From bdbc866914e54189d6f9924349005fa8fa6bf71b Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 19 Dec 2017 15:47:09 +0100 Subject: [PATCH] sd-bus: add new sd_bus_is_ready() API This new call is much light sd_bus_is_open(), but returns true only if the connection is fully set up, i.e. after we finished with the authentication and Hello() phase. This API is useful for clients in particular when using the "watch_bind" feature, as that way it can be determined in advance whether it makes sense to sync on some operation. --- src/libsystemd/libsystemd.sym | 1 + src/libsystemd/sd-bus/sd-bus.c | 7 +++++++ src/systemd/sd-bus.h | 1 + 3 files changed, 9 insertions(+) diff --git a/src/libsystemd/libsystemd.sym b/src/libsystemd/libsystemd.sym index 05c3b99bd6..af4226c73a 100644 --- a/src/libsystemd/libsystemd.sym +++ b/src/libsystemd/libsystemd.sym @@ -540,4 +540,5 @@ global: sd_bus_add_match_async; sd_bus_match_signal; sd_bus_match_signal_async; + sd_bus_is_ready; } LIBSYSTEMD_236; diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c index 0266fbaf55..7967aac7c6 100644 --- a/src/libsystemd/sd-bus/sd-bus.c +++ b/src/libsystemd/sd-bus/sd-bus.c @@ -1396,6 +1396,13 @@ _public_ int sd_bus_is_open(sd_bus *bus) { return BUS_IS_OPEN(bus->state); } +_public_ int sd_bus_is_ready(sd_bus *bus) { + assert_return(bus, -EINVAL); + assert_return(!bus_pid_changed(bus), -ECHILD); + + return bus->state == BUS_RUNNING; +} + _public_ int sd_bus_can_send(sd_bus *bus, char type) { int r; diff --git a/src/systemd/sd-bus.h b/src/systemd/sd-bus.h index 9a6581348c..76bd5eff95 100644 --- a/src/systemd/sd-bus.h +++ b/src/systemd/sd-bus.h @@ -165,6 +165,7 @@ sd_bus *sd_bus_flush_close_unref(sd_bus *bus); void sd_bus_default_flush_close(void); int sd_bus_is_open(sd_bus *bus); +int sd_bus_is_ready(sd_bus *bus); int sd_bus_get_bus_id(sd_bus *bus, sd_id128_t *id); int sd_bus_get_scope(sd_bus *bus, const char **scope);