system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-07-22 10:44:58 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

core/manager: export manager_dbus_is_running

Browse source
This commit is contained in:
Mike Yuan 2023-05-08 23:10:07 +08:00
parent 7429c8fe57
commit e886315065
No known key found for this signature in database
GPG key ID: 417471C0A40F58B3
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/core/manager.c
View file

@ -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))

5
src/core/manager.h
View file

@ -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);