Merge pull request #125 from project-tsurugi/wip/revise_build

revise build system in regard to ALTIMETER
project-tsurugi · Jan 21, 2024 · 3652375 · 3652375
2 parents 8e727bb + f98061f
commit 3652375
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 15 deletions.
diff --git a/cmake/CompileOptions.cmake b/cmake/CompileOptions.cmake
@@ -31,3 +31,9 @@ function(set_compile_options target_name)
     target_compile_options(${target_name}
         PRIVATE -Wall -Wextra -Werror)
 endfunction(set_compile_options)
+
+if(ENABLE_ALTIMETER)
+    message("altimeter enabled")
+    add_definitions(-DENABLE_ALTIMETER)
+endif()
+
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -57,12 +57,11 @@ endif (ENABLE_JEMALLOC)
 
 if (ENABLE_ALTIMETER)
     target_link_libraries(server
-        PUBLIC altimeter
-        PUBLIC Boost::container
-        PUBLIC fmt::fmt
-        PUBLIC Threads::Threads
+        PRIVATE altimeter
+        PRIVATE Boost::container
+        PRIVATE fmt::fmt
+        PRIVATE Threads::Threads
     )
-    target_compile_definitions(server PUBLIC ALTIMETER)
 endif()
 
 set_compile_options(server)
@@ -144,13 +143,6 @@ target_link_libraries(tgctl
         PRIVATE rt
         )
 
-if (ENABLE_ALTIMETER)
-        target_include_directories(tgctl
-                PRIVATE altimeter
-        )
-        target_compile_definitions(tgctl PUBLIC ALTIMETER)
-endif()
-
 set_compile_options(tgctl)
 
 install_custom(tgctl ${export_name})
diff --git a/src/tateyama/configuration/bootstrap_configuration.cpp b/src/tateyama/configuration/bootstrap_configuration.cpp
@@ -65,7 +65,7 @@ static constexpr std::string_view default_configuration {  // NOLINT
     "[glog]\n"
         "dummy=\n"  // just for retain glog section in default configuration
 
-#ifdef ALTIMETER
+#ifdef ENABLE_ALTIMETER
     "[event_log]\n"
         "output=true\n"
         "directory=/var/log/altimeter/event\n"

diff --git a/src/tateyama/server/backend.cpp b/src/tateyama/server/backend.cpp
@@ -48,7 +48,7 @@
 #include "utils.h"
 #include "logging.h"
 #include "glog_helper.h"
-#ifdef ALTIMETER
+#ifdef ENABLE_ALTIMETER
 #include <altimeter/logger.h>
 #include "tateyama/altimeter/altimeter_helper.h"
 #endif
@@ -98,7 +98,7 @@ int backend_main(int argc, char **argv) {
         exit(1);
     }
     setup_glog(conf.get());
-#ifdef ALTIMETER
+#ifdef ENABLE_ALTIMETER
     auto altimeter_object = std::make_unique<tateyama::altimeter::altimeter_helper>(conf.get());
     altimeter_object->start();
 #endif
@@ -237,6 +237,9 @@ int backend_main(int argc, char **argv) {
     LOG(INFO) << "exiting";
     status_info->whole(tateyama::status_info::state::deactivating);
     tgsv.shutdown();
+#ifdef ENABLE_ALTIMETER
+    altimeter_object->shutdown();
+#endif
     status_info->whole(tateyama::status_info::state::deactivated);
     return 0;
 }