RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 22:07:35 +00:00
Code Issues Activity Actions

top: Add -p option to filter by pid

Browse source 
The -p option can now be used to only monitor processes with the
specified pids. Pids are given as a comma-separated list. This option
may be used multiple times.
This commit is contained in:
Tim Ledbetter 2023-05-13 12:04:44 +01:00 • committed by Andreas Kling
parent ce11db72e8
commit 56301688e4
1 changed files with 26 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Userland/Utilities/top.cpp
View file

@ -35,6 +35,7 @@ struct TopOption {
SortBy sort_by { SortBy::Cpu }; SortBy sort_by { SortBy::Cpu };
int delay_time { 1 }; int delay_time { 1 };
HashTable<pid_t> pids_to_filter_by;
}; };
struct ThreadData { struct ThreadData {
@ -88,12 +89,15 @@ struct Snapshot {
u64 total_time_scheduled_kernel { 0 }; u64 total_time_scheduled_kernel { 0 };
}; };
static ErrorOr<Snapshot> get_snapshot() static ErrorOr<Snapshot> get_snapshot(HashTable<pid_t> const& pids)
{ {
auto all_processes = TRY(Core::ProcessStatisticsReader::get_all()); auto all_processes = TRY(Core::ProcessStatisticsReader::get_all());
Snapshot snapshot; Snapshot snapshot;
for (auto& process : all_processes.processes) { for (auto& process : all_processes.processes) {
if (!pids.is_empty() && !pids.contains(process.pid))
continue;
for (auto& thread : process.threads) { for (auto& thread : process.threads) {
ThreadData thread_data; ThreadData thread_data;
thread_data.tid = thread.tid; thread_data.tid = thread.tid;
@ -163,13 +167,31 @@ static void parse_args(Main::Arguments arguments, TopOption& top_option)
return true; return true;
} }
}; };
HashTable<pid_t> pids;
Core::ArgsParser args_parser; Core::ArgsParser args_parser;
args_parser.set_general_help("Display information about processes"); args_parser.set_general_help("Display information about processes");
args_parser.add_option(top_option.delay_time, "Delay time interval in seconds", "delay-time", 'd', nullptr); args_parser.add_option(top_option.delay_time, "Delay time interval in seconds", "delay-time", 'd', nullptr);
args_parser.add_option(Core::ArgsParser::Option {
.argument_mode = Core::ArgsParser::OptionArgumentMode::Required,
.help_string = "A comma-separated list of pids to filter by",
.long_name = "pids",
.short_name = 'p',
.accept_value = [&pids](auto comma_separated_pids) {
for (auto pid : comma_separated_pids.split_view(',')) {
auto maybe_integer = pid.to_int();
if (!maybe_integer.has_value())
return false;
pids.set(maybe_integer.value());
}
return true;
},
});
args_parser.add_option(move(sort_by_option)); args_parser.add_option(move(sort_by_option));
args_parser.parse(arguments); args_parser.parse(arguments);
top_option.pids_to_filter_by = move(pids);
} }
static bool check_quit() static bool check_quit()
@ -214,7 +236,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
enable_nonblocking_stdin(); enable_nonblocking_stdin();
Vector<ThreadData*> threads; Vector<ThreadData*> threads;
auto prev = TRY(get_snapshot()); auto prev = TRY(get_snapshot(top_option.pids_to_filter_by));
usleep(10000); usleep(10000);
for (;;) { for (;;) {
if (g_window_size_changed) { if (g_window_size_changed) {
@ -222,7 +244,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
g_window_size_changed = false; g_window_size_changed = false;
} }
auto current = TRY(get_snapshot()); auto current = TRY(get_snapshot(top_option.pids_to_filter_by));
auto total_scheduled_diff = current.total_time_scheduled - prev.total_time_scheduled; auto total_scheduled_diff = current.total_time_scheduled - prev.total_time_scheduled;
printf("\033[3J\033[H\033[2J"); printf("\033[3J\033[H\033[2J");