ASCEE/pyqtgraph
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Terminate FileForwarder thread on process end

Browse Source 
Previously on windows the FileForwarder threads would
continue to run and eat up a lot of CPU once the child process
they were forwarding dies. This commit shuts down those threads
when the child process is killed.
This commit is contained in:
Sebastian Pauka 2018-10-30 10:22:49 +11:00
parent e5e103de6d
commit 482dd2ee33
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pyqtgraph/multiprocess/processes.py
View File

@ -166,6 +166,14 @@ class Process(RemoteEventHandler):
raise Exception('Timed out waiting for remote process to end.')
time.sleep(0.05)
self.conn.close()
# Close remote polling threads, otherwise they will spin continuously
if hasattr(self, "_stdoutForwarder"):
self._stdoutForwarder.finish.set()
self._stderrForwarder.finish.set()
self._stdoutForwarder.join()
self._stderrForwarder.join()
self.debugMsg('Child process exited. (%d)' % self.proc.returncode)
def debugMsg(self, msg, *args):
@ -473,23 +481,24 @@ class FileForwarder(threading.Thread):
self.lock = threading.Lock()
self.daemon = True
self.color = color
self.finish = threading.Event()
self.start()
def run(self):
if self.output == 'stdout' and self.color is not False:
while True:
while not self.finish.is_set():
line = self.input.readline()
with self.lock:
cprint.cout(self.color, line, -1)
elif self.output == 'stderr' and self.color is not False:
while True:
while not self.finish.is_set():
line = self.input.readline()
with self.lock:
cprint.cerr(self.color, line, -1)
else:
if isinstance(self.output, str):
self.output = getattr(sys, self.output)
while True:
while not self.finish.is_set():
line = self.input.readline()
with self.lock:
self.output.write(line)
self.output.write(line.decode('utf8'))