diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3c188b0e09c768093bdd52be7c808130be703289..49ee836ed839fd6b252289d8ba68e953449a754c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,8 @@ FEATURES
IMPROVEMENTS
* Consumer/Producer API - allow any characters in source/stream/group names
* Consumer/Producer API - introduce stream metadata
-* Consumer API - an option to auto discovery of data folder when consumer client uses file transfer service (has_filesystem=False)
+* Consumer API - an option to auto discovery of data folder when consumer client uses file transfer service (has_filesystem=False)
+* Improved build procedure - shared libaries, added pkg-config and cmake config for asapo clients
BUG FIXES
* Consumer API: multiple consumers from same group receive stream finished error
diff --git a/CMakeModules/astyle.cmake b/CMakeIncludes/astyle.cmake
similarity index 82%
rename from CMakeModules/astyle.cmake
rename to CMakeIncludes/astyle.cmake
index 4fb06da8181f694a4546379c31c17c06734be276..00e13f3a0a2a0d1521bcba1850f1d5686d7e8ee8 100644
--- a/CMakeModules/astyle.cmake
+++ b/CMakeIncludes/astyle.cmake
@@ -7,9 +7,9 @@ if(ASTYLE_EXECUTABLE)
${ASTYLE_EXECUTABLE} -i
--exclude=${PROJECT_BINARY_DIR}
--recursive -n --style=google --indent=spaces=4 --max-code-length=120
- --max-instatement-indent=50 --pad-oper --align-pointer=type
+ --max-instatement-indent=50 --pad-oper --align-pointer=type --quiet
"${PROJECT_SOURCE_DIR}/*.cpp" "${PROJECT_SOURCE_DIR}/*.h"
- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+ WORKING_DIRECTORY ..
VERBATIM
)
else()
diff --git a/CMakeIncludes/dependencies.cmake b/CMakeIncludes/dependencies.cmake
new file mode 100644
index 0000000000000000000000000000000000000000..a9b19a74c0e7f8fbe0f353946fc082349ad4fe7f
--- /dev/null
+++ b/CMakeIncludes/dependencies.cmake
@@ -0,0 +1,32 @@
+if(BUILD_PYTHON)
+ set(BUILD_PYTHON_PACKAGES "" CACHE STRING "which python packages to build")
+ set_property(CACHE BUILD_PYTHON_PACKAGES PROPERTY STRINGS source rpm deb win)
+endif()
+
+set (CMAKE_PREFIX_PATH "${LIBCURL_DIR}")
+find_package (CURL REQUIRED)
+message (STATUS "Found cURL libraries: ${CURL_LIBRARIES}")
+message (STATUS "cURL include: ${CURL_INCLUDE_DIRS}")
+if(CURL_FOUND) #old FindCURL versions do not create CURL::libcurl target, so we do it here if CURL::libcurl is missing
+ if(NOT TARGET CURL::libcurl)
+ add_library(CURL::libcurl UNKNOWN IMPORTED)
+ set_target_properties(CURL::libcurl PROPERTIES
+ INTERFACE_INCLUDE_DIRECTORIES "${CURL_INCLUDE_DIRS}")
+ set_target_properties(CURL::libcurl PROPERTIES
+ IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+ IMPORTED_LOCATION "${CURL_LIBRARIES}")
+ endif()
+endif()
+
+
+
+# python is needed anyway, even if no Python packages are build (e.g. to parse test results)
+if ("${Python_EXECUTABLE}" STREQUAL "")
+ find_package (Python COMPONENTS Interpreter Development)
+ if (NOT Python_FOUND)
+ message (FATAL "Cannot find Python")
+ endif()
+endif()
+message (STATUS "Using Python: ${Python_EXECUTABLE}")
+
+include(libfabric)
\ No newline at end of file
diff --git a/CMakeIncludes/language_settings.cmake b/CMakeIncludes/language_settings.cmake
new file mode 100644
index 0000000000000000000000000000000000000000..29d287bbbebd1b7e0cafd28d3607440e0792e983
--- /dev/null
+++ b/CMakeIncludes/language_settings.cmake
@@ -0,0 +1,41 @@
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_C_STANDARD 99)
+
+IF(WIN32)
+ set(CMAKE_CXX_FLAGS_DEBUG "/MTd")
+ set(CMAKE_CXX_FLAGS_RELEASE "/MT")
+ add_definitions(-DWIN32)
+ add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "GNU")
+ add_compile_options(-Wall -Wextra -pedantic -Wconversion -Wno-missing-field-initializers -fPIC)
+ IF (STOP_BUILD_ON_WARNINGS)
+ add_compile_options(-Werror)
+ ENDIF()
+ SET( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libgcc -static-libstdc++")
+ELSEIF(CMAKE_C_COMPILER_ID MATCHES "Clang")
+ IF (STOP_BUILD_ON_WARNINGS)
+ add_compile_options(-Werror)
+ ENDIF()
+ add_compile_options(-Wall -Wextra -pedantic -Wconversion)
+ENDIF(WIN32)
+
+set (ASAPO_CXX_COMMON_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/common/cpp/include)
+
+find_package (Threads)
+
+#TODO: Better way then GLOBAL PROPERTY
+IF(WIN32)
+ find_package(Threads REQUIRED)
+ SET(ASAPO_COMMON_IO_LIBRARIES ${CMAKE_THREAD_LIBS_INIT} wsock32 ws2_32)
+ELSEIF(UNIX)
+ SET(ASAPO_COMMON_IO_LIBRARIES Threads::Threads)
+ENDIF(WIN32)
+SET_PROPERTY(GLOBAL PROPERTY ASAPO_COMMON_IO_LIBRARIES ${ASAPO_COMMON_IO_LIBRARIES})
+
+if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+ add_definitions(-DUNIT_TESTS)
+endif (CMAKE_BUILD_TYPE STREQUAL "Debug")
+
+if (APPLE)
+ link_directories("/usr/local/lib")
+endif()
\ No newline at end of file
diff --git a/CMakeIncludes/libfabric.cmake b/CMakeIncludes/libfabric.cmake
new file mode 100644
index 0000000000000000000000000000000000000000..be0714b574103c0fdf4048bb91127ea7af552138
--- /dev/null
+++ b/CMakeIncludes/libfabric.cmake
@@ -0,0 +1,16 @@
+SET(ASAPO_COMMON_FABRIC_LIBRARIES ${ASAPO_COMMON_IO_LIBRARIES})
+IF(ENABLE_LIBFABRIC)
+ find_package(LibFabric)
+ if(NOT LIBFABRIC_LIBRARY)
+ message(FATAL_ERROR "Did not find libfabric")
+ endif()
+ message(STATUS "LibFabric support enabled")
+ message(STATUS "LIB_FABRIC: Path: ${LIBFABRIC_LIBRARY} Include: ${LIBFABRIC_INCLUDE_DIR}")
+ add_definitions(-DLIBFABRIC_ENABLED)
+ SET(ASAPO_COMMON_FABRIC_LIBRARIES ${ASAPO_COMMON_FABRIC_LIBRARIES} dl)
+ IF(ENABLE_LIBFABRIC_LOCALHOST)
+ message(STATUS "LIB_FABRIC: Enabled emulated RDMA when localhost is used. Should only be used for tests.")
+ add_definitions(-DLIBFARBIC_ALLOW_LOCALHOST)
+ ENDIF()
+ENDIF()
+SET_PROPERTY(GLOBAL PROPERTY ASAPO_COMMON_FABRIC_LIBRARIES ${ASAPO_COMMON_FABRIC_LIBRARIES})
diff --git a/CMakeIncludes/packaging.cmake b/CMakeIncludes/packaging.cmake
new file mode 100644
index 0000000000000000000000000000000000000000..72bc6ab94e4dbe740d1919c056c89990591c27e9
--- /dev/null
+++ b/CMakeIncludes/packaging.cmake
@@ -0,0 +1,25 @@
+if(NOT PACKAGE_RELEASE_SUFFIX)
+ set(PACKAGE_RELEASE_SUFFIX linux)
+endif()
+set(CPACK_PACKAGE_VERSION ${ASAPO_VERSION})
+set(CPACK_PACKAGE_RELEASE ${PACKAGE_RELEASE_SUFFIX})
+set(CPACK_PACKAGE_CONTACT "IT")
+set(CPACK_PACKAGE_VENDOR "DESY")
+IF (WIN32)
+ install(FILES ${CURL_LIBRARIES} DESTINATION lib)
+ set(CPACK_PACKAGE_FILE_NAME "asapo-${CPACK_PACKAGE_VERSION}.${CMAKE_SYSTEM_PROCESSOR}")
+else()
+ get_filename_component(CURLLIB_EXT ${CURL_LIBRARIES} EXT)
+ if(DEFINED PACK_STATIC_CURL_LIB)
+ install(FILES ${PACK_STATIC_CURL_LIB} DESTINATION lib RENAME ${CMAKE_STATIC_LIBRARY_PREFIX}asapo-curl${CMAKE_STATIC_LIBRARY_SUFFIX})
+ elseif("R${CMAKE_STATIC_LIBRARY_SUFFIX}" STREQUAL "R${CURLLIB_EXT}")
+ install(FILES ${CURL_LIBRARIES} DESTINATION lib RENAME ${CMAKE_STATIC_LIBRARY_PREFIX}asapo-curl${CURLLIB_EXT})
+ set(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
+ set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_PACKAGE_RELEASE}.${CMAKE_SYSTEM_PROCESSOR}")
+ endif()
+endif()
+
+set(CPACK_DEBIAN_PACKAGE_DEPENDS "libcurl4-openssl-dev")
+set(CPACK_RPM_PACKAGE_REQUIRES "libcurl-devel")
+
+include(CPack)
\ No newline at end of file
diff --git a/CMakeIncludes/prepare_version.cmake b/CMakeIncludes/prepare_version.cmake
new file mode 100644
index 0000000000000000000000000000000000000000..5b7a91c5b2f04135cddd227172b55c7ddde9fd6d
--- /dev/null
+++ b/CMakeIncludes/prepare_version.cmake
@@ -0,0 +1,4 @@
+string(TIMESTAMP TIMESTAMP "%H:%M:%S %d.%m.%Y UTC" UTC)
+
+configure_file( ${PROJECT_SOURCE_DIR}/common/cpp/include/asapo/common/internal/version.h.in ../common/cpp/include/asapo/common/internal/version.h @ONLY)
+configure_file( ${PROJECT_SOURCE_DIR}/common/go/src/asapo_common/version/version_lib.go.in ../common/go/src/asapo_common/version/version_lib.go @ONLY)
diff --git a/CMakeModules/prepare_version_tag.cmake b/CMakeIncludes/prepare_version_tag.cmake
similarity index 86%
rename from CMakeModules/prepare_version_tag.cmake
rename to CMakeIncludes/prepare_version_tag.cmake
index b4d299d198088e0dd5f286aeed7b048071558abe..7ce10de4822f4076c90ed12f1da61006cb1be1b6 100644
--- a/CMakeModules/prepare_version_tag.cmake
+++ b/CMakeIncludes/prepare_version_tag.cmake
@@ -5,18 +5,18 @@ endfunction()
execute_process(COMMAND git describe --tags --abbrev=0
OUTPUT_VARIABLE ASAPO_TAG
- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
+ WORKING_DIRECTORY ..)
string(STRIP ${ASAPO_TAG} ASAPO_TAG)
execute_process(COMMAND git rev-parse --abbrev-ref HEAD
OUTPUT_VARIABLE BRANCH
- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
+ WORKING_DIRECTORY ..)
string(STRIP ${BRANCH} BRANCH)
cleanup(BRANCH)
execute_process(COMMAND git rev-parse --short=10 HEAD
OUTPUT_VARIABLE ASAPO_VERSION_COMMIT
- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
+ WORKING_DIRECTORY ..)
string(STRIP ${ASAPO_VERSION_COMMIT} ASAPO_VERSION_COMMIT)
if (${BRANCH} STREQUAL "master")
@@ -32,7 +32,7 @@ else()
SET (ASAPO_VERSION_COMMIT ", build ${ASAPO_VERSION_COMMIT}")
SET (ASAPO_VERSION_DOCKER_SUFFIX "-dev")
string(REPLACE "_" "-" ASAPO_VERSION ${ASAPO_VERSION})
- SET (ASAPO_VERSION 1.0.${ASAPO_VERSION})
+ SET (ASAPO_VERSION 100.0.${ASAPO_VERSION})
SET (PYTHON_ASAPO_VERSION ${ASAPO_VERSION})
SET (ASAPO_WHEEL_VERSION ${ASAPO_VERSION})
endif()
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 45af391cd03a63110fa2a773c2d924ed331ec473..ec51ea4ee739c7682f2f5c0c42255b20b5c52f1e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,10 +1,11 @@
cmake_minimum_required(VERSION 3.7)
project(ASAPO)
+set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeModules/ ${PROJECT_SOURCE_DIR}/CMakeIncludes/)
+
#protocol version changes if one of the microservice API's change
set (ASAPO_CONSUMER_PROTOCOL "v0.4")
set (ASAPO_PRODUCER_PROTOCOL "v0.3")
-
set (ASAPO_DISCOVERY_API_VER "v0.1")
set (ASAPO_AUTHORIZER_API_VER "v0.2")
set (ASAPO_BROKER_API_VER "v0.4")
@@ -13,51 +14,18 @@ set (ASAPO_RECEIVER_API_VER "v0.3")
set (ASAPO_RDS_API_VER "v0.1")
set (DB_SCHEMA_VER "v0.1")
-set(CMAKE_CXX_STANDARD 11)
-IF(WIN32)
- set(CMAKE_CXX_FLAGS_DEBUG "/MTd")
- set(CMAKE_CXX_FLAGS_RELEASE "/MT")
- add_definitions(-DWIN32)
- add_definitions(-D_CRT_SECURE_NO_WARNINGS)
-ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "GNU")
- SET( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libgcc -static-libstdc++")
-#todo: added fPIC to be able to create shared libs for Python - check it does not change performance
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fPIC")
- SET(BUILD_SHARED_LIBS OFF)
-ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "Clang")
- add_compile_options("-fsanitize=address")
- link_libraries("-fsanitize=address")
-ENDIF(WIN32)
-
-#TODO: Better way then GLOBAL PROPERTY
-IF(WIN32)
- find_package(Threads REQUIRED)
- SET(ASAPO_COMMON_IO_LIBRARIES ${CMAKE_THREAD_LIBS_INIT} wsock32 ws2_32)
-ELSEIF(UNIX)
- SET(ASAPO_COMMON_IO_LIBRARIES Threads::Threads)
-ENDIF(WIN32)
-SET_PROPERTY(GLOBAL PROPERTY ASAPO_COMMON_IO_LIBRARIES ${ASAPO_COMMON_IO_LIBRARIES})
-
-if (CMAKE_BUILD_TYPE STREQUAL "Debug")
- add_definitions(-DUNIT_TESTS)
-endif (CMAKE_BUILD_TYPE STREQUAL "Debug")
-
-if (APPLE)
- link_directories("/usr/local/lib")
-endif()
+#global settings
-option(BUILD_CLIENTS_ONLY "Build clients only" OFF)
-option(BUILD_CONSUMER_TOOLS "Build consumer tools" OFF)
-option(BUILD_EVENT_MONITOR_PRODUCER "Build the event monitor producer" OFF)
+set(ConfigPackageLocation lib/cmake/Asapo)
+# options
option(BUILD_PYTHON "Build python libs" ON)
-if(BUILD_PYTHON)
- set(BUILD_PYTHON_PACKAGES "" CACHE STRING "which python packages to build")
- set_property(CACHE BUILD_PYTHON_PACKAGES PROPERTY STRINGS source rpm deb win)
-endif()
+option(BUILD_CLIENTS_ONLY "Build clients only" OFF)
+option(BUILD_CONSUMER_TOOLS "Build consumer tools" OFF)
+option(BUILD_EVENT_MONITOR_PRODUCER "Build the event monitor producer" OFF)
option(BUILD_TESTS "Build unit tests" OFF)
option(BUILD_INTEGRATION_TESTS "Include integration tests" OFF)
@@ -65,74 +33,43 @@ option(BUILD_INTEGRATION_TESTS "Include integration tests" OFF)
option(BUILD_EXAMPLES "Build examples" OFF)
option(INSTALL_EXAMPLES "Install examples" OFF)
+option(STOP_BUILD_ON_WARNINGS "Stop build if compiler has warnings" OFF)
+
option(BUILD_CPP_DOCS "Build the C++ documentaion with doxygen" OFF)
option(BUILD_PYTHON_DOCS "Build the Python documentaion with sphinx" OFF)
option(BUILD_ASAPO_SITE "Build the asapo web site" OFF)
-
option(ENABLE_LIBFABRIC "Enables LibFabric support for RDMA transfers" OFF)
option(ENABLE_LIBFABRIC_LOCALHOST "Emulates LibFabric stack over TCP. Only for localhost and testing purposes." OFF)
+option(BUILD_SHARED_CLIENT_LIBS "Build shared consumer and producer libs" ON)
+option(BUILD_STATIC_CLIENT_LIBS "Build static consumer and producer libs" ON)
-set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeModules/)
-
-set (ASAPO_CXX_COMMON_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/common/cpp/include)
-
-find_package (Threads)
+# includes
-set (CMAKE_PREFIX_PATH "${LIBCURL_DIR}")
-find_package (CURL REQUIRED)
-message (STATUS "Found cURL libraries: ${CURL_LIBRARIES}")
-message (STATUS "cURL include: ${CURL_INCLUDE_DIRS}")
+include(language_settings)
+include(dependencies)
-
-if ("${Python_EXECUTABLE}" STREQUAL "")
- find_package (Python COMPONENTS Interpreter Development)
- if (NOT Python_FOUND)
- message (FATAL "Cannot find Python")
- endif()
-endif()
-message (STATUS "Using Python: ${Python_EXECUTABLE}")
-
-
-SET(ASAPO_COMMON_FABRIC_LIBRARIES ${ASAPO_COMMON_IO_LIBRARIES})
-IF(ENABLE_LIBFABRIC)
- find_package(LibFabric)
- if(NOT LIBFABRIC_LIBRARY)
- message(FATAL_ERROR "Did not find libfabric")
- endif()
- message(STATUS "LibFabric support enabled")
- message(STATUS "LIB_FABRIC: Path: ${LIBFABRIC_LIBRARY} Include: ${LIBFABRIC_INCLUDE_DIR}")
- add_definitions(-DLIBFABRIC_ENABLED)
- SET(ASAPO_COMMON_FABRIC_LIBRARIES ${ASAPO_COMMON_FABRIC_LIBRARIES} dl)
- IF(ENABLE_LIBFABRIC_LOCALHOST)
- message(STATUS "LIB_FABRIC: Enabled emulated RDMA when localhost is used. Should only be used for tests.")
- add_definitions(-DLIBFARBIC_ALLOW_LOCALHOST)
- ENDIF()
-ENDIF()
-SET_PROPERTY(GLOBAL PROPERTY ASAPO_COMMON_FABRIC_LIBRARIES ${ASAPO_COMMON_FABRIC_LIBRARIES})
-
-# format sources
include(astyle)
include(prepare_version_tag)
-
include(testing_cpp)
-
include(prepare_asapo)
+include(prepare_version)
+include(packaging)
-add_subdirectory(common/cpp)
+#subdirectorties
+add_subdirectory(common/cpp)
add_subdirectory(producer)
add_subdirectory(consumer)
-
if (NOT BUILD_CLIENTS_ONLY)
-add_subdirectory(broker)
-add_subdirectory(receiver)
-add_subdirectory(discovery)
-add_subdirectory(authorizer)
-add_subdirectory(asapo_tools)
-add_subdirectory(file_transfer)
+ add_subdirectory(broker)
+ add_subdirectory(receiver)
+ add_subdirectory(discovery)
+ add_subdirectory(authorizer)
+ add_subdirectory(asapo_tools)
+ add_subdirectory(file_transfer)
endif()
add_subdirectory(deploy)
@@ -145,30 +82,7 @@ if(BUILD_EXAMPLES OR INSTALL_EXAMPLES OR BUILD_ASAPO_SITE)
add_subdirectory(examples)
endif()
-include(prepare_version)
-
add_subdirectory(docs)
-if(NOT PACKAGE_RELEASE_SUFFIX)
- set(PACKAGE_RELEASE_SUFFIX linux)
-endif()
-
+add_subdirectory(install)
-set(CPACK_PACKAGE_VERSION ${ASAPO_VERSION})
-set(CPACK_PACKAGE_RELEASE ${PACKAGE_RELEASE_SUFFIX})
-set(CPACK_PACKAGE_CONTACT "IT")
-set(CPACK_PACKAGE_VENDOR "DESY")
-IF (WIN32)
- install(FILES ${CURL_LIBRARIES} DESTINATION lib)
- set(CPACK_PACKAGE_FILE_NAME "asapo-${CPACK_PACKAGE_VERSION}.${CMAKE_SYSTEM_PROCESSOR}")
-else()
- get_filename_component(CURLLIB_EXT ${CURL_LIBRARIES} EXT)
- if (${CMAKE_SHARED_LIBRARY_SUFFIX} EQUAL ${CURLLIB_EXT})
- install(FILES ${CURL_LIBRARIES} DESTINATION lib RENAME ${CMAKE_SHARED_LIBRARY_PREFIX}asapo-curl${CURLLIB_EXT})
- else()
- install(FILES ${CURL_LIBRARIES} DESTINATION lib RENAME ${CMAKE_STATIC_LIBRARY_PREFIX}asapo-curl${CURLLIB_EXT})
- endif()
- set(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
- set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_PACKAGE_RELEASE}.${CMAKE_SYSTEM_PROCESSOR}")
-endif()
-include(CPack)
\ No newline at end of file
diff --git a/CMakeModules/prepare_version.cmake b/CMakeModules/prepare_version.cmake
deleted file mode 100644
index 7ef56e9486d3c798234c767aedcca48654cf5821..0000000000000000000000000000000000000000
--- a/CMakeModules/prepare_version.cmake
+++ /dev/null
@@ -1,4 +0,0 @@
-string(TIMESTAMP TIMESTAMP "%H:%M:%S %d.%m.%Y UTC" UTC)
-
-configure_file(${PROJECT_SOURCE_DIR}/common/cpp/include/asapo/common/internal/version.h.in ${PROJECT_SOURCE_DIR}/common/cpp/include/asapo/common/internal/version.h @ONLY)
-configure_file(${PROJECT_SOURCE_DIR}/common/go/src/asapo_common/version/version_lib.go.in ${PROJECT_SOURCE_DIR}/common/go/src/asapo_common/version/version_lib.go @ONLY)
diff --git a/CMakeModules/testing_cpp.cmake b/CMakeModules/testing_cpp.cmake
index 0c000601b4f9a70f7049e2878c85c8bad6c0c158..23a4457ac3af624949eeba0f4b3c9a55900820c3 100644
--- a/CMakeModules/testing_cpp.cmake
+++ b/CMakeModules/testing_cpp.cmake
@@ -34,7 +34,7 @@ endif ()
#TODO: Call add_plain_unit_test in gtest
function(add_plain_unit_test target test_source_files linktarget)
if (BUILD_TESTS)
- include_directories(${gtest_SOURCE_DIR}/include ${gtest_SOURCE_DIR})
+ include_directories(SYSTEM ${gtest_SOURCE_DIR}/include ${gtest_SOURCE_DIR})
link_directories(${gtest_SOURCE_DIR}/lib)
add_executable(test-${target} ${test_source_files})
@@ -66,7 +66,7 @@ endfunction()
function(gtest target test_source_files linktarget)
if (BUILD_TESTS)
- include_directories(${gtest_SOURCE_DIR}/include ${gtest_SOURCE_DIR})
+ include_directories(SYSTEM ${gtest_SOURCE_DIR}/include ${gtest_SOURCE_DIR})
link_directories(${gtest_SOURCE_DIR}/lib)
FOREACH (lib ${linktarget})
@@ -114,7 +114,7 @@ function(gtest target test_source_files linktarget)
endif ()
SETUP_TARGET_FOR_COVERAGE(NAME coverage-${target} EXECUTABLE test-${target} ${target})
add_test(NAME coveragetest-${target}
- COMMAND ${CMAKE_MODULE_PATH}/check_test.sh
+ COMMAND ${PROJECT_SOURCE_DIR}/CMakeModules/check_test.sh
coverage-${target} ${CMAKE_BINARY_DIR} ${ASAPO_MINIMUM_COVERAGE})
set_tests_properties(coveragetest-${target} PROPERTIES LABELS "coverage;all")
message(STATUS "Added test 'test-${target}-coverage'")
diff --git a/CMakeModules/testing_go.cmake b/CMakeModules/testing_go.cmake
index f130ab796ec0d94aeebffc94252ba628ea55b4aa..465736a5db40cbfb1146b1e8c66779c27b603b2c 100644
--- a/CMakeModules/testing_go.cmake
+++ b/CMakeModules/testing_go.cmake
@@ -16,7 +16,7 @@ function(gotest target source_dir test_source_files)
message(STATUS "Added test 'test-${target}'")
if (CMAKE_COMPILER_IS_GNUCXX)
add_test(NAME coveragetest-${target}
- COMMAND ${CMAKE_MODULE_PATH}/coverage_go.sh
+ COMMAND ${PROJECT_SOURCE_DIR}/CMakeModules/coverage_go.sh
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${ASAPO_MINIMUM_COVERAGE} ${gopath}
WORKING_DIRECTORY ${source_dir})
set_tests_properties(coveragetest-${target} PROPERTIES LABELS "coverage;all")
diff --git a/common/cpp/include/asapo/common/internal/asapo_common_c_glue.h b/common/cpp/include/asapo/common/internal/asapo_common_c_glue.h
index 9545dc7532347e79480ecb1d2570bc52931b1a8f..ef4be942c128c2e718562cbc4434003022ecb780 100644
--- a/common/cpp/include/asapo/common/internal/asapo_common_c_glue.h
+++ b/common/cpp/include/asapo/common/internal/asapo_common_c_glue.h
@@ -94,14 +94,7 @@ template <typename T> AsapoHandlerHolder<T>* handle_or_null_t(T* object,
AsapoHandlerHolder<std::string>* handle_or_null_t(const std::string& object,
AsapoErrorHandle* error,
asapo::Error err,
- const asapo::ErrorTemplateInterface* p_exclude_err_template = nullptr) {
- if (process_error(error, std::move(err), p_exclude_err_template) < 0) {
- return nullptr;
- } else {
- return new AsapoHandlerHolder<std::string>(object);
- }
-}
-
+ const asapo::ErrorTemplateInterface* p_exclude_err_template = nullptr);
template<typename u, typename t>
diff --git a/common/cpp/include/asapo/request/request.h b/common/cpp/include/asapo/request/request.h
index 83774bc6eb095b07199ca2125ababbcbe98e0700..f7fa5daf4bf7b49b4eb55e51fc08883de0f2a269 100644
--- a/common/cpp/include/asapo/request/request.h
+++ b/common/cpp/include/asapo/request/request.h
@@ -28,8 +28,9 @@ class GenericRequest {
if (timeout_ms_ == 0) {
return false;
}
- uint64_t elapsed_ms = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now() -
- created_at_).count();
+ uint64_t elapsed_ms = static_cast<uint64_t>(std::chrono::duration_cast<std::chrono::milliseconds>
+ (std::chrono::system_clock::now() -
+ created_at_).count());
return elapsed_ms > timeout_ms_;
}
diff --git a/common/cpp/include/asapo/request/request_pool.h b/common/cpp/include/asapo/request/request_pool.h
index 55f248d56dcd9a785ca38584fad6d246e1fa9248..2af119d68a24cbdc89791a22d7ea549f0658536c 100644
--- a/common/cpp/include/asapo/request/request_pool.h
+++ b/common/cpp/include/asapo/request/request_pool.h
@@ -30,7 +30,7 @@ class RequestPool {
VIRTUAL Error AddRequest(GenericRequestPtr request, bool top_priority = false);
VIRTUAL void SetLimits(RequestPoolLimits limits);
VIRTUAL Error AddRequests(GenericRequests requests);
- ~RequestPool();
+ VIRTUAL ~RequestPool();
VIRTUAL uint64_t NRequestsInPool();
VIRTUAL uint64_t UsedMemoryInPool();
VIRTUAL Error WaitRequestsFinished(uint64_t timeout_ms);
diff --git a/common/cpp/include/asapo/unittests/MockHttpClient.h b/common/cpp/include/asapo/unittests/MockHttpClient.h
index 3b41fcba69519d8890a2ab69cd217a85dc5e68fb..d5d318ed8890ecc2d245a9d8e76e934788337dc0 100644
--- a/common/cpp/include/asapo/unittests/MockHttpClient.h
+++ b/common/cpp/include/asapo/unittests/MockHttpClient.h
@@ -30,9 +30,9 @@ class MockHttpClient : public HttpClient {
return Error{PostReturnArray_t(uri, cookie, input_data, ouput_data, output_data_size, response_code)};
};
- Error Post(const std::string& uri, const std::string& cookie,
- const std::string& input_data, std::string output_file_name,
- HttpCode* response_code) const noexcept override {
+ Error Post(const std::string&, const std::string&,
+ const std::string&, std::string,
+ HttpCode* ) const noexcept override {
return nullptr;
};
diff --git a/common/cpp/include/asapo/unittests/MockIO.h b/common/cpp/include/asapo/unittests/MockIO.h
index ea2259e6695552e09c251a2e292bfc0186ce3975..9f32eadc4679299ba6d1771265cd84127dffd9f4 100644
--- a/common/cpp/include/asapo/unittests/MockIO.h
+++ b/common/cpp/include/asapo/unittests/MockIO.h
@@ -25,12 +25,12 @@ class MockIO : public IO {
MOCK_CONST_METHOD1(AddressFromSocket_t, std::string (SocketDescriptor socket));
- std::unique_ptr<std::thread> NewThread(const std::string& name, std::function<void()> function) const override {
+ std::unique_ptr<std::thread> NewThread(const std::string&, std::function<void()> function) const override {
return std::unique_ptr<std::thread>(NewThread_t(function));
}
MOCK_CONST_METHOD1(NewThread_t, std::thread * (std::function<void()> function));
- std::unique_ptr<std::thread> NewThread(const std::string& name, std::function<void(uint64_t index)> function,
+ std::unique_ptr<std::thread> NewThread(const std::string&, std::function<void(uint64_t index)> function,
uint64_t index) const override {
return std::unique_ptr<std::thread>(NewThread_t(function, index));
}
diff --git a/common/cpp/src/asapo_fabric/CMakeLists.txt b/common/cpp/src/asapo_fabric/CMakeLists.txt
index f397fd10295431b70fc6c5bfaa7395b258e8b6b6..9deef4e2d415b5179532faca0fc67d182b289140 100644
--- a/common/cpp/src/asapo_fabric/CMakeLists.txt
+++ b/common/cpp/src/asapo_fabric/CMakeLists.txt
@@ -28,8 +28,10 @@ ENDIF()
# Library
################################
-add_library(${TARGET_NAME} STATIC ${SOURCE_FILES} $<TARGET_OBJECTS:system_io>)
+add_library(asapo_fabric_objects OBJECT ${SOURCE_FILES})
+target_include_directories(asapo_fabric_objects PUBLIC ${ASAPO_CXX_COMMON_INCLUDE_DIR} )
+target_include_directories(asapo_fabric_objects SYSTEM PUBLIC ${LIBFABRIC_INCLUDE_DIR})
-target_include_directories(${TARGET_NAME} PUBLIC ${ASAPO_CXX_COMMON_INCLUDE_DIR} ${LIBFABRIC_INCLUDE_DIR})
-
-install(TARGETS ${TARGET_NAME} DESTINATION lib)
+add_library(${TARGET_NAME} STATIC $<TARGET_OBJECTS:asapo_fabric_objects> $<TARGET_OBJECTS:system_io>)
+target_include_directories(${TARGET_NAME} PUBLIC ${ASAPO_CXX_COMMON_INCLUDE_DIR} )
+target_include_directories(${TARGET_NAME} SYSTEM PUBLIC ${LIBFABRIC_INCLUDE_DIR})
diff --git a/common/cpp/src/asapo_fabric/common/fabric_context_impl.cpp b/common/cpp/src/asapo_fabric/common/fabric_context_impl.cpp
index a80d851307ebddf9a9224803fbe0d07b293dce05..683e1dbf4db8027db3b8eede6b1a551ffb52879b 100644
--- a/common/cpp/src/asapo_fabric/common/fabric_context_impl.cpp
+++ b/common/cpp/src/asapo_fabric/common/fabric_context_impl.cpp
@@ -250,7 +250,7 @@ void FabricContextImpl::CompletionThread() {
break;
}
default:
- error = ErrorFromFabricInternal("Unknown error while fi_cq_readfrom", ret);
+ error = ErrorFromFabricInternal("Unknown error while fi_cq_readfrom", static_cast<int>(ret));
break;
}
}
@@ -264,7 +264,7 @@ void FabricContextImpl::CompletionThreadHandleErrorAvailable(Error* error) {
fi_cq_err_entry errEntry{};
ssize_t ret = fi_cq_readerr(completion_queue_, &errEntry, 0);
if (ret != 1) {
- *error = ErrorFromFabricInternal("Unknown error while fi_cq_readerr", ret);
+ *error = ErrorFromFabricInternal("Unknown error while fi_cq_readerr", static_cast<int>(ret));
} else {
auto task = (FabricWaitableTask*)(errEntry.op_context);
if (task) {
@@ -281,7 +281,7 @@ bool FabricContextImpl::TargetIsAliveCheck(FabricAddress address) {
Error error;
HandleFiCommandWithBasicTaskAndWait(FI_ASAPO_ADDR_NO_ALIVE_CHECK, &error,
- fi_tsend, nullptr, 0, nullptr, address, FI_ASAPO_TAG_ALIVE_CHECK);
+ fi_tsend, nullptr, static_cast<size_t>(0), nullptr, address, FI_ASAPO_TAG_ALIVE_CHECK);
// If the send was successful, then we are still able to communicate with the peer
return !(error != nullptr);
}
@@ -292,7 +292,7 @@ void FabricContextImpl::InternalWait(FabricAddress targetAddress, FabricWaitable
auto timeoutMs = targetAddress == FI_ASAPO_ADDR_NO_ALIVE_CHECK ? requestFastTimeoutMs_ : requestTimeoutMs_;
// Check if we simply can wait for our task
- task->Wait(timeoutMs, error);
+ task->Wait(static_cast<uint32_t>(timeoutMs), error);
if (*error == IOErrorTemplates::kTimeout) {
if (targetAddress == FI_ASAPO_ADDR_NO_ALIVE_CHECK) {
@@ -317,7 +317,7 @@ void FabricContextImpl::InternalWaitWithAliveCheck(FabricAddress targetAddress,
aliveCheckFailed = true;
break;
}
- task->Wait(requestTimeoutMs_, error);
+ task->Wait(static_cast<uint32_t>(requestTimeoutMs_), error);
}
CancelTask(task, error);
@@ -332,5 +332,6 @@ void FabricContextImpl::InternalWaitWithAliveCheck(FabricAddress targetAddress,
void FabricContextImpl::CancelTask(FabricWaitableTask* task, Error* error) {
*error = nullptr;
fi_cancel(&endpoint_->fid, task);
- task->Wait(taskCancelTimeout_, error); // You can probably expect a kInternalOperationCanceledError
+ task->Wait(static_cast<uint32_t>(taskCancelTimeout_),
+ error); // You can probably expect a kInternalOperationCanceledError
}
diff --git a/common/cpp/src/asapo_fabric/common/fabric_context_impl.h b/common/cpp/src/asapo_fabric/common/fabric_context_impl.h
index 83d39701868fb4008fb7a72a713d1737296e4ea1..91608bceb8a2c7611fc46c8dea406ff03d634bfc 100644
--- a/common/cpp/src/asapo_fabric/common/fabric_context_impl.h
+++ b/common/cpp/src/asapo_fabric/common/fabric_context_impl.h
@@ -150,7 +150,7 @@ class FabricContextImpl : public FabricContext {
*error = FabricErrorTemplates::kConnectionRefusedError.Generate();
break;
default:
- *error = ErrorFromFabricInternal("HandleRawFiCommand", ret);
+ *error = ErrorFromFabricInternal("HandleRawFiCommand", static_cast<int>(ret));
break;
}
}
diff --git a/common/cpp/src/asapo_fabric/common/task/fabric_alive_check_response_task.cpp b/common/cpp/src/asapo_fabric/common/task/fabric_alive_check_response_task.cpp
index 2875a1a289c230842be85a2b12ef9905fa78c152..a4818c50fea474b6beed7c8e8d3f6ee27140d1cd 100644
--- a/common/cpp/src/asapo_fabric/common/task/fabric_alive_check_response_task.cpp
+++ b/common/cpp/src/asapo_fabric/common/task/fabric_alive_check_response_task.cpp
@@ -9,7 +9,7 @@ void FabricAliveCheckResponseTask::RequeueSelf() {
Error tmpError = nullptr;
ParentContext()->HandleRawFiCommand(this, &tmpError,
- fi_trecv, nullptr, 0, nullptr, FI_ADDR_UNSPEC, FI_ASAPO_TAG_ALIVE_CHECK, kRecvTaggedExactMatch);
+ fi_trecv, nullptr, static_cast<size_t>(0), nullptr, FI_ADDR_UNSPEC, FI_ASAPO_TAG_ALIVE_CHECK, kRecvTaggedExactMatch);
// Error is ignored
}
diff --git a/common/cpp/src/asapo_fabric/fabric_factory_not_supported.cpp b/common/cpp/src/asapo_fabric/fabric_factory_not_supported.cpp
index 1e3be7d22aa463c9eb7c01d5e012ee73663555f0..d77df1fbe6def73d4412388724522e52cf36a74e 100644
--- a/common/cpp/src/asapo_fabric/fabric_factory_not_supported.cpp
+++ b/common/cpp/src/asapo_fabric/fabric_factory_not_supported.cpp
@@ -10,7 +10,7 @@ FabricFactoryNotSupported::FabricFactoryNotSupported(FabricErrorTemplate reason)
std::unique_ptr<FabricServer> asapo::fabric::FabricFactoryNotSupported::CreateAndBindServer(
- const AbstractLogger* logger, const std::string& host, uint16_t port,
+ const AbstractLogger*, const std::string&, uint16_t,
Error* error) const {
*error = reason_.Generate();
return nullptr;
diff --git a/common/cpp/src/asapo_fabric/server/fabric_server_impl.cpp b/common/cpp/src/asapo_fabric/server/fabric_server_impl.cpp
index cabf224c25d4ca28ced74b32aac7562daa483a34..8d5c2022169ffdbeeeeafaae973e88b97c152789 100644
--- a/common/cpp/src/asapo_fabric/server/fabric_server_impl.cpp
+++ b/common/cpp/src/asapo_fabric/server/fabric_server_impl.cpp
@@ -41,7 +41,7 @@ void
FabricServerImpl::RecvAny(FabricAddress* srcAddress, FabricMessageId* messageId, void* dst, size_t size, Error* error) {
FabricRecvAnyTask anyTask;
HandleFiCommandAndWait(FI_ASAPO_ADDR_NO_ALIVE_CHECK, &anyTask, error,
- fi_trecv, dst, size, nullptr, FI_ADDR_UNSPEC, 0, kRecvTaggedAnyMatch);
+ fi_trecv, dst, size, nullptr, FI_ADDR_UNSPEC, static_cast<size_t>(0), kRecvTaggedAnyMatch);
if (!(*error)) {
if (anyTask.GetSource() == FI_ADDR_NOTAVAIL) {
diff --git a/common/cpp/src/asapo_fabric/server/task/fabric_handshake_accepting_task.cpp b/common/cpp/src/asapo_fabric/server/task/fabric_handshake_accepting_task.cpp
index 253d778b4975f56858098943c21649bcfd51e042..0f264ad582dd44399dfbc3926f4c616c1cddbdc8 100644
--- a/common/cpp/src/asapo_fabric/server/task/fabric_handshake_accepting_task.cpp
+++ b/common/cpp/src/asapo_fabric/server/task/fabric_handshake_accepting_task.cpp
@@ -58,7 +58,7 @@ void FabricHandshakeAcceptingTask::HandleAccept(Error* error) {
// TODO: This could slow down the whole complete queue process, maybe use another thread?
// Send and forget
server->HandleRawFiCommand(new FabricSelfDeletingTask(), error,
- fi_send, nullptr, 0, nullptr, tmpAddr);
+ fi_send, nullptr, static_cast<size_t>(0), nullptr, tmpAddr);
}
void FabricHandshakeAcceptingTask::OnError(const Error* error) {
diff --git a/common/cpp/src/common/CMakeLists.txt b/common/cpp/src/common/CMakeLists.txt
index 34ca5ead93ad7b75700f0254bf8fc0949f62e840..c267e42e447dd1b0018c8e71580aeb188323c0a9 100644
--- a/common/cpp/src/common/CMakeLists.txt
+++ b/common/cpp/src/common/CMakeLists.txt
@@ -4,7 +4,7 @@ set(SOURCE_FILES common_c_glue.cpp)
set(TEST_SOURCE_FILES ../../unittests/common/test_error.cpp)
-add_library(${TARGET_NAME} STATIC ${SOURCE_FILES})
+add_library(${TARGET_NAME} OBJECT ${SOURCE_FILES})
set(TEST_LIBRARIES "${TARGET_NAME};system_io")
include_directories(${ASAPO_CXX_COMMON_INCLUDE_DIR} ../../include)
diff --git a/common/cpp/src/common/common_c_glue.cpp b/common/cpp/src/common/common_c_glue.cpp
index ce48fed6c8749de99aa19ce7d33558694bb4e91a..a58213d93cf66f89afc115252fc103d45dee5b38 100644
--- a/common/cpp/src/common/common_c_glue.cpp
+++ b/common/cpp/src/common/common_c_glue.cpp
@@ -2,6 +2,19 @@
#include "asapo/common/internal/asapo_common_c_glue.h"
#include <algorithm>
+AsapoHandlerHolder<std::string>* handle_or_null_t(const std::string& object,
+ AsapoErrorHandle* error,
+ asapo::Error err,
+ const asapo::ErrorTemplateInterface* p_exclude_err_template) {
+ if (process_error(error, std::move(err), p_exclude_err_template) < 0) {
+ return nullptr;
+ } else {
+ return new AsapoHandlerHolder<std::string>(object);
+ }
+}
+
+
+
int process_error(AsapoErrorHandle* error, asapo::Error err,
const asapo::ErrorTemplateInterface* p_exclude_err_template) {
int retval = (err == nullptr || (p_exclude_err_template != nullptr && err == *p_exclude_err_template)) ? 0 : -1;
diff --git a/common/cpp/src/data_structs/data_structs.cpp b/common/cpp/src/data_structs/data_structs.cpp
index 71b58f1ebcefcef61651071d3ac876c2378f5d25..c55d6017629b2c3ba24dfa9b59303e70b411968b 100644
--- a/common/cpp/src/data_structs/data_structs.cpp
+++ b/common/cpp/src/data_structs/data_structs.cpp
@@ -186,7 +186,7 @@ std::string IsoDateFromEpochNanosecs(uint64_t time_from_epoch_nanosec) {
sprintf(buff, "%.4d-%.2d-%.2dT%.2d:%.2d:%.2d", timetm.tm_year + 1900, timetm.tm_mon + 1, timetm.tm_mday,
timetm.tm_hour, timetm.tm_min, timetm.tm_sec);
if (zz > 0) {
- sprintf(buff + 19, ".%.9ld", zz);
+ sprintf(buff + 19, ".%.9llu", static_cast<unsigned long long>(zz));
}
return buff;
@@ -203,7 +203,7 @@ uint64_t NanosecsEpochFromISODate(std::string date_time) {
date_time = date_time.substr(0, pos);
}
- std::tm tm{};
+ std::tm tm;
int year, month, day, hour, minute, second;
hour = 0;
@@ -226,8 +226,8 @@ uint64_t NanosecsEpochFromISODate(std::string date_time) {
tm.tm_year = year - 1900;
system_clock::time_point tp = system_clock::from_time_t(timegm(&tm));
- uint64_t ns = std::chrono::time_point_cast<std::chrono::nanoseconds>(tp).
- time_since_epoch().count();
+ uint64_t ns = static_cast<uint64_t>(std::chrono::time_point_cast<std::chrono::nanoseconds>(tp).
+ time_since_epoch().count());
ns = ns + uint64_t(frac * 1000000000);
diff --git a/common/cpp/src/database/CMakeLists.txt b/common/cpp/src/database/CMakeLists.txt
index eda63f850608b08872b79c147ee887f7852a473d..47233f679acdbeafac508d5a23da0e04cb0576f4 100644
--- a/common/cpp/src/database/CMakeLists.txt
+++ b/common/cpp/src/database/CMakeLists.txt
@@ -13,8 +13,9 @@ message ("-- mongoc include path \"${MONGOC_STATIC_INCLUDE_DIRS}\"")
message ("-- mongoc libraries \"${MONGOC_STATIC_LIBRARIES}\"")
add_library(${TARGET_NAME} STATIC ${SOURCE_FILES} $<TARGET_OBJECTS:data_structs> $<TARGET_OBJECTS:json_parser> $<TARGET_OBJECTS:system_io>)
-target_include_directories(${TARGET_NAME} PUBLIC ${ASAPO_CXX_COMMON_INCLUDE_DIR}
- PUBLIC "${MONGOC_STATIC_INCLUDE_DIRS}")
+target_include_directories(${TARGET_NAME} PUBLIC ${ASAPO_CXX_COMMON_INCLUDE_DIR})
+target_include_directories(${TARGET_NAME} SYSTEM PUBLIC "${MONGOC_STATIC_INCLUDE_DIRS}")
+
target_link_libraries (${TARGET_NAME} PRIVATE "${MONGOC_STATIC_LIBRARIES}")
target_compile_definitions (${TARGET_NAME} PRIVATE "${MONGOC_STATIC_DEFINITIONS}")
diff --git a/common/cpp/src/database/database.cpp b/common/cpp/src/database/database.cpp
index 3084aa918b96e9dd4a32a74db8d6daa440f143d2..df1c69ea322e5287a25dd40a0f695dc115a39ec3 100644
--- a/common/cpp/src/database/database.cpp
+++ b/common/cpp/src/database/database.cpp
@@ -12,6 +12,6 @@ std::unique_ptr<Database> DatabaseFactory::Create(Error* err) const noexcept {
*err = ErrorTemplates::kMemoryAllocationError.Generate();
}
return p;
-};
+}
}
\ No newline at end of file
diff --git a/common/cpp/src/database/encoding.cpp b/common/cpp/src/database/encoding.cpp
index 533c3748ea7fcde43b29ba11068ed370b1e53412..5e589436fb52a0cf476ad5dff7f9af8ba1aa7f40 100644
--- a/common/cpp/src/database/encoding.cpp
+++ b/common/cpp/src/database/encoding.cpp
@@ -26,8 +26,8 @@ bool ShouldEscape(char c, bool db) {
const std::string upperhex = "0123456789ABCDEF";
std::string Escape(const std::string& s, bool db) {
- auto hexCount = 0;
- for (auto i = 0; i < s.size(); i++) {
+ size_t hexCount = 0;
+ for (size_t i = 0; i < s.size(); i++) {
char c = s[i];
if (ShouldEscape(c, db)) {
hexCount++;
@@ -40,11 +40,11 @@ std::string Escape(const std::string& s, bool db) {
std::string res;
res.reserve(s.size() + 2 * hexCount);
- for (auto i = 0; i < s.size(); i++) {
- auto c = s[i];
+ for (size_t i = 0; i < s.size(); i++) {
+ char c = s[i];
if (ShouldEscape(c, db)) {
res.push_back('%');
- res.push_back(upperhex[c >> 4]);
+ res.push_back(upperhex[static_cast<size_t>(c >> 4)]);
res.push_back(upperhex[c & 15]);
} else {
res.push_back(c);
@@ -62,19 +62,19 @@ inline int ishex(int x) {
int decode(const char* s, char* dec) {
char* o;
const char* end = s + strlen(s);
- int c;
+ unsigned int c;
for (o = dec; s <= end; o++) {
- c = *s++;
+ c = static_cast<unsigned int>(*s++);
// if (c == '+') c = ' ';
if (c == '%' && (!ishex(*s++) ||
!ishex(*s++) ||
!sscanf(s - 2, "%2x", &c)))
return -1;
- if (dec) *o = c;
+ if (dec) *o = (char)c;
}
- return o - dec;
+ return int(o - dec);
}
std::string EncodeDbName(const std::string& dbname) {
@@ -98,7 +98,7 @@ std::string DecodeName(const std::string& name) {
bool ShouldEscapeQuery(char c) {
char chars[] = "-[]{}()*+?\\.,^$|#";
- for (auto i = 0; i < strlen(chars); i++) {
+ for (size_t i = 0; i < strlen(chars); i++) {
if (c == chars[i]) {
return true;
}
@@ -107,8 +107,8 @@ bool ShouldEscapeQuery(char c) {
}
std::string EscapeQuery(const std::string& s) {
- auto count = 0;
- for (auto i = 0; i < s.size(); i++) {
+ size_t count = 0;
+ for (size_t i = 0; i < s.size(); i++) {
char c = s[i];
if (ShouldEscapeQuery(c)) {
count++;
@@ -121,7 +121,7 @@ std::string EscapeQuery(const std::string& s) {
std::string res;
res.reserve(s.size() + count);
- for (auto i = 0; i < s.size(); i++) {
+ for (size_t i = 0; i < s.size(); i++) {
auto c = s[i];
if (ShouldEscapeQuery(c)) {
res.push_back('\\');
diff --git a/common/cpp/src/database/mongodb_client.cpp b/common/cpp/src/database/mongodb_client.cpp
index 423122f9aca51901b7792d61a30f5fd89f50001f..d57c3a27538c60c84c5b73b52bb799843ce7672a 100644
--- a/common/cpp/src/database/mongodb_client.cpp
+++ b/common/cpp/src/database/mongodb_client.cpp
@@ -168,7 +168,8 @@ bson_p PrepareUpdateDocument(const uint8_t* json, Error* err) {
}
bson_error_t mongo_err;
auto bson_meta =
- bson_new_from_json(reinterpret_cast<const uint8_t*>(json_flat.c_str()), json_flat.size(), &mongo_err);
+ bson_new_from_json(reinterpret_cast<const uint8_t*>(json_flat.c_str()), static_cast<ssize_t>(json_flat.size()),
+ &mongo_err);
if (!bson_meta) {
*err = DBErrorTemplates::kJsonParseError.Generate(mongo_err.message);
return nullptr;
@@ -317,7 +318,7 @@ Error MongoDBClient::GetNextId(const std::string& stream, uint64_t* id) const {
auto found = bson_iter_init(&iter, &reply) && bson_iter_find_descendant(&iter, "value.curIndex", &iter_idx)
&& BSON_ITER_HOLDS_INT64(&iter_idx);
if (found) {
- *id = bson_iter_int64(&iter_idx);
+ *id = static_cast<uint64_t>(bson_iter_int64(&iter_idx));
} else {
err = DBErrorTemplates::kInsertError.Generate(std::string("cannot extract auto id"));
}
@@ -337,10 +338,7 @@ Error MongoDBClient::GetNextId(const std::string& stream, uint64_t* id) const {
}
Error MongoDBClient::InsertWithAutoId(const MessageMeta& file,
- const std::string& collection,
uint64_t* id_inserted) const {
- bson_error_t error;
-
uint64_t id;
auto err = GetNextId(current_collection_name_, &id);
if (err != nullptr) {
@@ -364,7 +362,7 @@ Error MongoDBClient::Insert(const std::string& collection, const MessageMeta& fi
}
if (file.id == 0) {
- return InsertWithAutoId(file, collection, id_inserted);
+ return InsertWithAutoId(file, id_inserted);
}
auto document = PrepareBsonDocument(file, &err);
@@ -429,9 +427,8 @@ Error MongoDBClient::InsertMeta(const std::string& collection, const std::string
case MetaIngestOp::kUpdate:
return UpdateBsonDocument(id_encoded, document, mode.upsert);
break;
-
}
-
+ return DBErrorTemplates::kWrongInput.Generate("unknown op");
}
Error MongoDBClient::AddBsonDocumentToArray(bson_t* query, bson_t* update, bool ignore_duplicates) const {
@@ -472,10 +469,11 @@ Error MongoDBClient::InsertAsDatasetMessage(const std::string& collection, const
return err;
}
auto query =
- BCON_NEW ("$and", "[", "{", "_id", BCON_INT64(file.id), "}", "{", "messages.dataset_substream", "{", "$ne",
- BCON_INT64(file.dataset_substream), "}", "}", "]");
+ BCON_NEW ("$and", "[", "{", "_id", BCON_INT64(static_cast<int64_t>(file.id)), "}", "{", "messages.dataset_substream",
+ "{", "$ne",
+ BCON_INT64(static_cast<int64_t>(file.dataset_substream)), "}", "}", "]");
auto update = BCON_NEW ("$setOnInsert", "{",
- "size", BCON_INT64(dataset_size),
+ "size", BCON_INT64(static_cast<int64_t>(dataset_size)),
"schema_version", GetDbSchemaVersion().c_str(),
"timestamp", BCON_INT64((int64_t) NanosecsEpochFromTimePoint(file.timestamp)),
"}",
@@ -503,8 +501,8 @@ Error MongoDBClient::GetRecordFromDb(const std::string& collection, uint64_t id,
}
bson_error_t mongo_err;
- bson_t* filter;
- bson_t* opts;
+ bson_t* filter{nullptr};
+ bson_t* opts{nullptr};
mongoc_cursor_t* cursor;
const bson_t* doc;
char* str;
@@ -515,7 +513,7 @@ Error MongoDBClient::GetRecordFromDb(const std::string& collection, uint64_t id,
opts = BCON_NEW ("limit", BCON_INT64(1));
break;
case GetRecordMode::kById:
- filter = BCON_NEW ("_id", BCON_INT64(id));
+ filter = BCON_NEW ("_id", BCON_INT64(static_cast<int64_t>(id)));
opts = BCON_NEW ("limit", BCON_INT64(1));
break;
case GetRecordMode::kLast:
diff --git a/common/cpp/src/database/mongodb_client.h b/common/cpp/src/database/mongodb_client.h
index d97bd21f2c38fa579a64032eccb1cedddd7feeb8..90fbe73a6b4a6bd60ced7236964001557fe86393 100644
--- a/common/cpp/src/database/mongodb_client.h
+++ b/common/cpp/src/database/mongodb_client.h
@@ -1,7 +1,7 @@
#ifndef ASAPO_MONGO_DATABASE_H
#define ASAPO_MONGO_DATABASE_H
-#include "mongoc.h"
+#include <mongoc.h>
#include <string>
@@ -85,7 +85,7 @@ class MongoDBClient final : public Database {
Error DeleteCollection(const std::string& name) const;
Error DeleteCollections(const std::string& prefix) const;
Error DeleteDocumentsInCollection(const std::string& collection_name, const std::string& querystr) const;
- Error InsertWithAutoId(const MessageMeta& file, const std::string& collection, uint64_t* id_inserted) const;
+ Error InsertWithAutoId(const MessageMeta& file, uint64_t* id_inserted) const;
};
struct TransactionContext {
diff --git a/common/cpp/src/http_client/curl_http_client.cpp b/common/cpp/src/http_client/curl_http_client.cpp
index 0eedf7d1dd78ad36be3d50b360e39426eb9fd47a..6eed5c45770a6df33c6a8d0dc54f8c932111904b 100644
--- a/common/cpp/src/http_client/curl_http_client.cpp
+++ b/common/cpp/src/http_client/curl_http_client.cpp
@@ -31,7 +31,7 @@ size_t curl_write( void* ptr, size_t size, size_t nmemb, void* data_container) {
break;
case CurlDataMode::array:
if (container->bytes_received + nbytes > container->array_size) {
- return -1;
+ return 0;
}
memcpy(container->p_array->get() + container->bytes_received, ptr, nbytes);
container->bytes_received += nbytes;
@@ -40,7 +40,7 @@ size_t curl_write( void* ptr, size_t size, size_t nmemb, void* data_container) {
Error err;
container->io->Write(container->fd, ptr, nbytes, &err);
if (err) {
- return -1;
+ return 0;
}
break;
}
@@ -76,7 +76,7 @@ HttpCode GetResponseCode(CURL* curl) {
return static_cast<HttpCode>(http_code);
}
-std::string GetCurlError(CURL* curl, CURLcode res, const char* errbuf) {
+std::string GetCurlError(CURLcode res, const char* errbuf) {
if (strlen(errbuf) > 0) {
return errbuf;
} else {
@@ -89,7 +89,7 @@ Error ProcessCurlResponse(CURL* curl, CURLcode res, const char* errbuf, HttpCode
*response_code = GetResponseCode(curl);
return nullptr;
} else {
- auto err_string = GetCurlError(curl, res, errbuf);
+ auto err_string = GetCurlError(res, errbuf);
if (res == CURLE_COULDNT_CONNECT || res == CURLE_COULDNT_RESOLVE_HOST) {
return HttpErrorTemplates::kConnectionError.Generate(err_string);
} else {
@@ -222,7 +222,7 @@ std::string CurlHttpClient::UrlEscape(const std::string& uri) const noexcept {
if (!curl_) {
return "";
}
- char* output = curl_easy_escape(curl_, uri.c_str(), uri.size());
+ char* output = curl_easy_escape(curl_, uri.c_str(), static_cast<int>(uri.size()));
if (output) {
auto res = std::string(output);
curl_free(output);
diff --git a/common/cpp/src/json_parser/CMakeLists.txt b/common/cpp/src/json_parser/CMakeLists.txt
index eddf5735d2efa5be900c33392fbafed3b5111c4c..d5c16a20d031195495812ebc4271b78ebdd853f4 100644
--- a/common/cpp/src/json_parser/CMakeLists.txt
+++ b/common/cpp/src/json_parser/CMakeLists.txt
@@ -19,5 +19,7 @@ target_include_directories(${TARGET_NAME} PUBLIC ${ASAPO_CXX_COMMON_INCLUDE_DIR}
set(TEST_SOURCE_FILES ../../unittests/json_parser/test_json_parser.cpp)
set(TEST_LIBRARIES "${TARGET_NAME};system_io")
-include_directories(${ASAPO_CXX_COMMON_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/3d_party/rapidjson/include)
+include_directories(${ASAPO_CXX_COMMON_INCLUDE_DIR})
+include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/3d_party/rapidjson/include)
+
gtest(${TARGET_NAME} "${TEST_SOURCE_FILES}" "${TEST_LIBRARIES}")
diff --git a/common/cpp/src/json_parser/rapid_json.cpp b/common/cpp/src/json_parser/rapid_json.cpp
index 17e4bbd72038e258e1f086045d52d5c06f363ab5..d2a9afe150afa40e34fd515c74fce9e3862811e4 100644
--- a/common/cpp/src/json_parser/rapid_json.cpp
+++ b/common/cpp/src/json_parser/rapid_json.cpp
@@ -226,7 +226,7 @@ void AddVals(const std::string& prefix, const std::string& separator, Document&
return;
}
Value s;
- s.SetString(name.c_str(), name.size(), a);
+ s.SetString(name.c_str(), static_cast<SizeType>(name.size()), a);
vals->AddMember(s, Value(m.value, a), d.GetAllocator());
}
}
diff --git a/common/cpp/src/logger/CMakeLists.txt b/common/cpp/src/logger/CMakeLists.txt
index 04b6fb251b4bf98b06390fc10894b6d5a6bae5f4..b1eccc4d7b20bec763869042cd90725ef43b8731 100644
--- a/common/cpp/src/logger/CMakeLists.txt
+++ b/common/cpp/src/logger/CMakeLists.txt
@@ -8,8 +8,8 @@ set(SOURCE_FILES
add_library(${TARGET_NAME} OBJECT ${SOURCE_FILES})
-target_include_directories(${TARGET_NAME} PUBLIC ${ASAPO_CXX_COMMON_INCLUDE_DIR}
- ${CMAKE_SOURCE_DIR}/3d_party/spd_log/include)
+target_include_directories(${TARGET_NAME} PUBLIC ${ASAPO_CXX_COMMON_INCLUDE_DIR})
+target_include_directories(${TARGET_NAME} SYSTEM PUBLIC ${CMAKE_SOURCE_DIR}/3d_party/spd_log/include)
################################
# Testing
@@ -19,8 +19,9 @@ target_include_directories(${TARGET_NAME} PUBLIC ${ASAPO_CXX_COMMON_INCLUDE_DIR}
set(TEST_SOURCE_FILES ../../unittests/logger/test_logger.cpp
../../unittests/logger/test_fluentd_sink.cpp)
-link_libraries(${CURL_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
+link_libraries(CURL::libcurl ${CMAKE_THREAD_LIBS_INIT})
set(TEST_LIBRARIES "${TARGET_NAME};curl_http_client;system_io")
-include_directories(${ASAPO_CXX_COMMON_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/3d_party/spd_log/include)
+include_directories(${ASAPO_CXX_COMMON_INCLUDE_DIR})
+include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/3d_party/spd_log/include)
gtest(${TARGET_NAME} "${TEST_SOURCE_FILES}" "${TEST_LIBRARIES}")
diff --git a/common/cpp/src/logger/fluentd_sink.cpp b/common/cpp/src/logger/fluentd_sink.cpp
index e291fc7de767793b4c14d0fcfe9761344fdcb30e..d51d4d909cc5632cbde98ed360a949b481e8b680 100644
--- a/common/cpp/src/logger/fluentd_sink.cpp
+++ b/common/cpp/src/logger/fluentd_sink.cpp
@@ -17,7 +17,7 @@ void FluentdSink::_sink_it(const spdlog::details::log_msg& msg) {
FluentdSink::FluentdSink(const std::string& endpoint_uri): httpclient__{DefaultHttpClient()}, endpoint_uri_{endpoint_uri} {
-};
+}
}
diff --git a/common/cpp/src/logger/logger.cpp b/common/cpp/src/logger/logger.cpp
index 8ab8acbf9b8ec2e0bd0cd956d4f5c8d1ee3fdd88..7e09a5da12289bab67f0a27a455019059fb7132a 100644
--- a/common/cpp/src/logger/logger.cpp
+++ b/common/cpp/src/logger/logger.cpp
@@ -38,7 +38,7 @@ LogLevel StringToLogLevel(const std::string& name, Error* err) {
template<typename ... Args>
std::string string_format( const std::string& format, Args ... args ) {
- size_t size = snprintf( nullptr, 0, format.c_str(), args ... ) + 1;
+ size_t size = static_cast<size_t>(snprintf( nullptr, 0, format.c_str(), args ... ) + 1);
std::unique_ptr<char[]> buf( new char[ size ] );
snprintf( buf.get(), size, format.c_str(), args ... );
return std::string( buf.get(), buf.get() + size - 1 );
@@ -79,4 +79,4 @@ LogMessageWithFields& LogMessageWithFields::Append(std::string key, std::string
std::string LogMessageWithFields::LogString() const {
return log_string_;
}
-};
\ No newline at end of file
+}
diff --git a/common/cpp/src/request/CMakeLists.txt b/common/cpp/src/request/CMakeLists.txt
index 56dbea2526a889a339345eea9348d7fe0cc010c6..11b44d8fa07359a3142e9a15e187aaa382f1fbd2 100644
--- a/common/cpp/src/request/CMakeLists.txt
+++ b/common/cpp/src/request/CMakeLists.txt
@@ -18,7 +18,7 @@ target_include_directories(${TARGET_NAME} PUBLIC ${ASAPO_CXX_COMMON_INCLUDE_DIR}
set(TEST_SOURCE_FILES ../../unittests/request/test_request_pool.cpp
../../unittests/request/test_request.cpp)
-link_libraries(${CURL_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} )
+link_libraries(CURL::libcurl ${CMAKE_THREAD_LIBS_INIT} )
set(TEST_LIBRARIES "${TARGET_NAME};system_io;logger;curl_http_client")
include_directories(${ASAPO_CXX_COMMON_INCLUDE_DIR})
diff --git a/common/cpp/src/system_io/system_io.cpp b/common/cpp/src/system_io/system_io.cpp
index b15011f379445951910b8fcfa9dfb02ad12a18cd..6b35e0491e8759315ec469a3d4918d3277de2e38 100644
--- a/common/cpp/src/system_io/system_io.cpp
+++ b/common/cpp/src/system_io/system_io.cpp
@@ -7,6 +7,11 @@
#include <algorithm>
#include <mutex>
+#ifdef _WIN32
+typedef long suseconds_t;
+typedef short sa_family_t;
+#endif
+
#if defined(__linux__) || defined (__APPLE__)
#include <sys/socket.h>
#include <netinet/in.h>
@@ -19,6 +24,8 @@
#include <sys/select.h>
#endif
+
+
#include "system_io.h"
#include "asapo/preprocessor/definitions.h"
@@ -53,7 +60,7 @@ void StripBasePath(const std::string& folder, std::vector<MessageMeta>* file_lis
}
void AssignIDs(MessageMetas* file_list) {
- int64_t id = 0;
+ uint64_t id = 0;
for (auto& file : *file_list) {
file.id = ++id;
}
@@ -329,7 +336,7 @@ std::unique_ptr<sockaddr_in> SystemIO::BuildSockaddrIn(const std::string& addres
std::unique_ptr<sockaddr_in> socket_address = std::unique_ptr<sockaddr_in>(new sockaddr_in);
socket_address->sin_addr.s_addr = inet_addr(host.c_str());
socket_address->sin_port = htons(port);
- socket_address->sin_family = family;
+ socket_address->sin_family = static_cast<sa_family_t>(family);
return socket_address;
}
@@ -359,7 +366,7 @@ Error* err) const {
return nullptr;
}
- sockaddr_in client_address{};
+ sockaddr_in client_address;
static size_t client_address_size = sizeof(sockaddr_in);
int peer_fd;
@@ -529,7 +536,7 @@ size_t asapo::SystemIO::ReceiveWithTimeout(SocketDescriptor socket_fd, void* buf
FD_SET(socket_fd, &read_fds);
timeval timeout;
timeout.tv_sec = 0;
- timeout.tv_usec = timeout_in_usec;
+ timeout.tv_usec = static_cast<suseconds_t>(timeout_in_usec);
int res = ::select(socket_fd + 1, &read_fds, nullptr, nullptr, &timeout);
if (res == 0) {
@@ -591,7 +598,7 @@ size_t SystemIO::Transfer(ssize_t (* method)(FileDescriptor, void*, size_t), Fil
}
return already_transferred;//Return the amount of _ensured_ transferred bytes
}
- already_transferred += received_amount;
+ already_transferred += static_cast<size_t>(received_amount);
}
*err = nullptr;
return already_transferred;
@@ -621,7 +628,7 @@ Error SystemIO::CreateDirectoryWithParents(const std::string& root_path, const s
Error SystemIO::RemoveFile(const std::string& fname) const {
if (remove(fname.c_str()) == 0) {
- return nullptr;;
+ return nullptr;
} else {
return GetLastError();
}
diff --git a/common/cpp/src/system_io/system_io.h b/common/cpp/src/system_io/system_io.h
index ba981a2265267a6dfa9dfdc5cefdf52225763bf0..d016fc5d2c73d5317d77b71e710f08fb6f4b337d 100644
--- a/common/cpp/src/system_io/system_io.h
+++ b/common/cpp/src/system_io/system_io.h
@@ -21,7 +21,6 @@ typedef SSIZE_T ssize_t;
# define MSG_NOSIGNAL 0
#endif
-
namespace asapo {
class SystemIO final : public IO {
@@ -34,7 +33,7 @@ class SystemIO final : public IO {
#if defined(__linux__) || defined (__APPLE__)
// used to for epoll - assumed single epoll instance per class instance
- const int kMaxEpollEvents = 10;
+ static constexpr int kMaxEpollEvents = 10;
mutable int epoll_fd_ = -1;
Error AddToEpool(SocketDescriptor sd) const;
Error CreateEpoolIfNeeded(SocketDescriptor master_socket) const;
diff --git a/common/cpp/src/system_io/system_io_linux_mac.cpp b/common/cpp/src/system_io/system_io_linux_mac.cpp
index 60039cd27c19268921d813d671ca0888348c1563..b933a506eeb3e4bc4131dc81ec182c24f1f39d41 100644
--- a/common/cpp/src/system_io/system_io_linux_mac.cpp
+++ b/common/cpp/src/system_io/system_io_linux_mac.cpp
@@ -70,7 +70,7 @@ Error GetLastErrorFromErrno() {
(*err).Append("Unknown error code: " + std::to_string(errno));
return err;
}
-};
+}
Error SystemIO::GetLastError() const {
return GetLastErrorFromErrno();
@@ -97,7 +97,7 @@ void SetModifyDate(const struct stat& t_stat, MessageMeta* message_meta) {
}
void SetFileSize(const struct stat& t_stat, MessageMeta* message_meta) {
- message_meta->size = t_stat.st_size;
+ message_meta->size = static_cast<uint64_t>(t_stat.st_size);
}
void SetFileName(const string& name, MessageMeta* message_meta) {
@@ -105,7 +105,7 @@ void SetFileName(const string& name, MessageMeta* message_meta) {
}
struct stat FileStat(const string& fname, Error* err) {
- struct stat t_stat {};
+ struct stat t_stat;
errno = 0;
int res = stat(fname.c_str(), &t_stat);
if (res < 0) {
diff --git a/common/cpp/src/system_io/system_io_mac.cpp b/common/cpp/src/system_io/system_io_mac.cpp
index 2e240568e18a6663edc66a07b434e2b6a6bdff3b..a62f53042e8b71483632e3a74e7ee3be6eb58de8 100644
--- a/common/cpp/src/system_io/system_io_mac.cpp
+++ b/common/cpp/src/system_io/system_io_mac.cpp
@@ -76,7 +76,7 @@ ListSocketDescriptors SystemIO::WaitSocketsActivity(SocketDescriptor master_sock
return active_sockets;
}
-void SystemIO::SetThreadName(std::thread* threadHandle, const std::string& name) const {
+void SystemIO::SetThreadName(std::thread*, const std::string& ) const {
// does not work on macos (could only set name for current thread, which is not what we want)
}
diff --git a/common/cpp/unittests/database/test_encoding.cpp b/common/cpp/unittests/database/test_encoding.cpp
index c8cd7ad3f1967f174f95f9731a9d83381a4684f8..57d425fb7ff36b32454ebdb171e6e5948bab66b3 100644
--- a/common/cpp/unittests/database/test_encoding.cpp
+++ b/common/cpp/unittests/database/test_encoding.cpp
@@ -17,8 +17,6 @@ using ::testing::SetArgPointee;
namespace {
-uint64_t big_uint = 18446744073709551615ull;
-
TEST(EncodingTests, EncodeDbName) {
std::string dbname = R"(db_/\."$)";
diff --git a/common/cpp/unittests/logger/test_logger.cpp b/common/cpp/unittests/logger/test_logger.cpp
index bead7006ce0a668f07929f35d8f1ef93978f121f..6dc03c84104187ee38fb8bfc2dd710d39062ed99 100644
--- a/common/cpp/unittests/logger/test_logger.cpp
+++ b/common/cpp/unittests/logger/test_logger.cpp
@@ -56,7 +56,7 @@ TEST(DefaultLogger, ApiLogger) {
class MockSink : public spdlog::sinks::base_sink<std::mutex> {
public:
- MockSink(const std::string& endpoint_uri) {};
+ MockSink(const std::string&) {};
public:
MOCK_METHOD1(_sink_it, void(
const spdlog::details::log_msg& msg));
diff --git a/common/cpp/unittests/request/test_request_pool.cpp b/common/cpp/unittests/request/test_request_pool.cpp
index e11ae7a8dde114c13e3a577d0b81ee8179a6a2cf..467f2c98a88aaba047caba5e33d1cfc207962dcb 100644
--- a/common/cpp/unittests/request/test_request_pool.cpp
+++ b/common/cpp/unittests/request/test_request_pool.cpp
@@ -43,7 +43,7 @@ class MockRequestHandlerFactory : public asapo::RequestHandlerFactory {
RequestHandlerFactory() {
request_handler_ = request_handler;
}
- std::unique_ptr<RequestHandler> NewRequestHandler(uint64_t thread_id, uint64_t* shared_counter) override {
+ std::unique_ptr<RequestHandler> NewRequestHandler(uint64_t, uint64_t* ) override {
return std::unique_ptr<RequestHandler> {request_handler_};
}
~MockRequestHandlerFactory() {};
diff --git a/consumer/api/cpp/CMakeLists.txt b/consumer/api/cpp/CMakeLists.txt
index d89d94f281f9798a2232473553c4833c19f490c9..1009f2347afa4dcb39021c12d5015f41a01bc4e3 100644
--- a/consumer/api/cpp/CMakeLists.txt
+++ b/consumer/api/cpp/CMakeLists.txt
@@ -10,22 +10,82 @@ set(SOURCE_FILES
################################
-# Library
+# Libraries
################################
-add_library(${TARGET_NAME} STATIC ${SOURCE_FILES} $<TARGET_OBJECTS:system_io>
- $<TARGET_OBJECTS:json_parser> $<TARGET_OBJECTS:data_structs> $<TARGET_OBJECTS:version> $<TARGET_OBJECTS:curl_http_client> )
-target_include_directories(${TARGET_NAME} PUBLIC ../c/include include ${ASAPO_CXX_COMMON_INCLUDE_DIR} ${LIBFABRIC_INCLUDE_DIR} ${CURL_INCLUDE_DIRS})
-
-IF(CMAKE_C_COMPILER_ID STREQUAL "GNU")
- SET( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libgcc -static-libstdc++")
-ENDIF()
+string(REPLACE "v" "" CONSUMER_CLIENT_VER ${ASAPO_CONSUMER_PROTOCOL})
GET_PROPERTY(ASAPO_COMMON_FABRIC_LIBRARIES GLOBAL PROPERTY ASAPO_COMMON_FABRIC_LIBRARIES)
-target_link_libraries(${TARGET_NAME} ${CURL_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}
- asapo-fabric ${ASAPO_COMMON_FABRIC_LIBRARIES})
+add_library(consumer_lib_objects OBJECT ${SOURCE_FILES})
+target_include_directories(consumer_lib_objects PRIVATE ../c/include include ${ASAPO_CXX_COMMON_INCLUDE_DIR} )
+target_include_directories(consumer_lib_objects SYSTEM PRIVATE ${LIBFABRIC_INCLUDE_DIR})
+
+
+if (BUILD_STATIC_CLIENT_LIBS)
+ add_library(${TARGET_NAME} STATIC $<TARGET_OBJECTS:consumer_lib_objects> $<TARGET_OBJECTS:asapo_fabric_objects> $<TARGET_OBJECTS:system_io>
+ $<TARGET_OBJECTS:json_parser> $<TARGET_OBJECTS:data_structs> $<TARGET_OBJECTS:version> $<TARGET_OBJECTS:curl_http_client> $<TARGET_OBJECTS:common>)
+ target_include_directories(${TARGET_NAME} SYSTEM PUBLIC $<BUILD_INTERFACE:${LIBFABRIC_INCLUDE_DIR}>)
+ target_include_directories(${TARGET_NAME} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>)
+ target_include_directories(${TARGET_NAME} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../c/include>)
+ target_include_directories(${TARGET_NAME} PUBLIC $<BUILD_INTERFACE:${ASAPO_CXX_COMMON_INCLUDE_DIR}>)
+ target_include_directories(${TARGET_NAME} INTERFACE $<INSTALL_INTERFACE:include>)
+ target_link_libraries(${TARGET_NAME} INTERFACE CURL::libcurl ${CMAKE_THREAD_LIBS_INIT} ${ASAPO_COMMON_FABRIC_LIBRARIES})
+ #install
+ install(TARGETS ${TARGET_NAME} EXPORT AsapoConsumerStaticTarget
+ LIBRARY DESTINATION lib
+ ARCHIVE DESTINATION lib
+ INCLUDES DESTINATION include
+ )
+
+
+ export(EXPORT AsapoConsumerStaticTarget
+ FILE "${CMAKE_CURRENT_BINARY_DIR}/asapo/AsapoConsumerStaticTarget.cmake"
+ NAMESPACE imported::
+ )
+ install(EXPORT AsapoConsumerStaticTarget
+ FILE AsapoConsumerStaticTarget.cmake
+ NAMESPACE imported::
+ DESTINATION ${ConfigPackageLocation}
+ )
+
+
+endif()
+
+if (BUILD_SHARED_CLIENT_LIBS)
+ add_library(${TARGET_NAME}_shared SHARED $<TARGET_OBJECTS:consumer_lib_objects> $<TARGET_OBJECTS:asapo_fabric_objects> $<TARGET_OBJECTS:system_io>
+ $<TARGET_OBJECTS:json_parser> $<TARGET_OBJECTS:data_structs> $<TARGET_OBJECTS:version> $<TARGET_OBJECTS:curl_http_client> $<TARGET_OBJECTS:common>)
+ target_include_directories(${TARGET_NAME}_shared SYSTEM PRIVATE ${LIBFABRIC_INCLUDE_DIR})
+ target_include_directories(${TARGET_NAME}_shared PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include ${ASAPO_CXX_COMMON_INCLUDE_DIR})
+
+ target_link_libraries(${TARGET_NAME}_shared CURL::libcurl ${CMAKE_THREAD_LIBS_INIT} ${ASAPO_COMMON_FABRIC_LIBRARIES})
+ IF(NOT WIN32)
+ set_target_properties(${TARGET_NAME}_shared PROPERTIES OUTPUT_NAME ${TARGET_NAME})
+ set_target_properties(${TARGET_NAME}_shared PROPERTIES VERSION ${CONSUMER_CLIENT_VER}
+ SOVERSION ${CONSUMER_CLIENT_VER})
+ set_target_properties(${TARGET_NAME}_shared PROPERTIES EXPORT_NAME ${TARGET_NAME})
+ ENDIF()
+ target_include_directories(${TARGET_NAME}_shared INTERFACE $<INSTALL_INTERFACE:include>)
+
+ install(TARGETS ${TARGET_NAME}_shared EXPORT AsapoConsumerSharedTarget
+ LIBRARY DESTINATION lib
+ ARCHIVE DESTINATION lib
+ INCLUDES DESTINATION include
+ )
+ export(EXPORT AsapoConsumerSharedTarget
+ FILE "${CMAKE_CURRENT_BINARY_DIR}/asapo/AsapoConsumerSharedTarget.cmake"
+ NAMESPACE imported::
+ )
+ install(EXPORT AsapoConsumerSharedTarget
+ FILE
+ AsapoConsumerSharedTarget.cmake
+ NAMESPACE imported::
+ DESTINATION ${ConfigPackageLocation}
+ )
+endif()
+
+install(DIRECTORY include/ DESTINATION include)
################################
# Testing
@@ -39,9 +99,5 @@ set(TEST_SOURCE_FILES
unittests/test_rds_error_mapper.cpp
)
set(TEST_LIBRARIES "${TARGET_NAME}")
-
-
gtest(${TARGET_NAME} "${TEST_SOURCE_FILES}" "${TEST_LIBRARIES}" ${CMAKE_CURRENT_SOURCE_DIR}/src/consumer_c_glue.cpp)
-install(TARGETS ${TARGET_NAME} DESTINATION lib)
-install(DIRECTORY include/ DESTINATION include)
diff --git a/consumer/api/cpp/src/consumer_c_glue.cpp b/consumer/api/cpp/src/consumer_c_glue.cpp
index 444a72b96a6cc7ec2dea2c00263e9751cee7c663..da85fc750f1bcaf3bad9e52d6e25f6ecf9636541 100644
--- a/consumer/api/cpp/src/consumer_c_glue.cpp
+++ b/consumer/api/cpp/src/consumer_c_glue.cpp
@@ -51,7 +51,6 @@ typedef AsapoHandlerHolder<asapo::PartialErrorData>* AsapoPartialErrorDataHandle
typedef AsapoHandlerHolder<asapo::ConsumerErrorData>* AsapoConsumerErrorDataHandle;
#include <algorithm>
-
#define dataGetterStart \
asapo::MessageData d; \
asapo::MessageMeta* fi = info ? new asapo::MessageMeta : nullptr; \
@@ -141,6 +140,8 @@ extern "C" {
}
+
+
//! wraps asapo::Consumer::SetTimeout()
/// \copydoc asapo::Consumer::SetTimeout()
/// \param[in] consumer the handle of the consumer concerned
@@ -388,7 +389,7 @@ extern "C" {
if (process_error(error, std::move(err)) < 0) {
return -1;
}
- return retval;
+ return static_cast<int64_t>(retval);
}
//! wraps asapo::Consumer::GetDatasetById()
@@ -655,21 +656,4 @@ extern "C" {
-//! free handle memory, set handle to NULL
-/// \param[in] pointer to an ASAPO handle
- void asapo_free_handle(void** handle) {
- if (*handle == nullptr) {
- return;
- }
- auto a_handle = static_cast<AsapoHandle*>(*handle);
- delete a_handle;
- *handle = nullptr;
- }
-
-//! creates a new ASAPO handle
-/// \return initialized ASAPO handle
- void* asapo_new_handle() {
- return NULL;
- }
-
}
diff --git a/consumer/api/cpp/src/consumer_impl.cpp b/consumer/api/cpp/src/consumer_impl.cpp
index 6dbeeaaef2b7784875e3a0fb57520be94438077e..973e6a98a5313364d75c2455662476fd25e2401f 100644
--- a/consumer/api/cpp/src/consumer_impl.cpp
+++ b/consumer/api/cpp/src/consumer_impl.cpp
@@ -335,7 +335,8 @@ Error ConsumerImpl::GetRecordFromServer(std::string* response, std::string group
return no_data_error ? std::move(no_data_error) : std::move(err);
}
std::this_thread::sleep_for(std::chrono::milliseconds(100));
- elapsed_ms += std::chrono::duration_cast<std::chrono::milliseconds>(system_clock::now() - start).count();
+ elapsed_ms += static_cast<uint64_t>(std::chrono::duration_cast<std::chrono::milliseconds>
+ (system_clock::now() - start).count());
}
return nullptr;
}
@@ -409,7 +410,8 @@ Error ConsumerImpl::GetDataFromFile(MessageMeta* info, MessageData* data) {
break;
}
std::this_thread::sleep_for(std::chrono::milliseconds(100));
- elapsed_ms += std::chrono::duration_cast<std::chrono::milliseconds>(system_clock::now() - start).count();
+ elapsed_ms += static_cast<uint64_t>(std::chrono::duration_cast<std::chrono::milliseconds>
+ (system_clock::now() - start).count());
}
if (err != nullptr) {
return ConsumerErrorTemplates::kLocalIOError.Generate(err->Explain());
@@ -522,7 +524,8 @@ Error ConsumerImpl::ServiceRequestWithTimeout(const std::string& service_name,
}
}
std::this_thread::sleep_for(std::chrono::milliseconds(100));
- elapsed_ms += std::chrono::duration_cast<std::chrono::milliseconds>(system_clock::now() - start).count();
+ elapsed_ms += static_cast<uint64_t>(std::chrono::duration_cast<std::chrono::milliseconds>
+ (system_clock::now() - start).count());
}
return err;
}
@@ -588,7 +591,7 @@ Error ConsumerImpl::SetLastReadMarker(std::string group_id, uint64_t value, std:
uint64_t ConsumerImpl::GetCurrentSize(std::string stream, Error* err) {
auto ri = GetSizeRequestForSingleMessagesStream(stream);
- return GetCurrentCount(stream, ri, err);
+ return GetCurrentCount(ri, err);
}
Error ConsumerImpl::GetById(uint64_t id, MessageMeta* info, MessageData* data, std::string stream) {
@@ -906,7 +909,7 @@ void ConsumerImpl::InterruptCurrentOperation() {
uint64_t ConsumerImpl::GetCurrentDatasetCount(std::string stream, bool include_incomplete, Error* err) {
RequestInfo ri = GetSizeRequestForDatasetStream(stream, include_incomplete);
- return GetCurrentCount(stream, ri, err);
+ return GetCurrentCount(ri, err);
}
RequestInfo ConsumerImpl::GetSizeRequestForDatasetStream(std::string& stream, bool include_incomplete) const {
@@ -915,7 +918,7 @@ RequestInfo ConsumerImpl::GetSizeRequestForDatasetStream(std::string& stream, bo
return ri;
}
-uint64_t ConsumerImpl::GetCurrentCount(std::string stream, const RequestInfo& ri, Error* err) {
+uint64_t ConsumerImpl::GetCurrentCount(const RequestInfo& ri, Error* err) {
auto responce = BrokerRequestWithTimeout(ri, err);
if (*err) {
return 0;
diff --git a/consumer/api/cpp/src/consumer_impl.h b/consumer/api/cpp/src/consumer_impl.h
index 52b7fa900682232ec946d0ea0bf8b03876608bfd..b4d228021c5297cdf2573db47d67eaf3a58f1f09 100644
--- a/consumer/api/cpp/src/consumer_impl.h
+++ b/consumer/api/cpp/src/consumer_impl.h
@@ -148,7 +148,7 @@ class ConsumerImpl final : public asapo::Consumer {
std::string OpToUriCmd(GetMessageServerOperation op);
Error UpdateFolderTokenIfNeeded(bool ignore_existing);
- uint64_t GetCurrentCount(std::string stream, const RequestInfo& ri, Error* err);
+ uint64_t GetCurrentCount(const RequestInfo& ri, Error* err);
RequestInfo GetStreamListRequest(const std::string& from, const StreamFilter& filter) const;
Error GetServerVersionInfo(std::string* server_info, bool* supported) ;
std::string BrokerApiUri(std::string stream, std::string group, std::string suffix) const;
@@ -166,7 +166,6 @@ class ConsumerImpl final : public asapo::Consumer {
std::string folder_token_;
RequestInfo CreateFolderTokenRequest() const;
RequestInfo CreateFileTransferRequest(const MessageMeta* info) const;
- uint64_t resend_timout_ = 0;
bool resend_ = false;
uint64_t delay_ms_;
uint64_t resend_attempts_;
diff --git a/consumer/api/cpp/src/fabric_consumer_client.cpp b/consumer/api/cpp/src/fabric_consumer_client.cpp
index 774513e1f4d7dab3abce541dfa3e4b1261d46d5b..58e2776cb6d6d05722252e6742dfa6c4b067f7d3 100644
--- a/consumer/api/cpp/src/fabric_consumer_client.cpp
+++ b/consumer/api/cpp/src/fabric_consumer_client.cpp
@@ -60,7 +60,7 @@ fabric::FabricAddress FabricConsumerClient::GetAddressOrConnect(const MessageMet
if (tableEntry == known_addresses_.end()) {
fabric::FabricAddress address = client__->AddServerAddress(info->source, error);
if (*error) {
- return -1;
+ return 0;
}
return known_addresses_[info->source] = address;
} else {
diff --git a/consumer/api/cpp/src/tcp_connection_pool.cpp b/consumer/api/cpp/src/tcp_connection_pool.cpp
index 7efbbfee8654d2c501a6ee9cfbc1c253979949ad..40407b89a621f9187ef3153405fee34471f3a8e9 100644
--- a/consumer/api/cpp/src/tcp_connection_pool.cpp
+++ b/consumer/api/cpp/src/tcp_connection_pool.cpp
@@ -42,14 +42,14 @@ SocketDescriptor TcpConnectionPool::GetFreeConnection(const std::string& source,
SocketDescriptor TcpConnectionPool::Reconnect(SocketDescriptor sd, Error* err) {
std::lock_guard<std::mutex> lock{mutex_};
- for (size_t i = 0; i < connections_.size(); i++) {
+ for (uint64_t i = 0; i < connections_.size(); i++) {
if (connections_[i].sd == sd) {
auto new_sd = Connect(connections_[i].uri, err);
if (err == nullptr) {
connections_[i].sd = new_sd;
connections_[i].in_use = true;
} else {
- connections_.erase(connections_.begin() + i);
+ connections_.erase(connections_.begin() + static_cast<int>(i));
}
return new_sd;
}
diff --git a/consumer/api/cpp/src/tcp_connection_pool.h b/consumer/api/cpp/src/tcp_connection_pool.h
index 10de162fa0ddf2e60b6170bae7ac5386de939e62..7d775133a768099c2b48324f2dc756772290e938 100644
--- a/consumer/api/cpp/src/tcp_connection_pool.h
+++ b/consumer/api/cpp/src/tcp_connection_pool.h
@@ -19,6 +19,7 @@ class TcpConnectionPool {
VIRTUAL SocketDescriptor GetFreeConnection(const std::string& source, bool* reused, Error* err);
VIRTUAL SocketDescriptor Reconnect(SocketDescriptor sd, Error* err);
VIRTUAL void ReleaseConnection(SocketDescriptor sd);
+ VIRTUAL ~TcpConnectionPool() = default;
TcpConnectionPool();
std::unique_ptr<IO> io__;
private:
diff --git a/consumer/api/cpp/src/tcp_consumer_client.cpp b/consumer/api/cpp/src/tcp_consumer_client.cpp
index 7eb9432aa335186766cd067f2b765c5b8e101c01..11ea5626fbc11fff505ebbb5e1093df0a7d6a155 100644
--- a/consumer/api/cpp/src/tcp_consumer_client.cpp
+++ b/consumer/api/cpp/src/tcp_consumer_client.cpp
@@ -56,6 +56,8 @@ Error TcpConsumerClient::ReceiveResponce(SocketDescriptor sd) const noexcept {
case kNetErrorNoData:
connection_pool__->ReleaseConnection(sd);
break;
+ default:
+ break;
}
return ConvertRdsResponseToError(response.error_code);
}
diff --git a/consumer/api/cpp/unittests/test_consumer_impl.cpp b/consumer/api/cpp/unittests/test_consumer_impl.cpp
index bb279cff58b4e7e3ae99908eee85bc19186a0576..ae11c5592d26e5e7746cf4ad9159f8d439fddb36 100644
--- a/consumer/api/cpp/unittests/test_consumer_impl.cpp
+++ b/consumer/api/cpp/unittests/test_consumer_impl.cpp
@@ -58,10 +58,6 @@ TEST(FolderDataBroker, Constructor) {
const uint8_t expected_value = 1;
-asapo::ErrorInterface* new_error() {
- return new asapo::SimpleError{"s"};
-};
-
class ConsumerImplTests : public Test {
public:
std::unique_ptr<ConsumerImpl> consumer, fts_consumer;
@@ -1158,7 +1154,7 @@ TEST_F(ConsumerImplTests, GetStreamListUsesCorrectUriWithoutFrom) {
_)).WillOnce(DoAll(
SetArgPointee<1>(HttpCode::OK),
SetArgPointee<2>(nullptr),
- Return("")));;
+ Return("")));
asapo::Error err;
auto streams = consumer->GetStreamList("", asapo::StreamFilter::kFinishedStreams, &err);
@@ -1261,7 +1257,7 @@ TEST_F(ConsumerImplTests, FileTransferReadsFileSize) {
5,
_)).WillOnce(DoAll(
SetArgPointee<5>(HttpCode::OK),
- AssignArg3(nullptr),
+ AssignArg3(false),
Return(nullptr)
));
diff --git a/consumer/api/cpp/unittests/test_fabric_consumer_client.cpp b/consumer/api/cpp/unittests/test_fabric_consumer_client.cpp
index dcbd311e16fef382fa1f1d710eab1041912ddf78..bca6e896aea1b87e6103f49130066e3a00a5e6bd 100644
--- a/consumer/api/cpp/unittests/test_fabric_consumer_client.cpp
+++ b/consumer/api/cpp/unittests/test_fabric_consumer_client.cpp
@@ -131,7 +131,7 @@ TEST_F(FabricConsumerClientTests, GetData_Error_Init) {
TEST_F(FabricConsumerClientTests, GetData_Error_AddConnection) {
ExpectInit(true);
- ExpectAddedConnection("host:1234", false, -1);
+ ExpectAddedConnection("host:1234", false, 1);
MessageData expectedMessageData;
MessageMeta expectedInfo{};
@@ -140,7 +140,7 @@ TEST_F(FabricConsumerClientTests, GetData_Error_AddConnection) {
ASSERT_THAT(err, Eq(fabric::FabricErrorTemplates::kInternalError));
// Make sure that the connection was not saved
- ExpectAddedConnection("host:1234", false, -1);
+ ExpectAddedConnection("host:1234", false, 1);
err = client.GetData(&expectedInfo, &expectedMessageData);
ASSERT_THAT(err, Eq(fabric::FabricErrorTemplates::kInternalError));
diff --git a/consumer/api/cpp/unittests/test_tcp_consumer_client.cpp b/consumer/api/cpp/unittests/test_tcp_consumer_client.cpp
index ebf4102b3aa4931b9efd884a83acf134e3168b8e..a17255045177ac9a1c6affd397604002415d4fa6 100644
--- a/consumer/api/cpp/unittests/test_tcp_consumer_client.cpp
+++ b/consumer/api/cpp/unittests/test_tcp_consumer_client.cpp
@@ -62,7 +62,7 @@ class TcpClientTests : public Test {
MessageMeta info;
std::string expected_uri = "test:8400";
uint64_t expected_buf_id = 123;
- uint64_t expected_size = 1233;
+ size_t expected_size = 1233;
MessageData data;
asapo::SocketDescriptor expected_sd = 1;
void SetUp() override {
@@ -102,7 +102,7 @@ class TcpClientTests : public Test {
DoAll(
testing::SetArgPointee<3>(ok ? nullptr
: asapo::IOErrorTemplates::kBadFileNumber.Generate().release()),
- Return(ok ? 1 : -1)
+ Return(ok ? 1 : 0)
));
if (!ok) {
EXPECT_CALL(mock_io, CloseSocket_t(sd, _));
@@ -134,7 +134,7 @@ class TcpClientTests : public Test {
.WillOnce(
DoAll(
testing::SetArgPointee<3>(ok ? nullptr : asapo::IOErrorTemplates::kTimeout.Generate().release()),
- testing::Return(ok ? expected_size : -1)
+ testing::Return(ok ? expected_size : 0)
));
if (!ok) {
EXPECT_CALL(mock_io, CloseSocket_t(sd, _));
diff --git a/consumer/api/python/CMakeLists_Linux.cmake b/consumer/api/python/CMakeLists_Linux.cmake
index c099a14d424918d4a3dcdf5dde31cbc949f990e2..5df653a11c84021a62821a1e1dec69568303161b 100644
--- a/consumer/api/python/CMakeLists_Linux.cmake
+++ b/consumer/api/python/CMakeLists_Linux.cmake
@@ -2,10 +2,10 @@
set (TEMP_ADDITIONAL_LINK_ARGS_PART "") # Arguments for the linker
if ((CMAKE_BUILD_TYPE STREQUAL "Debug") AND (CMAKE_C_COMPILER_ID STREQUAL "GNU"))
- set (EXTRA_COMPILE_ARGS "['--std=c++11']")
+ set (EXTRA_COMPILE_ARGS "['--std=c++11','-Wno-maybe-uninitialized']")
set (EXTRA_LINK_ARGS "['--coverage','-fprofile-arcs','-ftest-coverage','-static-libgcc','-static-libstdc++' ${TEMP_ADDITIONAL_LINK_ARGS_PART}]")
ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "GNU")
- set (EXTRA_COMPILE_ARGS "['--std=c++11']")
+ set (EXTRA_COMPILE_ARGS "['--std=c++11','-Wno-maybe-uninitialized']")
set (EXTRA_LINK_ARGS "['-static-libgcc','-static-libstdc++','-Wl,--exclude-libs,ALL' ${TEMP_ADDITIONAL_LINK_ARGS_PART}]")
else()
set (EXTRA_COMPILE_ARGS "['-std=c++11']")
@@ -19,7 +19,7 @@ set (ASAPO_CONSUMER_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../cpp/include)
configure_files(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} @ONLY)
-ADD_CUSTOM_TARGET(python-lib-consumer ALL COMMAND ${Python_EXECUTABLE} setup.py build_ext --inplace --force)
+ADD_CUSTOM_TARGET(python-lib-consumer ALL COMMAND ${Python_EXECUTABLE} setup.py --quiet build_ext --inplace --force)
ADD_DEPENDENCIES(python-lib-consumer asapo-consumer)
diff --git a/consumer/api/python/asapo_consumer.pyx.in b/consumer/api/python/asapo_consumer.pyx.in
index 1efc446dc622ab7fc7d1043f9a0be1cea6cde6e4..f4232d7c74a914ee65d19a50f82d9782ac7fc977 100644
--- a/consumer/api/python/asapo_consumer.pyx.in
+++ b/consumer/api/python/asapo_consumer.pyx.in
@@ -7,6 +7,7 @@ import json
from cpython.version cimport PY_MAJOR_VERSION
from libcpp.string cimport string
+
np.import_array()
cdef extern from "numpy/ndarraytypes.h":
@@ -144,7 +145,7 @@ cdef class PyConsumer:
cdef char* ptr = <char*> data.release()
dims[0] = meta['size']
arr = np.PyArray_SimpleNewFromData(1, dims, np.NPY_BYTE, ptr)
- PyArray_ENABLEFLAGS(arr,np.NPY_OWNDATA)
+ PyArray_ENABLEFLAGS(arr,np.NPY_ARRAY_OWNDATA)
return arr,meta
def get_next(self, group_id, meta_only = True, stream = "default"):
return self._op("next",group_id,stream,meta_only,0)
@@ -169,7 +170,7 @@ cdef class PyConsumer:
dims[0] = meta['size']
cdef char* ptr = <char*> data.release()
arr = np.PyArray_SimpleNewFromData(1, dims, np.NPY_BYTE, ptr)
- PyArray_ENABLEFLAGS(arr,np.NPY_OWNDATA)
+ PyArray_ENABLEFLAGS(arr,np.NPY_ARRAY_OWNDATA)
return arr
def get_current_size(self, stream = "default"):
cdef Error err
diff --git a/consumer/api/python/dist_linux/CMakeLists.txt b/consumer/api/python/dist_linux/CMakeLists.txt
index daaf9bfcaac816bb0274c7078346fb0653192eab..0715a4d2ac58f641276470703350ca2c79d7a1f8 100644
--- a/consumer/api/python/dist_linux/CMakeLists.txt
+++ b/consumer/api/python/dist_linux/CMakeLists.txt
@@ -54,8 +54,6 @@ ADD_CUSTOM_TARGET(copy_python_dist-consumer ALL
COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/lib
COMMAND ${CMAKE_COMMAND} -E copy ${CURL_LIBRARIES} ${CMAKE_CURRENT_BINARY_DIR}/lib
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:asapo-consumer> ${CMAKE_CURRENT_BINARY_DIR}/lib
- COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:asapo-fabric> ${CMAKE_CURRENT_BINARY_DIR}/lib
-
)
ADD_DEPENDENCIES(copy_python_dist-consumer python-lib-consumer)
diff --git a/consumer/api/python/dist_linux/setup.py.in b/consumer/api/python/dist_linux/setup.py.in
index 10b7063a32c26dc688db043e86c93b12e7b0391a..3a3824b8b6c1381a2cbe1144e5c57be70c5cadad 100644
--- a/consumer/api/python/dist_linux/setup.py.in
+++ b/consumer/api/python/dist_linux/setup.py.in
@@ -6,7 +6,7 @@ import os
# TODO 'lib/libcurl.a' seems to have no effect, because there is a libcurl.so file
ext_modules = [
Extension("asapo_consumer", ["asapo_consumer.cpp"],
- extra_objects=['lib/libasapo-consumer.a', 'lib/libasapo-fabric.a', 'lib/libcurl.a'],
+ extra_objects=['lib/libasapo-consumer.a', 'lib/libcurl.a'],
include_dirs=["include/asapo/common","include",numpy.get_include()],
extra_compile_args=@EXTRA_COMPILE_ARGS@,
extra_link_args=@EXTRA_LINK_ARGS@,
diff --git a/consumer/api/python/setup.py.in b/consumer/api/python/setup.py.in
index 655dd52cb18c5630a51cd97a4c1426aaabc7c146..1749ff98c5ab84f62436552a8cdddbf4bd7e1d3e 100644
--- a/consumer/api/python/setup.py.in
+++ b/consumer/api/python/setup.py.in
@@ -6,8 +6,8 @@ from Cython.Build import cythonize
import numpy
module = Extension("asapo_consumer", ["asapo_consumer.pyx"],
- extra_objects=['$<TARGET_FILE:asapo-consumer>','$<TARGET_FILE:asapo-fabric>',
- '@CURL_LIBRARIES@'],
+ extra_objects=['$<TARGET_FILE:asapo-consumer>','@CURL_LIBRARIES@'],
+ define_macros=[("NPY_NO_DEPRECATED_API", "NPY_1_7_API_VERSION")],
include_dirs=["@ASAPO_CXX_COMMON_INCLUDE_DIR@","@ASAPO_CONSUMER_INCLUDE_DIR@",numpy.get_include()],
extra_compile_args=@EXTRA_COMPILE_ARGS@,
extra_link_args=@EXTRA_LINK_ARGS@,
@@ -15,6 +15,6 @@ module = Extension("asapo_consumer", ["asapo_consumer.pyx"],
)
-ext_modules = cythonize([module],compiler_directives={'embedsignature': True})
+ext_modules = cythonize([module],compiler_directives={'embedsignature': True,'language_level': 2})
setup(ext_modules = ext_modules)
diff --git a/consumer/libasapo-consumer.pc.in b/consumer/libasapo-consumer.pc.in
index a09c6f780c6e597145526b861b943cf2baba2526..5ae055f45f419a0227a1032f3d79fd8ebd1476ed 100644
--- a/consumer/libasapo-consumer.pc.in
+++ b/consumer/libasapo-consumer.pc.in
@@ -7,5 +7,5 @@ Name: libasapo-consumer
Description: ASAP::O consumer API
Version: ${ASAPO_CONSUMER_PROTOCOL}
Cflags: -I${CMAKE_INSTALL_FULL_INCLUDEDIR}
-Libs: -L${CMAKE_INSTALL_FULL_LIBDIR} -lasapo-consumer -lasapo-fabric
-Libs.private: -lcurl -lstdc++ -lpthread
+Libs: -L${CMAKE_INSTALL_FULL_LIBDIR} -lasapo-consumer
+Libs.private: -lcurl -lstdc++ -lpthread -ld
diff --git a/consumer/tools/folder_to_db/src/folder_db_importer.cpp b/consumer/tools/folder_to_db/src/folder_db_importer.cpp
index ed0bdf12a3d7a8946f65c523ea3184745e6cfd6d..c973afe04fbb867990e0ba4efeb6de34ffc66dfe 100644
--- a/consumer/tools/folder_to_db/src/folder_db_importer.cpp
+++ b/consumer/tools/folder_to_db/src/folder_db_importer.cpp
@@ -68,8 +68,8 @@ Error WaitParallelTasks(std::vector<std::future<Error>>* res) {
TaskSplitParameters ComputeSplitParameters(const MessageMetas& file_list, int ntasks) {
TaskSplitParameters parameters;
- parameters.chunk = file_list.size() / ntasks;
- parameters.remainder = file_list.size() % ntasks;
+ parameters.chunk = static_cast<uint64_t>(file_list.size() / static_cast<unsigned long>(ntasks));
+ parameters.remainder = static_cast<uint64_t>(file_list.size() % static_cast<unsigned long>(ntasks));
return parameters;
}
@@ -89,7 +89,7 @@ void FolderToDbImporter::ProcessNextChunk(const MessageMetas& file_list,
}
Error FolderToDbImporter::ImportFilelist(const MessageMetas& file_list) const {
- auto split_parameters = ComputeSplitParameters(file_list, n_tasks_);
+ auto split_parameters = ComputeSplitParameters(file_list, static_cast<int>(n_tasks_));
std::vector<std::future<Error>>res;
for (unsigned int i = 0; i < n_tasks_; i++) {
diff --git a/consumer/tools/folder_to_db/src/main.cpp b/consumer/tools/folder_to_db/src/main.cpp
index 7d131ff3a95b8c4bd2e806d1a6b88df61ad5a814..ef92b81dbd624e1dad80932e7916087586dab761 100644
--- a/consumer/tools/folder_to_db/src/main.cpp
+++ b/consumer/tools/folder_to_db/src/main.cpp
@@ -76,7 +76,7 @@ int main(int argc, char* argv[]) {
auto import_params = ProcessCommandArguments(argc, argv);
asapo::FolderToDbImporter importer;
- importer.SetNParallelTasks(import_params.ntasks);
+ importer.SetNParallelTasks(static_cast<unsigned int>(import_params.ntasks));
importer.IgnoreDuplicates(import_params.ignore_duplicates);
asapo::FolderImportStatistics statistics;
diff --git a/consumer/tools/folder_to_db/unittests/test_folder_to_db.cpp b/consumer/tools/folder_to_db/unittests/test_folder_to_db.cpp
index 59a46d881e99784a9dfc2c98a48ca998c059b46d..cee9a314d7e5cf44e16f8f7b74cab771bbd1d19d 100644
--- a/consumer/tools/folder_to_db/unittests/test_folder_to_db.cpp
+++ b/consumer/tools/folder_to_db/unittests/test_folder_to_db.cpp
@@ -68,9 +68,9 @@ TEST(FolderDBConverter, SetNTasksCorrectly) {
class MockDatabaseFactory : public DatabaseFactory {
public:
std::vector<NiceMock<MockDatabase>*> db;
- mutable int n{0};
- void CreateDBs(int n) {
- for (int i = 0; i < n; i++) {
+ mutable size_t n{0};
+ void CreateDBs(size_t n) {
+ for (size_t i = 0; i < n; i++) {
auto val = new NiceMock<MockDatabase>;
db.push_back(val);
ON_CALL(*val, Connect_t(_, _))
@@ -82,7 +82,7 @@ class MockDatabaseFactory : public DatabaseFactory {
return std::unique_ptr<Database> {db[n++]};
}
~MockDatabaseFactory() {
- for (unsigned int i = n; i < db.size(); i++) {
+ for (size_t i = n; i < db.size(); i++) {
delete db[i];
}
}
@@ -143,7 +143,7 @@ TEST_F(FolderDBConverterTests, ErrorWhenCannotConnect) {
}
TEST_F(FolderDBConverterTests, ErrorWhenCannotCreateDbParallel) {
- int nparallel = 3;
+ size_t nparallel = 3;
EXPECT_CALL(*(mock_dbf->db[0]), Connect_t(uri, _)).
WillOnce(testing::Return(asapo::DBErrorTemplates::kConnectionError.Generate().release()));
EXPECT_CALL(*(mock_dbf->db[1]), Connect_t(uri, _)).
@@ -151,7 +151,7 @@ TEST_F(FolderDBConverterTests, ErrorWhenCannotCreateDbParallel) {
EXPECT_CALL(*(mock_dbf->db[2]), Connect_t(uri, _)).
WillOnce(testing::Return(asapo::DBErrorTemplates::kConnectionError.Generate().release()));
- converter.SetNParallelTasks(nparallel);
+ converter.SetNParallelTasks(static_cast<unsigned int>(nparallel));
auto error = converter.Convert(uri, folder, db_name);
ASSERT_THAT(error, Ne(nullptr));
}
@@ -245,7 +245,7 @@ TEST_F(FolderDBConverterTests, PassesFileListToInsertInParallel3by2) {
TEST_F(FolderDBConverterTests, ComputesStatistics) {
EXPECT_CALL(*mock_dbf->db[0], Insert_t(_, _, false, _)).
- Times(message_metas.size()).
+ Times(static_cast<int>(message_metas.size())).
WillRepeatedly(testing::Return(nullptr));
asapo::FolderImportStatistics statistics;
diff --git a/deploy/build_env/centos/Dockerfile.7.9.2009 b/deploy/build_env/centos/Dockerfile.7.9.2009
index a800bd13fe57b5c6b0ea3e57e89b7395c1c93d37..2026e61c51d2703daeae5dea58c03dcda18591d3 100644
--- a/deploy/build_env/centos/Dockerfile.7.9.2009
+++ b/deploy/build_env/centos/Dockerfile.7.9.2009
@@ -17,7 +17,7 @@ RUN yum -y install autoconf libtool libibverbs librdmacm librdmacm-devel
ADD install_libfabric.sh install_libfabric.sh
RUN ./install_libfabric.sh
-RUN yum -y install mc
+RUN yum -y install mc libcurl-devel
ENV GOPATH /tmp
ENV OS el7
diff --git a/deploy/build_env/centos/Dockerfile.8.3.2011 b/deploy/build_env/centos/Dockerfile.8.3.2011
index 0b7037a13fa144481df49dd2008a05e39e95e3d7..13d39c40afd91838f8d3123b60b42326709f7187 100644
--- a/deploy/build_env/centos/Dockerfile.8.3.2011
+++ b/deploy/build_env/centos/Dockerfile.8.3.2011
@@ -14,6 +14,8 @@ RUN ./install_curl.sh /curl
ADD install_libfabric.sh install_libfabric.sh
RUN ./install_libfabric.sh
+RUN yum -y install mc libcurl-devel
+
ENV GOPATH /tmp
ENV OS el8
ADD build.sh /bin/build.sh
diff --git a/deploy/build_env/centos/build.sh b/deploy/build_env/centos/build.sh
index 3df44c92eb3d54f6e5098b97f80d7c9c6de3e0b0..0f000741de74a14b217b875804e5059d0316de35 100755
--- a/deploy/build_env/centos/build.sh
+++ b/deploy/build_env/centos/build.sh
@@ -7,14 +7,25 @@ cmake \
-DINSTALL_EXAMPLES=ON \
-DBUILD_CLIENTS_ONLY=ON \
-DPACKAGE_RELEASE_SUFFIX=1.$OS \
+ -DPACK_STATIC_CURL_LIB=/curl/lib/libcurl.a \
-DBUILD_PYTHON=OFF \
- -DLIBCURL_DIR=/curl \
-DCPACK_PACKAGE_NAME="asapo-devel" \
-DCPACK_GENERATOR="RPM" \
..
make -j 4
make package
-cmake -DNUMPY_VERSION=0 -DBUILD_PYTHON=ON -DBUILD_PYTHON_PACKAGES="source;rpm" ..
-make
+#switch to static curl for Python packages
+rm CMakeCache.txt
+cmake \
+ -DCMAKE_BUILD_TYPE="Release" \
+ -DLIBCURL_DIR=/curl \
+ -DENABLE_LIBFABRIC=ON \
+ -DBUILD_CLIENTS_ONLY=ON \
+ -DNUMPY_VERSION=0 \
+ -DBUILD_PYTHON=ON \
+ -DBUILD_PYTHON_PACKAGES="source;rpm" \
+ -DBUILD_PYTHON_DOCS=$BUILD_PYTHON_DOCS \
+ ..
+make -j 1
diff --git a/deploy/build_env/debians/Dockerfile_debian10.7 b/deploy/build_env/debians/Dockerfile_debian10.7
index 5c669bd91e28f84a0b3a209fb7cbd72b479c36e2..6f4024966068a523ac956f8a4d34c27d1b0dbdcf 100644
--- a/deploy/build_env/debians/Dockerfile_debian10.7
+++ b/deploy/build_env/debians/Dockerfile_debian10.7
@@ -15,6 +15,8 @@ RUN ./install_curl.sh /curl && ./install_cmake.sh
ADD install_libfabric.sh install_libfabric.sh
RUN ./install_libfabric.sh
+RUN apt install -y libcurl4-openssl-dev
+
ARG OS
ENV OS=${OS}
ADD build.sh /bin/build.sh
\ No newline at end of file
diff --git a/deploy/build_env/debians/Dockerfile_debian9.13 b/deploy/build_env/debians/Dockerfile_debian9.13
index c59953f710094805daff07f1c06e1b8898c32486..6d1d12cb1d9932dcf7962bc949b154bbd2853e9c 100644
--- a/deploy/build_env/debians/Dockerfile_debian9.13
+++ b/deploy/build_env/debians/Dockerfile_debian9.13
@@ -15,6 +15,8 @@ RUN ./install_curl.sh /curl && ./install_cmake.sh
ADD install_libfabric.sh install_libfabric.sh
RUN ./install_libfabric.sh
+RUN apt install -y libcurl4-openssl-dev
+
ARG OS
ENV OS=${OS}
ADD build.sh /bin/build.sh
\ No newline at end of file
diff --git a/deploy/build_env/debians/Dockerfile_ubuntu16.04 b/deploy/build_env/debians/Dockerfile_ubuntu16.04
index 1a79c19bbd53f216fe385bcad28e82ed8892e703..df0b1e5558d8d7f9bb1b5c16c6aa49723bd7eb38 100644
--- a/deploy/build_env/debians/Dockerfile_ubuntu16.04
+++ b/deploy/build_env/debians/Dockerfile_ubuntu16.04
@@ -8,13 +8,15 @@ ADD install_cmake.sh install_cmake.sh
RUN apt update && apt install -y g++ git wget python python3 python-numpy python3-numpy python-pip python3-pip \
zlib1g-dev python3-all-dev python-all-dev python-stdeb python3-stdeb
-RUN pip --no-cache-dir install cython && pip3 --no-cache-dir install cython sphinx
+RUN pip --no-cache-dir install cython && pip3 --no-cache-dir install cython
RUN ./install_curl.sh /curl && ./install_cmake.sh
ADD install_libfabric.sh install_libfabric.sh
RUN ./install_libfabric.sh
+RUN apt install -y libcurl4-openssl-dev
+
ARG OS
ENV OS=${OS}
ADD build.sh /bin/build.sh
\ No newline at end of file
diff --git a/deploy/build_env/debians/Dockerfile_ubuntu18.04 b/deploy/build_env/debians/Dockerfile_ubuntu18.04
index f90bc71d291085b9e23e909a24b97bcce804d3f3..4ebfef728a3a7aceaa07d9d9dab27f54ee96fc1d 100644
--- a/deploy/build_env/debians/Dockerfile_ubuntu18.04
+++ b/deploy/build_env/debians/Dockerfile_ubuntu18.04
@@ -8,13 +8,15 @@ ADD install_cmake.sh install_cmake.sh
RUN apt update && apt install -y g++ git wget python python3 python-numpy python3-numpy python-pip python3-pip \
zlib1g-dev python3-all-dev python-all-dev python-stdeb python3-stdeb
-RUN pip --no-cache-dir install cython && pip3 --no-cache-dir install cython
+RUN pip --no-cache-dir install cython && pip3 --no-cache-dir install cython sphinx
RUN ./install_curl.sh /curl && ./install_cmake.sh
ADD install_libfabric.sh install_libfabric.sh
RUN ./install_libfabric.sh
+RUN apt install -y libcurl4-openssl-dev
+
ARG OS
ENV OS=${OS}
ADD build.sh /bin/build.sh
\ No newline at end of file
diff --git a/deploy/build_env/debians/build.sh b/deploy/build_env/debians/build.sh
index a237aca6de64253e907b74233b36500902147b49..e78771d5ca95635f17a6dac13619390a4128fec0 100755
--- a/deploy/build_env/debians/build.sh
+++ b/deploy/build_env/debians/build.sh
@@ -9,8 +9,8 @@ cmake \
-DINSTALL_EXAMPLES=ON \
-DBUILD_CLIENTS_ONLY=ON \
-DPACKAGE_RELEASE_SUFFIX=$OS \
+ -DPACK_STATIC_CURL_LIB=/curl/lib/libcurl.a \
-DBUILD_PYTHON=OFF \
- -DLIBCURL_DIR=/curl \
-DCPACK_PACKAGE_NAME="asapo-dev" \
-DCPACK_GENERATOR="DEB" \
..
@@ -19,12 +19,22 @@ make -j 4
make package
-if [ "$OS" = "ubuntu16.04" ]; then
+if [ "$OS" = "ubuntu18.04" ]; then
BUILD_PYTHON_DOCS=ON
else
BUILD_PYTHON_DOCS=OFF
fi
-
-cmake -DNUMPY_VERSION=0 -DBUILD_PYTHON=ON -DBUILD_PYTHON_PACKAGES="source;deb" -DBUILD_PYTHON_DOCS=$BUILD_PYTHON_DOCS ..
-make -j1
+#switch to static curl for Python packages
+rm CMakeCache.txt
+cmake \
+ -DCMAKE_BUILD_TYPE="Release" \
+ -DLIBCURL_DIR=/curl \
+ -DENABLE_LIBFABRIC=ON \
+ -DBUILD_CLIENTS_ONLY=ON \
+ -DNUMPY_VERSION=0 \
+ -DBUILD_PYTHON=ON \
+ -DBUILD_PYTHON_PACKAGES="source;deb" \
+ -DBUILD_PYTHON_DOCS=$BUILD_PYTHON_DOCS \
+ ..
+make -j 1
diff --git a/deploy/build_env/debians/build_images.sh b/deploy/build_env/debians/build_images.sh
index cdf50e6a9d41d8724763bb29bd38ce9c84d62684..365e106d12e27dc980464740e855a864cb275946 100755
--- a/deploy/build_env/debians/build_images.sh
+++ b/deploy/build_env/debians/build_images.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -e
-vers="ubuntu16.04 ubuntu18.04 debian9.13 debian10.7"
+vers="ubuntu18.04 ubuntu16.04 debian9.13 debian10.7"
for ver in $vers
do
diff --git a/examples/consumer/getnext/CMakeLists_separate.in b/examples/consumer/getnext/CMakeLists_separate.in
index c18b822691082b5401705e13d48fa60e568e833b..3ced42a8eca4502729ff794770bd97fe1f4b4a04 100644
--- a/examples/consumer/getnext/CMakeLists_separate.in
+++ b/examples/consumer/getnext/CMakeLists_separate.in
@@ -31,4 +31,4 @@ link_directories(@CMAKE_INSTALL_PREFIX@/lib)
add_executable(${TARGET_NAME} ${SOURCE_FILES})
target_include_directories(${TARGET_NAME} PUBLIC @CMAKE_INSTALL_PREFIX@/include)
-target_link_libraries(${TARGET_NAME} asapo-consumer asapo-fabric dl ${CURL_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
+target_link_libraries(${TARGET_NAME} asapo-consumer dl ${CURL_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
diff --git a/examples/consumer/getnext/Makefile.in b/examples/consumer/getnext/Makefile.in
index b57b1c1f040ed6f6be5dc78298df14f6b5f84d91..82c5d30c29cb6bbed1028a4fd5a45346ca66a642 100644
--- a/examples/consumer/getnext/Makefile.in
+++ b/examples/consumer/getnext/Makefile.in
@@ -3,7 +3,7 @@ PROGRAM=@TARGET_NAME@
CXX=g++
CXXFLAGS=-std=c++11
LDFLAGS=-pthread -static-libgcc -static-libstdc++
-LIBS=-L @CMAKE_INSTALL_PREFIX@/lib -lasapo-consumer -l asapo-fabric -lcurl -ldl
+LIBS=-L @CMAKE_INSTALL_PREFIX@/lib -lasapo-consumer -lcurl -ldl
INCLUDE=-I @CMAKE_INSTALL_PREFIX@/include
RM=rm -f
diff --git a/examples/consumer/getnext/getnext.cpp b/examples/consumer/getnext/getnext.cpp
index 142de7f7ec5c83ff77c323eaa587dd9745132cf2..898ba41e6506edbc0f6cc6ca82a480c546c86aee 100644
--- a/examples/consumer/getnext/getnext.cpp
+++ b/examples/consumer/getnext/getnext.cpp
@@ -39,7 +39,7 @@ struct Args {
std::string data_source;
std::string token;
int timeout_ms;
- int nthreads;
+ size_t nthreads;
bool read_data;
bool datasets;
bool need_beamtime_meta = false;
@@ -97,7 +97,7 @@ std::vector<std::thread>
StartThreads(const Args& params, std::vector<int>* nfiles, std::vector<int>* errors, std::vector<int>* nbuf,
std::vector<int>* nfiles_total, std::vector<asapo::NetworkConnectionType>* connection_type,
LatchedTimer* timer) {
- auto exec_next = [¶ms, nfiles, errors, nbuf, nfiles_total, connection_type, timer](int i) {
+ auto exec_next = [¶ms, nfiles, errors, nbuf, nfiles_total, connection_type, timer](size_t i) {
asapo::MessageMeta fi;
Error err;
auto consumer = asapo::ConsumerFactory::CreateConsumer(params.server,
@@ -179,7 +179,7 @@ StartThreads(const Args& params, std::vector<int>* nfiles, std::vector<int>* err
};
std::vector<std::thread> threads;
- for (int i = 0; i < params.nthreads; i++) {
+ for (size_t i = 0; i < params.nthreads; i++) {
threads.emplace_back(std::thread(exec_next, i));
}
return threads;
@@ -197,7 +197,7 @@ int ReadAllData(const Args& params, uint64_t* duration_ms, uint64_t* duration_wi
std::vector<int> nfiles_total_in_datasets(params.nthreads, 0);
std::vector<asapo::NetworkConnectionType> connection_types(params.nthreads, asapo::NetworkConnectionType::kUndefined);
- LatchedTimer latched_timer(params.nthreads);
+ LatchedTimer latched_timer(static_cast<int>(params.nthreads));
auto threads = StartThreads(params, &nfiles, &errors, &nfiles_frombuf, &nfiles_total_in_datasets, &connection_types,
&latched_timer);
@@ -205,10 +205,10 @@ int ReadAllData(const Args& params, uint64_t* duration_ms, uint64_t* duration_wi
std::chrono::system_clock::time_point t2 = std::chrono::system_clock::now();
auto duration_read = std::chrono::duration_cast<std::chrono::milliseconds>(t2 - t1);
- *duration_ms = duration_read.count();
+ *duration_ms = static_cast<uint64_t>(duration_read.count());
if (latched_timer.was_triggered()) {
auto duration_without_first = std::chrono::duration_cast<std::chrono::milliseconds>(t2 - latched_timer.start_time());
- *duration_without_first_ms = duration_without_first.count();
+ *duration_without_first_ms = static_cast<uint64_t>(duration_without_first.count());
} else {
*duration_without_first_ms = 0;
}
@@ -220,8 +220,8 @@ int ReadAllData(const Args& params, uint64_t* duration_ms, uint64_t* duration_wi
// The following two loops will check if all threads that processed some data were using the same network type
{
- int firstThreadThatActuallyProcessedData = 0;
- for (int i = 0; i < params.nthreads; i++) {
+ size_t firstThreadThatActuallyProcessedData = 0;
+ for (size_t i = 0; i < params.nthreads; i++) {
if (nfiles[i] > 0) {
firstThreadThatActuallyProcessedData = i;
break;
@@ -229,7 +229,7 @@ int ReadAllData(const Args& params, uint64_t* duration_ms, uint64_t* duration_wi
}
*connection_type = connection_types[firstThreadThatActuallyProcessedData];
- for (int i = 0; i < params.nthreads; i++) {
+ for (size_t i = 0; i < params.nthreads; i++) {
if (*connection_type != connection_types[i] && nfiles[i] > 0) {
// The output will look like this:
// ERROR thread[0](processed 5 files) connection type is 'No connection' but thread[1](processed 3 files) is 'TCP'
@@ -279,7 +279,7 @@ int main(int argc, char* argv[]) {
params.file_path = std::string{argv[2]};
params.beamtime_id = std::string{argv[3]};
TryGetStream(¶ms);
- params.nthreads = atoi(argv[4]);
+ params.nthreads = static_cast<size_t>(atoi(argv[4]));
params.token = std::string{argv[5]};
params.timeout_ms = atoi(argv[6]);
params.read_data = atoi(argv[7]) != 1;
@@ -315,12 +315,14 @@ int main(int argc, char* argv[]) {
float rate;
if (duration_without_first_ms == 0) {
std::cout << "Elapsed : " << duration_ms << "ms" << std::endl;
- rate = 1000.0f * nfiles / (duration_ms - params.timeout_ms);
+ rate = 1000.0f * static_cast<float>(nfiles) / (static_cast<float>(duration_ms - static_cast<uint64_t>
+ (params.timeout_ms)));
} else {
std::cout << "Elapsed : " << duration_without_first_ms << "ms (With handshake: " << duration_ms << "ms)" << std::endl;
- rate = 1000.0f * nfiles / (duration_without_first_ms - params.timeout_ms);
+ rate = 1000.0f * static_cast<float>(nfiles) / (static_cast<float>(duration_without_first_ms - static_cast<uint64_t>
+ (params.timeout_ms)));
}
- auto bw_gbytes = rate * file_size / 1000.0f / 1000.0f / 1000.0f;
+ auto bw_gbytes = rate * static_cast<float>(file_size) / 1000.0f / 1000.0f / 1000.0f;
std::cout << "Rate : " << rate << std::endl;
if (file_size > 0) {
std::cout << "Bandwidth " << bw_gbytes * 8 << " Gbit/s" << std::endl;
diff --git a/examples/consumer/simple-consumer-c/consume.c b/examples/consumer/simple-consumer-c/consume.c
index ea79dad81e91c704aad0aebd55bf4def0ea4ffaf..f9d36a40aee80d56e1d99673d702129a6f548cde 100644
--- a/examples/consumer/simple-consumer-c/consume.c
+++ b/examples/consumer/simple-consumer-c/consume.c
@@ -12,7 +12,7 @@ void exit_if_error(const char *error_string, const AsapoErrorHandle err) {
}
}
-int main(int argc, char* argv[]) {
+int main() {
AsapoErrorHandle err = asapo_new_handle();
AsapoMessageMetaHandle mm = asapo_new_handle();
AsapoMessageDataHandle data = asapo_new_handle();
@@ -41,6 +41,7 @@ int main(int argc, char* argv[]) {
asapo_consumer_get_next(consumer, group_id, &mm, &data, "default",&err);
exit_if_error("Cannot get next record", err);
+
printf("id: %lu\n", asapo_message_meta_get_id(mm));
printf("file name: %s\n", asapo_message_meta_get_name(mm));
printf("file content: %s\n", asapo_message_data_get_as_chars(data));
diff --git a/examples/pipeline/in_to_out/in_to_out.cpp b/examples/pipeline/in_to_out/in_to_out.cpp
index fe0f49520f6693bb478c849134634a07eaf52c9c..dbf5bb66aca741ca4d67c8d5ae8fe0a578951fab 100644
--- a/examples/pipeline/in_to_out/in_to_out.cpp
+++ b/examples/pipeline/in_to_out/in_to_out.cpp
@@ -35,11 +35,11 @@ struct Args {
std::string token;
int timeout_ms;
int timeout_ms_producer;
- int nthreads;
+ uint8_t nthreads;
bool transfer_data;
};
-void ProcessAfterSend(asapo::RequestCallbackPayload payload, asapo::Error err) {
+void ProcessAfterSend(asapo::RequestCallbackPayload, asapo::Error err) {
if (err && err != asapo::ProducerErrorTemplates::kServerWarning) {
std::cerr << "Data was not successfully send: " << err << std::endl;
return;
@@ -141,7 +141,7 @@ Error ProcessNextEvent(const Args& args, const ConsumerPtr& consumer, const Prod
std::vector<std::thread> StartConsumerThreads(const Args& args, const ProducerPtr& producer,
std::vector<int>* nfiles,
std::vector<int>* errors) {
- auto exec_next = [&args, nfiles, errors, &producer](int i) {
+ auto exec_next = [&args, nfiles, errors, &producer](uint64_t i) {
asapo::MessageMeta fi;
Error err;
auto consumer = CreateConsumerAndGroup(args, &err);
@@ -165,7 +165,7 @@ std::vector<std::thread> StartConsumerThreads(const Args& args, const ProducerPt
std::vector<std::thread> threads;
for (int i = 0; i < args.nthreads; i++) {
- threads.emplace_back(std::thread(exec_next, i));
+ threads.emplace_back(std::thread(exec_next, static_cast<uint64_t>(i)));
}
return threads;
}
@@ -185,7 +185,7 @@ int ProcessAllData(const Args& args, const ProducerPtr& producer, uint64_t* dura
system_clock::time_point t2 = system_clock::now();
auto duration_read = std::chrono::duration_cast<std::chrono::milliseconds>(t2 - t1);
- *duration_ms = duration_read.count();
+ *duration_ms = static_cast<uint64_t>(duration_read.count());
return n_total;
}
@@ -220,7 +220,7 @@ int main(int argc, char* argv[]) {
args.stream_in = std::string{argv[4]};
args.stream_out = std::string{argv[5]};
args.token = std::string{argv[6]};
- args.nthreads = atoi(argv[7]);
+ args.nthreads = static_cast<uint8_t>(atoi(argv[7]));
args.timeout_ms = atoi(argv[8]);
args.timeout_ms_producer = atoi(argv[9]);
args.transfer_data = atoi(argv[10]) == 1;
@@ -233,7 +233,7 @@ int main(int argc, char* argv[]) {
int nerrors;
auto nfiles = ProcessAllData(args, producer, &duration_ms, &nerrors);
- if (producer->WaitRequestsFinished(args.timeout_ms_producer) != nullptr) {
+ if (producer->WaitRequestsFinished(static_cast<uint64_t>(args.timeout_ms_producer)) != nullptr) {
std::cerr << "Data source out exit on timeout " << std::endl;
}
auto duration_streamout = std::chrono::duration_cast<std::chrono::milliseconds>(streamout_finish - streamout_start);
@@ -242,13 +242,14 @@ int main(int argc, char* argv[]) {
std::cout << " Processed " << nfiles << " file(s)" << std::endl;
std::cout << " Successfully: " << nfiles - nerrors << std::endl;
std::cout << " Errors : " << nerrors << std::endl;
- std::cout << " Elapsed : " << duration_ms - args.timeout_ms << "ms" << std::endl;
- std::cout << " Rate : " << 1000.0f * nfiles / (duration_ms - args.timeout_ms) << std::endl;
+ std::cout << " Elapsed : " << duration_ms - static_cast<unsigned long long int>(args.timeout_ms) << "ms" << std::endl;
+ std::cout << " Rate : " << 1000.0f * static_cast<float>(nfiles) / (static_cast<float>(duration_ms
+ - static_cast<unsigned long long int>(args.timeout_ms))) << std::endl;
std::cout << "Data source out " << std::endl;
std::cout << " Sent " << files_sent << " file(s)" << std::endl;
std::cout << " Elapsed : " << duration_streamout.count() << "ms" << std::endl;
- std::cout << " Rate : " << 1000.0f * files_sent / (duration_streamout.count()) << std::endl;
+ std::cout << " Rate : " << 1000.0f * static_cast<float>(files_sent / duration_streamout.count()) << std::endl;
std::this_thread::sleep_for(std::chrono::milliseconds(1000));
diff --git a/examples/producer/dummy-data-producer/dummy_data_producer.cpp b/examples/producer/dummy-data-producer/dummy_data_producer.cpp
index d0626ac4910598d259ee6c48c76ffecf57ddeb52..8efc8b9c686e6c6cf1bd40e6acf937e1cd388e97 100644
--- a/examples/producer/dummy-data-producer/dummy_data_producer.cpp
+++ b/examples/producer/dummy-data-producer/dummy_data_producer.cpp
@@ -13,7 +13,7 @@
using std::chrono::system_clock;
std::mutex mutex;
-int iterations_remained;
+uint64_t iterations_remained;
struct Args {
std::string discovery_service_endpoint;
@@ -22,7 +22,7 @@ struct Args {
std::string token;
size_t number_of_bytes;
uint64_t iterations;
- uint64_t nthreads;
+ uint8_t nthreads;
uint64_t mode;
uint64_t timeout_ms;
uint64_t messages_in_set;
@@ -83,7 +83,7 @@ void ProcessCommandArguments(int argc, char* argv[], Args* args) {
TryGetDataSourceAndToken(args);
args->number_of_bytes = std::stoull(argv[3]) * 1000;
args->iterations = std::stoull(argv[4]);
- args->nthreads = std::stoull(argv[5]);
+ args->nthreads = static_cast<uint8_t>(std::stoi(argv[5]));
args->mode = std::stoull(argv[6]);
args->timeout_ms = std::stoull(argv[7]) * 1000;
if (argc == 9) {
@@ -100,7 +100,7 @@ void ProcessCommandArguments(int argc, char* argv[], Args* args) {
}
}
-void ProcessAfterSend(asapo::RequestCallbackPayload payload, asapo::Error err) {
+void ProcessAfterSend(asapo::RequestCallbackPayload, asapo::Error err) {
mutex.lock();
iterations_remained--;
if (err) {
@@ -111,7 +111,7 @@ void ProcessAfterSend(asapo::RequestCallbackPayload payload, asapo::Error err) {
mutex.unlock();
}
-void ProcessAfterMetaDataSend(asapo::RequestCallbackPayload payload, asapo::Error err) {
+void ProcessAfterMetaDataSend(asapo::RequestCallbackPayload, asapo::Error err) {
mutex.lock();
iterations_remained--;
if (err) {
@@ -133,7 +133,8 @@ bool SendDummyData(asapo::Producer* producer, size_t number_of_byte, uint64_t it
asapo::Error err;
if (iterations == 0) {
- err = producer->SendMetadata("{\"dummy_meta\":\"test\"}", &ProcessAfterMetaDataSend);
+ auto mode = asapo::MetaIngestMode{asapo::MetaIngestOp::kReplace, true};
+ err = producer->SendBeamtimeMetadata("{\"dummy_meta\":\"test\"}", mode, &ProcessAfterMetaDataSend);
if (err) {
std::cerr << "Cannot send metadata: " << err << std::endl;
return false;
@@ -210,9 +211,10 @@ std::unique_ptr<asapo::Producer> CreateProducer(const Args& args) {
void PrintOutput(const Args& args, const system_clock::time_point& start) {
system_clock::time_point t2 = system_clock::now();
- double duration_sec = std::chrono::duration_cast<std::chrono::milliseconds>( t2 - start ).count() / 1000.0;
- double size_gb = double(args.number_of_bytes) * args.iterations / 1000.0 / 1000.0 / 1000.0 * 8.0;
- double rate = args.iterations / duration_sec;
+ double duration_sec = static_cast<double>(std::chrono::duration_cast<std::chrono::milliseconds>(t2 - start).count())
+ / 1000.0;
+ double size_gb = static_cast<double>(args.number_of_bytes * args.iterations) / 1000.0 / 1000.0 / 1000.0 * 8.0;
+ double rate = static_cast<double>(args.iterations) / duration_sec;
std::cout << "Rate: " << rate << " Hz" << std::endl;
std::cout << "Bandwidth " << size_gb / duration_sec << " Gbit/s" << std::endl;
std::cout << "Bandwidth " << size_gb / duration_sec / 8 << " GBytes/s" << std::endl;
diff --git a/examples/producer/simple-producer/CMakeLists.txt b/examples/producer/simple-producer/CMakeLists.txt
deleted file mode 100644
index 9a5e097aec62e79ed1dc7b9d19b38a3342d3bc3e..0000000000000000000000000000000000000000
--- a/examples/producer/simple-producer/CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-cmake_minimum_required(VERSION 2.8)
-
-project(asapo-produce)
-
-set(CMAKE_CXX_STANDARD 11)
-
-IF(CMAKE_C_COMPILER_ID STREQUAL "GNU")
- SET( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libgcc -static-libstdc++")
-ENDIF()
-
-find_package (Threads)
-
-set(TARGET_NAME ${CMAKE_PROJECT_NAME})
-
-set(SOURCE_FILES produce.cpp)
-
-link_directories(asapo/lib)
-
-add_executable(${TARGET_NAME} ${SOURCE_FILES})
-target_include_directories(${TARGET_NAME} PUBLIC asapo/include)
-target_link_libraries(${TARGET_NAME} asapo-producer curl ${CMAKE_THREAD_LIBS_INIT})
diff --git a/examples/producer/simple-producer/produce.cpp b/examples/producer/simple-producer/produce.cpp
deleted file mode 100644
index e0fd685037d3d0bc008fd5389428e12ba0367a28..0000000000000000000000000000000000000000
--- a/examples/producer/simple-producer/produce.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-#include "asapo_producer.h"
-
-void ProcessAfterSend(asapo::GenericRequestHeader header, asapo::Error err) {
- if (err) {
- std::cerr << "error/warnign during send: " << err << std::endl;
- return;
- } else {
- std::cout << "successfuly send " << header.Json() << std::endl;
- return;
- }
-}
-
-
-void exit_if_error(std::string error_string, const asapo::Error& err) {
- if (err) {
- std::cerr << error_string << err << std::endl;
- exit(EXIT_FAILURE);
- }
-}
-
-
-int main(int argc, char* argv[]) {
- asapo::Error err;
-
- auto source = "asapo-services2:8400";
- auto beamtime = "asapo_test";
-
- auto producer = asapo::Producer::Create(source, 1, asapo::RequestHandlerType::kTcp,
- asapo::SourceCredentials{beamtime, "", "", ""}, 60000, &err);
- exit_if_error("Cannot start producer", err);
-
- std::string to_send = "hello";
- auto send_size = to_send.size() + 1;
- auto buffer = asapo::MessageData(new uint8_t[send_size]);
- memcpy(buffer.get(), to_send.c_str(), send_size);
-
- asapo::EventHeader message_header{1, send_size, "processed" + asapo::kPathseparator + "test_file"};
- err = producer->Send(message_header, std::move(buffer), asapo::kDefaultIngestMode, &ProcessAfterSend);
- exit_if_error("Cannot send file", err);
-
- err = producer->WaitRequestsFinished(1000);
- exit_if_error("Producer exit on timeout", err);
-
- return EXIT_SUCCESS;
-}
-
diff --git a/install/CMakeLists.txt b/install/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..882bc9eee11a8003e33df5152ca1fc0995a074d7
--- /dev/null
+++ b/install/CMakeLists.txt
@@ -0,0 +1,19 @@
+include(CMakePackageConfigHelpers)
+write_basic_package_version_file(
+ "${CMAKE_CURRENT_BINARY_DIR}/asapo/AsapoConfigVersion.cmake"
+ VERSION ${ASAPO_VERSION}
+ COMPATIBILITY AnyNewerVersion
+)
+
+configure_file(cmake/AsapoConfig.cmake
+ "${CMAKE_CURRENT_BINARY_DIR}/asapo/AsapoConfig.cmake"
+ COPYONLY
+ )
+
+install(
+ FILES
+ cmake/AsapoConfig.cmake
+ "${CMAKE_CURRENT_BINARY_DIR}/asapo/AsapoConfigVersion.cmake"
+ DESTINATION
+ ${ConfigPackageLocation}
+)
diff --git a/install/cmake/AsapoConfig.cmake b/install/cmake/AsapoConfig.cmake
new file mode 100644
index 0000000000000000000000000000000000000000..420bd223177a43a9038f52e6923445203b194c99
--- /dev/null
+++ b/install/cmake/AsapoConfig.cmake
@@ -0,0 +1,120 @@
+include(CMakeFindDependencyMacro)
+
+if(NOT WIN32)
+ if (NOT DEFINED ASAPO_USE_SHIPPED_CURL)
+ set(ASAPO_USE_SHIPPED_CURL OFF CACHE BOOL "use shipped static curl library")
+ endif()
+ if (ASAPO_USE_SHIPPED_CURL AND NOT DEFINED CURL_LIBRARY)
+ # Compute the installation prefix relative to this file.
+ get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
+ get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+ get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+ get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+ if(_IMPORT_PREFIX STREQUAL "/")
+ set(_IMPORT_PREFIX "")
+ endif()
+ set (CURL_LIBRARY ${_IMPORT_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}asapo-curl${CMAKE_STATIC_LIBRARY_SUFFIX})
+ endif()
+endif(NOT WIN32)
+
+find_dependency(CURL REQUIRED)
+if(CURL_FOUND) #old FindCURL versions do not create CURL::libcurl target, so we do it here if CURL::libcurl is missing
+ if(NOT TARGET CURL::libcurl)
+ add_library(CURL::libcurl UNKNOWN IMPORTED)
+ set_target_properties(CURL::libcurl PROPERTIES
+ INTERFACE_INCLUDE_DIRECTORIES "${CURL_INCLUDE_DIRS}")
+ set_target_properties(CURL::libcurl PROPERTIES
+ IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+ IMPORTED_LOCATION "${CURL_LIBRARIES}")
+ endif()
+endif()
+
+
+find_dependency(Threads REQUIRED)
+
+set(_supported_components Consumer Producer)
+
+set(_supported_versions static shared)
+set(static NO)
+set(shared NO)
+foreach(_comp ${Asapo_FIND_COMPONENTS})
+ if (_comp IN_LIST _supported_versions)
+ set(${_comp} YES)
+ endif ()
+endforeach ()
+
+list(REMOVE_ITEM Asapo_FIND_COMPONENTS ${_supported_versions})
+
+if (static AND shared)
+ set(Asapo_NOT_FOUND_MESSAGE "Asapo `static` and `shared` components are mutually exclusive.")
+ set(Asapo_FOUND FALSE)
+ return()
+endif ()
+
+if (NOT DEFINED ASAPO_STATIC_CXX_LIBS)
+ set(ASAPO_STATIC_CXX_LIBS OFF CACHE BOOL "link with static gcc and stdc++")
+endif()
+
+
+macro(asapo_load_targets type comp)
+ if (NOT EXISTS "${CMAKE_CURRENT_LIST_DIR}/Asapo${comp}${type}Target.cmake")
+ set(Asapo_NOT_FOUND_MESSAGE
+ "Asapo `${comp}/${type}` libraries were requested but not found.")
+ set(Asapo_FOUND FALSE)
+ return()
+ endif ()
+ include("${CMAKE_CURRENT_LIST_DIR}/Asapo${_comp}${type}Target.cmake")
+ string(TOLOWER ${_comp} comp_low)
+ string(TOLOWER ${type} type_low)
+ message(STATUS "Added imported::asapo-${comp_low} target (${type_low})")
+ if (${type} STREQUAL "Static" AND DEFINED ASAPO_STATIC_CXX_LIBS AND ASAPO_STATIC_CXX_LIBS AND CMAKE_COMPILER_IS_GNUCXX)
+ if(${CMAKE_VERSION} VERSION_LESS "3.13.0")
+ message(FATAL_ERROR "Need at least CMake 3.13 to add target link options for static gcc libs, use SET(CMAKE_EXE_LINKER_FLAGS \"\${CMAKE_EXE_LINKER_FLAGS} -static-libgcc -static-libstdc++\") instead ")
+ else()
+ message(STATUS "Added linker options -static-libgcc -static-libstdc++ to imported::asapo-${comp_low}")
+ target_link_options(imported::asapo-${comp_low} INTERFACE -static-libgcc -static-libstdc++)
+ endif()
+
+ endif()
+
+endmacro()
+
+macro(asapo_load_comp_targets comp static shared)
+ if (static)
+ asapo_load_targets(Static ${comp})
+ elseif (shared)
+ asapo_load_targets(Shared ${comp})
+ elseif (DEFINED ASAPO_SHARED_LIBS AND ASAPO_SHARED_LIBS)
+ asapo_load_targets(Shared ${comp})
+ elseif (DEFINED ASAPO_SHARED_LIBS AND NOT ASAPO_SHARED_LIBS)
+ asapo_load_targets(Static ${comp})
+ elseif (BUILD_SHARED_LIBS)
+ if (EXISTS "${CMAKE_CURRENT_LIST_DIR}/Asapo${comp}SharedTarget.cmake")
+ asapo_load_targets(Shared ${comp})
+ else ()
+ asapo_load_targets(Static ${comp})
+ endif ()
+ else ()
+ if (EXISTS "${CMAKE_CURRENT_LIST_DIR}/Asapo${comp}StaticTarget.cmake")
+ asapo_load_targets(Static ${comp})
+ else ()
+ asapo_load_targets(Shared ${comp})
+ endif ()
+ endif ()
+endmacro()
+
+
+if( "S${Asapo_FIND_COMPONENTS}" STREQUAL "S")
+ foreach(_comp ${_supported_components})
+ asapo_load_comp_targets(${_comp} ${static} ${shared})
+ endforeach()
+else()
+ foreach(_comp ${Asapo_FIND_COMPONENTS})
+ if (NOT _comp IN_LIST _supported_components)
+ set(Asapo_FOUND False)
+ set(Asapo_NOT_FOUND_MESSAGE "Unsupported component: ${_comp}")
+ endif()
+ asapo_load_comp_targets(${_comp} ${static} ${shared})
+ endforeach()
+endif()
+
diff --git a/producer/api/cpp/CMakeLists.txt b/producer/api/cpp/CMakeLists.txt
index a607b6d31f33ba1d1c2b17e5dca4680fb95b7789..75c8f7d162ba8dfda1a4e1a55a76fc961ea457fd 100644
--- a/producer/api/cpp/CMakeLists.txt
+++ b/producer/api/cpp/CMakeLists.txt
@@ -11,13 +11,74 @@ set(SOURCE_FILES
src/producer_c_glue.cpp)
+string(REPLACE "v" "" PRODUCER_CLIENT_VER ${ASAPO_PRODUCER_PROTOCOL})
+
+
################################
# Library
################################
-add_library(${TARGET_NAME} STATIC ${SOURCE_FILES} $<TARGET_OBJECTS:system_io> $<TARGET_OBJECTS:logger> $<TARGET_OBJECTS:json_parser>
- $<TARGET_OBJECTS:curl_http_client> $<TARGET_OBJECTS:request_pool> $<TARGET_OBJECTS:data_structs> $<TARGET_OBJECTS:version>)
-target_include_directories(${TARGET_NAME} PUBLIC ../c/include include ${ASAPO_CXX_COMMON_INCLUDE_DIR})
-target_link_libraries(${TARGET_NAME} ${CURL_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
+add_library(producer_lib_objects OBJECT ${SOURCE_FILES})
+target_include_directories(producer_lib_objects PRIVATE ../c/include include ${ASAPO_CXX_COMMON_INCLUDE_DIR} )
+target_include_directories(producer_lib_objects SYSTEM PRIVATE ${LIBFABRIC_INCLUDE_DIR})
+
+if (BUILD_STATIC_CLIENT_LIBS)
+ add_library(${TARGET_NAME} STATIC $<TARGET_OBJECTS:producer_lib_objects> $<TARGET_OBJECTS:system_io> $<TARGET_OBJECTS:logger> $<TARGET_OBJECTS:json_parser>
+ $<TARGET_OBJECTS:curl_http_client> $<TARGET_OBJECTS:request_pool> $<TARGET_OBJECTS:data_structs> $<TARGET_OBJECTS:version> $<TARGET_OBJECTS:common>)
+ target_include_directories(${TARGET_NAME} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>)
+ target_include_directories(${TARGET_NAME} PUBLIC $<BUILD_INTERFACE:${ASAPO_CXX_COMMON_INCLUDE_DIR}>)
+ target_include_directories(${TARGET_NAME} INTERFACE $<INSTALL_INTERFACE:include>)
+ target_link_libraries(${TARGET_NAME} CURL::libcurl ${CMAKE_THREAD_LIBS_INIT})
+ #install
+ install(TARGETS ${TARGET_NAME} EXPORT AsapoProducerStaticTarget
+ LIBRARY DESTINATION lib
+ ARCHIVE DESTINATION lib
+ INCLUDES DESTINATION include
+ )
+
+ export(EXPORT AsapoProducerStaticTarget
+ FILE "${CMAKE_CURRENT_BINARY_DIR}/asapo/AsapoProducerStaticTarget.cmake"
+ NAMESPACE imported::
+ )
+ install(EXPORT AsapoProducerStaticTarget
+ FILE AsapoProducerStaticTarget.cmake
+ NAMESPACE imported::
+ DESTINATION ${ConfigPackageLocation}
+ )
+endif()
+
+if (BUILD_SHARED_CLIENT_LIBS)
+ add_library(${TARGET_NAME}_shared SHARED $<TARGET_OBJECTS:producer_lib_objects> $<TARGET_OBJECTS:system_io> $<TARGET_OBJECTS:logger> $<TARGET_OBJECTS:json_parser>
+ $<TARGET_OBJECTS:curl_http_client> $<TARGET_OBJECTS:request_pool> $<TARGET_OBJECTS:data_structs> $<TARGET_OBJECTS:version> $<TARGET_OBJECTS:common>)
+ target_include_directories(${TARGET_NAME}_shared PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include ${ASAPO_CXX_COMMON_INCLUDE_DIR})
+
+ target_link_libraries(${TARGET_NAME}_shared CURL::libcurl ${CMAKE_THREAD_LIBS_INIT})
+ IF(NOT WIN32)
+ set_target_properties(${TARGET_NAME}_shared PROPERTIES OUTPUT_NAME ${TARGET_NAME})
+ set_target_properties(${TARGET_NAME}_shared PROPERTIES VERSION ${PRODUCER_CLIENT_VER}
+ SOVERSION ${PRODUCER_CLIENT_VER})
+ set_target_properties(${TARGET_NAME}_shared PROPERTIES EXPORT_NAME ${TARGET_NAME})
+ ENDIF()
+ target_include_directories(${TARGET_NAME}_shared INTERFACE $<INSTALL_INTERFACE:include>)
+
+ install(TARGETS ${TARGET_NAME}_shared EXPORT AsapoProducerSharedTarget
+ LIBRARY DESTINATION lib
+ ARCHIVE DESTINATION lib
+ INCLUDES DESTINATION include
+ )
+ export(EXPORT AsapoProducerSharedTarget
+ FILE "${CMAKE_CURRENT_BINARY_DIR}/asapo/AsapoProducerSharedTarget.cmake"
+ NAMESPACE imported::
+ )
+ install(EXPORT AsapoProducerSharedTarget
+ FILE
+ AsapoProducerSharedTarget.cmake
+ NAMESPACE imported::
+ DESTINATION ${ConfigPackageLocation}
+ )
+endif()
+
+install(DIRECTORY include/ DESTINATION include)
+
################################
# Testing
@@ -36,7 +97,3 @@ set(TEST_LIBRARIES "${TARGET_NAME}")
gtest(${TARGET_NAME} "${TEST_SOURCE_FILES}" "${TEST_LIBRARIES}")
-
-install(TARGETS ${TARGET_NAME} DESTINATION lib)
-
-install(DIRECTORY include/ DESTINATION include)
diff --git a/producer/api/cpp/include/asapo/producer/producer.h b/producer/api/cpp/include/asapo/producer/producer.h
index 9d09d71f8ee4093f503052a0a57df5332ff9ee33..f77aae08db7c90be4c523a48128a01670e8269af 100644
--- a/producer/api/cpp/include/asapo/producer/producer.h
+++ b/producer/api/cpp/include/asapo/producer/producer.h
@@ -134,6 +134,7 @@ class Producer {
//! Sends beamtime metadata to the receiver
/*!
\param metadata - a JSON string with metadata
+ \param MetaIngestMode - a JSON string with metadata
\param callback - callback function
\return Error - will be nullptr on success
*/
diff --git a/producer/api/cpp/include/asapo/producer/producer_error.h b/producer/api/cpp/include/asapo/producer/producer_error.h
index 83460b5e4c804a60d0cd163422598a8178f80eba..7b6bc174d88293c1b553a8206cf2098a9c4027f2 100644
--- a/producer/api/cpp/include/asapo/producer/producer_error.h
+++ b/producer/api/cpp/include/asapo/producer/producer_error.h
@@ -59,11 +59,8 @@ auto const kUnsupportedClient = ProducerErrorTemplate {
"cannot connect to asapo", ProducerErrorType::kUnsupportedClient
};
+}
-
-
-
-};
}
#endif //ASAPO_PRODUCER_ERROR_H
diff --git a/producer/api/cpp/src/producer_impl.cpp b/producer/api/cpp/src/producer_impl.cpp
index 26ed89d549a99c83b6da4f8e254603982da299f0..2c99c0147899f8770beeff094910b444e332039c 100644
--- a/producer/api/cpp/src/producer_impl.cpp
+++ b/producer/api/cpp/src/producer_impl.cpp
@@ -313,7 +313,7 @@ Error ProducerImpl::Send__(const MessageHeader& message_header,
uint64_t ProducerImpl::GetRequestsQueueSize() {
return request_pool__->NRequestsInPool();
-};
+}
Error ProducerImpl::WaitRequestsFinished(uint64_t timeout_ms) {
if (request_pool__->WaitRequestsFinished(timeout_ms) != nullptr) {
diff --git a/producer/api/cpp/src/receiver_discovery_service.cpp b/producer/api/cpp/src/receiver_discovery_service.cpp
index 63db2b9828ca4c59c4ac2c5a7f23418f017dee70..e36d038a69fa3b51e04234a8cec25a3029561a8b 100644
--- a/producer/api/cpp/src/receiver_discovery_service.cpp
+++ b/producer/api/cpp/src/receiver_discovery_service.cpp
@@ -103,7 +103,7 @@ ReceiversList ReceiverDiscoveryService::RotatedUriList(uint64_t nthread) {
}
ReceiversList list{uri_list_};
lock.unlock();
- auto shift = (int) nthread % size;
+ auto shift = static_cast<unsigned int>(nthread % size);
std::rotate(list.begin(), list.begin() + shift, list.end());
return list;
}
diff --git a/producer/api/cpp/src/receiver_discovery_service.h b/producer/api/cpp/src/receiver_discovery_service.h
index 2b42a862445a4963f6792f3fdd3d4e7d49168838..a2949ec1b638905ed61f81a14a6daaa316b584c2 100644
--- a/producer/api/cpp/src/receiver_discovery_service.h
+++ b/producer/api/cpp/src/receiver_discovery_service.h
@@ -20,7 +20,7 @@ class ReceiverDiscoveryService {
public:
explicit ReceiverDiscoveryService(std::string endpoint, uint64_t update_frequency_ms);
VIRTUAL void StartCollectingData();
- ~ReceiverDiscoveryService();
+ VIRTUAL ~ReceiverDiscoveryService();
VIRTUAL uint64_t MaxConnections();
VIRTUAL ReceiversList RotatedUriList(uint64_t nthread);
VIRTUAL uint64_t UpdateFrequency();
diff --git a/producer/api/cpp/src/request_handler_filesystem.cpp b/producer/api/cpp/src/request_handler_filesystem.cpp
index 6f509f9bb6c2e64cd8bad32f755d8cd20222786c..74b129ef7b7f72de8e703ba7b3785df1e5a9ad04 100644
--- a/producer/api/cpp/src/request_handler_filesystem.cpp
+++ b/producer/api/cpp/src/request_handler_filesystem.cpp
@@ -11,9 +11,8 @@
namespace asapo {
-RequestHandlerFilesystem::RequestHandlerFilesystem(std::string destination_folder, uint64_t thread_id):
- io__{GenerateDefaultIO()}, log__{GetDefaultProducerLogger()}, destination_folder_{std::move(destination_folder)},
- thread_id_{thread_id} {
+RequestHandlerFilesystem::RequestHandlerFilesystem(std::string destination_folder, uint64_t ):
+ io__{GenerateDefaultIO()}, log__{GetDefaultProducerLogger()}, destination_folder_{std::move(destination_folder)} {
}
bool RequestHandlerFilesystem::ProcessRequestUnlocked(GenericRequest* request, bool* retry) {
diff --git a/producer/api/cpp/src/request_handler_filesystem.h b/producer/api/cpp/src/request_handler_filesystem.h
index 15dc03e563bb6ca0cc0bb6374bbf5ad0205e9d64..788b9b52c1995780713a5dc61788747dd8a52873 100644
--- a/producer/api/cpp/src/request_handler_filesystem.h
+++ b/producer/api/cpp/src/request_handler_filesystem.h
@@ -22,7 +22,7 @@ class RequestHandlerFilesystem: public RequestHandler {
return true;
};
void PrepareProcessingRequestLocked() override {};
- void TearDownProcessingRequestLocked(bool request_processed_successfully) override {};
+ void TearDownProcessingRequestLocked(bool ) override {};
void ProcessRequestTimeoutUnlocked(GenericRequest* request) override;
virtual ~RequestHandlerFilesystem() = default;
@@ -30,7 +30,6 @@ class RequestHandlerFilesystem: public RequestHandler {
const AbstractLogger* log__;
private:
std::string destination_folder_;
- uint64_t thread_id_;
};
}
diff --git a/producer/api/cpp/src/request_handler_tcp.cpp b/producer/api/cpp/src/request_handler_tcp.cpp
index 824930f4a2f1350ad2411c4fe902ca93ff25c299..a2f2409e1721b39d82ca9fdfdf6fe1f2dc539071 100644
--- a/producer/api/cpp/src/request_handler_tcp.cpp
+++ b/producer/api/cpp/src/request_handler_tcp.cpp
@@ -28,7 +28,7 @@ Error RequestHandlerTcp::Authorize(const std::string& source_credentials) {
return err;
}
- return ReceiveResponse(header, nullptr);
+ return ReceiveResponse(nullptr);
}
Error RequestHandlerTcp::ConnectToReceiver(const std::string& source_credentials, const std::string& receiver_address) {
@@ -82,7 +82,7 @@ Error RequestHandlerTcp::SendRequestContent(const ProducerRequest* request) {
return nullptr;
}
-Error RequestHandlerTcp::ReceiveResponse(const GenericRequestHeader& request_header, std::string* response) {
+Error RequestHandlerTcp::ReceiveResponse(std::string* response) {
Error err;
SendResponse sendDataResponse;
io__->Receive(sd_, &sendDataResponse, sizeof(sendDataResponse), &err);
@@ -133,7 +133,7 @@ Error RequestHandlerTcp::TrySendToReceiver(const ProducerRequest* request, std::
return err;
}
- err = ReceiveResponse(request->header, response);
+ err = ReceiveResponse(response);
if (err == nullptr || err == ProducerErrorTemplates::kServerWarning) {
log__->Debug("successfully sent data, opcode: " + std::to_string(request->header.op_code) +
", id: " + std::to_string(request->header.data_id) + " to " + connected_receiver_uri_);
@@ -164,8 +164,8 @@ bool RequestHandlerTcp::UpdateReceiversList() {
}
bool RequestHandlerTcp::TimeToUpdateReceiverList() {
- uint64_t elapsed_ms = std::chrono::duration_cast<std::chrono::milliseconds>(system_clock::now() -
- last_receivers_uri_update_).count();
+ uint64_t elapsed_ms = static_cast<uint64_t>(std::chrono::duration_cast<std::chrono::milliseconds>(system_clock::now() -
+ last_receivers_uri_update_).count());
return elapsed_ms > discovery_service__->UpdateFrequency();
}
@@ -274,7 +274,7 @@ bool RequestHandlerTcp::ProcessRequestUnlocked(GenericRequest* request, bool* re
auto err = producer_request->UpdateDataSizeFromFileIfNeeded(io__.get());
if (err) {
if (producer_request->callback) {
- producer_request->callback(RequestCallbackPayload{producer_request->header}, std::move(err));
+ producer_request->callback(RequestCallbackPayload{producer_request->header, nullptr, ""}, std::move(err));
}
*retry = false;
return false;
diff --git a/producer/api/cpp/src/request_handler_tcp.h b/producer/api/cpp/src/request_handler_tcp.h
index 7b8e6187480bf0e0452a1affbc719fb9839db2ea..4ef345f7d30073668ebefc8db0d1196d3be4d12c 100644
--- a/producer/api/cpp/src/request_handler_tcp.h
+++ b/producer/api/cpp/src/request_handler_tcp.h
@@ -34,7 +34,7 @@ class RequestHandlerTcp: public RequestHandler {
Error ConnectToReceiver(const std::string& source_credentials, const std::string& receiver_address);
bool SendToOneOfTheReceivers(ProducerRequest* request, bool* retry);
Error SendRequestContent(const ProducerRequest* request);
- Error ReceiveResponse(const GenericRequestHeader& request_header, std::string* response);
+ Error ReceiveResponse(std::string* response);
Error TrySendToReceiver(const ProducerRequest* request, std::string* response);
SocketDescriptor sd_{kDisconnectedSocketDescriptor};
void UpdateIfNewConnection();
diff --git a/producer/api/cpp/unittests/test_producer_impl.cpp b/producer/api/cpp/unittests/test_producer_impl.cpp
index 667f3723a93914d6de35647ada6caf180c7df49d..3ba5836b150644a76bf5c3f77ed02be868eb56e9 100644
--- a/producer/api/cpp/unittests/test_producer_impl.cpp
+++ b/producer/api/cpp/unittests/test_producer_impl.cpp
@@ -505,7 +505,7 @@ TEST_F(ProducerImplTests, GetQueueVolume) {
MATCHER_P(M_CheckLimits, limits, "Checks if a valid limits were used") {
return arg.max_requests == limits.max_requests && arg.max_memory_mb == limits.max_memory_mb;
-};
+}
TEST_F(ProducerImplTests, SetLimits) {
EXPECT_CALL(mock_pull, SetLimits(M_CheckLimits(asapo::RequestPoolLimits{10, 20})));
@@ -622,7 +622,7 @@ MATCHER_P4(M_CheckDeleteStreamRequest, op_code, source_credentials, stream, flag
auto request = static_cast<ProducerRequest*>(arg);
return ((asapo::GenericRequestHeader) (arg->header)).op_code == op_code
&& request->source_credentials == source_credentials
- && ((asapo::GenericRequestHeader) (arg->header)).custom_data[0] == flag
+ && ((asapo::GenericRequestHeader) (arg->header)).custom_data[0] == static_cast<uint64_t>(flag)
&& strcmp(((asapo::GenericRequestHeader) (arg->header)).stream, stream) == 0;
}
diff --git a/producer/api/cpp/unittests/test_request_handler_tcp.cpp b/producer/api/cpp/unittests/test_request_handler_tcp.cpp
index faa60f74a2e044fd064c3f5bdd147fd792ed97d4..30eb79579dcf7e31f925ad2473a7397269374fb7 100644
--- a/producer/api/cpp/unittests/test_request_handler_tcp.cpp
+++ b/producer/api/cpp/unittests/test_request_handler_tcp.cpp
@@ -75,7 +75,7 @@ class RequestHandlerTcpTests : public testing::Test {
uint8_t expected_callback_data = 2;
asapo::MessageData expected_data{[this]() {
auto a = new uint8_t[expected_file_size];
- for (auto i = 0; i < expected_file_size; i++) {
+ for (uint64_t i = 0; i < expected_file_size; i++) {
a[i] = expected_callback_data;
}
return a;
@@ -236,7 +236,7 @@ void RequestHandlerTcpTests::ExpectFailAuthorize(asapo::NetworkErrorCode error_c
void RequestHandlerTcpTests::ExpectOKAuthorize(bool only_once) {
- int i = 0;
+ size_t i = 0;
for (auto expected_sd : expected_sds) {
EXPECT_CALL(mock_io,
Send_t(expected_sd, M_CheckSendRequest(asapo::kOpcodeAuthorize, 0, 0, "",
@@ -277,7 +277,7 @@ void RequestHandlerTcpTests::ExpectOKAuthorize(bool only_once) {
}
void RequestHandlerTcpTests::ExpectFailSendHeader(bool only_once) {
- int i = 0;
+ size_t i = 0;
for (auto expected_sd : expected_sds) {
EXPECT_CALL(mock_io, Send_t(expected_sd, M_CheckSendRequest(expected_op_code,
expected_file_id,
@@ -313,7 +313,7 @@ void RequestHandlerTcpTests::ExpectFailSendHeader(bool only_once) {
}
void RequestHandlerTcpTests::ExpectFailSendFile(const asapo::ProducerErrorTemplate& err_template, bool client_error) {
- int i = 0;
+ size_t i = 0;
for (auto expected_sd : expected_sds) {
EXPECT_CALL(mock_io, SendFile_t(expected_sd, expected_origin_fullpath, (size_t) expected_file_size))
.Times(1)
@@ -346,7 +346,7 @@ void RequestHandlerTcpTests::ExpectFailSendFile(const asapo::ProducerErrorTempla
}
void RequestHandlerTcpTests::ExpectFailSend(uint64_t expected_size, bool only_once) {
- int i = 0;
+ size_t i = 0;
for (auto expected_sd : expected_sds) {
EXPECT_CALL(mock_io, Send_t(expected_sd, _, (size_t) expected_size, _))
.Times(1)
@@ -385,7 +385,7 @@ void RequestHandlerTcpTests::ExpectFailSendMetaData(bool only_once) {
}
void RequestHandlerTcpTests::ExpectFailReceive(bool only_once) {
- int i = 0;
+ size_t i = 0;
for (auto expected_sd : expected_sds) {
EXPECT_CALL(mock_io, Receive_t(expected_sd, _, sizeof(asapo::SendResponse), _))
.InSequence(seq_receive[i])
@@ -468,7 +468,7 @@ void RequestHandlerTcpTests::ExpectOKSendHeader(bool only_once, asapo::Opcode op
}
void RequestHandlerTcpTests::ExpectOKConnect(bool only_once) {
- int i = 0;
+ size_t i = 0;
for (auto expected_address : receivers_list) {
EXPECT_CALL(mock_io, CreateAndConnectIPTCPSocket_t(expected_address, _))
.WillOnce(
@@ -489,7 +489,7 @@ void RequestHandlerTcpTests::ExpectOKConnect(bool only_once) {
}
void RequestHandlerTcpTests::ExpectOKReceive(bool only_once, asapo::NetworkErrorCode code, std::string message) {
- int i = 0;
+ size_t i = 0;
for (auto expected_sd : expected_sds) {
EXPECT_CALL(mock_io, Receive_t(expected_sd, _, sizeof(asapo::SendResponse), _))
.InSequence(seq_receive[i])
@@ -902,7 +902,7 @@ TEST_F(RequestHandlerTcpTests, SendOK) {
ASSERT_THAT(callback_header.op_code, Eq(header.op_code));
ASSERT_THAT(callback_header.data_id, Eq(header.data_id));
ASSERT_THAT(callback_data, Ne(nullptr));
- for (auto i = 0; i < expected_file_size; i++) {
+ for (uint64_t i = 0; i < expected_file_size; i++) {
ASSERT_THAT(callback_data[i], Eq(expected_callback_data));
}
diff --git a/producer/api/python/CMakeLists_Linux.cmake b/producer/api/python/CMakeLists_Linux.cmake
index de40245e9da800c6b40124f03d59d855ec7650b0..6684c0e4661da635d859c931a7320c148dc0458d 100644
--- a/producer/api/python/CMakeLists_Linux.cmake
+++ b/producer/api/python/CMakeLists_Linux.cmake
@@ -1,8 +1,8 @@
if ((CMAKE_BUILD_TYPE STREQUAL "Debug") AND (CMAKE_C_COMPILER_ID STREQUAL "GNU"))
- set (EXTRA_COMPILE_ARGS "['--std=c++11']")
+ set (EXTRA_COMPILE_ARGS "['--std=c++11','-Wno-maybe-uninitialized']")
set (EXTRA_LINK_ARGS "['--coverage','-fprofile-arcs','-ftest-coverage','-static-libgcc','-static-libstdc++']")
ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "GNU")
- set (EXTRA_COMPILE_ARGS "['--std=c++11']")
+ set (EXTRA_COMPILE_ARGS "['--std=c++11','-Wno-maybe-uninitialized']")
set (EXTRA_LINK_ARGS "['-static-libgcc','-static-libstdc++','-Wl,--exclude-libs,ALL']")
else()
set (EXTRA_COMPILE_ARGS "['-std=c++11']")
@@ -15,7 +15,7 @@ configure_files(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} @ONLY)
file(GENERATE OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/setup.py INPUT ${CMAKE_CURRENT_BINARY_DIR}/setup.py)
ADD_CUSTOM_TARGET(python-lib-producer ALL
- COMMAND ${Python_EXECUTABLE} setup.py build_ext --inplace --force)
+ COMMAND ${Python_EXECUTABLE} setup.py --quiet build_ext --inplace --force)
ADD_DEPENDENCIES(python-lib-producer asapo-producer)
diff --git a/producer/api/python/asapo_producer.pyx.in b/producer/api/python/asapo_producer.pyx.in
index d0101a01b7e853d53350f2413296230c7fe6cff7..0f236b9888173fd6a06c1b29258f554ebb043fd0 100644
--- a/producer/api/python/asapo_producer.pyx.in
+++ b/producer/api/python/asapo_producer.pyx.in
@@ -1,5 +1,5 @@
#distutils: language=c++
-
+#cython: language_level=2
cimport asapo_producer
import numpy as np
diff --git a/producer/api/python/setup.py.in b/producer/api/python/setup.py.in
index 75da93f36dc9089f197759b1a042245b2b8eb4c6..00b03adb041f4b9ef219b17d4b5310b133ca3da9 100644
--- a/producer/api/python/setup.py.in
+++ b/producer/api/python/setup.py.in
@@ -8,15 +8,13 @@ import numpy
module = Extension("asapo_producer", ["asapo_producer.pyx"],
extra_objects=['$<TARGET_FILE:asapo-producer>',
'@CURL_LIBRARIES@'],
+ define_macros=[("NPY_NO_DEPRECATED_API", "NPY_1_7_API_VERSION")],
include_dirs=["@ASAPO_CXX_COMMON_INCLUDE_DIR@","@ASAPO_PRODUCER_INCLUDE_DIR@",numpy.get_include()],
extra_compile_args=@EXTRA_COMPILE_ARGS@,
extra_link_args=@EXTRA_LINK_ARGS@,
language="c++",
)
-ext_modules = cythonize([module],compiler_directives={'embedsignature': True})
+ext_modules = cythonize([module],compiler_directives={'embedsignature': True,'language_level': 2})
-setup(ext_modules = ext_modules,
- setup_requires=["numpy","cython>=0.28"],
- install_requires=["numpy","cython>=0.28"]
-)
+setup(ext_modules = ext_modules)
diff --git a/producer/event_monitor_producer/src/event_monitor_error.h b/producer/event_monitor_producer/src/event_monitor_error.h
index c26ad823a7f140576d7dc20536ca6620bba0591d..f3dcf37ccf9e04c89c11f8c7af752d6984c63591 100644
--- a/producer/event_monitor_producer/src/event_monitor_error.h
+++ b/producer/event_monitor_producer/src/event_monitor_error.h
@@ -23,7 +23,7 @@ auto const kSystemError = EventMonitorErrorTemplate {
-};
+}
}
#endif //ASAPO_EventMonitor_ERROR_H
diff --git a/producer/event_monitor_producer/src/inotify_event.cpp b/producer/event_monitor_producer/src/inotify_event.cpp
index 2ac09876975d1d443e09fec0ec70b490a287b4ce..6811a4f7c976be289ab67948c34d7bc79de1a90a 100644
--- a/producer/event_monitor_producer/src/inotify_event.cpp
+++ b/producer/event_monitor_producer/src/inotify_event.cpp
@@ -2,15 +2,13 @@
namespace asapo {
-InotifyEvent::InotifyEvent(const struct inotify_event* inotify_event,
- const std::map<int, std::string>& watched_folders_paths):
- inotify_event_{inotify_event}, watched_folders_paths_{watched_folders_paths} {
-
+InotifyEvent::InotifyEvent(const struct inotify_event* inotify_event):
+ inotify_event_{inotify_event} {
}
uint32_t InotifyEvent::Length() const {
- return sizeof(struct inotify_event) + inotify_event_->len;
-};
+ return static_cast<uint32_t>(sizeof(struct inotify_event)) + static_cast<uint32_t>(inotify_event_->len);
+}
bool InotifyEvent::IsDirectoryEvent() const {
return inotify_event_->mask & IN_ISDIR || inotify_event_->mask & IN_DELETE_SELF;
@@ -63,4 +61,4 @@ void InotifyEvent::Print() const {
}
-}
\ No newline at end of file
+}
diff --git a/producer/event_monitor_producer/src/inotify_event.h b/producer/event_monitor_producer/src/inotify_event.h
index 9ba0d7ec1e136b8b4d2a6cca234ef364808e91d8..a2cef81aa2e2544c514a36927b1cfae8fc8cdea3 100644
--- a/producer/event_monitor_producer/src/inotify_event.h
+++ b/producer/event_monitor_producer/src/inotify_event.h
@@ -13,7 +13,7 @@ namespace asapo {
class InotifyEvent {
public:
- InotifyEvent(const struct inotify_event* inotify_event, const std::map<int, std::string>& watched_folders_paths);
+ InotifyEvent(const struct inotify_event* inotify_event);
uint32_t Length() const ;
bool IsDirectoryEvent() const ;
bool IsNewFileInFolderEvent() const;
@@ -26,7 +26,6 @@ class InotifyEvent {
void Print() const;
private:
const struct inotify_event* inotify_event_;
- const std::map<int, std::string>& watched_folders_paths_;
};
}
diff --git a/producer/event_monitor_producer/src/main_eventmon.cpp b/producer/event_monitor_producer/src/main_eventmon.cpp
index 0133991d9e5add14fd3b88d75a8ce4b77bd54146..26064f3094294539b7bf5e7907ef7b816d479a65 100644
--- a/producer/event_monitor_producer/src/main_eventmon.cpp
+++ b/producer/event_monitor_producer/src/main_eventmon.cpp
@@ -123,10 +123,10 @@ int main (int argc, char* argv[]) {
return EXIT_FAILURE;
}
- int i = 0;
+ uint64_t i = 0;
while (true) {
asapo::MessageHeader message_header;
- auto err = event_detector->GetNextEvent(&message_header);
+ err = event_detector->GetNextEvent(&message_header);
if (stop_signal) {
break; // we check it here because signal can interrupt system call (ready by inotify and result in incomplete event data)
}
@@ -136,7 +136,8 @@ int main (int argc, char* argv[]) {
}
continue;
}
- message_header.message_id = ++i;
+ i = i + 1;
+ message_header.message_id = i;
HandleDatasets(&message_header);
producer->SendFile(message_header, GetEventMonConfig()->root_monitored_folder + asapo::kPathSeparator +
message_header.file_name, asapo::kDefaultIngestMode, "default", ProcessAfterSend);
diff --git a/producer/event_monitor_producer/src/system_folder_watch_linux.cpp b/producer/event_monitor_producer/src/system_folder_watch_linux.cpp
index b1aeb7ea0dece154d9842a07e60de40946e8a577..31ce158a8ee5d1b376c2a18db0649c5343b70280 100644
--- a/producer/event_monitor_producer/src/system_folder_watch_linux.cpp
+++ b/producer/event_monitor_producer/src/system_folder_watch_linux.cpp
@@ -199,7 +199,7 @@ Error SystemFolderWatch::ProcessInotifyEvent(const InotifyEvent& event, FilesToS
}
Error SystemFolderWatch::ReadInotifyEvents(int* bytes_read) {
- *bytes_read = inotify__->Read(watch_fd_, buffer_.get(), kBufLen);
+ *bytes_read = static_cast<int>(inotify__->Read(watch_fd_, buffer_.get(), kBufLen));
if (*bytes_read < 0) {
return EventMonitorErrorTemplates::kSystemError.Generate("read from inotify fd");
}
@@ -210,7 +210,7 @@ Error SystemFolderWatch::ProcessInotifyEvents(int bytes_in_buffer_, FilesToSend*
int nerrors = 0;
int nevents = 0;
for (char* p = buffer_.get(); p < buffer_.get() + bytes_in_buffer_; ) {
- InotifyEvent event{(struct inotify_event*) p, watched_folders_paths_};
+ InotifyEvent event{(struct inotify_event*) p};
auto err = ProcessInotifyEvent(event, events);
if (err) {
GetDefaultEventMonLogger()->Error("error processing inotify event: " + err->Explain());
diff --git a/producer/event_monitor_producer/src/system_folder_watch_macos_dummy.h b/producer/event_monitor_producer/src/system_folder_watch_macos_dummy.h
index 668116a668cbbb9f0179d847f0637f264bf4cd95..3c22b6aa7dfab48d66e2fb9af24bf6b8b24e1f82 100644
--- a/producer/event_monitor_producer/src/system_folder_watch_macos_dummy.h
+++ b/producer/event_monitor_producer/src/system_folder_watch_macos_dummy.h
@@ -12,10 +12,11 @@ namespace asapo {
class SystemFolderWatch {
public:
- VIRTUAL Error StartFolderMonitor(const std::string& root_folder, const std::vector<std::string>& monitored_folders) {
+ VIRTUAL ~SystemFolderWatch() = default;
+ VIRTUAL Error StartFolderMonitor(const std::string&, const std::vector<std::string>&) {
return nullptr;
};
- VIRTUAL FilesToSend GetFileList(Error* err) {
+ VIRTUAL FilesToSend GetFileList(Error*) {
return {};
};
};
diff --git a/producer/event_monitor_producer/unittests/test_folder_event_detector.cpp b/producer/event_monitor_producer/unittests/test_folder_event_detector.cpp
index 1ce260a12174a0944ba5bae9fa6e535a5854684f..c1c8b43a0ae6cff754634045b4d04bddad97ad9e 100644
--- a/producer/event_monitor_producer/unittests/test_folder_event_detector.cpp
+++ b/producer/event_monitor_producer/unittests/test_folder_event_detector.cpp
@@ -161,7 +161,7 @@ asapo::MessageHeader FolderEventDetectorTests::InitiateAndReadSingleEvent() {
detector.GetNextEvent(&message_header);
Mock::VerifyAndClearExpectations(&mock_system_folder_watch);
return message_header;
-};
+}
TEST_F(FolderEventDetectorTests, GetNextEventOK) {
diff --git a/producer/event_monitor_producer/unittests/test_system_folder_watch_linux.cpp b/producer/event_monitor_producer/unittests/test_system_folder_watch_linux.cpp
index d2b1f50e4eedcc644756b961f1a69720707e45fb..a22c65f7445f26e49efeb5003cd975214ca9a04e 100644
--- a/producer/event_monitor_producer/unittests/test_system_folder_watch_linux.cpp
+++ b/producer/event_monitor_producer/unittests/test_system_folder_watch_linux.cpp
@@ -126,9 +126,9 @@ ssize_t SystemFolderWatchTests::AddEventToBuffer(std::string filename, uint32_t
event->mask = mask;
event->wd = fd;
strcpy(event->name, filename.c_str());
- event->len = strlen(event->name) + 1;
+ event->len = static_cast<uint32_t>(strlen(event->name)) + 1;
memcpy(buffer + cur_buffer_pointer, event, size);
- cur_buffer_pointer += size;
+ cur_buffer_pointer += static_cast<int>(size);
free(buf);
return size;
diff --git a/producer/libasapo-producer.pc.in b/producer/libasapo-producer.pc.in
index 223d907cf736a768f11823eecfc03fb2de656bf8..8e6b2a70b1eff2f41d8a08a5391a9bb68dd3495a 100644
--- a/producer/libasapo-producer.pc.in
+++ b/producer/libasapo-producer.pc.in
@@ -7,5 +7,5 @@ Name: libasapo-producer
Description: ASAP::O producer API
Version: ${ASAPO_PRODUCER_PROTOCOL}
Cflags: -I${CMAKE_INSTALL_FULL_INCLUDEDIR}
-Libs: -L${CMAKE_INSTALL_FULL_LIBDIR} -lasapo-producer -lasapo-fabric
+Libs: -L${CMAKE_INSTALL_FULL_LIBDIR} -lasapo-producer
Libs.private: -lcurl -lstdc++ -lpthread
diff --git a/receiver/CMakeLists.txt b/receiver/CMakeLists.txt
index b743d6131194fc789e4bae3c4208efe9a2d1aa83..dbfd7d1ae1ecf86c48ecb7928c0e1aef2f1eeb7e 100644
--- a/receiver/CMakeLists.txt
+++ b/receiver/CMakeLists.txt
@@ -58,8 +58,9 @@ GET_PROPERTY(ASAPO_COMMON_FABRIC_LIBRARIES GLOBAL PROPERTY ASAPO_COMMON_FABRIC_L
add_library(${TARGET_NAME} STATIC ${SOURCE_FILES} $<TARGET_OBJECTS:system_io> $<TARGET_OBJECTS:curl_http_client>
$<TARGET_OBJECTS:json_parser> $<TARGET_OBJECTS:logger> $<TARGET_OBJECTS:request_pool>)
set_target_properties(${TARGET_NAME} PROPERTIES LINKER_LANGUAGE CXX)
-target_include_directories(${TARGET_NAME} PUBLIC ${ASAPO_CXX_COMMON_INCLUDE_DIR} ${LIBFABRIC_INCLUDE_DIR} ${CURL_INCLUDE_DIRS})
-target_link_libraries(${TARGET_NAME} ${CURL_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} database
+target_include_directories(${TARGET_NAME} PUBLIC ${ASAPO_CXX_COMMON_INCLUDE_DIR})
+target_include_directories(${TARGET_NAME} SYSTEM PUBLIC ${LIBFABRIC_INCLUDE_DIR})
+target_link_libraries(${TARGET_NAME} CURL::libcurl ${CMAKE_THREAD_LIBS_INIT} database
asapo-fabric ${ASAPO_COMMON_FABRIC_LIBRARIES})
diff --git a/receiver/src/data_cache.cpp b/receiver/src/data_cache.cpp
index dbcb01fd2e9ed2f56b87e46feeaaaaf96f83e551..f6765f46fac8db9a24e5b76b9f8dae40dfffffa5 100644
--- a/receiver/src/data_cache.cpp
+++ b/receiver/src/data_cache.cpp
@@ -17,7 +17,7 @@ DataCache::DataCache(uint64_t cache_size, float keepunlocked_ratio) : cache_size
exit(1);
}
- srand(time(NULL));
+ srand(static_cast<unsigned int>(time(NULL)));
counter_ = rand() % 100 + 1;
}
@@ -60,19 +60,19 @@ void* DataCache::GetFreeSlotAndLock(uint64_t size, CacheMeta** meta) {
uint64_t DataCache::GetNextId() {
counter_++;
std::chrono::system_clock::time_point now = std::chrono::system_clock::now();
- uint32_t timeMillis = std::chrono::duration_cast<std::chrono::milliseconds>(now.time_since_epoch()).count();
+ auto timeMillis = std::chrono::duration_cast<std::chrono::milliseconds>(now.time_since_epoch()).count();
return (uint64_t) timeMillis << 32 | counter_;
}
bool DataCache::SlotTooCloseToCurrentPointer(const CacheMeta* meta) {
uint64_t dist;
- uint64_t shift = (uint8_t*) meta->addr - cache_.get();
+ uint64_t shift = static_cast<uint64_t>((uint8_t*) meta->addr - cache_.get());
if (shift > cur_pointer_) {
dist = shift - cur_pointer_;
} else {
dist = cache_size_ - cur_pointer_ + shift;
}
- return dist < cache_size_ * keepunlocked_ratio_;
+ return dist < static_cast<uint64_t>(static_cast<float>(cache_size_) * keepunlocked_ratio_);
}
// we allow to read if it was already locked - if lock come from reading - no problems, from writing -should not happen!
@@ -101,9 +101,9 @@ bool DataCache::CleanOldSlots(uint64_t size) {
int64_t last_del = -1;
bool was_intersecting = false;
for (uint64_t i = 0; i < meta_.size(); i++) {
- uint64_t start_position = (uint8_t*) meta_[i]->addr - cache_.get();
+ uint64_t start_position = static_cast<uint64_t>((uint8_t*) meta_[i]->addr - cache_.get());
if (Intersects(start_position, start_position + meta_[i]->size, cur_pointer_ - size, cur_pointer_)) {
- last_del = i;
+ last_del = static_cast<int64_t>(i);
was_intersecting = true;
} else {
if (cur_pointer_ - size > 0 || was_intersecting) {
@@ -113,7 +113,7 @@ bool DataCache::CleanOldSlots(uint64_t size) {
}
for (int i = 0; i <= last_del; i++) {
- if (meta_[i]->lock > 0) return false;
+ if (meta_[static_cast<unsigned long>(i)]->lock > 0) return false;
}
if (last_del >= 0) {
diff --git a/receiver/src/data_cache.h b/receiver/src/data_cache.h
index e7107f276f001bcad5cfe8d3928b630f42bb2e78..0db4fb66e9a0d06adff3853466b6905998e65b01 100644
--- a/receiver/src/data_cache.h
+++ b/receiver/src/data_cache.h
@@ -24,7 +24,7 @@ class DataCache {
VIRTUAL void* GetFreeSlotAndLock(uint64_t size, CacheMeta** meta);
VIRTUAL void* GetSlotToReadAndLock(uint64_t id, uint64_t data_size, CacheMeta** meta);
VIRTUAL bool UnlockSlot(CacheMeta* meta);
- ~DataCache() = default;
+ VIRTUAL ~DataCache() = default;
private:
uint64_t cache_size_;
float keepunlocked_ratio_;
diff --git a/receiver/src/main.cpp b/receiver/src/main.cpp
index e00c94fbd97b8e9047bb34d52c49c18cf9b92546..78a16f45ec458770ba64ce7a0f0bee711377ec37 100644
--- a/receiver/src/main.cpp
+++ b/receiver/src/main.cpp
@@ -21,7 +21,7 @@ asapo::Error ReadConfigFile(int argc, char* argv[]) {
return factory.SetConfig(argv[1]);
}
-void AddDataServers(const asapo::ReceiverConfig* config, asapo::SharedCache cache,
+void AddDataServers(const asapo::ReceiverConfig* config, asapo::SharedCache,
std::vector<asapo::RdsNetServerPtr>& netServers) {
auto logger = asapo::GetDefaultReceiverDataServerLogger();
logger->SetLogLevel(config->log_level);
diff --git a/receiver/src/receiver_data_server/net_server/rds_fabric_server.cpp b/receiver/src/receiver_data_server/net_server/rds_fabric_server.cpp
index 7ec0a59025f4d6dd58196de018aa854268523e16..3c07fd7855e3265b27b2d85fcdd998bec644e840 100644
--- a/receiver/src/receiver_data_server/net_server/rds_fabric_server.cpp
+++ b/receiver/src/receiver_data_server/net_server/rds_fabric_server.cpp
@@ -74,6 +74,6 @@ Error RdsFabricServer::SendResponseAndSlotData(const ReceiverDataServerRequest*
return err;
}
-void RdsFabricServer::HandleAfterError(uint64_t source_id) {
+void RdsFabricServer::HandleAfterError(uint64_t) {
/* Do nothing? */
}
diff --git a/receiver/src/receiver_data_server/net_server/rds_tcp_server.cpp b/receiver/src/receiver_data_server/net_server/rds_tcp_server.cpp
index a828d2c59d756b909ea9bccf1fcb9e18be9cc0c6..eacb5fc0d82f7062de3fdc049f5d6794fff8720d 100644
--- a/receiver/src/receiver_data_server/net_server/rds_tcp_server.cpp
+++ b/receiver/src/receiver_data_server/net_server/rds_tcp_server.cpp
@@ -89,12 +89,12 @@ RdsTcpServer::~RdsTcpServer() {
}
void RdsTcpServer::HandleAfterError(uint64_t source_id) {
- CloseSocket(source_id);
+ CloseSocket(static_cast<int>(source_id));
}
Error RdsTcpServer::SendResponse(const ReceiverDataServerRequest* request, const GenericNetworkResponse* response) {
Error err;
- io__->Send(request->source_id, response, sizeof(*response), &err);
+ io__->Send(static_cast<int>(request->source_id), response, sizeof(*response), &err);
if (err) {
log__->Error("cannot send to consumer" + err->Explain());
}
@@ -111,7 +111,7 @@ RdsTcpServer::SendResponseAndSlotData(const ReceiverDataServerRequest* request,
return err;
}
- io__->Send(request->source_id, cache_slot->addr, cache_slot->size, &err);
+ io__->Send(static_cast<int>(request->source_id), cache_slot->addr, cache_slot->size, &err);
if (err) {
log__->Error("cannot send slot to worker" + err->Explain());
}
diff --git a/receiver/src/receiver_data_server/receiver_data_server.cpp b/receiver/src/receiver_data_server/receiver_data_server.cpp
index 4b26097544fcd93cf72bf89e2ff9ef88aa4e2227..1dd311a908276934e5f0ef80c8baca839d203044 100644
--- a/receiver/src/receiver_data_server/receiver_data_server.cpp
+++ b/receiver/src/receiver_data_server/receiver_data_server.cpp
@@ -8,7 +8,7 @@ namespace asapo {
ReceiverDataServer::ReceiverDataServer(std::unique_ptr<RdsNetServer> net_server, LogLevel log_level,
SharedCache data_cache, const ReceiverDataServerConfig& config) : net__{std::move(net_server)},
log__{GetDefaultReceiverDataServerLogger()}, data_cache_{data_cache},
- config_{config}, statistics__{new Statistics()} {
+ statistics__{new Statistics()} {
request_handler_factory_.reset(new ReceiverDataServerRequestHandlerFactory(net__.get(), data_cache_.get(),
statistics__.get()));
GetDefaultReceiverDataServerLogger()->SetLogLevel(log_level);
diff --git a/receiver/src/receiver_data_server/receiver_data_server.h b/receiver/src/receiver_data_server/receiver_data_server.h
index e440b7689748ed479de0829ed4d2680354bc8125..5c5f103f3ada29f5e557338ffb2af907193eece9 100644
--- a/receiver/src/receiver_data_server/receiver_data_server.h
+++ b/receiver/src/receiver_data_server/receiver_data_server.h
@@ -27,7 +27,6 @@ class ReceiverDataServer {
void Run();
private:
SharedCache data_cache_;
- const ReceiverDataServerConfig& config_;
public:
std::unique_ptr<Statistics>statistics__;
diff --git a/receiver/src/receiver_data_server/receiver_data_server_error.h b/receiver/src/receiver_data_server/receiver_data_server_error.h
index 9c590c4ddbd9e8cdc7c2148efd2193073831cb44..02befb4cad4cb24b4e2fe9f74ecd36b42eef8a7a 100644
--- a/receiver/src/receiver_data_server/receiver_data_server_error.h
+++ b/receiver/src/receiver_data_server/receiver_data_server_error.h
@@ -22,7 +22,7 @@ auto const kWrongRequest = ReceiverDataServerErrorTemplate {
};
-};
+}
}
#endif //ASAPO_RECEIVER_DATA_SERVER_ERROR_H
diff --git a/receiver/src/receiver_data_server/request_handler/receiver_data_server_request_handler.cpp b/receiver/src/receiver_data_server/request_handler/receiver_data_server_request_handler.cpp
index 59406f7f2606fb5ac28394527a61d3d1d0166799..6de6edf6f542a6c9c1091ad2ea703cc957b799ff 100644
--- a/receiver/src/receiver_data_server/request_handler/receiver_data_server_request_handler.cpp
+++ b/receiver/src/receiver_data_server/request_handler/receiver_data_server_request_handler.cpp
@@ -101,6 +101,8 @@ void ReceiverDataServerRequestHandler::HandleInvalidRequest(const ReceiverDataSe
case NetworkErrorCode::kNetErrorNotSupported:
log__->Error("unsupported client, version: " + std::string(receiver_request->header.api_version));
break;
+ default:
+ break;
};
}
diff --git a/receiver/src/receiver_data_server/request_handler/receiver_data_server_request_handler_factory.cpp b/receiver/src/receiver_data_server/request_handler/receiver_data_server_request_handler_factory.cpp
index d08f13a8c05089475e887f7c9ca3038ca848e28c..be11bd47a5b2bcf0f5bd8d1ef41206ad78adf349 100644
--- a/receiver/src/receiver_data_server/request_handler/receiver_data_server_request_handler_factory.cpp
+++ b/receiver/src/receiver_data_server/request_handler/receiver_data_server_request_handler_factory.cpp
@@ -4,8 +4,8 @@
namespace asapo {
-std::unique_ptr<RequestHandler> ReceiverDataServerRequestHandlerFactory::NewRequestHandler(uint64_t thread_id,
- uint64_t* shared_counter) {
+std::unique_ptr<RequestHandler> ReceiverDataServerRequestHandlerFactory::NewRequestHandler(uint64_t,
+ uint64_t* ) {
return std::unique_ptr<RequestHandler> {new ReceiverDataServerRequestHandler(server_, data_cache_, statistics_)};
}
ReceiverDataServerRequestHandlerFactory::ReceiverDataServerRequestHandlerFactory(RdsNetServer* server,
diff --git a/receiver/src/receiver_error.h b/receiver/src/receiver_error.h
index 210c116cadfa8d9b1f64f2894cc014ec7355bbd2..23d0669d6b09f113224f9981f03f0e31281094e3 100644
--- a/receiver/src/receiver_error.h
+++ b/receiver/src/receiver_error.h
@@ -53,7 +53,7 @@ auto const kReAuthorizationFailure = ReceiverErrorTemplate {
"reauthorization for auto beamtime failed", ReceiverErrorType::kReAuthorizationFailure
};
-};
+}
}
#endif //ASAPO_RECEIVER_ERROR_H
diff --git a/receiver/src/request.cpp b/receiver/src/request.cpp
index 7db51dfd02f8aa91f097ecab8bfdb8747f9e3add..f6aa6223bc30f08ca8b651ebb35cd7d4476d1fc0 100644
--- a/receiver/src/request.cpp
+++ b/receiver/src/request.cpp
@@ -191,7 +191,7 @@ const std::string& Request::GetResponseMessage() const {
return response_message_;
}
-const ResponseMessageType Request::GetResponseMessageType() const {
+ResponseMessageType Request::GetResponseMessageType() const {
return response_message_type_;
}
diff --git a/receiver/src/request.h b/receiver/src/request.h
index 141430e7748b09ee46c1c596d3efa2c992e59759..916a04358932d82dfe8de23386edead3ebf26eb4 100644
--- a/receiver/src/request.h
+++ b/receiver/src/request.h
@@ -33,7 +33,7 @@ enum class ResponseMessageType {
class Request {
public:
VIRTUAL Error Handle(ReceiverStatistics*);
- ~Request() = default;
+ VIRTUAL ~Request() = default;
Request() = delete;
Request(const GenericRequestHeader& request_header, SocketDescriptor socket_fd, std::string origin_uri,
DataCache* cache, const RequestHandlerDbCheckRequest* db_check_handler);
@@ -78,7 +78,7 @@ class Request {
VIRTUAL bool WasAlreadyProcessed() const;
VIRTUAL void SetAlreadyProcessedFlag();
VIRTUAL void SetResponseMessage(std::string message, ResponseMessageType type);
- VIRTUAL const ResponseMessageType GetResponseMessageType() const;
+ VIRTUAL ResponseMessageType GetResponseMessageType() const;
VIRTUAL const std::string& GetResponseMessage() const;
VIRTUAL Error CheckForDuplicates();
private:
diff --git a/receiver/src/request_handler/request_factory.h b/receiver/src/request_handler/request_factory.h
index a44d7efaff638a9abe2ecd633675481b6244baaf..edb2981cecda8b64743d868325ea09f774e43a19 100644
--- a/receiver/src/request_handler/request_factory.h
+++ b/receiver/src/request_handler/request_factory.h
@@ -16,6 +16,7 @@ class RequestFactory {
explicit RequestFactory (SharedCache cache);
virtual std::unique_ptr<Request> GenerateRequest(const GenericRequestHeader& request_header,
SocketDescriptor socket_fd, std::string origin_uri, Error* err) const noexcept;
+ virtual ~RequestFactory() = default;
private:
Error AddHandlersToRequest(std::unique_ptr<Request>& request, const GenericRequestHeader& request_header) const;
Error AddReceiveWriteHandlers(std::unique_ptr<Request>& request, const GenericRequestHeader& request_header) const;
@@ -32,7 +33,7 @@ class RequestFactory {
RequestHandlerDbMetaWrite request_handler_db_meta_write_{kDBMetaCollectionName};
RequestHandlerDbGetMeta request_handler_db_get_meta_{kDBMetaCollectionName};
RequestHandlerAuthorize request_handler_authorize_;
- RequestHandlerDbCheckRequest request_handler_db_check_{kDBDataCollectionNamePrefix};;
+ RequestHandlerDbCheckRequest request_handler_db_check_{kDBDataCollectionNamePrefix};
SharedCache cache_;
bool ReceiveDirectToFile(const GenericRequestHeader& request_header) const;
Error AddReceiveDirectToFileHandler(std::unique_ptr<Request>& request,
diff --git a/receiver/src/request_handler/requests_dispatcher.h b/receiver/src/request_handler/requests_dispatcher.h
index 780a029717b285e39dbed2cf54aa89d8528ebb39..b18da4725c1fbbaa7ce309f118a31c71769adefb 100644
--- a/receiver/src/request_handler/requests_dispatcher.h
+++ b/receiver/src/request_handler/requests_dispatcher.h
@@ -17,6 +17,7 @@ class RequestsDispatcher {
RequestsDispatcher(SocketDescriptor socket_fd, std::string address, ReceiverStatistics* statistics, SharedCache cache);
VIRTUAL Error ProcessRequest(const std::unique_ptr<Request>& request) const noexcept;
VIRTUAL std::unique_ptr<Request> GetNextRequest(Error* err) const noexcept;
+ VIRTUAL ~RequestsDispatcher() = default;
ReceiverStatistics* statistics__;
std::unique_ptr<IO> io__;
const AbstractLogger* log__;
diff --git a/receiver/src/statistics/receiver_statistics.cpp b/receiver/src/statistics/receiver_statistics.cpp
index 9f4458a81bf267e15f5911966d609ed3e54d418a..1f54884d85bd6e6c7cbf8b35926a757d07715cf3 100644
--- a/receiver/src/statistics/receiver_statistics.cpp
+++ b/receiver/src/statistics/receiver_statistics.cpp
@@ -12,19 +12,19 @@ ReceiverStatistics::ReceiverStatistics(unsigned int write_interval) : Statistics
StatisticsToSend ReceiverStatistics::PrepareStatisticsToSend() const noexcept {
StatisticsToSend stat = Statistics::PrepareStatisticsToSend();
- for (auto i = 0; i < kNStatisticEntities; i++) {
- stat.extra_entities.push_back(ExtraEntity{kStatisticEntityNames[i], double(GetElapsedMs(StatisticEntity(i))) / stat.elapsed_ms});
+ for (size_t i = 0; i < kNStatisticEntities; i++) {
+ stat.extra_entities.push_back(ExtraEntity{kStatisticEntityNames[i], double(GetElapsedMs(StatisticEntity(i))) / static_cast<double>(stat.elapsed_ms)});
}
return stat;
}
uint64_t ReceiverStatistics::GetElapsedMs(StatisticEntity entity) const noexcept {
- return std::chrono::duration_cast<std::chrono::milliseconds>(time_counters_[entity]).count();
+ return static_cast<uint64_t>(std::chrono::duration_cast<std::chrono::milliseconds>(time_counters_[entity]).count());
}
void ReceiverStatistics::ResetStatistics() noexcept {
Statistics::ResetStatistics();
- for (int i = 0; i < kNStatisticEntities; i++) {
+ for (size_t i = 0; i < kNStatisticEntities; i++) {
time_counters_[i] = std::chrono::nanoseconds{0};
}
}
diff --git a/receiver/src/statistics/receiver_statistics.h b/receiver/src/statistics/receiver_statistics.h
index cbd30bd5a7f9cc68967bb14b21aecfcf71cae760..4bffa21c1c9f0664f4190355934ed541ef873ec9 100644
--- a/receiver/src/statistics/receiver_statistics.h
+++ b/receiver/src/statistics/receiver_statistics.h
@@ -5,7 +5,7 @@
namespace asapo {
-static const auto kNStatisticEntities = 3;
+static const size_t kNStatisticEntities = 3;
enum StatisticEntity : int {
kDatabase = 0,
kDisk,
diff --git a/receiver/src/statistics/statistics.cpp b/receiver/src/statistics/statistics.cpp
index 4549f1bc43f8d45376f55220f86efb2bed5532b2..f16c144364efaf91452e6150489b071c46837e44 100644
--- a/receiver/src/statistics/statistics.cpp
+++ b/receiver/src/statistics/statistics.cpp
@@ -36,13 +36,13 @@ StatisticsToSend Statistics::PrepareStatisticsToSend() const noexcept {
}
uint64_t Statistics::GetTotalElapsedMs() const noexcept {
- return std::chrono::duration_cast<std::chrono::milliseconds>
- ( system_clock::now() - last_timepoint_).count();
+ return static_cast<uint64_t>(std::chrono::duration_cast<std::chrono::milliseconds>
+ (system_clock::now() - last_timepoint_).count());
}
void Statistics::SetWriteInterval(uint64_t interval_ms) {
- write_interval_ = (size_t) interval_ms;
+ write_interval_ = static_cast<unsigned int>(interval_ms);
}
void Statistics::ResetStatistics() noexcept {
diff --git a/receiver/src/statistics/statistics_sender_influx_db.cpp b/receiver/src/statistics/statistics_sender_influx_db.cpp
index e6b1ca8a706b0dd571e784c7182ab4245c501df9..c9c8837c8f76184c0915eaa16e8b41082ac597ae 100644
--- a/receiver/src/statistics/statistics_sender_influx_db.cpp
+++ b/receiver/src/statistics/statistics_sender_influx_db.cpp
@@ -10,7 +10,7 @@ namespace asapo {
template<typename ... Args>
std::string string_format( const std::string& format, Args ... args ) {
- size_t size = snprintf( nullptr, 0, format.c_str(), args ... ) + 1;
+ size_t size = static_cast<size_t>(snprintf(nullptr, 0, format.c_str(), args ...) + 1);
std::unique_ptr<char[]> buf( new char[ size ] );
snprintf( buf.get(), size, format.c_str(), args ... );
return std::string( buf.get(), buf.get() + size - 1 );
@@ -70,7 +70,7 @@ StatisticsSenderInfluxDb::StatisticsSenderInfluxDb(): httpclient__{DefaultHttpCl
log__->Debug(msg);
-};
+}
}
diff --git a/receiver/unittests/receiver_data_server/net_server/test_rds_fabric_server.cpp b/receiver/unittests/receiver_data_server/net_server/test_rds_fabric_server.cpp
index 6c77791d9a613b5d4a7510470f5fd3a1def5ce25..d185a4f7abcf9793d03339ae0830edd5406806ad 100644
--- a/receiver/unittests/receiver_data_server/net_server/test_rds_fabric_server.cpp
+++ b/receiver/unittests/receiver_data_server/net_server/test_rds_fabric_server.cpp
@@ -112,10 +112,12 @@ TEST_F(RdsFabricServerTests, Initialize_Error_DoubleInitialize) {
ACTION_P5(A_WriteToRecvAnyBuffer, op_code, expected_id, remote_mem_addr, remote_mem_length, remote_mem_key) {
((GenericRequestHeader*)arg2)->op_code = op_code;
- ((GenericRequestHeader*)arg2)->data_id = expected_id;
- ((fabric::MemoryRegionDetails*) & ((GenericRequestHeader*)arg2)->message)->addr = remote_mem_addr;
- ((fabric::MemoryRegionDetails*) & ((GenericRequestHeader*)arg2)->message)->length = remote_mem_length;
- ((fabric::MemoryRegionDetails*) & ((GenericRequestHeader*)arg2)->message)->key = remote_mem_key;
+ ((GenericRequestHeader*)arg2)->data_id = static_cast<uint64_t>(expected_id);
+ ((fabric::MemoryRegionDetails*) & ((GenericRequestHeader*)arg2)->message)->addr = static_cast<uint64_t>
+ (remote_mem_addr);
+ ((fabric::MemoryRegionDetails*) & ((GenericRequestHeader*)arg2)->message)->length = static_cast<uint64_t>
+ (remote_mem_length);
+ ((fabric::MemoryRegionDetails*) & ((GenericRequestHeader*)arg2)->message)->key = static_cast<uint64_t>(remote_mem_key);
}
TEST_F(RdsFabricServerTests, GetNewRequests_Ok) {
diff --git a/receiver/unittests/receiver_data_server/net_server/test_rds_tcp_server.cpp b/receiver/unittests/receiver_data_server/net_server/test_rds_tcp_server.cpp
index 1106da959b420f2614429f23f2e925c235d0e28d..83d2d8572b4ac878c505e2cc15a51534910d1c32 100644
--- a/receiver/unittests/receiver_data_server/net_server/test_rds_tcp_server.cpp
+++ b/receiver/unittests/receiver_data_server/net_server/test_rds_tcp_server.cpp
@@ -150,7 +150,7 @@ void RdsTCPServerTests::ExpectReceiveRequestEof() {
ACTION_P2(A_ReceiveData, op_code, expected_id) {
((asapo::GenericRequestHeader*)arg1)->op_code = op_code;
- ((asapo::GenericRequestHeader*)arg1)->data_id = expected_id;
+ ((asapo::GenericRequestHeader*)arg1)->data_id = static_cast<uint64_t>(expected_id);
}
@@ -226,7 +226,7 @@ TEST_F(RdsTCPServerTests, GetNewRequestsReadOk) {
ASSERT_THAT(err, Eq(nullptr));
ASSERT_THAT(requests.size(), Eq(3));
- int i = 0;
+ size_t i = 0;
for (auto conn : expected_client_sockets) {
ASSERT_THAT(dynamic_cast<asapo::ReceiverDataServerRequest*>(requests[i].get()), Ne(nullptr));
ASSERT_THAT(requests[i]->header.data_id, Eq(conn));
@@ -327,7 +327,7 @@ TEST_F(RdsTCPServerTests, SendResponseAndSlotData_Ok) {
TEST_F(RdsTCPServerTests, HandleAfterError) {
EXPECT_CALL(mock_io, CloseSocket_t(expected_client_sockets[0], _));
- tcp_server.HandleAfterError(expected_client_sockets[0]);
+ tcp_server.HandleAfterError(static_cast<uint64_t>(expected_client_sockets[0]));
}
}
diff --git a/receiver/unittests/receiver_data_server/test_receiver_data_server.cpp b/receiver/unittests/receiver_data_server/test_receiver_data_server.cpp
index fe3d15950a61dacb59a49c39988cc9cf4ccea279..b3ce88a40f7cc44333e7cac70eed46aa4ad6adb4 100644
--- a/receiver/unittests/receiver_data_server/test_receiver_data_server.cpp
+++ b/receiver/unittests/receiver_data_server/test_receiver_data_server.cpp
@@ -68,7 +68,7 @@ class ReceiverDataServerTests : public Test {
void SetUp() override {
data_server.request_pool__ = std::unique_ptr<asapo::RequestPool> {&mock_pool};
data_server.log__ = &mock_logger;
- data_server.statistics__ = std::unique_ptr<asapo::Statistics> {&mock_statistics};;
+ data_server.statistics__ = std::unique_ptr<asapo::Statistics> {&mock_statistics};
}
void TearDown() override {
data_server.net__.release();
diff --git a/receiver/unittests/receiver_mocking.h b/receiver/unittests/receiver_mocking.h
index 8711a6e70ce6a0bcc26173113891188d3313e197..74894756165b86e11e83b226cd020bce958752ff 100644
--- a/receiver/unittests/receiver_mocking.h
+++ b/receiver/unittests/receiver_mocking.h
@@ -102,7 +102,7 @@ class MockRequest: public Request {
MOCK_CONST_METHOD0(GetResponseMessage, const std::string & ());
MOCK_CONST_METHOD0(GetResponseMessageType_t, ResponseMessageType ());
- const ResponseMessageType GetResponseMessageType() const override {
+ ResponseMessageType GetResponseMessageType() const override {
return GetResponseMessageType_t();
};
diff --git a/receiver/unittests/request_handler/test_requests_dispatcher.cpp b/receiver/unittests/request_handler/test_requests_dispatcher.cpp
index 9454aba1564b61886b4b37d78a1e2d8cf80c2a93..aad695db0406141df911288ce466a8400b66722b 100644
--- a/receiver/unittests/request_handler/test_requests_dispatcher.cpp
+++ b/receiver/unittests/request_handler/test_requests_dispatcher.cpp
@@ -66,7 +66,7 @@ class MockRequest: public Request {
public:
MockRequest(const GenericRequestHeader& request_header, SocketDescriptor socket_fd):
Request(request_header, socket_fd, "", nullptr, nullptr) {};
- Error Handle(ReceiverStatistics* statistics) override {
+ Error Handle(ReceiverStatistics*) override {
return Error{Handle_t()};
};
MOCK_CONST_METHOD0(Handle_t, ErrorInterface * ());
diff --git a/receiver/unittests/statistics/test_receiver_statistics.cpp b/receiver/unittests/statistics/test_receiver_statistics.cpp
index b64fc20b0834011bdaacb4ec6bd4712fe930e331..d2bbe46e0fd812eb2e52af73b67beb87c0c523c1 100644
--- a/receiver/unittests/statistics/test_receiver_statistics.cpp
+++ b/receiver/unittests/statistics/test_receiver_statistics.cpp
@@ -59,7 +59,7 @@ ACTION_P(SaveArg1ToSendStatR, value) {
value->data_volume = resp.data_volume;
value->elapsed_ms = resp.elapsed_ms;
value->tags = resp.tags;
- for (int i = 0; i < asapo::kNStatisticEntities; i++) {
+ for (size_t i = 0; i < asapo::kNStatisticEntities; i++) {
value->extra_entities.push_back(resp.extra_entities[i]);
}
@@ -89,8 +89,8 @@ void ReceiverStatisticTests::TestTimer(const StatisticEntity& entity) {
auto stat = ExtractStat();
- ASSERT_THAT(stat.extra_entities[entity].second, Ge(0.3));
- ASSERT_THAT(stat.extra_entities[entity].second, Le(1.0));
+ ASSERT_THAT(stat.extra_entities[static_cast<size_t>(entity)].second, Ge(0.3));
+ ASSERT_THAT(stat.extra_entities[static_cast<size_t>(entity)].second, Le(1.0));
}
diff --git a/receiver/unittests/test_datacache.cpp b/receiver/unittests/test_datacache.cpp
index 56c90b426ccbca119295524e367936c10f1b0621..d17f292767cd819b8a77a72eb39372bb394b55a4 100644
--- a/receiver/unittests/test_datacache.cpp
+++ b/receiver/unittests/test_datacache.cpp
@@ -26,7 +26,7 @@ class DataCacheTests : public Test {
uint64_t expected_cache_size = 1024 * 1024;
uint64_t expected_size = 10;
uint64_t expected_val = 1;
- float expected_keepunlocked_ratio = 0.2;
+ float expected_keepunlocked_ratio = 0.2f;
CacheMeta* meta1;
CacheMeta* meta2;
DataCache cache{expected_cache_size, expected_keepunlocked_ratio};
@@ -102,7 +102,7 @@ TEST_F(DataCacheTests, PrepareToReadIdNotFound) {
}
TEST_F(DataCacheTests, PrepareToReadOk) {
- uint64_t data_size = expected_cache_size * 0.7;
+ auto data_size = static_cast<uint64_t>(static_cast<double>(expected_cache_size) * 0.7);
uint8_t* ini_addr = (uint8_t*) cache.GetFreeSlotAndLock(data_size, &meta1);
uint8_t* addr = (uint8_t*) cache.GetSlotToReadAndLock(meta1->id, data_size, &meta2);
@@ -113,7 +113,7 @@ TEST_F(DataCacheTests, PrepareToReadOk) {
TEST_F(DataCacheTests, PrepareToReadFailsIfTooCloseToCurrentPointer) {
- auto data_size = expected_cache_size * 0.9;
+ auto data_size = static_cast<uint64_t>(static_cast<double>(expected_cache_size) * 0.9);
cache.GetFreeSlotAndLock(data_size, &meta1);
uint8_t* addr = (uint8_t*) cache.GetSlotToReadAndLock(meta1->id, data_size, &meta2);
diff --git a/receiver/unittests/test_request.cpp b/receiver/unittests/test_request.cpp
index 202884985b3a75b619460e737e6e6942eb47518d..93d018c37b86b12dfca749f1b0f5f29ba639f444 100644
--- a/receiver/unittests/test_request.cpp
+++ b/receiver/unittests/test_request.cpp
@@ -120,7 +120,7 @@ TEST_F(RequestTests, HandleProcessesRequests) {
Return(nullptr)
).WillOnce(
Return(new asapo::IOError("Test Send Error", asapo::IOErrorType::kUnknownIOError))
- );;
+ );
request->AddHandler(&mock_request_handler);
request->AddHandler(&mock_request_handler);
@@ -184,7 +184,7 @@ void RequestTests::ExpectFileName(std::string sended, std::string received) {
request->io__.release();
request.reset(new Request{generic_request_header, expected_socket_id, expected_origin_uri, nullptr, nullptr});
- request->io__ = std::unique_ptr<asapo::IO> {&mock_io};;
+ request->io__ = std::unique_ptr<asapo::IO> {&mock_io};
auto fname = request->GetFileName();
@@ -198,7 +198,7 @@ TEST_F(RequestTests, GetStream) {
request->io__.release();
request.reset(new Request{generic_request_header, expected_socket_id, expected_origin_uri, nullptr, nullptr});
- request->io__ = std::unique_ptr<asapo::IO> {&mock_io};;
+ request->io__ = std::unique_ptr<asapo::IO> {&mock_io};
auto stream = request->GetStream();
diff --git a/tests/automatic/asapo_fabric/CMakeLists.txt b/tests/automatic/asapo_fabric/CMakeLists.txt
index 05111bc399bcb5dcb4f51ef1492ba7c6e92f1785..9d7f733c401aa377051ec31e782e3d379a4d4101 100644
--- a/tests/automatic/asapo_fabric/CMakeLists.txt
+++ b/tests/automatic/asapo_fabric/CMakeLists.txt
@@ -10,8 +10,9 @@ foreach(file ${files})
# Executable and link
add_executable(${TARGET_NAME} ${SOURCE_FILES} $<TARGET_OBJECTS:logger> $<TARGET_OBJECTS:curl_http_client>)
- target_link_libraries(${TARGET_NAME} test_common asapo-fabric ${CURL_LIBRARIES} ${ASAPO_COMMON_FABRIC_LIBRARIES})
- target_include_directories(${TARGET_NAME} PUBLIC ${ASAPO_CXX_COMMON_INCLUDE_DIR} ${LIBFABRIC_INCLUDE_DIR})
+ target_link_libraries(${TARGET_NAME} test_common asapo-fabric CURL::libcurl ${ASAPO_COMMON_FABRIC_LIBRARIES})
+ target_include_directories(${TARGET_NAME} PUBLIC ${ASAPO_CXX_COMMON_INCLUDE_DIR})
+ target_include_directories(${TARGET_NAME} SYSTEM PUBLIC ${LIBFABRIC_INCLUDE_DIR})
set_target_properties(${TARGET_NAME} PROPERTIES LINKER_LANGUAGE CXX)
# Add test
diff --git a/tests/automatic/asapo_fabric/client_lazy_initialization.cpp b/tests/automatic/asapo_fabric/client_lazy_initialization.cpp
index 1f42bc23ca5d5d2358a8f35dc47a7d9dd25d18f7..3a54002522d9e7109aa598223bc6876f86e1cc78 100644
--- a/tests/automatic/asapo_fabric/client_lazy_initialization.cpp
+++ b/tests/automatic/asapo_fabric/client_lazy_initialization.cpp
@@ -5,7 +5,7 @@
using namespace asapo;
using namespace fabric;
-int main(int argc, char* argv[]) {
+int main() {
Error err;
auto factory = GenerateDefaultFabricFactory();
diff --git a/tests/automatic/asapo_fabric/parallel_data_transfer.cpp b/tests/automatic/asapo_fabric/parallel_data_transfer.cpp
index ec68b712b4b25f0a8c3bd653d5784cfd0a2cd423..b7aed4413d05b50b3ca0073480e06aec0c648cea 100644
--- a/tests/automatic/asapo_fabric/parallel_data_transfer.cpp
+++ b/tests/automatic/asapo_fabric/parallel_data_transfer.cpp
@@ -97,9 +97,9 @@ void ClientChildThread(const std::string& hostname, uint16_t port, int index, ch
GenericRequestHeader request{};
strcpy(request.message, "Hello World");
memcpy(request.stream, mr->GetDetails(), sizeof(MemoryRegionDetails));
- request.data_id = index;
- request.data_size = run;
- FabricMessageId messageId = (index * kEachInstanceRuns) + run;
+ request.data_id = static_cast<uint64_t>(index);
+ request.data_size = static_cast<uint64_t>(run);
+ FabricMessageId messageId = static_cast<FabricMessageId>((index * kEachInstanceRuns) + run);
client->Send(serverAddress, messageId, &request, sizeof(request), &err);
M_AssertEq(nullptr, err, "client->Send");
@@ -111,7 +111,7 @@ void ClientChildThread(const std::string& hostname, uint16_t port, int index, ch
for (size_t i = 0; i < kRdmaSize; i++) {
// Check to reduce log spam
if (expectedRdmaBuffer[i] != actualRdmaBuffer[i]) {
- M_AssertEq(expectedRdmaBuffer[i], actualRdmaBuffer[i],
+ M_AssertEq(static_cast<uint64_t>(expectedRdmaBuffer[i]), static_cast<uint64_t>(actualRdmaBuffer[i]),
"Expect rdma[i] == acutal[i], i = " + std::to_string(i));
}
}
diff --git a/tests/automatic/asapo_fabric/server_not_running.cpp b/tests/automatic/asapo_fabric/server_not_running.cpp
index d28a86d528240001660568f6aefeeeeb5aff6d52..698f8098062b25cca9e7efee0674f4229a4aac51 100644
--- a/tests/automatic/asapo_fabric/server_not_running.cpp
+++ b/tests/automatic/asapo_fabric/server_not_running.cpp
@@ -27,9 +27,8 @@ int main(int argc, char* argv[]) {
auto client = factory->CreateClient(&err);
M_AssertEq(nullptr, err, "factory->CreateClient");
- auto serverAddress = client->AddServerAddress(hostname + ":" + std::to_string(port), &err);
+ client->AddServerAddress(hostname + ":" + std::to_string(port), &err);
M_AssertEq(FabricErrorTemplates::kConnectionRefusedError, err, "client->AddServerAddress");
- err = nullptr;
return 0;
}
diff --git a/tests/automatic/asapo_fabric/simple_data_transfer.cpp b/tests/automatic/asapo_fabric/simple_data_transfer.cpp
index 86054cb9b2f263a3cd70b62dd55090c897e8a0c6..b2d15f2dc705cf39029f3471c77d99a929960e11 100644
--- a/tests/automatic/asapo_fabric/simple_data_transfer.cpp
+++ b/tests/automatic/asapo_fabric/simple_data_transfer.cpp
@@ -42,7 +42,7 @@ void ServerMasterThread(const std::string& hostname, uint16_t port, char* expect
server->RecvAny(&clientAddress, &messageId, &request, sizeof(request), &err);
} while (err == IOErrorTemplates::kTimeout && tries++ < 2);
M_AssertEq(nullptr, err, "server->RecvAny");
- M_AssertEq(123 + instanceRuns, messageId);
+ M_AssertEq(static_cast<FabricMessageId>(123 + instanceRuns), messageId);
M_AssertEq("Hello World", request.message);
server->RdmaWrite(clientAddress, (MemoryRegionDetails*) &request.stream, expectedRdmaBuffer, kRdmaSize,
@@ -85,7 +85,7 @@ void ClientThread(const std::string& hostname, uint16_t port, char* expectedRdma
GenericRequestHeader request{};
strcpy(request.message, "Hello World");
memcpy(request.stream, mr->GetDetails(), sizeof(MemoryRegionDetails));
- FabricMessageId messageId = 123 + instanceRuns;
+ FabricMessageId messageId = static_cast<FabricMessageId>(123 + instanceRuns);
client->Send(serverAddress, messageId, &request, sizeof(request), &err);
M_AssertEq(nullptr, err, "client->Send");
@@ -97,7 +97,7 @@ void ClientThread(const std::string& hostname, uint16_t port, char* expectedRdma
for (size_t i = 0; i < kRdmaSize; i++) {
// Check to reduce log spam
if (expectedRdmaBuffer[i] != actualRdmaBuffer[i]) {
- M_AssertEq(expectedRdmaBuffer[i], actualRdmaBuffer[i],
+ M_AssertEq(static_cast<uint64_t>(expectedRdmaBuffer[i]), static_cast<uint64_t>(actualRdmaBuffer[i]),
"Expect rdma[i] == acutal[i], i = " + std::to_string(i));
}
}
diff --git a/tests/automatic/common/cpp/include/testing.h b/tests/automatic/common/cpp/include/testing.h
index c4c9aa7c377ec7748cc5b6731dd0139512f6463c..b9a0f53bbc27e94cc72657a50b1eaeffb49318d6 100644
--- a/tests/automatic/common/cpp/include/testing.h
+++ b/tests/automatic/common/cpp/include/testing.h
@@ -13,7 +13,7 @@ void _M_AssertTrue(bool value, const std::string& comment);
void _M_AssertContains(const std::string& whole, const std::string& sub, const std::string& comment);
void _M_AssertEq(const std::string& expected, const std::string& got, const std::string& comment);
-void _M_AssertEq(int expected, int got, const std::string& comment);
+void _M_AssertEq(uint64_t expected, uint64_t got, const std::string& comment);
// Error checks
void _M_AssertEq(const Error& expected, const Error& got, const std::string& comment);
diff --git a/tests/automatic/common/cpp/src/testing.cpp b/tests/automatic/common/cpp/src/testing.cpp
index 17b333cd7c4701fdfde372f473a667403de8da84..5245d61955d0d251b307a969d048732316b0c442 100644
--- a/tests/automatic/common/cpp/src/testing.cpp
+++ b/tests/automatic/common/cpp/src/testing.cpp
@@ -60,15 +60,17 @@ void _M_AssertEq(const std::string& expected, const std::string& got, const std:
T_AssertEq(expected, got, comment);
}
-void _M_AssertEq(int expected, int got, const std::string& comment) {
+
+void _M_AssertEq(uint64_t expected, uint64_t got, const std::string& comment) {
T_AssertEq(expected, got, comment);
}
+
void _M_AssertEq(const Error& expected, const Error& got, const std::string& comment) {
T_AssertEq(expected, got, comment);
}
-void _M_AssertEq(const decltype(nullptr)& expected, const Error& got, const std::string& comment) {
+void _M_AssertEq(const decltype(nullptr)&, const Error& got, const std::string& comment) {
T_AssertEq(Error{}, got, comment);
}
diff --git a/tests/automatic/consumer/consumer_api/consumer_api.c b/tests/automatic/consumer/consumer_api/consumer_api.c
index 1e2bb11159e5a8d6adf1d2a79d53a38a70c5f7fd..ed81afab911933054f4c398fd3ddf156540e3ab3 100644
--- a/tests/automatic/consumer/consumer_api/consumer_api.c
+++ b/tests/automatic/consumer/consumer_api/consumer_api.c
@@ -9,10 +9,10 @@
#define ASSERT_EQ_STRING(...) assert_eq_string_(__VA_ARGS__,__LINE__)
#define ASSERT_TRUE(...) assert_true_(__VA_ARGS__,__LINE__)
-void assert_eq_int_(int expected, int got, const char *message, int line) {
+void assert_eq_int_(uint64_t expected, uint64_t got, const char *message, int line) {
printf("asserting %s at %d\n",message,line);
if (expected!=got) {
- printf("%s: expected %d got %d at %d\n",message, expected, got,line);
+ printf("%s: expected %llu got %llu at %d\n",message, (unsigned long long)expected, (unsigned long long)got,line);
exit(EXIT_FAILURE);
}
}
@@ -79,7 +79,7 @@ void test_datasets(AsapoConsumerHandle consumer, AsapoStringHandle group_id) {
// size
int64_t size = asapo_consumer_get_current_dataset_count(consumer,"default", 0, &err);
EXIT_IF_ERROR("asapo_consumer_get_current_dataset_count", err);
- ASSERT_EQ_INT(10,size,"asapo_consumer_get_current_dataset_count");
+ ASSERT_EQ_INT(10,(uint64_t)size,"asapo_consumer_get_current_dataset_count");
// get next incomplete datasets without min_size
dataset = asapo_consumer_get_next_dataset(consumer,group_id, 0, "incomplete", &err);
@@ -119,11 +119,11 @@ void test_datasets(AsapoConsumerHandle consumer, AsapoStringHandle group_id) {
// get size
size = asapo_consumer_get_current_dataset_count(consumer,"incomplete", 1, &err);
EXIT_IF_ERROR("asapo_consumer_get_current_dataset_count", err);
- ASSERT_EQ_INT(5,size,"asapo_consumer_get_current_dataset_count include incomplete");
+ ASSERT_EQ_INT(5,(uint64_t)size,"asapo_consumer_get_current_dataset_count include incomplete");
size = asapo_consumer_get_current_dataset_count(consumer,"incomplete", 0, &err);
EXIT_IF_ERROR("asapo_consumer_get_current_dataset_count", err);
- ASSERT_EQ_INT(0,size,"asapo_consumer_get_current_dataset_count exclude incomplete");
+ ASSERT_EQ_INT(0,(uint64_t)size,"asapo_consumer_get_current_dataset_count exclude incomplete");
asapo_free_handle(&err);
@@ -173,11 +173,11 @@ void test_single(AsapoConsumerHandle consumer, AsapoStringHandle group_id) {
// stream size
int64_t size = asapo_consumer_get_current_size(consumer,"default", &err);
EXIT_IF_ERROR("asapo_consumer_get_current_size", err);
- ASSERT_EQ_INT(10,size,"asapo_consumer_get_current_size");
+ ASSERT_EQ_INT(10,(uint64_t)size,"asapo_consumer_get_current_size");
size = asapo_consumer_get_current_size(consumer,"stream1", &err);
EXIT_IF_ERROR("asapo_consumer_get_current_size stream1", err);
- ASSERT_EQ_INT(5,size,"asapo_consumer_get_current_size stream1");
+ ASSERT_EQ_INT(5,(uint64_t)size,"asapo_consumer_get_current_size stream1");
// query messages
AsapoMessageMetasHandle messages = asapo_consumer_query_messages(consumer, "meta.test = 10 AND name='1'", "default", &err);
@@ -201,12 +201,12 @@ void test_single(AsapoConsumerHandle consumer, AsapoStringHandle group_id) {
struct timespec time;
asapo_stream_info_get_timestamp_last_entry(s1,&time);
- ASSERT_EQ_INT(0,time.tv_sec,"stream 1 lastentry sec");
- ASSERT_EQ_INT(1000,time.tv_nsec,"stream 1 lastentry nsec");
+ ASSERT_EQ_INT(0,(uint64_t)time.tv_sec,"stream 1 lastentry sec");
+ ASSERT_EQ_INT(1000,(uint64_t)time.tv_nsec,"stream 1 lastentry nsec");
asapo_stream_info_get_timestamp_created(s2,&time);
- ASSERT_EQ_INT(0,time.tv_sec,"stream 2 timestamp_created sec");
- ASSERT_EQ_INT(2000,time.tv_nsec,"stream 2 timestamp_created nsec");
+ ASSERT_EQ_INT(0,(uint64_t)time.tv_sec,"stream 2 timestamp_created sec");
+ ASSERT_EQ_INT(2000,(uint64_t)time.tv_nsec,"stream 2 timestamp_created nsec");
asapo_free_handle(&s0);
asapo_free_handle(&s1);
asapo_free_handle(&s2);
@@ -214,7 +214,7 @@ void test_single(AsapoConsumerHandle consumer, AsapoStringHandle group_id) {
// acknowledges
int64_t id = asapo_consumer_get_last_acknowledged_message(consumer,group_id, "default", &err);
ASSERT_TRUE(asapo_error_get_type(err) == kNoData,"last ack default stream no data");
- ASSERT_EQ_INT(-1,id,"last ack default stream no data id = -1");
+ ASSERT_EQ_INT(0,(uint64_t)id+1,"last ack default stream no data id = -1");
AsapoIdListHandle nacks = asapo_consumer_get_unacknowledged_messages(consumer, group_id, 0, 0, "default", &err);
EXIT_IF_ERROR("asapo_consumer_get_unacknowledged_messages", err);
@@ -244,6 +244,9 @@ void test_single(AsapoConsumerHandle consumer, AsapoStringHandle group_id) {
}
int main(int argc, char* argv[]) {
+ if (argc <4) {
+ abort();
+ }
const char *endpoint = argv[1];
const char *beamtime = argv[2];
const char *token = argv[3];
@@ -259,6 +262,11 @@ int main(int argc, char* argv[]) {
&err);
EXIT_IF_ERROR("create consumer", err);
+ AsapoStringHandle group_id2 = asapo_string_from_c_str("hello");
+ printf("%s\n",asapo_string_c_str(group_id2));
+// ASSERT_EQ_STRING("hello",asapo_string_c_str(group_id2),"asapo str <-> string");
+
+
asapo_consumer_set_timeout(consumer, 1000ull);
@@ -277,10 +285,12 @@ int main(int argc, char* argv[]) {
test_datasets(consumer,group_id);
}
+
asapo_free_handle(&err);
asapo_free_handle(&cred);
asapo_free_handle(&consumer);
asapo_free_handle(&group_id);
+ asapo_free_handle(&group_id2);
return EXIT_SUCCESS;
}
diff --git a/tests/automatic/consumer/next_multithread_broker/next_multithread_broker.cpp b/tests/automatic/consumer/next_multithread_broker/next_multithread_broker.cpp
index 4be2fc5524f0fce0163670d4554bad6b780f1b31..eb8c03c6f872c1c098d702e57f4dc071b5f1367f 100644
--- a/tests/automatic/consumer/next_multithread_broker/next_multithread_broker.cpp
+++ b/tests/automatic/consumer/next_multithread_broker/next_multithread_broker.cpp
@@ -5,14 +5,14 @@
#include "asapo/consumer/consumer.h"
#include "testing.h"
-void Assert(std::vector<asapo::MessageMetas> message_metas, int nthreads, int nfiles) {
+void Assert(std::vector<asapo::MessageMetas> message_metas, uint64_t nthreads, int nfiles) {
std::vector<std::string> expect, result;
for (int i = 1; i <= nfiles; i++) {
expect.push_back(std::to_string(i));
}
int nfiles_read = 0;
- for (int i = 0; i < nthreads; i++) {
- nfiles_read += message_metas[i].size();
+ for (uint64_t i = 0; i < nthreads; i++) {
+ nfiles_read += static_cast<int>(message_metas[i].size());
for (const auto& fi : message_metas[i]) {
result.push_back(fi.name);
}
@@ -33,7 +33,7 @@ struct Args {
std::string server;
std::string run_name;
std::string token;
- int nthreads;
+ size_t nthreads;
int nfiles;
};
@@ -44,7 +44,7 @@ Args GetArgs(int argc, char* argv[]) {
}
std::string server{argv[1]};
std::string source_name{argv[2]};
- int nthreads = std::stoi(argv[3]);
+ size_t nthreads = static_cast<size_t>(std::stoi(argv[3]));
int nfiles = std::stoi(argv[4]);
std::string token{argv[5]};
@@ -67,7 +67,7 @@ void TestAll(const Args& args) {
auto group_id = consumer->GenerateNewGroupId(&err);
consumer->SetTimeout(10000);
std::vector<asapo::MessageMetas>message_metas(args.nthreads);
- auto exec_next = [&](int i) {
+ auto exec_next = [&](size_t i) {
asapo::MessageMeta fi;
while ((err = consumer->GetNext(group_id, &fi, nullptr, "default")) == nullptr) {
message_metas[i].emplace_back(fi);
@@ -76,7 +76,7 @@ void TestAll(const Args& args) {
};
std::vector<std::thread> threads;
- for (int i = 0; i < args.nthreads; i++) {
+ for (size_t i = 0; i < args.nthreads; i++) {
threads.emplace_back(std::thread(exec_next, i));
}
diff --git a/tests/automatic/full_chain/send_recv_streams/send_recv_streams.cpp b/tests/automatic/full_chain/send_recv_streams/send_recv_streams.cpp
index 94227abe2238fd4dad86b0bf33c354cc7b30e339..cce8e600741ede934e6e7b1fa02d1d10aaa3be4c 100644
--- a/tests/automatic/full_chain/send_recv_streams/send_recv_streams.cpp
+++ b/tests/automatic/full_chain/send_recv_streams/send_recv_streams.cpp
@@ -26,7 +26,7 @@ struct Args {
std::string token;
};
-void ProcessAfterSend(asapo::RequestCallbackPayload payload, asapo::Error err) {
+void ProcessAfterSend(asapo::RequestCallbackPayload, asapo::Error err) {
if (err) {
std::cerr << "Data was not successfully send: " << err << std::endl;
return;
diff --git a/tests/automatic/mongo_db/auto_id/auto_id.cpp b/tests/automatic/mongo_db/auto_id/auto_id.cpp
index b138e88f6c38c96b518b1d88f34b401895fd6f51..019017e3e2041cb968be43c4b3a47ef5f9b9c84d 100644
--- a/tests/automatic/mongo_db/auto_id/auto_id.cpp
+++ b/tests/automatic/mongo_db/auto_id/auto_id.cpp
@@ -59,7 +59,7 @@ void insert(const asapo::MongoDBClient& db, const std::string& name, asapo::Mess
fi.id = 0;
break;
case Mode::kUpdateCounterThenIngest:
- fi.id = start + i + 1;
+ fi.id = start + static_cast<uint64_t>(i) + 1;
break;
default:
abort();
@@ -90,7 +90,7 @@ int main(int argc, char* argv[]) {
fi.timestamp = std::chrono::system_clock::now();
fi.buf_id = 18446744073709551615ull;
fi.source = "host:1234";
- fi.id = args.n_messages_per_thread * i;
+ fi.id = static_cast<uint64_t>(args.n_messages_per_thread * i);
db.Connect("127.0.0.1", db_name);
insert(db, "stream", fi, args);
};
@@ -105,14 +105,15 @@ int main(int argc, char* argv[]) {
thread.join();
}
- auto messages_sent = global_count.load();
+ uint64_t messages_sent = global_count.load();
- printf("Sent %llu messages \n", messages_sent);
- M_AssertTrue(messages_sent == args.n_threads * args.n_messages_per_thread);
+ printf("Sent %llu messages \n", static_cast<unsigned long long>(messages_sent));
+ M_AssertTrue(messages_sent == static_cast<uint64_t>(args.n_threads * args.n_messages_per_thread));
auto t2 = high_resolution_clock::now();
- auto ms_int = duration_cast<milliseconds>(t2 - t1).count();
- printf("mode: %s, throughput %llu messages/sec with %d threads\n", args.str_mode.c_str(), 1000 * messages_sent / ms_int,
+ auto ms_int = static_cast<unsigned int>(duration_cast<milliseconds>(t2 - t1).count());
+ printf("mode: %s, throughput %llu messages/sec with %d threads\n", args.str_mode.c_str(),
+ static_cast<unsigned long long>(1000 * messages_sent / ms_int),
args.n_threads);
asapo::MongoDBClient db;
diff --git a/tests/automatic/mongo_db/insert_retrieve/insert_retrieve_mongodb.cpp b/tests/automatic/mongo_db/insert_retrieve/insert_retrieve_mongodb.cpp
index 68f790722ca2abc1d7d2219b68d560de3e02f557..2e51f8eac29661a3645a63d7eb8d98f70e2870b2 100644
--- a/tests/automatic/mongo_db/insert_retrieve/insert_retrieve_mongodb.cpp
+++ b/tests/automatic/mongo_db/insert_retrieve/insert_retrieve_mongodb.cpp
@@ -42,7 +42,7 @@ std::string GenRandomString(int len) {
"abcdefghijklmnopqrstuvwxyz";
for (int i = 0; i < len; ++i) {
- s += alphanum[rand() % (sizeof(alphanum) - 1)];
+ s += alphanum[static_cast<size_t>(rand()) % (sizeof(alphanum) - 1)];
}
return s;
@@ -55,7 +55,7 @@ int main(int argc, char* argv[]) {
asapo::MessageMeta fi;
fi.size = 100;
fi.name = "relpath/1";
- fi.id = args.file_id;
+ fi.id = static_cast<uint64_t>(args.file_id);
fi.timestamp = std::chrono::system_clock::now();
fi.buf_id = 18446744073709551615ull;
fi.source = "host:1234";
diff --git a/tests/automatic/mongo_db/insert_retrieve_dataset/insert_retrieve_dataset_mongodb.cpp b/tests/automatic/mongo_db/insert_retrieve_dataset/insert_retrieve_dataset_mongodb.cpp
index b6ffe373fb29c8f97f9ad5cadd368383c218ea8a..4217c48e68601c211beba898c5d0bb9b752af71c 100644
--- a/tests/automatic/mongo_db/insert_retrieve_dataset/insert_retrieve_dataset_mongodb.cpp
+++ b/tests/automatic/mongo_db/insert_retrieve_dataset/insert_retrieve_dataset_mongodb.cpp
@@ -40,7 +40,7 @@ int main(int argc, char* argv[]) {
fi.timestamp = std::chrono::system_clock::now();
fi.buf_id = 18446744073709551615ull;
fi.source = "host:1234";
- fi.id = args.file_id;
+ fi.id = static_cast<uint64_t>(args.file_id);
fi.dataset_substream = 10;
uint64_t dataset_size = 2;
diff --git a/tests/automatic/producer/beamtime_metadata/beamtime_metadata.cpp b/tests/automatic/producer/beamtime_metadata/beamtime_metadata.cpp
index 65054a791bdf64f41473bae37a08d33b09e9052e..e0639f5f6a426fd88176d9b3aa1b6fe104371a79 100644
--- a/tests/automatic/producer/beamtime_metadata/beamtime_metadata.cpp
+++ b/tests/automatic/producer/beamtime_metadata/beamtime_metadata.cpp
@@ -32,7 +32,7 @@ void ProcessCommandArguments(int argc, char* argv[], Args* args) {
try {
args->discovery_service_endpoint = argv[1];
args->beamtime_id = argv[2];
- args->mode = std::stoull(argv[3]);
+ args->mode = std::stoi(argv[3]);
PrintCommandArguments(*args);
return;
} catch (std::exception& e) {
@@ -42,7 +42,7 @@ void ProcessCommandArguments(int argc, char* argv[], Args* args) {
}
}
-void ProcessAfterSend(asapo::RequestCallbackPayload payload, asapo::Error err) {
+void ProcessAfterSend(asapo::RequestCallbackPayload, asapo::Error err) {
if (err) {
std::cerr << "metadata was not successfully send: " << err << std::endl;
return;
@@ -53,8 +53,8 @@ void ProcessAfterSend(asapo::RequestCallbackPayload payload, asapo::Error err) {
}
bool SendMetaData(asapo::Producer* producer) {
-
- auto err = producer->SendMetadata("hello", &ProcessAfterSend);
+ auto mode = asapo::MetaIngestMode{asapo::MetaIngestOp::kReplace, true};
+ auto err = producer->SendBeamtimeMetadata("hello", mode, &ProcessAfterSend);
if (err) {
std::cerr << "Cannot send metadata: " << err << std::endl;
return false;
diff --git a/tests/automatic/spd_logger/console/CMakeLists.txt b/tests/automatic/spd_logger/console/CMakeLists.txt
index 398f0e7815c8b2ceea4747799949dc47cc61e5ea..9f51b9acd7d2ddfb8417818a6166c573e35bc0a8 100644
--- a/tests/automatic/spd_logger/console/CMakeLists.txt
+++ b/tests/automatic/spd_logger/console/CMakeLists.txt
@@ -6,7 +6,7 @@ set(SOURCE_FILES spd_logger_console.cpp)
# Executable and link
################################
add_executable(${TARGET_NAME} ${SOURCE_FILES} $<TARGET_OBJECTS:logger> $<TARGET_OBJECTS:curl_http_client> $<TARGET_OBJECTS:system_io>)
-target_link_libraries(${TARGET_NAME} ${CURL_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
+target_link_libraries(${TARGET_NAME} CURL::libcurl ${CMAKE_THREAD_LIBS_INIT})
target_include_directories(${TARGET_NAME} PUBLIC ${ASAPO_CXX_COMMON_INCLUDE_DIR})
diff --git a/tests/automatic/spd_logger/console/spd_logger_console.cpp b/tests/automatic/spd_logger/console/spd_logger_console.cpp
index af2ae9113e6c1125226d6636e3ee7be4b3361b8f..bf6667457f0aea5d2f0b94a228d80b39613e323d 100644
--- a/tests/automatic/spd_logger/console/spd_logger_console.cpp
+++ b/tests/automatic/spd_logger/console/spd_logger_console.cpp
@@ -5,7 +5,7 @@
using namespace asapo;
-int main(int argc, char* argv[]) {
+int main() {
auto logger = CreateDefaultLoggerBin("test_logger");
diff --git a/tests/automatic/spd_logger/fluentd/CMakeLists.txt b/tests/automatic/spd_logger/fluentd/CMakeLists.txt
index 017f3905bcdc7fdd44dab3d7a6a86c2e809494bf..f9ab76fae6baaa6bde74cc65be2790158c036162 100644
--- a/tests/automatic/spd_logger/fluentd/CMakeLists.txt
+++ b/tests/automatic/spd_logger/fluentd/CMakeLists.txt
@@ -7,7 +7,7 @@ set(SOURCE_FILES spd_logger_fluentd.cpp)
################################
add_executable(${TARGET_NAME} ${SOURCE_FILES} $<TARGET_OBJECTS:logger> $<TARGET_OBJECTS:curl_http_client> $<TARGET_OBJECTS:system_io>)
target_include_directories(${TARGET_NAME} PUBLIC ${ASAPO_CXX_COMMON_INCLUDE_DIR})
-target_link_libraries(${TARGET_NAME} ${CURL_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
+target_link_libraries(${TARGET_NAME} CURL::libcurl ${CMAKE_THREAD_LIBS_INIT})
################################
# Testing
diff --git a/tests/automatic/spd_logger/fluentd/spd_logger_fluentd.cpp b/tests/automatic/spd_logger/fluentd/spd_logger_fluentd.cpp
index 609f07e42d0ed9d3396f42b567998d2e5a2eec9e..42c19b5e9b96f0c186dcf7d1b2b1341865001970 100644
--- a/tests/automatic/spd_logger/fluentd/spd_logger_fluentd.cpp
+++ b/tests/automatic/spd_logger/fluentd/spd_logger_fluentd.cpp
@@ -5,7 +5,7 @@
using namespace asapo;
-int main(int argc, char* argv[]) {
+int main() {
auto logger = CreateDefaultLoggerApi("test_central", "http://localhost:9880/asapo");
diff --git a/tests/automatic/system_io/ip_tcp_network/client_serv/ip_tcp_network.cpp b/tests/automatic/system_io/ip_tcp_network/client_serv/ip_tcp_network.cpp
index 68986918582c0947cb165b0ad404e98a7d676bb0..c551e5f8010dbf5e0280c04a6813ef885a942c8b 100644
--- a/tests/automatic/system_io/ip_tcp_network/client_serv/ip_tcp_network.cpp
+++ b/tests/automatic/system_io/ip_tcp_network/client_serv/ip_tcp_network.cpp
@@ -109,7 +109,7 @@ void CheckNormal(int times, size_t size) {
std::cout << "[CLIENT] Allocate and create random numbers" << std::endl;
std::unique_ptr<uint8_t[]> buffer(new uint8_t[size]);
for (size_t i = 0; i < size; i++) {
- buffer[i] = rand();
+ buffer[i] = static_cast<uint8_t>(256 * rand() / RAND_MAX);
}
FILE* out = fopen("sent", "wb");
@@ -169,7 +169,7 @@ void CheckNormal(int times, size_t size) {
ExitIfErrIsNotOk(&err, 108);
}
-int main(int argc, char* argv[]) {
+int main() {
Error err;
std::cout << "[META] Check if connection is refused if server is not running" << std::endl;
io->CreateAndConnectIPTCPSocket(kListenAddress, &err);
diff --git a/tests/automatic/system_io/ip_tcp_network/client_serv_multicon/multicon.cpp b/tests/automatic/system_io/ip_tcp_network/client_serv_multicon/multicon.cpp
index dbf0bf3a9e8ece0840fb15ed4a18bff4be5c6151..7e914d0252ea640d9184eec27443388dd89e0859 100644
--- a/tests/automatic/system_io/ip_tcp_network/client_serv_multicon/multicon.cpp
+++ b/tests/automatic/system_io/ip_tcp_network/client_serv_multicon/multicon.cpp
@@ -86,7 +86,7 @@ void CheckNormal(int times) {
for (int i = 0; i < times; i++) {
std::cout << "[CLIENT] send random number" << std::endl;
- uint64_t message_send = rand();
+ uint64_t message_send = static_cast<uint64_t>(rand());
std::cout << "[CLIENT] Send Size" << std::endl;
io->Send(socket, &message_send, sizeof(uint64_t), &err);
@@ -105,7 +105,7 @@ void CheckNormal(int times) {
ExitIfErrIsNotOk(&err, 108);
}
-int main(int argc, char* argv[]) {
+int main() {
Error err;
std::unique_ptr<std::thread> server_thread = CreateEchoServerThread();
//server_thread->detach();
diff --git a/tests/automatic/system_io/read_file_content/read_file_content.cpp b/tests/automatic/system_io/read_file_content/read_file_content.cpp
index 743fb25e2f302451dfdcc6387a4ab3510feb1b1f..289a0aab39ae78a6c14b04ca1c5fd0066590c922 100644
--- a/tests/automatic/system_io/read_file_content/read_file_content.cpp
+++ b/tests/automatic/system_io/read_file_content/read_file_content.cpp
@@ -27,7 +27,7 @@ int main(int argc, char* argv[]) {
if (err == nullptr) {
for(unsigned int i = 0; i < expect.size(); i++)
- result += data[i];
+ result += static_cast<char>(data[i]);
} else {
result = err->Explain();
}
diff --git a/tests/automatic/system_io/read_folder_content/read_folder_content.cpp b/tests/automatic/system_io/read_folder_content/read_folder_content.cpp
index a820b7a499d5dcef478b3d85362e1745c24d68ea..8867f6d27b9568953fbd135fe379820ccdaa217d 100644
--- a/tests/automatic/system_io/read_folder_content/read_folder_content.cpp
+++ b/tests/automatic/system_io/read_folder_content/read_folder_content.cpp
@@ -19,11 +19,11 @@ int main(int argc, char* argv[]) {
std::string result{};
if (err == nullptr) {
- int64_t id = 0;
+ uint64_t id = 0;
for(auto message_meta : files) {
M_AssertEq(message_meta.id, ++id);
if (message_meta.name == "1") {
- M_AssertEq(4, message_meta.size);
+ M_AssertEq(static_cast<uint64_t>(4), message_meta.size);
}
result += message_meta.name;
}
diff --git a/tests/automatic/system_io/resolve_hostname_to_ip/resolve_hostname_to_ip.cpp b/tests/automatic/system_io/resolve_hostname_to_ip/resolve_hostname_to_ip.cpp
index ee18ea3920010dc207f2d812345de46982653d6b..7e53dd64b053e5fe385677bf4c912d7a2b589df1 100644
--- a/tests/automatic/system_io/resolve_hostname_to_ip/resolve_hostname_to_ip.cpp
+++ b/tests/automatic/system_io/resolve_hostname_to_ip/resolve_hostname_to_ip.cpp
@@ -19,7 +19,7 @@ void Check(const std::string& expected_ip_address, const std::string& hostname)
M_AssertEq(expected_ip_address, ip_address);
}
-int main(int argc, char* argv[]) {
+int main() {
Check("127.0.0.1", "localhost");
Check("8.8.8.8", "google-public-dns-a.google.com");
Check("8.8.4.4", "google-public-dns-b.google.com");
diff --git a/tests/automatic/system_io/write_data_to_file/write_data_to_file.cpp b/tests/automatic/system_io/write_data_to_file/write_data_to_file.cpp
index 5cbe7939899823846e3459bea39279d74357ff82..4e0bbfc2c0b3f52303b1a80aedb6ed76a821e66e 100644
--- a/tests/automatic/system_io/write_data_to_file/write_data_to_file.cpp
+++ b/tests/automatic/system_io/write_data_to_file/write_data_to_file.cpp
@@ -27,7 +27,7 @@ Args GetParams(int argc, char* argv[]) {
return Args{fname, result, message, 3};
}
-void AssertGoodResult(const std::unique_ptr<IO>& io, const Error& err, const MessageData& data,
+void AssertGoodResult(const std::unique_ptr<IO>& io, const Error& err, const MessageData&,
const Args& params) {
if (err) {
std::cerr << err << std::endl;
@@ -52,7 +52,7 @@ int main(int argc, char* argv[]) {
auto params = GetParams(argc, argv);
auto io = std::unique_ptr<asapo::IO> {asapo::GenerateDefaultIO()};
- auto array = new uint8_t[params.length] {'1', '2', '3'};
+ auto array = new uint8_t[3] {'1', '2', '3'};
MessageData data{array};
auto err = io->WriteDataToFile("", params.fname, data, params.length, true, true);
@@ -60,7 +60,7 @@ int main(int argc, char* argv[]) {
if (params.result == "ok") {
AssertGoodResult(io, err, data, params);
// check allow_overwrite works
- auto err = io->WriteDataToFile("", params.fname, data, params.length, true, false);
+ err = io->WriteDataToFile("", params.fname, data, params.length, true, false);
params.message = asapo::IOErrorTemplates::kFileAlreadyExists.Generate()->Explain();
AssertBadResult(err, params);
} else {
diff --git a/tests/manual/asapo_fabric/CMakeLists.txt b/tests/manual/asapo_fabric/CMakeLists.txt
index ca48a6f6a30529e2ef79f47e2e25c9fb09d87cd7..84b2cd121ae782cb551c90b0c171d34578ed1e43 100644
--- a/tests/manual/asapo_fabric/CMakeLists.txt
+++ b/tests/manual/asapo_fabric/CMakeLists.txt
@@ -1,7 +1,7 @@
GET_PROPERTY(ASAPO_COMMON_FABRIC_LIBRARIES GLOBAL PROPERTY ASAPO_COMMON_FABRIC_LIBRARIES)
add_executable(example-fabric-server fabric_server.cpp $<TARGET_OBJECTS:logger> $<TARGET_OBJECTS:curl_http_client>)
-target_link_libraries(example-fabric-server asapo-fabric ${CURL_LIBRARIES} ${ASAPO_COMMON_FABRIC_LIBRARIES})
+target_link_libraries(example-fabric-server asapo-fabric CURL::libcurl ${ASAPO_COMMON_FABRIC_LIBRARIES})
add_executable(example-fabric-client fabric_client.cpp)
target_link_libraries(example-fabric-client asapo-fabric ${ASAPO_COMMON_FABRIC_LIBRARIES})
diff --git a/tests/manual/asapo_fabric/fabric_client.cpp b/tests/manual/asapo_fabric/fabric_client.cpp
index 462a84f7c030005b7f761f86d75e4fbe8863f79f..843e470abdc44dde1d83ddb779bbb41d04091bf5 100644
--- a/tests/manual/asapo_fabric/fabric_client.cpp
+++ b/tests/manual/asapo_fabric/fabric_client.cpp
@@ -38,7 +38,7 @@ int main(int argc, char* argv[]) {
return 1;
}
- size_t dataBufferSize = 1024 * kByte;
+ size_t dataBufferSize = static_cast<size_t>(1024 * kByte);
MessageData dataBuffer = MessageData{new uint8_t[dataBufferSize]};
std::cout << "Expected file size: " << dataBufferSize << " byte" << std::endl;
@@ -59,7 +59,7 @@ int main(int argc, char* argv[]) {
auto start = std::chrono::system_clock::now();
std::cout << "Starting message loop" << std::endl;
- for (FabricMessageId messageId = 0; messageId < count && !error; messageId++) {
+ for (FabricMessageId messageId = 0; messageId < static_cast<FabricMessageId>(count) && !error; messageId++) {
GenericRequestHeader request{};
memcpy(&request.message, mr->GetDetails(), sizeof(MemoryRegionDetails));
client->Send(serverAddress, messageId, &request, sizeof(request), &error);
diff --git a/tests/manual/asapo_fabric/fabric_server.cpp b/tests/manual/asapo_fabric/fabric_server.cpp
index 981840e6ec785bb7b7dfc2dc48fc693a55fc1bab..4e2f549ecd28110f546dc25e80be379a07fee0cd 100644
--- a/tests/manual/asapo_fabric/fabric_server.cpp
+++ b/tests/manual/asapo_fabric/fabric_server.cpp
@@ -68,7 +68,7 @@ int main(int argc, char* argv[]) {
std::cout << "Server is listening on " << server->GetAddress() << std::endl;
- size_t dataBufferSize = 1024 * kByte;
+ size_t dataBufferSize = static_cast<size_t>(1024 * kByte);
MessageData dataBuffer = MessageData{new uint8_t[dataBufferSize]};
strcpy((char*)dataBuffer.get(), "I (the server) wrote into your buffer.");
std::cout << "Expected file size: " << dataBufferSize << " byte" << std::endl;
diff --git a/tests/manual/performance_broker_receiver/getlast_broker.cpp b/tests/manual/performance_broker_receiver/getlast_broker.cpp
index 56bcd29288453544ba08a69b1751cce9fd4e893f..ff58c1f5b7d50c1baf904daa494e3db58815ebf0 100644
--- a/tests/manual/performance_broker_receiver/getlast_broker.cpp
+++ b/tests/manual/performance_broker_receiver/getlast_broker.cpp
@@ -35,7 +35,7 @@ struct Args {
std::string beamtime_id;
std::string token;
int timeout_ms;
- int nthreads;
+ size_t nthreads;
bool read_data;
bool datasets;
};
@@ -57,7 +57,7 @@ std::vector<std::thread> StartThreads(const Args& params,
std::vector<int>* errors,
std::vector<int>* nbuf,
std::vector<int>* nfiles_total) {
- auto exec_next = [¶ms, nfiles, errors, nbuf, nfiles_total](int i) {
+ auto exec_next = [¶ms, nfiles, errors, nbuf, nfiles_total](size_t i) {
asapo::MessageMeta fi;
Error err;
auto consumer = asapo::ConsumerFactory::CreateConsumer(params.server, params.file_path, true,
@@ -111,7 +111,7 @@ std::vector<std::thread> StartThreads(const Args& params,
};
std::vector<std::thread> threads;
- for (int i = 0; i < params.nthreads; i++) {
+ for (size_t i = 0; i < params.nthreads; i++) {
threads.emplace_back(std::thread(exec_next, i));
}
return threads;
@@ -138,12 +138,12 @@ int ReadAllData(const Args& params, uint64_t* duration_ms, int* nerrors, int* nb
system_clock::time_point t2 = system_clock::now();
auto duration_read = std::chrono::duration_cast<std::chrono::milliseconds>(t2 - t1);
- *duration_ms = duration_read.count();
+ *duration_ms = static_cast<uint64_t>(duration_read.count());
// The following two loops will check if all threads that processed some data were using the same network type
{
- int firstThreadThatActuallyProcessedData = 0;
- for (int i = 0; i < params.nthreads; i++) {
+ size_t firstThreadThatActuallyProcessedData = 0;
+ for (size_t i = 0; i < params.nthreads; i++) {
if (nfiles[i] > 0) {
firstThreadThatActuallyProcessedData = i;
break;
@@ -151,7 +151,7 @@ int ReadAllData(const Args& params, uint64_t* duration_ms, int* nerrors, int* nb
}
*connection_type = connection_types[firstThreadThatActuallyProcessedData];
- for (int i = 0; i < params.nthreads; i++) {
+ for (size_t i = 0; i < params.nthreads; i++) {
if (*connection_type != connection_types[i] && nfiles[i] > 0) {
// The output will look like this:
// ERROR thread[0](processed 5 files) connection type is 'No connection' but thread[1](processed 3 files) is 'TCP'
@@ -181,7 +181,7 @@ int main(int argc, char* argv[]) {
params.server = std::string{argv[1]};
params.file_path = std::string{argv[2]};
params.beamtime_id = std::string{argv[3]};
- params.nthreads = atoi(argv[4]);
+ params.nthreads = static_cast<size_t>(atoi(argv[4]));
params.token = std::string{argv[5]};
params.timeout_ms = atoi(argv[6]);
params.read_data = atoi(argv[7]) != 1;
@@ -203,7 +203,8 @@ int main(int argc, char* argv[]) {
}
std::cout << "Errors : " << nerrors << std::endl;
std::cout << "Elapsed : " << duration_ms << "ms" << std::endl;
- std::cout << "Rate : " << 1000.0f * nfiles / (duration_ms) << " Hz" << std::endl;
+ std::cout << "Rate : " << 1000.0f * static_cast<float>(nfiles) / (static_cast<float>
+ (duration_ms)) << " Hz" << std::endl;
std::cout << "Using connection type: " << ConnectionTypeToString(connectionType) << std::endl;
diff --git a/tests/manual/producer_cpp/producer.cpp b/tests/manual/producer_cpp/producer.cpp
index 151b055db8b25d01c678bd47a05da9025b8a269b..78aa3c0daf23809255e49596b56d39196666404c 100644
--- a/tests/manual/producer_cpp/producer.cpp
+++ b/tests/manual/producer_cpp/producer.cpp
@@ -38,10 +38,10 @@ int main(int argc, char* argv[]) {
if(argc >= 2)
- submodule = atoi(argv[1]);
+ submodule = static_cast<uint32_t>(atoi(argv[1]));
if(argc >= 3)
- sleeptime = atoi(argv[2]);
+ sleeptime = static_cast<uint32_t>(atoi(argv[2]));
asapo::Error err;
@@ -53,7 +53,6 @@ int main(int argc, char* argv[]) {
asapo::SourceCredentials{asapo::SourceType::kProcessed, beamtime, "", "", ""}, 60000, &err);
exit_if_error("Cannot start producer", err);
- uint32_t eventid = 1;
uint32_t start_number = 1;
// number of files per acquistion per module