Merge f68371e into b8bbd4f

qdrvm · Oct 28, 2022 · ea2f7a0 · ea2f7a0
2 parents b8bbd4f + f68371e
commit ea2f7a0
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -39,6 +39,7 @@ option(CLANG_TIDY   "Enable clang-tidy checks during compilation" OFF)
 option(COVERAGE     "Enable generation of coverage info"          OFF)
 option(EMBEDDINGS   "Embed developers assets"                     ON )
 option(PROFILING    "Enable internal profiling instruments"       OFF)
+option(BACKWARD     "Enable stacktrace logging instruments"       ON )
 
 # sanitizers will be enabled only for Kagome, and will be disabled for dependencies
 option(ASAN         "Enable address sanitizer"                    OFF)

diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
@@ -7,8 +7,10 @@ if (TESTING)
     find_package(GTest CONFIG REQUIRED)
 endif()
 
-hunter_add_package(backward-cpp)
-find_package(Backward)
+if (BACKWARD)
+    hunter_add_package(backward-cpp)
+    find_package(Backward)
+endif()
 
 # https://docs.hunter.sh/en/latest/packages/pkg/Boost.html
 hunter_add_package(Boost COMPONENTS random filesystem program_options date_time)

diff --git a/core/utils/CMakeLists.txt b/core/utils/CMakeLists.txt
@@ -10,13 +10,14 @@ add_executable(storage_explorer
 target_link_libraries(storage_explorer
     application_injector
     )
-add_backward(storage_explorer)
+if (BACKWARD)
+    add_backward(storage_explorer)
+endif()
 
 add_executable(kagome-db-editor
     kagome_db_editor.cpp
     )
 target_link_libraries(kagome-db-editor
-    Backward::Backward
     Boost::Boost.DI
     block_storage
     changes_tracker
@@ -29,4 +30,8 @@ target_link_libraries(kagome-db-editor
     trie_storage
     trie_storage_backend
     )
+if (BACKWARD)
+  add_backward(kagome-db-editor)
+endif()
 kagome_install(kagome-db-editor)
+
diff --git a/core/utils/kagome_db_editor.cpp b/core/utils/kagome_db_editor.cpp
@@ -4,9 +4,13 @@
 #include <string_view>
 #include <thread>
 
+#if defined(BACKWARD_HAS_BACKTRACE)
 #include <backward.hpp>
+#endif
+
 #undef TRUE
 #undef FALSE
+
 #include <boost/di.hpp>
 #include <soralog/impl/configurator_from_yaml.hpp>
 
@@ -160,7 +164,9 @@ auto is_hash(const char *s) {
 };
 
 int main(int argc, char *argv[]) {
+#if defined(BACKWARD_HAS_BACKTRACE)
   backward::SignalHandling sh;
+#endif
 
   Command cmd;
   if (argc == 2 or (argc == 3 && is_hash(argv[2]))

diff --git a/node/CMakeLists.txt b/node/CMakeLists.txt
@@ -7,7 +7,6 @@ add_executable(kagome
     main.cpp
     )
 target_link_libraries(kagome
-    Backward::Backward
     Boost::boost
     Boost::program_options
     kagome_application
@@ -16,4 +15,7 @@ target_link_libraries(kagome
     p2p::p2p_identify
     p2p::p2p_ping
     )
+if (BACKWARD)
+  add_backward(kagome)
+endif()
 kagome_install(kagome)
diff --git a/node/main.cpp b/node/main.cpp
@@ -5,9 +5,13 @@
 
 #include <iostream>
 
+#if defined(BACKWARD_HAS_BACKTRACE)
 #include <backward.hpp>
+#endif
+
 #undef TRUE
 #undef FALSE
+
 #include <libp2p/log/configurator.hpp>
 
 #include "application/impl/app_configuration_impl.hpp"
@@ -20,8 +24,9 @@ using kagome::application::AppConfiguration;
 using kagome::application::AppConfigurationImpl;
 
 int main(int argc, const char **argv) {
+#if defined(BACKWARD_HAS_BACKTRACE)
   backward::SignalHandling sh;
-
+#endif
   {
     soralog::util::setThreadName("kagome");