From: Richard Purdie <rpurdie@linux.intel.com>
Date: Thu, 21 Jan 2010 23:46:20 +0000 (+0000)
Subject: runqueue.py: Use fcntl to make the worker pipes non-blocking
X-Git-Tag: 2011-1~6392
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=5c62833766048b83c0d7ea9e77194b9ca6af7fb1;p=openembedded-core.git

runqueue.py: Use fcntl to make the worker pipes non-blocking

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---

diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index 7a34ba9f7e..1f9907b9d5 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("</event>")
         while index != -1: