mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-10 06:26:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

cros_workon: minimize portageq penalties

Browse Source 
Calling portageq is fairly slow, so only call it when required, and
combine the multiple calls into a single one.  In some cases, we'd
end up calling it multiple times which quickly multiplies the slowness.

BUG=None
TEST=`./cros_workon --board x86-alex start dtc` still works
TEST=`./cros_workon --board x86-alex list` still works and is fast
TEST=`./cros_workon --board x86-alex stop dtc` still works

Change-Id: I6ac6ba283c6529384a7981ad4fffa480bae52234
Reviewed-on: https://gerrit.chromium.org/gerrit/18400
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
This commit is contained in:
Mike Frysinger 2012-03-16 15:47:53 -04:00 committed by David James
parent 95aad59ad3
commit bb18db9908
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cros_workon
View File

@ -60,14 +60,12 @@ if [ -n "${FLAGS_board}" ]; then
EBUILDCMD=ebuild-"${FLAGS_board}" EBUILDCMD=ebuild-"${FLAGS_board}"
PORTAGEQCMD=portageq-"${FLAGS_board}" PORTAGEQCMD=portageq-"${FLAGS_board}"
BOARD_STR="${FLAGS_board}" BOARD_STR="${FLAGS_board}"
BOARD_KEYWORD="$(portageq-${FLAGS_board} envvar ARCH)"
else else
BOARD_DIR="" # --host specified BOARD_DIR="" # --host specified
EQUERYCMD=equery EQUERYCMD=equery
EBUILDCMD=ebuild EBUILDCMD=ebuild
PORTAGEQCMD=portageq PORTAGEQCMD=portageq
BOARD_STR="host" BOARD_STR="host"
BOARD_KEYWORD="$(portageq envvar ARCH)"
fi fi
WORKON_DIR=${CHROOT_TRUNK_DIR}/.config/cros_workon WORKON_DIR=${CHROOT_TRUNK_DIR}/.config/cros_workon
@ -110,10 +108,8 @@ find_keyword_workon_ebuilds() {
local keyword="${1}" local keyword="${1}"
local overlay local overlay
local cros_overlays=$("${PORTAGEQCMD}" envvar PORTDIR_OVERLAY)
# NOTE: overlay may be a symlink, and we have to use ${overlay}/ # NOTE: overlay may be a symlink, and we have to use ${overlay}/
for overlay in ${cros_overlays}; do for overlay in ${PORTDIR_OVERLAY}; do
# only look up ebuilds named 9999 to eliminate duplicates # only look up ebuilds named 9999 to eliminate duplicates
find ${overlay}/*-* -maxdepth 2 -type f -name '*9999.ebuild' \ find ${overlay}/*-* -maxdepth 2 -type f -name '*9999.ebuild' \
-exec grep -l 'inherit.*cros-workon' {} + 2>/dev/null | \ -exec grep -l 'inherit.*cros-workon' {} + 2>/dev/null | \
@ -176,7 +172,7 @@ canonicalize_name () {
return 0 return 0
fi fi
if ! pkgfile=$(ACCEPT_KEYWORDS="~${BOARD_KEYWORD}" ${EQUERYCMD} which $1); then if ! pkgfile=$(ACCEPT_KEYWORDS="~${ARCH}" ${EQUERYCMD} which $1); then
warn "error looking up package $1" 1>&2 warn "error looking up package $1" 1>&2
return 1 return 1
fi fi
@ -353,10 +349,18 @@ ebuild_iterate() {
done done
} }
# Only call portageq when absolutely required, and when we do, only run it
# once -- it's a slow beast and can easily take hundreds of milliseconds :(.
if [[ ${WORKON_CMD} != "list" || ${FLAGS_all} != ${FLAGS_FALSE} ]] ; then
portageq_vars="ARCH PORTDIR_OVERLAY"
unset ${portageq_vars}
eval $(${PORTAGEQCMD} envvar -v ${portageq_vars})
fi
# --all makes commands operate on different lists # --all makes commands operate on different lists
if [ ${FLAGS_all} = "${FLAGS_TRUE}" ]; then if [ ${FLAGS_all} = "${FLAGS_TRUE}" ]; then
case ${WORKON_CMD} in case ${WORKON_CMD} in
start|info) ATOM_LIST=$(show_workon_ebuilds ${BOARD_KEYWORD});; start|info) ATOM_LIST=$(show_workon_ebuilds ${ARCH});;
stop|iterate) ATOM_LIST=$(show_live_ebuilds);; stop|iterate) ATOM_LIST=$(show_live_ebuilds);;
list) ;; list) ;;
*) die "--all is invalid for the given command";; *) die "--all is invalid for the given command";;
@ -381,9 +385,9 @@ fi
case ${WORKON_CMD} in case ${WORKON_CMD} in
start) ebuild_to_live "${ATOM_LIST}" ;; start) ebuild_to_live "${ATOM_LIST}" ;;
stop) ebuild_to_stable "${ATOM_LIST}" ;; stop) ebuild_to_stable "${ATOM_LIST}" ;;
info) show_workon_info "${ATOM_LIST}" "${BOARD_KEYWORD}" ;; info) show_workon_info "${ATOM_LIST}" "${ARCH}" ;;
list) [ ${FLAGS_all} = "${FLAGS_FALSE}" ] && show_live_ebuilds || \ list) [ ${FLAGS_all} = "${FLAGS_FALSE}" ] && show_live_ebuilds || \
show_workon_ebuilds ${BOARD_KEYWORD} ;; show_workon_ebuilds ${ARCH} ;;
list-all) show_all_live_ebuilds ;; list-all) show_all_live_ebuilds ;;
iterate) ebuild_iterate "${ATOM_LIST}" ;; iterate) ebuild_iterate "${ATOM_LIST}" ;;
*) *)