From bc357ce5d7848cd43ed9e3c75c15c02a8873f095 Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Wed, 16 Nov 2016 20:51:47 -0500 Subject: systemctl: shorter list-jobs --before/--after output a bit (before)$ systemctl list-jobs --before --after JOB UNIT TYPE STATE 8769 foobar.device start running A job waits for this job: 8669 (run-rb6da596d0cfa4e36b7c594cd973e795a.service/start) 8669 run-rb6da596d0cfa4e36b7c594cd973e795a.service start waiting This job waits for a job: 8769 (foobar.device/start) 2 jobs listed. (after)$ systemctl list-jobs --before --after JOB UNIT TYPE STATE 8769 foobar.device start running waiting for job 8669 (run-rb6da596d0cfa4e36b7c594cd973e795a.service/start) 8669 run-rb6da596d0cfa4e36b7c594cd973e795a.service start waiting blocking job 8769 (foobar.device/start) 2 jobs listed. --- src/systemctl/systemctl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/systemctl/systemctl.c') diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c index db836639b5..5fbda23775 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -2227,7 +2227,7 @@ static void output_waiting_jobs(sd_bus *bus, uint32_t id, const char *method, co } while ((r = sd_bus_message_read(reply, "(usssoo)", &other_id, &name, &type, &state, &job_path, &unit_path)) > 0) - printf("%s%u (%s/%s)\n", prefix, other_id, name, type); + printf("%s %u (%s/%s)\n", prefix, other_id, name, type); if (r < 0) { bus_log_parse_error(r); return; @@ -2309,9 +2309,9 @@ static void output_jobs_list(sd_bus *bus, const struct job_info* jobs, unsigned on, state_len, j->state, off); if (arg_jobs_after) - output_waiting_jobs(bus, j->id, "GetJobAfter", "\tA job waits for this job: "); + output_waiting_jobs(bus, j->id, "GetJobAfter", "\twaiting for job"); if (arg_jobs_before) - output_waiting_jobs(bus, j->id, "GetJobBefore", "\tThis job waits for a job: "); + output_waiting_jobs(bus, j->id, "GetJobBefore", "\tblocking job"); } if (!arg_no_legend) { -- cgit v1.2.3-54-g00ecf From 76d8ca22293d106dfece06df8102ff61ff55ca77 Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Wed, 16 Nov 2016 21:01:11 -0500 Subject: core/dbus-job, systemctl: shorten some code --- src/core/dbus-job.c | 25 ++++++++++--------------- src/systemctl/systemctl.c | 28 +++++++++++----------------- 2 files changed, 21 insertions(+), 32 deletions(-) (limited to 'src/systemctl/systemctl.c') diff --git a/src/core/dbus-job.c b/src/core/dbus-job.c index 087a08dc0d..effc45db45 100644 --- a/src/core/dbus-job.c +++ b/src/core/dbus-job.c @@ -258,40 +258,35 @@ static int bus_job_track_handler(sd_bus_track *t, void *userdata) { } static int bus_job_allocate_bus_track(Job *j) { - int r; assert(j); if (j->bus_track) return 0; - r = sd_bus_track_new(j->unit->manager->api_bus, &j->bus_track, bus_job_track_handler, j); - if (r < 0) - return r; - - return 0; + return sd_bus_track_new(j->unit->manager->api_bus, &j->bus_track, bus_job_track_handler, j); } int bus_job_coldplug_bus_track(Job *j) { int r = 0; + _cleanup_strv_free_ char **deserialized_clients = NULL; assert(j); - if (strv_isempty(j->deserialized_clients)) - goto finish; + deserialized_clients = j->deserialized_clients; + j->deserialized_clients = NULL; + + if (strv_isempty(deserialized_clients)) + return 0; if (!j->manager->api_bus) - goto finish; + return 0; r = bus_job_allocate_bus_track(j); if (r < 0) - goto finish; - - r = bus_track_add_name_many(j->bus_track, j->deserialized_clients); + return r; -finish: - j->deserialized_clients = strv_free(j->deserialized_clients); - return r; + return bus_track_add_name_many(j->bus_track, deserialized_clients); } int bus_job_track_sender(Job *j, sd_bus_message *m) { diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c index 5fbda23775..4fd8d7ba27 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -2197,7 +2197,7 @@ finish: return r; } -static void output_waiting_jobs(sd_bus *bus, uint32_t id, const char *method, const char *prefix) { +static int output_waiting_jobs(sd_bus *bus, uint32_t id, const char *method, const char *prefix) { _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL; _cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL; const char *name, *type, *state, *job_path, *unit_path; @@ -2215,29 +2215,23 @@ static void output_waiting_jobs(sd_bus *bus, uint32_t id, const char *method, co &error, &reply, "u", id); - if (r < 0) { - log_debug_errno(r, "Failed to get waiting jobs for job %" PRIu32, id); - return; - } + if (r < 0) + return log_debug_errno(r, "Failed to get waiting jobs for job %" PRIu32, id); r = sd_bus_message_enter_container(reply, 'a', "(usssoo)"); - if (r < 0) { - bus_log_parse_error(r); - return; - } + if (r < 0) + return bus_log_parse_error(r); while ((r = sd_bus_message_read(reply, "(usssoo)", &other_id, &name, &type, &state, &job_path, &unit_path)) > 0) printf("%s %u (%s/%s)\n", prefix, other_id, name, type); - if (r < 0) { - bus_log_parse_error(r); - return; - } + if (r < 0) + return bus_log_parse_error(r); r = sd_bus_message_exit_container(reply); - if (r < 0) { - bus_log_parse_error(r); - return; - } + if (r < 0) + return bus_log_parse_error(r); + + return 0; } struct job_info { -- cgit v1.2.3-54-g00ecf