From c0f32805086ff65d2905b0e3a9166d9ed6c2bc41 Mon Sep 17 00:00:00 2001 From: Daniel Mack Date: Sat, 11 Apr 2015 18:44:51 +0200 Subject: logind: use sd_event timer source for inhibitor logic Instead of open-coding the delayed action and inhibit timeout logic, switch over to a real sd_event_source based implementation. This is not only easier to read but also allows us to add more timers in the future. --- src/login/logind.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/login/logind.h') diff --git a/src/login/logind.h b/src/login/logind.h index 4781688f0a..caf78f734a 100644 --- a/src/login/logind.h +++ b/src/login/logind.h @@ -95,7 +95,7 @@ struct Manager { /* If a shutdown/suspend is currently executed, then this is * the job of it */ char *action_job; - usec_t action_timestamp; + sd_event_source *inhibit_timeout_source; sd_event_source *idle_action_event_source; usec_t idle_action_usec; @@ -167,8 +167,6 @@ int bus_manager_shutdown_or_sleep_now_or_later(Manager *m, const char *unit_name int manager_send_changed(Manager *manager, const char *property, ...) _sentinel_; -int manager_dispatch_delayed(Manager *manager); - int manager_start_scope(Manager *manager, const char *scope, pid_t pid, const char *slice, const char *description, const char *after, const char *after2, sd_bus_error *error, char **job); int manager_start_unit(Manager *manager, const char *unit, sd_bus_error *error, char **job); int manager_stop_unit(Manager *manager, const char *unit, sd_bus_error *error, char **job); -- cgit v1.2.3-54-g00ecf