Merge branch 'feature/wfbench_updates'

Author: tainagdcoleman

bin/cpu-benchmark

@@ -113,6 +113,7 @@ def cpu_mem_benchmark(cpu_threads: Optional[int] = 5,
     cpu_work_per_thread = int(cpu_work / cpu_threads)
 
     cpu_procs = []
+    mem_procs = []
     cpu_prog = [
         f"{this_dir.joinpath('cpu-benchmark')}", f"{cpu_work_per_thread}"]
     mem_prog = ["stress-ng", "--vm", f"{mem_threads}",
@@ -125,11 +126,11 @@ def cpu_mem_benchmark(cpu_threads: Optional[int] = 5,
         cpu_procs.append(cpu_proc)
 
     if mem_threads > 0:
-        mem_proc = subprocess.Popen(mem_prog)
+        mem_proc = subprocess.Popen(mem_prog,   preexec_fn=os.setsid)
         if core:
             os.sched_setaffinity(mem_proc.pid, {core})
-
-    return cpu_procs
+        mem_procs.append(mem_proc)
+    return cpu_procs, mem_procs
 
 
 def io_read_benchmark_user_input_data_size(inputs,
@@ -294,29 +295,34 @@ def main():
             print(f"[WfBench]  {args.name} acquired core {core}")
 
         mem_threads=int(10 - 10 * args.percent_cpu)
-        cpu_procs = cpu_mem_benchmark(cpu_threads=int(10 * args.percent_cpu),
-                                    mem_threads=mem_threads,
-                                    cpu_work=sys.maxsize if args.time else int(args.cpu_work),
-                                    core=core,
-                                    total_mem=args.mem)
-        
+        cpu_procs, mem_procs = cpu_mem_benchmark(cpu_threads=int(10 * args.percent_cpu),
+                                                mem_threads=mem_threads,
+                                                cpu_work=sys.maxsize if args.time else int(args.cpu_work),
+                                                core=core,
+                                                total_mem=args.mem)
+                    
         procs.extend(cpu_procs)
-
         if args.time:
             time.sleep(int(args.time))
             for proc in procs:
                 os.killpg(os.getpgid(proc.pid), signal.SIGTERM)
         else:
             for proc in procs:
-                # if isinstance(proc, multiprocessing.Process):
-                #     proc.join()
                 if isinstance(proc, subprocess.Popen):
                     proc.wait()
         if io_proc is not None and io_proc.is_alive():
             io_proc.terminate()
             io_proc.join()
-        mem_kill = subprocess.Popen(["killall", "stress-ng"])
-        mem_kill.wait()
+
+        
+        for mem_proc in mem_procs:
+            try:
+                os.kill(mem_proc.pid, signal.SIGKILL)  # Force kill if SIGTERM fails
+            except subprocess.TimeoutExpired:
+                print("Memory process did not terminate; force-killing.")
+        # As a fallback, use pkill if any remaining instances are stuck
+        subprocess.Popen(["pkill", "-f", "stress-ng"]).wait()
+
         print("[WfBench] Completed CPU and Memory Benchmarks!\n")
 
     # NOTE: If you would like to run only IO add time.sleep(2)