use osmo_init_logging2() with proper talloc ctx
Since the logging allocations now also show up in the root context report, some
tests need adjusted talloc checks.
In msc_vlr_tests, also output the number of talloc blocks before tests are
started to show that the number didn't change after the tests.
Change-Id: Iae07ae60230c7bab28e52b5df97fa3844778158e
diff --git a/src/libgsupclient/gsup_test_client.c b/src/libgsupclient/gsup_test_client.c
index 03ba68e..0ebcd4a 100644
--- a/src/libgsupclient/gsup_test_client.c
+++ b/src/libgsupclient/gsup_test_client.c
@@ -289,10 +289,11 @@
unsigned long long i;
char *server_host = "127.0.0.1";
uint16_t server_port = OSMO_GSUP_PORT;
+ void *ctx = talloc_named_const(NULL, 0, "gsup_test_client");
- osmo_init_logging(&gsup_test_client_log_info);
+ osmo_init_logging2(ctx, &gsup_test_client_log_info);
- g_gc = gsup_client_create(NULL, "GSUPTEST", server_host, server_port,
+ g_gc = gsup_client_create(ctx, "GSUPTEST", server_host, server_port,
gsupc_read_cb, NULL);
diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c
index 2b1a8c7..85a8fe1 100644
--- a/src/osmo-msc/msc_main.c
+++ b/src/osmo-msc/msc_main.c
@@ -531,7 +531,7 @@
tall_call_ctx = talloc_named_const(tall_msc_ctx, 0, "gsm_call");
tall_trans_ctx = talloc_named_const(tall_msc_ctx, 0, "transaction");
- osmo_init_logging(&log_info);
+ osmo_init_logging2(tall_msc_ctx, &log_info);
osmo_stats_init(tall_msc_ctx);
/* For --version, vty_init() must be called before handling options */
diff --git a/src/utils/smpp_mirror.c b/src/utils/smpp_mirror.c
index fa509df..3053553 100644
--- a/src/utils/smpp_mirror.c
+++ b/src/utils/smpp_mirror.c
@@ -343,12 +343,13 @@
char *host = "localhost";
int port = 0;
int rc;
+ void *ctx = talloc_named_const(NULL, 0, "smpp_mirror");
- msgb_talloc_ctx_init(NULL, 0);
+ msgb_talloc_ctx_init(ctx, 0);
memset(&esme, 0, sizeof(esme));
- osmo_init_logging(&log_info);
+ osmo_init_logging2(ctx, &log_info);
snprintf((char *) esme.system_id, sizeof(esme.system_id), "mirror");
snprintf((char *) esme.password, sizeof(esme.password), "mirror");