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: implement synchronous message calls via kernel ioctl
[elogind.git]
/
src
/
libsystemd
/
sd-bus
/
sd-bus.c
diff --git
a/src/libsystemd/sd-bus/sd-bus.c
b/src/libsystemd/sd-bus/sd-bus.c
index 95d80db2405c8698527c28a9fb5448d95cc340ac..2c458f311c0912aaef1e85e15d89256376cf8624 100644
(file)
--- a/
src/libsystemd/sd-bus/sd-bus.c
+++ b/
src/libsystemd/sd-bus/sd-bus.c
@@
-1371,14
+1371,14
@@
int bus_seal_synthetic_message(sd_bus *b, sd_bus_message *m) {
return bus_message_seal(m, 0xFFFFFFFFULL, 0);
}
return bus_message_seal(m, 0xFFFFFFFFULL, 0);
}
-static int bus_write_message(sd_bus *bus, sd_bus_message *m, size_t *idx) {
+static int bus_write_message(sd_bus *bus, sd_bus_message *m,
bool hint_sync_call,
size_t *idx) {
int r;
assert(bus);
assert(m);
if (bus->is_kernel)
int r;
assert(bus);
assert(m);
if (bus->is_kernel)
- r = bus_kernel_write_message(bus, m);
+ r = bus_kernel_write_message(bus, m
, hint_sync_call
);
else
r = bus_socket_write_message(bus, m, idx);
else
r = bus_socket_write_message(bus, m, idx);
@@
-1408,7
+1408,7
@@
static int dispatch_wqueue(sd_bus *bus) {
while (bus->wqueue_size > 0) {
while (bus->wqueue_size > 0) {
- r = bus_write_message(bus, bus->wqueue[0], &bus->windex);
+ r = bus_write_message(bus, bus->wqueue[0],
false,
&bus->windex);
if (r < 0)
return r;
else if (r == 0)
if (r < 0)
return r;
else if (r == 0)
@@
-1486,7
+1486,7
@@
static int dispatch_rqueue(sd_bus *bus, sd_bus_message **m) {
}
}
}
}
-
_public_ int sd_bus_send(sd_bus *bus, sd_bus_message *_m, uint64_t *cookie
) {
+
static int bus_send_internal(sd_bus *bus, sd_bus_message *_m, uint64_t *cookie, bool hint_sync_call
) {
_cleanup_bus_message_unref_ sd_bus_message *m = sd_bus_message_ref(_m);
int r;
_cleanup_bus_message_unref_ sd_bus_message *m = sd_bus_message_ref(_m);
int r;
@@
-1526,7
+1526,7
@@
_public_ int sd_bus_send(sd_bus *bus, sd_bus_message *_m, uint64_t *cookie) {
if ((bus->state == BUS_RUNNING || bus->state == BUS_HELLO) && bus->wqueue_size <= 0) {
size_t idx = 0;
if ((bus->state == BUS_RUNNING || bus->state == BUS_HELLO) && bus->wqueue_size <= 0) {
size_t idx = 0;
- r = bus_write_message(bus, m, &idx);
+ r = bus_write_message(bus, m,
hint_sync_call,
&idx);
if (r < 0) {
if (r == -ENOTCONN || r == -ECONNRESET || r == -EPIPE || r == -ESHUTDOWN) {
bus_enter_closing(bus);
if (r < 0) {
if (r == -ENOTCONN || r == -ECONNRESET || r == -EPIPE || r == -ESHUTDOWN) {
bus_enter_closing(bus);
@@
-1562,6
+1562,10
@@
_public_ int sd_bus_send(sd_bus *bus, sd_bus_message *_m, uint64_t *cookie) {
return 1;
}
return 1;
}
+_public_ int sd_bus_send(sd_bus *bus, sd_bus_message *m, uint64_t *cookie) {
+ return bus_send_internal(bus, m, cookie, false);
+}
+
_public_ int sd_bus_send_to(sd_bus *bus, sd_bus_message *m, const char *destination, uint64_t *cookie) {
int r;
_public_ int sd_bus_send_to(sd_bus *bus, sd_bus_message *m, const char *destination, uint64_t *cookie) {
int r;
@@
-1755,7
+1759,7
@@
_public_ int sd_bus_call(
if (r < 0)
return r;
if (r < 0)
return r;
- r =
sd_bus_send(bus, m, &cooki
e);
+ r =
bus_send_internal(bus, m, &cookie, tru
e);
if (r < 0)
return r;
if (r < 0)
return r;