X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd-bus%2Ftest-bus-kernel-benchmark.c;h=04627d9a779475b700ca193782e1a9a1fa390cbb;hb=843f737ade9c73609a2280dd3dd16e18222a5dcb;hp=d9ccdc223947fea8b3bd0df73f19dc37932a3ff8;hpb=83d97ce664806829b027c02708d648d469724362;p=elogind.git

diff --git a/src/libsystemd-bus/test-bus-kernel-benchmark.c b/src/libsystemd-bus/test-bus-kernel-benchmark.c
index d9ccdc223..04627d9a7 100644
--- a/src/libsystemd-bus/test-bus-kernel-benchmark.c
+++ b/src/libsystemd-bus/test-bus-kernel-benchmark.c
@@ -31,6 +31,7 @@
 #include "bus-error.h"
 #include "bus-kernel.h"
 #include "bus-internal.h"
+#include "bus-util.h"
 
 #define MAX_SIZE (4*1024*1024)
 
@@ -51,7 +52,7 @@ static void server(sd_bus *b, size_t *result) {
                         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;
@@ -59,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);
 
-                        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);
@@ -81,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) {
@@ -138,7 +139,7 @@ static void client_bisect(const char *address) {
                         if (now(CLOCK_MONOTONIC) >= t + arg_loop_usec)
                                 break;
                 }
-                printf("%u\n", (unsigned) ((n_copying * USEC_PER_SEC) / arg_loop_usec));
+                printf("%u\n", (unsigned) ((n_memfd * USEC_PER_SEC) / arg_loop_usec));
 
                 if (n_copying == n_memfd)
                         break;
@@ -219,7 +220,7 @@ int main(int argc, char *argv[]) {
                 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;
@@ -227,8 +228,6 @@ int main(int argc, char *argv[]) {
         pid_t pid;
         int r;
 
-        log_set_max_level(LOG_DEBUG);
-
         for (i = 1; i < argc; i++) {
                 if (streq(argv[i], "chart")) {
                         mode = MODE_CHART;
@@ -240,7 +239,9 @@ int main(int argc, char *argv[]) {
 
         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);