From: Lennart Poettering Date: Thu, 19 Dec 2013 20:14:52 +0000 (+0100) Subject: bus: fix exit-on-idle for driverd X-Git-Tag: submit/kdbus-integration/20140207.094352~455 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=37224a5ff522a366b353e8a01e2c2eee1e5416e5;p=platform%2Fupstream%2Fsystemd.git bus: fix exit-on-idle for driverd --- diff --git a/src/bus-driverd/bus-driverd.c b/src/bus-driverd/bus-driverd.c index d4126a9..46ee349 100644 --- a/src/bus-driverd/bus-driverd.c +++ b/src/bus-driverd/bus-driverd.c @@ -772,6 +772,13 @@ static int connect_bus(Context *c) { return 0; } +static bool check_idle(void *userdata) { + Context *c = userdata; + assert(c); + + return hashmap_isempty(c->clients); +} + int main(int argc, char *argv[]) { Context context = {}; Client *c; @@ -799,7 +806,7 @@ int main(int argc, char *argv[]) { if (r < 0) goto finish; - r = bus_event_loop_with_idle(context.event, context.bus, "org.freedesktop.DBus", DEFAULT_EXIT_USEC); + r = bus_event_loop_with_idle(context.event, context.bus, "org.freedesktop.DBus", DEFAULT_EXIT_USEC, check_idle, &context); if (r < 0) { log_error("Failed to run event loop: %s", strerror(-r)); goto finish; diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c index eb2b35f..e57891b 100644 --- a/src/hostname/hostnamed.c +++ b/src/hostname/hostnamed.c @@ -639,7 +639,7 @@ int main(int argc, char *argv[]) { goto finish; } - r = bus_event_loop_with_idle(event, bus, "org.freedesktop.hostname1", DEFAULT_EXIT_USEC); + r = bus_event_loop_with_idle(event, bus, "org.freedesktop.hostname1", DEFAULT_EXIT_USEC, NULL, NULL); if (r < 0) { log_error("Failed to run event loop: %s", strerror(-r)); goto finish; diff --git a/src/libsystemd-bus/bus-util.c b/src/libsystemd-bus/bus-util.c index 4c87e16..f96c293 100644 --- a/src/libsystemd-bus/bus-util.c +++ b/src/libsystemd-bus/bus-util.c @@ -87,7 +87,13 @@ int bus_async_unregister_and_exit(sd_event *e, sd_bus *bus, const char *name) { return 0; } -int bus_event_loop_with_idle(sd_event *e, sd_bus *bus, const char *name, usec_t timeout) { +int bus_event_loop_with_idle( + sd_event *e, + sd_bus *bus, + const char *name, + usec_t timeout, + check_idle_t check_idle, + void *userdata) { bool exiting = false; int r, code; @@ -96,14 +102,20 @@ int bus_event_loop_with_idle(sd_event *e, sd_bus *bus, const char *name, usec_t assert(name); for (;;) { + bool idle; + r = sd_event_get_state(e); if (r < 0) return r; - if (r == SD_EVENT_FINISHED) break; - r = sd_event_run(e, exiting ? (uint64_t) -1 : timeout); + if (check_idle) + idle = check_idle(userdata); + else + idle = true; + + r = sd_event_run(e, exiting || !idle ? (uint64_t) -1 : timeout); if (r < 0) return r; diff --git a/src/libsystemd-bus/bus-util.h b/src/libsystemd-bus/bus-util.h index 9a90c2a..51e1613 100644 --- a/src/libsystemd-bus/bus-util.h +++ b/src/libsystemd-bus/bus-util.h @@ -54,7 +54,9 @@ int bus_map_all_properties(sd_bus *bus, int bus_async_unregister_and_exit(sd_event *e, sd_bus *bus, const char *name); -int bus_event_loop_with_idle(sd_event *e, sd_bus *bus, const char *name, usec_t timeout); +typedef bool (*check_idle_t)(void *userdata); + +int bus_event_loop_with_idle(sd_event *e, sd_bus *bus, const char *name, usec_t timeout, check_idle_t check_idle, void *userdata); int bus_name_has_owner(sd_bus *c, const char *name, sd_bus_error *error); diff --git a/src/locale/localed.c b/src/locale/localed.c index 2c90180..a1e0ab6 100644 --- a/src/locale/localed.c +++ b/src/locale/localed.c @@ -1149,7 +1149,7 @@ int main(int argc, char *argv[]) { goto finish; } - r = bus_event_loop_with_idle(event, bus, "org.freedesktop.locale1", DEFAULT_EXIT_USEC); + r = bus_event_loop_with_idle(event, bus, "org.freedesktop.locale1", DEFAULT_EXIT_USEC, NULL, NULL); if (r < 0) { log_error("Failed to run event loop: %s", strerror(-r)); goto finish; diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c index 8ac933c..d85ce57 100644 --- a/src/timedate/timedated.c +++ b/src/timedate/timedated.c @@ -857,7 +857,7 @@ int main(int argc, char *argv[]) { goto finish; } - r = bus_event_loop_with_idle(event, bus, "org.freedesktop.timedate1", DEFAULT_EXIT_USEC); + r = bus_event_loop_with_idle(event, bus, "org.freedesktop.timedate1", DEFAULT_EXIT_USEC, NULL, NULL); if (r < 0) { log_error("Failed to run event loop: %s", strerror(-r)); goto finish;