Adds core assignment to processes

Author: Taina Coleman

wfcommons/wfperf/data_gen.py

@@ -13,6 +13,7 @@ def generate_sys_data(num_files: int, file_total_size: int, test_mode: str = "se
             f"--file-total-size={file_total_size}G",
             f"--file-test-mode={test_mode}"
         ]
+    print(" ".join(["sysbench","fileio", *params,"prepare"]))
     proc = subprocess.Popen(["sysbench","fileio", *params,"prepare"], stdout=subprocess.PIPE)
     proc.wait()
     out, _ = proc.communicate()

wfcommons/wfperf/perf.py

@@ -85,7 +85,7 @@ def create(self,
 
         if verbose:
             print("Generating system files.")
-        generate_sys_data(num_sys_files, data_footprint)
+        generate_sys_data(num_sys_files, file_size)
 
 
         with open(f'{save_dir.joinpath(workflow.name)}.json', 'w') as fp:

wfcommons/wfperf/wfperf_benchmark.py

@@ -43,31 +43,35 @@ def main():
         proc = subprocess.Popen(["sysbench", "fileio", *sysbench_file_input_args, "cleanup"], stdout=fp, stderr=fp)
         proc.wait()
 
-    with save_dir.joinpath(f"{name}_cpu.txt").open("w+") as fp_cpu, save_dir.joinpath(f"{name}_memory.txt").open("w+") as fp_mem:
+    with save_dir.joinpath(f"{name}_cpu.txt").open("w+") as fp_cpu, save_dir.joinpath(f"{name}_memory.txt").open("w+") as fp_mem, save_dir.joinpath(f"{name}_ps_log.txt").open("w+") as fp_ps:
         num_cores = os.cpu_count()
         cpu_threads = int(args.percent_cpu*10)
         mem_threads = int(10 - cpu_threads)
 
         print(cpu_threads, mem_threads)
 
-        for _ in range(num_cores):
+        for i in range(num_cores):
             print("Starting CPU benchmark...")
-            sysbench_cpu_args = [arg for arg in other if arg.startswith("--cpu")] + [f"--threads={cpu_threads}"]
+            sysbench_cpu_args = [arg for arg in other if arg.startswith("--cpu")] + [f"--time={args.time}", f"--threads={cpu_threads}"]
             proc_cpu = subprocess.Popen(
                 [
-                    "time", "timeout", f"{args.time}s", "sysbench", "cpu", 
+                    "sysbench", "cpu", "--forced-shutdown=0", #time", "timeout", f"{args.time}s",
                     *sysbench_cpu_args, "run"
                 ], 
                 stdout=fp_cpu, stderr=fp_cpu
             )
+            os.sched_setaffinity(proc_cpu.pid, {i})
 
             print("Starting Memory benchmark...")     
             sysbench_mem_args = [arg for arg in other if arg.startswith("--memory")] + [f"--time={args.time}", f"--threads={mem_threads}"]
             proc_mem = subprocess.Popen(
-                ["time", "sysbench", "memory", "run",*sysbench_mem_args], 
+                ["sysbench", "memory", "run",*sysbench_mem_args], #"time",  
                 stdout=fp_mem, stderr=fp_mem
             )
-            
+            os.sched_setaffinity(proc_mem.pid, {i})
+
+        proc = subprocess.Popen(["ps", "-o","pid,psr,comm,thcount"], stdout=fp_ps)
+        proc.wait()    
         proc_cpu.wait()
         proc_mem.wait()