chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus: properly detect and handle if a callback is installed/removed from within a...
[elogind.git]
/
src
/
libsystemd-bus
/
bus-internal.h
diff --git
a/src/libsystemd-bus/bus-internal.h
b/src/libsystemd-bus/bus-internal.h
index 1dcb38303858a890012eff122adc7695bffef545..6ff3163cfdbffe94975869c23b09219b71fd539a 100644
(file)
--- a/
src/libsystemd-bus/bus-internal.h
+++ b/
src/libsystemd-bus/bus-internal.h
@@
-35,7
+35,7
@@
#include "bus-match.h"
struct reply_callback {
#include "bus-match.h"
struct reply_callback {
- sd_message_handler_t callback;
+ sd_
bus_
message_handler_t callback;
void *userdata;
usec_t timeout;
uint64_t serial;
void *userdata;
usec_t timeout;
uint64_t serial;
@@
-43,18
+43,22
@@
struct reply_callback {
};
struct filter_callback {
};
struct filter_callback {
- sd_message_handler_t callback;
+ sd_
bus_
message_handler_t callback;
void *userdata;
void *userdata;
+ unsigned last_iteration;
+
LIST_FIELDS(struct filter_callback, callbacks);
};
struct object_callback {
LIST_FIELDS(struct filter_callback, callbacks);
};
struct object_callback {
- sd_message_handler_t callback;
+ sd_
bus_
message_handler_t callback;
void *userdata;
char *path;
bool is_fallback;
void *userdata;
char *path;
bool is_fallback;
+
+ unsigned last_iteration;
};
enum bus_state {
};
enum bus_state {
@@
-74,7
+78,7
@@
enum bus_auth {
struct sd_bus {
unsigned n_ref;
enum bus_state state;
struct sd_bus {
unsigned n_ref;
enum bus_state state;
- int fd;
+ int
input_fd, output_
fd;
int message_version;
bool negotiate_fds:1;
int message_version;
bool negotiate_fds:1;
@@
-83,6
+87,12
@@
struct sd_bus {
bool ucred_valid:1;
bool is_server:1;
bool anonymous_auth:1;
bool ucred_valid:1;
bool is_server:1;
bool anonymous_auth:1;
+ bool prefer_readv:1;
+ bool prefer_writev:1;
+ bool processing:1;
+ bool match_callbacks_modified:1;
+ bool filter_callbacks_modified:1;
+ bool object_callbacks_modified:1;
void *rbuffer;
size_t rbuffer_size;
void *rbuffer;
size_t rbuffer_size;
@@
-112,7
+122,7
@@
struct sd_bus {
} sockaddr;
socklen_t sockaddr_size;
} sockaddr;
socklen_t sockaddr_size;
- sd_id128_t
peer
;
+ sd_id128_t
server_id
;
char *address;
unsigned address_index;
char *address;
unsigned address_index;
@@
-136,6
+146,7
@@
struct sd_bus {
char **exec_argv;
uint64_t hello_serial;
char **exec_argv;
uint64_t hello_serial;
+ unsigned iteration_counter;
};
static inline void bus_unrefp(sd_bus **b) {
};
static inline void bus_unrefp(sd_bus **b) {