bus: break reference cycle between bus and messages

Previously (6ee4f99 bus: break reference cycle between bus and
messages) I committed the test code, but not the actual fix :)
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2014-01-16 00:16:02 -05:00
parent 8114dedc59
commit b7fc42e03a
2 changed files with 25 additions and 2 deletions
+15 -2
View 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;
}