From 5c62833766048b83c0d7ea9e77194b9ca6af7fb1 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 21 Jan 2010 23:46:20 +0000 Subject: runqueue.py: Use fcntl to make the worker pipes non-blocking Signed-off-by: Richard Purdie --- bitbake/lib/bb/runqueue.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index 7a34ba9f7..1f9907b9d 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py @@ -26,6 +26,7 @@ from bb import msg, data, event, mkdirhier, utils import bb, os, sys import signal import stat +import fcntl class TaskFailure(Exception): """Exception raised when a task in a runqueue fails""" @@ -1161,12 +1162,16 @@ class runQueuePipe(): def __init__(self, pipein, pipeout, d): self.fd = pipein os.close(pipeout) + fcntl.fcntl(self.fd, fcntl.F_SETFL, fcntl.fcntl(self.fd, fcntl.F_GETFL) | os.O_NONBLOCK) self.queue = "" self.d = d def read(self): start = len(self.queue) - self.queue = self.queue + os.read(self.fd, 1024) + try: + self.queue = self.queue + os.read(self.fd, 1024) + except OSError: + pass end = len(self.queue) index = self.queue.find("") while index != -1: -- cgit v1.2.3