diff options
| -rwxr-xr-x | bitbake/bin/bitbake-worker | 8 | ||||
| -rw-r--r-- | bitbake/lib/bb/cooker.py | 1 | ||||
| -rw-r--r-- | bitbake/lib/bb/runqueue.py | 1 | ||||
| -rw-r--r-- | bitbake/lib/bb/server/process.py | 2 | ||||
| -rw-r--r-- | bitbake/lib/bb/ui/knotty.py | 2 | ||||
| -rw-r--r-- | bitbake/lib/bb/ui/uievent.py | 1 | ||||
| -rw-r--r-- | bitbake/lib/prserv/serv.py | 4 |
7 files changed, 18 insertions, 1 deletions
diff --git a/bitbake/bin/bitbake-worker b/bitbake/bin/bitbake-worker index 3390f637e3..f053382f50 100755 --- a/bitbake/bin/bitbake-worker +++ b/bitbake/bin/bitbake-worker @@ -18,7 +18,7 @@ if len(sys.argv) != 2 or not sys.argv[1].startswith("decafbad"): sys.exit(1) profiling = False -if sys.argv[1] == "decafbadbad": +if sys.argv[1].startswith("decafbadbad"): profiling = True try: import cProfile as profile @@ -202,6 +202,8 @@ def fork_off_task(cfg, data, workerdata, fn, task, taskname, appends, taskdepdat the_data = bb.cache.Cache.loadDataFull(fn, appends, data) the_data.setVar('BB_TASKHASH', workerdata["runq_hash"][task]) + bb.utils.set_process_name("%s:%s" % (the_data.getVar("PN", True), taskname.replace("do_", ""))) + # exported_vars() returns a generator which *cannot* be passed to os.environ.update() # successfully. We also need to unset anything from the environment which shouldn't be there exports = bb.data.exported_vars(the_data) @@ -296,6 +298,10 @@ class BitbakeWorker(object): signal.signal(signal.SIGTERM, self.sigterm_exception) # Let SIGHUP exit as SIGTERM signal.signal(signal.SIGHUP, self.sigterm_exception) + if "beef" in sys.argv[1]: + bb.utils.set_process_name("Worker (Fakeroot)") + else: + bb.utils.set_process_name("Worker") def sigterm_exception(self, signum, stackframe): if signum == signal.SIGTERM: diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index a02d143c34..a1182ef461 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py @@ -2012,6 +2012,7 @@ class CookerParser(object): bb.event.fire(bb.event.ParseStarted(self.toparse), self.cfgdata) def init(): Parser.cfg = self.cfgdata + bb.utils.set_process_name(multiprocessing.current_process().name) multiprocessing.util.Finalize(None, bb.codeparser.parser_cache_save, args=(self.cfgdata,), exitpriority=1) multiprocessing.util.Finalize(None, bb.fetch.fetcher_parse_save, args=(self.cfgdata,), exitpriority=1) diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index f840ad2154..2f0a9562d7 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py @@ -884,6 +884,7 @@ class RunQueue: if self.cooker.configuration.profile: magic = "decafbadbad" if fakeroot: + magic = magic + "beef" fakerootcmd = self.cfgData.getVar("FAKEROOTCMD", True) fakerootenv = (self.cfgData.getVar("FAKEROOTBASEENV", True) or "").split() env = os.environ.copy() diff --git a/bitbake/lib/bb/server/process.py b/bitbake/lib/bb/server/process.py index 5fca3508b1..1e2b8249a9 100644 --- a/bitbake/lib/bb/server/process.py +++ b/bitbake/lib/bb/server/process.py @@ -106,6 +106,7 @@ class ProcessServer(Process, BaseImplServer): # the UI and communicated to us self.quitin.close() signal.signal(signal.SIGINT, signal.SIG_IGN) + bb.utils.set_process_name("Cooker") while not self.quit: try: if self.command_channel.poll(): @@ -212,6 +213,7 @@ class ProcessEventQueue(multiprocessing.queues.Queue): def __init__(self, maxsize): multiprocessing.queues.Queue.__init__(self, maxsize) self.exit = False + bb.utils.set_process_name("ProcessEQueue") def setexit(self): self.exit = True diff --git a/bitbake/lib/bb/ui/knotty.py b/bitbake/lib/bb/ui/knotty.py index b42f8eb888..3f2b77b6be 100644 --- a/bitbake/lib/bb/ui/knotty.py +++ b/bitbake/lib/bb/ui/knotty.py @@ -272,6 +272,8 @@ def main(server, eventHandler, params, tf = TerminalFilter): logger.addHandler(console) logger.addHandler(errconsole) + bb.utils.set_process_name("KnottyUI") + if params.options.remote_server and params.options.kill_server: server.terminateServer() return diff --git a/bitbake/lib/bb/ui/uievent.py b/bitbake/lib/bb/ui/uievent.py index df22e253ca..6b479bfa54 100644 --- a/bitbake/lib/bb/ui/uievent.py +++ b/bitbake/lib/bb/ui/uievent.py @@ -104,6 +104,7 @@ class BBUIEventQueue: def startCallbackHandler(self): self.server.timeout = 1 + bb.utils.set_process_name("UIEventQueue") while not self.server.quit: try: self.server.handle_request() diff --git a/bitbake/lib/prserv/serv.py b/bitbake/lib/prserv/serv.py index eafc3aab7b..a4ae229134 100644 --- a/bitbake/lib/prserv/serv.py +++ b/bitbake/lib/prserv/serv.py @@ -79,6 +79,8 @@ class PRServer(SimpleXMLRPCServer): # 60 iterations between syncs or sync if dirty every ~30 seconds iterations_between_sync = 60 + bb.utils.set_process_name("PRServ Handler") + while not self.quit: try: (request, client_address) = self.requestqueue.get(True, 30) @@ -141,6 +143,8 @@ class PRServer(SimpleXMLRPCServer): self.quit = False self.timeout = 0.5 + bb.utils.set_process_name("PRServ") + logger.info("Started PRServer with DBfile: %s, IP: %s, PORT: %s, PID: %s" % (self.dbfile, self.host, self.port, str(os.getpid()))) |