aboutsummaryrefslogtreecommitdiffstats
path: root/lib/bb/process.py
diff options
context:
space:
mode:
authorJuro Bystricky <juro.bystricky@intel.com>2017-06-13 09:21:54 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-14 10:56:11 +0100
commit1f6e6aa8262369eafc3bbf9f01f8d981f90becdf (patch)
treea15ee58aed105ffbe823b21fa6642391ed50dfd7 /lib/bb/process.py
parent8d0a76f5a595dddf16b7268bae2c00ef5f568316 (diff)
downloadbitbake-contrib-1f6e6aa8262369eafc3bbf9f01f8d981f90becdf.tar.gz
bitbake:process: flush stderr/stdout to log
When a process terminates, some messages may still remain in stdout or stderr and do not make it into the log file. In addition, the messages that do make it to the log file may end up in the log file in incorrect order. This patch flushes all messages into the log file after the process terminates. Some additional log flushing is also needed to keep the various messages showing up in the log file in proper order. [YOCTO#10785] Signed-off-by: Juro Bystricky <juro.bystricky@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib/bb/process.py')
-rw-r--r--lib/bb/process.py79
1 files changed, 43 insertions, 36 deletions
diff --git a/lib/bb/process.py b/lib/bb/process.py
index a4a559982..e69697cb6 100644
--- a/lib/bb/process.py
+++ b/lib/bb/process.py
@@ -94,45 +94,52 @@ def _logged_communicate(pipe, log, input, extrafiles):
if data is not None:
func(data)
+ def read_all_pipes(log, rin, outdata, errdata):
+ rlist = rin
+ stdoutbuf = b""
+ stderrbuf = b""
+
+ try:
+ r,w,e = select.select (rlist, [], [], 1)
+ except OSError as e:
+ if e.errno != errno.EINTR:
+ raise
+
+ readextras(r)
+
+ if pipe.stdout in r:
+ data = stdoutbuf + pipe.stdout.read()
+ if data is not None and len(data) > 0:
+ try:
+ data = data.decode("utf-8")
+ outdata.append(data)
+ log.write(data)
+ log.flush()
+ stdoutbuf = b""
+ except UnicodeDecodeError:
+ stdoutbuf = data
+
+ if pipe.stderr in r:
+ data = stderrbuf + pipe.stderr.read()
+ if data is not None and len(data) > 0:
+ try:
+ data = data.decode("utf-8")
+ errdata.append(data)
+ log.write(data)
+ log.flush()
+ stderrbuf = b""
+ except UnicodeDecodeError:
+ stderrbuf = data
+
try:
+ # Read all pipes while the process is open
while pipe.poll() is None:
- rlist = rin
- stdoutbuf = b""
- stderrbuf = b""
- try:
- r,w,e = select.select (rlist, [], [], 1)
- except OSError as e:
- if e.errno != errno.EINTR:
- raise
-
- if pipe.stdout in r:
- data = stdoutbuf + pipe.stdout.read()
- if data is not None and len(data) > 0:
- try:
- data = data.decode("utf-8")
- outdata.append(data)
- log.write(data)
- stdoutbuf = b""
- except UnicodeDecodeError:
- stdoutbuf = data
-
- if pipe.stderr in r:
- data = stderrbuf + pipe.stderr.read()
- if data is not None and len(data) > 0:
- try:
- data = data.decode("utf-8")
- errdata.append(data)
- log.write(data)
- stderrbuf = b""
- except UnicodeDecodeError:
- stderrbuf = data
-
- readextras(r)
-
- finally:
- log.flush()
+ read_all_pipes(log, rin, outdata, errdata)
- readextras([fobj for fobj, _ in extrafiles])
+ # Pocess closed, drain all pipes...
+ read_all_pipes(log, rin, outdata, errdata)
+ finally:
+ log.flush()
if pipe.stdout is not None:
pipe.stdout.close()