Rewrite doins by python (bug 624526). #190
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mrueg
reviewed
Aug 14, 2017
bin/ebuild-helpers/doins
Outdated
| rm -rf "$TMP" | ||
| [[ $failed -ne 0 || $success -eq 0 ]] && { __helpers_die "${helper} failed"; exit 1; } || exit 0 | ||
| "${PORTAGE_PYTHON:-/usr/bin/python}" \ | ||
| "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/doins.py \ |
There was a problem hiding this comment.
Is /usr/lib/portage/bin a safe fallback? Shouldn't we check for it being unset instead?
bin/ebuild-helpers/doins
Outdated
| mkdir -p "$TMP"/{1,2} | ||
| # Use safe cwd, avoiding unsafe import for bug #469338. | ||
| export __PORTAGE_HELPER_CWD=${PWD} | ||
| cd "${PORTAGE_PYM_PATH:-/usr/lib/portage/pym}" |
There was a problem hiding this comment.
Is this path a safe fallback?
bin/doins.py
Outdated
| """Installs a file at |source| into |dest_dir| in process.""" | ||
| dest = os.path.join(dest_dir, os.path.basename(source)) | ||
| try: | ||
| # TODO: Consider to use portage.util.file_copy.copyfile |
There was a problem hiding this comment.
Possible to get this TODO done before merging?
bin/doins.py
Outdated
| def run(self, dest): | ||
| """Installs a dir into |dest| by 'install' command.""" | ||
| command = ['install', '-d'] + self._split_options + [dest] | ||
| subprocess.call(command) |
There was a problem hiding this comment.
Could need some exception handling, if subprocess.call fails
mrueg
reviewed
Aug 14, 2017
bin/doins.py
Outdated
| # supported. | ||
| # In Python 3, the prefix of octal int must be '0o' rather than '0'. | ||
| # So, set base explicitly in that case. | ||
| return int(mode, 8 if re.search(r'^0[0-7]*$', mode) else 0) |
There was a problem hiding this comment.
Split up into multiple lines for readability and consider compiling the regex
mrueg
approved these changes
Aug 20, 2017
zmedico
force-pushed
the
bug_624526
branch
2 times, most recently
from
6f23b87
to
414e807
Compare
zmedico
force-pushed
the
bug_624526
branch
3 times, most recently
from
94491c3
to
e7e89ce
Compare
|
Updated with the version merged in chromiumos/third_party/portage_tool, and added a commit to optimize with copyfile from portage.util.file_copy. |
doins is written in bash. However, specifically in case that
too many files are installed, it is very slow.
This CL rewrites the script in python for performance.
BUG=chromium:712659
TEST=time (./setup_board --forace && \
./build_package --withdev && \
./build_image --noenable_rootfs_verification test)
===Before===
real 21m35.445s
user 93m40.588s
sys 21m31.224s
===After===
real 17m30.106s
user 94m1.812s
sys 20m13.468s
Change-Id: Ib10f623961ba316753d58397cff5e72fbc343339
Reviewed-on: https://chromium-review.googlesource.com/559225
X-Chromium-Bug: 712659
X-Chromium-Bug-url: https://bugs.chromium.org/p/chromium/issues/detail?id=712659
Reviewed-by: Manuel Rüger <mrueg@gentoo.org>
Bug: https://bugs.gentoo.org/624526
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
doins is written in bash. However, specifically in case that
too many files are installed, it is very slow.
This CL rewrites the script in python for performance.
BUG=chromium:712659
TEST=time (./setup_board --forace &&
./build_package --withdev &&
./build_image --noenable_rootfs_verification test)
===Before===
real 21m35.445s
user 93m40.588s
sys 21m31.224s
===After===
real 17m30.106s
user 94m1.812s
sys 20m13.468s
Change-Id: Ib10f623961ba316753d58397cff5e72fbc343339
Reviewed-on: https://chromium-review.googlesource.com/559225
X-Chromium-Bug: 712659
X-Chromium-Bug-url: https://bugs.chromium.org/p/chromium/issues/detail?id=712659
X-Gentoo-Bug: 624526
X-Gentoo-Bug-url: https://bugs.gentoo.org/624526