mirrors/sby
3
0
Fork 0
mirror of https://github.com/YosysHQ/sby.git synced 2025-04-06 14:24:08 +00:00
Code Activity

Significantly improve management of child processes

Browse source 
Signed-off-by: Clifford Wolf <clifford@clifford.at>
This commit is contained in:
Clifford Wolf 2019-03-21 15:06:49 +01:00
parent 334b952e5a
commit a2b85faa08
1 changed files with 33 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
sbysrc/sby_core.py
View file

@ -18,12 +18,25 @@
import os, re, sys import os, re, sys
if os.name == "posix": if os.name == "posix":
import resource, fcntl import resource, fcntl, signal
import subprocess import subprocess
from shutil import copyfile from shutil import copyfile
from select import select from select import select
from time import time, localtime from time import time, localtime
all_tasks_running = []
def force_shutdown(signum, frame):
print("SBY ---- Keyboard interrupt or external termination signal ----", flush=True)
for task in list(all_tasks_running):
task.terminate()
sys.exit(1)
if os.name == "posix":
signal.signal(signal.SIGHUP, force_shutdown)
signal.signal(signal.SIGINT, force_shutdown)
signal.signal(signal.SIGTERM, force_shutdown)
class SbyTask: class SbyTask:
def __init__(self, job, info, deps, cmdline, logfile=None, logstderr=True): def __init__(self, job, info, deps, cmdline, logfile=None, logstderr=True):
self.running = False self.running = False
@ -91,8 +104,11 @@ class SbyTask:
return return
if self.running: if self.running:
self.job.log("%s: terminating process" % self.info) self.job.log("%s: terminating process" % self.info)
if os.name == "posix":
os.killpg(self.p.pid, signal.SIGTERM)
self.p.terminate() self.p.terminate()
self.job.tasks_running.remove(self) self.job.tasks_running.remove(self)
all_tasks_running.remove(self)
self.terminated = True self.terminated = True
def poll(self): def poll(self):
@ -105,13 +121,25 @@ class SbyTask:
return return
self.job.log("%s: starting process \"%s\"" % (self.info, self.cmdline)) self.job.log("%s: starting process \"%s\"" % (self.info, self.cmdline))
self.p = subprocess.Popen(self.cmdline, shell=True, stdin=subprocess.DEVNULL, stdout=subprocess.PIPE,
stderr=(subprocess.STDOUT if self.logstderr else None))
if os.name == "posix": if os.name == "posix":
def preexec_fn():
signal.signal(signal.SIGINT, signal.SIG_IGN)
os.setpgrp()
self.p = subprocess.Popen(["/bin/bash", "-c", self.cmdline], stdin=subprocess.DEVNULL, stdout=subprocess.PIPE,
stderr=(subprocess.STDOUT if self.logstderr else None), preexec_fn=preexec_fn)
fl = fcntl.fcntl(self.p.stdout, fcntl.F_GETFL) fl = fcntl.fcntl(self.p.stdout, fcntl.F_GETFL)
fcntl.fcntl(self.p.stdout, fcntl.F_SETFL, fl | os.O_NONBLOCK) fcntl.fcntl(self.p.stdout, fcntl.F_SETFL, fl | os.O_NONBLOCK)
else:
self.p = subprocess.Popen(self.cmdline, shell=True, stdin=subprocess.DEVNULL, stdout=subprocess.PIPE,
stderr=(subprocess.STDOUT if self.logstderr else None))
self.job.tasks_pending.remove(self) self.job.tasks_pending.remove(self)
self.job.tasks_running.append(self) self.job.tasks_running.append(self)
all_tasks_running.append(self)
self.running = True self.running = True
return return
@ -128,6 +156,7 @@ class SbyTask:
if self.p.poll() is not None: if self.p.poll() is not None:
self.job.log("%s: finished (returncode=%d)" % (self.info, self.p.returncode)) self.job.log("%s: finished (returncode=%d)" % (self.info, self.p.returncode))
self.job.tasks_running.remove(self) self.job.tasks_running.remove(self)
all_tasks_running.remove(self)
self.running = False self.running = False
self.handle_exit(self.p.returncode) self.handle_exit(self.p.returncode)
@ -205,10 +234,7 @@ class SbyJob:
if task.running: if task.running:
fds.append(task.p.stdout) fds.append(task.p.stdout)
try: select(fds, [], [], 1.0) == ([], [], [])
select(fds, [], [], 1.0) == ([], [], [])
except:
pass
for task in self.tasks_running: for task in self.tasks_running:
task.poll() task.poll()