mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-01-31 11:19:18 +00:00
Code Issues Releases Wiki Activity

Add flags for logging configuration

Browse Source
This commit is contained in:
Carles Fernandez 2024-05-01 12:14:06 +02:00
parent 33a38f4ec6
commit c8c6325535
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
6 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/CMakeLists.txt
View File

@ -26,7 +26,7 @@ if(ENABLE_GLOG_AND_GFLAGS)
target_link_libraries(gnss-sdr PRIVATE Gflags::gflags Glog::glog) target_link_libraries(gnss-sdr PRIVATE Gflags::gflags Glog::glog)
target_compile_definitions(gnss-sdr PUBLIC -DUSE_GLOG_AND_GFLAGS=1) target_compile_definitions(gnss-sdr PUBLIC -DUSE_GLOG_AND_GFLAGS=1)
else() 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 $<LINK_LIBRARY:WHOLE_ARCHIVE,absl::log_flags> absl::log_initialize absl::log_sink absl::log_sink_registry)
endif() endif()
if(NOT ENABLE_LOG) if(NOT ENABLE_LOG)

11
src/main/main.cc
View File

@ -57,6 +57,7 @@ using namespace google;
#include <absl/flags/parse.h> #include <absl/flags/parse.h>
#include <absl/flags/usage.h> #include <absl/flags/usage.h>
#include <absl/flags/usage_config.h> #include <absl/flags/usage_config.h>
#include <absl/log/flags.h>
#include <absl/log/globals.h> #include <absl/log/globals.h>
#include <absl/log/initialize.h> #include <absl/log/initialize.h>
#include <absl/log/log.h> #include <absl/log/log.h>
@ -124,6 +125,7 @@ int main(int argc, char** argv)
absl::SetFlagsUsageConfig(empty_config); absl::SetFlagsUsageConfig(empty_config);
absl::SetProgramUsageMessage(intro_help); absl::SetProgramUsageMessage(intro_help);
absl::ParseCommandLine(argc, argv); absl::ParseCommandLine(argc, argv);
#endif #endif
std::cout << "Initializing GNSS-SDR v" << gnss_sdr_version << " ... Please wait.\n"; 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) if (GOOGLE_STRIP_LOG == 0)
{ {
// google::InitGoogleLogging(argv[0]);
#if USE_GLOG_AND_GFLAGS #if USE_GLOG_AND_GFLAGS
google::InitGoogleLogging(argv[0]); google::InitGoogleLogging(argv[0]);
if (FLAGS_log_dir.empty()) 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<std::chrono::system_clock> start; std::chrono::time_point<std::chrono::system_clock> start;
std::chrono::time_point<std::chrono::system_clock> end; std::chrono::time_point<std::chrono::system_clock> end;
start = std::chrono::system_clock::now(); start = std::chrono::system_clock::now();

22
src/tests/CMakeLists.txt
View File

@ -623,7 +623,7 @@ if(ENABLE_UNIT_TESTING)
target_link_libraries(run_tests PRIVATE Gflags::gflags Glog::glog) target_link_libraries(run_tests PRIVATE Gflags::gflags Glog::glog)
target_compile_definitions(run_tests PRIVATE -DUSE_GLOG_AND_GFLAGS=1) target_compile_definitions(run_tests PRIVATE -DUSE_GLOG_AND_GFLAGS=1)
else() 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 $<LINK_LIBRARY:WHOLE_ARCHIVE,absl::log_flags> absl::log_initialize)
endif() endif()
target_include_directories(run_tests target_include_directories(run_tests
INTERFACE 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_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) target_compile_definitions(gps_l1_ca_dll_pll_tracking_test_fpga PRIVATE -DUSE_GLOG_AND_GFLAGS=1)
else() 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 $<LINK_LIBRARY:WHOLE_ARCHIVE,absl::log_flags> absl::log_initialize)
endif() endif()
target_include_directories(gps_l1_ca_dll_pll_tracking_test_fpga target_include_directories(gps_l1_ca_dll_pll_tracking_test_fpga
INTERFACE ${GNSSSDR_SOURCE_DIR}/src/tests/common-files INTERFACE ${GNSSSDR_SOURCE_DIR}/src/tests/common-files
@ -872,7 +872,7 @@ if(ENABLE_SYSTEM_TESTING)
if(ENABLE_GLOG_AND_GFLAGS) if(ENABLE_GLOG_AND_GFLAGS)
set(OPT_LIBS_ ${OPT_LIBS_} Gflags::gflags Glog::glog) set(OPT_LIBS_ ${OPT_LIBS_} Gflags::gflags Glog::glog)
else() 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 $<LINK_LIBRARY:WHOLE_ARCHIVE,absl::log_flags> absl::log_initialize absl::log_sink absl::log_sink_registry)
endif() endif()
if(NOT ENABLE_PACKAGING) if(NOT ENABLE_PACKAGING)
add_system_test(ttff add_system_test(ttff
@ -896,7 +896,7 @@ if(ENABLE_SYSTEM_TESTING)
if(ENABLE_GLOG_AND_GFLAGS) if(ENABLE_GLOG_AND_GFLAGS)
set(OPT_LIBS_ ${OPT_LIBS_} Gflags::gflags Glog::glog) set(OPT_LIBS_ ${OPT_LIBS_} Gflags::gflags Glog::glog)
else() 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 $<LINK_LIBRARY:WHOLE_ARCHIVE,absl::log_flags> absl::log_initialize absl::log_sink absl::log_sink_registry)
endif() endif()
add_system_test(position_test add_system_test(position_test
CMAKE_ARGS -DCMAKE_BUILD_TYPE=$<$<CONFIG:Debug>:Debug>$<$<CONFIG:Release>:Release>$<$<CONFIG:RelWithDebInfo>:RelWithDebInfo>$<$<CONFIG:MinSizeRel>:MinSizeRel>$<$<CONFIG:NoOptWithASM>:Debug>$<$<CONFIG:Coverage>:Debug>$<$<CONFIG:O2WithASM>:RelWithDebInfo>$<$<CONFIG:O3WithASM>:RelWithDebInfo>$<$<CONFIG:ASAN>:Debug> CMAKE_ARGS -DCMAKE_BUILD_TYPE=$<$<CONFIG:Debug>:Debug>$<$<CONFIG:Release>:Release>$<$<CONFIG:RelWithDebInfo>:RelWithDebInfo>$<$<CONFIG:MinSizeRel>:MinSizeRel>$<$<CONFIG:NoOptWithASM>:Debug>$<$<CONFIG:Coverage>:Debug>$<$<CONFIG:O2WithASM>:RelWithDebInfo>$<$<CONFIG:O3WithASM>:RelWithDebInfo>$<$<CONFIG:ASAN>:Debug>
@ -969,7 +969,7 @@ if(NOT ENABLE_PACKAGING AND NOT ENABLE_FPGA)
target_link_libraries(flowgraph_test PRIVATE Gflags::gflags Glog::glog) target_link_libraries(flowgraph_test PRIVATE Gflags::gflags Glog::glog)
target_compile_definitions(flowgraph_test PRIVATE -DUSE_GLOG_AND_GFLAGS=1) target_compile_definitions(flowgraph_test PRIVATE -DUSE_GLOG_AND_GFLAGS=1)
else() 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 $<LINK_LIBRARY:WHOLE_ARCHIVE,absl::log_flags> absl::log_initialize)
endif() endif()
target_include_directories(flowgraph_test 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_link_libraries(gnss_block_test PRIVATE Gflags::gflags Glog::glog)
target_compile_definitions(gnss_block_test PRIVATE -DUSE_GLOG_AND_GFLAGS=1) target_compile_definitions(gnss_block_test PRIVATE -DUSE_GLOG_AND_GFLAGS=1)
else() 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 $<LINK_LIBRARY:WHOLE_ARCHIVE,absl::log_flags> absl::log_initialize)
endif() endif()
target_include_directories(gnss_block_test 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_link_libraries(gnuradio_block_test PRIVATE Gflags::gflags Glog::glog)
target_compile_definitions(gnuradio_block_test PRIVATE -DUSE_GLOG_AND_GFLAGS=1) target_compile_definitions(gnuradio_block_test PRIVATE -DUSE_GLOG_AND_GFLAGS=1)
else() 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 $<LINK_LIBRARY:WHOLE_ARCHIVE,absl::log_flags> absl::log_initialize)
endif() endif()
xcode_remove_warning_duplicates(gnuradio_block_test) 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_link_libraries(matio_test PRIVATE Gflags::gflags Glog::glog)
target_compile_definitions(matio_test PRIVATE -DUSE_GLOG_AND_GFLAGS=1) target_compile_definitions(matio_test PRIVATE -DUSE_GLOG_AND_GFLAGS=1)
else() 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 $<LINK_LIBRARY:WHOLE_ARCHIVE,absl::log_flags> absl::log_initialize)
endif() endif()
target_include_directories(matio_test 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_link_libraries(acq_test PRIVATE Gflags::gflags Glog::glog)
target_compile_definitions(acq_test PRIVATE -DUSE_GLOG_AND_GFLAGS=1) target_compile_definitions(acq_test PRIVATE -DUSE_GLOG_AND_GFLAGS=1)
else() 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 $<LINK_LIBRARY:WHOLE_ARCHIVE,absl::log_flags> absl::log_initialize)
endif() endif()
target_include_directories(acq_test target_include_directories(acq_test
INTERFACE INTERFACE
@ -1250,7 +1250,7 @@ if(NOT ENABLE_PACKAGING AND NOT ENABLE_FPGA)
target_link_libraries(trk_test PRIVATE Gflags::gflags Glog::glog) target_link_libraries(trk_test PRIVATE Gflags::gflags Glog::glog)
target_compile_definitions(trk_test PRIVATE -DUSE_GLOG_AND_GFLAGS=1) target_compile_definitions(trk_test PRIVATE -DUSE_GLOG_AND_GFLAGS=1)
else() 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 $<LINK_LIBRARY:WHOLE_ARCHIVE,absl::log_flags> absl::log_initialize)
endif() endif()
if(USE_GENERIC_LAMBDAS) if(USE_GENERIC_LAMBDAS)
set(has_generic_lambdas HAS_GENERIC_LAMBDA=1) 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_link_libraries(control_thread_test PRIVATE Gflags::gflags Glog::glog)
target_compile_definitions(control_thread_test PRIVATE -DUSE_GLOG_AND_GFLAGS=1) target_compile_definitions(control_thread_test PRIVATE -DUSE_GLOG_AND_GFLAGS=1)
else() 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 $<LINK_LIBRARY:WHOLE_ARCHIVE,absl::log_flags> absl::log_initialize)
endif() endif()
xcode_remove_warning_duplicates(control_thread_test) xcode_remove_warning_duplicates(control_thread_test)

1
src/tests/single_test_main.cc
View File

@ -39,6 +39,7 @@ DECLARE_string(log_dir);
#include "gnss_sdr_flags.h" #include "gnss_sdr_flags.h"
#include <absl/flags/flag.h> #include <absl/flags/flag.h>
#include <absl/flags/parse.h> #include <absl/flags/parse.h>
#include <absl/log/flags.h>
#include <absl/log/initialize.h> #include <absl/log/initialize.h>
#include <absl/log/log.h> #include <absl/log/log.h>
#include <absl/log/log_sink.h> #include <absl/log/log_sink.h>

1
src/tests/system-tests/ttff.cc
View File

@ -52,6 +52,7 @@ using namespace google;
#else #else
#include <absl/flags/flag.h> #include <absl/flags/flag.h>
#include <absl/flags/parse.h> #include <absl/flags/parse.h>
#include <absl/log/flags.h>
#include <absl/log/log.h> #include <absl/log/log.h>
#endif #endif

2
src/tests/test_main.cc
View File

@ -38,6 +38,7 @@ DECLARE_string(log_dir);
#include "gnss_sdr_flags.h" #include "gnss_sdr_flags.h"
#include <absl/flags/flag.h> #include <absl/flags/flag.h>
#include <absl/flags/parse.h> #include <absl/flags/parse.h>
#include <absl/log/flags.h>
#include <absl/log/globals.h> #include <absl/log/globals.h>
#include <absl/log/initialize.h> #include <absl/log/initialize.h>
#include <absl/log/log.h> #include <absl/log/log.h>
@ -220,7 +221,6 @@ int main(int argc, char **argv)
absl::ParseCommandLine(argc, argv); absl::ParseCommandLine(argc, argv);
absl::LogSink *testLogSink = new TestingLogSink; absl::LogSink *testLogSink = new TestingLogSink;
absl::AddLogSink(testLogSink); absl::AddLogSink(testLogSink);
// absl::SetMinLogLevel(absl::LogSeverityAtLeast::kInfinity);
absl::InitializeLog(); absl::InitializeLog();
#endif #endif
try try