From 718db96199eb307751264e4163555662c9a389fa Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 19 Nov 2013 21:12:59 +0100 Subject: core: convert PID 1 to libsystemd-bus This patch converts PID 1 to libsystemd-bus and thus drops the dependency on libdbus. The only remaining code using libdbus is a test case that validates our bus marshalling against libdbus' marshalling, and this dependency can be turned off. This patch also adds a couple of things to libsystem-bus, that are necessary to make the port work: - Synthesizing of "Disconnected" messages when bus connections are severed. - Support for attaching multiple vtables for the same interface on the same path. This patch also fixes the SetDefaultTarget() and GetDefaultTarget() bus calls which used an inappropriate signature. As a side effect we will now generate PropertiesChanged messages which carry property contents, rather than just invalidation information. --- src/core/swap.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/core/swap.h') diff --git a/src/core/swap.h b/src/core/swap.h index dd89535895..c51c55f839 100644 --- a/src/core/swap.h +++ b/src/core/swap.h @@ -96,7 +96,7 @@ struct Swap { SwapExecCommand control_command_id; pid_t control_pid; - Watch timer_watch; + sd_event_source *timer_event_source; /* In order to be able to distinguish dependencies on different device nodes we might end up creating multiple @@ -107,9 +107,6 @@ struct Swap { extern const UnitVTable swap_vtable; -int swap_dispatch_reload(Manager *m); -int swap_fd_event(Manager *m, int events); - const char* swap_state_to_string(SwapState i) _const_; SwapState swap_state_from_string(const char *s) _pure_; -- cgit v1.2.3-54-g00ecf