chiark / gitweb /
core: convert PID 1 to libsystemd-bus
[elogind.git] / src / libsystemd-bus / test-bus-chat.c
index efc19c68b3d3d2914a4022198547d4f2e5fd2b8d..67411f11849595838ae7c62398588ca00200f98b 100644 (file)
@@ -228,6 +228,8 @@ static int server(sd_bus *bus) {
                                 goto fail;
                         }
 
+                        log_info("Received fd=%d", fd);
+
                         if (write(fd, &x, 1) < 0) {
                                 log_error("Failed to write to fd: %m");
                                 close_nointr_nofail(fd);
@@ -307,6 +309,8 @@ static void* client1(void*p) {
                 goto finish;
         }
 
+        log_info("Sending fd=%d", pp[1]);
+
         r = sd_bus_call_method(
                         bus,
                         "org.freedesktop.systemd.test",
@@ -433,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;
@@ -465,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
@@ -486,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;