diff --git a/ChaosMetadataService/object_storage/influxDB/InfluxDB.cpp b/ChaosMetadataService/object_storage/influxDB/InfluxDB.cpp index 8e4933a631752e11f9d55bd4bba17eadcaff4e38..42cdc1f6d4f3af1c992a5bc14fe67f37f7f6a3ca 100644 --- a/ChaosMetadataService/object_storage/influxDB/InfluxDB.cpp +++ b/ChaosMetadataService/object_storage/influxDB/InfluxDB.cpp @@ -74,6 +74,8 @@ inline bool skipDefault(const std::string& name) { if (name == chaos::ControlUnitDatapackCommonKey::RUN_ID) return true; if (name == chaos::DataPackCommonKey::DPCK_DEVICE_ID) return true; if (name == chaos::NodeHealtDefinitionKey::NODE_HEALT_MDS_TIMESTAMP) return true; + if (name == chaos::DataPackCommonKey::DPCK_SEQ_ID) return true; + if (name == chaos::DataPackCommonKey::DPCK_TIMESTAMP) return true; return false; } diff --git a/chaos/common/bson/bson/bson-config.h b/chaos/common/bson/bson/bson-config.h index 4f7ba2974f6a857984462471cca62260eeff8068..792af336a677b1bb6ddb8d2bbeef024a5ce0aca1 100644 --- a/chaos/common/bson/bson/bson-config.h +++ b/chaos/common/bson/bson/bson-config.h @@ -1,14 +1,17 @@ #ifndef BSON_CONFIG_H #define BSON_CONFIG_H -#include <boost/detail/endian.hpp> +//#include <boost/detail/endian.hpp> +#include <boost/predef/other/endian.h> /* * Define to 1234 for Little Endian, 4321 for Big Endian. */ -#if defined(BOOST_LITTLE_ENDIAN) +//#if defined(BOOST_LITTLE_ENDIAN) +#if defined(BOOST_ENDIAN_LITTLE_BYTE) #define BSON_BYTE_ORDER 1234 -#elif defined(BOOST_BIG_ENDIAN) +//#elif defined(BOOST_BIG_ENDIAN) +#elif defined(BOOST_ENDIAN_BIG_BYTE) #define BSON_BYTE_ORDER 4321 #else #error "unable to determine system endianness" diff --git a/config/CMakeChaos.txt b/config/CMakeChaos.txt index 26647a0ecfaf409d192238cd859c357c6ff7d9cc..c652b4a8e486abadd0f1da5b07cfdfc7ff14b0d0 100644 --- a/config/CMakeChaos.txt +++ b/config/CMakeChaos.txt @@ -44,7 +44,7 @@ option(CHAOS_DEBUG "Enable Debug" OFF) option(CHAOS_ENABLE_C11 "Enable C11" ON) option(CHAOS_DISABLE_EVENTFD "Disable EventFD" OFF) option(CHAOS_BUILD_CACHE "Keep third part sources" ON) -option(CHAOS_BOOST_VERSION "Use a predefined boost version" 64) +option(CHAOS_BOOST_VERSION "Use a predefined boost version" 66) option(CHAOS_BOOST_MINOR_VERSION "Use a predefined boost minor version" 0) option(CHAOS_BOOST_DYNAMIC "compile and use dynamic boost" OFF) option(CHAOS_BUILD_UNITSERVER "Automatically build an Unit Server that includes all CUs found in distribution" ON) @@ -180,6 +180,8 @@ IF(CHAOS_TARGET) ELSE() SET(CHAOS_POSTFIX "${CHAOS_SYSTEM_MACHINE}-${CHAOS_SYSTEM_NAME}") ENDIF() +set(Boost_USE_STATIC_LIBS ON) +set(Boost_USE_STATIC_RUNTIME ON) IF(${SYSTEM_NAME} MATCHES "Darwin") # Mac OS X specific code @@ -237,9 +239,7 @@ CheckCompiler("CXX" arm-infn-linux-gnueabi-g++) CheckCompiler("C" arm-infn-linux-gnueabi-gcc) SET(CHAOS_CROSS_HOST arm-infn-linux-gnueabi) SET(CHAOS_ENABLE_C11 "Enable C11" OFF) -SET(CHAOS_BOOST_VERSION 64) - SET(CHAOS_BOOST_MINOR_VERSION 0) - SET (CHAOS_C_FLAGS "${CHAOS_C_FLAGS} -fno-builtin -DCHAOS_NO_BACKTRACE -DBOOST_ASIO_DISABLE_EVENTFD -D__BSON_USEMEMCPY__ -mcpu=xscale -D__BSON_USEMEMCPY__ -DBOOST_ASIO_DISABLE_EVENTFD -mno-unaligned-access -DDISABLE_COMPARE_AND_SWAP -mfloat-abi=soft") +SET (CHAOS_C_FLAGS "${CHAOS_C_FLAGS} -fno-builtin -DCHAOS_NO_BACKTRACE -DBOOST_ASIO_DISABLE_EVENTFD -D__BSON_USEMEMCPY__ -mcpu=xscale -D__BSON_USEMEMCPY__ -DBOOST_ASIO_DISABLE_EVENTFD -mno-unaligned-access -DDISABLE_COMPARE_AND_SWAP -mfloat-abi=soft") SET(CHAOS_CXX_FLAGS "${CHAOS_CXX_FLAGS} ${CHAOS_C_FLAGS}") SET(CHAOS_BOOST_FLAGS toolset=gcc-arm target-os=linux) SET(CHAOS_DISABLE_EVENTFD ON) @@ -345,7 +345,7 @@ if( CHAOS_BOOST_VERSION) SET(BOOST_VERSION ${CHAOS_BOOST_VERSION}) SET(BOOST_MINOR_VERSION ${CHAOS_BOOST_MINOR_VERSION}) ELSE() - SET(BOOST_VERSION 64) + SET(BOOST_VERSION 66) SET(BOOST_MINOR_VERSION 0) ENDIF() @@ -430,6 +430,9 @@ if(LIB_NEED) # include_directories(${Boost_INCLUDE_DIRS}) else() MESG("boost not found in ${CMAKE_INSTALL_PREFIX}/lib downloading...") + set(Boost_USE_STATIC_LIBS ON) + set(Boost_USE_STATIC_RUNTIME ON) + # boostInstall(${BOOST_VERSION} ${BOOST_MINOR_VERSION} https://dl.bintray.com/boostorg/release/1.${BOOST_VERSION}.${BOOST_MINOR_VERSION}/source "${CHAOS_BOOST_FLAGS}") boostInstall(${BOOST_VERSION} ${BOOST_MINOR_VERSION} https://sourceforge.net/projects/boost/files/boost/1.${BOOST_VERSION}.${BOOST_MINOR_VERSION} "${CHAOS_BOOST_FLAGS}") endif()