diff options
author | Lennart Poettering <lennart@poettering.net> | 2013-11-19 21:12:59 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2013-11-20 20:52:36 +0100 |
commit | 718db96199eb307751264e4163555662c9a389fa (patch) | |
tree | 9ec8467596ba1acba76bb6273c7797baf68c1a00 /src/core/service.h | |
parent | 3febea3a0b0a968ea281e7959c1654cbaf95c9bf (diff) |
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.
Diffstat (limited to 'src/core/service.h')
-rw-r--r-- | src/core/service.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/service.h b/src/core/service.h index 37fa6ff0fa..5c53791753 100644 --- a/src/core/service.h +++ b/src/core/service.h @@ -130,7 +130,7 @@ struct Service { dual_timestamp watchdog_timestamp; usec_t watchdog_usec; - Watch watchdog_watch; + sd_event_source *watchdog_event_source; ExecCommand* exec_command[_SERVICE_EXEC_COMMAND_MAX]; @@ -191,7 +191,7 @@ struct Service { UnitRef accept_socket; - Watch timer_watch; + sd_event_source *timer_event_source; PathSpec *pid_file_pathspec; NotifyAccess notify_access; |