shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-25 23:21:33 +03:00
Code

bus: rename sd_bus_send_with_reply_and_block() to sd_bus_call()

Browse Source 
The call is one of the most important ones we expose, where we place
major emphasis on. We should make sure to give it a short, memorable
name.
This commit is contained in:
Lennart Poettering 2013-11-11 18:55:34 +01:00
parent 1823b86ebf
commit c49b30a235
13 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libsystemd-bus/bus-convenience.c
View File

@ -87,7 +87,7 @@ _public_ int sd_bus_call_method(
return r;
}
return sd_bus_send_with_reply_and_block(bus, m, 0, error, reply);
return sd_bus_call(bus, m, 0, error, reply);
}
_public_ int sd_bus_reply_method_return(
@ -422,5 +422,5 @@ _public_ int sd_bus_set_property(
if (r < 0)
return r;
return sd_bus_send_with_reply_and_block(bus, m, 0, error, NULL);
return sd_bus_call(bus, m, 0, error, NULL);
}

4
src/libsystemd-bus/bus-util.c
View File

@ -236,7 +236,7 @@ static void async_polkit_query_free(sd_bus *b, AsyncPolkitQuery *q) {
return;
if (q->serial > 0 && b)
sd_bus_send_with_reply_cancel(b, q->serial);
sd_bus_call_async_cancel(b, q->serial);
sd_bus_message_unref(q->request);
sd_bus_message_unref(q->reply);
@ -362,7 +362,7 @@ int bus_verify_polkit_async(
return r;
}
r = sd_bus_send_with_reply(bus, pk, async_polkit_callback, q, 0, &q->serial);
r = sd_bus_call_async(bus, pk, async_polkit_callback, q, 0, &q->serial);
if (r < 0)
return r;

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

@ -396,7 +396,7 @@ static int bus_send_hello(sd_bus *bus) {
if (r < 0)
return r;
return sd_bus_send_with_reply(bus, m, hello_callback, NULL, 0, &bus->hello_serial);
return sd_bus_call_async(bus, m, hello_callback, NULL, 0, &bus->hello_serial);
}
int bus_start_running(sd_bus *bus) {
@ -1440,7 +1440,7 @@ static int timeout_compare(const void *a, const void *b) {
return 0;
}
_public_ int sd_bus_send_with_reply(
_public_ int sd_bus_call_async(
sd_bus *bus,
sd_bus_message *m,
sd_bus_message_handler_t callback,
@ -1492,21 +1492,21 @@ _public_ int sd_bus_send_with_reply(
r = prioq_put(bus->reply_callbacks_prioq, c, &c->prioq_idx);
if (r < 0) {
c->timeout = 0;
sd_bus_send_with_reply_cancel(bus, c->serial);
sd_bus_call_async_cancel(bus, c->serial);
return r;
}
}
r = sd_bus_send(bus, m, serial);
if (r < 0) {
sd_bus_send_with_reply_cancel(bus, c->serial);
sd_bus_call_async_cancel(bus, c->serial);
return r;
}
return r;
}
_public_ int sd_bus_send_with_reply_cancel(sd_bus *bus, uint64_t serial) {
_public_ int sd_bus_call_async_cancel(sd_bus *bus, uint64_t serial) {
struct reply_callback *c;
assert_return(bus, -EINVAL);
@ -1549,7 +1549,7 @@ int bus_ensure_running(sd_bus *bus) {
}
}
_public_ int sd_bus_send_with_reply_and_block(
_public_ int sd_bus_call(
sd_bus *bus,
sd_bus_message *m,
uint64_t usec,

6
src/libsystemd-bus/test-bus-chat.c
View File

@ -437,7 +437,7 @@ static void* client2(void*p) {
goto finish;
}
r = sd_bus_send_with_reply_and_block(bus, m, 0, &error, &reply);
r = sd_bus_call(bus, m, 0, &error, &reply);
if (r < 0) {
log_error("Failed to issue method call: %s", bus_error_message(&error, -r));
goto finish;
@ -469,7 +469,7 @@ static void* client2(void*p) {
sd_bus_message_unref(reply);
reply = NULL;
r = sd_bus_send_with_reply_and_block(bus, m, 200 * USEC_PER_MSEC, &error, &reply);
r = sd_bus_call(bus, m, 200 * USEC_PER_MSEC, &error, &reply);
if (r < 0)
log_info("Failed to issue method call: %s", bus_error_message(&error, -r));
else
@ -490,7 +490,7 @@ static void* client2(void*p) {
goto finish;
}
r = sd_bus_send_with_reply(bus, m, quit_callback, &quit, 200 * USEC_PER_MSEC, NULL);
r = sd_bus_call_async(bus, m, quit_callback, &quit, 200 * USEC_PER_MSEC, NULL);
if (r < 0) {
log_info("Failed to issue method call: %s", bus_error_message(&error, -r));
goto finish;

2
src/libsystemd-bus/test-bus-kernel-benchmark.c
View File

@ -82,7 +82,7 @@ static void transaction(sd_bus *b, size_t sz) {
memset(p, 0x80, sz);
assert_se(sd_bus_send_with_reply_and_block(b, m, 0, NULL, &reply) >= 0);
assert_se(sd_bus_call(b, m, 0, NULL, &reply) >= 0);
}
static void client_bisect(const char *address) {

2
src/libsystemd-bus/test-bus-server.c
View File

@ -151,7 +151,7 @@ static int client(struct context *c) {
return r;
}
r = sd_bus_send_with_reply_and_block(bus, m, 0, &error, &reply);
r = sd_bus_call(bus, m, 0, &error, &reply);
if (r < 0) {
log_error("Failed to issue method call: %s", bus_error_message(&error, -r));
return r;

2
src/locale/localectl.c
View File

@ -164,7 +164,7 @@ static int set_locale(sd_bus *bus, char **args, unsigned n) {
if (r < 0)
return bus_log_create_error(r);
r = sd_bus_send_with_reply_and_block(bus, m, 0, &error, NULL);
r = sd_bus_call(bus, m, 0, &error, NULL);
if (r < 0) {
log_error("Failed to issue method call: %s", bus_error_message(&error, -r));
return r;

2
src/locale/localed.c
View File

@ -382,7 +382,7 @@ static int locale_update_system_manager(Context *c, sd_bus *bus) {
if (r < 0)
return r;
r = sd_bus_send_with_reply_and_block(bus, m, 0, &error, NULL);
r = sd_bus_call(bus, m, 0, &error, NULL);
if (r < 0)
log_error("Failed to update the manager environment: %s", strerror(-r));

2
src/login/logind-dbus.c
View File

@ -2216,7 +2216,7 @@ int manager_start_scope(
if (r < 0)
return r;
r = sd_bus_send_with_reply_and_block(manager->bus, m, 0, error, &reply);
r = sd_bus_call(manager->bus, m, 0, error, &reply);
if (r < 0)
return r;

2
src/machine/machined-dbus.c
View File

@ -529,7 +529,7 @@ int manager_start_scope(
if (r < 0)
return r;
r = sd_bus_send_with_reply_and_block(manager->bus, m, 0, error, &reply);
r = sd_bus_call(manager->bus, m, 0, error, &reply);
if (r < 0)
return r;

2
src/run/run.c
View File

@ -237,7 +237,7 @@ static int message_start_transient_unit_send(sd_bus *bus, sd_bus_message *m, sd_
if (r < 0)
return r;
return sd_bus_send_with_reply_and_block(bus, m, 0, error, reply);
return sd_bus_call(bus, m, 0, error, reply);
}
static int start_transient_service(

6
src/systemctl/systemctl.c
View File

@ -3845,7 +3845,7 @@ static int set_property(sd_bus *bus, char **args) {
if (r < 0)
return bus_log_create_error(r);
r = sd_bus_send_with_reply_and_block(bus, m, -1, &error, NULL);
r = sd_bus_call(bus, m, 0, &error, NULL);
if (r < 0) {
log_error("Failed to set unit properties on %s: %s", n, bus_error_message(&error, r));
return r;
@ -4132,7 +4132,7 @@ static int set_environment(sd_bus *bus, char **args) {
if (r < 0)
return bus_log_create_error(r);
r = sd_bus_send_with_reply_and_block(bus, m, -1, &error, NULL);
r = sd_bus_call(bus, m, 0, &error, NULL);
if (r < 0) {
log_error("Failed to set environment: %s", bus_error_message(&error, r));
return r;
@ -4443,7 +4443,7 @@ static int enable_unit(sd_bus *bus, char **args) {
return bus_log_create_error(r);
}
r = sd_bus_send_with_reply_and_block(bus, m, -0, &error, &reply);
r = sd_bus_call(bus, m, 0, &error, &reply);
if (r < 0) {
log_error("Failed to execute operation: %s", bus_error_message(&error, r));
return r;

6
src/systemd/sd-bus.h
View File

@ -89,9 +89,9 @@ int sd_bus_can_send(sd_bus *bus, char type);
int sd_bus_get_server_id(sd_bus *bus, sd_id128_t *peer);
int sd_bus_send(sd_bus *bus, sd_bus_message *m, uint64_t *serial);
int sd_bus_send_with_reply(sd_bus *bus, sd_bus_message *m, sd_bus_message_handler_t callback, void *userdata, uint64_t usec, uint64_t *serial);
int sd_bus_send_with_reply_cancel(sd_bus *bus, uint64_t serial);
int sd_bus_send_with_reply_and_block(sd_bus *bus, sd_bus_message *m, uint64_t usec, sd_bus_error *error, sd_bus_message **r);
int sd_bus_call(sd_bus *bus, sd_bus_message *m, uint64_t usec, sd_bus_error *error, sd_bus_message **reply);
int sd_bus_call_async(sd_bus *bus, sd_bus_message *m, sd_bus_message_handler_t callback, void *userdata, uint64_t usec, uint64_t *serial);
int sd_bus_call_async_cancel(sd_bus *bus, uint64_t serial);
int sd_bus_get_fd(sd_bus *bus);
int sd_bus_get_events(sd_bus *bus);