Requests from the PR

Rename of key of slicer profile data; Introduction and use of PushCwd class.

Author: marek-trtik

security-scanner/analyser.py

@@ -1,7 +1,7 @@
 import os
 import time
 import json
-import shutil
+import utility
 
 
 def __get_my_dir(): return os.path.dirname(os.path.realpath(__file__))
@@ -109,7 +109,7 @@ def run_program_slicing(
         timeout,
         verbosity
         ):
-    prof = { "calling_goto_instrument": [] }
+    prof = {"calling_slicer": []}
     prof_start_time = time.time()
 
     with open(json_cfg_fname) as data_file:
@@ -121,8 +121,6 @@ def run_program_slicing(
         src_idx_name = int(src_plain_fname[src_plain_fname.rfind("_")+1:])
         dst_goto_program_fname = os.path.join(results_dir, "sliced_goto_program_" + str(src_idx_name) + ".gbf")
 
-        old_cwd = os.getcwd()
-        os.chdir(results_dir)
         command = (
             get_goto_instrument_pathname() + " " +
             "--full-slice " +
@@ -132,16 +130,16 @@ def run_program_slicing(
             )
         prof_calling_goto_instrument_start_time = time.time()
         print("Invoking 'goto-instrument' ...")
-        if verbosity >= 9:
-            print("CWD: " + results_dir)
-            print("CMD: " + command)
-        # TODO: Uncomment the next line when the slicer is functional!
-        # os.system(command)
-        prof["calling_goto_instrument"].append({
+        with utility.PushCwd(results_dir) as cwd:
+            if verbosity >= 9:
+                print("CWD: " + cwd.get())
+                print("CMD: " + command)
+            # TODO: Uncomment the next line when the slicer is functional!
+            # os.system(command)
+        prof["calling_slicer"].append({
             "gbf_idx": src_idx_name,
             "duration": time.time() - prof_calling_goto_instrument_start_time
             })
-        os.chdir(old_cwd)
 
         result.append(cfg.copy())
         # TODO: Uncomment the next line when the slicer is functional!

security-scanner/utility.py

@@ -0,0 +1,19 @@
+import os
+
+
+class PushCwd:
+    def __init__(self, dirname):
+        self._cwd = os.path.realpath(dirname)
+        self._old_cwd = None
+
+    def __enter__(self):
+        os.chdir(self._cwd)
+        self._old_cwd = os.getcwd()
+        return self
+
+    def __exit__(self, _, __, ___):
+        if self._old_cwd is not None:
+            os.chdir(self._old_cwd)
+
+    def get(self):
+        return self._cwd