mirror of
https://github.com/systemd/systemd-stable.git
synced 2024-10-28 03:25:27 +03:00
udev: fix some incorrect usages of CLOCK_BOOTTIME (#6198)
CLOCK_BOOTTIME should only be used if we actually want the clock to count on while we are suspended, and it is hence not useful for normal code execution time limits, fix that. Moreover, a couple of uses were even more broken, as clock_bottime_or_monotonic() was called where actually now(clock_boottime_or_monotic()) was supposed to be called. Ouch! Fixes: #5903
This commit is contained in:
parent
3e875a71e8
commit
3285baa857
@ -58,7 +58,7 @@ struct udev_event *udev_event_new(struct udev_device *dev) {
|
||||
event->udev = udev;
|
||||
udev_list_init(udev, &event->run_list, false);
|
||||
udev_list_init(udev, &event->seclabel_list, false);
|
||||
event->birth_usec = clock_boottime_or_monotonic();
|
||||
event->birth_usec = now(CLOCK_MONOTONIC);
|
||||
return event;
|
||||
}
|
||||
|
||||
@ -520,7 +520,7 @@ static void spawn_read(struct udev_event *event,
|
||||
if (timeout_usec > 0) {
|
||||
usec_t age_usec;
|
||||
|
||||
age_usec = clock_boottime_or_monotonic() - event->birth_usec;
|
||||
age_usec = now(CLOCK_MONOTONIC) - event->birth_usec;
|
||||
if (age_usec >= timeout_usec) {
|
||||
log_error("timeout '%s'", cmd);
|
||||
return;
|
||||
@ -671,13 +671,13 @@ static int spawn_wait(struct udev_event *event,
|
||||
if (timeout_usec > 0) {
|
||||
usec_t usec, age_usec;
|
||||
|
||||
usec = now(clock_boottime_or_monotonic());
|
||||
usec = now(CLOCK_MONOTONIC);
|
||||
age_usec = usec - event->birth_usec;
|
||||
if (age_usec < timeout_usec) {
|
||||
if (timeout_warn_usec > 0 && timeout_warn_usec < timeout_usec && age_usec < timeout_warn_usec) {
|
||||
spawn.timeout_warn = timeout_warn_usec - age_usec;
|
||||
|
||||
r = sd_event_add_time(e, NULL, clock_boottime_or_monotonic(),
|
||||
r = sd_event_add_time(e, NULL, CLOCK_MONOTONIC,
|
||||
usec + spawn.timeout_warn, USEC_PER_SEC,
|
||||
on_spawn_timeout_warning, &spawn);
|
||||
if (r < 0)
|
||||
@ -686,7 +686,7 @@ static int spawn_wait(struct udev_event *event,
|
||||
|
||||
spawn.timeout = timeout_usec - age_usec;
|
||||
|
||||
r = sd_event_add_time(e, NULL, clock_boottime_or_monotonic(),
|
||||
r = sd_event_add_time(e, NULL, CLOCK_MONOTONIC,
|
||||
usec + spawn.timeout, USEC_PER_SEC, on_spawn_timeout, &spawn);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
@ -284,12 +284,12 @@ static void worker_attach_event(struct worker *worker, struct event *event) {
|
||||
|
||||
e = worker->manager->event;
|
||||
|
||||
assert_se(sd_event_now(e, clock_boottime_or_monotonic(), &usec) >= 0);
|
||||
assert_se(sd_event_now(e, CLOCK_MONOTONIC, &usec) >= 0);
|
||||
|
||||
(void) sd_event_add_time(e, &event->timeout_warning, clock_boottime_or_monotonic(),
|
||||
(void) sd_event_add_time(e, &event->timeout_warning, CLOCK_MONOTONIC,
|
||||
usec + arg_event_timeout_warn_usec, USEC_PER_SEC, on_event_timeout_warning, event);
|
||||
|
||||
(void) sd_event_add_time(e, &event->timeout, clock_boottime_or_monotonic(),
|
||||
(void) sd_event_add_time(e, &event->timeout, CLOCK_MONOTONIC,
|
||||
usec + arg_event_timeout_usec, USEC_PER_SEC, on_event_timeout, event);
|
||||
}
|
||||
|
||||
@ -755,9 +755,9 @@ static void manager_exit(Manager *manager) {
|
||||
event_queue_cleanup(manager, EVENT_QUEUED);
|
||||
manager_kill_workers(manager);
|
||||
|
||||
assert_se(sd_event_now(manager->event, clock_boottime_or_monotonic(), &usec) >= 0);
|
||||
assert_se(sd_event_now(manager->event, CLOCK_MONOTONIC, &usec) >= 0);
|
||||
|
||||
r = sd_event_add_time(manager->event, NULL, clock_boottime_or_monotonic(),
|
||||
r = sd_event_add_time(manager->event, NULL, CLOCK_MONOTONIC,
|
||||
usec + 30 * USEC_PER_SEC, USEC_PER_SEC, on_exit_timeout, manager);
|
||||
if (r < 0)
|
||||
return;
|
||||
@ -791,7 +791,7 @@ static void event_queue_start(Manager *manager) {
|
||||
manager->exit || manager->stop_exec_queue)
|
||||
return;
|
||||
|
||||
assert_se(sd_event_now(manager->event, clock_boottime_or_monotonic(), &usec) >= 0);
|
||||
assert_se(sd_event_now(manager->event, CLOCK_MONOTONIC, &usec) >= 0);
|
||||
/* check for changed config, every 3 seconds at most */
|
||||
if (manager->last_usec == 0 ||
|
||||
(usec - manager->last_usec) > 3 * USEC_PER_SEC) {
|
||||
|
Loading…
Reference in New Issue
Block a user