File 0002-bus-make-use-of-sd_bus_try_close-in-exit-o... of Package systemd.578

Overview Repositories Revisions Requests Users Attributes Meta

File 0002-bus-make-use-of-sd_bus_try_close-in-exit-on-idle-ser.patch of Package systemd.578 (Revision b88c65b2d8c409aaada43c073eca2758)

Currently displaying revision b88c65b2d8c409aaada43c073eca2758 , Show latest

From b27adf354a83ad25f4a209c0a6f7989ecab7b4e2 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 5 Jun 2014 13:31:25 +0200
Subject: [PATCH] bus: make use of sd_bus_try_close() in exit-on-idle services

---
 src/libsystemd/sd-bus/bus-util.c |   25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git src/libsystemd/sd-bus/bus-util.c src/libsystemd/sd-bus/bus-util.c
index 6bd21cc..6441c5b 100644
--- src/libsystemd/sd-bus/bus-util.c
+++ src/libsystemd/sd-bus/bus-util.c
@@ -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;
                 }
         }
 
-- 
1.7.9.2

Places

File 0002-bus-make-use-of-sd_bus_try_close-in-exit-on-idle-ser.patch of Package systemd.578 (Revision b88c65b2d8c409aaada43c073eca2758)

Places