Merge branch 'master' into fix_popen_ref_leak

Author: mlim19

gprofiler/hw_metrics.py

@@ -57,6 +57,7 @@ def __init__(
         perfspect_path: Optional[Path] = None,
         perfspect_duration: int = 60,
         polling_rate_seconds: int = DEFAULT_POLLING_INTERVAL_SECONDS,
+        verbose: bool = False,
     ):
         self._polling_rate_seconds = polling_rate_seconds
         self._stop_event = stop_event
@@ -65,6 +66,7 @@ def __init__(
         self._ps_process: Optional[subprocess.Popen[bytes]] = None
         self._perfspect_path: Optional[Path] = perfspect_path
         self._perfspect_duration = perfspect_duration
+        self._verbose = verbose
 
         self._ps_raw_csv_filename = PERFSPECT_DATA_DIRECTORY + "/" + platform.node() + "_metrics.csv"
         self._ps_summary_csv_filename = PERFSPECT_DATA_DIRECTORY + "/" + platform.node() + "_metrics_summary.csv"
@@ -93,7 +95,17 @@ def start(self) -> None:
             PERFSPECT_DATA_DIRECTORY,
         ]
 
+        # Add --debug if verbose is enabled
+        if self._verbose:
+            ps_cmd.append("--debug")
+
         self._ps_process = subprocess.Popen(ps_cmd, stdout=subprocess.PIPE)
+        Thread(target=self._reap_ps_process, daemon=True).start()
+
+    def _reap_ps_process(self) -> None:
+        if self._ps_process is not None:
+            self._ps_process.wait()
+            self._ps_process = None
 
     def stop(self) -> None:
         if self._ps_process:

gprofiler/main.py

@@ -126,6 +126,7 @@ def __init__(
         heartbeat_file_path: Optional[Path] = None,
         perfspect_path: Optional[Path] = None,
         perfspect_duration: int = 60,
+        verbose: bool = False,
     ):
         self._output_dir = output_dir
         self._flamegraph = flamegraph
@@ -182,6 +183,7 @@ def __init__(
                 self._profiler_state.stop_event,
                 perfspect_path=self._perfspect_path,
                 perfspect_duration=self._perfspect_duration,
+                verbose=verbose,
             )
         else:
             self._hw_metrics_monitor = NoopHWMetricsMonitor()
@@ -1219,15 +1221,16 @@ def main() -> None:
             duration=args.duration,
             profile_api_version=args.profile_api_version,
             profiling_mode=args.profiling_mode,
-            collect_hw_metrics=args.collect_hw_metrics,
+            collect_hw_metrics=getattr(args, "collect_hw_metrics", False),
             profile_spawned_processes=args.profile_spawned_processes,
             remote_logs_handler=remote_logs_handler,
             controller_process=controller_process,
             processes_to_profile=processes_to_profile,
             external_metadata_path=external_metadata_path,
             heartbeat_file_path=heartbeat_file_path,
-            perfspect_path=args.tool_perfspect_path,
-            perfspect_duration=args.tool_perfspect_duration,
+            perfspect_path=perfspect_path,
+            perfspect_duration=getattr(args, "tool_perfspect_duration", 60),
+            verbose=args.verbose,
         )
         logger.info("gProfiler initialized and ready to start profiling")
         if args.continuous: