From ad763582eacfefffb7a0c12562d2c68edee99e55 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Wed, 4 Oct 2017 15:30:46 +0000 Subject: [PATCH] Fixed the build some more --- src/server/sparkd/CMakeDeps.cmake | 2 +- .../orderman/components/NativeOrderMan.cpp | 6 +--- .../native_orders/NativeOrderBuilder.cpp | 30 +++++++++++++++++++ .../native_orders/NativeOrderBuilder.h | 21 +++++++++++++ .../native_orders/NativeOrderFactory.h | 22 ++++++++++++++ 5 files changed, 75 insertions(+), 6 deletions(-) create mode 100644 src/server/sparkd/orderman/native_orders/NativeOrderBuilder.cpp create mode 100644 src/server/sparkd/orderman/native_orders/NativeOrderBuilder.h create mode 100644 src/server/sparkd/orderman/native_orders/NativeOrderFactory.h diff --git a/src/server/sparkd/CMakeDeps.cmake b/src/server/sparkd/CMakeDeps.cmake index e6ad6655a..a39fe4da0 100644 --- a/src/server/sparkd/CMakeDeps.cmake +++ b/src/server/sparkd/CMakeDeps.cmake @@ -1 +1 @@ -set(sources ;cmds/CmdRegistry.cpp;cmds/Help.cpp;cmds/Run.cpp;cmds/Test.cpp;cmds/TestOrderman.cpp;event_grid/EventNode.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/store_tests.cpp;main.cpp;md/platforms/mdp3_onixs/MDP3Listener.cpp;md/platforms/mdp3_onixs/MDP3Main.cpp;md/platforms/mdp3_onixs/MDP3Utils.cpp;md/platforms/mdp3_onixs/tests/mdp3_tests.cpp;md/run_md.cpp;orderman/components/FillRecorder.cpp;orderman/components/Gateway.cpp;orderman/components/MDSource.cpp;orderman/components/NativeOrderMan.cpp;orderman/components/OrderRecorder.cpp;orderman/components/SpreaderOrderMan.cpp;orderman/events/ExecutionReport.cpp;orderman/events/NativeOrderStateChange.cpp;orderman/events/TimeChange.cpp;orderman/native_orders/NativeOrder.cpp;orderman/persistence/FillDB.cpp;orderman/persistence/OrderDB.cpp;orderman/persistence/gen_order_id.cpp;orderman/service/OrderServiceServer.cpp;orderman/spreader_orders/SpreaderOrder.cpp;orderman/utils/fix_order_codec.cpp;orderman/utils/orderman_utils.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/tests/PersistenceServiceTests.cpp;risk_limits/IRiskLimitObserver.cpp;risk_limits/RiskLimitManager.cpp;risk_limits/RiskLimiter.cpp;risk_limits/SharedRiskLimiter.cpp;risk_limits/SymbolKey.cpp;risk_limits/tests/RiskLimitsTests.cpp;securities/SecurityDB.cpp;spreader/QuoteLegPriceQuantityState.cpp;spreader/SimpleSpreader.cpp;spreader/SingleFillHedger.cpp;spreader/SingleLegQuoter.cpp;spreader/SpreaderBase.cpp;spreader/SpreaderTests.cpp;testing/catch_test_runner.cpp;user/UserServiceServer.cpp) \ No newline at end of file +set(sources ;cmds/CmdRegistry.cpp;cmds/Help.cpp;cmds/Run.cpp;cmds/Test.cpp;cmds/TestOrderman.cpp;event_grid/EventNode.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/store_tests.cpp;main.cpp;md/platforms/mdp3_onixs/MDP3Listener.cpp;md/platforms/mdp3_onixs/MDP3Main.cpp;md/platforms/mdp3_onixs/MDP3Utils.cpp;md/platforms/mdp3_onixs/tests/mdp3_tests.cpp;md/run_md.cpp;orderman/components/FillRecorder.cpp;orderman/components/Gateway.cpp;orderman/components/MDSource.cpp;orderman/components/NativeOrderMan.cpp;orderman/components/OrderRecorder.cpp;orderman/components/SpreaderOrderMan.cpp;orderman/events/ExecutionReport.cpp;orderman/events/NativeOrderStateChange.cpp;orderman/events/TimeChange.cpp;orderman/native_orders/NativeOrder.cpp;orderman/native_orders/NativeOrderBuilder.cpp;orderman/persistence/FillDB.cpp;orderman/persistence/OrderDB.cpp;orderman/persistence/gen_order_id.cpp;orderman/service/OrderServiceServer.cpp;orderman/spreader_orders/SpreaderOrder.cpp;orderman/utils/fix_order_codec.cpp;orderman/utils/orderman_utils.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/tests/PersistenceServiceTests.cpp;risk_limits/IRiskLimitObserver.cpp;risk_limits/RiskLimitManager.cpp;risk_limits/RiskLimiter.cpp;risk_limits/SharedRiskLimiter.cpp;risk_limits/SymbolKey.cpp;risk_limits/tests/RiskLimitsTests.cpp;securities/SecurityDB.cpp;spreader/QuoteLegPriceQuantityState.cpp;spreader/SimpleSpreader.cpp;spreader/SingleFillHedger.cpp;spreader/SingleLegQuoter.cpp;spreader/SpreaderBase.cpp;spreader/SpreaderTests.cpp;testing/catch_test_runner.cpp;user/UserServiceServer.cpp) \ No newline at end of file diff --git a/src/server/sparkd/orderman/components/NativeOrderMan.cpp b/src/server/sparkd/orderman/components/NativeOrderMan.cpp index 90edd1bdc..91e3eb521 100644 --- a/src/server/sparkd/orderman/components/NativeOrderMan.cpp +++ b/src/server/sparkd/orderman/components/NativeOrderMan.cpp @@ -66,12 +66,8 @@ NativeOrderMan::NativeOrderMan (config::JetFIX::Connection const&gw_connection, auto &native_state = os.native(); auto sk = SecurityKey(native_state.security_key()); auto sec = me->sec_db.resolve(sk); - if (sec) { - const std::string *rej_msg = nullptr; - if (os.reject_msg().size()) - rej_msg = &os.reject_msg(); + if (sec) me->order_map[OrderKey(os.order_key())] = std::make_unique (*sec,os); - } else { LOG(OrderMan,Error, "Cannot resolve security key {} in stored order {}. This is a serious problem. " diff --git a/src/server/sparkd/orderman/native_orders/NativeOrderBuilder.cpp b/src/server/sparkd/orderman/native_orders/NativeOrderBuilder.cpp new file mode 100644 index 000000000..cac59b68d --- /dev/null +++ b/src/server/sparkd/orderman/native_orders/NativeOrderBuilder.cpp @@ -0,0 +1,30 @@ +// #include "NativeOrderBuilder.h" + +// namespace bts { +// namespace orderman { + +// struct NativeOrderBuilder::PImpl +// { +// PImpl(KeyGenerator const&kg, +// NativeOrderHeader const&header) +// : order_template(header), +// free(), +// in_use() +// {} + +// NativeOrderHeader order_template; +// std::vector free; +// std::vector in_use; +// KeyGenerator gen_keys; +// }; + +// NativeOrderBuilder::NativeOrderBuilder(KeyGenerator const &kg, +// NativeOrderHeader const&header) +// : me (new PImpl(kg,header)) +// { +// } + +// NativeOrderBuilder::~NativeOrderBuilder () +// {} + +// }} diff --git a/src/server/sparkd/orderman/native_orders/NativeOrderBuilder.h b/src/server/sparkd/orderman/native_orders/NativeOrderBuilder.h new file mode 100644 index 000000000..b861cb3ec --- /dev/null +++ b/src/server/sparkd/orderman/native_orders/NativeOrderBuilder.h @@ -0,0 +1,21 @@ +#pragma once + +#include + +namespace bts { +namespace orderman { + +class NativeOrderBuilder +{ +public: + using KeyGenerator = std::function ; + NativeOrderBuilder(KeyGenerator const&,NativeOrderHeader const&); + ~NativeOrderBuilder(); + void do_work(); + NativeOrder& operator()(); + +private: struct PImpl; + std::unique_ptr me; +}; + +}} diff --git a/src/server/sparkd/orderman/native_orders/NativeOrderFactory.h b/src/server/sparkd/orderman/native_orders/NativeOrderFactory.h new file mode 100644 index 000000000..ae32ed949 --- /dev/null +++ b/src/server/sparkd/orderman/native_orders/NativeOrderFactory.h @@ -0,0 +1,22 @@ +#pragma once + +#include + +namespace bts { +namespace orderman { + +class NativeOrderFactory +{ +public: + NativeOrderFactory(); + ~NativeOrderFactory(); + + NativeOrderBuilder& get_builder(NativeOrderHeader const&for_header); + void do_work(); + +private: + struct PImpl; + std::unique_ptr me; +}; + +}}