picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sd-bus: drop match cookie concept 

THe match cookie was used by kdbus to identify matches we install
uniquely. But given that kdbus is gone, the cookie serves no process
anymore, let's kill it.
This commit is contained in:
Lennart Poettering 2017-09-29 17:57:34 +02:00
parent e28d086553
commit 532f808fd1
5 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libsystemd/sd-bus/bus-control.c
View File

@ -650,8 +650,7 @@ int bus_add_match_internal(
sd_bus *bus,
const char *match,
struct bus_match_component *components,
unsigned n_components,
uint64_t cookie) {
unsigned n_components) {
assert(bus);
@ -686,8 +685,7 @@ static int bus_remove_match_internal_dbus1(
int bus_remove_match_internal(
sd_bus *bus,
const char *match,
uint64_t cookie) {
const char *match) {
assert(bus);

7
src/libsystemd/sd-bus/bus-control.h
View File

@ -23,8 +23,5 @@
#include "bus-match.h"
int bus_add_match_internal(sd_bus *bus, const char *match, struct bus_match_component *components, unsigned n_components, uint64_t cookie);
int bus_remove_match_internal(sd_bus *bus, const char *match, uint64_t cookie);
int bus_add_match_internal_kernel(sd_bus *bus, struct bus_match_component *components, unsigned n_components, uint64_t cookie);
int bus_remove_match_internal_kernel(sd_bus *bus, uint64_t cookie);
int bus_add_match_internal(sd_bus *bus, const char *match, struct bus_match_component *components, unsigned n_components);
int bus_remove_match_internal(sd_bus *bus, const char *match);

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

@ -53,7 +53,6 @@ struct filter_callback {
struct match_callback {
sd_bus_message_handler_t callback;
uint64_t cookie;
unsigned last_iteration;
char *match_string;
@ -287,8 +286,6 @@ struct sd_bus {
uint64_t hello_flags;
uint64_t attach_flags;
uint64_t match_cookie;
sd_event_source *input_io_event_source;
sd_event_source *output_io_event_source;
sd_event_source *time_event_source;

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

@ -93,7 +93,7 @@ void bus_slot_disconnect(sd_bus_slot *slot) {
case BUS_MATCH_CALLBACK:
if (slot->match_added)
bus_remove_match_internal(slot->bus, slot->match_callback.match_string, slot->match_callback.cookie);
bus_remove_match_internal(slot->bus, slot->match_callback.match_string);
slot->bus->match_callbacks_modified = true;
bus_match_remove(&slot->bus->match_callbacks, &slot->match_callback);

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

@ -2858,7 +2858,6 @@ _public_ int sd_bus_add_match(
}
s->match_callback.callback = callback;
s->match_callback.cookie = ++bus->match_cookie;
if (bus->bus_client) {
enum bus_match_scope scope;
@ -2878,7 +2877,7 @@ _public_ int sd_bus_add_match(
goto finish;
}
r = bus_add_match_internal(bus, s->match_callback.match_string, components, n_components, s->match_callback.cookie);
r = bus_add_match_internal(bus, s->match_callback.match_string, components, n_components);
if (r < 0)
goto finish;