diff options
| author | Mike Yuan <me@yhndnzj.com> | 2023-05-08 23:10:07 +0800 |
|---|---|---|
| committer | Mike Yuan <me@yhndnzj.com> | 2023-05-09 01:42:25 +0800 |
| commit | e8863150653931ae2ffc91757623f179ce763628 (patch) | |
| tree | 4e80c8af9dc29235fc268c00a76eee0538d3679c /src/core | |
| parent | 7429c8fe57bef84c3ff6ebd94b560356752af0bc (diff) | |
| download | systemd-e8863150653931ae2ffc91757623f179ce763628.tar.gz | |
core/manager: export manager_dbus_is_running
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/manager.c | 8 | ||||
| -rw-r--r-- | src/core/manager.h | 5 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/core/manager.c b/src/core/manager.c index 36881de479..ec8851ca22 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -1801,7 +1801,7 @@ static void manager_distribute_fds(Manager *m, FDSet *fds) { } } -static bool manager_dbus_is_running(Manager *m, bool deserialized) { +bool manager_dbus_is_running_full(Manager *m, bool deserialized) { Unit *u; assert(m); @@ -1843,7 +1843,7 @@ static void manager_setup_bus(Manager *m) { (void) bus_init_system(m); /* Let's connect to the bus now, but only if the unit is supposed to be up */ - if (manager_dbus_is_running(m, MANAGER_IS_RELOADING(m))) { + if (manager_dbus_is_running_full(m, MANAGER_IS_RELOADING(m))) { (void) bus_init_api(m); if (MANAGER_IS_SYSTEM(m)) @@ -2935,7 +2935,7 @@ static int manager_dispatch_signal_fd(sd_event_source *source, int fd, uint32_t break; case SIGUSR1: - if (manager_dbus_is_running(m, false)) { + if (manager_dbus_is_running(m)) { log_info("Trying to reconnect to bus..."); (void) bus_init_api(m); @@ -4140,7 +4140,7 @@ void manager_recheck_dbus(Manager *m) { if (MANAGER_IS_RELOADING(m)) return; /* don't check while we are reloading… */ - if (manager_dbus_is_running(m, false)) { + if (manager_dbus_is_running(m)) { (void) bus_init_api(m); if (MANAGER_IS_SYSTEM(m)) diff --git a/src/core/manager.h b/src/core/manager.h index 486eda11b6..951d46222e 100644 --- a/src/core/manager.h +++ b/src/core/manager.h @@ -504,6 +504,11 @@ DEFINE_TRIVIAL_CLEANUP_FUNC(Manager*, manager_free); int manager_startup(Manager *m, FILE *serialization, FDSet *fds, const char *root); +bool manager_dbus_is_running_full(Manager *m, bool deserialized); +static inline bool manager_dbus_is_running(Manager *m) { + return manager_dbus_is_running_full(m, false); +} + Job *manager_get_job(Manager *m, uint32_t id); Unit *manager_get_unit(Manager *m, const char *name); |