From: Richard Purdie <richard.purdie@linuxfoundation.org>
To: bitbake-devel <bitbake-devel@lists.openembedded.org>
Subject: [PATCH] runqueue: Use SIGCHLD instead of polling waitpid
Date: Sun, 09 Mar 2014 17:59:53 -0700 [thread overview]
Message-ID: <1394413193.7883.22.camel@ted> (raw)
Instead of a significant number of calls to waitpid, register a SIGCHLD
handler instead.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index c486c98..6650bd8 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -912,10 +912,28 @@ class RunQueue:
continue
workerpipe.close()
+ def sigchild_exception(self, signum, stackframe):
+ pid = True
+ while pid:
+ try:
+ pid, status = os.waitpid(-1, os.WNOHANG)
+ if pid != 0 and not self.teardown:
+ if self.worker and pid == self.worker.pid:
+ name = "Worker"
+ elif self.fakeworker and pid == self.fakeworker.pid:
+ name = "Fakeroot"
+ else:
+ name = "Unknown"
+ bb.error("%s process (%s) exited unexpectedly (%s), shutting down..." % (name, pid, str(status)))
+ self.finish_runqueue(True)
+ except OSError:
+ pid = False
+
def start_worker(self):
if self.worker:
self.teardown_workers()
self.teardown = False
+ signal.signal(signal.SIGCHLD, self.sigchild_exception)
self.worker, self.workerpipe = self._start_worker()
def start_fakeworker(self, rqexec):
@@ -924,6 +942,7 @@ class RunQueue:
def teardown_workers(self):
self.teardown = True
+ signal.signal(signal.SIGCHLD, signal.SIG_DFL)
self._teardown_worker(self.worker, self.workerpipe)
self.worker = None
self.workerpipe = None
@@ -2090,20 +2109,6 @@ class runQueuePipe():
self.rqexec = rqexec
def read(self):
- try:
- pid, status = os.waitpid(-1, os.WNOHANG)
- if pid != 0 and not self.rq.teardown:
- if self.rq.worker and pid == self.rq.worker.pid:
- name = "Worker"
- elif self.rq.fakeworker and pid == self.rq.fakeworker.pid:
- name = "Fakeroot"
- else:
- name = "Unknown"
- bb.error("%s process (%s) exited unexpectedly (%s), shutting down..." % (name, pid, str(status)))
- self.rq.finish_runqueue(True)
- except OSError:
- pass
-
start = len(self.queue)
try:
self.queue = self.queue + self.input.read(102400)
reply other threads:[~2014-03-10 1:00 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1394413193.7883.22.camel@ted \
--to=richard.purdie@linuxfoundation.org \
--cc=bitbake-devel@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.