From d42b72ea791bfba799d487fed6106e2b04d33587 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 11 Jan 2021 11:56:52 -0500 Subject: [PATCH 1/2] Added Trade summary signal to spartan. --- src/server/sparkd/CMakeDeps.cmake | 2 +- .../cmds/spartan/domain/AggressorSide.h | 20 ++ .../spartan/domain/TradeSummarySignal.cpp | 1 + .../cmds/spartan/domain/TradeSummarySignal.h | 16 ++ .../spartan/md/handler/IChannelObserver.h | 5 +- .../spartan/md/realtime/IRealTimeObserver.h | 3 + .../spartan/md/realtime/RealTimeHandler.cpp | 249 ++++++++++-------- .../spartan/md/realtime/RealTimeHandler.h | 16 +- .../spartan/md/recovery/RecoveryHandler.cpp | 3 +- .../md/platforms/mdp3_onixs/MDP3Listener.h | 2 + 10 files changed, 202 insertions(+), 115 deletions(-) create mode 100644 src/server/sparkd/cmds/spartan/domain/AggressorSide.h create mode 100644 src/server/sparkd/cmds/spartan/domain/TradeSummarySignal.cpp create mode 100644 src/server/sparkd/cmds/spartan/domain/TradeSummarySignal.h diff --git a/src/server/sparkd/CMakeDeps.cmake b/src/server/sparkd/CMakeDeps.cmake index 0c9f5717d..4116f0d32 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/TimeInterval.cpp;cmds/spartan/common/TimeStamp.cpp;cmds/spartan/domain/IcebergQuantity.cpp;cmds/spartan/domain/OrderKey.cpp;cmds/spartan/domain/Price.cpp;cmds/spartan/domain/Quantity.cpp;cmds/spartan/domain/SecurityDefinition.cpp;cmds/spartan/domain/SecurityID.cpp;cmds/spartan/domain/SecuritySnapshot.cpp;cmds/spartan/domain/book/BookLevel.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/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 +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/TimeInterval.cpp;cmds/spartan/common/TimeStamp.cpp;cmds/spartan/domain/IcebergQuantity.cpp;cmds/spartan/domain/OrderKey.cpp;cmds/spartan/domain/Price.cpp;cmds/spartan/domain/Quantity.cpp;cmds/spartan/domain/SecurityDefinition.cpp;cmds/spartan/domain/SecurityID.cpp;cmds/spartan/domain/SecuritySnapshot.cpp;cmds/spartan/domain/TradeSummarySignal.cpp;cmds/spartan/domain/book/BookLevel.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/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/domain/AggressorSide.h b/src/server/sparkd/cmds/spartan/domain/AggressorSide.h new file mode 100644 index 000000000..6ec6eee40 --- /dev/null +++ b/src/server/sparkd/cmds/spartan/domain/AggressorSide.h @@ -0,0 +1,20 @@ +#pragma once + +namespace bts::spartan { + +enum class AggressorSide { + Buy = 0, Sell = 1, None = 2 +}; + +inline constexpr const char *Side_Name(AggressorSide s) { + switch (s) { + case AggressorSide::Buy: + return "Buy"; + case AggressorSide::Sell: + return "Sell"; + case AggressorSide::None: + return "None"; + } +} + +} // namespace bts::spartan diff --git a/src/server/sparkd/cmds/spartan/domain/TradeSummarySignal.cpp b/src/server/sparkd/cmds/spartan/domain/TradeSummarySignal.cpp new file mode 100644 index 000000000..c434ba5f5 --- /dev/null +++ b/src/server/sparkd/cmds/spartan/domain/TradeSummarySignal.cpp @@ -0,0 +1 @@ +#include "TradeSummarySignal.h" diff --git a/src/server/sparkd/cmds/spartan/domain/TradeSummarySignal.h b/src/server/sparkd/cmds/spartan/domain/TradeSummarySignal.h new file mode 100644 index 000000000..e40125a9c --- /dev/null +++ b/src/server/sparkd/cmds/spartan/domain/TradeSummarySignal.h @@ -0,0 +1,16 @@ +#pragma once + +#include "server/sparkd/cmds/spartan/domain/Price.h" +#include "server/sparkd/cmds/spartan/domain/Quantity.h" +#include "server/sparkd/cmds/spartan/domain/AggressorSide.h" + +namespace bts::spartan::mdp3 { + +struct TradeSummarySignal { + Price last_level_price; + Quantity last_level_quantity = Quantity{0}; + uint16_t n_levels = 0; + AggressorSide aggressor_side = AggressorSide::None; +}; + +} diff --git a/src/server/sparkd/cmds/spartan/md/handler/IChannelObserver.h b/src/server/sparkd/cmds/spartan/md/handler/IChannelObserver.h index ee1d41311..54bb0ee0a 100644 --- a/src/server/sparkd/cmds/spartan/md/handler/IChannelObserver.h +++ b/src/server/sparkd/cmds/spartan/md/handler/IChannelObserver.h @@ -15,7 +15,10 @@ class IChannelObserver : public IRecoveryObserver, public IRealTimeObserver { void on_packet_end() override {} void on_event_begin(MDP3Event const &) override {} - void on_book(SecuritySnapshot const &, Book const &, ImpliedBook const &) override {} + void on_book( + SecuritySnapshot const &, Book const &, ImpliedBook const &) override {} + void on_trade_summary_signal( + SecuritySnapshot const &, TradeSummarySignal const &) override {} void on_event_end(MDP3Event const &) override {} void on_packet_loss() override {} diff --git a/src/server/sparkd/cmds/spartan/md/realtime/IRealTimeObserver.h b/src/server/sparkd/cmds/spartan/md/realtime/IRealTimeObserver.h index d42db7063..eff5208cd 100644 --- a/src/server/sparkd/cmds/spartan/md/realtime/IRealTimeObserver.h +++ b/src/server/sparkd/cmds/spartan/md/realtime/IRealTimeObserver.h @@ -7,6 +7,7 @@ namespace bts::spartan::mdp3 { class MDP3Event; class MDP3PacketView; class SecuritySnapshot; +struct TradeSummarySignal; class IRealTimeObserver { public: @@ -16,6 +17,8 @@ class IRealTimeObserver { virtual void on_event_begin(MDP3Event const &) = 0; virtual void on_book(SecuritySnapshot const &, Book const &, ImpliedBook const &) = 0; + virtual void on_trade_summary_signal( + SecuritySnapshot const &, TradeSummarySignal const &) = 0; virtual void on_event_end(MDP3Event const &) = 0; virtual void on_packet_loss() = 0; diff --git a/src/server/sparkd/cmds/spartan/md/realtime/RealTimeHandler.cpp b/src/server/sparkd/cmds/spartan/md/realtime/RealTimeHandler.cpp index 743004482..ef1f35a86 100644 --- a/src/server/sparkd/cmds/spartan/md/realtime/RealTimeHandler.cpp +++ b/src/server/sparkd/cmds/spartan/md/realtime/RealTimeHandler.cpp @@ -1,14 +1,16 @@ #include "RealTimeHandler.h" -#include "../common/mdp3_common.h" -#include "../gen/MDIncrementalRefreshBook46.h" -#include "../parsing/MDP3Parser.h" #include "IRealTimeObserver.h" #include "server/sparkd/cmds/spartan/domain/SecuritySnapshot.h" +#include "server/sparkd/cmds/spartan/domain/TradeSummarySignal.h" +#include "server/sparkd/cmds/spartan/md/common/mdp3_common.h" +#include "server/sparkd/cmds/spartan/md/gen/MDIncrementalRefreshBook46.h" +#include "server/sparkd/cmds/spartan/md/parsing/MDP3Parser.h" + #include namespace bts::spartan::mdp3 { -struct RealTimeHandler::TradeSummary { +struct RealTimeHandler::PendingTradeSummary { ::mdp3::MDUpdateAction::Value update_action; SecuritySnapshot *security; Price price; @@ -18,26 +20,25 @@ struct RealTimeHandler::TradeSummary { MDP3TradeEntryID trade_entry_id; }; -struct RealTimeHandler::TradeOrderDetail { +struct RealTimeHandler::PendingTradeOrderDetail { OrderKey order_id; Quantity quantity; }; struct RealTimeHandler::PImpl { PImpl(IRealTimeObserver &o) - : instruments(), current_packet_send_time(TimeStamp{0}), + : securities(), current_packet_send_time(TimeStamp{0}), current_packet_sn(0), current_event(), observer(o), pending_ts(), pending_trade_order_detail() {} - std::unordered_map> - instruments; + std::unordered_map> securities; TimeStamp current_packet_send_time; uint32_t current_packet_sn; MDP3Event current_event; IRealTimeObserver &observer; - std::vector pending_ts; - std::vector pending_trade_order_detail; + std::vector pending_ts; + std::vector pending_trade_order_detail; }; struct RealTimeHandler::EventGuard { @@ -117,8 +118,8 @@ RealTimeHandler::~RealTimeHandler() {} void RealTimeHandler::add_snapshot( std::unique_ptr &&snapshot) { bts_assert(!is_processing_multi_message_event()); - bts_assert(find_instrument(snapshot->security_id()) == nullptr); - me->instruments[snapshot->security_id()] = std::move(snapshot); + bts_assert(find_security(snapshot->security_id()) == nullptr); + me->securities[snapshot->security_id()] = std::move(snapshot); } void RealTimeHandler::add_snapshots(std::vector &snaps) { @@ -131,9 +132,9 @@ bool RealTimeHandler::is_processing_multi_message_event() const { } std::vector> -RealTimeHandler::move_all_instruments_and_reset() { +RealTimeHandler::move_all_securities_and_reset() { std::vector> result; - for (auto &p : me->instruments) + for (auto &p : me->securities) result.push_back(std::move(p.second)); return result; } @@ -179,12 +180,12 @@ void RealTimeHandler::operator()(::mdp3::MDIncrementalRefreshBook46 &m) { m.noMDEntries().forEach([&ev, this, &cache, &cache_idx](auto &md_entry) { auto sid = SecurityID{md_entry.securityID()}; - auto iptr = find_instrument(sid); - if (!iptr) { + auto sptr = find_security(sid); + if (!sptr) { cache_idx++; return; } - ev.record_security_change(iptr); + ev.record_security_change(sptr); auto side = convert_side(md_entry.mDEntryType()); auto level = BookLevel{ @@ -206,13 +207,13 @@ void RealTimeHandler::operator()(::mdp3::MDIncrementalRefreshBook46 &m) { case ::mdp3::MDEntryTypeBook::Offer: { switch (md_entry.mDUpdateAction()) { case ::mdp3::MDUpdateAction::New: - iptr->insert_book_level(side, md_entry.mDPriceLevel(), level); + sptr->insert_book_level(side, md_entry.mDPriceLevel(), level); break; case ::mdp3::MDUpdateAction::Change: - iptr->update_book_level(side, md_entry.mDPriceLevel(), level); + sptr->update_book_level(side, md_entry.mDPriceLevel(), level); break; case ::mdp3::MDUpdateAction::Delete: - iptr->remove_book_level(side, md_entry.mDPriceLevel()); + sptr->remove_book_level(side, md_entry.mDPriceLevel()); break; default: bts_assert(false); @@ -225,15 +226,15 @@ void RealTimeHandler::operator()(::mdp3::MDIncrementalRefreshBook46 &m) { case ::mdp3::MDEntryTypeBook::ImpliedOffer: { switch (md_entry.mDUpdateAction()) { case ::mdp3::MDUpdateAction::New: - iptr->insert_implied_book_level( + sptr->insert_implied_book_level( side, md_entry.mDPriceLevel(), level); break; case ::mdp3::MDUpdateAction::Change: - iptr->update_implied_book_level( + sptr->update_implied_book_level( side, md_entry.mDPriceLevel(), level); break; case ::mdp3::MDUpdateAction::Delete: - iptr->remove_implied_book_level(side, md_entry.mDPriceLevel()); + sptr->remove_implied_book_level(side, md_entry.mDPriceLevel()); break; default: bts_assert(false); @@ -253,8 +254,8 @@ void RealTimeHandler::operator()(::mdp3::MDIncrementalRefreshBook46 &m) { m.noOrderIDEntries().forEach([this, &cache](auto &order_id_entry) { auto &md_entry = cache[order_id_entry.referenceID() - 1]; auto sid = md_entry.id; - auto iptr = find_instrument(sid); - if (!iptr) + auto sptr = find_security(sid); + if (!sptr) return; MDP3Order order; order.key = OrderKey{order_id_entry.orderID()}; @@ -265,13 +266,13 @@ void RealTimeHandler::operator()(::mdp3::MDIncrementalRefreshBook46 &m) { order.price = md_entry.price; switch (order_id_entry.orderUpdateAction()) { case ::mdp3::OrderUpdateAction::New: - iptr->insert_order(order); + sptr->insert_order(order); break; case ::mdp3::OrderUpdateAction::Update: - iptr->update_order(order); + sptr->update_order(order); break; case ::mdp3::OrderUpdateAction::Delete: - iptr->remove_order(order.key); + sptr->remove_order(order.key); break; default: bts_assert(false); @@ -286,24 +287,24 @@ void RealTimeHandler::operator()( m.noMDEntries().forEach([&ev, this](auto &md_entry) { auto sid = SecurityID{md_entry.securityID()}; - auto iptr = find_instrument(sid); - if (!iptr) + auto sptr = find_security(sid); + if (!sptr) return; - ev.record_security_change(iptr); + ev.record_security_change(sptr); switch (md_entry.mDEntryType()) { case ::mdp3::MDEntryTypeDailyStatistics::ClearedVolume: - iptr->set_cleared_volume(Quantity{md_entry.mDEntrySize()}); + sptr->set_cleared_volume(Quantity{md_entry.mDEntrySize()}); break; case ::mdp3::MDEntryTypeDailyStatistics::FixingPrice: - iptr->set_fixing_price(Price{ + sptr->set_fixing_price(Price{ md_entry.mDEntryPx().mantissa(), md_entry.mDEntryPx().exponent()}); break; case ::mdp3::MDEntryTypeDailyStatistics::OpenInterest: - iptr->set_open_interest(Quantity{md_entry.mDEntrySize()}); + sptr->set_open_interest(Quantity{md_entry.mDEntrySize()}); break; case ::mdp3::MDEntryTypeDailyStatistics::SettlementPrice: - iptr->set_settlement_price(Price{ + sptr->set_settlement_price(Price{ md_entry.mDEntryPx().mantissa(), md_entry.mDEntryPx().exponent()}); break; default: @@ -318,17 +319,17 @@ void RealTimeHandler::operator()( m.noMDEntries().forEach([&ev, this](auto &md_entry) { auto sid = SecurityID{md_entry.securityID()}; - auto iptr = find_instrument(sid); - if (!iptr) + auto sptr = find_security(sid); + if (!sptr) return; - ev.record_security_change(iptr); - iptr->set_high_limit_price(Price{ + ev.record_security_change(sptr); + sptr->set_high_limit_price(Price{ md_entry.highLimitPrice().mantissa(), md_entry.highLimitPrice().exponent()}); - iptr->set_low_limit_price(Price{ + sptr->set_low_limit_price(Price{ md_entry.lowLimitPrice().mantissa(), md_entry.lowLimitPrice().exponent()}); - iptr->set_max_price_variation(Price{ + sptr->set_max_price_variation(Price{ md_entry.maxPriceVariation().mantissa(), md_entry.maxPriceVariation().exponent()}); }); @@ -339,10 +340,10 @@ void RealTimeHandler::operator()(::mdp3::MDIncrementalRefreshOrderBook47 &m) { m.noMDEntries().forEach([&ev, this](auto &md_entry) { auto sid = SecurityID{md_entry.securityID()}; - auto iptr = find_instrument(sid); - if (!iptr) + auto sptr = find_security(sid); + if (!sptr) return; - ev.record_security_change(iptr); + ev.record_security_change(sptr); MDP3Order order; order.key = OrderKey{md_entry.orderID()}; @@ -354,13 +355,13 @@ void RealTimeHandler::operator()(::mdp3::MDIncrementalRefreshOrderBook47 &m) { md_entry.mDEntryPx().mantissa(), md_entry.mDEntryPx().exponent()}; switch (md_entry.mDUpdateAction()) { case ::mdp3::MDUpdateAction::New: - iptr->insert_order(order); + sptr->insert_order(order); break; case ::mdp3::MDUpdateAction::Change: - iptr->update_order(order); + sptr->update_order(order); break; case ::mdp3::MDUpdateAction::Delete: - iptr->remove_order(order.key); + sptr->remove_order(order.key); break; default: bts_assert(false); @@ -376,37 +377,37 @@ void RealTimeHandler::operator()( m.noMDEntries().forEach([&ev, this](auto &md_entry) { auto sid = SecurityID{md_entry.securityID()}; - auto iptr = find_instrument(sid); - if (!iptr) + auto sptr = find_security(sid); + if (!sptr) return; - ev.record_security_change(iptr); + ev.record_security_change(sptr); switch (md_entry.mDUpdateAction()) { case ::mdp3::MDUpdateAction::New: case ::mdp3::MDUpdateAction::Change: switch (md_entry.mDEntryType()) { case ::mdp3::MDEntryTypeStatistics::OpenPrice: - iptr->set_open_price(Price{ + sptr->set_open_price(Price{ md_entry.mDEntryPx().mantissa(), md_entry.mDEntryPx().exponent()}); break; case ::mdp3::MDEntryTypeStatistics::HighTrade: - iptr->set_high_trade_price(Price{ + sptr->set_high_trade_price(Price{ md_entry.mDEntryPx().mantissa(), md_entry.mDEntryPx().exponent()}); break; case ::mdp3::MDEntryTypeStatistics::LowTrade: - iptr->set_low_trade_price(Price{ + sptr->set_low_trade_price(Price{ md_entry.mDEntryPx().mantissa(), md_entry.mDEntryPx().exponent()}); break; case ::mdp3::MDEntryTypeStatistics::HighestBid: - iptr->set_high_bid(Price{ + sptr->set_high_bid(Price{ md_entry.mDEntryPx().mantissa(), md_entry.mDEntryPx().exponent()}); break; case ::mdp3::MDEntryTypeStatistics::LowestOffer: - iptr->set_low_offer(Price{ + sptr->set_low_offer(Price{ md_entry.mDEntryPx().mantissa(), md_entry.mDEntryPx().exponent()}); break; @@ -417,10 +418,10 @@ void RealTimeHandler::operator()( case ::mdp3::MDUpdateAction::Delete: switch (md_entry.mDEntryType()) { case ::mdp3::MDEntryTypeStatistics::HighTrade: - iptr->set_high_trade_price({}); + sptr->set_high_trade_price({}); break; case ::mdp3::MDEntryTypeStatistics::LowTrade: - iptr->set_low_trade_price({}); + sptr->set_low_trade_price({}); break; default: bts_assert(false); @@ -436,18 +437,55 @@ void RealTimeHandler::operator()( ::mdp3::MDIncrementalRefreshTradeSummary48 &m) { EventGuard ev(*this, m); - m.noMDEntries().forEach([&ev, this](auto &md_entry) { - auto sid = SecurityID{md_entry.securityID()}; - auto iptr = find_instrument(sid); - if (!iptr) - return; - ev.record_security_change(iptr); + auto map_aggressor = [](::mdp3::AggressorSide::Value s) { + switch(s) { + case ::mdp3::AggressorSide::Buy: + return AggressorSide::Buy; + case ::mdp3::AggressorSide::Sell: + return AggressorSide::Sell; + default: + return AggressorSide::None; + } + }; - TradeSummary summary; + struct TSAccumulator { + SecuritySnapshot const *sec = nullptr; + bool bad_signal = true; + TradeSummarySignal signal; + } t_signal; + + m.noMDEntries().forEach([&](auto &md_entry) { + auto sid = SecurityID{md_entry.securityID()}; + auto sptr = find_security(sid); + if (!sptr) + return; + ev.record_security_change(sptr); + auto aggressor = map_aggressor(md_entry.aggressorSide()); + + if (t_signal.sec == nullptr) { + t_signal.sec = sptr; + if (aggressor == AggressorSide::None) + t_signal.bad_signal = true; + else + t_signal.signal.aggressor_side = aggressor; + } + + if (!t_signal.bad_signal) { + if (t_signal.sec != sptr || + t_signal.signal.aggressor_side != aggressor) + t_signal.bad_signal = true; + t_signal.signal.last_level_price = + Price{md_entry.mDEntryPx().mantissa(), md_entry.mDEntryPx().exponent()}; + t_signal.signal.last_level_quantity = + Quantity{md_entry.mDEntrySize()}; + t_signal.signal.n_levels ++; + + } + + PendingTradeSummary summary; summary.update_action = md_entry.mDUpdateAction(); - summary.security = iptr; - summary.price = Price{ - md_entry.mDEntryPx().mantissa(), md_entry.mDEntryPx().exponent()}; + summary.security = sptr; + summary.price = Price{md_entry.mDEntryPx().mantissa(), md_entry.mDEntryPx().exponent()}; summary.quantity = Quantity{md_entry.mDEntrySize()}; summary.n_orders = md_entry.numberOfOrders(); summary.aggressor = md_entry.aggressorSide(); @@ -455,8 +493,11 @@ void RealTimeHandler::operator()( me->pending_ts.emplace_back(summary); }); + if (t_signal.sec && !t_signal.bad_signal) + me->observer.on_trade_summary_signal(*t_signal.sec,t_signal.signal); + m.noOrderIDEntries().forEach([this](auto &order_id_entry) { - TradeOrderDetail detail; + PendingTradeOrderDetail detail; detail.order_id = OrderKey{order_id_entry.orderID()}; detail.quantity = Quantity{order_id_entry.lastQty()}; me->pending_trade_order_detail.emplace_back(detail); @@ -467,12 +508,12 @@ void RealTimeHandler::operator()(::mdp3::MDIncrementalRefreshVolume37 &m) { EventGuard ev(*this, m); m.noMDEntries().forEach([&ev, this](auto &md_entry) { auto sid = SecurityID{md_entry.securityID()}; - auto iptr = find_instrument(sid); - if (!iptr) + auto sptr = find_security(sid); + if (!sptr) return; - ev.record_security_change(iptr); + ev.record_security_change(sptr); - iptr->set_electronic_volume(Quantity{md_entry.mDEntrySize()}); + sptr->set_electronic_volume(Quantity{md_entry.mDEntrySize()}); }); } @@ -484,24 +525,24 @@ void RealTimeHandler::on_instrument_definition(DefM &d) { d.matchEventIndicator().endOfEvent()); auto sid = SecurityID{d.securityID()}; - if (auto iptr = find_instrument(sid); !iptr) { + if (auto sptr = find_security(sid); !sptr) { // We only add instruments if we observe them being created // because otherwise we cannot guarantee that the incremental // book updates we receive can be applied to the instrument. if (d.securityUpdateAction() == ::mdp3::SecurityUpdateAction::Add) { auto new_snapshot = std::make_unique(SecurityDefinition{d}); - iptr = new_snapshot.get(); - me->instruments[sid] = std::move(new_snapshot); - ev.record_security_change(iptr); + sptr = new_snapshot.get(); + me->securities[sid] = std::move(new_snapshot); + ev.record_security_change(sptr); } else { // We have not observed the instrument creation so it will be // someone else's responsability to build a snapshot for this // instrument and add it via add_snapshot() } } else { - iptr->set_definition(SecurityDefinition{d}); - ev.record_security_change(iptr); + sptr->set_definition(SecurityDefinition{d}); + ev.record_security_change(sptr); } } @@ -524,45 +565,45 @@ void RealTimeHandler::operator()(::mdp3::QuoteRequest39 &qr) { void RealTimeHandler::operator()(::mdp3::SecurityStatus30 &ss) { EventGuard ev(*this, ss); - auto update_implied_matching = [&ss](auto &iptr) { + auto update_implied_matching = [&ss](auto &sptr) { if (ss.securityTradingEvent() == ::mdp3::SecurityTradingEvent::ImpliedMatchingON) - iptr.set_implied_matching_status(true); + sptr.set_implied_matching_status(true); else if ( ss.securityTradingEvent() == ::mdp3::SecurityTradingEvent::ImpliedMatchingOFF) - iptr.set_implied_matching_status(false); + sptr.set_implied_matching_status(false); }; - auto update_trading_status = [&ss](auto &iptr) { + auto update_trading_status = [&ss](auto &sptr) { if (ss.securityTradingStatus() != ::mdp3::SecurityTradingStatus::NoChange) - iptr.set_trading_status(ss.securityTradingStatus()); + sptr.set_trading_status(ss.securityTradingStatus()); }; // This applies only to the security if (ss.securityID() != ss.securityIDNullValue()) { auto sid = SecurityID{ss.securityID()}; - auto iptr = find_instrument(sid); - if (!iptr) + auto sptr = find_security(sid); + if (!sptr) return; - ev.record_security_change(iptr); - update_trading_status(*iptr); - update_implied_matching(*iptr); + ev.record_security_change(sptr); + update_trading_status(*sptr); + update_implied_matching(*sptr); return; } // All securities with this group if (*ss.securityGroup() != ss.securityGroupNullValue()) { - for (auto &p : me->instruments) { - auto &iptr = p.second; - auto def = iptr->definition(); + for (auto &p : me->securities) { + auto &sptr = p.second; + auto def = sptr->definition(); auto sgroup = str_from_fixed_array( ss.securityGroup(), ss.securityGroupEncodingLength()); if (def.security_group() == sgroup) { - ev.record_security_change(iptr.get()); - update_trading_status(*iptr); - update_implied_matching(*iptr); + ev.record_security_change(sptr.get()); + update_trading_status(*sptr); + update_implied_matching(*sptr); } } return; @@ -570,15 +611,15 @@ void RealTimeHandler::operator()(::mdp3::SecurityStatus30 &ss) { // All securities on this asset if (*ss.asset() != ss.assetNullValue()) { - for (auto &p : me->instruments) { - auto &iptr = p.second; - auto def = iptr->definition(); + for (auto &p : me->securities) { + auto &sptr = p.second; + auto def = sptr->definition(); auto sasset = str_from_fixed_array(ss.asset(), ss.assetEncodingLength()); if (def.asset() == sasset) { - ev.record_security_change(iptr.get()); - update_trading_status(*iptr); - update_implied_matching(*iptr); + ev.record_security_change(sptr.get()); + update_trading_status(*sptr); + update_implied_matching(*sptr); } } return; @@ -587,7 +628,7 @@ void RealTimeHandler::operator()(::mdp3::SecurityStatus30 &ss) { void RealTimeHandler::operator()(::mdp3::ChannelReset4 &r) { EventGuard ev(*this, r); - for (auto &p : me->instruments) + for (auto &p : me->securities) p.second->reset_books(); } @@ -663,9 +704,9 @@ void RealTimeHandler::on_end_of_event() { } } -SecuritySnapshot *RealTimeHandler::find_instrument(SecurityID id) { - auto it = me->instruments.find(id); - if (it == me->instruments.end()) +SecuritySnapshot *RealTimeHandler::find_security(SecurityID id) { + auto it = me->securities.find(id); + if (it == me->securities.end()) return nullptr; else return it->second.get(); diff --git a/src/server/sparkd/cmds/spartan/md/realtime/RealTimeHandler.h b/src/server/sparkd/cmds/spartan/md/realtime/RealTimeHandler.h index e38d0fb1d..5dfa7d8a6 100644 --- a/src/server/sparkd/cmds/spartan/md/realtime/RealTimeHandler.h +++ b/src/server/sparkd/cmds/spartan/md/realtime/RealTimeHandler.h @@ -28,7 +28,7 @@ class SecuritySnapshot; class IRealTimeObserver; class MDP3PacketView; -// Updates a set of instruments snapshots with the incremental changes +// Updates a set of security snapshots with the incremental changes // reported in the real time incremental feed. Callers must ensure // that the snapshots they pass are synchronized with the real time // feeed, that is that for any added snapshot the next message @@ -41,7 +41,7 @@ class RealTimeHandler { RealTimeHandler(IRealTimeObserver &); ~RealTimeHandler(); - // Add a snapshot, including the instrument definition and its book + // Add a snapshot, including the security definition and its book // to the list of updated snapshots. Ownership of the passed // snapshot is transfered to this class. Caller must ensure that // the snapshot is synchronized with the real time feed, that is @@ -63,13 +63,13 @@ class RealTimeHandler { // not allow adding or removing snapshots during event processing. bool is_processing_multi_message_event() const; - // Transfer ownership of all instrument snapshots to caller and + // Transfer ownership of all security snapshots to caller and // reset internal state to empty. It is a fatal error to invoke // this method while in middle of a processing a multi message // packet (is_processing_packet() returns true) - std::vector move_all_instruments_and_reset(); + std::vector move_all_securities_and_reset(); - // Remove all instrument snapshots and reset internal state to + // Remove all security snapshots and reset internal state to // expect a new set of snapshots, starting on a event and packet // boundary. void reset(); @@ -93,11 +93,11 @@ class RealTimeHandler { private: struct PImpl; struct EventGuard; - struct TradeSummary; - struct TradeOrderDetail; + struct PendingTradeSummary; + struct PendingTradeOrderDetail; std::unique_ptr me; - SecuritySnapshot *find_instrument(SecurityID); + SecuritySnapshot *find_security(SecurityID); void on_start_of_event(); void on_end_of_event(); template void on_instrument_definition(Def &); diff --git a/src/server/sparkd/cmds/spartan/md/recovery/RecoveryHandler.cpp b/src/server/sparkd/cmds/spartan/md/recovery/RecoveryHandler.cpp index 7994a907d..8ca8eca1b 100644 --- a/src/server/sparkd/cmds/spartan/md/recovery/RecoveryHandler.cpp +++ b/src/server/sparkd/cmds/spartan/md/recovery/RecoveryHandler.cpp @@ -153,6 +153,7 @@ RecoveryHandler::MaybeSnapshot RecoveryHandler::try_build_snapshot_and_reset() { struct NullObserver : IRealTimeObserver { void on_event_begin(MDP3Event const &) {} void on_book(SecuritySnapshot const &, Book const &, ImpliedBook const &) {} + void on_trade_summary_signal(SecuritySnapshot const &,TradeSummarySignal const& ) {} void on_event_end(MDP3Event const &) {} void on_packet_loss() {} void on_packet_begin(MDP3PacketView const &) {} @@ -207,7 +208,7 @@ RecoveryHandler::MaybeSnapshot RecoveryHandler::try_build_snapshot_and_reset() { // have been shown the incremental messages that have occurred // since their books were recovered from the snapshot feed. We are // ready to go - auto result = rt_handler.move_all_instruments_and_reset(); + auto result = rt_handler.move_all_securities_and_reset(); reset(); return std::move(result); } diff --git a/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.h b/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.h index ad5a9a4ed..cd2e6f089 100644 --- a/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.h +++ b/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.h @@ -260,6 +260,8 @@ class MDP3Listener : public onixs::HandlerListener, // not vanilla we bail if (signal.sk == invalid_security_key) { // First entry defines the side, security and packet sn + + signal.sk = data->handle.key(); signal.ts = _packet_arrived; signal.aggressor = ag_side; From ee725747ad1733ea5d79386e55499a63638e2a2a Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 11 Jan 2021 13:23:28 -0500 Subject: [PATCH 2/2] Added trade summary signal --- src/server/sparkd/cmds/spartan/md/handler/IChannelObserver.h | 2 +- src/server/sparkd/cmds/spartan/md/realtime/IRealTimeObserver.h | 2 +- src/server/sparkd/cmds/spartan/md/realtime/RealTimeHandler.cpp | 2 +- src/server/sparkd/cmds/spartan/md/recovery/RecoveryHandler.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/server/sparkd/cmds/spartan/md/handler/IChannelObserver.h b/src/server/sparkd/cmds/spartan/md/handler/IChannelObserver.h index 54bb0ee0a..2047bed30 100644 --- a/src/server/sparkd/cmds/spartan/md/handler/IChannelObserver.h +++ b/src/server/sparkd/cmds/spartan/md/handler/IChannelObserver.h @@ -15,7 +15,7 @@ class IChannelObserver : public IRecoveryObserver, public IRealTimeObserver { void on_packet_end() override {} void on_event_begin(MDP3Event const &) override {} - void on_book( + void on_books( SecuritySnapshot const &, Book const &, ImpliedBook const &) override {} void on_trade_summary_signal( SecuritySnapshot const &, TradeSummarySignal const &) override {} diff --git a/src/server/sparkd/cmds/spartan/md/realtime/IRealTimeObserver.h b/src/server/sparkd/cmds/spartan/md/realtime/IRealTimeObserver.h index eff5208cd..cd4eb4cfd 100644 --- a/src/server/sparkd/cmds/spartan/md/realtime/IRealTimeObserver.h +++ b/src/server/sparkd/cmds/spartan/md/realtime/IRealTimeObserver.h @@ -16,7 +16,7 @@ class IRealTimeObserver { virtual void on_event_begin(MDP3Event const &) = 0; virtual void - on_book(SecuritySnapshot const &, Book const &, ImpliedBook const &) = 0; + on_books(SecuritySnapshot const &, Book const &, ImpliedBook const &) = 0; virtual void on_trade_summary_signal( SecuritySnapshot const &, TradeSummarySignal const &) = 0; virtual void on_event_end(MDP3Event const &) = 0; diff --git a/src/server/sparkd/cmds/spartan/md/realtime/RealTimeHandler.cpp b/src/server/sparkd/cmds/spartan/md/realtime/RealTimeHandler.cpp index ef1f35a86..cac7ad58d 100644 --- a/src/server/sparkd/cmds/spartan/md/realtime/RealTimeHandler.cpp +++ b/src/server/sparkd/cmds/spartan/md/realtime/RealTimeHandler.cpp @@ -249,7 +249,7 @@ void RealTimeHandler::operator()(::mdp3::MDIncrementalRefreshBook46 &m) { }); for (auto s_ptr : me->current_event) - me->observer.on_book(*s_ptr, s_ptr->book(), s_ptr->implied_book()); + me->observer.on_books(*s_ptr, s_ptr->book(), s_ptr->implied_book()); m.noOrderIDEntries().forEach([this, &cache](auto &order_id_entry) { auto &md_entry = cache[order_id_entry.referenceID() - 1]; diff --git a/src/server/sparkd/cmds/spartan/md/recovery/RecoveryHandler.cpp b/src/server/sparkd/cmds/spartan/md/recovery/RecoveryHandler.cpp index 8ca8eca1b..65d7c61cd 100644 --- a/src/server/sparkd/cmds/spartan/md/recovery/RecoveryHandler.cpp +++ b/src/server/sparkd/cmds/spartan/md/recovery/RecoveryHandler.cpp @@ -152,7 +152,7 @@ RecoveryHandler::MaybeSnapshot RecoveryHandler::try_build_snapshot_and_reset() { // event in the queue has not yet been seen by the snapshot. struct NullObserver : IRealTimeObserver { void on_event_begin(MDP3Event const &) {} - void on_book(SecuritySnapshot const &, Book const &, ImpliedBook const &) {} + void on_books(SecuritySnapshot const &, Book const &, ImpliedBook const &) {} void on_trade_summary_signal(SecuritySnapshot const &,TradeSummarySignal const& ) {} void on_event_end(MDP3Event const &) {} void on_packet_loss() {}