AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

[testrunner] Fix sigterm handler

Browse Source 
Bug: v8:8292
Change-Id: Icbfb8cb0c4ba9cdb5a6c1cbec5e4c6e61c9d0d4b
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2019163
Reviewed-by: Liviu Rau <liviurau@chromium.org>
Commit-Queue: Michael Achenbach <machenbach@chromium.org>
Cr-Commit-Position: refs/heads/master@{#65974}
This commit is contained in:
Michael Achenbach 2020-01-24 14:01:59 +01:00 committed by Commit Bot
parent d49a1842ca
commit 8dfdc86c50
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tools/testrunner/local/command.py
View File

@ -41,21 +41,27 @@ class AbortException(Exception):
@contextmanager
def handle_sigterm(process, handle_sigterm):
"""Handle sigterm for `process` and restore previous handler to prevent
def handle_sigterm(process, abort_fun, enabled):
"""Call`abort_fun` on sigterm and restore previous handler to prevent
erroneous termination of an already terminated process.
Args:
process: The process to terminate.
abort_fun: Function taking two parameters: the process to terminate and
an array with a boolean for storing if an abort occured.
enabled: If False, this wrapper will be a no-op.
"""
# Variable to communicate with the signal handler.
abort_occured = [False]
def handler(signum, frame):
self._abort(process, abort_occured)
abort_fun(process, abort_occured)
if handle_sigterm:
if enabled:
previous = signal.signal(signal.SIGTERM, handler)
try:
yield
finally:
if handle_sigterm:
if enabled:
signal.signal(signal.SIGTERM, previous)
if abort_occured[0]:
@ -95,7 +101,7 @@ class BaseCommand(object):
process = self._start_process()
with handle_sigterm(process, self.handle_sigterm):
with handle_sigterm(process, self._abort, self.handle_sigterm):
# Variable to communicate with the timer.
timeout_occured = [False]
timer = threading.Timer(