RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-30 21:28:11 +00:00
Code Issues Activity Actions

pkill: Add -o option to kill the oldest matching process only

Browse source
This commit is contained in:
Tim Ledbetter 2023-06-15 18:25:08 +01:00 • committed by Andreas Kling
parent 519893d31f
commit aa79a4ed9a
2 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Base/usr/share/man/man1/pkill.md
View file

@ -5,7 +5,7 @@ pkill - Signal processes based on name
## Synopsis ## Synopsis
```sh ```sh
$ pkill [--count] [--ignore-case] [--echo] [--newest] [--signal signame] [--uid uid-list] [--exact] <process-name> $ pkill [--count] [--ignore-case] [--echo] [--newest] [--oldest] [--signal signame] [--uid uid-list] [--exact] <process-name>
``` ```
## Options ## Options
@ -14,6 +14,7 @@ $ pkill [--count] [--ignore-case] [--echo] [--newest] [--signal signame] [--uid
* `-i`, `--ignore-case`: Make matches case-insensitive * `-i`, `--ignore-case`: Make matches case-insensitive
* `-e`, `--echo`: Display what is killed * `-e`, `--echo`: Display what is killed
* `-n`, `--newest`: Kill the most recently created process only * `-n`, `--newest`: Kill the most recently created process only
* `-o`, `--oldest`: Select the least recently created process only
* `-s signame`, `--signal signame`: Signal to send. The signal name or number may be used * `-s signame`, `--signal signame`: Signal to send. The signal name or number may be used
* `-U uid-list`, `--uid uid-list`: Select only processes whose UID is in the given comma-separated list. Login name or numerical user ID may be used * `-U uid-list`, `--uid uid-list`: Select only processes whose UID is in the given comma-separated list. Login name or numerical user ID may be used
* `-x`, `--exact`: Select only processes whose names match the given pattern exactly * `-x`, `--exact`: Select only processes whose names match the given pattern exactly

10
Userland/Utilities/pkill.cpp
View file

@ -31,6 +31,7 @@ ErrorOr<int> serenity_main(Main::Arguments args)
bool echo = false; bool echo = false;
bool exact_match = false; bool exact_match = false;
bool newest_only = false; bool newest_only = false;
bool oldest_only = false;
StringView pattern; StringView pattern;
HashTable<uid_t> uids_to_filter_by; HashTable<uid_t> uids_to_filter_by;
int signal = SIGTERM; int signal = SIGTERM;
@ -40,6 +41,7 @@ ErrorOr<int> serenity_main(Main::Arguments args)
args_parser.add_option(case_insensitive, "Make matches case-insensitive", "ignore-case", 'i'); args_parser.add_option(case_insensitive, "Make matches case-insensitive", "ignore-case", 'i');
args_parser.add_option(echo, "Display what is killed", "echo", 'e'); args_parser.add_option(echo, "Display what is killed", "echo", 'e');
args_parser.add_option(newest_only, "Kill the most recently created process only", "newest", 'n'); args_parser.add_option(newest_only, "Kill the most recently created process only", "newest", 'n');
args_parser.add_option(oldest_only, "Kill the least recently created process only", "oldest", 'o');
args_parser.add_option(Core::ArgsParser::Option { args_parser.add_option(Core::ArgsParser::Option {
.argument_mode = Core::ArgsParser::OptionArgumentMode::Required, .argument_mode = Core::ArgsParser::OptionArgumentMode::Required,
.help_string = "Signal number to send. A signal name or number may be used", .help_string = "Signal number to send. A signal name or number may be used",
@ -89,6 +91,12 @@ ErrorOr<int> serenity_main(Main::Arguments args)
args_parser.add_positional_argument(pattern, "Process name to search for", "process-name"); args_parser.add_positional_argument(pattern, "Process name to search for", "process-name");
args_parser.parse(args); args_parser.parse(args);
if (newest_only && oldest_only) {
warnln("The -n and -o options are mutually exclusive");
args_parser.print_usage(stderr, args.strings[0]);
return 1;
}
auto all_processes = TRY(Core::ProcessStatisticsReader::get_all()); auto all_processes = TRY(Core::ProcessStatisticsReader::get_all());
PosixOptions options {}; PosixOptions options {};
@ -122,6 +130,8 @@ ErrorOr<int> serenity_main(Main::Arguments args)
quick_sort(matched_processes, [](auto const& a, auto const& b) { return a.creation_time < b.creation_time; }); quick_sort(matched_processes, [](auto const& a, auto const& b) { return a.creation_time < b.creation_time; });
if (newest_only) if (newest_only)
matched_processes = { matched_processes.last() }; matched_processes = { matched_processes.last() };
else if (oldest_only)
matched_processes = { matched_processes.first() };
for (auto& process : matched_processes) { for (auto& process : matched_processes) {
auto result = Core::System::kill(process.pid, signal); auto result = Core::System::kill(process.pid, signal);