chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
fdb9161
)
bus: when closing the bus don't end up in a recursive destruction deadlock
author
Lennart Poettering
<lennart@poettering.net>
Mon, 3 Feb 2014 12:26:24 +0000
(13:26 +0100)
committer
Lennart Poettering
<lennart@poettering.net>
Mon, 3 Feb 2014 18:59:18 +0000
(19:59 +0100)
src/libsystemd/sd-bus/sd-bus.c
patch
|
blob
|
history
diff --git
a/src/libsystemd/sd-bus/sd-bus.c
b/src/libsystemd/sd-bus/sd-bus.c
index 420393054cab8d0dcc2497fb59c0a30574fa7624..4fdc246b7e1a1948638cd51cd0654f7bf94f526d 100644
(file)
--- a/
src/libsystemd/sd-bus/sd-bus.c
+++ b/
src/libsystemd/sd-bus/sd-bus.c
@@
-107,21
+107,21
@@
static void bus_node_destroy(sd_bus *b, struct node *n) {
}
static void bus_reset_queues(sd_bus *b) {
}
static void bus_reset_queues(sd_bus *b) {
- unsigned i;
-
assert(b);
assert(b);
- for (i = 0; i < b->rqueue_size; i++)
- sd_bus_message_unref(b->rqueue[i]);
+ while (b->rqueue_size > 0)
+ sd_bus_message_unref(b->rqueue[--b->rqueue_size]);
+
free(b->rqueue);
free(b->rqueue);
+ b->rqueue = NULL;
+ b->rqueue_allocated = 0;
- for (i = 0; i < b->wqueue_size; i++)
- sd_bus_message_unref(b->wqueue[i]);
- free(b->wqueue);
+ while (b->wqueue_size > 0)
+ sd_bus_message_unref(b->wqueue[--b->wqueue_size]);
-
b->rqueue = b->wqueue = NULL
;
- b->
rqueue_allocated = b->wqueue_allocated = 0
;
- b->
rqueue_size = b->wqueue_size
= 0;
+
free(b->wqueue)
;
+ b->
wqueue = NULL
;
+ b->
wqueue_allocated
= 0;
}
static void bus_free(sd_bus *b) {
}
static void bus_free(sd_bus *b) {
@@
-1340,21
+1340,36
@@
_public_ sd_bus *sd_bus_unref(sd_bus *bus) {
if (!bus)
return NULL;
if (!bus)
return NULL;
- i = REFCNT_DEC(bus->n_ref);
- if (i != bus->rqueue_size + bus->wqueue_size)
- return NULL;
+ if (REFCNT_GET(bus->n_ref) == bus->rqueue_size + bus->wqueue_size + 1) {
+ bool q = true;
+
+ for (i = 0; i < bus->rqueue_size; i++)
+ if (bus->rqueue[i]->n_ref > 1) {
+ q = false;
+ break;
+ }
- for (i = 0; i < bus->rqueue_size; i++)
- if (bus->rqueue[i]->n_ref > 1)
- return NULL;
+ if (q) {
+ for (i = 0; i < bus->wqueue_size; i++)
+ if (bus->wqueue[i]->n_ref > 1) {
+ q = false;
+ break;
+ }
+ }
- 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, and the
+ * messages are the only holders on us, so let's drop
+ * the messages and thus implicitly also kill our own
+ * last references */
- /* we are the only holders on the messages */
- bus_free(bus);
+ bus_reset_queues(bus);
+ }
+ i = REFCNT_DEC(bus->n_ref);
+ if (i > 0)
+ return NULL;
+
+ bus_free(bus);
return NULL;
}
return NULL;
}