shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-02-01 09:47:35 +03:00
Code

bus: make use of sd_bus_try_close() in exit-on-idle services

Browse Source
This commit is contained in:
Lennart Poettering 2014-06-05 13:31:25 +02:00
parent eec6022cf0
commit b27adf354a
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/libsystemd/sd-bus/bus-util.c
View File

@ -43,7 +43,9 @@ static int name_owner_change_callback(sd_bus *bus, sd_bus_message *m, void *user
assert(m);
assert(e);
sd_bus_close(bus);
sd_event_exit(e, 0);
return 1;
}
@ -121,11 +123,30 @@ int bus_event_loop_with_idle(
return r;
if (r == 0 && !exiting) {
r = bus_async_unregister_and_exit(e, bus, name);
r = sd_bus_try_close(bus);
if (r == -EBUSY)
continue;
if (r == -ENOTSUP) {
/* Fallback for dbus1 connections: we
* unregister the name and wait for
* the response to come through for
* it */
r = bus_async_unregister_and_exit(e, bus, name);
if (r < 0)
return r;
exiting = true;
continue;
}
if (r < 0)
return r;
exiting = true;
sd_event_exit(e, 0);
break;
}
}