android/git-repo
1
Fork 0
mirror of https://gerrit.googlesource.com/git-repo synced 2024-12-21 07:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

forall: simplify arg passing to worker children

Browse Source 
The ProjectArgs function can be inlined which simplifies it quite a
bit.  We shouldn't need the custom exception handling here either.
This also makes the next commit easier to review.

Change-Id: If3be04f58c302c36a0f20b99de0f67e78beac141
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/298723
Reviewed-by: Michael Mortensen <mmortensen@google.com>
Tested-by: Mike Frysinger <vapier@google.com>
This commit is contained in:
Mike Frysinger 2021-03-01 02:06:10 -05:00
parent 179a242caa
commit 819c73954f
1 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
subcmds/forall.py
View File

@ -13,6 +13,7 @@
# limitations under the License. # limitations under the License.
import errno import errno
import functools
import io import io
import multiprocessing import multiprocessing
import re import re
@ -240,8 +241,8 @@ without iterating through the remaining projects.
config = self.manifest.manifestProject.config config = self.manifest.manifestProject.config
with multiprocessing.Pool(opt.jobs, InitWorker) as pool: with multiprocessing.Pool(opt.jobs, InitWorker) as pool:
results_it = pool.imap( results_it = pool.imap(
DoWorkWrapper, functools.partial(DoWorkWrapper, mirror, opt, cmd, shell, config),
self.ProjectArgs(projects, mirror, opt, cmd, shell, config), enumerate(self._SerializeProject(x) for x in projects),
chunksize=WORKER_BATCH_SIZE) chunksize=WORKER_BATCH_SIZE)
first = True first = True
for (r, output) in results_it: for (r, output) in results_it:
@ -270,21 +271,6 @@ without iterating through the remaining projects.
if rc != 0: if rc != 0:
sys.exit(rc) sys.exit(rc)
def ProjectArgs(self, projects, mirror, opt, cmd, shell, config):
for cnt, p in enumerate(projects):
try:
project = self._SerializeProject(p)
except Exception as e:
print('Project list error on project %s: %s: %s' %
(p.name, type(e).__name__, e),
file=sys.stderr)
return
except KeyboardInterrupt:
print('Project list interrupted',
file=sys.stderr)
return
yield [mirror, opt, cmd, shell, cnt, config, project]
class WorkerKeyboardInterrupt(Exception): class WorkerKeyboardInterrupt(Exception):
""" Keyboard interrupt exception for worker processes. """ """ Keyboard interrupt exception for worker processes. """
@ -294,7 +280,7 @@ def InitWorker():
signal.signal(signal.SIGINT, signal.SIG_IGN) signal.signal(signal.SIGINT, signal.SIG_IGN)
def DoWorkWrapper(args): def DoWorkWrapper(mirror, opt, cmd, shell, config, args):
""" A wrapper around the DoWork() method. """ A wrapper around the DoWork() method.
Catch the KeyboardInterrupt exceptions here and re-raise them as a different, Catch the KeyboardInterrupt exceptions here and re-raise them as a different,
@ -302,9 +288,9 @@ def DoWorkWrapper(args):
and making the parent hang indefinitely. and making the parent hang indefinitely.
""" """
project = args.pop() cnt, project = args
try: try:
return DoWork(project, *args) return DoWork(project, mirror, opt, cmd, shell, cnt, config)
except KeyboardInterrupt: except KeyboardInterrupt:
print('%s: Worker interrupted' % project['name']) print('%s: Worker interrupted' % project['name'])
raise WorkerKeyboardInterrupt() raise WorkerKeyboardInterrupt()