[EN-7409] Implement WriteTapeFile sample

dxFeed · Aug 29, 2023 · b91f904 · b91f904
1 parent 7250775
commit b91f904
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 16 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -39,7 +39,7 @@ option(DXFCXX_INSTALL_LIB "Prepare install the libraries" ON)
 option(DXFCXX_INSTALL_SAMPLES "Prepare install the samples" ${DXFCXX_IS_ROOT_PROJECT})
 option(DXFCXX_INSTALL_TOOLS "Prepare install the tools" ${DXFCXX_IS_ROOT_PROJECT})
 option(DXFCXX_USE_DXFEED_GRAAL_NATIVE_SDK_JFROG "" ON)
-set(DXFEED_GRAAL_NATIVE_SDK_VERSION "1.0.1" CACHE STRING "")
+set(DXFEED_GRAAL_NATIVE_SDK_VERSION "1.0.2" CACHE STRING "")
 set(DXFEED_GRAAL_NATIVE_SDK_JFROG_BASE_URL "https://dxfeed.jfrog.io/artifactory/maven-open/com/dxfeed/graal-native-sdk/" CACHE STRING "")
 
 option(DXFCXX_ENABLE_ASAN_UBSAN "Enable address, UB sanitizers etc" OFF)
@@ -249,6 +249,12 @@ target_compile_definitions(${PROJECT_NAME} PRIVATE
 target_link_libraries(${PROJECT_NAME}_static PUBLIC DxFeedGraalNativeSdk utf8cpp fmt::fmt-header-only PUBLIC ${PROJECT_NAME}_CompilerOptions)
 target_link_libraries(${PROJECT_NAME} PUBLIC DxFeedGraalNativeSdk utf8cpp fmt::fmt-header-only PUBLIC ${PROJECT_NAME}_CompilerOptions)
 
+if (DXFCXX_ENABLE_ASAN_UBSAN)
+    target_compile_options(${PROJECT_NAME} PRIVATE "-fsanitize=address" "-fsanitize=undefined" "-fPIC")
+    target_link_options(${PROJECT_NAME} PRIVATE "-fsanitize=address" "-fsanitize=undefined" "-fPIC")
+    target_link_libraries(${PROJECT_NAME} PUBLIC asan ubsan)
+endif ()
+
 add_custom_command(TARGET ${PROJECT_NAME}_static POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different
         $<TARGET_FILE:DxFeedGraalNativeSdk> $<TARGET_FILE_DIR:${PROJECT_NAME}_static>)
 add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different

diff --git a/samples/cpp/WriteTapeFile/CMakeLists.txt b/samples/cpp/WriteTapeFile/CMakeLists.txt
@@ -33,13 +33,6 @@ elseif (UNIX)
     set(CMAKE_INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}:$ORIGIN/../lib64:$ORIGIN/../lib:$ORIGIN")
 endif ()
 
-if (DXFCXX_ENABLE_ASAN_UBSAN)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fsanitize=undefined")
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address -fsanitize=undefined")
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address -fsanitize=undefined")
-    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fsanitize=address -fsanitize=undefined")
-endif ()
-
 add_executable(${PROJECT_NAME} src/main.cpp)
 
 if (DXFCXX_ENABLE_VS_ASAN)
@@ -55,15 +48,20 @@ if (DXFCXX_ENABLE_VS_ASAN)
     )
 endif ()
 
+if (DXFCXX_ENABLE_ASAN_UBSAN)
+    target_compile_options(${PROJECT_NAME} PRIVATE "-fsanitize=address" "-fsanitize=undefined" "-fPIC")
+    target_link_options(${PROJECT_NAME} PRIVATE "-fsanitize=address" "-fsanitize=undefined" "-fPIC")
+endif ()
+
 target_include_directories(${PROJECT_NAME} PRIVATE ../../../include)
 
-target_link_libraries(${PROJECT_NAME} PRIVATE dxfcxx::static)
-#target_link_libraries(${PROJECT_NAME} PRIVATE dxfcxx)
-#target_compile_definitions(${PROJECT_NAME} PRIVATE DXFCPP_USE_DLLS)
+#target_link_libraries(${PROJECT_NAME} PRIVATE dxfcxx::static)
+target_link_libraries(${PROJECT_NAME} PRIVATE dxfcxx)
+target_compile_definitions(${PROJECT_NAME} PRIVATE DXFCPP_USE_DLLS)
 
 add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different
         $<TARGET_FILE:dxfcxx::graal>
-        #        $<TARGET_FILE:dxfcxx>
+        $<TARGET_FILE:dxfcxx>
         #        ${CMAKE_CURRENT_SOURCE_DIR}/dxfeed.properties
         $<TARGET_FILE_DIR:${PROJECT_NAME}>)
 

diff --git a/samples/cpp/WriteTapeFile/src/main.cpp b/samples/cpp/WriteTapeFile/src/main.cpp
@@ -32,4 +32,6 @@ int main() {
     // Wait until all data is written, close, and wait until it closes.
     endpoint->awaitProcessed();
     endpoint->closeAndAwaitTermination();
+
+    return 0;
 }
diff --git a/src/event/candle/CandleSession.cpp b/src/event/candle/CandleSession.cpp
@@ -8,6 +8,11 @@
 
 namespace dxfcpp {
 
+const SessionType SessionType::NO_TRADING{"NO_TRADING", false};
+const SessionType SessionType::PRE_MARKET{"PRE_MARKET", true};
+const SessionType SessionType::REGULAR{"REGULAR", true};
+const SessionType SessionType::AFTER_MARKET{"AFTER_MARKET", true};
+
 const SessionFilter SessionFilter::ANY{std::nullopt, std::nullopt};
 const SessionFilter SessionFilter::TRADING{std::nullopt, true};
 const SessionFilter SessionFilter::NON_TRADING{std::nullopt, false};

diff --git a/src/schedule/SessionType.cpp b/src/schedule/SessionType.cpp
@@ -8,9 +8,6 @@
 
 namespace dxfcpp {
 
-const SessionType SessionType::NO_TRADING{"NO_TRADING", false};
-const SessionType SessionType::PRE_MARKET{"PRE_MARKET", true};
-const SessionType SessionType::REGULAR{"REGULAR", true};
-const SessionType SessionType::AFTER_MARKET{"AFTER_MARKET", true};
+// The SessionType static fields are initialized in CandleSession.cpp
 
 } // namespace dxfcpp