sascha/devlib
1
0
Fork 0
mirror of https://github.com/ARM-software/devlib.git synced 2025-02-23 21:17:50 +00:00
Code Issues Releases Wiki Activity

connection: kill spawned child subprocesses:

Browse Source 
Subprocesses that were spawned under the same pgid were not necessarily
being terminated when the parent was terminated, allowing them to
continue running. This change explicitly kills the process group
involved.
This commit is contained in:
Jonathan Paynter 2020-08-10 17:29:02 +01:00 committed by Marc Bonnici
parent 0498017bf0
commit dc7faf46e4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devlib/connection.py
View File

@ -203,11 +203,11 @@ class PopenBackgroundCommand(BackgroundCommand):
def cancel(self, kill_timeout=_KILL_TIMEOUT): def cancel(self, kill_timeout=_KILL_TIMEOUT):
popen = self.popen popen = self.popen
popen.send_signal(signal.SIGTERM) os.killpg(os.getpgid(popen.pid), signal.SIGTERM)
try: try:
popen.wait(timeout=_KILL_TIMEOUT) popen.wait(timeout=_KILL_TIMEOUT)
except subprocess.TimeoutExpired: except subprocess.TimeoutExpired:
popen.kill() os.killpg(os.getpgid(popen.pid), signal.SIGKILL)
def close(self): def close(self):
self.popen.__exit__(None, None, None) self.popen.__exit__(None, None, None)