laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/27394 ) Change subject: host: Always initialize libosmocore logging before using it ...................................................................... host: Always initialize libosmocore logging before using it This avoids related ASSERTs or error messages in case any of the libosmocore / libosmousb API functions internally tries to log something. Change-Id: I611c435516856c5c8928d7810fd9a9b831adc199 --- M host/src/simtrace2-cardem-pcsc.c M host/src/simtrace2-tool.c M host/src/simtrace2_usb.c 3 files changed, 16 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/94/27394/1 diff --git a/host/src/simtrace2-cardem-pcsc.c b/host/src/simtrace2-cardem-pcsc.c index 8b08f36..c402df7 100644 --- a/host/src/simtrace2-cardem-pcsc.c +++ b/host/src/simtrace2-cardem-pcsc.c @@ -447,13 +447,21 @@ print_welcome(); + osmo_init_logging2(NULL, &log_info); + rc = osmo_libusb_init(NULL); if (rc < 0) { fprintf(stderr, "libusb initialization failed\n"); return rc; } - osmo_init_logging2(NULL, &log_info); + log_set_print_category_hex(osmo_stderr_target, false); + log_set_print_category(osmo_stderr_target, true); + log_set_print_level(osmo_stderr_target, true); + log_set_print_filename_pos(osmo_stderr_target, LOG_FILENAME_POS_LINE_END); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); + log_set_category_filter(osmo_stderr_target, DLINP, 1, LOGL_DEBUG); + log_set_category_filter(osmo_stderr_target, DLGLOBAL, 1, LOGL_DEBUG); while (1) { int option_index = 0; diff --git a/host/src/simtrace2-tool.c b/host/src/simtrace2-tool.c index 9c9b5ed..b0fac6c 100644 --- a/host/src/simtrace2-tool.c +++ b/host/src/simtrace2-tool.c @@ -290,6 +290,8 @@ transp->udp_fd = -1; + print_welcome(); + osmo_init_logging2(NULL, &log_info); rc = osmo_libusb_init(NULL); @@ -298,8 +300,6 @@ goto do_exit; } - print_welcome(); - do { if (transp->udp_fd < 0) { struct usb_interface_match _ifm, *ifm = &_ifm; diff --git a/host/src/simtrace2_usb.c b/host/src/simtrace2_usb.c index 10dc948..8ebc4f7 100644 --- a/host/src/simtrace2_usb.c +++ b/host/src/simtrace2_usb.c @@ -18,6 +18,8 @@ #include <errno.h> #include <osmocom/core/utils.h> +#include <osmocom/core/logging.h> +#include <osmocom/core/application.h> #include <osmocom/usb/libusb.h> #include <osmocom/simtrace2/simtrace_usb.h> @@ -71,8 +73,11 @@ return num_interfaces; } +static struct log_info log_info = {}; + int main(int argc, char **argv) { + osmo_init_logging2(NULL, &log_info); osmo_libusb_init(NULL); find_devices(); return 0; -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/27394 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I611c435516856c5c8928d7810fd9a9b831adc199 Gerrit-Change-Number: 27394 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge@osmocom.org> Gerrit-MessageType: newchange