diff options
author | Pau Espin Pedrol <pespin@sysmocom.de> | 2018-04-17 14:31:42 +0200 |
---|---|---|
committer | Pau Espin Pedrol <pespin@sysmocom.de> | 2018-04-17 14:31:42 +0200 |
commit | 042a445cf360c8b6093918f52c7137dcb6e6c788 (patch) | |
tree | 56d1f3ed8cf2a99730ee14e2e75cda3625dad042 | |
parent | a16c7501a4eccded2919fab0d485f77fb87dc81a (diff) |
use osmo_init_logging2
Change-Id: Ic38fff17cc985238b91999c8acdd92d22fd28c72
-rw-r--r-- | ggsn/ggsn.c | 2 | ||||
-rw-r--r-- | sgsnemu/sgsnemu.c | 6 | ||||
-rw-r--r-- | tests/gtp/gtpie_test.c | 5 | ||||
-rw-r--r-- | tests/lib/in46a_test.c | 5 | ||||
-rw-r--r-- | tests/lib/ippool_test.c | 5 |
5 files changed, 18 insertions, 5 deletions
diff --git a/ggsn/ggsn.c b/ggsn/ggsn.c index df071d2..cb11c49 100644 --- a/ggsn/ggsn.c +++ b/ggsn/ggsn.c @@ -1073,7 +1073,7 @@ int main(int argc, char **argv) signal(SIGUSR2, &signal_handler); osmo_init_ignore_signals(); - osmo_init_logging(&log_info); + osmo_init_logging2(tall_ggsn_ctx, &log_info); osmo_stats_init(tall_ggsn_ctx); vty_init(&g_vty_info); diff --git a/sgsnemu/sgsnemu.c b/sgsnemu/sgsnemu.c index 804b542..99f56da 100644 --- a/sgsnemu/sgsnemu.c +++ b/sgsnemu/sgsnemu.c @@ -20,6 +20,7 @@ #endif #include <osmocom/core/application.h> +#include <osmocom/core/msgb.h> #include <ctype.h> #include <netdb.h> @@ -79,6 +80,7 @@ struct gsn_t *gsn = NULL; /* GSN instance */ struct tun_t *tun = NULL; /* TUN instance */ int maxfd = 0; /* For select() */ int echoversion = 1; /* First try this version */ +void *tall_sgsnemu_ctx; /* root talloc ctx */ /* Struct with local versions of gengetopt options */ struct { @@ -1540,7 +1542,9 @@ int main(int argc, char **argv) signal(SIGHUP, signal_handler); signal(SIGINT, signal_handler); - osmo_init_logging(&log_info); + tall_sgsnemu_ctx = talloc_named_const(NULL, 0, "sgsnemu"); + msgb_talloc_ctx_init(tall_sgsnemu_ctx, 0); + osmo_init_logging2(tall_sgsnemu_ctx, &log_info); /* Process options given in configuration file and command line */ if (process_options(argc, argv)) diff --git a/tests/gtp/gtpie_test.c b/tests/gtp/gtpie_test.c index e3bc2e0..95dd900 100644 --- a/tests/gtp/gtpie_test.c +++ b/tests/gtp/gtpie_test.c @@ -7,6 +7,7 @@ #include <osmocom/core/utils.h> #include <osmocom/core/application.h> #include <osmocom/core/logging.h> +#include <osmocom/core/msgb.h> #include <osmocom/core/bits.h> #include "../../lib/syserr.h" @@ -108,7 +109,9 @@ static void test_gtpie_tv8() int main(int argc, char **argv) { - osmo_init_logging(&log_info); + void *tall_ctx = talloc_named_const(NULL, 1, "Root context"); + msgb_talloc_ctx_init(tall_ctx, 0); + osmo_init_logging2(tall_ctx, &log_info); log_set_use_color(osmo_stderr_target, 0); log_set_print_filename(osmo_stderr_target, 0); diff --git a/tests/lib/in46a_test.c b/tests/lib/in46a_test.c index b22da16..407ac5d 100644 --- a/tests/lib/in46a_test.c +++ b/tests/lib/in46a_test.c @@ -10,6 +10,7 @@ #include <osmocom/core/utils.h> #include <osmocom/core/application.h> #include <osmocom/core/logging.h> +#include <osmocom/core/msgb.h> #include <osmocom/core/bits.h> #include "../../lib/in46_addr.h" @@ -426,7 +427,9 @@ static void test_in46a_netmasklen_v6(void) int main(int argc, char **argv) { - osmo_init_logging(&log_info); + void *tall_ctx = talloc_named_const(NULL, 1, "Root context"); + msgb_talloc_ctx_init(tall_ctx, 0); + osmo_init_logging2(tall_ctx, &log_info); log_set_use_color(osmo_stderr_target, 0); log_set_print_filename(osmo_stderr_target, 0); diff --git a/tests/lib/ippool_test.c b/tests/lib/ippool_test.c index 8d3f46c..6155ab8 100644 --- a/tests/lib/ippool_test.c +++ b/tests/lib/ippool_test.c @@ -7,6 +7,7 @@ #include <osmocom/core/utils.h> #include <osmocom/core/application.h> #include <osmocom/core/logging.h> +#include <osmocom/core/msgb.h> #include "../../lib/in46_addr.h" #include "../../lib/ippool.h" @@ -126,7 +127,9 @@ static void test_pool_sizes_v6(void) int main(int argc, char **argv) { - osmo_init_logging(&log_info); + void *tall_ctx = talloc_named_const(NULL, 1, "Root context"); + msgb_talloc_ctx_init(tall_ctx, 0); + osmo_init_logging2(tall_ctx, &log_info); log_set_use_color(osmo_stderr_target, 0); log_set_print_filename(osmo_stderr_target, 0); |