Revert "fix(system_monitor): extend command line to display (autoware…

…foundation#4553)"

This reverts commit 3bf4673.

system/system_monitor/include/system_monitor/process_monitor/diag_task.hpp

@@ -24,25 +24,6 @@
 
 #include <string>
 
-/**
- * @brief Struct for storing process information
- */
-struct ProcessInfo
-{
-  std::string processId;
-  std::string userName;
-  std::string priority;
-  std::string niceValue;
-  std::string virtualImage;
-  std::string residentSize;
-  std::string sharedMemSize;
-  std::string processStatus;
-  std::string cpuUsage;
-  std::string memoryUsage;
-  std::string cpuTime;
-  std::string commandName;
-};
-
 class DiagTask : public diagnostic_updater::DiagnosticTask
 {
 public:
@@ -65,18 +46,18 @@ class DiagTask : public diagnostic_updater::DiagnosticTask
     if (level_ != DiagStatus::OK) {
       stat.add("content", content_);
     } else {
-      stat.add("COMMAND", info_.commandName);
-      stat.add("%CPU", info_.cpuUsage);
-      stat.add("%MEM", info_.memoryUsage);
-      stat.add("PID", info_.processId);
-      stat.add("USER", info_.userName);
-      stat.add("PR", info_.priority);
-      stat.add("NI", info_.niceValue);
-      stat.add("VIRT", info_.virtualImage);
-      stat.add("RES", info_.residentSize);
-      stat.add("SHR", info_.sharedMemSize);
-      stat.add("S", info_.processStatus);
-      stat.add("TIME+", info_.cpuTime);
+      stat.add("COMMAND", command_);
+      stat.add("%CPU", cpu_);
+      stat.add("%MEM", mem_);
+      stat.add("PID", pid_);
+      stat.add("USER", user_);
+      stat.add("PR", pr_);
+      stat.add("NI", ni_);
+      stat.add("VIRT", virt_);
+      stat.add("RES", res_);
+      stat.add("SHR", shr_);
+      stat.add("S", s_);
+      stat.add("TIME+", time_);
     }
     stat.summary(level_, message_);
   }
@@ -104,17 +85,95 @@ class DiagTask : public diagnostic_updater::DiagnosticTask
   }
 
   /**
-   * @brief Set process information
-   * @param [in] info Process information
+   * @brief set process id
+   * @param [in] pid process id
+   */
+  void setProcessId(const std::string & pid) { pid_ = pid; }
+
+  /**
+   * @brief set user name
+   * @param [in] user user name
+   */
+  void setUserName(const std::string & user) { user_ = user; }
+
+  /**
+   * @brief set priority
+   * @param [in] pr priority
+   */
+  void setPriority(const std::string & pr) { pr_ = pr; }
+
+  /**
+   * @brief set nice value
+   * @param [in] ni nice value
+   */
+  void setNiceValue(const std::string & ni) { ni_ = ni; }
+
+  /**
+   * @brief set virtual image
+   * @param [in] virt virtual image
+   */
+  void setVirtualImage(const std::string & virt) { virt_ = virt; }
+
+  /**
+   * @brief set resident size
+   * @param [in] res resident size
    */
-  void setProcessInformation(const struct ProcessInfo & info) { info_ = info; }
+  void setResidentSize(const std::string & res) { res_ = res; }
+
+  /**
+   * @brief set shared mem size
+   * @param [in] shr shared mem size
+   */
+  void setSharedMemSize(const std::string & shr) { shr_ = shr; }
+
+  /**
+   * @brief set process status
+   * @param [in] s process status
+   */
+  void setProcessStatus(const std::string & s) { s_ = s; }
+
+  /**
+   * @brief set CPU usage
+   * @param [in] cpu CPU usage
+   */
+  void setCPUUsage(const std::string & cpu) { cpu_ = cpu; }
+
+  /**
+   * @brief set memory usage
+   * @param [in] mem memory usage
+   */
+  void setMemoryUsage(const std::string & mem) { mem_ = mem; }
+
+  /**
+   * @brief set CPU time
+   * @param [in] time CPU time
+   */
+  void setCPUTime(const std::string & time) { time_ = time; }
+
+  /**
+   * @brief set Command name/line
+   * @param [in] command Command name/line
+   */
+  void setCommandName(const std::string & command) { command_ = command; }
 
 private:
   int level_;                  //!< @brief Diagnostics error level
   std::string message_;        //!< @brief Diagnostics status message
   std::string error_command_;  //!< @brief Error command
   std::string content_;        //!< @brief Error content
-  struct ProcessInfo info_;    //!< @brief Struct for storing process information
+
+  std::string pid_;      //!< @brief Process Id
+  std::string user_;     //!< @brief User Name
+  std::string pr_;       //!< @brief Priority
+  std::string ni_;       //!< @brief Nice value
+  std::string virt_;     //!< @brief Virtual Image (kb)
+  std::string res_;      //!< @brief Resident size (kb)
+  std::string shr_;      //!< @brief Shared Mem size (kb)
+  std::string s_;        //!< @brief Process Status
+  std::string cpu_;      //!< @brief CPU usage
+  std::string mem_;      //!< @brief Memory usage
+  std::string time_;     //!< @brief CPU Time
+  std::string command_;  //!< @brief Command name/line
 };
 
 #endif  // SYSTEM_MONITOR__PROCESS_MONITOR__DIAG_TASK_HPP_

system/system_monitor/src/process_monitor/process_monitor.cpp

@@ -451,21 +451,27 @@ void ProcessMonitor::getTopratedProcesses(
     return;
   }
 
+  std::vector<std::string> list;
   std::string line;
   int index = 0;
 
   while (std::getline(is_out, line) && !line.empty()) {
-    std::istringstream stream(line);
-
-    ProcessInfo info;
-    stream >> info.processId >> info.userName >> info.priority >> info.niceValue >>
-      info.virtualImage >> info.residentSize >> info.sharedMemSize >> info.processStatus >>
-      info.cpuUsage >> info.memoryUsage >> info.cpuTime;
-
-    std::getline(stream, info.commandName);
+    boost::trim_left(line);
+    boost::split(list, line, boost::is_space(), boost::token_compress_on);
 
     tasks->at(index)->setDiagnosticsStatus(DiagStatus::OK, "OK");
-    tasks->at(index)->setProcessInformation(info);
+    tasks->at(index)->setProcessId(list[0]);
+    tasks->at(index)->setUserName(list[1]);
+    tasks->at(index)->setPriority(list[2]);
+    tasks->at(index)->setNiceValue(list[3]);
+    tasks->at(index)->setVirtualImage(list[4]);
+    tasks->at(index)->setResidentSize(list[5]);
+    tasks->at(index)->setSharedMemSize(list[6]);
+    tasks->at(index)->setProcessStatus(list[7]);
+    tasks->at(index)->setCPUUsage(list[8]);
+    tasks->at(index)->setMemoryUsage(list[9]);
+    tasks->at(index)->setCPUTime(list[10]);
+    tasks->at(index)->setCommandName(list[11]);
     ++index;
   }
 }
@@ -515,7 +521,7 @@ void ProcessMonitor::onTimer()
   std::ostringstream os;
 
   // Get processes
-  bp::child c("top -bcn1 -o %CPU -w 256", bp::std_out > is_out, bp::std_err > is_err);
+  bp::child c("top -bn1 -o %CPU -w 128", bp::std_out > is_out, bp::std_err > is_err);
   c.wait();
 
   if (c.exit_code() != 0) {