fix(system_monitor): output command line (autowarefoundation#5430) (#…

…1057) * fix(system_monitor): output command line * style(pre-commit): autofix --------- Signed-off-by: takeshi.iwanari <[email protected]> Co-authored-by: takeshi-iwanari <[email protected]> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
tier4 · Dec 6, 2023 · 52f1ab1 · 52f1ab1
1 parent 3f0c70d
commit 52f1ab1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/system/system_monitor/include/system_monitor/process_monitor/process_monitor.hpp b/system/system_monitor/include/system_monitor/process_monitor/process_monitor.hpp
@@ -94,7 +94,7 @@ class ProcessMonitor : public rclcpp::Node
    * @param [out] command output command line
    * @return true if success to get command line name
    */
-  bool getCommandLineFromPiD(const std::string & pid, std::string * command);
+  bool getCommandLineFromPiD(const std::string & pid, std::string & command);
 
   /**
    * @brief get top-rated processes

diff --git a/system/system_monitor/src/process_monitor/process_monitor.cpp b/system/system_monitor/src/process_monitor/process_monitor.cpp
@@ -414,14 +414,22 @@ void ProcessMonitor::getHighMemoryProcesses(const std::string & output)
   getTopratedProcesses(&memory_tasks_, &p2);
 }
 
-bool ProcessMonitor::getCommandLineFromPiD(const std::string & pid, std::string * command)
+bool ProcessMonitor::getCommandLineFromPiD(const std::string & pid, std::string & command)
 {
   std::string commandLineFilePath = "/proc/" + pid + "/cmdline";
-  std::ifstream commandFile(commandLineFilePath);
+  std::ifstream commandFile(commandLineFilePath, std::ios::in | std::ios::binary);
+
   if (commandFile.is_open()) {
-    std::getline(commandFile, *command);
+    std::vector<uint8_t> buffer;
+    std::copy(
+      std::istream_iterator<uint8_t>(commandFile), std::istream_iterator<uint8_t>(),
+      std::back_inserter(buffer));
     commandFile.close();
-    return true;
+    std::replace(
+      buffer.begin(), buffer.end(), '\0',
+      ' ');  // 0x00 is used as delimiter in /cmdline instead of 0x20 (space)
+    command = std::string(buffer.begin(), buffer.end());
+    return (buffer.size() > 0) ? true : false;  // cmdline is empty if it is kernel process
   } else {
     return false;
   }
@@ -478,7 +486,7 @@ void ProcessMonitor::getTopratedProcesses(
     std::string program_name;
     std::getline(stream, program_name);
 
-    bool flag_find_command_line = getCommandLineFromPiD(info.processId, &info.commandName);
+    bool flag_find_command_line = getCommandLineFromPiD(info.processId, info.commandName);
 
     if (!flag_find_command_line) {
       info.commandName = program_name;  // if command line is not found, use program name instead