diff options
| -rwxr-xr-x | bin/bitbake-worker | 36 | ||||
| -rw-r--r-- | lib/bb/runqueue.py | 7 |
2 files changed, 37 insertions, 6 deletions
diff --git a/bin/bitbake-worker b/bin/bitbake-worker index d1ff5b36c..c7992f7e8 100755 --- a/bin/bitbake-worker +++ b/bin/bitbake-worker @@ -12,10 +12,18 @@ import errno import signal # Users shouldn't be running this code directly -if len(sys.argv) != 2 or sys.argv[1] != "decafbad": +if len(sys.argv) != 2 or not sys.argv[1].startswith("decafbad"): print("bitbake-worker is meant for internal execution by bitbake itself, please don't use it standalone.") sys.exit(1) +profiling = False +if sys.argv[1] == "decafbadbad": + profiling = True + try: + import cProfile as profile + except: + import profile + logger = logging.getLogger("BitBake") try: @@ -134,6 +142,7 @@ def fork_off_task(cfg, data, workerdata, fn, task, taskname, appends, taskdepdat bb.msg.fatal("RunQueue", "fork failed: %d (%s)" % (e.errno, e.strerror)) if pid == 0: + def child(): global worker_pipe pipein.close() @@ -185,10 +194,20 @@ def fork_off_task(cfg, data, workerdata, fn, task, taskname, appends, taskdepdat os._exit(1) try: if not cfg.dry_run: - ret = bb.build.exec_task(fn, taskname, the_data, cfg.profile) - os._exit(ret) + return bb.build.exec_task(fn, taskname, the_data, cfg.profile) except: os._exit(1) + if not profiling: + os._exit(child()) + else: + profname = "profile-%s.log" % (fn.replace("/", "-") + "-" + taskname) + prof = profile.Profile() + try: + ret = profile.Profile.runcall(prof, child) + finally: + prof.dump_stats(profname) + bb.utils.process_profilelog(profname) + os._exit(ret) else: for key, value in envbackup.iteritems(): if value is None: @@ -363,7 +382,16 @@ class BitbakeWorker(object): try: worker = BitbakeWorker(sys.stdin) - worker.serve() + if not profiling: + worker.serve() + else: + profname = "profile-worker.log" + prof = profile.Profile() + try: + profile.Profile.runcall(prof, worker.serve) + finally: + prof.dump_stats(profname) + bb.utils.process_profilelog(profname) except BaseException as e: if not normalexit: import traceback diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py index e32f81a16..39df79473 100644 --- a/lib/bb/runqueue.py +++ b/lib/bb/runqueue.py @@ -859,15 +859,18 @@ class RunQueue: def _start_worker(self, fakeroot = False, rqexec = None): logger.debug(1, "Starting bitbake-worker") + magic = "decafbad" + if self.cooker.configuration.profile: + magic = "decafbadbad" if fakeroot: fakerootcmd = self.cfgData.getVar("FAKEROOTCMD", True) fakerootenv = (self.cfgData.getVar("FAKEROOTBASEENV", True) or "").split() env = os.environ.copy() for key, value in (var.split('=') for var in fakerootenv): env[key] = value - worker = subprocess.Popen([fakerootcmd, "bitbake-worker", "decafbad"], stdout=subprocess.PIPE, stdin=subprocess.PIPE, env=env) + worker = subprocess.Popen([fakerootcmd, "bitbake-worker", magic], stdout=subprocess.PIPE, stdin=subprocess.PIPE, env=env) else: - worker = subprocess.Popen(["bitbake-worker", "decafbad"], stdout=subprocess.PIPE, stdin=subprocess.PIPE) + worker = subprocess.Popen(["bitbake-worker", magic], stdout=subprocess.PIPE, stdin=subprocess.PIPE) bb.utils.nonblockingfd(worker.stdout) workerpipe = runQueuePipe(worker.stdout, None, self.cfgData, self, rqexec) |