shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-01 09:21:26 +03:00
Code

sd-bus: make sd_bus::reply_callbacks a OrderedHashmap

Browse Source 
The way process_closing() picks the first entry from reply_callbacks
and works with it makes it likely that it cares about the order.
This commit is contained in:
Michal Schmidt 2014-10-14 18:27:55 +02:00
parent c1f906bd91
commit c9fe4af70d
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libsystemd/sd-bus/bus-internal.h
View File

@ -230,7 +230,7 @@ struct sd_bus {
struct bus_match_node match_callbacks; struct bus_match_node match_callbacks;
Prioq *reply_callbacks_prioq; Prioq *reply_callbacks_prioq;
Hashmap *reply_callbacks; OrderedHashmap *reply_callbacks;
LIST_HEAD(struct filter_callback, filter_callbacks); LIST_HEAD(struct filter_callback, filter_callbacks);
Hashmap *nodes; Hashmap *nodes;

2
src/libsystemd/sd-bus/bus-slot.c
View File

@ -75,7 +75,7 @@ void bus_slot_disconnect(sd_bus_slot *slot) {
case BUS_REPLY_CALLBACK: case BUS_REPLY_CALLBACK:
if (slot->reply_callback.cookie != 0) if (slot->reply_callback.cookie != 0)
hashmap_remove(slot->bus->reply_callbacks, &slot->reply_callback.cookie); ordered_hashmap_remove(slot->bus->reply_callbacks, &slot->reply_callback.cookie);
if (slot->reply_callback.timeout != 0) if (slot->reply_callback.timeout != 0)
prioq_remove(slot->bus->reply_callbacks_prioq, &slot->reply_callback, &slot->reply_callback.prioq_idx); prioq_remove(slot->bus->reply_callbacks_prioq, &slot->reply_callback, &slot->reply_callback.prioq_idx);

14
src/libsystemd/sd-bus/sd-bus.c
View File

@ -139,7 +139,7 @@ static void bus_free(sd_bus *b) {
bus_reset_queues(b); bus_reset_queues(b);
hashmap_free_free(b->reply_callbacks); ordered_hashmap_free_free(b->reply_callbacks);
prioq_free(b->reply_callbacks_prioq); prioq_free(b->reply_callbacks_prioq);
assert(b->match_callbacks.type == BUS_MATCH_ROOT); assert(b->match_callbacks.type == BUS_MATCH_ROOT);
@ -1759,7 +1759,7 @@ _public_ int sd_bus_call_async(
if (!BUS_IS_OPEN(bus->state)) if (!BUS_IS_OPEN(bus->state))
return -ENOTCONN; return -ENOTCONN;
r = hashmap_ensure_allocated(&bus->reply_callbacks, &uint64_hash_ops); r = ordered_hashmap_ensure_allocated(&bus->reply_callbacks, &uint64_hash_ops);
if (r < 0) if (r < 0)
return r; return r;
@ -1782,7 +1782,7 @@ _public_ int sd_bus_call_async(
s->reply_callback.callback = callback; s->reply_callback.callback = callback;
s->reply_callback.cookie = BUS_MESSAGE_COOKIE(m); s->reply_callback.cookie = BUS_MESSAGE_COOKIE(m);
r = hashmap_put(bus->reply_callbacks, &s->reply_callback.cookie, &s->reply_callback); r = ordered_hashmap_put(bus->reply_callbacks, &s->reply_callback.cookie, &s->reply_callback);
if (r < 0) { if (r < 0) {
s->reply_callback.cookie = 0; s->reply_callback.cookie = 0;
return r; return r;
@ -2096,7 +2096,7 @@ static int process_timeout(sd_bus *bus) {
assert_se(prioq_pop(bus->reply_callbacks_prioq) == c); assert_se(prioq_pop(bus->reply_callbacks_prioq) == c);
c->timeout = 0; c->timeout = 0;
hashmap_remove(bus->reply_callbacks, &c->cookie); ordered_hashmap_remove(bus->reply_callbacks, &c->cookie);
c->cookie = 0; c->cookie = 0;
slot = container_of(c, sd_bus_slot, reply_callback); slot = container_of(c, sd_bus_slot, reply_callback);
@ -2165,7 +2165,7 @@ static int process_reply(sd_bus *bus, sd_bus_message *m) {
if (m->destination && bus->unique_name && !streq_ptr(m->destination, bus->unique_name)) if (m->destination && bus->unique_name && !streq_ptr(m->destination, bus->unique_name))
return 0; return 0;
c = hashmap_remove(bus->reply_callbacks, &m->reply_cookie); c = ordered_hashmap_remove(bus->reply_callbacks, &m->reply_cookie);
if (!c) if (!c)
return 0; return 0;
@ -2499,7 +2499,7 @@ static int process_closing(sd_bus *bus, sd_bus_message **ret) {
assert(bus); assert(bus);
assert(bus->state == BUS_CLOSING); assert(bus->state == BUS_CLOSING);
c = hashmap_first(bus->reply_callbacks); c = ordered_hashmap_first(bus->reply_callbacks);
if (c) { if (c) {
_cleanup_bus_error_free_ sd_bus_error error_buffer = SD_BUS_ERROR_NULL; _cleanup_bus_error_free_ sd_bus_error error_buffer = SD_BUS_ERROR_NULL;
sd_bus_slot *slot; sd_bus_slot *slot;
@ -2522,7 +2522,7 @@ static int process_closing(sd_bus *bus, sd_bus_message **ret) {
c->timeout = 0; c->timeout = 0;
} }
hashmap_remove(bus->reply_callbacks, &c->cookie); ordered_hashmap_remove(bus->reply_callbacks, &c->cookie);
c->cookie = 0; c->cookie = 0;
slot = container_of(c, sd_bus_slot, reply_callback); slot = container_of(c, sd_bus_slot, reply_callback);