shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-02-18 21:57:48 +03:00
Code

bus: instead of exposing the dbus1 flags when acquiring a name use our own that are closer to kdbus

Browse Source 
This turns around DO_NOT_QUEUE into QUEUE which implies a more useful
default. (And negative options are awful anyway.)
This commit is contained in:
Lennart Poettering 2013-12-12 05:55:58 +01:00
parent f8e11cda53
commit 29a07cdb4a
12 changed files with 35 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/dbus.c
View File

@ -801,7 +801,7 @@ static int bus_setup_api(Manager *m, sd_bus *bus) {
* after the new connection is set up and the name installed * after the new connection is set up and the name installed
* to allow clients to synchronously wait for reexecution to * to allow clients to synchronously wait for reexecution to
* finish */ * finish */
r = sd_bus_request_name(bus,"org.freedesktop.systemd1", SD_BUS_NAME_REPLACE_EXISTING|SD_BUS_NAME_DO_NOT_QUEUE|SD_BUS_NAME_ALLOW_REPLACEMENT); r = sd_bus_request_name(bus,"org.freedesktop.systemd1", SD_BUS_NAME_REPLACE_EXISTING|SD_BUS_NAME_ALLOW_REPLACEMENT);
if (r < 0) { if (r < 0) {
log_error("Failed to register name: %s", strerror(-r)); log_error("Failed to register name: %s", strerror(-r));
return r; return r;

2
src/hostname/hostnamed.c
View File

@ -574,7 +574,7 @@ static int connect_bus(Context *c, sd_event *event, sd_bus **_bus) {
return r; return r;
} }
r = sd_bus_request_name(bus, "org.freedesktop.hostname1", SD_BUS_NAME_REPLACE_EXISTING|SD_BUS_NAME_DO_NOT_QUEUE); r = sd_bus_request_name(bus, "org.freedesktop.hostname1", 0);
if (r < 0) { if (r < 0) {
log_error("Failed to register name: %s", strerror(-r)); log_error("Failed to register name: %s", strerror(-r));
return r; return r;

19
src/libsystemd-bus/bus-control.c
View File

@ -49,7 +49,7 @@ _public_ int sd_bus_get_unique_name(sd_bus *bus, const char **unique) {
return 0; return 0;
} }
static int bus_request_name_kernel(sd_bus *bus, const char *name, unsigned flags) { static int bus_request_name_kernel(sd_bus *bus, const char *name, uint64_t flags) {
struct kdbus_cmd_name *n; struct kdbus_cmd_name *n;
size_t l; size_t l;
int r; int r;
@ -77,14 +77,21 @@ static int bus_request_name_kernel(sd_bus *bus, const char *name, unsigned flags
return 1; return 1;
} }
static int bus_request_name_dbus1(sd_bus *bus, const char *name, unsigned flags) { static int bus_request_name_dbus1(sd_bus *bus, const char *name, uint64_t flags) {
_cleanup_bus_message_unref_ sd_bus_message *reply = NULL; _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
uint32_t ret; uint32_t ret, param = 0;
int r; int r;
assert(bus); assert(bus);
assert(name); assert(name);
if (flags & SD_BUS_NAME_ALLOW_REPLACEMENT)
param |= BUS_NAME_ALLOW_REPLACEMENT;
if (flags & SD_BUS_NAME_REPLACE_EXISTING)
param |= BUS_NAME_REPLACE_EXISTING;
if (!(flags & SD_BUS_NAME_QUEUE))
param |= BUS_NAME_DO_NOT_QUEUE;
r = sd_bus_call_method( r = sd_bus_call_method(
bus, bus,
"org.freedesktop.DBus", "org.freedesktop.DBus",
@ -95,7 +102,7 @@ static int bus_request_name_dbus1(sd_bus *bus, const char *name, unsigned flags)
&reply, &reply,
"su", "su",
name, name,
flags); param);
if (r < 0) if (r < 0)
return r; return r;
@ -115,13 +122,13 @@ static int bus_request_name_dbus1(sd_bus *bus, const char *name, unsigned flags)
return -EIO; return -EIO;
} }
_public_ int sd_bus_request_name(sd_bus *bus, const char *name, unsigned flags) { _public_ int sd_bus_request_name(sd_bus *bus, const char *name, uint64_t flags) {
assert_return(bus, -EINVAL); assert_return(bus, -EINVAL);
assert_return(name, -EINVAL); assert_return(name, -EINVAL);
assert_return(bus->bus_client, -EINVAL); assert_return(bus->bus_client, -EINVAL);
assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN); assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN);
assert_return(!bus_pid_changed(bus), -ECHILD); assert_return(!bus_pid_changed(bus), -ECHILD);
assert_return(!(flags & ~(SD_BUS_NAME_ALLOW_REPLACEMENT|SD_BUS_NAME_REPLACE_EXISTING|SD_BUS_NAME_DO_NOT_QUEUE)), -EINVAL); assert_return(!(flags & ~(SD_BUS_NAME_ALLOW_REPLACEMENT|SD_BUS_NAME_REPLACE_EXISTING|SD_BUS_NAME_QUEUE)), -EINVAL);
if (bus->is_kernel) if (bus->is_kernel)
return bus_request_name_kernel(bus, name, flags); return bus_request_name_kernel(bus, name, flags);

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

@ -1020,7 +1020,7 @@ int kdbus_translate_request_name_flags(uint64_t flags, uint64_t *kdbus_flags) {
if (flags & SD_BUS_NAME_REPLACE_EXISTING) if (flags & SD_BUS_NAME_REPLACE_EXISTING)
f |= KDBUS_NAME_REPLACE_EXISTING; f |= KDBUS_NAME_REPLACE_EXISTING;
if (!(flags & SD_BUS_NAME_DO_NOT_QUEUE)) if (!(flags & SD_BUS_NAME_QUEUE))
f |= KDBUS_NAME_QUEUE; f |= KDBUS_NAME_QUEUE;
*kdbus_flags = f; *kdbus_flags = f;

8
src/libsystemd-bus/bus-protocol.h
View File

@ -60,6 +60,14 @@ enum {
_BUS_MESSAGE_HEADER_MAX _BUS_MESSAGE_HEADER_MAX
}; };
/* RequestName parameters */
enum {
BUS_NAME_ALLOW_REPLACEMENT = 1,
BUS_NAME_REPLACE_EXISTING = 2,
BUS_NAME_DO_NOT_QUEUE = 4
};
/* RequestName returns */ /* RequestName returns */
enum { enum {
BUS_NAME_PRIMARY_OWNER = 1, BUS_NAME_PRIMARY_OWNER = 1,

2
src/locale/localed.c
View File

@ -1094,7 +1094,7 @@ static int connect_bus(Context *c, sd_event *event, sd_bus **_bus) {
return r; return r;
} }
r = sd_bus_request_name(bus, "org.freedesktop.locale1", SD_BUS_NAME_REPLACE_EXISTING|SD_BUS_NAME_DO_NOT_QUEUE); r = sd_bus_request_name(bus, "org.freedesktop.locale1", 0);
if (r < 0) { if (r < 0) {
log_error("Failed to register name: %s", strerror(-r)); log_error("Failed to register name: %s", strerror(-r));
return r; return r;

2
src/login/logind.c
View File

@ -727,7 +727,7 @@ static int manager_connect_bus(Manager *m) {
return r; return r;
} }
r = sd_bus_request_name(m->bus, "org.freedesktop.login1", SD_BUS_NAME_REPLACE_EXISTING|SD_BUS_NAME_DO_NOT_QUEUE); r = sd_bus_request_name(m->bus, "org.freedesktop.login1", 0);
if (r < 0) { if (r < 0) {
log_error("Failed to register name: %s", strerror(-r)); log_error("Failed to register name: %s", strerror(-r));
return r; return r;

2
src/machine/machined.c
View File

@ -219,7 +219,7 @@ static int manager_connect_bus(Manager *m) {
return r; return r;
} }
r = sd_bus_request_name(m->bus, "org.freedesktop.machine1", SD_BUS_NAME_REPLACE_EXISTING|SD_BUS_NAME_DO_NOT_QUEUE); r = sd_bus_request_name(m->bus, "org.freedesktop.machine1", 0);
if (r < 0) { if (r < 0) {
log_error("Failed to register name: %s", strerror(-r)); log_error("Failed to register name: %s", strerror(-r));
return r; return r;

10
src/systemd/sd-bus-protocol.h
View File

@ -22,8 +22,6 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>. along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/ ***/
#include <endian.h>
#include "_sd-common.h" #include "_sd-common.h"
_SD_BEGIN_DECLARATIONS; _SD_BEGIN_DECLARATIONS;
@ -66,14 +64,6 @@ enum {
SD_BUS_TYPE_DICT_ENTRY_END = '}', SD_BUS_TYPE_DICT_ENTRY_END = '}',
}; };
/* RequestName parameters */
enum {
SD_BUS_NAME_ALLOW_REPLACEMENT = 1,
SD_BUS_NAME_REPLACE_EXISTING = 2,
SD_BUS_NAME_DO_NOT_QUEUE = 4
};
/* Well-known errors. Note that this is only a sanitized subset of the /* Well-known errors. Note that this is only a sanitized subset of the
* errors that the reference implementation generates. */ * errors that the reference implementation generates. */

1
src/systemd/sd-bus-vtable.h
View File

@ -37,7 +37,6 @@ enum {
_SD_BUS_VTABLE_SIGNAL = 'S', _SD_BUS_VTABLE_SIGNAL = 'S',
_SD_BUS_VTABLE_PROPERTY = 'P', _SD_BUS_VTABLE_PROPERTY = 'P',
_SD_BUS_VTABLE_WRITABLE_PROPERTY = 'W', _SD_BUS_VTABLE_WRITABLE_PROPERTY = 'W',
_SD_BUS_VTABLE_CHILDREN = 'C',
}; };
enum { enum {

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

@ -75,6 +75,12 @@ enum {
_SD_BUS_CREDS_ALL = (1ULL << 24) -1, _SD_BUS_CREDS_ALL = (1ULL << 24) -1,
}; };
enum {
SD_BUS_NAME_REPLACE_EXISTING = 1ULL << 0,
SD_BUS_NAME_ALLOW_REPLACEMENT = 1ULL << 1,
SD_BUS_NAME_QUEUE = 1ULL << 2,
};
/* Callbacks */ /* Callbacks */
typedef int (*sd_bus_message_handler_t)(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bus_error *ret_error); typedef int (*sd_bus_message_handler_t)(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bus_error *ret_error);
@ -234,7 +240,7 @@ int sd_bus_message_rewind(sd_bus_message *m, int complete);
/* Bus management */ /* Bus management */
int sd_bus_get_unique_name(sd_bus *bus, const char **unique); int sd_bus_get_unique_name(sd_bus *bus, const char **unique);
int sd_bus_request_name(sd_bus *bus, const char *name, unsigned flags); int sd_bus_request_name(sd_bus *bus, const char *name, uint64_t flags);
int sd_bus_release_name(sd_bus *bus, const char *name); int sd_bus_release_name(sd_bus *bus, const char *name);
int sd_bus_list_names(sd_bus *bus, char ***acquired, char ***activatable); /* free the results */ int sd_bus_list_names(sd_bus *bus, char ***acquired, char ***activatable); /* free the results */
int sd_bus_get_owner(sd_bus *bus, const char *name, uint64_t mask, sd_bus_creds **creds); /* unref the result! */ int sd_bus_get_owner(sd_bus *bus, const char *name, uint64_t mask, sd_bus_creds **creds); /* unref the result! */

2
src/timedate/timedated.c
View File

@ -791,7 +791,7 @@ static int connect_bus(Context *c, sd_event *event, sd_bus **_bus) {
return r; return r;
} }
r = sd_bus_request_name(bus, "org.freedesktop.timedate1", SD_BUS_NAME_REPLACE_EXISTING|SD_BUS_NAME_DO_NOT_QUEUE); r = sd_bus_request_name(bus, "org.freedesktop.timedate1", 0);
if (r < 0) { if (r < 0) {
log_error("Failed to register name: %s", strerror(-r)); log_error("Failed to register name: %s", strerror(-r));
return r; return r;