diff --git a/src/server/sparkd/CMakeDeps.cmake b/src/server/sparkd/CMakeDeps.cmake index d9d91334e..4823f0f06 100644 --- a/src/server/sparkd/CMakeDeps.cmake +++ b/src/server/sparkd/CMakeDeps.cmake @@ -1 +1 @@ -set(sources ;cmds/Benchmark.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/Md.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/TestOrderman.cpp;event_grid/EventNode.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/Market.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/celoxica/CXListener.cpp;md/platforms/celoxica/CXMain.cpp;md/platforms/celoxica/tests/cx_tests.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;mercury/actors/Actor.cpp;mercury/actors/Poller.cpp;mercury/broker/AsyncEventBroker.cpp;mercury/broker/CoreEventBroker.cpp;mercury/broker/IEventBroker.cpp;mercury/events/TimerEvent.cpp;mercury/mercury_utils/Executor.cpp;mercury/mercury_utils/mercury_common.cpp;mercury/synopsis/SynopsisBuilder.cpp;mercury/topics/ITopic.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/SpreaderOrderStateChange.cpp;orderman/events/TimeChange.cpp;orderman/native_orders/NativeOrder.cpp;orderman/native_orders/NativeOrderBuilder.cpp;orderman/native_orders/NativeOrderFactory.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/spreader_orders/SpreaderOrderBase.cpp;orderman/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForFirstConnStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/tests/spreader_tests.cpp;orderman/utils/fix_order_codec.cpp;orderman/utils/orderman_utils.cpp;orderman2/actors/ExecutionGateway.cpp;orderman2/actors/FillStore.cpp;orderman2/actors/OrderStore.cpp;orderman2/actors/SecuritySrc.cpp;orderman2/actors/order_manager/OrderBuilder.cpp;orderman2/actors/order_manager/OrderManager.cpp;orderman2/events/CancelRejectEvent.cpp;orderman2/events/NewExecutionReportEvent.cpp;orderman2/order_factory/OrderFactory.cpp;orderman2/orderman2_utils/fix_order_codec.cpp;orderman2/orders/LimitOrder.cpp;orderman2/orders/Order.cpp;orderman2/server/OrderServiceServer2.cpp;orderman2/tests/fat_wrapper_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/tests/PersistenceServiceTests.cpp;position/IMarginObserver.cpp;position/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/PositionServiceCore.cpp;position/tests/PositionTests.cpp;risk_limits/AccountRiskLimiter.cpp;risk_limits/IRiskLimitObserver.cpp;risk_limits/OperatorRiskLimiter.cpp;risk_limits/RiskLimitManager.cpp;risk_limits/RiskLimiter.cpp;risk_limits/SymbolKey.cpp;risk_limits/tests/RiskLimitsTests.cpp;securities/SecurityDB.cpp;spreader/SingleFillHedger.cpp;spreader/SingleLegQuoter.cpp;spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;testing/catch_test_runner.cpp;user/AccountServiceServer.cpp;user/UserServiceServer.cpp;user/tests/UserAndAccountTests.cpp) \ No newline at end of file +set(sources ;cmds/Benchmark.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/Md.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/TestOrderman.cpp;event_grid/EventNode.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/Market.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/celoxica/CXListener.cpp;md/platforms/celoxica/CXMain.cpp;md/platforms/celoxica/tests/cx_tests.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;mercury/actors/Actor.cpp;mercury/actors/Poller.cpp;mercury/broker/AsyncEventBroker.cpp;mercury/broker/CoreEventBroker.cpp;mercury/broker/IEventBroker.cpp;mercury/events/TimerEvent.cpp;mercury/mercury_utils/Executor.cpp;mercury/mercury_utils/mercury_common.cpp;mercury/synopsis/SynopsisBuilder.cpp;mercury/topics/ITopic.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/SpreaderOrderStateChange.cpp;orderman/events/TimeChange.cpp;orderman/native_orders/NativeOrder.cpp;orderman/native_orders/NativeOrderBuilder.cpp;orderman/native_orders/NativeOrderFactory.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/spreader_orders/SpreaderOrderBase.cpp;orderman/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForFirstConnStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/tests/spreader_tests.cpp;orderman/utils/fix_order_codec.cpp;orderman/utils/orderman_utils.cpp;orderman2/actors/AsyncFactory.cpp;orderman2/actors/ExecutionGateway.cpp;orderman2/actors/FillStore.cpp;orderman2/actors/OrderStore.cpp;orderman2/actors/SecuritySrc.cpp;orderman2/actors/order_manager/OrderBuilder.cpp;orderman2/actors/order_manager/OrderManager.cpp;orderman2/events/CancelRejectEvent.cpp;orderman2/events/NewExecutionReportEvent.cpp;orderman2/order_factory/OrderFactory.cpp;orderman2/orderman2_utils/fix_order_codec.cpp;orderman2/orders/LimitOrder.cpp;orderman2/orders/Order.cpp;orderman2/server/OrderServiceServer2.cpp;orderman2/tests/fat_wrapper_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/tests/PersistenceServiceTests.cpp;position/IMarginObserver.cpp;position/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/PositionServiceCore.cpp;position/tests/PositionTests.cpp;risk_limits/AccountRiskLimiter.cpp;risk_limits/IRiskLimitObserver.cpp;risk_limits/OperatorRiskLimiter.cpp;risk_limits/RiskLimitManager.cpp;risk_limits/RiskLimiter.cpp;risk_limits/SymbolKey.cpp;risk_limits/tests/RiskLimitsTests.cpp;securities/SecurityDB.cpp;spreader/SingleFillHedger.cpp;spreader/SingleLegQuoter.cpp;spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;testing/catch_test_runner.cpp;user/AccountServiceServer.cpp;user/UserServiceServer.cpp;user/tests/UserAndAccountTests.cpp) \ No newline at end of file diff --git a/src/server/sparkd/cmds/TestOrderman.cpp b/src/server/sparkd/cmds/TestOrderman.cpp index 312c7cd86..a9c435fa6 100644 --- a/src/server/sparkd/cmds/TestOrderman.cpp +++ b/src/server/sparkd/cmds/TestOrderman.cpp @@ -344,5 +344,3 @@ std::string TestOrderman::help () }} - - diff --git a/src/server/sparkd/main.cpp b/src/server/sparkd/main.cpp index 71cea8d67..b95e75737 100644 --- a/src/server/sparkd/main.cpp +++ b/src/server/sparkd/main.cpp @@ -32,5 +32,6 @@ int main(int argc, char **argv) { END_CMD; utils::finit_spark_lib(); + std::string s; return 0; } diff --git a/src/server/sparkd/orderman2/actors/AsyncFactory.cpp b/src/server/sparkd/orderman2/actors/AsyncFactory.cpp new file mode 100644 index 000000000..5b624b254 --- /dev/null +++ b/src/server/sparkd/orderman2/actors/AsyncFactory.cpp @@ -0,0 +1,70 @@ +#include "AsyncFactory.h" + +#include "server/sparkd/orderman2/events/CreateOrderRequestEvent.h" +#include "server/sparkd/orderman2/events/CreateOrderReplyEvent.h" +#include "server/sparkd/orderman2/events/CreateFIXBufferRequestEvent.h" +#include "server/sparkd/orderman2/events/CreateFIXBufferReplyEvent.h" +#include "server/sparkd/orderman2/order_factory/OrderFactory.h" +#include "server/sparkd/orderman2/events/NewSecuritiesEvent.h" +#include "server/sparkd/jetfix/common/OutFIX.h" +#include "server/sparkd/securities/MapSecurityDB.h" + +namespace bts { +namespace orderman2 { + +struct AsyncFactory::PImpl +{ + PImpl(GatewayName const&gw) : + gw(gw), + orders_stream(), + fix_buffer_stream(), + db(), + order_factory(db) + {} + + GatewayName gw; + mercury::Stream orders_stream; + mercury::Stream fix_buffer_stream; + securities::MapSecurityDB db; + OrderFactory order_factory; +}; + +AsyncFactory::AsyncFactory (const GatewayName &gw) : me (new PImpl(gw)) {} +AsyncFactory::~AsyncFactory () {} + +void AsyncFactory::init() +{ + me->orders_stream = make_stream(me->gw); + me->fix_buffer_stream = make_stream (me->gw); + + subscribe([this] (auto const&u) { + if (u.events) + for (auto const &ev : *(u.events)) + me->db.securities[SecurityKey(ev.security->id())] = ev.security; + }); + + subscribe(me->gw,[this] (const auto &u) { + if (u.events) + for (auto const &ev : *u.events) { + std::vector response; + response.reserve(ev.n_orders); + while (response.size() < ev.n_orders) + response.push_back(&me->order_factory.create(ev.parent_key,*ev.def)); + this->publish(me->orders_stream,ev.request_id,std::move(response)); + } + }); + + subscribe(me->gw,[this] (const auto &u) { + if (u.events) + for (auto const &ev : *u.events) { + std::vector response; + response.reserve(ev.n_buffers); + while (response.size() < ev.n_buffers) + response.push_back(std::make_shared (*ev.cfg)); + this->publish(me->fix_buffer_stream,std::move(response)); + } + }); +} + + +}} diff --git a/src/server/sparkd/orderman2/actors/AsyncFactory.h b/src/server/sparkd/orderman2/actors/AsyncFactory.h new file mode 100644 index 000000000..6ecc1c691 --- /dev/null +++ b/src/server/sparkd/orderman2/actors/AsyncFactory.h @@ -0,0 +1,22 @@ +#pragma once + +#include +#include "server/sparkd/orderman2/orderman2_utils/orderman2_common.h" +#include "server/sparkd/mercury/actors/Actor.h" + +namespace bts { +namespace orderman2 { + +class AsyncFactory : public mercury::Actor +{ +public: + AsyncFactory(GatewayName const&gw); + ~AsyncFactory(); + + void init() override; +private: + struct PImpl; + std::unique_ptr me; +}; + +}} diff --git a/src/server/sparkd/orderman2/events/CreateFIXBufferReplyEvent.h b/src/server/sparkd/orderman2/events/CreateFIXBufferReplyEvent.h index 2a1756c37..12379fe88 100644 --- a/src/server/sparkd/orderman2/events/CreateFIXBufferReplyEvent.h +++ b/src/server/sparkd/orderman2/events/CreateFIXBufferReplyEvent.h @@ -15,7 +15,6 @@ public: using Tag = GatewayName; using SynopsisPolicy = mercury::NoSynopsis; - CreateFIXBufferReplyEvent (std::vector const&b) : buffers(b) {} CreateFIXBufferReplyEvent (std::vector &&b) : buffers(std::move(b)) {} std::vector buffers; diff --git a/src/server/sparkd/orderman2/events/CreateOrderRequestEvent.h b/src/server/sparkd/orderman2/events/CreateOrderRequestEvent.h index e085dcd78..9403f7019 100644 --- a/src/server/sparkd/orderman2/events/CreateOrderRequestEvent.h +++ b/src/server/sparkd/orderman2/events/CreateOrderRequestEvent.h @@ -4,6 +4,7 @@ #include "server/sparkd/orderman2/orderman2_utils/orderman2_common.h" #include "server/sparkd/mercury/events/Event.h" +#include "lib/api/services/OrderService2.pb.h" namespace bts { namespace orderman2 { @@ -13,7 +14,7 @@ class CreateOrderRequestEvent : public mercury::Event { public: using Tag = GatewayName; - using SynopsisPolicy = mercury::CacheAll; + using SynopsisPolicy = mercury::NoSynopsis; CreateOrderRequestEvent (size_t request_id,OrderKey parent_key, api::orderman2::OrderDefinition const &def, diff --git a/src/server/sparkd/orderman2/order_factory/OrderFactory.h b/src/server/sparkd/orderman2/order_factory/OrderFactory.h index 1a4675ebb..44267f605 100644 --- a/src/server/sparkd/orderman2/order_factory/OrderFactory.h +++ b/src/server/sparkd/orderman2/order_factory/OrderFactory.h @@ -27,6 +27,7 @@ public: private: Order &allocate (OrderKey k, OrderKey pk, api::orderman2::OrderDefinition const&); struct PImpl; + std::unique_ptr me; }; diff --git a/src/server/sparkd/orderman2/orders/LimitOrder.cpp b/src/server/sparkd/orderman2/orders/LimitOrder.cpp index e8c81e5d4..fd923f6ee 100644 --- a/src/server/sparkd/orderman2/orders/LimitOrder.cpp +++ b/src/server/sparkd/orderman2/orders/LimitOrder.cpp @@ -49,7 +49,6 @@ api::orderman2::OrderStatus map_status(api::orderman2::NativeOrderStatus status) } } - void LimitOrder::on_init_from_exe_report(ExecutionReport const&er, const PreActivationOrderServices &os) { auto k = er.order_key;