@@ -69,7 +69,7 @@ def _bchr(c):
69
69
# Documentation
70
70
## @{
71
71
72
- def handle_process_output (process , stdout_handler , stderr_handler , finalizer ):
72
+ def 9 (process , stdout_handler , stderr_handler , finalizer ):
73
73
"""Registers for notifications to lean that process output is ready to read, and dispatches lines to
74
74
the respective line handlers. We are able to handle carriage returns in case progress is sent by that
75
75
mean. For performance reasons, we only apply this to stderr.
@@ -193,14 +193,24 @@ def _deplete_buffer(fno, handler, buf_list, wg=None):
193
193
else :
194
194
# Oh ... probably we are on windows. select.select() can only handle sockets, we have files
195
195
# The only reliable way to do this now is to use threads and wait for both to finish
196
+ def _handle_lines (fd , handler , wg ):
197
+ for line in fd :
198
+ line = line .decode (defenc )
199
+ if line and handler :
200
+ handler (line )
201
+ if wg :
202
+ wg .done ()
203
+
196
204
# Since the finalizer is expected to wait, we don't have to introduce our own wait primitive
197
205
# NO: It's not enough unfortunately, and we will have to sync the threads
198
206
wg = WaitGroup ()
199
- for fno , (handler , buf_list ) in fdmap .items ():
207
+ for fd , handler in zip ((process .stdout , process .stderr ),
208
+ (stdout_handler , stderr_handler )):
200
209
wg .add (1 )
201
- t = threading .Thread (target = lambda : _deplete_buffer (fno , handler , buf_list , wg ))
210
+ t = threading .Thread (target = _handle_lines , args = (fd , handler , wg ))
211
+ t .setDaemon (True )
202
212
t .start ()
203
- # end
213
+
204
214
# NOTE: Just joining threads can possibly fail as there is a gap between .start() and when it's
205
215
# actually started, which could make the wait() call to just return because the thread is not yet
206
216
# active
0 commit comments