diff --git a/src/server/sparkd/CMakeDeps.cmake b/src/server/sparkd/CMakeDeps.cmake index 4be5d5cf9..56b11349d 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;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/SecuritySrc.cpp;orderman2/factory/OrderBuilder.cpp;orderman2/factory/OrderFactory.cpp;orderman2/mercury/Actor.cpp;orderman2/mercury/AsyncEventBroker.cpp;orderman2/mercury/CoreEventBroker.cpp;orderman2/mercury/Executor.cpp;orderman2/mercury/IEventBroker.cpp;orderman2/mercury/Poller.cpp;orderman2/mercury/SynopsisBuilder.cpp;orderman2/mercury/mercury_common.cpp;orderman2/mercury/topics/ITopic.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/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/PositionServiceCore.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;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/SecuritySrc.cpp;orderman2/factory/OrderBuilder.cpp;orderman2/factory/OrderFactory.cpp;orderman2/mercury/AsyncEventBroker.cpp;orderman2/mercury/CoreEventBroker.cpp;orderman2/mercury/Executor.cpp;orderman2/mercury/IEventBroker.cpp;orderman2/mercury/SynopsisBuilder.cpp;orderman2/mercury/actors/Actor.cpp;orderman2/mercury/actors/Poller.cpp;orderman2/mercury/mercury_common.cpp;orderman2/mercury/topics/ITopic.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/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/PositionServiceCore.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/main.cpp b/src/server/sparkd/main.cpp index 61139cd7e..78357a13c 100644 --- a/src/server/sparkd/main.cpp +++ b/src/server/sparkd/main.cpp @@ -18,7 +18,6 @@ int main(int argc, char **argv) { using namespace bts; os::set_thread_name("main"); utils::init_spark_lib(); - BEGIN_CMD; REGISTER(Test); REGISTER(Help); diff --git a/src/server/sparkd/orderman/doc/event_flow.pdf b/src/server/sparkd/orderman/doc/event_flow.pdf index af25cadec..74b79d94a 100644 Binary files a/src/server/sparkd/orderman/doc/event_flow.pdf and b/src/server/sparkd/orderman/doc/event_flow.pdf differ diff --git a/src/server/sparkd/orderman/doc/order_man_notes.org b/src/server/sparkd/orderman/doc/order_man_notes.org index bddbbe39c..4f2c7b28e 100644 --- a/src/server/sparkd/orderman/doc/order_man_notes.org +++ b/src/server/sparkd/orderman/doc/order_man_notes.org @@ -379,55 +379,41 @@ CheckSum = 151 10=151 digraph G { bgcolor="transparent"; + SecSrc GW - Fast_OM - SecFinder - SecStore - FillStore - MD - UI - Time OrderStore + FastOM + FillStore + MDSrc + UI subgraph cluster_fast { label="Fast Core"; GW - Fast_OM - MD + FastOM + MDSrc } subgraph cluster_slow { label="Slow Core"; FillStore - SecFinder - SecStore + SecSrc UI - Time OrderStore - Slow_OM } - - GW -> Fast_OM [label="xmgs"] - GW -> FillStore [label="xreport"] - SecFinder -> SecStore [label="raw_sec"] - SecStore -> Fast_OM [label="sec"] - SecStore -> Slow_OM [label="sec"] - Fast_OM -> Slow_OM [label="ostate"] - Slow_OM -> Fast_OM [label="ocrud"] - MD -> Fast_OM - MD -> Slow_OM - Slow_OM -> OrderStore [label="ostate"] - Time -> Slow_OM - - UI -> Fast_OM [label="ocrud"] - Time -> Fast_OM - Fast_OM -> GW [label="fix"] - Fast_OM -> Fast_OM [label="ostate | ocrud"] - Fast_OM -> OrderStore [label="ostate"] - - OrderStore -> UI [label="p_ostate"] - FillStore -> UI [label="p_fill_state"] + SecSrc -> GW [label=psec] + SecSrc -> OrderStore [label=psec] + SecSrc -> FastOM [label=psec] + GW -> FillStore [label=xmsgs] + GW -> FastOM [label=xmsgs] + FastOM -> GW [label=fix] + FastOM -> OrderStore [label=oupdate] + OrderStore -> FastOM [label=rec_orders] + OrderStore -> UI [label=orecs] + FillStore-> UI [label=frecs] + UI -> FastOM [label="crud"] + MDSrc -> FastOM [label="md"] } #+END_SRC diff --git a/src/server/sparkd/orderman2/actors/SecuritySrc.h b/src/server/sparkd/orderman2/actors/SecuritySrc.h index 7d8c30404..99df04d9c 100644 --- a/src/server/sparkd/orderman2/actors/SecuritySrc.h +++ b/src/server/sparkd/orderman2/actors/SecuritySrc.h @@ -1,7 +1,7 @@ #pragma once #include -#include "server/sparkd/orderman2/mercury/Actor.h" +#include "server/sparkd/orderman2/mercury/actors/Actor.h" namespace bts { namespace api { class Security;} diff --git a/src/server/sparkd/orderman2/events/NewSecuritiesEvent.h b/src/server/sparkd/orderman2/events/NewSecuritiesEvent.h index 511f286ca..f71ee5cc0 100644 --- a/src/server/sparkd/orderman2/events/NewSecuritiesEvent.h +++ b/src/server/sparkd/orderman2/events/NewSecuritiesEvent.h @@ -1,7 +1,7 @@ #pragma once #include -#include "server/sparkd/orderman2/mercury/Event.h" +#include "server/sparkd/orderman2/mercury/events/Event.h" #include "lib/domain_model/Security.h" #include "server/sparkd/orderman2/mercury/synopsys_policies/AppendVector.h" diff --git a/src/server/sparkd/orderman2/mercury/Executor.h b/src/server/sparkd/orderman2/mercury/Executor.h index a73cf49c0..600912cb9 100644 --- a/src/server/sparkd/orderman2/mercury/Executor.h +++ b/src/server/sparkd/orderman2/mercury/Executor.h @@ -4,8 +4,8 @@ #include #include "server/sparkd/orderman2/mercury/AsyncEventBroker.h" -#include "server/sparkd/orderman2/mercury/ActorPtr.h" -#include "server/sparkd/orderman2/mercury/Actor.h" +#include "server/sparkd/orderman2/mercury/actors/ActorPtr.h" +#include "server/sparkd/orderman2/mercury/actors/Actor.h" namespace bts { namespace mercury { diff --git a/src/server/sparkd/orderman2/mercury/Actor.cpp b/src/server/sparkd/orderman2/mercury/actors/Actor.cpp similarity index 91% rename from src/server/sparkd/orderman2/mercury/Actor.cpp rename to src/server/sparkd/orderman2/mercury/actors/Actor.cpp index c6dfbe3bb..e7df1da17 100644 --- a/src/server/sparkd/orderman2/mercury/Actor.cpp +++ b/src/server/sparkd/orderman2/mercury/actors/Actor.cpp @@ -2,17 +2,17 @@ #include "server/sparkd/orderman/md/Book.h" #include "lib/domain_model/common.h" #include "server/sparkd/orderman2/mercury/synopsys_policies/CacheLast.h" -#include "server/sparkd/orderman2/mercury/Event.h" +#include "server/sparkd/orderman2/mercury/events/Event.h" namespace bts { namespace mercury { class Book{}; -class BookUpdate : public Event { -public: +struct BookUpdate : Event { using Tag = SecurityKey; using SynopsisBuilder = CacheLast; + BookUpdate(Book const &b) : book (b) {} Book book; }; diff --git a/src/server/sparkd/orderman2/mercury/Actor.h b/src/server/sparkd/orderman2/mercury/actors/Actor.h similarity index 100% rename from src/server/sparkd/orderman2/mercury/Actor.h rename to src/server/sparkd/orderman2/mercury/actors/Actor.h diff --git a/src/server/sparkd/orderman2/mercury/ActorPtr.h b/src/server/sparkd/orderman2/mercury/actors/ActorPtr.h similarity index 100% rename from src/server/sparkd/orderman2/mercury/ActorPtr.h rename to src/server/sparkd/orderman2/mercury/actors/ActorPtr.h diff --git a/src/server/sparkd/orderman2/mercury/Poller.cpp b/src/server/sparkd/orderman2/mercury/actors/Poller.cpp similarity index 100% rename from src/server/sparkd/orderman2/mercury/Poller.cpp rename to src/server/sparkd/orderman2/mercury/actors/Poller.cpp diff --git a/src/server/sparkd/orderman2/mercury/Poller.h b/src/server/sparkd/orderman2/mercury/actors/Poller.h similarity index 100% rename from src/server/sparkd/orderman2/mercury/Poller.h rename to src/server/sparkd/orderman2/mercury/actors/Poller.h diff --git a/src/server/sparkd/orderman2/mercury/Event.h b/src/server/sparkd/orderman2/mercury/events/Event.h similarity index 100% rename from src/server/sparkd/orderman2/mercury/Event.h rename to src/server/sparkd/orderman2/mercury/events/Event.h diff --git a/src/server/sparkd/orderman2/mercury/events/PollEvent.h b/src/server/sparkd/orderman2/mercury/events/PollEvent.h index 24d428338..2c68703fa 100644 --- a/src/server/sparkd/orderman2/mercury/events/PollEvent.h +++ b/src/server/sparkd/orderman2/mercury/events/PollEvent.h @@ -1,7 +1,7 @@ #pragma once #include -#include "server/sparkd/orderman2/mercury/Event.h" +#include "server/sparkd/orderman2/mercury/events/Event.h" namespace bts { namespace mercury {