From c8c6325535916a4ac11e08b34c6f6b88aac52409 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Wed, 1 May 2024 12:14:06 +0200 Subject: [PATCH] Add flags for logging configuration --- src/main/CMakeLists.txt | 2 +- src/main/main.cc | 11 +++++++++-- src/tests/CMakeLists.txt | 22 +++++++++++----------- src/tests/single_test_main.cc | 1 + src/tests/system-tests/ttff.cc | 1 + src/tests/test_main.cc | 2 +- 6 files changed, 24 insertions(+), 15 deletions(-) diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt index c48639a07..04b2a0622 100644 --- a/src/main/CMakeLists.txt +++ b/src/main/CMakeLists.txt @@ -26,7 +26,7 @@ if(ENABLE_GLOG_AND_GFLAGS) target_link_libraries(gnss-sdr PRIVATE Gflags::gflags Glog::glog) target_compile_definitions(gnss-sdr PUBLIC -DUSE_GLOG_AND_GFLAGS=1) else() - target_link_libraries(gnss-sdr PRIVATE absl::flags absl::flags_parse absl::log absl::log_initialize absl::log_sink absl::log_sink_registry) + target_link_libraries(gnss-sdr PRIVATE absl::flags absl::flags_parse absl::log $ absl::log_initialize absl::log_sink absl::log_sink_registry) endif() if(NOT ENABLE_LOG) diff --git a/src/main/main.cc b/src/main/main.cc index 472f44148..78009e329 100644 --- a/src/main/main.cc +++ b/src/main/main.cc @@ -57,6 +57,7 @@ using namespace google; #include #include #include +#include #include #include #include @@ -124,6 +125,7 @@ int main(int argc, char** argv) absl::SetFlagsUsageConfig(empty_config); absl::SetProgramUsageMessage(intro_help); absl::ParseCommandLine(argc, argv); + #endif std::cout << "Initializing GNSS-SDR v" << gnss_sdr_version << " ... Please wait.\n"; } @@ -147,7 +149,6 @@ int main(int argc, char** argv) if (GOOGLE_STRIP_LOG == 0) { - // google::InitGoogleLogging(argv[0]); #if USE_GLOG_AND_GFLAGS google::InitGoogleLogging(argv[0]); if (FLAGS_log_dir.empty()) @@ -212,7 +213,13 @@ int main(int argc, char** argv) } } } - +#if USE_GLOG_AND_GFLAGS +#else + else + { + absl::SetMinLogLevel(absl::LogSeverityAtLeast::kInfinity); // do not log + } +#endif std::chrono::time_point start; std::chrono::time_point end; start = std::chrono::system_clock::now(); diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index 43f8ff97d..ebc9e7ab3 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -623,7 +623,7 @@ if(ENABLE_UNIT_TESTING) target_link_libraries(run_tests PRIVATE Gflags::gflags Glog::glog) target_compile_definitions(run_tests PRIVATE -DUSE_GLOG_AND_GFLAGS=1) else() - target_link_libraries(run_tests PRIVATE absl::flags absl::flags_parse absl::log absl::log_initialize) + target_link_libraries(run_tests PRIVATE absl::flags absl::flags_parse absl::log $ absl::log_initialize) endif() target_include_directories(run_tests INTERFACE @@ -773,7 +773,7 @@ if(ENABLE_FPGA) target_link_libraries(gps_l1_ca_dll_pll_tracking_test_fpga PRIVATE Gflags::gflags Glog::glog) target_compile_definitions(gps_l1_ca_dll_pll_tracking_test_fpga PRIVATE -DUSE_GLOG_AND_GFLAGS=1) else() - target_link_libraries(gps_l1_ca_dll_pll_tracking_test_fpga PRIVATE absl::flags absl::flags_parse absl::log absl::log_initialize) + target_link_libraries(gps_l1_ca_dll_pll_tracking_test_fpga PRIVATE absl::flags absl::flags_parse absl::log $ absl::log_initialize) endif() target_include_directories(gps_l1_ca_dll_pll_tracking_test_fpga INTERFACE ${GNSSSDR_SOURCE_DIR}/src/tests/common-files @@ -872,7 +872,7 @@ if(ENABLE_SYSTEM_TESTING) if(ENABLE_GLOG_AND_GFLAGS) set(OPT_LIBS_ ${OPT_LIBS_} Gflags::gflags Glog::glog) else() - set(OPT_LIBS_ ${OPT_LIBS_} absl::flags_parse absl::flags absl::log absl::log_initialize absl::log_sink absl::log_sink_registry) + set(OPT_LIBS_ ${OPT_LIBS_} absl::flags_parse absl::flags absl::log $ absl::log_initialize absl::log_sink absl::log_sink_registry) endif() if(NOT ENABLE_PACKAGING) add_system_test(ttff @@ -896,7 +896,7 @@ if(ENABLE_SYSTEM_TESTING) if(ENABLE_GLOG_AND_GFLAGS) set(OPT_LIBS_ ${OPT_LIBS_} Gflags::gflags Glog::glog) else() - set(OPT_LIBS_ ${OPT_LIBS_} absl::flags_parse absl::log absl::log_initialize absl::log_sink absl::log_sink_registry) + set(OPT_LIBS_ ${OPT_LIBS_} absl::flags_parse absl::log $ absl::log_initialize absl::log_sink absl::log_sink_registry) endif() add_system_test(position_test CMAKE_ARGS -DCMAKE_BUILD_TYPE=$<$:Debug>$<$:Release>$<$:RelWithDebInfo>$<$:MinSizeRel>$<$:Debug>$<$:Debug>$<$:RelWithDebInfo>$<$:RelWithDebInfo>$<$:Debug> @@ -969,7 +969,7 @@ if(NOT ENABLE_PACKAGING AND NOT ENABLE_FPGA) target_link_libraries(flowgraph_test PRIVATE Gflags::gflags Glog::glog) target_compile_definitions(flowgraph_test PRIVATE -DUSE_GLOG_AND_GFLAGS=1) else() - target_link_libraries(flowgraph_test PRIVATE absl::flags absl::flags_parse absl::log absl::log_initialize) + target_link_libraries(flowgraph_test PRIVATE absl::flags absl::flags_parse absl::log $ absl::log_initialize) endif() target_include_directories(flowgraph_test @@ -1026,7 +1026,7 @@ if(NOT ENABLE_PACKAGING AND NOT ENABLE_FPGA) target_link_libraries(gnss_block_test PRIVATE Gflags::gflags Glog::glog) target_compile_definitions(gnss_block_test PRIVATE -DUSE_GLOG_AND_GFLAGS=1) else() - target_link_libraries(gnss_block_test PRIVATE absl::flags absl::flags_parse absl::log absl::log_initialize) + target_link_libraries(gnss_block_test PRIVATE absl::flags absl::flags_parse absl::log $ absl::log_initialize) endif() target_include_directories(gnss_block_test @@ -1078,7 +1078,7 @@ if(NOT ENABLE_PACKAGING AND NOT ENABLE_FPGA) target_link_libraries(gnuradio_block_test PRIVATE Gflags::gflags Glog::glog) target_compile_definitions(gnuradio_block_test PRIVATE -DUSE_GLOG_AND_GFLAGS=1) else() - target_link_libraries(gnuradio_block_test PRIVATE absl::flags absl::flags_parse absl::log absl::log_initialize) + target_link_libraries(gnuradio_block_test PRIVATE absl::flags absl::flags_parse absl::log $ absl::log_initialize) endif() xcode_remove_warning_duplicates(gnuradio_block_test) @@ -1114,7 +1114,7 @@ if(ENABLE_GLOG_AND_GFLAGS) target_link_libraries(matio_test PRIVATE Gflags::gflags Glog::glog) target_compile_definitions(matio_test PRIVATE -DUSE_GLOG_AND_GFLAGS=1) else() - target_link_libraries(matio_test PRIVATE absl::flags absl::flags_parse absl::log absl::log_initialize) + target_link_libraries(matio_test PRIVATE absl::flags absl::flags_parse absl::log $ absl::log_initialize) endif() target_include_directories(matio_test @@ -1164,7 +1164,7 @@ if(NOT ENABLE_PACKAGING AND NOT ENABLE_FPGA) target_link_libraries(acq_test PRIVATE Gflags::gflags Glog::glog) target_compile_definitions(acq_test PRIVATE -DUSE_GLOG_AND_GFLAGS=1) else() - target_link_libraries(acq_test PRIVATE absl::flags absl::flags_parse absl::log absl::log_initialize) + target_link_libraries(acq_test PRIVATE absl::flags absl::flags_parse absl::log $ absl::log_initialize) endif() target_include_directories(acq_test INTERFACE @@ -1250,7 +1250,7 @@ if(NOT ENABLE_PACKAGING AND NOT ENABLE_FPGA) target_link_libraries(trk_test PRIVATE Gflags::gflags Glog::glog) target_compile_definitions(trk_test PRIVATE -DUSE_GLOG_AND_GFLAGS=1) else() - target_link_libraries(trk_test PRIVATE absl::flags absl::flags_parse absl::log absl::log_initialize) + target_link_libraries(trk_test PRIVATE absl::flags absl::flags_parse absl::log $ absl::log_initialize) endif() if(USE_GENERIC_LAMBDAS) set(has_generic_lambdas HAS_GENERIC_LAMBDA=1) @@ -1313,7 +1313,7 @@ if(NOT ENABLE_PACKAGING AND NOT ENABLE_FPGA) target_link_libraries(control_thread_test PRIVATE Gflags::gflags Glog::glog) target_compile_definitions(control_thread_test PRIVATE -DUSE_GLOG_AND_GFLAGS=1) else() - target_link_libraries(control_thread_test PRIVATE absl::flags absl::flags_parse absl::log absl::log_initialize) + target_link_libraries(control_thread_test PRIVATE absl::flags absl::flags_parse absl::log $ absl::log_initialize) endif() xcode_remove_warning_duplicates(control_thread_test) diff --git a/src/tests/single_test_main.cc b/src/tests/single_test_main.cc index 669bc91c8..5156ee547 100644 --- a/src/tests/single_test_main.cc +++ b/src/tests/single_test_main.cc @@ -39,6 +39,7 @@ DECLARE_string(log_dir); #include "gnss_sdr_flags.h" #include #include +#include #include #include #include diff --git a/src/tests/system-tests/ttff.cc b/src/tests/system-tests/ttff.cc index ebaebee55..773a9acd3 100644 --- a/src/tests/system-tests/ttff.cc +++ b/src/tests/system-tests/ttff.cc @@ -52,6 +52,7 @@ using namespace google; #else #include #include +#include #include #endif diff --git a/src/tests/test_main.cc b/src/tests/test_main.cc index 991495070..bdc565e0d 100644 --- a/src/tests/test_main.cc +++ b/src/tests/test_main.cc @@ -38,6 +38,7 @@ DECLARE_string(log_dir); #include "gnss_sdr_flags.h" #include #include +#include #include #include #include @@ -220,7 +221,6 @@ int main(int argc, char **argv) absl::ParseCommandLine(argc, argv); absl::LogSink *testLogSink = new TestingLogSink; absl::AddLogSink(testLogSink); - // absl::SetMinLogLevel(absl::LogSeverityAtLeast::kInfinity); absl::InitializeLog(); #endif try