fix(system_usage_monitor): change the node search method (#137)

* Fixed the node search method Signed-off-by: Shintaro Sakoda <[email protected]> * Added a comment Signed-off-by: Shintaro Sakoda <[email protected]> --------- Signed-off-by: Shintaro Sakoda <[email protected]>
autowarefoundation · Oct 23, 2024 · af16f8c · af16f8c
1 parent 7eb78cf
commit af16f8c
Showing 1 changed file with 27 additions and 8 deletions.
diff --git a/common/autoware_debug_tools/autoware_debug_tools/system_usage_monitor.py b/common/autoware_debug_tools/autoware_debug_tools/system_usage_monitor.py
@@ -44,13 +44,32 @@ def get_system_usage(pid, system_usages, interval):
         )
         if component == "":
             component = "others"
-        container = process_name.split("__node:=", 1)[1].split(" ")[0]
-        system_usages[pid] = {
-            "component": component,
-            "container": container,
-            "cpu_usage": cpu_usage,
-            "memory_usage": memory_usage,
-        }
+
+        elements = process_name.split("__node:=", 1)
+
+        # If `process_name`` can be split by "__node:=", get the container name from the second element.
+        # Otherwise, get the container name from the file name in the first element.
+        # An example of `process_name` is as follows:
+        # `/path/to/autoware/install/topic_state_monitor/lib/topic_state_monitor/topic_state_monitor_node
+        #     --ros-args -r __node:=topic_state_monitor_scenario_planning_trajectory -r __ns:=/system ...`
+        if len(elements) < 2:
+            container = process_name.split(" ")[0].split("/")[-1]
+            if container.startswith("autoware_"):
+                container = container.split("_", 1)[1]
+            system_usages[pid] = {
+                "component": component,
+                "container": container,
+                "cpu_usage": cpu_usage,
+                "memory_usage": memory_usage,
+            }
+        else:
+            container = elements[1].split(" ")[0]
+            system_usages[pid] = {
+                "component": component,
+                "container": container,
+                "cpu_usage": cpu_usage,
+                "memory_usage": memory_usage,
+            }
     except (psutil.NoSuchProcess, psutil.AccessDenied, psutil.ZombieProcess, IndexError):
         pass
 
@@ -128,7 +147,7 @@ def main(args=None):
     system_usages = {}
     while True:
         # create thread to calculate cpu usage of each process since it takes time
-        process_name_keyword = "__node:="
+        process_name_keyword = "--ros-args"
         threads = []
         for proc in psutil.process_iter(["pid", "name", "cpu_percent", "cmdline"]):
             try: