[systemd-commits] 3 commits - src/libsystemd-bus
Lennart Poettering
lennart at kemper.freedesktop.org
Mon Oct 14 13:03:56 PDT 2013
src/libsystemd-bus/bus-internal.h | 6
src/libsystemd-bus/bus-objects.c | 193 +++++++++++++++---
src/libsystemd-bus/sd-bus.c | 352 +++++++++++-----------------------
src/libsystemd-bus/test-bus-objects.c | 8
4 files changed, 283 insertions(+), 276 deletions(-)
New commits:
commit 68313d3dfa2082dae8a06643d639e0200afc19fc
Author: Lennart Poettering <lennart at poettering.net>
Date: Mon Oct 14 21:58:06 2013 +0200
bus: properly handle if new objects are installed in the node tree while we are dispatching to one
diff --git a/src/libsystemd-bus/bus-objects.c b/src/libsystemd-bus/bus-objects.c
index 9142fab..4091490 100644
--- a/src/libsystemd-bus/bus-objects.c
+++ b/src/libsystemd-bus/bus-objects.c
@@ -77,6 +77,8 @@ static int vtable_property_get_userdata(
r = node_vtable_get_userdata(bus, path, p->parent, &u);
if (r <= 0)
return r;
+ if (bus->nodes_modified)
+ return 0;
*userdata = vtable_property_convert_userdata(p->vtable, u);
return 1;
@@ -98,6 +100,9 @@ static int add_enumerated_to_set(
LIST_FOREACH(enumerators, c, first) {
char **children = NULL, **k;
+ if (bus->nodes_modified)
+ return 0;
+
r = c->callback(bus, prefix, &children, c->userdata);
if (r < 0)
return r;
@@ -142,6 +147,8 @@ static int add_subtree_to_set(
r = add_enumerated_to_set(bus, prefix, n->enumerators, s);
if (r < 0)
return r;
+ if (bus->nodes_modified)
+ return 0;
LIST_FOREACH(siblings, i, n->child) {
char *t;
@@ -157,6 +164,8 @@ static int add_subtree_to_set(
r = add_subtree_to_set(bus, prefix, i, s);
if (r < 0)
return r;
+ if (bus->nodes_modified)
+ return 0;
}
return 0;
@@ -205,6 +214,9 @@ static int node_callbacks_run(
assert(found_object);
LIST_FOREACH(callbacks, c, first) {
+ if (bus->nodes_modified)
+ return 0;
+
if (require_fallback && !c->is_fallback)
continue;
@@ -213,6 +225,8 @@ static int node_callbacks_run(
if (c->last_iteration == bus->iteration_counter)
continue;
+ c->last_iteration = bus->iteration_counter;
+
r = sd_bus_message_rewind(m, true);
if (r < 0)
return r;
@@ -247,9 +261,16 @@ static int method_callbacks_run(
r = node_vtable_get_userdata(bus, m->path, c->parent, &u);
if (r <= 0)
return r;
+ if (bus->nodes_modified)
+ return 0;
*found_object = true;
+ if (c->last_iteration == bus->iteration_counter)
+ return 0;
+
+ c->last_iteration = bus->iteration_counter;
+
r = sd_bus_message_rewind(m, true);
if (r < 0)
return r;
@@ -412,6 +433,8 @@ static int property_get_set_callbacks_run(
r = vtable_property_get_userdata(bus, m->path, c, &u);
if (r <= 0)
return r;
+ if (bus->nodes_modified)
+ return 0;
*found_object = true;
@@ -419,9 +442,14 @@ static int property_get_set_callbacks_run(
if (r < 0)
return r;
- c->last_iteration = bus->iteration_counter;
-
if (is_get) {
+ /* Note that we do not protect against reexecution
+ * here (using the last_iteration check, see below),
+ * should the node tree have changed and we got called
+ * again. We assume that property Get() calls are
+ * ultimately without side-effects or if they aren't
+ * then at least idempotent. */
+
r = sd_bus_message_open_container(reply, 'v', c->vtable->x.property.signature);
if (r < 0)
return r;
@@ -438,6 +466,9 @@ static int property_get_set_callbacks_run(
return 1;
}
+ if (bus->nodes_modified)
+ return 0;
+
r = sd_bus_message_close_container(reply);
if (r < 0)
return r;
@@ -446,6 +477,15 @@ static int property_get_set_callbacks_run(
if (c->vtable->type != _SD_BUS_VTABLE_WRITABLE_PROPERTY)
sd_bus_error_setf(&error, "org.freedesktop.DBus.Error.PropertyReadOnly", "Property '%s' is not writable.", c->member);
else {
+ /* Avoid that we call the set routine more
+ * than once if the processing of this message
+ * got restarted because the node tree
+ * changed. */
+ if (c->last_iteration == bus->iteration_counter)
+ return 0;
+
+ c->last_iteration = bus->iteration_counter;
+
r = sd_bus_message_enter_container(m, 'v', c->vtable->x.property.signature);
if (r < 0)
return r;
@@ -463,6 +503,9 @@ static int property_get_set_callbacks_run(
return 1;
}
+ if (bus->nodes_modified)
+ return 0;
+
r = sd_bus_message_exit_container(m);
if (r < 0)
return r;
@@ -510,9 +553,10 @@ static int vtable_append_all_properties(
r = invoke_property_get(bus, v, path, c->interface, v->x.property.member, reply, error, vtable_property_convert_userdata(v, userdata));
if (r < 0)
return r;
-
if (sd_bus_error_is_set(error))
return 0;
+ if (bus->nodes_modified)
+ return 0;
r = sd_bus_message_close_container(reply);
if (r < 0)
@@ -561,6 +605,8 @@ static int property_get_all_callbacks_run(
r = node_vtable_get_userdata(bus, m->path, c, &u);
if (r < 0)
return r;
+ if (bus->nodes_modified)
+ return 0;
if (r == 0)
continue;
@@ -570,8 +616,6 @@ static int property_get_all_callbacks_run(
continue;
found_interface = true;
- c->last_iteration = bus->iteration_counter;
-
r = vtable_append_all_properties(bus, reply, m->path, c, u, &error);
if (r < 0)
return r;
@@ -583,6 +627,8 @@ static int property_get_all_callbacks_run(
return 1;
}
+ if (bus->nodes_modified)
+ return 0;
}
if (!found_interface) {
@@ -650,6 +696,8 @@ static bool bus_node_exists(
if (node_vtable_get_userdata(bus, path, c, NULL) > 0)
return true;
+ if (bus->nodes_modified)
+ return false;
}
return !require_fallback && (n->enumerators || n->object_manager);
@@ -677,6 +725,8 @@ static int process_introspect(
r = get_child_nodes(bus, m->path, n, &s);
if (r < 0)
return r;
+ if (bus->nodes_modified)
+ return 0;
r = introspect_begin(&intro);
if (r < 0)
@@ -695,6 +745,8 @@ static int process_introspect(
r = node_vtable_get_userdata(bus, m->path, c, NULL);
if (r < 0)
return r;
+ if (bus->nodes_modified)
+ return 0;
if (r == 0)
continue;
@@ -711,7 +763,8 @@ static int process_introspect(
r = bus_node_exists(bus, n, m->path, require_fallback);
if (r < 0)
return r;
-
+ if (bus->nodes_modified)
+ return 0;
if (r == 0)
goto finish;
}
@@ -768,6 +821,8 @@ static int object_manager_serialize_vtable(
r = vtable_append_all_properties(bus, reply, path, c, userdata, error);
if (r < 0)
return r;
+ if (bus->nodes_modified)
+ return 0;
r = sd_bus_message_close_container(reply);
if (r < 0)
@@ -812,6 +867,8 @@ static int object_manager_serialize_path(
r = node_vtable_get_userdata(bus, path, i, &u);
if (r < 0)
return r;
+ if (bus->nodes_modified)
+ return 0;
if (r == 0)
continue;
@@ -836,6 +893,8 @@ static int object_manager_serialize_path(
return r;
if (sd_bus_error_is_set(error))
return 0;
+ if (bus->nodes_modified)
+ return 0;
}
if (found_something) {
@@ -871,6 +930,8 @@ static int object_manager_serialize_path_and_fallbacks(
return r;
if (sd_bus_error_is_set(error))
return 0;
+ if (bus->nodes_modified)
+ return 0;
/* Second, add fallback vtables registered for any of the prefixes */
prefix = alloca(strlen(path) + 1);
@@ -878,9 +939,10 @@ static int object_manager_serialize_path_and_fallbacks(
r = object_manager_serialize_path(bus, reply, prefix, path, true, error);
if (r < 0)
return r;
-
if (sd_bus_error_is_set(error))
return 0;
+ if (bus->nodes_modified)
+ return 0;
}
return 0;
@@ -909,6 +971,8 @@ static int process_get_managed_objects(
r = get_child_nodes(bus, m->path, n, &s);
if (r < 0)
return r;
+ if (bus->nodes_modified)
+ return 0;
r = sd_bus_message_new_method_return(bus, m, &reply);
if (r < 0)
@@ -960,6 +1024,9 @@ static int process_get_managed_objects(
return 1;
}
+
+ if (bus->nodes_modified)
+ return 0;
}
}
@@ -998,6 +1065,8 @@ static int object_find_and_run(
r = node_callbacks_run(bus, m, n->callbacks, require_fallback, found_object);
if (r != 0)
return r;
+ if (bus->nodes_modified)
+ return 0;
if (!m->interface || !m->member)
return 0;
@@ -1012,6 +1081,8 @@ static int object_find_and_run(
r = method_callbacks_run(bus, m, v, require_fallback, found_object);
if (r != 0)
return r;
+ if (bus->nodes_modified)
+ return 0;
}
/* Then, look for a known property */
@@ -1071,11 +1142,13 @@ static int object_find_and_run(
return r;
}
+ if (bus->nodes_modified)
+ return 0;
+
if (!*found_object) {
r = bus_node_exists(bus, n, m->path, require_fallback);
if (r < 0)
return r;
-
if (r > 0)
*found_object = true;
}
@@ -1256,6 +1329,8 @@ static int bus_add_object(
c->is_fallback = fallback;
LIST_PREPEND(callbacks, n->callbacks, c);
+ bus->nodes_modified = true;
+
return 0;
fail:
@@ -1293,6 +1368,7 @@ static int bus_remove_object(
free(c);
bus_node_gc(bus, n);
+ bus->nodes_modified = true;
return 1;
}
@@ -1547,6 +1623,8 @@ static int add_object_vtable_internal(
}
LIST_PREPEND(vtables, n->vtables, c);
+ bus->nodes_modified = true;
+
return 0;
fail:
@@ -1587,6 +1665,8 @@ static int remove_object_vtable_internal(
free_node_vtable(bus, c);
bus_node_gc(bus, n);
+ bus->nodes_modified = true;
+
return 1;
}
@@ -1657,6 +1737,9 @@ int sd_bus_add_node_enumerator(
c->userdata = userdata;
LIST_PREPEND(enumerators, n->enumerators, c);
+
+ bus->nodes_modified = true;
+
return 0;
fail:
@@ -1695,6 +1778,8 @@ int sd_bus_remove_node_enumerator(
bus_node_gc(bus, n);
+ bus->nodes_modified = true;
+
return 1;
}
@@ -1738,6 +1823,8 @@ static int emit_properties_changed_on_interface(
r = node_vtable_get_userdata(bus, path, c, &u);
if (r <= 0)
return r;
+ if (bus->nodes_modified)
+ return 0;
r = sd_bus_message_new_signal(bus, path, "org.freedesktop.DBus.Properties", "PropertiesChanged", &m);
if (r < 0)
@@ -1788,9 +1875,10 @@ static int emit_properties_changed_on_interface(
r = invoke_property_get(bus, v->vtable, m->path, interface, *property, m, &error, vtable_property_convert_userdata(v->vtable, u));
if (r < 0)
return r;
-
if (sd_bus_error_is_set(&error))
return bus_error_to_errno(&error);
+ if (bus->nodes_modified)
+ return 0;
r = sd_bus_message_close_container(m);
if (r < 0)
@@ -1856,16 +1944,25 @@ int sd_bus_emit_properties_changed_strv(
if (strv_isempty(names))
return 0;
- r = emit_properties_changed_on_interface(bus, path, path, interface, false, names);
- if (r != 0)
- return r;
+ do {
+ bus->nodes_modified = false;
- prefix = alloca(strlen(path) + 1);
- OBJECT_PATH_FOREACH_PREFIX(prefix, path) {
- r = emit_properties_changed_on_interface(bus, prefix, path, interface, true, names);
+ r = emit_properties_changed_on_interface(bus, path, path, interface, false, names);
if (r != 0)
return r;
- }
+ if (bus->nodes_modified)
+ continue;
+
+ prefix = alloca(strlen(path) + 1);
+ OBJECT_PATH_FOREACH_PREFIX(prefix, path) {
+ r = emit_properties_changed_on_interface(bus, prefix, path, interface, true, names);
+ if (r != 0)
+ return r;
+ if (bus->nodes_modified)
+ break;
+ }
+
+ } while (bus->nodes_modified);
return -ENOENT;
}
@@ -1936,6 +2033,8 @@ static int interfaces_added_append_one_prefix(
r = node_vtable_get_userdata(bus, path, c, &u);
if (r <= 0)
return r;
+ if (bus->nodes_modified)
+ return 0;
r = sd_bus_message_append_basic(m, 's', interface);
if (r < 0)
@@ -1948,9 +2047,10 @@ static int interfaces_added_append_one_prefix(
r = vtable_append_all_properties(bus, m,path, c, u, &error);
if (r < 0)
return r;
-
if (sd_bus_error_is_set(&error))
return bus_error_to_errno(&error);
+ if (bus->nodes_modified)
+ return 0;
r = sd_bus_message_close_container(m);
if (r < 0)
@@ -1976,12 +2076,16 @@ static int interfaces_added_append_one(
r = interfaces_added_append_one_prefix(bus, m, path, path, interface, false);
if (r != 0)
return r;
+ if (bus->nodes_modified)
+ return 0;
prefix = alloca(strlen(path) + 1);
OBJECT_PATH_FOREACH_PREFIX(prefix, path) {
r = interfaces_added_append_one_prefix(bus, m, prefix, path, interface, true);
if (r != 0)
return r;
+ if (bus->nodes_modified)
+ return 0;
}
return -ENOENT;
@@ -2002,37 +2106,51 @@ int sd_bus_emit_interfaces_added_strv(sd_bus *bus, const char *path, char **inte
if (strv_isempty(interfaces))
return 0;
- r = sd_bus_message_new_signal(bus, path, "org.freedesktop.DBus.ObjectManager", "InterfacesAdded", &m);
- if (r < 0)
- return r;
-
- r = sd_bus_message_append_basic(m, 'o', path);
- if (r < 0)
- return r;
+ do {
+ bus->nodes_modified = false;
- r = sd_bus_message_open_container(m, 'a', "{sa{sv}}");
- if (r < 0)
- return r;
+ if (m)
+ m = sd_bus_message_unref(m);
- STRV_FOREACH(i, interfaces) {
- assert_return(interface_name_is_valid(*i), -EINVAL);
+ r = sd_bus_message_new_signal(bus, path, "org.freedesktop.DBus.ObjectManager", "InterfacesAdded", &m);
+ if (r < 0)
+ return r;
- r = sd_bus_message_open_container(m, 'e', "sa{sv}");
+ r = sd_bus_message_append_basic(m, 'o', path);
if (r < 0)
return r;
- r = interfaces_added_append_one(bus, m, path, *i);
+ r = sd_bus_message_open_container(m, 'a', "{sa{sv}}");
if (r < 0)
return r;
+ STRV_FOREACH(i, interfaces) {
+ assert_return(interface_name_is_valid(*i), -EINVAL);
+
+ r = sd_bus_message_open_container(m, 'e', "sa{sv}");
+ if (r < 0)
+ return r;
+
+ r = interfaces_added_append_one(bus, m, path, *i);
+ if (r < 0)
+ return r;
+
+ if (bus->nodes_modified)
+ break;
+
+ r = sd_bus_message_close_container(m);
+ if (r < 0)
+ return r;
+ }
+
+ if (bus->nodes_modified)
+ continue;
+
r = sd_bus_message_close_container(m);
if (r < 0)
return r;
- }
- r = sd_bus_message_close_container(m);
- if (r < 0)
- return r;
+ } while (bus->nodes_modified);
return sd_bus_send(bus, m, NULL);
}
@@ -2114,6 +2232,7 @@ int sd_bus_add_object_manager(sd_bus *bus, const char *path) {
return -ENOMEM;
n->object_manager = true;
+ bus->nodes_modified = true;
return 0;
}
@@ -2132,6 +2251,7 @@ int sd_bus_remove_object_manager(sd_bus *bus, const char *path) {
return 0;
n->object_manager = false;
+ bus->nodes_modified = true;
bus_node_gc(bus, n);
return 1;
diff --git a/src/libsystemd-bus/test-bus-objects.c b/src/libsystemd-bus/test-bus-objects.c
index 2757f69..543063f 100644
--- a/src/libsystemd-bus/test-bus-objects.c
+++ b/src/libsystemd-bus/test-bus-objects.c
@@ -34,14 +34,6 @@
#include "bus-internal.h"
#include "bus-message.h"
-/* Test:
- *
- * Add in:
- *
- * node hierarchy updates during dispatching
- *
- */
-
struct context {
int fds[2];
bool quit;
commit 8ce2afd6347dcf01e33fe1ff257e2b0fffa8edfe
Author: Lennart Poettering <lennart at poettering.net>
Date: Mon Oct 14 19:53:56 2013 +0200
bus: make sure that we always keep a ref to the bus when we dispatch callbacks
Otherwise the callback might unref the bus we are processing and destroy
the object while we are processing it.
diff --git a/src/libsystemd-bus/bus-internal.h b/src/libsystemd-bus/bus-internal.h
index 6499d6b..31e10b2 100644
--- a/src/libsystemd-bus/bus-internal.h
+++ b/src/libsystemd-bus/bus-internal.h
@@ -294,3 +294,9 @@ bool bus_pid_changed(sd_bus *bus);
for (char *_slash = ({ strcpy((prefix), (path)); streq((prefix), "/") ? NULL : strrchr((prefix), '/'); }) ; \
_slash && !(_slash[(_slash) == (prefix)] = 0); \
_slash = streq((prefix), "/") ? NULL : strrchr((prefix), '/'))
+
+/* If we are invoking callbacks of a bus object, ensure unreffing the
+ * bus from the callback doesn't destroy the object we are working
+ * on */
+#define BUS_DONT_DESTROY(bus) \
+ _cleanup_bus_unref_ sd_bus *_dont_destroy_##bus = sd_bus_ref(bus)
diff --git a/src/libsystemd-bus/bus-objects.c b/src/libsystemd-bus/bus-objects.c
index cd56d13..9142fab 100644
--- a/src/libsystemd-bus/bus-objects.c
+++ b/src/libsystemd-bus/bus-objects.c
@@ -1843,6 +1843,7 @@ int sd_bus_emit_properties_changed_strv(
const char *interface,
char **names) {
+ BUS_DONT_DESTROY(bus);
char *prefix;
int r;
@@ -1987,6 +1988,8 @@ static int interfaces_added_append_one(
}
int sd_bus_emit_interfaces_added_strv(sd_bus *bus, const char *path, char **interfaces) {
+ BUS_DONT_DESTROY(bus);
+
_cleanup_bus_message_unref_ sd_bus_message *m = NULL;
char **i;
int r;
diff --git a/src/libsystemd-bus/sd-bus.c b/src/libsystemd-bus/sd-bus.c
index 44c13d3..ee5f395 100644
--- a/src/libsystemd-bus/sd-bus.c
+++ b/src/libsystemd-bus/sd-bus.c
@@ -1870,6 +1870,7 @@ null_message:
}
int sd_bus_process(sd_bus *bus, sd_bus_message **ret) {
+ BUS_DONT_DESTROY(bus);
int r;
/* Returns 0 when we didn't do anything. This should cause the
commit d68888227d2e1093f8e18753ba2e10a1cab7c6ad
Author: Lennart Poettering <lennart at poettering.net>
Date: Mon Oct 14 19:40:37 2013 +0200
bus: use assert_return() for more API calls
diff --git a/src/libsystemd-bus/sd-bus.c b/src/libsystemd-bus/sd-bus.c
index d9f9dfd..44c13d3 100644
--- a/src/libsystemd-bus/sd-bus.c
+++ b/src/libsystemd-bus/sd-bus.c
@@ -157,8 +157,7 @@ static void bus_free(sd_bus *b) {
int sd_bus_new(sd_bus **ret) {
sd_bus *r;
- if (!ret)
- return -EINVAL;
+ assert_return(ret, -EINVAL);
r = new0(sd_bus, 1);
if (!r)
@@ -187,14 +186,10 @@ int sd_bus_new(sd_bus **ret) {
int sd_bus_set_address(sd_bus *bus, const char *address) {
char *a;
- if (!bus)
- return -EINVAL;
- if (bus->state != BUS_UNSET)
- return -EPERM;
- if (!address)
- return -EINVAL;
- if (bus_pid_changed(bus))
- return -ECHILD;
+ assert_return(bus, -EINVAL);
+ assert_return(bus->state == BUS_UNSET, -EPERM);
+ assert_return(address, -EINVAL);
+ assert_return(!bus_pid_changed(bus), -ECHILD);
a = strdup(address);
if (!a)
@@ -207,16 +202,11 @@ int sd_bus_set_address(sd_bus *bus, const char *address) {
}
int sd_bus_set_fd(sd_bus *bus, int input_fd, int output_fd) {
- if (!bus)
- return -EINVAL;
- if (bus->state != BUS_UNSET)
- return -EPERM;
- if (input_fd < 0)
- return -EINVAL;
- if (output_fd < 0)
- return -EINVAL;
- if (bus_pid_changed(bus))
- return -ECHILD;
+ assert_return(bus, -EINVAL);
+ assert_return(bus->state == BUS_UNSET, -EPERM);
+ assert_return(input_fd >= 0, -EINVAL);
+ assert_return(output_fd >= 0, -EINVAL);
+ assert_return(!bus_pid_changed(bus), -ECHILD);
bus->input_fd = input_fd;
bus->output_fd = output_fd;
@@ -226,16 +216,11 @@ int sd_bus_set_fd(sd_bus *bus, int input_fd, int output_fd) {
int sd_bus_set_exec(sd_bus *bus, const char *path, char *const argv[]) {
char *p, **a;
- if (!bus)
- return -EINVAL;
- if (bus->state != BUS_UNSET)
- return -EPERM;
- if (!path)
- return -EINVAL;
- if (strv_isempty(argv))
- return -EINVAL;
- if (bus_pid_changed(bus))
- return -ECHILD;
+ assert_return(bus, -EINVAL);
+ assert_return(bus->state == BUS_UNSET, -EPERM);
+ assert_return(path, -EINVAL);
+ assert_return(!strv_isempty(argv), -EINVAL);
+ assert_return(!bus_pid_changed(bus), -ECHILD);
p = strdup(path);
if (!p)
@@ -257,122 +242,91 @@ int sd_bus_set_exec(sd_bus *bus, const char *path, char *const argv[]) {
}
int sd_bus_set_bus_client(sd_bus *bus, int b) {
- if (!bus)
- return -EINVAL;
- if (bus->state != BUS_UNSET)
- return -EPERM;
- if (bus_pid_changed(bus))
- return -ECHILD;
+ assert_return(bus, -EINVAL);
+ assert_return(bus->state == BUS_UNSET, -EPERM);
+ assert_return(!bus_pid_changed(bus), -ECHILD);
bus->bus_client = !!b;
return 0;
}
int sd_bus_negotiate_fds(sd_bus *bus, int b) {
- if (!bus)
- return -EINVAL;
- if (bus->state != BUS_UNSET)
- return -EPERM;
- if (bus_pid_changed(bus))
- return -ECHILD;
+ assert_return(bus, -EINVAL);
+ assert_return(bus->state == BUS_UNSET, -EPERM);
+ assert_return(!bus_pid_changed(bus), -ECHILD);
SET_FLAG(bus->hello_flags, KDBUS_HELLO_ACCEPT_FD, b);
return 0;
}
int sd_bus_negotiate_attach_comm(sd_bus *bus, int b) {
- if (!bus)
- return -EINVAL;
- if (bus->state != BUS_UNSET)
- return -EPERM;
- if (bus_pid_changed(bus))
- return -ECHILD;
+ assert_return(bus, -EINVAL);
+ assert_return(bus->state == BUS_UNSET, -EPERM);
+ assert_return(!bus_pid_changed(bus), -ECHILD);
SET_FLAG(bus->hello_flags, KDBUS_HELLO_ATTACH_COMM, b);
return 0;
}
int sd_bus_negotiate_attach_exe(sd_bus *bus, int b) {
- if (!bus)
- return -EINVAL;
- if (bus->state != BUS_UNSET)
- return -EPERM;
- if (bus_pid_changed(bus))
- return -ECHILD;
+ assert_return(bus, -EINVAL);
+ assert_return(bus->state == BUS_UNSET, -EPERM);
+ assert_return(!bus_pid_changed(bus), -ECHILD);
SET_FLAG(bus->hello_flags, KDBUS_HELLO_ATTACH_EXE, b);
return 0;
}
int sd_bus_negotiate_attach_cmdline(sd_bus *bus, int b) {
- if (!bus)
- return -EINVAL;
- if (bus->state != BUS_UNSET)
- return -EPERM;
- if (bus_pid_changed(bus))
- return -ECHILD;
+ assert_return(bus, -EINVAL);
+ assert_return(bus->state == BUS_UNSET, -EPERM);
+ assert_return(!bus_pid_changed(bus), -ECHILD);
SET_FLAG(bus->hello_flags, KDBUS_HELLO_ATTACH_CMDLINE, b);
return 0;
}
int sd_bus_negotiate_attach_cgroup(sd_bus *bus, int b) {
- if (!bus)
- return -EINVAL;
- if (bus->state != BUS_UNSET)
- return -EPERM;
- if (bus_pid_changed(bus))
- return -ECHILD;
+ assert_return(bus, -EINVAL);
+ assert_return(bus->state == BUS_UNSET, -EPERM);
+ assert_return(!bus_pid_changed(bus), -ECHILD);
SET_FLAG(bus->hello_flags, KDBUS_HELLO_ATTACH_CGROUP, b);
return 0;
}
int sd_bus_negotiate_attach_caps(sd_bus *bus, int b) {
- if (!bus)
- return -EINVAL;
- if (bus->state != BUS_UNSET)
- return -EPERM;
- if (bus_pid_changed(bus))
- return -ECHILD;
+ assert_return(bus, -EINVAL);
+ assert_return(bus->state == BUS_UNSET, -EPERM);
+ assert_return(!bus_pid_changed(bus), -ECHILD);
SET_FLAG(bus->hello_flags, KDBUS_HELLO_ATTACH_CAPS, b);
return 0;
}
int sd_bus_negotiate_attach_selinux_context(sd_bus *bus, int b) {
- if (!bus)
- return -EINVAL;
- if (bus->state != BUS_UNSET)
- return -EPERM;
- if (bus_pid_changed(bus))
- return -ECHILD;
+ assert_return(bus, -EINVAL);
+ assert_return(bus->state == BUS_UNSET, -EPERM);
+ assert_return(!bus_pid_changed(bus), -ECHILD);
SET_FLAG(bus->hello_flags, KDBUS_HELLO_ATTACH_SECLABEL, b);
return 0;
}
int sd_bus_negotiate_attach_audit(sd_bus *bus, int b) {
- if (!bus)
- return -EINVAL;
- if (bus->state != BUS_UNSET)
- return -EPERM;
- if (bus_pid_changed(bus))
- return -ECHILD;
+ assert_return(bus, -EINVAL);
+ assert_return(bus->state == BUS_UNSET, -EPERM);
+ assert_return(!bus_pid_changed(bus), -ECHILD);
SET_FLAG(bus->hello_flags, KDBUS_HELLO_ATTACH_AUDIT, b);
return 0;
}
int sd_bus_set_server(sd_bus *bus, int b, sd_id128_t server_id) {
- if (!bus)
- return -EINVAL;
- if (!b && !sd_id128_equal(server_id, SD_ID128_NULL))
- return -EINVAL;
- if (bus->state != BUS_UNSET)
- return -EPERM;
- if (bus_pid_changed(bus))
- return -ECHILD;
+ assert_return(bus, -EINVAL);
+ assert_return(b || sd_id128_equal(server_id, SD_ID128_NULL), -EINVAL);
+ assert_return(bus->state == BUS_UNSET, -EPERM);
+ assert_return(!bus_pid_changed(bus), -ECHILD);
bus->is_server = !!b;
bus->server_id = server_id;
@@ -380,12 +334,9 @@ int sd_bus_set_server(sd_bus *bus, int b, sd_id128_t server_id) {
}
int sd_bus_set_anonymous(sd_bus *bus, int b) {
- if (!bus)
- return -EINVAL;
- if (bus->state != BUS_UNSET)
- return -EPERM;
- if (bus_pid_changed(bus))
- return -ECHILD;
+ assert_return(bus, -EINVAL);
+ assert_return(bus->state == BUS_UNSET, -EPERM);
+ assert_return(!bus_pid_changed(bus), -ECHILD);
bus->anonymous_auth = !!b;
return 0;
@@ -970,12 +921,9 @@ static int bus_start_fd(sd_bus *b) {
int sd_bus_start(sd_bus *bus) {
int r;
- if (!bus)
- return -EINVAL;
- if (bus->state != BUS_UNSET)
- return -EPERM;
- if (bus_pid_changed(bus))
- return -ECHILD;
+ assert_return(bus, -EINVAL);
+ assert_return(bus->state == BUS_UNSET, -EPERM);
+ assert_return(!bus_pid_changed(bus), -ECHILD);
bus->state = BUS_OPENING;
@@ -1000,8 +948,7 @@ int sd_bus_open_system(sd_bus **ret) {
sd_bus *b;
int r;
- if (!ret)
- return -EINVAL;
+ assert_return(ret, -EINVAL);
r = sd_bus_new(&b);
if (r < 0)
@@ -1038,8 +985,7 @@ int sd_bus_open_user(sd_bus **ret) {
size_t l;
int r;
- if (!ret)
- return -EINVAL;
+ assert_return(ret, -EINVAL);
r = sd_bus_new(&b);
if (r < 0)
@@ -1122,10 +1068,9 @@ sd_bus *sd_bus_unref(sd_bus *bus) {
}
int sd_bus_is_open(sd_bus *bus) {
- if (!bus)
- return -EINVAL;
- if (bus_pid_changed(bus))
- return -ECHILD;
+
+ assert_return(bus, -EINVAL);
+ assert_return(!bus_pid_changed(bus), -ECHILD);
return BUS_IS_OPEN(bus->state);
}
@@ -1133,12 +1078,9 @@ int sd_bus_is_open(sd_bus *bus) {
int sd_bus_can_send(sd_bus *bus, char type) {
int r;
- if (!bus)
- return -EINVAL;
- if (bus->state == BUS_UNSET)
- return -ENOTCONN;
- if (bus_pid_changed(bus))
- return -ECHILD;
+ assert_return(bus, -EINVAL);
+ assert_return(bus->state != BUS_UNSET, -ENOTCONN);
+ assert_return(!bus_pid_changed(bus), -ECHILD);
if (type == SD_BUS_TYPE_UNIX_FD) {
if (!(bus->hello_flags & KDBUS_HELLO_ACCEPT_FD))
@@ -1157,12 +1099,9 @@ int sd_bus_can_send(sd_bus *bus, char type) {
int sd_bus_get_server_id(sd_bus *bus, sd_id128_t *server_id) {
int r;
- if (!bus)
- return -EINVAL;
- if (!server_id)
- return -EINVAL;
- if (bus_pid_changed(bus))
- return -ECHILD;
+ assert_return(bus, -EINVAL);
+ assert_return(server_id, -EINVAL);
+ assert_return(!bus_pid_changed(bus), -ECHILD);
r = bus_ensure_running(bus);
if (r < 0)
@@ -1267,14 +1206,10 @@ static int dispatch_rqueue(sd_bus *bus, sd_bus_message **m) {
int sd_bus_send(sd_bus *bus, sd_bus_message *m, uint64_t *serial) {
int r;
- if (!bus)
- return -EINVAL;
- if (!BUS_IS_OPEN(bus->state))
- return -ENOTCONN;
- if (!m)
- return -EINVAL;
- if (bus_pid_changed(bus))
- return -ECHILD;
+ assert_return(bus, -EINVAL);
+ assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN);
+ assert_return(m, -EINVAL);
+ assert_return(!bus_pid_changed(bus), -ECHILD);
if (m->n_fds > 0) {
r = sd_bus_can_send(bus, SD_BUS_TYPE_UNIX_FD);
@@ -1380,20 +1315,13 @@ int sd_bus_send_with_reply(
struct reply_callback *c;
int r;
- if (!bus)
- return -EINVAL;
- if (!BUS_IS_OPEN(bus->state))
- return -ENOTCONN;
- if (!m)
- return -EINVAL;
- if (!callback)
- return -EINVAL;
- if (m->header->type != SD_BUS_MESSAGE_TYPE_METHOD_CALL)
- return -EINVAL;
- if (m->header->flags & SD_BUS_MESSAGE_NO_REPLY_EXPECTED)
- return -EINVAL;
- if (bus_pid_changed(bus))
- return -ECHILD;
+ assert_return(bus, -EINVAL);
+ assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN);
+ assert_return(m, -EINVAL);
+ assert_return(m->header->type == SD_BUS_MESSAGE_TYPE_METHOD_CALL, -EINVAL);
+ assert_return(!(m->header->flags & SD_BUS_MESSAGE_NO_REPLY_EXPECTED), -EINVAL);
+ assert_return(callback, -EINVAL);
+ assert_return(!bus_pid_changed(bus), -ECHILD);
r = hashmap_ensure_allocated(&bus->reply_callbacks, uint64_hash_func, uint64_compare_func);
if (r < 0)
@@ -1445,12 +1373,9 @@ int sd_bus_send_with_reply(
int sd_bus_send_with_reply_cancel(sd_bus *bus, uint64_t serial) {
struct reply_callback *c;
- if (!bus)
- return -EINVAL;
- if (serial == 0)
- return -EINVAL;
- if (bus_pid_changed(bus))
- return -ECHILD;
+ assert_return(bus, -EINVAL);
+ assert_return(serial != 0, -EINVAL);
+ assert_return(!bus_pid_changed(bus), -ECHILD);
c = hashmap_remove(bus->reply_callbacks, &serial);
if (!c)
@@ -1500,20 +1425,13 @@ int sd_bus_send_with_reply_and_block(
uint64_t serial;
bool room = false;
- if (!bus)
- return -EINVAL;
- if (!BUS_IS_OPEN(bus->state))
- return -ENOTCONN;
- if (!m)
- return -EINVAL;
- if (m->header->type != SD_BUS_MESSAGE_TYPE_METHOD_CALL)
- return -EINVAL;
- if (m->header->flags & SD_BUS_MESSAGE_NO_REPLY_EXPECTED)
- return -EINVAL;
- if (bus_error_is_dirty(error))
- return -EINVAL;
- if (bus_pid_changed(bus))
- return -ECHILD;
+ assert_return(bus, -EINVAL);
+ assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN);
+ assert_return(m, -EINVAL);
+ assert_return(m->header->type == SD_BUS_MESSAGE_TYPE_METHOD_CALL, -EINVAL);
+ assert_return(!(m->header->flags & SD_BUS_MESSAGE_NO_REPLY_EXPECTED), -EINVAL);
+ assert_return(!bus_error_is_dirty(error), -EINVAL);
+ assert_return(!bus_pid_changed(bus), -ECHILD);
r = bus_ensure_running(bus);
if (r < 0)
@@ -1618,14 +1536,11 @@ int sd_bus_send_with_reply_and_block(
}
int sd_bus_get_fd(sd_bus *bus) {
- if (!bus)
- return -EINVAL;
- if (!BUS_IS_OPEN(bus->state))
- return -ENOTCONN;
- if (bus->input_fd != bus->output_fd)
- return -EPERM;
- if (bus_pid_changed(bus))
- return -ECHILD;
+
+ assert_return(bus, -EINVAL);
+ assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN);
+ assert_return(bus->input_fd == bus->output_fd, -EPERM);
+ assert_return(!bus_pid_changed(bus), -ECHILD);
return bus->input_fd;
}
@@ -1633,12 +1548,9 @@ int sd_bus_get_fd(sd_bus *bus) {
int sd_bus_get_events(sd_bus *bus) {
int flags = 0;
- if (!bus)
- return -EINVAL;
- if (!BUS_IS_OPEN(bus->state))
- return -ENOTCONN;
- if (bus_pid_changed(bus))
- return -ECHILD;
+ assert_return(bus, -EINVAL);
+ assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN);
+ assert_return(!bus_pid_changed(bus), -ECHILD);
if (bus->state == BUS_OPENING)
flags |= POLLOUT;
@@ -1662,14 +1574,10 @@ int sd_bus_get_events(sd_bus *bus) {
int sd_bus_get_timeout(sd_bus *bus, uint64_t *timeout_usec) {
struct reply_callback *c;
- if (!bus)
- return -EINVAL;
- if (!timeout_usec)
- return -EINVAL;
- if (!BUS_IS_OPEN(bus->state))
- return -ENOTCONN;
- if (bus_pid_changed(bus))
- return -ECHILD;
+ assert_return(bus, -EINVAL);
+ assert_return(timeout_usec, -EINVAL);
+ assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN);
+ assert_return(!bus_pid_changed(bus), -ECHILD);
if (bus->state == BUS_AUTHENTICATING) {
*timeout_usec = bus->auth_timeout;
@@ -1969,14 +1877,11 @@ int sd_bus_process(sd_bus *bus, sd_bus_message **ret) {
* time. Returns > 0 when we did something, which possibly
* means *ret is filled in with an unprocessed message. */
- if (!bus)
- return -EINVAL;
- if (bus_pid_changed(bus))
- return -ECHILD;
+ assert_return(bus, -EINVAL);
+ assert_return(!bus_pid_changed(bus), -ECHILD);
/* We don't allow recursively invoking sd_bus_process(). */
- if (bus->processing)
- return -EBUSY;
+ assert_return(!bus->processing, -EBUSY);
switch (bus->state) {
@@ -2021,9 +1926,7 @@ static int bus_poll(sd_bus *bus, bool need_more, uint64_t timeout_usec) {
usec_t until, m;
assert(bus);
-
- if (!BUS_IS_OPEN(bus->state))
- return -ENOTCONN;
+ assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN);
e = sd_bus_get_events(bus);
if (e < 0)
@@ -2066,12 +1969,9 @@ static int bus_poll(sd_bus *bus, bool need_more, uint64_t timeout_usec) {
int sd_bus_wait(sd_bus *bus, uint64_t timeout_usec) {
- if (!bus)
- return -EINVAL;
- if (!BUS_IS_OPEN(bus->state))
- return -ENOTCONN;
- if (bus_pid_changed(bus))
- return -ECHILD;
+ assert_return(bus, -EINVAL);
+ assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN);
+ assert_return(!bus_pid_changed(bus), -ECHILD);
if (bus->rqueue_size > 0)
return 0;
@@ -2082,12 +1982,9 @@ int sd_bus_wait(sd_bus *bus, uint64_t timeout_usec) {
int sd_bus_flush(sd_bus *bus) {
int r;
- if (!bus)
- return -EINVAL;
- if (!BUS_IS_OPEN(bus->state))
- return -ENOTCONN;
- if (bus_pid_changed(bus))
- return -ECHILD;
+ assert_return(bus, -EINVAL);
+ assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN);
+ assert_return(!bus_pid_changed(bus), -ECHILD);
r = bus_ensure_running(bus);
if (r < 0)
@@ -2113,12 +2010,9 @@ int sd_bus_flush(sd_bus *bus) {
int sd_bus_add_filter(sd_bus *bus, sd_bus_message_handler_t callback, void *userdata) {
struct filter_callback *f;
- if (!bus)
- return -EINVAL;
- if (!callback)
- return -EINVAL;
- if (bus_pid_changed(bus))
- return -ECHILD;
+ assert_return(bus, -EINVAL);
+ assert_return(callback, -EINVAL);
+ assert_return(!bus_pid_changed(bus), -ECHILD);
f = new0(struct filter_callback, 1);
if (!f)
@@ -2134,12 +2028,9 @@ int sd_bus_add_filter(sd_bus *bus, sd_bus_message_handler_t callback, void *user
int sd_bus_remove_filter(sd_bus *bus, sd_bus_message_handler_t callback, void *userdata) {
struct filter_callback *f;
- if (!bus)
- return -EINVAL;
- if (!callback)
- return -EINVAL;
- if (bus_pid_changed(bus))
- return -ECHILD;
+ assert_return(bus, -EINVAL);
+ assert_return(callback, -EINVAL);
+ assert_return(!bus_pid_changed(bus), -ECHILD);
LIST_FOREACH(callbacks, f, bus->filter_callbacks) {
if (f->callback == callback && f->userdata == userdata) {
@@ -2159,12 +2050,9 @@ int sd_bus_add_match(sd_bus *bus, const char *match, sd_bus_message_handler_t ca
uint64_t cookie = 0;
int r = 0;
- if (!bus)
- return -EINVAL;
- if (!match)
- return -EINVAL;
- if (bus_pid_changed(bus))
- return -ECHILD;
+ assert_return(bus, -EINVAL);
+ assert_return(match, -EINVAL);
+ assert_return(!bus_pid_changed(bus), -ECHILD);
r = bus_match_parse(match, &components, &n_components);
if (r < 0)
@@ -2196,12 +2084,9 @@ int sd_bus_remove_match(sd_bus *bus, const char *match, sd_bus_message_handler_t
int r = 0, q = 0;
uint64_t cookie = 0;
- if (!bus)
- return -EINVAL;
- if (!match)
- return -EINVAL;
- if (bus_pid_changed(bus))
- return -ECHILD;
+ assert_return(bus, -EINVAL);
+ assert_return(match, -EINVAL);
+ assert_return(!bus_pid_changed(bus), -ECHILD);
r = bus_match_parse(match, &components, &n_components);
if (r < 0)
More information about the systemd-commits
mailing list