X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/eb6970c22550a14398d08be4b4bc5824b81c7b89..ec942f7991f8fd4aad98d954ca860b580879d994:/tools/tesh/tesh.py diff --git a/tools/tesh/tesh.py b/tools/tesh/tesh.py index d62cd7f921..3abc35ab66 100755 --- a/tools/tesh/tesh.py +++ b/tools/tesh/tesh.py @@ -5,12 +5,11 @@ tesh -- testing shell ======================== -Copyright (c) 2012-2019. The SimGrid Team. All rights reserved. +Copyright (c) 2012-2020. The SimGrid Team. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the license (GNU LGPL) which comes with this package. - #TODO: child of child of child that printfs. Does it work? #TODO: a child dies after its parent. What happen? @@ -25,7 +24,6 @@ under the terms of the license (GNU LGPL) which comes with this package. """ - import sys import os import shlex @@ -33,6 +31,7 @@ import re import difflib import signal import argparse +import time if sys.version_info[0] == 3: import subprocess @@ -46,14 +45,12 @@ else: # # - def isWindows(): return sys.platform.startswith('win') # Singleton metaclass that works in Python 2 & 3 # http://stackoverflow.com/questions/6760685/creating-a-singleton-in-python - class _Singleton(type): """ A metaclass that creates a Singleton base class when called. """ _instances = {} @@ -63,11 +60,9 @@ class _Singleton(type): cls._instances[cls] = super(_Singleton, cls).__call__(*args, **kwargs) return cls._instances[cls] - class Singleton(_Singleton('SingletonMeta', (object,), {})): pass - SIGNALS_TO_NAMES_DICT = dict((getattr(signal, n), n) for n in dir(signal) if n.startswith('SIG') and '_' not in n) @@ -115,27 +110,47 @@ except NameError: # # Global variable. Stores which process group should be killed (or None otherwise) -running_pgids = list() +running_pids = list() -def kill_process_group(pgid): - if pgid is None: # Nobody to kill. We don't know who to kill on windows, or we don't have anyone to kill on signal handler +# Tests whether the process is dead already +def process_is_dead(pid): + try: + os.kill(pid, 0) + except ProcessLookupError: + return True + except OSError as err: + if err.errno == errno.ESRCH: # ESRCH == No such process. The process is now dead + return True + return False + +# This function send TERM signal + KILL signal after 0.2s to the group of the specified process +def kill_process_group(pid): + if pid is None: # Nobody to kill. We don't know who to kill on windows, or we don't have anyone to kill on signal handler return - # print("Kill process group {}".format(pgid)) + try: + pgid = os.getpgid(pid) + except: + # os.getpgid failed. Ok, don't cleanup. + return + try: os.killpg(pgid, signal.SIGTERM) + if process_is_dead(pid): + return + time.sleep(0.2) + os.killpg(pgid, signal.SIGKILL) except OSError: # os.killpg failed. OK. Some subprocesses may still be running. pass - def signal_handler(signal, frame): print("Caught signal {}".format(SIGNALS_TO_NAMES_DICT[signal])) - global running_pgids - running_pgids_copy = running_pgids # Just in case of interthread conflicts. - for pgid in running_pgids_copy: - kill_process_group(pgid) - running_pgids.clear() + global running_pids + running_pids_copy = running_pids # Just in case of interthread conflicts. + for pid in running_pids_copy: + kill_process_group(pid) + running_pids.clear() tesh_exit(5) @@ -217,7 +232,7 @@ class Cmd(object): self.cwd = os.getcwd() self.ignore_output = False - self.expect_return = 0 + self.expect_return = [0] self.output_display = False @@ -293,8 +308,8 @@ class Cmd(object): vdefault = m.group(2) if vname in os.environ: return "$" + vname - else: - return vdefault + return vdefault + self.args = re.sub(r"\${(\w+):=([^}]*)}", replace_perl_variables, self.args) # replace bash environment variables ($THINGS) to their values @@ -328,8 +343,8 @@ class Cmd(object): args = shlex.split(self.args) - global running_pgids - local_pgid = None + global running_pids + local_pid = None global return_code try: @@ -344,13 +359,9 @@ class Cmd(object): stderr=subprocess.STDOUT, universal_newlines=True, preexec_fn=preexec_function) - try: - if not isWindows(): - local_pgid = os.getpgid(proc.pid) - running_pgids.append(local_pgid) - except OSError: - # os.getpgid failed. OK. No cleanup. - pass + if not isWindows(): + local_pid = proc.pid + running_pids.append(local_pid) except PermissionError: logs.append("[{file}:{number}] Cannot start '{cmd}': The binary is not executable.".format( file=FileReader().filename, number=self.linenumber, cmd=args[0])) @@ -381,14 +392,14 @@ class Cmd(object): cmdName = FileReader().filename + ":" + str(self.linenumber) try: (stdout_data, stderr_data) = proc.communicate("\n".join(self.input_pipe), self.timeout) - local_pgid = None + local_pid = None timeout_reached = False except subprocess.TimeoutExpired: timeout_reached = True logs.append("Test suite `{file}': NOK (<{cmd}> timeout after {timeout} sec)".format( file=FileReader().filename, cmd=cmdName, timeout=self.timeout)) - running_pgids.remove(local_pgid) - kill_process_group(local_pgid) + running_pids.remove(local_pid) + kill_process_group(local_pid) # Try to get the output of the timeout process, to help in debugging. try: (stdout_data, stderr_data) = proc.communicate(timeout=1) @@ -410,7 +421,7 @@ class Cmd(object): logs.append("(ignoring the output of <{cmd}> as requested)".format(cmd=cmdName)) else: stdouta = stdout_data.split("\n") - while len(stdouta) > 0 and stdouta[-1] == "": + while stdouta and stdouta[-1] == "": del stdouta[-1] stdouta = self.remove_ignored_lines(stdouta) stdcpy = stdouta[:] @@ -430,7 +441,7 @@ class Cmd(object): lineterm="", fromfile='expected', tofile='obtained')) - if len(diff) > 0: + if diff: logs.append("Output of <{cmd}> mismatch:".format(cmd=cmdName)) if self.sort >= 0: # If sorted, truncate the diff output and show the unsorted version difflen = 0 @@ -454,7 +465,7 @@ class Cmd(object): if TeshState().keep: f = open('obtained', 'w') obtained = stdout_data.split("\n") - while len(obtained) > 0 and obtained[-1] == "": + while obtained and obtained[-1] == "": del obtained[-1] obtained = self.remove_ignored_lines(obtained) for line in obtained: @@ -470,7 +481,7 @@ class Cmd(object): print('\n'.join(logs)) return - if proc.returncode != self.expect_return: + if not proc.returncode in self.expect_return: if proc.returncode >= 0: logs.append("Test suite `{file}': NOK (<{cmd}> returned code {code})".format( file=FileReader().filename, cmd=cmdName, code=proc.returncode)) @@ -497,14 +508,12 @@ class Cmd(object): def can_run(self): return self.args is not None - ############## # # Main # # - if __name__ == '__main__': signal.signal(signal.SIGINT, signal_handler) signal.signal(signal.SIGTERM, signal_handler) @@ -592,7 +601,7 @@ if __name__ == '__main__': line = f.readfullline() while line is not None: # print(">>============="+line+"==<<") - if len(line) == 0: + if not line: #print ("END CMD block") if cmd.run_if_possible(): cmd = Cmd() @@ -631,16 +640,17 @@ if __name__ == '__main__': cmd.output_display = True cmd.ignore_output = True elif line[0:15] == "! expect return": - cmd.expect_return = int(line[16:]) + cmd.expect_return = [int(line[16:])] #print("expect return "+str(int(line[16:]))) elif line[0:15] == "! expect signal": - sig = line[16:] - # get the signal integer value from the signal module - if sig not in signal.__dict__: - fatal_error("unrecognized signal '" + sig + "'") - sig = int(signal.__dict__[sig]) - # popen return -signal when a process ends with a signal - cmd.expect_return = -sig + cmd.expect_return = [] + for sig in (line[16:]).split("|"): + # get the signal integer value from the signal module + if sig not in signal.__dict__: + fatal_error("unrecognized signal '" + sig + "'") + sig = int(signal.__dict__[sig]) + # popen return -signal when a process ends with a signal + cmd.expect_return.append(-sig) elif line[0:len("! timeout ")] == "! timeout ": if "no" in line[len("! timeout "):]: cmd.timeout = None