alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

spotcgi: correctly kill ltl3ba on timeout

Browse source 
* python/spot/__init__.py (automata): Do not create a session for
every command, this is only needed if automata() is run with a timeout
parameter.
* python/ajax/spotcgi.in: Adjust exclude the main process from
the process group, so that only children are killed on SIGALRM.
* NEWS: Mention the bug.
This commit is contained in:
Alexandre Duret-Lutz 2016-12-15 13:35:20 +01:00
parent 55eae0d8bc
commit cd34827510
3 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
python/spot/__init__.py
View file

@ -307,7 +307,7 @@ class formula:
def automata(*sources, timeout=None, ignore_abort=True,
trust_hoa=True, debug=False):
trust_hoa=True, no_sid=False, debug=False):
"""Read automata from a list of sources.
Parameters
@ -326,6 +326,10 @@ def automata(*sources, timeout=None, ignore_abort=True,
trust_hoa : bool, optional
If True (the default), supported HOA properies that
cannot be easily verified are trusted.
no_sid : bool, optional
When an automaton is obtained from a subprocess, this
subprocess is started from a shell with its own session
group (the default) unless no_sid is set to True.
debug : bool, optional
Whether to run the parser in debug mode.
@ -386,11 +390,15 @@ def automata(*sources, timeout=None, ignore_abort=True,
p = None
proc = None
if filename[-1] == '|':
setsid_maybe = None
if not no_sid:
setsid_maybe = os.setsid
# universal_newlines for str output instead of bytes
# when the pipe is read from Python (which happens
# when timeout is set).
proc = subprocess.Popen(filename[:-1], shell=True,
preexec_fn=os.setsid,
preexec_fn=
None if no_sid else os.setsid,
universal_newlines=True,
stdout=subprocess.PIPE)
if timeout is None: