Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(system_monitor): extend command line to display #4553

Merged
merged 3 commits into from
Aug 16, 2023
Merged

fix(system_monitor): extend command line to display #4553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0ea6ecd
fix(system_monitor): extend command line to display
ito-san Aug 8, 2023
5ee59ea
Merge branch 'main' into fix/process_monitor
ito-san Aug 16, 2023
dde8677
Merge branch 'main' into fix/process_monitor
ito-san Aug 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
129 changes: 35 additions & 94 deletions system/system_monitor/include/system_monitor/process_monitor/diag_task.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,25 @@

#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:
Expand All @@ -46,18 +65,18 @@ class DiagTask : public diagnostic_updater::DiagnosticTask
if (level_ != DiagStatus::OK) {
stat.add("content", content_);
} else {
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.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.summary(level_, message_);
}
Expand Down Expand Up @@ -85,95 +104,17 @@ class DiagTask : public diagnostic_updater::DiagnosticTask
}

/**
* @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
* @brief Set process information
* @param [in] info Process information
*/
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; }
void setProcessInformation(const struct ProcessInfo & info) { info_ = info; }

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

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
struct ProcessInfo info_; //!< @brief Struct for storing process information
};

#endif // SYSTEM_MONITOR__PROCESS_MONITOR__DIAG_TASK_HPP_
26 changes: 10 additions & 16 deletions system/system_monitor/src/process_monitor/process_monitor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,27 +451,21 @@ void ProcessMonitor::getTopratedProcesses(
return;
}

std::vector<std::string> list;
std::string line;
int index = 0;

while (std::getline(is_out, line) && !line.empty()) {
boost::trim_left(line);
boost::split(list, line, boost::is_space(), boost::token_compress_on);
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);

tasks->at(index)->setDiagnosticsStatus(DiagStatus::OK, "OK");
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]);
tasks->at(index)->setProcessInformation(info);
++index;
}
}
Expand Down Expand Up @@ -521,7 +515,7 @@ void ProcessMonitor::onTimer()
std::ostringstream os;

// Get processes
bp::child c("top -bn1 -o %CPU -w 128", bp::std_out > is_out, bp::std_err > is_err);
bp::child c("top -bcn1 -o %CPU -w 256", bp::std_out > is_out, bp::std_err > is_err);
c.wait();

if (c.exit_code() != 0) {
Expand Down
Loading