From b7d7b3dceba0d88b6c799bbfea04898efd16466a Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Fri, 8 Jan 2021 14:27:36 -0500 Subject: [PATCH] Refactored. --- src/server/sparkd/CMakeDeps.cmake | 2 +- src/server/sparkd/cmds/Spartan.cpp | 2 +- .../matcher_validation_observer.cpp | 10 ++--- .../sim/pcap/PCapEventGenerator.cpp | 2 +- .../channel_observers/DefinitionCollector.cpp | 2 +- .../md/channel_observers/FillCounter.cpp | 2 +- .../md/channel_observers/IcebergFinder.cpp | 2 +- .../PolygonOpportunityFinder.cpp | 2 +- .../SyntheticBookRecorder.cpp | 4 +- .../cmds/spartan/md/common/MDP3Event.cpp | 1 + .../sparkd/cmds/spartan/md/common/MDP3Event.h | 44 +++++++++++++++++++ .../cmds/spartan/md/common/mdp3_common.h | 32 +------------- .../spartan/md/realtime/RealTimeHandler.cpp | 6 +-- .../spartan/md/tests/spartan_md_tests.cpp | 4 +- .../cmds/spartan/md/utils/mdp3_utils.cpp | 2 +- .../md/utils/queries/BookStatRecorder.cpp | 2 +- 16 files changed, 67 insertions(+), 52 deletions(-) create mode 100644 src/server/sparkd/cmds/spartan/md/common/MDP3Event.cpp create mode 100644 src/server/sparkd/cmds/spartan/md/common/MDP3Event.h diff --git a/src/server/sparkd/CMakeDeps.cmake b/src/server/sparkd/CMakeDeps.cmake index 7c5c4ca0b..fcfe395d0 100644 --- a/src/server/sparkd/CMakeDeps.cmake +++ b/src/server/sparkd/CMakeDeps.cmake @@ -1 +1 @@ -set(sources algo/AlgoDefinitionServiceServer.cpp;cmds/AdminReport.cpp;cmds/AutoCert.cpp;cmds/Benchmark.cpp;cmds/CMECertCmd.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/FIXSim.cpp;cmds/Help.cpp;cmds/KeyCode.cpp;cmds/Md.cpp;cmds/ParseHistoricalFIX.cpp;cmds/PrintHedgeOrders.cpp;cmds/QuickTest.cpp;cmds/Run.cpp;cmds/Span.cpp;cmds/Spartan.cpp;cmds/Test.cpp;cmds/Web.cpp;cmds/spartan/algoman/IAlgo.cpp;cmds/spartan/algoman/IAlgoExecutionServices.cpp;cmds/spartan/algoman/IAlgoSetupServices.cpp;cmds/spartan/algoman/algos/tas/RunTAS.cpp;cmds/spartan/algoman/algos/tas/TASOrderReactor.cpp;cmds/spartan/algoman/algos/tas/TASTriggerDef.cpp;cmds/spartan/back_testing/algos/PolyObserver.cpp;cmds/spartan/back_testing/algos/SniperModel.cpp;cmds/spartan/back_testing/algos/spreader/SimOrderGateway.cpp;cmds/spartan/back_testing/algos/spreader/SimSpreader.cpp;cmds/spartan/back_testing/algos/spreader/tests/sim_spreader_tests.cpp;cmds/spartan/back_testing/db/SimDB.cpp;cmds/spartan/back_testing/matcher/FifoImpliedSecurityMatcher.cpp;cmds/spartan/back_testing/matcher/FifoMatcherContext.cpp;cmds/spartan/back_testing/matcher/FifoMergedSecurityMatcher.cpp;cmds/spartan/back_testing/matcher/FifoPriceLevelMatcher.cpp;cmds/spartan/back_testing/matcher/FifoSecurityMatcher.cpp;cmds/spartan/back_testing/matcher/Matcher.cpp;cmds/spartan/back_testing/matcher/MatchingCommon.cpp;cmds/spartan/back_testing/matcher/fill_depot.cpp;cmds/spartan/back_testing/matcher/iceberg_helper.cpp;cmds/spartan/back_testing/matcher/tests/matcher_tests.cpp;cmds/spartan/back_testing/matcher/validation/iceberg_file_cache.cpp;cmds/spartan/back_testing/matcher/validation/matcher_validation_observer.cpp;cmds/spartan/back_testing/run/SimSessionOptions.proto;cmds/spartan/back_testing/run/run_sim.cpp;cmds/spartan/back_testing/sim/ISim.cpp;cmds/spartan/back_testing/sim/Sim.cpp;cmds/spartan/back_testing/sim/pandl/PandL.cpp;cmds/spartan/back_testing/sim/pcap/PCapEventGenerator.cpp;cmds/spartan/back_testing/sim/pcap/PCapEventSource.cpp;cmds/spartan/back_testing/sim/spark_bridge/AlgoServicesBridge.cpp;cmds/spartan/back_testing/sim/spark_bridge/BeforeLaunchBridge.cpp;cmds/spartan/common/EndPoint.cpp;cmds/spartan/common/IcebergQuantity.cpp;cmds/spartan/common/InstrumentDefinition.cpp;cmds/spartan/common/OrderKey.cpp;cmds/spartan/common/Price.cpp;cmds/spartan/common/Quantity.cpp;cmds/spartan/common/SecurityID.cpp;cmds/spartan/common/TimeInterval.cpp;cmds/spartan/common/TimeStamp.cpp;cmds/spartan/md/channel_observers/DefinitionCollector.cpp;cmds/spartan/md/channel_observers/FillCounter.cpp;cmds/spartan/md/channel_observers/IcebergFinder.cpp;cmds/spartan/md/channel_observers/PolygonFinder.cpp;cmds/spartan/md/channel_observers/PolygonOpportunityFinder.cpp;cmds/spartan/md/channel_observers/SyntheticBookRecorder.cpp;cmds/spartan/md/common/InstrumentSnapshot.cpp;cmds/spartan/md/common/mdp3_common.cpp;cmds/spartan/md/common/tests/book_merging_tests.cpp;cmds/spartan/md/feed_control/IFeedController.cpp;cmds/spartan/md/handler/ChannelHandler.cpp;cmds/spartan/md/handler/ReactorChannelHandler.cpp;cmds/spartan/md/implied/implied_market.cpp;cmds/spartan/md/parsing/MDP3MsgBox.cpp;cmds/spartan/md/realtime/RealTimeHandler.cpp;cmds/spartan/md/recovery/BookSnapshot.cpp;cmds/spartan/md/recovery/DefinitionSnapshot.cpp;cmds/spartan/md/recovery/IncrementalQueue.cpp;cmds/spartan/md/recovery/RecoveryHandler.cpp;cmds/spartan/md/tests/spartan_md_tests.cpp;cmds/spartan/md/utils/book_utils.cpp;cmds/spartan/md/utils/mdp3_utils.cpp;cmds/spartan/md/utils/order_utils.cpp;cmds/spartan/md/utils/polygon_utils.cpp;cmds/spartan/md/utils/queries/BookStatRecorder.cpp;cmds/spartan/md/utils/security_comp.cpp;cmds/spartan/md/utils/security_parser.cpp;cmds/spartan/md/utils/tests/synthetic_book_tests.cpp;cmds/spartan/md/utils/tests/test_polygon_finder.cpp;cmds/spartan/system/PCapReader.cpp;cmds/spartan/system/reactor/IReactorConnection.cpp;cmds/spartan/system/reactor/IReactorHandler.cpp;cmds/spartan/system/reactor/Reactor.cpp;cmds/spartan/util/action_summarizer.cpp;cmds/spartan/util/args_parser.cpp;cmds/spartan/util/sql/adapters/polygon_defs.cpp;dspark/mirage/quick_queue/quick_queue.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/book/Book.cpp;exchange_sim/book/ExchangeSim.proto;exchange_sim/book/Order.cpp;exchange_sim/book/OrderMatcher.cpp;exchange_sim/book/book_transform.cpp;exchange_sim/tests/test_book_transform.cpp;http/ApiGateway.cpp;http/MultipartFormDecoder.cpp;http/WebServer.cpp;http/tests/MultiPartFormTests.cpp;main.cpp;md/ChannelVolume.cpp;md/MarketDataAuxiliaryServiceServer.cpp;md/VolumeAtPriceState.cpp;md/platforms/IMDPlatform.cpp;md/platforms/ice_onixs/ICEListener.cpp;md/platforms/ice_onixs/ICEMain.cpp;md/platforms/ice_onixs/tests/ice_tests.cpp;md/platforms/mdp3_onixs/MDP3Listener.cpp;md/platforms/mdp3_onixs/MDP3Main.cpp;md/platforms/mdp3_onixs/TradeSummarySignalDispatcher.cpp;md/platforms/mdp3_onixs/tests/mdp3_tests.cpp;md/run_md.cpp;position/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/MarginServiceServer.cpp;position/PositionAggregator.cpp;position/PositionMap.cpp;position/PositionServicePNLHelper.cpp;position/PositionServiceServer.cpp;position/import/BasePositionServiceServer.cpp;position/import/DownloadCommonStateMachine.cpp;position/import/DownloadWindow.cpp;position/import/MoneyFileServiceServer.cpp;position/import/parsing/gmi_parser.cpp;position/import/parsing/money_parser.cpp;position/import/parsing/parser_common.cpp;position/tests/PositionTests.cpp;position/tests/position_tests_internal.cpp;subprocess/SubProcessRunner.cpp;support/ErrorReportService.cpp;support/ShellLatencyServer.cpp;user/AdminServiceDB.cpp;user/AdminServiceServer.cpp;user/AuthServiceServer.cpp;user/tests/admin_service_tests.cpp) \ No newline at end of file +set(sources algo/AlgoDefinitionServiceServer.cpp;cmds/AdminReport.cpp;cmds/AutoCert.cpp;cmds/Benchmark.cpp;cmds/CMECertCmd.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/FIXSim.cpp;cmds/Help.cpp;cmds/KeyCode.cpp;cmds/Md.cpp;cmds/ParseHistoricalFIX.cpp;cmds/PrintHedgeOrders.cpp;cmds/QuickTest.cpp;cmds/Run.cpp;cmds/Span.cpp;cmds/Spartan.cpp;cmds/Test.cpp;cmds/Web.cpp;cmds/spartan/algoman/IAlgo.cpp;cmds/spartan/algoman/IAlgoExecutionServices.cpp;cmds/spartan/algoman/IAlgoSetupServices.cpp;cmds/spartan/algoman/algos/tas/RunTAS.cpp;cmds/spartan/algoman/algos/tas/TASOrderReactor.cpp;cmds/spartan/algoman/algos/tas/TASTriggerDef.cpp;cmds/spartan/back_testing/algos/PolyObserver.cpp;cmds/spartan/back_testing/algos/SniperModel.cpp;cmds/spartan/back_testing/algos/spreader/SimOrderGateway.cpp;cmds/spartan/back_testing/algos/spreader/SimSpreader.cpp;cmds/spartan/back_testing/algos/spreader/tests/sim_spreader_tests.cpp;cmds/spartan/back_testing/db/SimDB.cpp;cmds/spartan/back_testing/matcher/FifoImpliedSecurityMatcher.cpp;cmds/spartan/back_testing/matcher/FifoMatcherContext.cpp;cmds/spartan/back_testing/matcher/FifoMergedSecurityMatcher.cpp;cmds/spartan/back_testing/matcher/FifoPriceLevelMatcher.cpp;cmds/spartan/back_testing/matcher/FifoSecurityMatcher.cpp;cmds/spartan/back_testing/matcher/Matcher.cpp;cmds/spartan/back_testing/matcher/MatchingCommon.cpp;cmds/spartan/back_testing/matcher/fill_depot.cpp;cmds/spartan/back_testing/matcher/iceberg_helper.cpp;cmds/spartan/back_testing/matcher/tests/matcher_tests.cpp;cmds/spartan/back_testing/matcher/validation/iceberg_file_cache.cpp;cmds/spartan/back_testing/matcher/validation/matcher_validation_observer.cpp;cmds/spartan/back_testing/run/SimSessionOptions.proto;cmds/spartan/back_testing/run/run_sim.cpp;cmds/spartan/back_testing/sim/ISim.cpp;cmds/spartan/back_testing/sim/Sim.cpp;cmds/spartan/back_testing/sim/pandl/PandL.cpp;cmds/spartan/back_testing/sim/pcap/PCapEventGenerator.cpp;cmds/spartan/back_testing/sim/pcap/PCapEventSource.cpp;cmds/spartan/back_testing/sim/spark_bridge/AlgoServicesBridge.cpp;cmds/spartan/back_testing/sim/spark_bridge/BeforeLaunchBridge.cpp;cmds/spartan/common/EndPoint.cpp;cmds/spartan/common/IcebergQuantity.cpp;cmds/spartan/common/InstrumentDefinition.cpp;cmds/spartan/common/OrderKey.cpp;cmds/spartan/common/Price.cpp;cmds/spartan/common/Quantity.cpp;cmds/spartan/common/SecurityID.cpp;cmds/spartan/common/TimeInterval.cpp;cmds/spartan/common/TimeStamp.cpp;cmds/spartan/md/channel_observers/DefinitionCollector.cpp;cmds/spartan/md/channel_observers/FillCounter.cpp;cmds/spartan/md/channel_observers/IcebergFinder.cpp;cmds/spartan/md/channel_observers/PolygonFinder.cpp;cmds/spartan/md/channel_observers/PolygonOpportunityFinder.cpp;cmds/spartan/md/channel_observers/SyntheticBookRecorder.cpp;cmds/spartan/md/common/InstrumentSnapshot.cpp;cmds/spartan/md/common/MDP3Event.cpp;cmds/spartan/md/common/mdp3_common.cpp;cmds/spartan/md/common/tests/book_merging_tests.cpp;cmds/spartan/md/feed_control/IFeedController.cpp;cmds/spartan/md/handler/ChannelHandler.cpp;cmds/spartan/md/handler/ReactorChannelHandler.cpp;cmds/spartan/md/implied/implied_market.cpp;cmds/spartan/md/parsing/MDP3MsgBox.cpp;cmds/spartan/md/realtime/RealTimeHandler.cpp;cmds/spartan/md/recovery/BookSnapshot.cpp;cmds/spartan/md/recovery/DefinitionSnapshot.cpp;cmds/spartan/md/recovery/IncrementalQueue.cpp;cmds/spartan/md/recovery/RecoveryHandler.cpp;cmds/spartan/md/tests/spartan_md_tests.cpp;cmds/spartan/md/utils/book_utils.cpp;cmds/spartan/md/utils/mdp3_utils.cpp;cmds/spartan/md/utils/order_utils.cpp;cmds/spartan/md/utils/polygon_utils.cpp;cmds/spartan/md/utils/queries/BookStatRecorder.cpp;cmds/spartan/md/utils/security_comp.cpp;cmds/spartan/md/utils/security_parser.cpp;cmds/spartan/md/utils/tests/synthetic_book_tests.cpp;cmds/spartan/md/utils/tests/test_polygon_finder.cpp;cmds/spartan/system/PCapReader.cpp;cmds/spartan/system/reactor/IReactorConnection.cpp;cmds/spartan/system/reactor/IReactorHandler.cpp;cmds/spartan/system/reactor/Reactor.cpp;cmds/spartan/util/action_summarizer.cpp;cmds/spartan/util/args_parser.cpp;cmds/spartan/util/sql/adapters/polygon_defs.cpp;dspark/mirage/quick_queue/quick_queue.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/book/Book.cpp;exchange_sim/book/ExchangeSim.proto;exchange_sim/book/Order.cpp;exchange_sim/book/OrderMatcher.cpp;exchange_sim/book/book_transform.cpp;exchange_sim/tests/test_book_transform.cpp;http/ApiGateway.cpp;http/MultipartFormDecoder.cpp;http/WebServer.cpp;http/tests/MultiPartFormTests.cpp;main.cpp;md/ChannelVolume.cpp;md/MarketDataAuxiliaryServiceServer.cpp;md/VolumeAtPriceState.cpp;md/platforms/IMDPlatform.cpp;md/platforms/ice_onixs/ICEListener.cpp;md/platforms/ice_onixs/ICEMain.cpp;md/platforms/ice_onixs/tests/ice_tests.cpp;md/platforms/mdp3_onixs/MDP3Listener.cpp;md/platforms/mdp3_onixs/MDP3Main.cpp;md/platforms/mdp3_onixs/TradeSummarySignalDispatcher.cpp;md/platforms/mdp3_onixs/tests/mdp3_tests.cpp;md/run_md.cpp;position/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/MarginServiceServer.cpp;position/PositionAggregator.cpp;position/PositionMap.cpp;position/PositionServicePNLHelper.cpp;position/PositionServiceServer.cpp;position/import/BasePositionServiceServer.cpp;position/import/DownloadCommonStateMachine.cpp;position/import/DownloadWindow.cpp;position/import/MoneyFileServiceServer.cpp;position/import/parsing/gmi_parser.cpp;position/import/parsing/money_parser.cpp;position/import/parsing/parser_common.cpp;position/tests/PositionTests.cpp;position/tests/position_tests_internal.cpp;subprocess/SubProcessRunner.cpp;support/ErrorReportService.cpp;support/ShellLatencyServer.cpp;user/AdminServiceDB.cpp;user/AdminServiceServer.cpp;user/AuthServiceServer.cpp;user/tests/admin_service_tests.cpp) \ No newline at end of file diff --git a/src/server/sparkd/cmds/Spartan.cpp b/src/server/sparkd/cmds/Spartan.cpp index 24336a43a..6d20b3167 100644 --- a/src/server/sparkd/cmds/Spartan.cpp +++ b/src/server/sparkd/cmds/Spartan.cpp @@ -252,7 +252,7 @@ void stats(std::string const &pcap) { StatPrinter(std::ostream &out) : out{out} {} std::ostream &out; void on_event_end(MDP3Event const &ev) override { - for (auto s : ev.affected_securities()) { + for (auto s : ev) { total_orders += s->orders().size(); } } diff --git a/src/server/sparkd/cmds/spartan/back_testing/matcher/validation/matcher_validation_observer.cpp b/src/server/sparkd/cmds/spartan/back_testing/matcher/validation/matcher_validation_observer.cpp index 7f216faf5..03e006371 100644 --- a/src/server/sparkd/cmds/spartan/back_testing/matcher/validation/matcher_validation_observer.cpp +++ b/src/server/sparkd/cmds/spartan/back_testing/matcher/validation/matcher_validation_observer.cpp @@ -90,7 +90,7 @@ void _sync_orders( bool _has_multiple_aggressor_secs(const MDP3Event &ev) { bool aggr_sec_found = false; - for (auto *s : ev.affected_securities()) { + for (auto *s : ev) { for (auto f : s->fills()) { switch (f.aggressor) { case MDP3Fill::Aggressor::THIS_BUY: @@ -279,7 +279,7 @@ struct MatcherValidationObserver::PImpl { EventFlags flags = EventFlags::None; if (_has_multiple_aggressor_secs(ev)) flags |= EventFlags::MultipleSecurityAggressors; - for (const auto *s : ev.affected_securities()) { + for (const auto *s : ev) { for (auto &f : s->fills()) { if (icebergs.find(f.key) != icebergs.end()) flags |= EventFlags::IcebergOrders; @@ -334,14 +334,14 @@ bool MatcherValidationObserver::_is_ready_to_trade( } void MatcherValidationObserver::_sync_current_orders(MDP3Event const &ev) { - for (auto s : ev.affected_securities()) { + for (auto s : ev) { auto &new_orders = _me->get_security_data(*s, ev.event_id).current_orders; _sync_orders(ev.event_id, *s, new_orders, _me->icebergs); } } void MatcherValidationObserver::_sync_previous_orders(const MDP3Event &ev) { - for (auto s : ev.affected_securities()) { + for (auto s : ev) { auto &old_orders = _me->get_security_data(*s, ev.event_id).previous_orders; _sync_orders(ev.event_id, *s, old_orders, _me->icebergs); @@ -413,7 +413,7 @@ void MatcherValidationObserver::on_event_end(MDP3Event const &ev) { // in a particular order, sorted hierarchically by symbol, then expiration. // 'sorted_secs' will contain the proper order of securities. std::vector sorted_secs; - for (auto *s : ev.affected_securities()) { + for (auto *s : ev) { if (_is_interesting_sec(*s)) sorted_secs.push_back(s); } diff --git a/src/server/sparkd/cmds/spartan/back_testing/sim/pcap/PCapEventGenerator.cpp b/src/server/sparkd/cmds/spartan/back_testing/sim/pcap/PCapEventGenerator.cpp index 526638249..4ff681932 100644 --- a/src/server/sparkd/cmds/spartan/back_testing/sim/pcap/PCapEventGenerator.cpp +++ b/src/server/sparkd/cmds/spartan/back_testing/sim/pcap/PCapEventGenerator.cpp @@ -91,7 +91,7 @@ void PCapEventGenerator::on_event_end(MDP3Event const &ev_in) { ev.first_packet_sn = ev.first_packet_sn; ev.last_packet_sn = ev.last_packet_sn; - for (auto snap_ptr : ev_in.affected_securities()) { + for (auto snap_ptr : ev_in) { auto &snap_cpy = ev.affected_securities.emplace_back(); // light_copy() does not copy the orders, just the order changes // Observers of this class should see a continuous stream of diff --git a/src/server/sparkd/cmds/spartan/md/channel_observers/DefinitionCollector.cpp b/src/server/sparkd/cmds/spartan/md/channel_observers/DefinitionCollector.cpp index 11aa688b5..ae34c0a6f 100644 --- a/src/server/sparkd/cmds/spartan/md/channel_observers/DefinitionCollector.cpp +++ b/src/server/sparkd/cmds/spartan/md/channel_observers/DefinitionCollector.cpp @@ -19,7 +19,7 @@ void DefinitionCollector::on_recovery_complete( } void DefinitionCollector::on_event_end(MDP3Event const &ev) { - for (auto s : ev.affected_securities()) { + for (auto s : ev) { auto it = result.find(s->security_id()); if (it == result.end()) result.insert({s->security_id(), s->definition()}); diff --git a/src/server/sparkd/cmds/spartan/md/channel_observers/FillCounter.cpp b/src/server/sparkd/cmds/spartan/md/channel_observers/FillCounter.cpp index 89eae5fba..07d66c170 100644 --- a/src/server/sparkd/cmds/spartan/md/channel_observers/FillCounter.cpp +++ b/src/server/sparkd/cmds/spartan/md/channel_observers/FillCounter.cpp @@ -34,7 +34,7 @@ void FillCounter::on_recovery_complete( } void FillCounter::on_event_end(MDP3Event const &ev) { - for (auto snap : ev.affected_securities()) { + for (auto snap : ev) { auto &c = me->counts[snap->security_id()]; if (c.sec_id.value() == 0) { c.sec_id = snap->security_id(); diff --git a/src/server/sparkd/cmds/spartan/md/channel_observers/IcebergFinder.cpp b/src/server/sparkd/cmds/spartan/md/channel_observers/IcebergFinder.cpp index 3ef6ecb8d..bb4557c22 100644 --- a/src/server/sparkd/cmds/spartan/md/channel_observers/IcebergFinder.cpp +++ b/src/server/sparkd/cmds/spartan/md/channel_observers/IcebergFinder.cpp @@ -189,7 +189,7 @@ void IcebergFinder::on_recovery_complete(InitialSnapshot const &snap) { void IcebergFinder::on_event_end(MDP3Event const &ev) { me->fills.clear(); - for (auto s : ev.affected_securities()) { + for (auto s : ev) { _on_fills(s->fills()); _on_security_changed(ev.event_id, *s); } diff --git a/src/server/sparkd/cmds/spartan/md/channel_observers/PolygonOpportunityFinder.cpp b/src/server/sparkd/cmds/spartan/md/channel_observers/PolygonOpportunityFinder.cpp index 66e7b6248..ecb8e4fdd 100644 --- a/src/server/sparkd/cmds/spartan/md/channel_observers/PolygonOpportunityFinder.cpp +++ b/src/server/sparkd/cmds/spartan/md/channel_observers/PolygonOpportunityFinder.cpp @@ -312,7 +312,7 @@ void PolygonOpportunityFinder::on_event_end(MDP3Event const &ev) { std::unordered_set to_recalc = me->active_polygons; me->active_polygons.clear(); - for (auto &s : ev.affected_securities()) { + for (auto &s : ev) { me->all_snapshots[s->security_id()] = {s, ev.event_id}; auto &these_dependencies = me->dependencies[s->security_id()]; to_recalc.insert(these_dependencies.begin(), these_dependencies.end()); diff --git a/src/server/sparkd/cmds/spartan/md/channel_observers/SyntheticBookRecorder.cpp b/src/server/sparkd/cmds/spartan/md/channel_observers/SyntheticBookRecorder.cpp index 05e4d8f83..79a65aff0 100644 --- a/src/server/sparkd/cmds/spartan/md/channel_observers/SyntheticBookRecorder.cpp +++ b/src/server/sparkd/cmds/spartan/md/channel_observers/SyntheticBookRecorder.cpp @@ -219,8 +219,8 @@ void SyntheticBookRecorder::on_recovery_complete(const InitialSnapshot &snap) { void SyntheticBookRecorder::on_event_end(const MDP3Event &ev) { on_securities_changed( - ev.event_id, ev.affected_securities().begin(), - ev.affected_securities().end(), _me->synthetic_defs(), _me->reverse_legs(), + ev.event_id, ev.begin(), + ev.end(), _me->synthetic_defs(), _me->reverse_legs(), _me->mbooks(), _me->msynthetic_book_history()); } void SyntheticBookRecorder::on_packet_loss() {} diff --git a/src/server/sparkd/cmds/spartan/md/common/MDP3Event.cpp b/src/server/sparkd/cmds/spartan/md/common/MDP3Event.cpp new file mode 100644 index 000000000..c11a5290e --- /dev/null +++ b/src/server/sparkd/cmds/spartan/md/common/MDP3Event.cpp @@ -0,0 +1 @@ +#include "MDP3Event.h" diff --git a/src/server/sparkd/cmds/spartan/md/common/MDP3Event.h b/src/server/sparkd/cmds/spartan/md/common/MDP3Event.h new file mode 100644 index 000000000..cfc28fcd9 --- /dev/null +++ b/src/server/sparkd/cmds/spartan/md/common/MDP3Event.h @@ -0,0 +1,44 @@ +#pragma once + +#include +#include "server/sparkd/cmds/spartan/common/TimeStamp.h" + +namespace bts::spartan::mdp3 { + +class InstrumentSnapshot; + +class MDP3Event { + public: + size_t event_id = 0; + TimeStamp transact_time = TimeStamp{0}; + TimeStamp first_packet_send_time; + TimeStamp last_packet_send_time; + uint32_t first_packet_sn; + uint32_t last_packet_sn; + + using SecContainer = + boost::container::small_vector ; + using SecIter = SecContainer::const_iterator; + + SecIter begin() const {return _affected_securities.begin();} + SecIter end() const {return _affected_securities.end();} + SecContainer const& secs() const {return _affected_securities;} + + bool add_sec(InstrumentSnapshot const *sec) { + for (auto s : _affected_securities) + if (s == sec) + return false; + _affected_securities.push_back(sec); + return true; + } + + void reset_sec() { + transact_time = TimeStamp{0}; + _affected_securities.clear(); + } + + private: + SecContainer _affected_securities; +}; + +} diff --git a/src/server/sparkd/cmds/spartan/md/common/mdp3_common.h b/src/server/sparkd/cmds/spartan/md/common/mdp3_common.h index 0583df020..8a5c4b610 100644 --- a/src/server/sparkd/cmds/spartan/md/common/mdp3_common.h +++ b/src/server/sparkd/cmds/spartan/md/common/mdp3_common.h @@ -11,43 +11,13 @@ #include "server/sparkd/cmds/spartan/common/Quantity.h" #include "server/sparkd/cmds/spartan/common/SecurityID.h" #include "server/sparkd/cmds/spartan/common/TimeStamp.h" +#include "server/sparkd/cmds/spartan/md/common/MDP3Event.h" #include #include #include namespace bts::spartan::mdp3 { -class InstrumentSnapshot; - -class MDP3Event { - public: - size_t event_id = 0; - TimeStamp transact_time = TimeStamp{0}; - TimeStamp first_packet_send_time; - TimeStamp last_packet_send_time; - uint32_t first_packet_sn; - uint32_t last_packet_sn; - - std::vector const &affected_securities() const { - return _affected_securities; - } - - bool add(InstrumentSnapshot const *sec) { - for (auto s : _affected_securities) - if (s == sec) - return false; - _affected_securities.push_back(sec); - return true; - } - - void reset() { - transact_time = TimeStamp{0}; - _affected_securities.clear(); - } - - private: - std::vector _affected_securities; -}; inline std::string str_from_fixed_array(const char *ptr, size_t max_len) { std::string result; diff --git a/src/server/sparkd/cmds/spartan/md/realtime/RealTimeHandler.cpp b/src/server/sparkd/cmds/spartan/md/realtime/RealTimeHandler.cpp index abd1f0c6b..737a8bd25 100644 --- a/src/server/sparkd/cmds/spartan/md/realtime/RealTimeHandler.cpp +++ b/src/server/sparkd/cmds/spartan/md/realtime/RealTimeHandler.cpp @@ -95,7 +95,7 @@ struct RealTimeHandler::EventGuard { if (info.last_packet_send_time != TimeStamp{0}) { // last event owner.on_end_of_event(); - info.reset(); + info.reset_sec(); owner.me->pending_ts.clear(); owner.me->pending_trade_order_detail.clear(); } @@ -104,7 +104,7 @@ struct RealTimeHandler::EventGuard { void record_security_change(InstrumentSnapshot *s) { auto &info = owner.me->current_event; s->set_last_msg_processed_sn(owner.me->current_packet_sn); - info.add(s); + info.add_sec(s); } RealTimeHandler &owner; @@ -654,7 +654,7 @@ void RealTimeHandler::on_end_of_event() { me->current_event.event_id++; me->observer.on_event_end(me->current_event); - for (auto s : me->current_event.affected_securities()) { + for (auto s : me->current_event) { const_cast(s)->clear_fills(); const_cast(s)->clear_order_changes(); } diff --git a/src/server/sparkd/cmds/spartan/md/tests/spartan_md_tests.cpp b/src/server/sparkd/cmds/spartan/md/tests/spartan_md_tests.cpp index c8e31e548..dfeb3e931 100644 --- a/src/server/sparkd/cmds/spartan/md/tests/spartan_md_tests.cpp +++ b/src/server/sparkd/cmds/spartan/md/tests/spartan_md_tests.cpp @@ -58,7 +58,7 @@ TEST_CASE("spartan_md", "[spartan_md]") { } void on_event_end(MDP3Event const &ev) override { real_time = true; - for (auto i : ev.affected_securities()) + for (auto i : ev) instruments[i->security_id()] = i; } void on_packet_loss() override { REQUIRE(false); } @@ -111,7 +111,7 @@ TEST_CASE("spartan_md", "[spartan_md]") { } } void on_event_end(MDP3Event const &ev) override { - for (auto is : ev.affected_securities()) { + for (auto is : ev) { if (is->trading_status() == ::mdp3::SecurityTradingStatus::ReadyToTrade) { auto buy_ok = is->build_book_from_orders(api::SIDE_BUY) == diff --git a/src/server/sparkd/cmds/spartan/md/utils/mdp3_utils.cpp b/src/server/sparkd/cmds/spartan/md/utils/mdp3_utils.cpp index 8c227c919..5a0bcd637 100644 --- a/src/server/sparkd/cmds/spartan/md/utils/mdp3_utils.cpp +++ b/src/server/sparkd/cmds/spartan/md/utils/mdp3_utils.cpp @@ -592,7 +592,7 @@ struct CSVObs : IChannelObserver { << ev.last_packet_send_time // last packet send time << std::endl; - for (auto s : ev.affected_securities()) { + for (auto s : ev) { if (known_securities.count(s->security_id()) == 0) { known_securities.insert(s->security_id()); diff --git a/src/server/sparkd/cmds/spartan/md/utils/queries/BookStatRecorder.cpp b/src/server/sparkd/cmds/spartan/md/utils/queries/BookStatRecorder.cpp index 4edbf6ff2..cf0274bd5 100644 --- a/src/server/sparkd/cmds/spartan/md/utils/queries/BookStatRecorder.cpp +++ b/src/server/sparkd/cmds/spartan/md/utils/queries/BookStatRecorder.cpp @@ -185,7 +185,7 @@ void BookStatRecorder::on_event_end(MDP3Event const &ev) { case bts::spartan::EventOrdinal::Interesting: _me->event_id = ev.event_id; record_data( - ev.affected_securities(), ev.event_id, _me->block_size, _me->num_blocks, + ev.secs(), ev.event_id, _me->block_size, _me->num_blocks, _me->out); break; case bts::spartan::EventOrdinal::Done: