systemctl: add --kill-value= argument to systemctl

This allows accompanying a signal with a value (as supported for Linux
Realtime signals). This is particularly useful as it allows us to do
stuff like this:

   systemctl kill --kill-whom=main --kill-value=0x300 systemd-journald

In order to ask journald to flush its allocation caches and compact
memory.
This commit is contained in:
Lennart Poettering
2023-02-17 09:55:35 +01:00
parent a721cd0016
commit d06e61996d
3 changed files with 50 additions and 11 deletions
+19 -11
View File
@@ -8,7 +8,7 @@
int verb_kill(int argc, char *argv[], void *userdata) {
_cleanup_strv_free_ char **names = NULL;
char *kill_whom = NULL;
const char *kill_whom;
sd_bus *bus;
int r, q;
@@ -18,12 +18,11 @@ int verb_kill(int argc, char *argv[], void *userdata) {
polkit_agent_open_maybe();
if (!arg_kill_whom)
arg_kill_whom = "all";
kill_whom = arg_kill_whom ?: "all";
/* --fail was specified */
if (streq(arg_job_mode(), "fail"))
kill_whom = strjoina(arg_kill_whom, "-fail");
kill_whom = strjoina(kill_whom, "-fail");
r = expand_unit_names(bus, strv_skip(argv, 1), NULL, &names, NULL);
if (r < 0)
@@ -32,13 +31,22 @@ int verb_kill(int argc, char *argv[], void *userdata) {
STRV_FOREACH(name, names) {
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
q = bus_call_method(
bus,
bus_systemd_mgr,
"KillUnit",
&error,
NULL,
"ssi", *name, kill_whom ?: arg_kill_whom, arg_signal);
if (arg_kill_value_set)
q = bus_call_method(
bus,
bus_systemd_mgr,
"QueueSignalUnit",
&error,
NULL,
"ssii", *name, kill_whom, arg_signal, arg_kill_value);
else
q = bus_call_method(
bus,
bus_systemd_mgr,
"KillUnit",
&error,
NULL,
"ssi", *name, kill_whom, arg_signal);
if (q < 0) {
log_error_errno(q, "Failed to kill unit %s: %s", *name, bus_error_message(&error, q));
if (r == 0)