chiark / gitweb /
bus: break reference cycle between bus and messages
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Tue, 14 Jan 2014 19:26:37 +0000 (14:26 -0500)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Thu, 16 Jan 2014 05:16:02 +0000 (00:16 -0500)
Previously (6ee4f99 bus: break reference cycle between bus and
messages) I committed the test code, but not the actual fix :)

Makefile.am
src/libsystemd/sd-bus.c

index 4fc9097..677de0c 100644 (file)
@@ -2096,6 +2096,7 @@ tests += \
        test-bus-marshal \
        test-bus-signature \
        test-bus-chat \
+       test-bus-cleanup \
        test-bus-server \
        test-bus-match \
        test-bus-kernel \
@@ -2157,6 +2158,15 @@ test_bus_chat_LDADD = \
        libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
+test_bus_cleanup_SOURCES = \
+       src/libsystemd/test-bus-cleanup.c
+
+test_bus_cleanup_LDADD = \
+       libsystemd-internal.la \
+       libsystemd-id128-internal.la \
+       libsystemd-daemon-internal.la \
+       libsystemd-shared.la
+
 test_bus_server_SOURCES = \
        src/libsystemd/test-bus-server.c
 
index 6bd1eaa..b76221e 100644 (file)
@@ -1259,12 +1259,25 @@ _public_ sd_bus *sd_bus_ref(sd_bus *bus) {
 }
 
 _public_ sd_bus *sd_bus_unref(sd_bus *bus) {
+        unsigned i;
 
         if (!bus)
                 return NULL;
 
-        if (REFCNT_DEC(bus->n_ref) <= 0)
-                bus_free(bus);
+        i = REFCNT_DEC(bus->n_ref);
+        if (i != bus->rqueue_size + bus->wqueue_size)
+                return NULL;
+
+        for (i = 0; i < bus->rqueue_size; i++)
+                if (bus->rqueue[i]->n_ref > 1)
+                        return NULL;
+
+        for (i = 0; i < bus->wqueue_size; i++)
+                if (bus->wqueue[i]->n_ref > 1)
+                        return NULL;
+
+        /* we are the only holders on the messages */
+        bus_free(bus);
 
         return NULL;
 }