shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-30 10:50:15 +03:00
Code

busctl: various bugfixes + tweaks (#34928)

Browse Source 
Fixes: #34048
Replaces: #34796
Follow-up for: #33961
This commit is contained in:
Luca Boccassi 2024-10-29 18:15:16 +00:00 committed by GitHub
commit a91c739a24
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 55 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
man/busctl.xml
View File

@ -417,7 +417,8 @@
</varlistentry>
<varlistentry>
<term><option>--num-matches=<replaceable>NUMBER</replaceable></option></term>
<term><option>--limit-messages=<replaceable>NUMBER</replaceable></option></term>
<term><option>-N <replaceable>NUMBER</replaceable></option></term>
<listitem>
<para>When used with the <command>monitor</command> command, if enabled will make

2
shell-completion/bash/busctl
View File

@ -89,7 +89,7 @@ _busctl() {
--allow-interactive-authorization=no --augment-creds=no
--watch-bind=yes -j -l --full --xml-interface'
[ARG]='--address -H --host -M --machine --match --timeout --size --json
--destination --num-matches'
--destination -N --limit-messages'
)
if __contains_word "--user" ${COMP_WORDS[*]}; then

2
shell-completion/zsh/_busctl
View File

@ -310,5 +310,5 @@ _arguments \
'--allow-interactive-authorization=[Allow interactive authorization for operation]:boolean:(1 0)' \
'--timeout=[Maximum time to wait for method call completion and monitoring]:timeout (seconds)' \
'--augment-creds=[Extend credential data with data read from /proc/$PID]:boolean:(1 0)' \
'--num-matches=[Exit after receiving a number of matches while monitoring]:integer' \
'(-M --limit-messages)'{-M,--limit-messages}'[Exit after receiving a number of messages while monitoring]:integer' \
'*::busctl command:_busctl_commands'

65
src/busctl/busctl.c
View File

@ -65,7 +65,7 @@ static bool arg_augment_creds = true;
static bool arg_watch_bind = false;
static usec_t arg_timeout = 0;
static const char *arg_destination = NULL;
static uint64_t arg_num_matches = UINT64_MAX;
static uint64_t arg_limit_messages = UINT64_MAX;
STATIC_DESTRUCTOR_REGISTER(arg_matches, strv_freep);
@ -1268,6 +1268,9 @@ static int monitor(int argc, char **argv, int (*dump)(sd_bus_message *m, FILE *f
if (r < 0)
return r;
usec_t end = arg_timeout > 0 ?
usec_add(now(CLOCK_MONOTONIC), arg_timeout) : USEC_INFINITY;
/* upgrade connection; it's not used for anything else after this call */
r = sd_bus_message_new_method_call(bus,
&message,
@ -1364,10 +1367,14 @@ static int monitor(int argc, char **argv, int (*dump)(sd_bus_message *m, FILE *f
dump(m, stdout);
fflush(stdout);
if (arg_num_matches != UINT64_MAX && --arg_num_matches == 0) {
if (!arg_quiet && !sd_json_format_enabled(arg_json_format_flags))
log_info("Received requested number of matching messages, exiting.");
return 0;
if (arg_limit_messages != UINT64_MAX) {
arg_limit_messages--;
if (arg_limit_messages == 0) {
if (!arg_quiet && !sd_json_format_enabled(arg_json_format_flags))
log_info("Received requested maximum number of messages, exiting.");
return 0;
}
}
if (sd_bus_message_is_signal(m, "org.freedesktop.DBus.Local", "Disconnected") > 0) {
@ -1382,8 +1389,8 @@ static int monitor(int argc, char **argv, int (*dump)(sd_bus_message *m, FILE *f
if (r > 0)
continue;
r = sd_bus_wait(bus, arg_timeout > 0 ? arg_timeout : UINT64_MAX);
if (r == 0 && arg_timeout > 0) {
r = sd_bus_wait(bus, arg_timeout > 0 ? usec_sub_unsigned(end, now(CLOCK_MONOTONIC)) : UINT64_MAX);
if (r == 0 && arg_timeout > 0 && now(CLOCK_MONOTONIC) >= end) {
if (!arg_quiet && !sd_json_format_enabled(arg_json_format_flags))
log_info("Timed out waiting for messages, exiting.");
return 0;
@ -2448,9 +2455,9 @@ static int help(void) {
pager_open(arg_pager_flags);
printf("%s [OPTIONS...] COMMAND ...\n\n"
"%sIntrospect the D-Bus IPC bus.%s\n"
"\nCommands:\n"
printf("%1$s [OPTIONS...] COMMAND ...\n\n"
"%5$sIntrospect the D-Bus IPC bus.%6$s\n"
"\n%3$sCommands%4$s:\n"
" list List bus names\n"
" status [SERVICE] Show bus service, process or bus owner credentials\n"
" monitor [SERVICE...] Show bus traffic\n"
@ -2468,7 +2475,7 @@ static int help(void) {
" set-property SERVICE OBJECT INTERFACE PROPERTY SIGNATURE ARGUMENT...\n"
" Set property value\n"
" help Show this help\n"
"\nOptions:\n"
"\n%3$sOptions:%4$s\n"
" -h --help Show this help\n"
" --version Show package version\n"
" --no-pager Do not pipe output into a pager\n"
@ -2500,13 +2507,16 @@ static int help(void) {
" --watch-bind=BOOL Wait for bus AF_UNIX socket to be bound in the file\n"
" system\n"
" --destination=SERVICE Destination service of a signal\n"
" --num-matches=NUMBER Exit after receiving a number of matches while\n"
" -N --limit-messages=NUMBER\n"
" Exit after receiving a number of matches while\n"
" monitoring\n"
"\nSee the %s for details.\n",
"\nSee the %2$s for details.\n",
program_invocation_short_name,
ansi_highlight(),
link,
ansi_underline(),
ansi_normal(),
link);
ansi_highlight(),
ansi_normal());
return 0;
}
@ -2541,7 +2551,6 @@ static int parse_argv(int argc, char *argv[]) {
ARG_WATCH_BIND,
ARG_JSON,
ARG_DESTINATION,
ARG_NUM_MATCHES,
};
static const struct option options[] = {
@ -2574,7 +2583,7 @@ static int parse_argv(int argc, char *argv[]) {
{ "watch-bind", required_argument, NULL, ARG_WATCH_BIND },
{ "json", required_argument, NULL, ARG_JSON },
{ "destination", required_argument, NULL, ARG_DESTINATION },
{ "num-matches", required_argument, NULL, ARG_NUM_MATCHES },
{ "limit-messages", required_argument, NULL, 'N' },
{},
};
@ -2583,7 +2592,7 @@ static int parse_argv(int argc, char *argv[]) {
assert(argc >= 0);
assert(argv);
while ((c = getopt_long(argc, argv, "hH:M:C:J:qjl", options, NULL)) >= 0)
while ((c = getopt_long(argc, argv, "hH:M:C:J:qjlN:", options, NULL)) >= 0)
switch (c) {
@ -2710,6 +2719,11 @@ static int parse_argv(int argc, char *argv[]) {
break;
case ARG_TIMEOUT:
if (isempty(optarg)) {
arg_timeout = 0; /* Reset to default */
break;
}
r = parse_sec(optarg, &arg_timeout);
if (r < 0)
return log_error_errno(r, "Failed to parse --timeout= parameter '%s': %m", optarg);
@ -2743,12 +2757,17 @@ static int parse_argv(int argc, char *argv[]) {
arg_destination = optarg;
break;
case ARG_NUM_MATCHES:
r = safe_atou64(optarg, &arg_num_matches);
case 'N':
if (isempty(optarg)) {
arg_limit_messages = UINT64_MAX; /* Reset to default */
break;
}
r = safe_atou64(optarg, &arg_limit_messages);
if (r < 0)
return log_error_errno(r, "Failed to parse --num-matches= parameter '%s': %m", optarg);
if (arg_num_matches == 0)
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "--num-matches= parameter cannot be 0");
return log_error_errno(r, "Failed to parse --limit-messages= parameter: %s", optarg);
if (arg_limit_messages == 0)
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "--limit-messages= parameter cannot be 0");
break;

10
test/units/TEST-74-AUX-UTILS.busctl.sh
View File

@ -117,4 +117,12 @@ busctl get-property -j \
(! busctl set-property org.freedesktop.systemd1 /org/freedesktop/systemd1 org.freedesktop.systemd1.Manager \
KExecWatchdogUSec t "foo")
busctl --quiet --timeout 1 --num-matches 1 --match "interface=org.freedesktop.systemd1.Manager" monitor >/dev/null
busctl --quiet --timeout=1 --limit-messages=1 --match "interface=org.freedesktop.systemd1.Manager" monitor
START_USEC=$(date +%s%6N)
busctl --quiet --timeout=500ms --match "interface=io.dontexist.NeverGonnaHappen" monitor
END_USEC=$(date +%s%6N)
USEC=$((END_USEC-START_USEC))
# Validate that the above was delayed for at least 500ms, but at most 30s (some leeway for slow CIs)
test "$USEC" -gt 500000
test "$USEC" -lt 30000000