From f44b01c3269d71cff4566a894fe48c35ca77e11c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 4 Jun 2018 15:15:17 +0200 Subject: test-bus-util: add a simple test for bus_request_name_async_may_reload_dbus() This shows a minor memleak: ==1883== 24 bytes in 1 blocks are definitely lost in loss record 1 of 1 ==1883== at 0x4C2DBAB: malloc (vg_replace_malloc.c:299) ==1883== by 0x4E9D385: malloc_multiply (alloc-util.h:69) ==1883== by 0x4EA2959: bus_request_name_async_may_reload_dbus (bus-util.c:1841) ==1883== by ... The exchange of messages is truncated at two different points: once right after the first callback is requested, and the second time after the full sequence has run (usually resulting in an error because of policy). --- src/test/meson.build | 11 ++++------- src/test/test-bus-util.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 7 deletions(-) create mode 100644 src/test/test-bus-util.c (limited to 'src/test') diff --git a/src/test/meson.build b/src/test/meson.build index 8d694b379..b48705b41 100644 --- a/src/test/meson.build +++ b/src/test/meson.build @@ -711,6 +711,10 @@ tests += [ 'src/core/umount.h'], [], [libmount]], + + [['src/test/test-bus-util.c'], + [], + []], ] ############################################################ @@ -959,7 +963,6 @@ tests += [ # 'src/libsystemd-network/dhcp-protocol.h', # 'src/libsystemd-network/dhcp-internal.h'], # [libshared, -# libelogind_network], # libsystemd_network], # []], # @@ -974,13 +977,11 @@ tests += [ # 'src/libsystemd-network/dhcp-internal.h', # 'src/systemd/sd-dhcp-client.h'], # [libshared, -# libelogind_network], # libsystemd_network], # []], # # [['src/libelogind-network/test-dhcp-server.c'], # [libshared, -# libelogind_network], # libsystemd_network], # []], # @@ -988,14 +989,12 @@ tests += [ # 'src/libsystemd-network/arp-util.h', # 'src/systemd/sd-ipv4ll.h'], # [libshared, -# libelogind_network], # libsystemd_network], # []], # # [['src/libelogind-network/test-ipv4ll-manual.c', # 'src/systemd/sd-ipv4ll.h'], # [libshared, -# libelogind_network], # libsystemd_network], # [], # '', 'manual'], @@ -1014,7 +1013,6 @@ tests += [ # 'src/systemd/sd-dhcp6-client.h', # 'src/systemd/sd-ndisc.h'], # [libshared, -# libelogind_network], # libsystemd_network], # []], # @@ -1031,7 +1029,6 @@ tests += [ # 'src/libsystemd-network/dhcp6-internal.h', # 'src/systemd/sd-dhcp6-client.h'], # [libshared, -# libelogind_network], # libsystemd_network], # []], # diff --git a/src/test/test-bus-util.c b/src/test/test-bus-util.c new file mode 100644 index 000000000..608052be1 --- /dev/null +++ b/src/test/test-bus-util.c @@ -0,0 +1,47 @@ +/* SPDX-License-Identifier: LGPL-2.1+ */ + +//#include "bus-util.h" +//#include "log.h" + +static void test_name_async(unsigned n_messages) { + _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL; + int r; + unsigned i; + + log_info("/* %s (%u) */", __func__, n_messages); + + r = bus_open_system_watch_bind_with_description(&bus, "test-bus"); + if (r < 0) { + log_error_errno(r, "Failed to connect to bus: %m"); + return; + } + + r = bus_request_name_async_may_reload_dbus(bus, NULL, "org.freedesktop.elogind.test-bus-util", 0, NULL); + if (r < 0) { + log_error_errno(r, "Failed to request name: %m"); + return; + } + + for (i = 0; i < n_messages; i++) { + r = sd_bus_process(bus, NULL); + log_debug("stage %u: sd_bus_process returned %d", i, r); + if (r < 0) { + log_notice_errno(r, "Processing failed: %m"); + return; + } + + if (r > 0 && i + 1 < n_messages) + (void) sd_bus_wait(bus, USEC_PER_SEC / 3); + } +} + +int main(int argc, char **argv) { + log_set_max_level(LOG_DEBUG); + log_parse_environment(); + log_open(); + + test_name_async(0); + test_name_async(20); + + return 0; +} -- cgit v1.2.3