Updates requested in PR diffblue#50: using start_time instead of prof = { "duration": time.time() }.

Author: marek-trtik

security-scanner/analyser.py

@@ -38,7 +38,9 @@ def run_security_analyser(
         results_dir,
         temp_root_dir
         ):
-    prof = { "duration": time.time() }
+    prof = {}
+    prof_start_time = time.time()
+
     if not os.path.exists(results_dir):
         os.makedirs(results_dir)
 
@@ -93,15 +95,16 @@ def run_security_analyser(
         + "'./" + os.path.relpath(root_jar,results_dir) + "' "
         "--security-scanner '" + os.path.relpath(root_config_json_fname,results_dir) + "' "
         )
-    prof["calling_goto_analyser"] = { "duration": time.time() }
+    prof["calling_goto_analyser"] = {}
+    prof_calling_goto_analyser_start_time = time.time()
     print("Invoking 'security-analyser' ...")
     if verbosity >= 9:
         print("CWD: " + results_dir)
         print("CMD: " + command)
     os.system(command)
-    prof["calling_goto_analyser"]["duration"] = time.time() - prof["calling_goto_analyser"]["duration"]
+    prof["calling_goto_analyser"]["duration"] = time.time() - prof_calling_goto_analyser_start_time
     os.chdir(old_cwd)
-    prof["duration"] = time.time() - prof["duration"]
+    prof["duration"] = time.time() - prof_start_time
 
     return prof
 
@@ -112,13 +115,14 @@ def run_program_slicing(
         timeout,
         verbosity
         ):
-    prof = { "duration": time.time() }
+    prof = {}
+    prof_start_time = time.time()
 
     # TODO: once the slicer in "goto-instrument" tool is available, then provide proper implementation here!
     #       Until then we assume the slicing removes nothing from the instrumented program.
     shutil.copyfile(json_cfg_fname, os.path.join(os.path.dirname(json_cfg_fname),"sliced_goto_programs.json"))
 
-    prof["duration"] = time.time() - prof["duration"]
+    prof["duration"] = time.time() - prof_start_time
     return prof
 
 
@@ -157,7 +161,8 @@ def run_search_for_error_traces(
         timeout,
         verbosity
         ):
-    prof = { "duration": time.time() }
+    prof = {}
+    prof_start_time = time.time()
     if not os.path.exists(results_dir):
         os.makedirs(results_dir)
 
@@ -176,13 +181,14 @@ def run_search_for_error_traces(
             "--verbosity " + str(1) + " "
             "> \"cbmc_results.json\""
             )
-        prof["calling_cbmc"] = { "duration": time.time() }
+        prof["calling_cbmc"] = {}
+        prof_calling_cbmc_start_time = time.time()
         print("Invoking 'cbmc' ...")
         if verbosity >= 9:
             print("CWD: " + results_dir)
             print("CMD: " + command)
         os.system(command)
-        prof["calling_cbmc"]["duration"] = time.time() - prof["calling_cbmc"]["duration"]
+        prof["calling_cbmc"]["duration"] = time.time() - prof_calling_cbmc_start_time
         os.chdir(old_cwd)
 
         with open(os.path.join(results_dir,"cbmc_results.json")) as data_file:
@@ -203,7 +209,7 @@ def run_search_for_error_traces(
     with open(os.path.join(results_dir, "error_traces.json"), "w") as traces_file:
         traces_file.write(json.dumps(traces_list, sort_keys=True, indent=4))
 
-    prof["duration"] = time.time() - prof["duration"]
+    prof["duration"] = time.time() - prof_start_time
     return prof
 
 

security-scanner/mkbench.py

@@ -9,16 +9,18 @@ def __get_my_dir(): return os.path.dirname(os.path.realpath(__file__))
 
 
 def collect_java_files(app_build_dir,extension_text,output_list):
-    prof = { "duration": time.time() }
+    prof = {}
+    prof_start_time = time.time()
     for root, dirnames, filenames in os.walk(app_build_dir):
         for filename in fnmatch.filter(filenames, "*." + extension_text):
             output_list.append(os.path.abspath(os.path.join(root,filename)))
-    prof["duration"] = time.time() - prof["duration"]
+    prof["duration"] = time.time() - prof_start_time
     return prof
 
 
 def unpack_java_package(pathname,unpack_dir):
-    prof = { "duration": time.time() }
+    prof = {}
+    prof_start_time = time.time()
     if not os.path.exists(unpack_dir):
         os.makedirs(unpack_dir)
     old_cwd = os.getcwd()
@@ -29,12 +31,13 @@ def unpack_java_package(pathname,unpack_dir):
         pathname
         )
     os.chdir(old_cwd)
-    prof["duration"] = time.time() - prof["duration"]
+    prof["duration"] = time.time() - prof_start_time
     return prof
 
 
 def pack_classes_to_jar(classes_dir,dst_file):
-    prof = { "duration": time.time() }
+    prof = {}
+    prof_start_time = time.time()
     if not os.path.exists(os.path.dirname(dst_file)):
         os.makedirs(os.path.dirname(dst_file))
     old_cwd = os.getcwd()
@@ -44,7 +47,7 @@ def pack_classes_to_jar(classes_dir,dst_file):
         + dst_file + "\" ."
         )
     os.chdir(old_cwd)
-    prof["duration"] = time.time() - prof["duration"]
+    prof["duration"] = time.time() - prof_start_time
     return prof
 
 
@@ -100,11 +103,13 @@ def is_class_modeled(pathname):
 
 
 def install_class_file(pathname,output_dir,class_temp_dir):
-    prof = { "duration": time.time() }
+    prof = {}
+    prof_start_time = time.time()
     print("   " + pathname)
-    prof["fullname"] = { "duration": time.time() }
+    prof["fullname"] = {}
+    prof_fullname_start_time = time.time()
     packages_classname = compute_fullname_of_class(pathname,class_temp_dir)
-    prof["fullname"]["duration"] = time.time() - prof["fullname"]["duration"]
+    prof["fullname"]["duration"] = time.time() - prof_fullname_start_time
     if packages_classname is None:
         print("FAIL: Cannot read full class name (including packages) of the class file: " + pathname)
         prof["duration"] = time.time() - prof["duration"]
@@ -120,12 +125,13 @@ def install_class_file(pathname,output_dir,class_temp_dir):
     else:
         shutil.copyfile(pathname,class_pathname)
 
-    prof["duration"] = time.time() - prof["duration"]
+    prof["duration"] = time.time() - prof_start_time
     return prof
 
 
 def install_jar_file(pathname,output_dir,temp_dir,class_temp_dir):
-    prof = { "duration": time.time() }
+    prof = {}
+    prof_start_time = time.time()
 
     prof["unpack"] = unpack_java_package(pathname,temp_dir)
 
@@ -140,12 +146,13 @@ def install_jar_file(pathname,output_dir,temp_dir,class_temp_dir):
         prof["install"]["duration"] += prof_install["duration"]
         prof["install"]["fullname"]["duration"] += prof_install["fullname"]["duration"]
 
-    prof["duration"] = time.time() - prof["duration"]
+    prof["duration"] = time.time() - prof_start_time
     return prof
 
 
 def install_war_file(pathname,output_dir,temp_dir,class_temp_dir):
-    prof = { "duration": time.time() }
+    prof = {}
+    prof_start_time = time.time()
 
     war_temp_dir = os.path.join(temp_dir,"WAR")
     prof["unpack"] = unpack_java_package(pathname,war_temp_dir)
@@ -176,12 +183,13 @@ def install_war_file(pathname,output_dir,temp_dir,class_temp_dir):
         prof["install"]["duration"] += prof_install["install"]["duration"]
         prof["install"]["fullname"]["duration"] += prof_install["install"]["fullname"]["duration"]
 
-    prof["duration"] = time.time() - prof["duration"]
+    prof["duration"] = time.time() - prof_start_time
     return prof
 
 
 def build_classes_configuration(app_binary_dir,output_dir,temp_dir):
-    prof = { "duration": time.time() }
+    prof = {}
+    prof_start_time = time.time()
 
     prof["unpack"] = {"duration": 0.0}
     prof["collect"] = {"duration": 0.0}
@@ -229,5 +237,5 @@ def build_classes_configuration(app_binary_dir,output_dir,temp_dir):
         prof["install"]["duration"] += prof_install["install"]["duration"]
         prof["install"]["fullname"]["duration"] += prof_install["install"]["fullname"]["duration"]
 
-    prof["duration"] = time.time() - prof["duration"]
+    prof["duration"] = time.time() - prof_start_time
     return prof

security-scanner/run.py

@@ -63,7 +63,8 @@ def __parse_cmd_line():
 def evaluate(cmdline):
     print("Starting analysis of Java web application '" + cmdline.name + "'.")
 
-    prof = { "duration": time.time(), "analysis_per_root_fn": [], "benchmark_name": cmdline.name }
+    prof = { "analysis_per_root_fn": [], "benchmark_name": cmdline.name }
+    prof_start_time = time.time()
 
     if cmdline.rebuild:
         print("First performing cleanup.")
@@ -117,7 +118,8 @@ def evaluate(cmdline):
         )
 
     print("Building performance plots.")
-    prof_plots = {"duration": time.time()}
+    prof_plots = {}
+    prof_plots_start_time = time.time()
 
     stats_json_fname = os.path.abspath(os.path.join(cmdline.results_dir,"statistics/JSON/statistics.json"))
     stats_plots_dir = os.path.abspath(os.path.join(cmdline.results_dir,"statistics/plots"))
@@ -127,13 +129,13 @@ def evaluate(cmdline):
 
     mkplot.make_plots(stats_json_fname,stats_plots_dir,True)
 
-    prof_plots["duration"] = time.time() - prof_plots["duration"]
+    prof_plots["duration"] = time.time() - prof_plots_start_time
     prof["plots_build"] = prof_plots
 
     overall_perf_fname = os.path.abspath(os.path.join(cmdline.results_dir,"overall_performance.json"))
     print("Saving performance data in JSON format to: " + overall_perf_fname)
 
-    prof["duration"] = time.time() - prof["duration"]
+    prof["duration"] = time.time() - prof_start_time
 
     with open(overall_perf_fname,"w") as overall_perf_file:
         overall_perf_file.write(json.dumps(prof,sort_keys=True,indent=4))