chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improve messages about user mode a bit
[elogind.git]
/
src
/
libsystemd-bus
/
test-bus-kernel-benchmark.c
diff --git
a/src/libsystemd-bus/test-bus-kernel-benchmark.c
b/src/libsystemd-bus/test-bus-kernel-benchmark.c
index 666c74cea384604d787f6dea76ac555eb9926768..04627d9a779475b700ca193782e1a9a1fa390cbb 100644
(file)
--- a/
src/libsystemd-bus/test-bus-kernel-benchmark.c
+++ b/
src/libsystemd-bus/test-bus-kernel-benchmark.c
@@
-52,7
+52,7
@@
static void server(sd_bus *b, size_t *result) {
continue;
if (sd_bus_message_is_method_call(m, "benchmark.server", "Ping"))
continue;
if (sd_bus_message_is_method_call(m, "benchmark.server", "Ping"))
- assert_se(sd_bus_reply_method_return(
b,
m, NULL) >= 0);
+ assert_se(sd_bus_reply_method_return(m, NULL) >= 0);
else if (sd_bus_message_is_method_call(m, "benchmark.server", "Work")) {
const void *p;
size_t sz;
else if (sd_bus_message_is_method_call(m, "benchmark.server", "Work")) {
const void *p;
size_t sz;
@@
-60,7
+60,7
@@
static void server(sd_bus *b, size_t *result) {
/* Make sure the mmap is mapped */
assert_se(sd_bus_message_read_array(m, 'y', &p, &sz) > 0);
/* Make sure the mmap is mapped */
assert_se(sd_bus_message_read_array(m, 'y', &p, &sz) > 0);
- assert_se(sd_bus_reply_method_return(
b,
m, NULL) >= 0);
+ assert_se(sd_bus_reply_method_return(m, NULL) >= 0);
} else if (sd_bus_message_is_method_call(m, "benchmark.server", "Exit")) {
uint64_t res;
assert_se(sd_bus_message_read(m, "t", &res) > 0);
} else if (sd_bus_message_is_method_call(m, "benchmark.server", "Exit")) {
uint64_t res;
assert_se(sd_bus_message_read(m, "t", &res) > 0);
@@
-82,7
+82,7
@@
static void transaction(sd_bus *b, size_t sz) {
memset(p, 0x80, 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) {
}
static void client_bisect(const char *address) {
@@
-220,7
+220,7
@@
int main(int argc, char *argv[]) {
MODE_CHART,
} mode = MODE_BISECT;
int i;
MODE_CHART,
} mode = MODE_BISECT;
int i;
- _cleanup_free_ char *bus_name = NULL, *address = NULL;
+ _cleanup_free_ char *
name = NULL, *
bus_name = NULL, *address = NULL;
_cleanup_close_ int bus_ref = -1;
cpu_set_t cpuset;
size_t result;
_cleanup_close_ int bus_ref = -1;
cpu_set_t cpuset;
size_t result;
@@
-239,7
+239,9
@@
int main(int argc, char *argv[]) {
assert_se(arg_loop_usec > 0);
assert_se(arg_loop_usec > 0);
- bus_ref = bus_kernel_create("deine-mutter", &bus_name);
+ assert_se(asprintf(&name, "deine-mutter-%u", (unsigned) getpid()) >= 0);
+
+ bus_ref = bus_kernel_create_bus(name, false, &bus_name);
if (bus_ref == -ENOENT)
exit(EXIT_TEST_SKIP);
if (bus_ref == -ENOENT)
exit(EXIT_TEST_SKIP);