fixup! Implement Runtime wrapper

[deliverable/lttng-ivc.git] / lttng_ivc / utils / runtime.py

diff --git a/lttng_ivc/utils/runtime.py b/lttng_ivc/utils/runtime.py
index 264addc67f8667263071605658253faddaaad571..0ec87272cf6426ab133e264c0210ae2847f39b12 100644 (file)
--- a/lttng_ivc/utils/runtime.py
+++ b/lttng_ivc/utils/runtime.py
@@ -7,6 +7,7 @@ import logging
 import shutil
 import contextlib
 import pprint
+import signal
 
 from tempfile import TemporaryDirectory
 
@@ -141,7 +142,7 @@ class Runtime(object):
         _logger.debug("Spawned sub pid: {} args: {} stdout: {} stderr{}".format(p.pid, p.args, out_path, err_path))
         return tmp_id
 
-    def run(self, command_line, cwd=None, check_return=True, ld_preload="", classpath=""):
+    def run(self, command_line, cwd=None, check_return=True, ld_preload="", classpath="", timeout=None):
         """
         Run the command and return a tuple of a (CompletedProcess, stdout_path,
         stderr_path). The subprocess is already executed and returned. The
@@ -173,7 +174,8 @@ class Runtime(object):
             for key, value in env.items():
                 env_out.write('{}={}\n'.format(key, value))
 
-        cp = subprocess.run(args, stdout=stdout, stderr=stderr, env=env, cwd=cwd)
+        cp = subprocess.run(args, stdout=stdout, stderr=stderr, env=env,
+                            cwd=cwd, timeout=timeout)
         _logger.debug("Command #{} args: {} stdout: {} stderr{}".format(tmp_id, cp.args, out_path, err_path))
 
         # Add to the global log file. This can help a little. Leave the other
@@ -267,13 +269,7 @@ class Runtime(object):
 
     def close(self):
         for key, subp in self.__subprocess.items():
-            subp.terminate()
-        for key, subp in self.__subprocess.items():
-            # TODO move timeout to settings
-            subp.wait(timeout=60)
-        for key, (stdout, stderr) in self.__stdout_stderr.items():
-            stdout.close()
-            stderr.close()
+            self.subprocess_kill(key)
 
         # Always try to remove test module but do not perform check on return
         # value.