X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fjob.c;h=dc4f44150c3c6fbc091092762ad36ef74ac07436;hb=5261ba901845c084de5a8fd06500ed09bfb0bd80;hp=f791299a9d640755379435a222fa78f6a9d48862;hpb=66ca4ec48a63ee0e71532148b9b373cda318c7e2;p=elogind.git diff --git a/src/core/job.c b/src/core/job.c index f791299a9..dc4f44150 100644 --- a/src/core/job.c +++ b/src/core/job.c @@ -37,7 +37,7 @@ #include "special.h" #include "async.h" #include "virt.h" -#include "dbus-client-track.h" +#include "dbus.h" Job* job_new_raw(Unit *unit) { Job *j; @@ -90,7 +90,8 @@ void job_free(Job *j) { sd_event_source_unref(j->timer_event_source); - bus_client_track_free(j->subscribed); + sd_bus_track_unref(j->subscribed); + strv_free(j->deserialized_subscribed); free(j); } @@ -508,7 +509,7 @@ int job_run_and_invalidate(Job *j) { else if (t == UNIT_ACTIVATING) r = -EAGAIN; else - r = -ENOEXEC; + r = -EBADR; break; } @@ -537,8 +538,10 @@ int job_run_and_invalidate(Job *j) { if (j) { if (r == -EALREADY) r = job_finish_and_invalidate(j, JOB_DONE, true); - else if (r == -ENOEXEC) + else if (r == -EBADR) r = job_finish_and_invalidate(j, JOB_SKIPPED, true); + else if (r == -ENOEXEC) + r = job_finish_and_invalidate(j, JOB_INVALID, true); else if (r == -EAGAIN) { j->state = JOB_WAITING; m->n_running_jobs--; @@ -615,6 +618,8 @@ static void job_print_status_message(Unit *u, JobType t, JobResult result) { assert(t >= 0); assert(t < _JOB_TYPE_MAX); + DISABLE_WARNING_FORMAT_NONLITERAL; + if (t == JOB_START) { format = job_get_status_message_format(u, t, result); if (!format) @@ -628,15 +633,18 @@ static void job_print_status_message(Unit *u, JobType t, JobResult result) { break; case JOB_FAILED: + manager_flip_auto_status(u->manager, true); unit_status_printf(u, ANSI_HIGHLIGHT_RED_ON "FAILED" ANSI_HIGHLIGHT_OFF, format); manager_status_printf(u->manager, false, NULL, "See 'systemctl status %s' for details.", u->id); break; case JOB_DEPENDENCY: + manager_flip_auto_status(u->manager, true); unit_status_printf(u, ANSI_HIGHLIGHT_YELLOW_ON "DEPEND" ANSI_HIGHLIGHT_OFF, format); break; case JOB_TIMEOUT: + manager_flip_auto_status(u->manager, true); unit_status_printf(u, ANSI_HIGHLIGHT_RED_ON " TIME " ANSI_HIGHLIGHT_OFF, format); break; @@ -653,6 +661,7 @@ static void job_print_status_message(Unit *u, JobType t, JobResult result) { switch (result) { case JOB_TIMEOUT: + manager_flip_auto_status(u->manager, true); unit_status_printf(u, ANSI_HIGHLIGHT_RED_ON " TIME " ANSI_HIGHLIGHT_OFF, format); break; @@ -673,10 +682,10 @@ static void job_print_status_message(Unit *u, JobType t, JobResult result) { if (result == JOB_SKIPPED) unit_status_printf(u, ANSI_HIGHLIGHT_ON " INFO " ANSI_HIGHLIGHT_OFF, "%s is not active."); } + + REENABLE_WARNING; } -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wformat-nonliteral" static void job_log_status_message(Unit *u, JobType t, JobResult result) { const char *format; char buf[LINE_MAX]; @@ -695,8 +704,10 @@ static void job_log_status_message(Unit *u, JobType t, JobResult result) { if (!format) return; + DISABLE_WARNING_FORMAT_NONLITERAL; snprintf(buf, sizeof(buf), format, unit_description(u)); char_array_0(buf); + REENABLE_WARNING; if (t == JOB_START) { sd_id128_t mid; @@ -725,7 +736,6 @@ static void job_log_status_message(Unit *u, JobType t, JobResult result) { "MESSAGE=%s", buf, NULL); } -#pragma GCC diagnostic pop int job_finish_and_invalidate(Job *j, JobResult result, bool recursive) { Unit *u; @@ -764,7 +774,7 @@ int job_finish_and_invalidate(Job *j, JobResult result, bool recursive) { goto finish; } - if (result == JOB_FAILED) + if (result == JOB_FAILED || result == JOB_INVALID) j->manager->n_failed_jobs ++; job_uninstall(j); @@ -855,12 +865,20 @@ static int job_dispatch_timer(sd_event_source *s, uint64_t monotonic, void *user int job_start_timer(Job *j) { int r; - if (j->unit->job_timeout <= 0 || j->timer_event_source) + if (j->timer_event_source) return 0; j->begin_usec = now(CLOCK_MONOTONIC); - r = sd_event_add_monotonic(j->manager->event, j->begin_usec + j->unit->job_timeout, 0, job_dispatch_timer, j, &j->timer_event_source); + if (j->unit->job_timeout <= 0) + return 0; + + r = sd_event_add_time( + j->manager->event, + &j->timer_event_source, + CLOCK_MONOTONIC, + j->begin_usec + j->unit->job_timeout, 0, + job_dispatch_timer, j); if (r < 0) return r; @@ -874,6 +892,9 @@ void job_add_to_run_queue(Job *j) { if (j->in_run_queue) return; + if (!j->manager->run_queue) + sd_event_source_set_enabled(j->manager->run_queue_event_source, SD_EVENT_ONESHOT); + LIST_PREPEND(run_queue, j->manager->run_queue, j); j->in_run_queue = true; } @@ -898,7 +919,7 @@ char *job_dbus_path(Job *j) { assert(j); - if (asprintf(&p, "/org/freedesktop/systemd1/job/%lu", (unsigned long) j->id) < 0) + if (asprintf(&p, "/org/freedesktop/systemd1/job/%"PRIu32, j->id) < 0) return NULL; return p; @@ -914,9 +935,9 @@ int job_serialize(Job *j, FILE *f, FDSet *fds) { fprintf(f, "job-ignore-order=%s\n", yes_no(j->ignore_order)); if (j->begin_usec > 0) - fprintf(f, "job-begin=%llu\n", (unsigned long long) j->begin_usec); + fprintf(f, "job-begin="USEC_FMT"\n", j->begin_usec); - bus_client_track_serialize(j->manager, f, j->subscribed); + bus_track_serialize(j->subscribed, f); /* End marker */ fputc('\n', f); @@ -1020,13 +1041,10 @@ int job_deserialize(Job *j, FILE *f, FDSet *fds) { else j->begin_usec = ull; - } else { - char t[strlen(l) + 1 + strlen(v) + 1]; - - strcpy(stpcpy(stpcpy(t, l), "="), v); + } else if (streq(l, "subscribed")) { - if (bus_client_track_deserialize_item(j->manager, &j->subscribed, t) == 0) - log_debug("Unknown deserialization key '%s'", l); + if (strv_extend(&j->deserialized_subscribed, v) < 0) + return log_oom(); } } } @@ -1036,13 +1054,27 @@ int job_coldplug(Job *j) { assert(j); - if (j->begin_usec <= 0) + /* After deserialization is complete and the bus connection + * set up again, let's start watching our subscribers again */ + r = bus_track_coldplug(j->manager, &j->subscribed, &j->deserialized_subscribed); + if (r < 0) + return r; + + if (j->state == JOB_WAITING) + job_add_to_run_queue(j); + + if (j->begin_usec == 0 || j->unit->job_timeout == 0) return 0; if (j->timer_event_source) j->timer_event_source = sd_event_source_unref(j->timer_event_source); - r = sd_event_add_monotonic(j->manager->event, j->begin_usec + j->unit->job_timeout, 0, job_dispatch_timer, j, &j->timer_event_source); + r = sd_event_add_time( + j->manager->event, + &j->timer_event_source, + CLOCK_MONOTONIC, + j->begin_usec + j->unit->job_timeout, 0, + job_dispatch_timer, j); if (r < 0) log_debug("Failed to restart timeout for job: %s", strerror(-r)); @@ -1078,6 +1110,34 @@ void job_shutdown_magic(Job *j) { asynchronous_sync(); } +int job_get_timeout(Job *j, uint64_t *timeout) { + Unit *u = j->unit; + uint64_t x = -1, y = -1; + int r = 0, q = 0; + + assert(u); + + if (j->timer_event_source) { + r = sd_event_source_get_time(j->timer_event_source, &x); + if (r < 0) + return r; + r = 1; + } + + if (UNIT_VTABLE(u)->get_timeout) { + q = UNIT_VTABLE(u)->get_timeout(u, &y); + if (q < 0) + return q; + } + + if (r == 0 && q == 0) + return 0; + + *timeout = MIN(x, y); + + return 1; +} + static const char* const job_state_table[_JOB_STATE_MAX] = { [JOB_WAITING] = "waiting", [JOB_RUNNING] = "running" @@ -1103,8 +1163,9 @@ static const char* const job_mode_table[_JOB_MODE_MAX] = { [JOB_REPLACE] = "replace", [JOB_REPLACE_IRREVERSIBLY] = "replace-irreversibly", [JOB_ISOLATE] = "isolate", + [JOB_FLUSH] = "flush", [JOB_IGNORE_DEPENDENCIES] = "ignore-dependencies", - [JOB_IGNORE_REQUIREMENTS] = "ignore-requirements" + [JOB_IGNORE_REQUIREMENTS] = "ignore-requirements", }; DEFINE_STRING_TABLE_LOOKUP(job_mode, JobMode); @@ -1115,7 +1176,8 @@ static const char* const job_result_table[_JOB_RESULT_MAX] = { [JOB_TIMEOUT] = "timeout", [JOB_FAILED] = "failed", [JOB_DEPENDENCY] = "dependency", - [JOB_SKIPPED] = "skipped" + [JOB_SKIPPED] = "skipped", + [JOB_INVALID] = "invalid", }; DEFINE_STRING_TABLE_LOOKUP(job_result, JobResult);