Merge pull request #156 from martinfantini/xetra_fast_timestamp

Xetra fast timestamp

Author: huangminghuang

.github/workflows/main.yml

@@ -16,7 +16,7 @@ jobs:
         run: curl -L https://archives.boost.io/release/1.72.0/source/boost_1_72_0.tar.gz | tar zx
         shell: bash
       - name: configure
-        run: cmake -Bbuild -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON
+        run: cmake -Bbuild -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DXETRA_FAST_SPECIFICATION=ON
       - name: build
         run: cmake --build build --parallel 2
       - name: test

CMakeLists.txt

@@ -9,6 +9,7 @@ project (mFAST VERSION 1.3.0 LANGUAGES CXX)
 option(BUILD_TESTS "Build tests" ON)
 option(BUILD_EXAMPLES "Build examples" ON)
 option(BUILD_PACKAGES "Build packages" ON)
+option(XETRA_FAST_SPECIFICATION "Xetra Fast 1.2 specification" OFF)
 
 # global options
 set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
@@ -96,4 +97,5 @@ message(STATUS "BUILD_SHARED_LIBS: " ${BUILD_SHARED_LIBS})
 message(STATUS "BUILD_TESTS: " ${BUILD_TESTS})
 message(STATUS "BUILD_EXAMPLES: " ${BUILD_EXAMPLES})
 message(STATUS "BUILD_PACKAGES: " ${BUILD_PACKAGES})
+message(STATUS "XETRA_FAST_SPECIFICATION: " ${XETRA_FAST_SPECIFICATION})
 message(STATUS "")

src/mfast/xml_parser/CMakeLists.txt

@@ -22,6 +22,11 @@ if (UNIX)
   set_target_properties(mfast_xml_parser_static PROPERTIES OUTPUT_NAME mfast_xml_parser)
 endif()
 
+
+if(XETRA_FAST_SPECIFICATION)
+  target_compile_definitions(mfast_xml_parser_static PRIVATE XETRA_FAST_SPECIFICATION)
+endif(XETRA_FAST_SPECIFICATION)
+
 install(TARGETS mfast_xml_parser_static 
         EXPORT  mFASTTargets
         FILE_SET HEADERS)
@@ -40,6 +45,10 @@ if (BUILD_SHARED_LIBS)
   set_property(TARGET mfast_xml_parser PROPERTY VERSION ${MFAST_VERSION})
   set_property(TARGET mfast_xml_parser PROPERTY SOVERSION ${MFAST_VERSION})
 
+  if(XETRA_FAST_SPECIFICATION)
+    target_compile_definitions(mfast_xml_parser PRIVATE XETRA_FAST_SPECIFICATION)
+  endif(XETRA_FAST_SPECIFICATION)
+
   install(TARGETS mfast_xml_parser
           EXPORT  mFASTTargets
           FILE_SET HEADERS)

src/mfast/xml_parser/templates_builder.cpp

@@ -67,6 +67,13 @@ templates_builder::templates_builder(dynamic_templates_description *definition,
       string_value_storage());
   this->member["string"] = &ascii_field_instruction_prototype;
 
+#ifdef XETRA_FAST_SPECIFICATION
+  static const int64_field_instruction timestamp_field_instruction_prototype(
+    operator_none, presence_mandatory, 0, nullptr, "", nullptr,
+    int_value_storage<int64_t>());
+  this->member["timestamp"] = &timestamp_field_instruction_prototype;
+#endif
+
   static const byte_vector_field_instruction
       byte_vector_field_instruction_prototype(
           operator_none, presence_mandatory, 0, nullptr, "", nullptr,

tests/CMakeLists.txt

@@ -26,13 +26,17 @@ FASTTYPEGEN_TARGET(simple_types14 simple14.xml)
 FASTTYPEGEN_TARGET(simple_types15 simple15.xml)
 FASTTYPEGEN_TARGET(simple_types16 simple16.xml)
 
+if(XETRA_FAST_SPECIFICATION)
+  FASTTYPEGEN_TARGET(simple_types17 simple17.xml)
+endif(XETRA_FAST_SPECIFICATION)
+
 FASTTYPEGEN_TARGET(test_types1 test1.xml test2.xml)
 FASTTYPEGEN_TARGET(test_types3 test3.xml)
 FASTTYPEGEN_TARGET(test_types4 test4.xml)
 FASTTYPEGEN_TARGET(test_types5 test5.xml)
 FASTTYPEGEN_TARGET(test_scp scp.xml)
 
-add_executable (mfast_test
+set(test_sources
                 test_main.cpp
                 arena_allocator_test.cpp
                 field_ref_test.cpp
@@ -87,6 +91,16 @@ add_executable (mfast_test
                 enum_encoder_decoder.cpp
             )
 
+if(XETRA_FAST_SPECIFICATION)
+    set(test_sources ${test_sources}
+        ${FASTTYPEGEN_simple_types17_OUTPUTS}
+        timestamp_encoder_decoder_v2.cpp
+        timestamp_encoder_decoder.cpp
+    )
+endif(XETRA_FAST_SPECIFICATION)
+
+add_executable (mfast_test ${test_sources})
+
 target_link_libraries (mfast_test
                        mfast_static
                        mfast_coder_static

tests/simple17.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" ?>
+<templates xmlns="http://www.fixprotocol.org/ns/template-definition"
+    templateNs="http://www.fixprotocol.org/ns/templates/sample"
+    ns="http://www.fixprotocol.org/ns/fix">
+  <template name="Test_1" id="1">
+    <uInt32 name="field1" id="11"><copy/></uInt32>
+    <timestamp name="TransactTime" unit="nanosecond" id="60" presence="optional"><copy/></timestamp>
+  </template>
+  <template name="Test_2" id="2">
+    <uInt32 name="field4" id="21"><copy/></uInt32>
+    <uInt32 name="field5" id="22"><copy/></uInt32>
+    <uInt32 name="field6" id="23"><copy/></uInt32>
+  </template>  
+</templates>

tests/timestamp_encoder_decoder.cpp

@@ -0,0 +1,23 @@
+#include "catch.hpp"
+#include <mfast.h>
+
+#include "fast_test_coding_case.hpp"
+#include "byte_stream.h"
+
+#include "simple17.h"
+
+using namespace test::coding;
+
+TEST_CASE("timestamp test encoder/decoder","[timestamp_encoder_decoder]")
+{
+    fast_test_coding_case<simple17::templates_description> test_case;
+    simple17::Test_1 test_1;
+    simple17::Test_1_mref test_1_mref = test_1.mref();
+    test_1_mref.set_field1().as(1);
+    test_1_mref.set_TransactTime().as(2);
+    REQUIRE(test_case.encoding(test_1.cref(),"\xF0\x81\x81\x83",true));
+    REQUIRE(test_case.decoding("\xF0\x81\x81\x83",test_1.cref(),true));
+}
+
+
+

tests/timestamp_encoder_decoder_v2.cpp

@@ -0,0 +1,20 @@
+#include "catch.hpp"
+#include <mfast.h>
+
+#include "fast_test_coding_case_v2.hpp"
+#include "byte_stream.h"
+
+#include "simple17.h"
+
+using namespace test::coding;
+
+TEST_CASE("timestamp test encoder_V2/decoder_v2","[timestamp_encoder_v2_decoder_v2]")
+{
+    fast_test_coding_case_v2<simple17::templates_description> test_case;
+    simple17::Test_1 test_1;
+    simple17::Test_1_mref test_1_mref = test_1.mref();
+    test_1_mref.set_field1().as(1);
+    test_1_mref.set_TransactTime().as(2);
+    REQUIRE(test_case.encoding(test_1.cref(),"\xF0\x81\x81\x83",true));
+    REQUIRE(test_case.decoding("\xF0\x81\x81\x83",test_1.cref(),true));
+}