Mon 11764 pb timeperiod (#188)

* MON-11764-pb-timeperiod ecriture tests * MON-11764 only one engine timerange * MON-11764-pb use of precomp header * MON-11764-pb-timeperiod no use of boost::icl at the moment * MON-11764 update after comments
centreon · Apr 12, 2022 · 6dbe4d8 · 6dbe4d8
1 parent c503fef
commit 6dbe4d8
Show file tree

Hide file tree

Showing 500 changed files with 1,898 additions and 2,269 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,6 +15,8 @@ broker_pb2.pyc
 broker_pb2_grpc.py
 broker_pb2_grpc.pyc
 build
+build_my_host
+build_centos7
 cppcheck-build
 cppcheck-report.txt
 broker/core/inc/com/centreon/broker/database/table_max_size.hh

diff --git a/conanfile.txt b/conanfile.txt
@@ -18,3 +18,4 @@ cmake
 grpc:secure=True
 boost:header_only=True
 libssh2:shared=False
+
diff --git a/engine/CMakeLists.txt b/engine/CMakeLists.txt
@@ -41,6 +41,7 @@ endif ()
 set(INC_DIR "${PROJECT_SOURCE_DIR}/inc")
 set(SCRIPT_DIR "${PROJECT_SOURCE_DIR}/scripts")
 set(SRC_DIR "${PROJECT_SOURCE_DIR}/src")
+set(PRECOMP_HEADER "${PROJECT_SOURCE_DIR}/precomp_inc/precomp.hh")
 
 set(ENGINE_MODULES_DIR "${CMAKE_INSTALL_PREFIX}/lib64/centreon-engine/")
 
@@ -532,6 +533,9 @@ add_library(cce_core ${LIBRARY_TYPE} ${FILES})
 add_dependencies(cce_core engine_rpc)
 add_dependencies(cce_core centreon_clib)
 
+target_precompile_headers(cce_core PRIVATE ${PRECOMP_HEADER})
+
+
 # Link target with required libraries.
 target_link_libraries(cce_core CONAN_PKG::nlohmann_json
   ${MATH_LIBRARIES}
@@ -546,6 +550,7 @@ target_link_libraries(cce_core CONAN_PKG::nlohmann_json
 add_executable("centengine" "${SRC_DIR}/main.cc")
 set_property(TARGET "centengine" PROPERTY ENABLE_EXPORTS "1")
 add_dependencies(centengine centreon_clib)
+target_precompile_headers(centengine PRIVATE ${PRECOMP_HEADER})
 
 # Link centengine with required libraries.
 target_link_libraries(centengine "-export-dynamic" centreon_clib "-Wl,-whole-archive" enginerpc cce_core  "-Wl,-no-whole-archive" -L${CONAN_LIB_DIRS_GRPC} "-Wl,--whole-archive" grpc++ "-Wl,--no-whole-archive" CONAN_PKG::grpc ${absl_LIBS} CONAN_PKG::openssl ${c-ares_LIBS} CONAN_PKG::zlib dl)
@@ -554,6 +559,7 @@ target_link_libraries(centengine "-export-dynamic" centreon_clib "-Wl,-whole-arc
 add_executable("centenginestats" "${SRC_DIR}/centenginestats.cc")
 add_dependencies("centenginestats" centreon_clib)
 target_link_libraries("centenginestats" centreon_clib)
+target_precompile_headers(centenginestats PRIVATE ${PRECOMP_HEADER})
 
 # Unit tests.
 add_subdirectory(tests)

diff --git a/engine/enginerpc/CMakeLists.txt b/engine/enginerpc/CMakeLists.txt
@@ -78,6 +78,9 @@ add_library(
   "${INC_DIR}/enginerpc.hh"
 )
 
+target_precompile_headers(${ENGINERPC} PRIVATE ../precomp_inc/precomp.hh)
+
+
 # Prettier name.
 set_property(TARGET ${ENGINERPC} PROPERTY PREFIX "" PROPERTY POSITION_INDEPENDENT_CODE ON)
 # Link target with libraries.

diff --git a/engine/enginerpc/CMakeLists.txt.old b/engine/enginerpc/CMakeLists.txt.old
diff --git a/engine/enginerpc/engine_impl.cc b/engine/enginerpc/engine_impl.cc
@@ -1,11 +1,8 @@
 #include "com/centreon/engine/engine_impl.hh"
 
-#include <fmt/format.h>
 #include <google/protobuf/util/time_util.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <algorithm>
-#include <functional>
 #include <future>
 
 #include "com/centreon/engine/anomalydetection.hh"

diff --git a/engine/inc/com/centreon/engine/anomalydetection.hh b/engine/inc/com/centreon/engine/anomalydetection.hh
@@ -22,6 +22,7 @@
 
 #include <map>
 #include <mutex>
+
 #include <nlohmann/json.hpp>
 #include <tuple>
 

diff --git a/engine/inc/com/centreon/engine/broker/compatibility.hh b/engine/inc/com/centreon/engine/broker/compatibility.hh
@@ -21,7 +21,6 @@
 #define CCE_BROKER_COMPATIBILITY_HH
 
 #include "com/centreon/engine/broker/handle.hh"
-#include "com/centreon/engine/namespace.hh"
 
 CCE_BEGIN()
 

diff --git a/engine/inc/com/centreon/engine/broker/handle.hh b/engine/inc/com/centreon/engine/broker/handle.hh
@@ -20,9 +20,6 @@
 #ifndef CCE_BROKER_HANDLE_HH
 #define CCE_BROKER_HANDLE_HH
 
-#include <memory>
-#include <string>
-#include "com/centreon/engine/namespace.hh"
 #include "com/centreon/library.hh"
 
 CCE_BEGIN()

diff --git a/engine/inc/com/centreon/engine/broker/loader.hh b/engine/inc/com/centreon/engine/broker/loader.hh
@@ -20,11 +20,7 @@
 #ifndef CCE_MODULES_LOADER_HH
 #define CCE_MODULES_LOADER_HH
 
-#include <list>
-#include <memory>
-#include <string>
 #include "com/centreon/engine/broker/handle.hh"
-#include "com/centreon/engine/namespace.hh"
 
 CCE_BEGIN()
 

diff --git a/engine/inc/com/centreon/engine/check_result.hh b/engine/inc/com/centreon/engine/check_result.hh
@@ -24,7 +24,6 @@
 #include <sys/time.h>
 
 #include "com/centreon/engine/checkable.hh"
-#include "com/centreon/engine/namespace.hh"
 
 enum check_source { service_check, host_check };
 

diff --git a/engine/inc/com/centreon/engine/checks/checker.hh b/engine/inc/com/centreon/engine/checks/checker.hh
@@ -20,8 +20,6 @@
 #ifndef CCE_CHECKS_CHECKER_HH
 #define CCE_CHECKS_CHECKER_HH
 
-#include <queue>
-
 #include "com/centreon/engine/anomalydetection.hh"
 #include "com/centreon/engine/commands/command.hh"
 

diff --git a/engine/inc/com/centreon/engine/checks/stats.hh b/engine/inc/com/centreon/engine/checks/stats.hh
@@ -23,8 +23,6 @@
 #ifndef CCE_CHECKS_STATS_HH
 #define CCE_CHECKS_STATS_HH
 
-#include <time.h>
-
 #define ACTIVE_SCHEDULED_SERVICE_CHECK_STATS 0
 #define ACTIVE_ONDEMAND_SERVICE_CHECK_STATS 1
 #define PASSIVE_SERVICE_CHECK_STATS 2

diff --git a/engine/inc/com/centreon/engine/command_manager.hh b/engine/inc/com/centreon/engine/command_manager.hh
@@ -20,13 +20,10 @@
 #ifndef CCE_COMMAND_MANAGER_HH
 #define CCE_COMMAND_MANAGER_HH
 
-#include <deque>
 #include <future>
-#include <mutex>
 
 #include "com/centreon/engine/engine_impl.hh"
 #include "com/centreon/engine/host.hh"
-#include "com/centreon/engine/namespace.hh"
 
 /**
  *  @class command_manager command_manager.hh

diff --git a/engine/inc/com/centreon/engine/commands/connector.hh b/engine/inc/com/centreon/engine/commands/connector.hh
@@ -20,13 +20,8 @@
 #ifndef CCE_COMMANDS_CONNECTOR_HH
 #define CCE_COMMANDS_CONNECTOR_HH
 
-#include <condition_variable>
-#include <memory>
-#include <mutex>
-#include <string>
 #include <thread>
 #include "com/centreon/engine/commands/command.hh"
-#include "com/centreon/engine/namespace.hh"
 #include "com/centreon/process.hh"
 #include "com/centreon/process_listener.hh"
 

diff --git a/engine/inc/com/centreon/engine/commands/environment.hh b/engine/inc/com/centreon/engine/commands/environment.hh
@@ -21,9 +21,6 @@
 #ifndef CCE_COMMANDS_ENVIRONMENT_HH
 #define CCE_COMMANDS_ENVIRONMENT_HH
 
-#include <string>
-#include "com/centreon/engine/namespace.hh"
-
 CCE_BEGIN()
 
 namespace commands {

diff --git a/engine/inc/com/centreon/engine/commands/forward.hh b/engine/inc/com/centreon/engine/commands/forward.hh
@@ -19,10 +19,8 @@
 #ifndef CCE_COMMANDS_FORWARD_HH
 #define CCE_COMMANDS_FORWARD_HH
 
-#include <string>
 #include "com/centreon/engine/commands/command.hh"
 #include "com/centreon/engine/commands/connector.hh"
-#include "com/centreon/engine/namespace.hh"
 
 CCE_BEGIN()
 

diff --git a/engine/inc/com/centreon/engine/commands/raw.hh b/engine/inc/com/centreon/engine/commands/raw.hh
@@ -20,11 +20,7 @@
 #ifndef CCE_COMMANDS_RAW_HH
 #define CCE_COMMANDS_RAW_HH
 
-#include <deque>
-#include <mutex>
-#include <string>
 #include "com/centreon/engine/commands/command.hh"
-#include "com/centreon/engine/namespace.hh"
 #include "com/centreon/process.hh"
 #include "com/centreon/process_listener.hh"
 

diff --git a/engine/inc/com/centreon/engine/comment.hh b/engine/inc/com/centreon/engine/comment.hh
@@ -20,9 +20,6 @@
 
 #ifndef CCE_OBJECTS_COMMENTS_HH
 #define CCE_OBJECTS_COMMENTS_HH
-#include <time.h>
-#include <map>
-#include <ostream>
 #include "com/centreon/engine/contact.hh"
 #include "com/centreon/engine/host.hh"
 

diff --git a/engine/inc/com/centreon/engine/configuration/anomalydetection.hh b/engine/inc/com/centreon/engine/configuration/anomalydetection.hh
@@ -20,15 +20,10 @@
 #ifndef CCE_CONFIGURATION_ANOMALYDETECTION_HH
 #define CCE_CONFIGURATION_ANOMALYDETECTION_HH
 
-#include <list>
-#include <memory>
-#include <set>
-#include <utility>
 #include "com/centreon/engine/common.hh"
 #include "com/centreon/engine/configuration/group.hh"
 #include "com/centreon/engine/configuration/object.hh"
 #include "com/centreon/engine/customvariable.hh"
-#include "com/centreon/engine/namespace.hh"
 #include "com/centreon/engine/opt.hh"
 
 CCE_BEGIN()

diff --git a/engine/inc/com/centreon/engine/configuration/applier/anomalydetection.hh b/engine/inc/com/centreon/engine/configuration/applier/anomalydetection.hh
@@ -20,8 +20,6 @@
 #ifndef CCE_CONFIGURATION_APPLIER_ANOMALYDETECTION_HH
 #define CCE_CONFIGURATION_APPLIER_ANOMALYDETECTION_HH
 
-#include "com/centreon/engine/namespace.hh"
-
 CCE_BEGIN()
 
 namespace configuration {

diff --git a/engine/inc/com/centreon/engine/configuration/applier/command.hh b/engine/inc/com/centreon/engine/configuration/applier/command.hh
@@ -20,9 +20,6 @@
 #ifndef CCE_CONFIGURATION_APPLIER_COMMAND_HH
 #define CCE_CONFIGURATION_APPLIER_COMMAND_HH
 
-#include <string>
-#include "com/centreon/engine/namespace.hh"
-
 CCE_BEGIN()
 
 // Forward declarations.

diff --git a/engine/inc/com/centreon/engine/configuration/applier/connector.hh b/engine/inc/com/centreon/engine/configuration/applier/connector.hh
@@ -20,8 +20,6 @@
 #ifndef CCE_CONFIGURATION_APPLIER_CONNECTOR_HH
 #define CCE_CONFIGURATION_APPLIER_CONNECTOR_HH
 
-#include "com/centreon/engine/namespace.hh"
-
 CCE_BEGIN()
 
 namespace configuration {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -18,3 +18,4 @@ cmake
		grpc:secure=True
		boost:header_only=True
		libssh2:shared=False