diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-06-07 18:12:30 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-06-12 17:48:51 +0100 |
commit | b5d0f12f9df3ab211700473ed145ee6fbd9ca8e9 (patch) | |
tree | 1d753fc181ecc03284f3535fe8698b9b171d029c | |
parent | 8117f8480125b121b2b5ac0afc31b108d9e670ae (diff) | |
download | bitbake-b5d0f12f9df3ab211700473ed145ee6fbd9ca8e9.tar.gz |
runqueue: Abstract the start and teardown worker functions
We're going to need a fakeroot/pseudo version of the worker so
abstract the code to start the worker process.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | lib/bb/runqueue.py | 48 |
1 files changed, 31 insertions, 17 deletions
diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py index 34a123b48..3e694ba18 100644 --- a/lib/bb/runqueue.py +++ b/lib/bb/runqueue.py @@ -800,15 +800,13 @@ class RunQueue: self.rqexe = None self.worker = None + self.workerpipe = None - def start_worker(self): - if self.worker: - self.teardown_worker() - + def _start_worker(self): logger.debug(1, "Starting bitbake-worker") - self.worker = subprocess.Popen(["bitbake-worker", "decafbad"], stdout=subprocess.PIPE, stdin=subprocess.PIPE) - bb.utils.nonblockingfd(self.worker.stdout) - self.workerpipe = runQueuePipe(self.worker.stdout, None, self.cfgData, self) + worker = subprocess.Popen(["bitbake-worker", "decafbad"], stdout=subprocess.PIPE, stdin=subprocess.PIPE) + bb.utils.nonblockingfd(worker.stdout) + workerpipe = runQueuePipe(worker.stdout, None, self.cfgData, None) workerdata = { "taskdeps" : self.rqdata.dataCache.task_deps, @@ -825,19 +823,35 @@ class RunQueue: "logdefaultdomain" : bb.msg.loggerDefaultDomains, } - self.worker.stdin.write("<cookerconfig>" + pickle.dumps(self.cooker.configuration) + "</cookerconfig>") - self.worker.stdin.write("<workerdata>" + pickle.dumps(workerdata) + "</workerdata>") - self.worker.stdin.flush() + worker.stdin.write("<cookerconfig>" + pickle.dumps(self.cooker.configuration) + "</cookerconfig>") + worker.stdin.write("<workerdata>" + pickle.dumps(workerdata) + "</workerdata>") + worker.stdin.flush() - def teardown_worker(self): + return worker, workerpipe + + def _teardown_worker(self, worker, workerpipe): + if not worker: + return logger.debug(1, "Teardown for bitbake-worker") - self.worker.stdin.write("<quit></quit>") - self.worker.stdin.flush() - while self.worker.returncode is None: - self.workerpipe.read() - self.worker.poll() - while self.workerpipe.read(): + worker.stdin.write("<quit></quit>") + worker.stdin.flush() + while worker.returncode is None: + workerpipe.read() + worker.poll() + while workerpipe.read(): continue + workerpipe.close() + + def start_worker(self): + if self.worker: + self.teardown_worker() + + self.worker, self.workerpipe = self._start_worker() + + def teardown_worker(self): + self._teardown_worker(self.worker, self.workerpipe) + self.worker = None + self.workerpipe = None def check_stamp_task(self, task, taskname = None, recurse = False, cache = None): def get_timestamp(f): |