fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35311?usp=email )
Change subject: virt_phy: use osmo_init_logging2() to init logging ......................................................................
virt_phy: use osmo_init_logging2() to init logging
Change-Id: Iaaaa3b0c1aaea8d96b760938a4638eaa0dd65bc7 Related: OS#6299 --- M src/host/virt_phy/include/osmocom/bb/virtphy/logging.h M src/host/virt_phy/src/logging.c M src/host/virt_phy/src/virtphy.c 3 files changed, 23 insertions(+), 16 deletions(-)
Approvals: osmith: Looks good to me, approved laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified
diff --git a/src/host/virt_phy/include/osmocom/bb/virtphy/logging.h b/src/host/virt_phy/include/osmocom/bb/virtphy/logging.h index 48f7ed5..1727453 100644 --- a/src/host/virt_phy/include/osmocom/bb/virtphy/logging.h +++ b/src/host/virt_phy/include/osmocom/bb/virtphy/logging.h @@ -16,5 +16,5 @@
extern const struct log_info ms_log_info;
-int ms_log_init(char *cat_mask); +int ms_log_init(void *ctx, const char *cat_mask); const char *getL1ctlPrimName(uint8_t type); diff --git a/src/host/virt_phy/src/logging.c b/src/host/virt_phy/src/logging.c index 19951ef..fc37205 100644 --- a/src/host/virt_phy/src/logging.c +++ b/src/host/virt_phy/src/logging.c @@ -107,24 +107,21 @@ /** * Initialize the logging system for the virtual physical layer. */ -int ms_log_init(char *cat_mask) +int ms_log_init(void *ctx, const char *cat_mask) { - struct log_target *stderr_target; + int rc;
- log_init(&ms_log_info, NULL); - stderr_target = log_target_create_stderr(); - OSMO_ASSERT(stderr_target != NULL); + rc = osmo_init_logging2(ctx, &ms_log_info); + OSMO_ASSERT(rc == 0);
- log_add_target(stderr_target); - log_set_all_filter(stderr_target, 1); - //log_set_log_level(stderr_target, 1); - log_set_print_filename2(stderr_target, LOG_FILENAME_PATH); - log_set_use_color(stderr_target, 0); - log_set_print_timestamp(stderr_target, 1); - log_set_print_category_hex(stderr_target, 0); - log_set_print_category(stderr_target, 1); + //log_set_log_level(osmo_stderr_target, 1); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_PATH); + log_set_use_color(osmo_stderr_target, 0); + log_set_print_timestamp(osmo_stderr_target, 1); + log_set_print_category_hex(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 1); if (cat_mask) - log_parse_category_mask(stderr_target, cat_mask); + log_parse_category_mask(osmo_stderr_target, cat_mask);
return 0; } diff --git a/src/host/virt_phy/src/virtphy.c b/src/host/virt_phy/src/virtphy.c index 005ae2d..0aa21ad 100644 --- a/src/host/virt_phy/src/virtphy.c +++ b/src/host/virt_phy/src/virtphy.c @@ -242,7 +242,7 @@ /* init loginfo */ handle_options(argc, argv);
- ms_log_init(log_mask); + ms_log_init(tall_vphy_ctx, log_mask); l1gprs_logging_init(DGPRS);
LOGP(DVIRPHY, LOGL_INFO, "Virtual physical layer starting up...\n");
-
fixeria