shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-05-29 17:05:48 +03:00
Code

core: ignore any issues with setting time on jobs_in_progress_event_source

Browse Source 
CID #1237559.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2015-03-13 21:11:09 -05:00
parent d448c7927a
commit 2ae56591b5
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/manager.c
View File

@ -85,16 +85,16 @@ static int manager_dispatch_run_queue(sd_event_source *source, void *userdata);
static int manager_run_generators(Manager *m); static int manager_run_generators(Manager *m);
static void manager_undo_generators(Manager *m); static void manager_undo_generators(Manager *m);
static int manager_watch_jobs_in_progress(Manager *m) { static void manager_watch_jobs_in_progress(Manager *m) {
usec_t next; usec_t next;
assert(m); assert(m);
if (m->jobs_in_progress_event_source) if (m->jobs_in_progress_event_source)
return 0; return;
next = now(CLOCK_MONOTONIC) + JOBS_IN_PROGRESS_WAIT_USEC; next = now(CLOCK_MONOTONIC) + JOBS_IN_PROGRESS_WAIT_USEC;
return sd_event_add_time( (void) sd_event_add_time(
m->event, m->event,
&m->jobs_in_progress_event_source, &m->jobs_in_progress_event_source,
CLOCK_MONOTONIC, CLOCK_MONOTONIC,
@ -2707,7 +2707,9 @@ void manager_check_finished(Manager *m) {
if (hashmap_size(m->jobs) > 0) { if (hashmap_size(m->jobs) > 0) {
if (m->jobs_in_progress_event_source) if (m->jobs_in_progress_event_source)
sd_event_source_set_time(m->jobs_in_progress_event_source, now(CLOCK_MONOTONIC) + JOBS_IN_PROGRESS_WAIT_USEC); /* Ignore any failure, this is only for feedback */
(void) sd_event_source_set_time(m->jobs_in_progress_event_source,
now(CLOCK_MONOTONIC) + JOBS_IN_PROGRESS_WAIT_USEC);
return; return;
} }