From bdfed43b016cf4ee458cd9fd1010e7216ef05969 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Fri, 5 Feb 2021 21:09:37 -0500 Subject: [PATCH] Refactor. --- src/server/sparkd/CMakeDeps.cmake | 2 +- .../back_testing/algos/PolyObserver.cpp | 5 +- .../back_testing/algos/SniperModel.cpp | 11 +- .../cmds/spartan/back_testing/run/run_sim.h | 3 - .../cmds/spartan/back_testing/sim/ISim.h | 5 +- .../cmds/spartan/back_testing/sim/Sim.cpp | 16 +-- .../back_testing/sim/pcap/PCapEventSource.cpp | 4 +- .../back_testing/sim/pcap/PCapEventSource.h | 7 +- .../sparkd/cmds/spartan/cmds/FindPolys.cpp | 4 +- .../sparkd/cmds/spartan/cmds/ValuePolys.cpp | 4 +- .../polygons}/PolygonFinder.cpp | 13 +- .../polygons}/PolygonFinder.h | 2 +- .../polygons}/PolygonOpportunityFinder.cpp | 0 .../polygons}/PolygonOpportunityFinder.h | 2 +- .../polygons}/polygon_utils.cpp | 0 .../utils => domain/polygons}/polygon_utils.h | 2 +- .../polygons}/tests/test_polygon_finder.cpp | 2 +- .../cmds/spartan/feed_handler/FeedHandler.cpp | 12 +- .../cmds/spartan/feed_handler/FeedHandler.h | 2 +- .../spartan/feed_handler/FeedHandlerBinder.h | 2 +- .../cmds/spartan/feed_handler/IFeedObserver.h | 6 +- .../{feed_control => detail}/AB_Arbitrageur.h | 4 +- .../{recovery => detail}/BookSnapshot.cpp | 0 .../{recovery => detail}/BookSnapshot.h | 0 .../DefinitionSnapshot.cpp | 0 .../{recovery => detail}/DefinitionSnapshot.h | 0 .../IFeedController.cpp | 0 .../IFeedController.h | 0 .../IMDP3RecoveryObserver.h | 0 .../IRealTimeMDObserver.h} | 7 +- .../{recovery => detail}/IncrementalQueue.cpp | 0 .../{recovery => detail}/IncrementalQueue.h | 0 .../{feed_control => detail}/PickedFeed.h | 0 .../RealTimeMDHandler.cpp} | 113 +++++++++--------- .../RealTimeMDHandler.h} | 12 +- .../RecoveryMDHandler.cpp} | 93 +++++++------- .../RecoveryMDHandler.h} | 13 +- .../{common => }/tests/book_merging_tests.cpp | 0 .../feed_handler/tests/spartan_md_tests.cpp | 22 ++-- .../tests/synthetic_book_tests.cpp | 0 .../spartan/feed_handler/utils/mdp3_utils.cpp | 37 +++--- 41 files changed, 203 insertions(+), 202 deletions(-) rename src/server/sparkd/cmds/spartan/{feed_handler/feed_observers => domain/polygons}/PolygonFinder.cpp (95%) rename src/server/sparkd/cmds/spartan/{feed_handler/feed_observers => domain/polygons}/PolygonFinder.h (96%) rename src/server/sparkd/cmds/spartan/{feed_handler/feed_observers => domain/polygons}/PolygonOpportunityFinder.cpp (100%) rename src/server/sparkd/cmds/spartan/{feed_handler/feed_observers => domain/polygons}/PolygonOpportunityFinder.h (98%) rename src/server/sparkd/cmds/spartan/{feed_handler/utils => domain/polygons}/polygon_utils.cpp (100%) rename src/server/sparkd/cmds/spartan/{feed_handler/utils => domain/polygons}/polygon_utils.h (99%) rename src/server/sparkd/cmds/spartan/{feed_handler/utils => domain/polygons}/tests/test_polygon_finder.cpp (99%) rename src/server/sparkd/cmds/spartan/feed_handler/{feed_control => detail}/AB_Arbitrageur.h (96%) rename src/server/sparkd/cmds/spartan/feed_handler/{recovery => detail}/BookSnapshot.cpp (100%) rename src/server/sparkd/cmds/spartan/feed_handler/{recovery => detail}/BookSnapshot.h (100%) rename src/server/sparkd/cmds/spartan/feed_handler/{recovery => detail}/DefinitionSnapshot.cpp (100%) rename src/server/sparkd/cmds/spartan/feed_handler/{recovery => detail}/DefinitionSnapshot.h (100%) rename src/server/sparkd/cmds/spartan/feed_handler/{feed_control => detail}/IFeedController.cpp (100%) rename src/server/sparkd/cmds/spartan/feed_handler/{feed_control => detail}/IFeedController.h (100%) rename src/server/sparkd/cmds/spartan/feed_handler/{recovery => detail}/IMDP3RecoveryObserver.h (100%) rename src/server/sparkd/cmds/spartan/feed_handler/{realtime/IMDP3RealTimeObserver.h => detail/IRealTimeMDObserver.h} (83%) rename src/server/sparkd/cmds/spartan/feed_handler/{recovery => detail}/IncrementalQueue.cpp (100%) rename src/server/sparkd/cmds/spartan/feed_handler/{recovery => detail}/IncrementalQueue.h (100%) rename src/server/sparkd/cmds/spartan/feed_handler/{feed_control => detail}/PickedFeed.h (100%) rename src/server/sparkd/cmds/spartan/feed_handler/{realtime/RealTimeHandler.cpp => detail/RealTimeMDHandler.cpp} (87%) rename src/server/sparkd/cmds/spartan/feed_handler/{realtime/RealTimeHandler.h => detail/RealTimeMDHandler.h} (94%) rename src/server/sparkd/cmds/spartan/feed_handler/{recovery/RecoveryHandler.cpp => detail/RecoveryMDHandler.cpp} (85%) rename src/server/sparkd/cmds/spartan/feed_handler/{recovery/RecoveryHandler.h => detail/RecoveryMDHandler.h} (95%) rename src/server/sparkd/cmds/spartan/feed_handler/{common => }/tests/book_merging_tests.cpp (100%) rename src/server/sparkd/cmds/spartan/feed_handler/{utils => }/tests/synthetic_book_tests.cpp (100%) diff --git a/src/server/sparkd/CMakeDeps.cmake b/src/server/sparkd/CMakeDeps.cmake index 1502ea45a..b579210c9 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/CMECert.cpp;cmds/ConfigCheck.cpp;cmds/FIXSim.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/Web.cpp;cmds/md/cmds/Channels.cpp;cmds/md/cmds/Cleanup.cpp;cmds/md/cmds/Dump.cpp;cmds/md/cmds/DumpSecurity.cpp;cmds/md/cmds/RecTool.cpp;cmds/md/cmds/Record.cpp;cmds/md/cmds/Relay.cpp;cmds/md/cmds/Replay.cpp;cmds/md/cmds/Run.cpp;cmds/md/cmds/Tail.cpp;cmds/md/cmds/rec_tool/cmds/Print.cpp;cmds/md/cmds/rec_tool/cmds/Trace.cpp;cmds/md/cmds/rec_tool/cmds/Unprint.cpp;cmds/md/common/PlatformOption.cpp;cmds/md/common/SecurityTypeOption.cpp;cmds/md/common/VenueOption.cpp;cmds/spartan/back_testing/algos/PolyObserver.cpp;cmds/spartan/back_testing/algos/SniperModel.cpp;cmds/spartan/back_testing/algos/TestObserver.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/common/Trace.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/FillDepot.cpp;cmds/spartan/back_testing/matcher/Matcher.cpp;cmds/spartan/back_testing/matcher/MatchingCommon.cpp;cmds/spartan/back_testing/matcher/common/IcebergFileCache.cpp;cmds/spartan/back_testing/matcher/common/MatcherOneof.cpp;cmds/spartan/back_testing/matcher/common/MatcherOrder.cpp;cmds/spartan/back_testing/matcher/common/MatchingSession.cpp;cmds/spartan/back_testing/matcher/iceberg_helper.cpp;cmds/spartan/back_testing/matcher/tests/matcher_tests.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/pcap/PCapOrderChangeBootstrapper.cpp;cmds/spartan/back_testing/sim/spark_bridge/AlgoServicesBridge.cpp;cmds/spartan/back_testing/sim/spark_bridge/BeforeLaunchBridge.cpp;cmds/spartan/cmds/BookStats.cpp;cmds/spartan/cmds/CSV.cpp;cmds/spartan/cmds/Compress.cpp;cmds/spartan/cmds/FindPolys.cpp;cmds/spartan/cmds/Icebergs.cpp;cmds/spartan/cmds/Json.cpp;cmds/spartan/cmds/ListSec.cpp;cmds/spartan/cmds/MatcherCmd.cpp;cmds/spartan/cmds/PolygonBooks.cpp;cmds/spartan/cmds/SQL.cpp;cmds/spartan/cmds/Sim.cpp;cmds/spartan/cmds/Stats.cpp;cmds/spartan/cmds/Test.cpp;cmds/spartan/cmds/ValidateFifo.cpp;cmds/spartan/cmds/ValuePolys.cpp;cmds/spartan/cmds/matcher/cmds/BooksCmd.cpp;cmds/spartan/cmds/matcher/cmds/FillsCmd.cpp;cmds/spartan/cmds/matcher/cmds/ProcTimeCmd.cpp;cmds/spartan/cmds/matcher/common/InitData.cpp;cmds/spartan/common/EndPoint.cpp;cmds/spartan/common/Stopwatch.cpp;cmds/spartan/common/TimeInterval.cpp;cmds/spartan/common/TimeStamp.cpp;cmds/spartan/common/cli/RangeArg.cpp;cmds/spartan/domain/IcebergQuantity.cpp;cmds/spartan/domain/Price.cpp;cmds/spartan/domain/Quantity.cpp;cmds/spartan/domain/SecurityCriteria.cpp;cmds/spartan/domain/SecurityDefinition.cpp;cmds/spartan/domain/SecurityID.cpp;cmds/spartan/domain/SecuritySnapshot.cpp;cmds/spartan/domain/SideQuantity.cpp;cmds/spartan/domain/TradeSummarySignal.cpp;cmds/spartan/domain/book/BookLevel.cpp;cmds/spartan/domain/order/OrderChange.cpp;cmds/spartan/domain/order/OrderKey.cpp;cmds/spartan/engine/AlgoManager.cpp;cmds/spartan/engine/IAlgo.cpp;cmds/spartan/engine/IAlgoExecutionServices.cpp;cmds/spartan/engine/IAlgoSetupServices.cpp;cmds/spartan/engine/algos/tas/RunTAS.cpp;cmds/spartan/engine/algos/tas/TASOrderReactor.cpp;cmds/spartan/engine/algos/tas/TASTriggerDef.cpp;cmds/spartan/execution/Cancel.cpp;cmds/spartan/execution/CancelReplace.cpp;cmds/spartan/execution/GatewayError.cpp;cmds/spartan/execution/NewOrder.cpp;cmds/spartan/execution/OrderUpdate.cpp;cmds/spartan/execution/il3/IL3Gateway.cpp;cmds/spartan/execution/il3/common/IL3MsgFramer.cpp;cmds/spartan/execution/il3/handlers/init/IL3InitHandler.cpp;cmds/spartan/execution/il3/handlers/party_details/IL3PartyDetailsHandler.cpp;cmds/spartan/execution/il3/handlers/realtime/IL3RealTimeHandler.cpp;cmds/spartan/execution/il3/parsing/IL3Parser.cpp;cmds/spartan/execution/il3/store/IL3SessionFileStore.cpp;cmds/spartan/execution/il3/tests/order_execution_tests.cpp;cmds/spartan/feed_handler/FeedHandler.cpp;cmds/spartan/feed_handler/FeedHandlerBinder.cpp;cmds/spartan/feed_handler/common/EventRangeMonitor.cpp;cmds/spartan/feed_handler/common/IcebergQuantityModification.cpp;cmds/spartan/feed_handler/common/MDP3Event.cpp;cmds/spartan/feed_handler/common/OrderModification.cpp;cmds/spartan/feed_handler/common/mdp3_common.cpp;cmds/spartan/feed_handler/common/tests/book_merging_tests.cpp;cmds/spartan/feed_handler/feed_control/IFeedController.cpp;cmds/spartan/feed_handler/feed_observers/BookStatRecorder.cpp;cmds/spartan/feed_handler/feed_observers/CompositeObserver.cpp;cmds/spartan/feed_handler/feed_observers/DefinitionCollector.cpp;cmds/spartan/feed_handler/feed_observers/FillCounter.cpp;cmds/spartan/feed_handler/feed_observers/IcebergFinder.cpp;cmds/spartan/feed_handler/feed_observers/PolygonFinder.cpp;cmds/spartan/feed_handler/feed_observers/PolygonOpportunityFinder.cpp;cmds/spartan/feed_handler/feed_observers/SyntheticBookRecorder.cpp;cmds/spartan/feed_handler/feed_observers/recorders/MatcherBookRecorder.cpp;cmds/spartan/feed_handler/feed_observers/recorders/MatcherFillRecorder.cpp;cmds/spartan/feed_handler/feed_observers/recorders/MatcherProcTimeRecorder.cpp;cmds/spartan/feed_handler/feed_observers/recorders/MatcherRecorder.cpp;cmds/spartan/feed_handler/implied/implied_market.cpp;cmds/spartan/feed_handler/parsing/MDP3MsgBox.cpp;cmds/spartan/feed_handler/parsing/MDP3Parser.cpp;cmds/spartan/feed_handler/realtime/RealTimeHandler.cpp;cmds/spartan/feed_handler/recovery/BookSnapshot.cpp;cmds/spartan/feed_handler/recovery/DefinitionSnapshot.cpp;cmds/spartan/feed_handler/recovery/IncrementalQueue.cpp;cmds/spartan/feed_handler/recovery/RecoveryHandler.cpp;cmds/spartan/feed_handler/tests/spartan_md_tests.cpp;cmds/spartan/feed_handler/utils/book_utils.cpp;cmds/spartan/feed_handler/utils/mdp3_utils.cpp;cmds/spartan/feed_handler/utils/order_utils.cpp;cmds/spartan/feed_handler/utils/polygon_utils.cpp;cmds/spartan/feed_handler/utils/security_comp.cpp;cmds/spartan/feed_handler/utils/security_parser.cpp;cmds/spartan/feed_handler/utils/tests/synthetic_book_tests.cpp;cmds/spartan/feed_handler/utils/tests/test_polygon_finder.cpp;cmds/spartan/system/PCapReader.cpp;cmds/spartan/system/reactor/Reactor.cpp;cmds/spartan/system/sbe/SBEParser.cpp;cmds/spartan/utils/ActionSummarizer.cpp;cmds/spartan/utils/FileUtils.cpp;cmds/spartan/utils/StringUtils.cpp;cmds/spartan/utils/sql/adapters/polygon_defs.cpp;cmds/spartan/utils/tests/PermutationTests.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;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/CMECert.cpp;cmds/ConfigCheck.cpp;cmds/FIXSim.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/Web.cpp;cmds/md/cmds/Channels.cpp;cmds/md/cmds/Cleanup.cpp;cmds/md/cmds/Dump.cpp;cmds/md/cmds/DumpSecurity.cpp;cmds/md/cmds/RecTool.cpp;cmds/md/cmds/Record.cpp;cmds/md/cmds/Relay.cpp;cmds/md/cmds/Replay.cpp;cmds/md/cmds/Run.cpp;cmds/md/cmds/Tail.cpp;cmds/md/cmds/rec_tool/cmds/Print.cpp;cmds/md/cmds/rec_tool/cmds/Trace.cpp;cmds/md/cmds/rec_tool/cmds/Unprint.cpp;cmds/md/common/PlatformOption.cpp;cmds/md/common/SecurityTypeOption.cpp;cmds/md/common/VenueOption.cpp;cmds/spartan/back_testing/algos/PolyObserver.cpp;cmds/spartan/back_testing/algos/SniperModel.cpp;cmds/spartan/back_testing/algos/TestObserver.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/common/Trace.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/FillDepot.cpp;cmds/spartan/back_testing/matcher/Matcher.cpp;cmds/spartan/back_testing/matcher/MatchingCommon.cpp;cmds/spartan/back_testing/matcher/common/IcebergFileCache.cpp;cmds/spartan/back_testing/matcher/common/MatcherOneof.cpp;cmds/spartan/back_testing/matcher/common/MatcherOrder.cpp;cmds/spartan/back_testing/matcher/common/MatchingSession.cpp;cmds/spartan/back_testing/matcher/iceberg_helper.cpp;cmds/spartan/back_testing/matcher/tests/matcher_tests.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/pcap/PCapOrderChangeBootstrapper.cpp;cmds/spartan/back_testing/sim/spark_bridge/AlgoServicesBridge.cpp;cmds/spartan/back_testing/sim/spark_bridge/BeforeLaunchBridge.cpp;cmds/spartan/cmds/BookStats.cpp;cmds/spartan/cmds/CSV.cpp;cmds/spartan/cmds/Compress.cpp;cmds/spartan/cmds/FindPolys.cpp;cmds/spartan/cmds/Icebergs.cpp;cmds/spartan/cmds/Json.cpp;cmds/spartan/cmds/ListSec.cpp;cmds/spartan/cmds/MatcherCmd.cpp;cmds/spartan/cmds/PolygonBooks.cpp;cmds/spartan/cmds/SQL.cpp;cmds/spartan/cmds/Sim.cpp;cmds/spartan/cmds/Stats.cpp;cmds/spartan/cmds/Test.cpp;cmds/spartan/cmds/ValidateFifo.cpp;cmds/spartan/cmds/ValuePolys.cpp;cmds/spartan/cmds/matcher/cmds/BooksCmd.cpp;cmds/spartan/cmds/matcher/cmds/FillsCmd.cpp;cmds/spartan/cmds/matcher/cmds/ProcTimeCmd.cpp;cmds/spartan/cmds/matcher/common/InitData.cpp;cmds/spartan/common/EndPoint.cpp;cmds/spartan/common/Stopwatch.cpp;cmds/spartan/common/TimeInterval.cpp;cmds/spartan/common/TimeStamp.cpp;cmds/spartan/common/cli/RangeArg.cpp;cmds/spartan/domain/IcebergQuantity.cpp;cmds/spartan/domain/Price.cpp;cmds/spartan/domain/Quantity.cpp;cmds/spartan/domain/SecurityCriteria.cpp;cmds/spartan/domain/SecurityDefinition.cpp;cmds/spartan/domain/SecurityID.cpp;cmds/spartan/domain/SecuritySnapshot.cpp;cmds/spartan/domain/SideQuantity.cpp;cmds/spartan/domain/TradeSummarySignal.cpp;cmds/spartan/domain/book/BookLevel.cpp;cmds/spartan/domain/order/OrderChange.cpp;cmds/spartan/domain/order/OrderKey.cpp;cmds/spartan/domain/polygons/PolygonFinder.cpp;cmds/spartan/domain/polygons/PolygonOpportunityFinder.cpp;cmds/spartan/domain/polygons/polygon_utils.cpp;cmds/spartan/domain/polygons/tests/test_polygon_finder.cpp;cmds/spartan/engine/AlgoManager.cpp;cmds/spartan/engine/IAlgo.cpp;cmds/spartan/engine/IAlgoExecutionServices.cpp;cmds/spartan/engine/IAlgoSetupServices.cpp;cmds/spartan/engine/algos/tas/RunTAS.cpp;cmds/spartan/engine/algos/tas/TASOrderReactor.cpp;cmds/spartan/engine/algos/tas/TASTriggerDef.cpp;cmds/spartan/execution/Cancel.cpp;cmds/spartan/execution/CancelReplace.cpp;cmds/spartan/execution/GatewayError.cpp;cmds/spartan/execution/NewOrder.cpp;cmds/spartan/execution/OrderUpdate.cpp;cmds/spartan/execution/il3/IL3Gateway.cpp;cmds/spartan/execution/il3/common/IL3MsgFramer.cpp;cmds/spartan/execution/il3/handlers/init/IL3InitHandler.cpp;cmds/spartan/execution/il3/handlers/party_details/IL3PartyDetailsHandler.cpp;cmds/spartan/execution/il3/handlers/realtime/IL3RealTimeHandler.cpp;cmds/spartan/execution/il3/parsing/IL3Parser.cpp;cmds/spartan/execution/il3/store/IL3SessionFileStore.cpp;cmds/spartan/execution/il3/tests/order_execution_tests.cpp;cmds/spartan/feed_handler/FeedHandler.cpp;cmds/spartan/feed_handler/FeedHandlerBinder.cpp;cmds/spartan/feed_handler/common/EventRangeMonitor.cpp;cmds/spartan/feed_handler/common/IcebergQuantityModification.cpp;cmds/spartan/feed_handler/common/MDP3Event.cpp;cmds/spartan/feed_handler/common/OrderModification.cpp;cmds/spartan/feed_handler/common/mdp3_common.cpp;cmds/spartan/feed_handler/detail/BookSnapshot.cpp;cmds/spartan/feed_handler/detail/DefinitionSnapshot.cpp;cmds/spartan/feed_handler/detail/IFeedController.cpp;cmds/spartan/feed_handler/detail/IncrementalQueue.cpp;cmds/spartan/feed_handler/detail/RealTimeMDHandler.cpp;cmds/spartan/feed_handler/detail/RecoveryMDHandler.cpp;cmds/spartan/feed_handler/feed_observers/BookStatRecorder.cpp;cmds/spartan/feed_handler/feed_observers/CompositeObserver.cpp;cmds/spartan/feed_handler/feed_observers/DefinitionCollector.cpp;cmds/spartan/feed_handler/feed_observers/FillCounter.cpp;cmds/spartan/feed_handler/feed_observers/IcebergFinder.cpp;cmds/spartan/feed_handler/feed_observers/SyntheticBookRecorder.cpp;cmds/spartan/feed_handler/feed_observers/recorders/MatcherBookRecorder.cpp;cmds/spartan/feed_handler/feed_observers/recorders/MatcherFillRecorder.cpp;cmds/spartan/feed_handler/feed_observers/recorders/MatcherProcTimeRecorder.cpp;cmds/spartan/feed_handler/feed_observers/recorders/MatcherRecorder.cpp;cmds/spartan/feed_handler/implied/implied_market.cpp;cmds/spartan/feed_handler/parsing/MDP3MsgBox.cpp;cmds/spartan/feed_handler/parsing/MDP3Parser.cpp;cmds/spartan/feed_handler/tests/book_merging_tests.cpp;cmds/spartan/feed_handler/tests/spartan_md_tests.cpp;cmds/spartan/feed_handler/tests/synthetic_book_tests.cpp;cmds/spartan/feed_handler/utils/book_utils.cpp;cmds/spartan/feed_handler/utils/mdp3_utils.cpp;cmds/spartan/feed_handler/utils/order_utils.cpp;cmds/spartan/feed_handler/utils/security_comp.cpp;cmds/spartan/feed_handler/utils/security_parser.cpp;cmds/spartan/system/PCapReader.cpp;cmds/spartan/system/reactor/Reactor.cpp;cmds/spartan/system/sbe/SBEParser.cpp;cmds/spartan/utils/ActionSummarizer.cpp;cmds/spartan/utils/FileUtils.cpp;cmds/spartan/utils/StringUtils.cpp;cmds/spartan/utils/sql/adapters/polygon_defs.cpp;cmds/spartan/utils/tests/PermutationTests.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;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/back_testing/algos/PolyObserver.cpp b/src/server/sparkd/cmds/spartan/back_testing/algos/PolyObserver.cpp index 30d9b71a0..51a2444fb 100644 --- a/src/server/sparkd/cmds/spartan/back_testing/algos/PolyObserver.cpp +++ b/src/server/sparkd/cmds/spartan/back_testing/algos/PolyObserver.cpp @@ -2,8 +2,8 @@ #include "back_testing/sim/ISim.h" #include "back_testing/sim/sim_common.h" -#include "feed_handler/utils/polygon_utils.h" #include "domain/SecurityDefinition.h" +#include "domain/polygons/polygon_utils.h" namespace bts::spartan::mdp3 { @@ -165,7 +165,8 @@ void PolyObserver::analyze() { } } -void PolyObserver::on_order_update(EventHeader const &, SimOrderUpdate const &) { +void PolyObserver::on_order_update( + EventHeader const &, SimOrderUpdate const &) { bts_assert(false); } diff --git a/src/server/sparkd/cmds/spartan/back_testing/algos/SniperModel.cpp b/src/server/sparkd/cmds/spartan/back_testing/algos/SniperModel.cpp index fccd62477..ed35bf1a5 100644 --- a/src/server/sparkd/cmds/spartan/back_testing/algos/SniperModel.cpp +++ b/src/server/sparkd/cmds/spartan/back_testing/algos/SniperModel.cpp @@ -4,11 +4,11 @@ #include "back_testing/sim/pandl/PandL.h" #include "back_testing/sim/sim_common.h" #include "domain/SecurityDefinition.h" +#include "domain/polygons/polygon_utils.h" #include "feed_handler/utils/book_utils.h" #include "feed_handler/utils/mdp3_utils.h" -#include "feed_handler/utils/polygon_utils.h" -#include +#include #include #include @@ -202,7 +202,8 @@ void SniperModel::on_order_update( for (auto const &p : in_flight.working) { auto &these_fills = p.second.fills; for (auto &f : these_fills) { - clean_fills = clean_fills && (f.fill_type == SimOrderUpdate::AGGRESSIVE); + clean_fills = + clean_fills && (f.fill_type == SimOrderUpdate::AGGRESSIVE); if (f.status == SimOrderUpdate::CANCELED || f.status == SimOrderUpdate::FILLED) { pending_orders--; @@ -541,8 +542,8 @@ void SniperModel::transition(State new_state) { me->state = new_state; } -protos::SimRunOptions -SniperModel::fill_defaults(protos::SimRunOptions const &in) { +protos::SimRunOptions SniperModel::fill_defaults( + protos::SimRunOptions const &in) { protos::SimRunOptions result = in; set_param_if_empty(&result, "min_orders_at_top", 1); set_param_if_empty(&result, "max_qty", 1); diff --git a/src/server/sparkd/cmds/spartan/back_testing/run/run_sim.h b/src/server/sparkd/cmds/spartan/back_testing/run/run_sim.h index 5d36c4e1d..f5f05d04f 100644 --- a/src/server/sparkd/cmds/spartan/back_testing/run/run_sim.h +++ b/src/server/sparkd/cmds/spartan/back_testing/run/run_sim.h @@ -1,9 +1,6 @@ #pragma once -#include "back_testing/db/SimLogger.h" #include "back_testing/run/SimSessionOptions.pb.h" -#include "feed_handler/common/mdp3_common.h" -#include "feed_handler/utils/polygon_utils.h" namespace bts::spartan::mdp3 { class MDP3EventGenerator; diff --git a/src/server/sparkd/cmds/spartan/back_testing/sim/ISim.h b/src/server/sparkd/cmds/spartan/back_testing/sim/ISim.h index cb8ea6d3a..a29f7d8ec 100644 --- a/src/server/sparkd/cmds/spartan/back_testing/sim/ISim.h +++ b/src/server/sparkd/cmds/spartan/back_testing/sim/ISim.h @@ -1,8 +1,8 @@ #pragma once #include "domain/SecurityMap.h" +#include "domain/polygons/polygon_utils.h" #include "feed_handler/common/mdp3_common.h" -#include "feed_handler/utils/polygon_utils.h" namespace bts::spartan::mdp3 { @@ -21,7 +21,8 @@ class ISim { virtual void start_simulation() = 0; virtual void stop_simulation() = 0; virtual void log_pandl() const = 0; - template void log(std::string const &ty, T &&... args) const; + template + void log(std::string const &ty, T &&... args) const; private: virtual void algo_log( diff --git a/src/server/sparkd/cmds/spartan/back_testing/sim/Sim.cpp b/src/server/sparkd/cmds/spartan/back_testing/sim/Sim.cpp index 25ed83d6c..c684660f2 100644 --- a/src/server/sparkd/cmds/spartan/back_testing/sim/Sim.cpp +++ b/src/server/sparkd/cmds/spartan/back_testing/sim/Sim.cpp @@ -1,7 +1,5 @@ #include "Sim.h" -#include "lib/logging/logging.h" -#include "lib/utils/datetime.h" #include "back_testing/db/SimLogger.h" #include "back_testing/matcher/Matcher.h" #include "back_testing/matcher/iceberg_helper.h" @@ -12,9 +10,11 @@ #include "back_testing/sim/pcap/PCapEvent.h" #include "back_testing/sim/pcap/PCapEventGenerator.h" #include "back_testing/sim/sim_common.h" +#include "domain/polygons/polygon_utils.h" #include "feed_handler/common/mdp3_common.h" #include "feed_handler/utils/mdp3_utils.h" -#include "feed_handler/utils/polygon_utils.h" +#include "lib/logging/logging.h" +#include "lib/utils/datetime.h" #include #include @@ -68,7 +68,8 @@ struct Sim::AlgoCBFilter : IAlgoModel { EventHeader const &h, std::vector const &b) override { real_algo.on_replay_start(h, b); } - void on_order_update(EventHeader const &h, SimOrderUpdate const &o) override { + void on_order_update( + EventHeader const &h, SimOrderUpdate const &o) override { if (!owner.is_stopping_sim()) real_algo.on_order_update(h, o); } @@ -366,7 +367,8 @@ void Sim::on_algo_action() { sim_log( "algo_order", algo_action.transact_time.value(), - OrderChange::ChangeType_Name(change.change), get_security(change.order.security).symbol(), + OrderChange::ChangeType_Name(change.change), + get_security(change.order.security).symbol(), change.order.price.to_double(), change.order.quantity.value(), Side_Name(change.order.side), change.order.key.value(), 0); @@ -533,8 +535,8 @@ void Sim::clear_simulated_order_book(TimeStamp transact_time, SecurityID sid) { match_and_send_effects(transact_time, matcher_input); } -SmallOrderChange -Sim::correct_pcap_order(OrderChange const &o, bool set_exact_ib_state) { +SmallOrderChange Sim::correct_pcap_order( + OrderChange const &o, bool set_exact_ib_state) { bts_assert(me->state == State::SIM); bts_assert(me->simulation); auto &key_map = me->simulation->cme_key_map; diff --git a/src/server/sparkd/cmds/spartan/back_testing/sim/pcap/PCapEventSource.cpp b/src/server/sparkd/cmds/spartan/back_testing/sim/pcap/PCapEventSource.cpp index 52a05c88c..a35915e3a 100644 --- a/src/server/sparkd/cmds/spartan/back_testing/sim/pcap/PCapEventSource.cpp +++ b/src/server/sparkd/cmds/spartan/back_testing/sim/pcap/PCapEventSource.cpp @@ -1,10 +1,10 @@ #include "PCapEventSource.h" #include "back_testing/sim/pcap/PCapEvent.h" -#include "feed_handler/utils/mdp3_utils.h" +#include "domain/polygons/PolygonFinder.h" #include "feed_handler/feed_observers/DefinitionCollector.h" #include "feed_handler/feed_observers/IcebergFinder.h" -#include "feed_handler/feed_observers/PolygonFinder.h" +#include "feed_handler/utils/mdp3_utils.h" namespace bts::spartan::mdp3 { diff --git a/src/server/sparkd/cmds/spartan/back_testing/sim/pcap/PCapEventSource.h b/src/server/sparkd/cmds/spartan/back_testing/sim/pcap/PCapEventSource.h index 322c7ab6e..55ff8edc2 100644 --- a/src/server/sparkd/cmds/spartan/back_testing/sim/pcap/PCapEventSource.h +++ b/src/server/sparkd/cmds/spartan/back_testing/sim/pcap/PCapEventSource.h @@ -6,12 +6,11 @@ #include #include "back_testing/sim/pcap/PCapEventGenerator.h" -#include "feed_handler/common/mdp3_common.h" -#include "feed_handler/utils/polygon_utils.h" -#include "feed_handler/feed_observers/IcebergFinder.h" #include "domain/SecurityDefinition.h" #include "domain/SecurityMap.h" - +#include "domain/polygons/polygon_utils.h" +#include "feed_handler/common/mdp3_common.h" +#include "feed_handler/feed_observers/IcebergFinder.h" namespace bts::spartan::mdp3 { class SecurityDefinition; diff --git a/src/server/sparkd/cmds/spartan/cmds/FindPolys.cpp b/src/server/sparkd/cmds/spartan/cmds/FindPolys.cpp index acbcfb73c..762d10162 100644 --- a/src/server/sparkd/cmds/spartan/cmds/FindPolys.cpp +++ b/src/server/sparkd/cmds/spartan/cmds/FindPolys.cpp @@ -1,8 +1,8 @@ #include "FindPolys.h" #include "feed_handler/feed_observers/DefinitionCollector.h" -#include "feed_handler/feed_observers/PolygonFinder.h" +#include "domain/polygons/PolygonFinder.h" #include "feed_handler/utils/mdp3_utils.h" -#include "feed_handler/utils/polygon_utils.h" +#include "domain/polygons/polygon_utils.h" #include namespace bts::spartan::cmds { diff --git a/src/server/sparkd/cmds/spartan/cmds/ValuePolys.cpp b/src/server/sparkd/cmds/spartan/cmds/ValuePolys.cpp index 3b5bc4cd6..ca5a42c1b 100644 --- a/src/server/sparkd/cmds/spartan/cmds/ValuePolys.cpp +++ b/src/server/sparkd/cmds/spartan/cmds/ValuePolys.cpp @@ -1,7 +1,7 @@ #include "ValuePolys.h" #include "feed_handler/feed_observers/DefinitionCollector.h" -#include "feed_handler/feed_observers/PolygonFinder.h" -#include "feed_handler/feed_observers/PolygonOpportunityFinder.h" +#include "domain/polygons/PolygonFinder.h" +#include "domain/polygons/PolygonOpportunityFinder.h" #include "feed_handler/utils/mdp3_utils.h" #include "utils/FileUtils.h" #include diff --git a/src/server/sparkd/cmds/spartan/feed_handler/feed_observers/PolygonFinder.cpp b/src/server/sparkd/cmds/spartan/domain/polygons/PolygonFinder.cpp similarity index 95% rename from src/server/sparkd/cmds/spartan/feed_handler/feed_observers/PolygonFinder.cpp rename to src/server/sparkd/cmds/spartan/domain/polygons/PolygonFinder.cpp index 4e3fd3222..82014f0aa 100644 --- a/src/server/sparkd/cmds/spartan/feed_handler/feed_observers/PolygonFinder.cpp +++ b/src/server/sparkd/cmds/spartan/domain/polygons/PolygonFinder.cpp @@ -1,15 +1,15 @@ #include "PolygonFinder.h" -#include "feed_handler/utils/polygon_utils.h" -#include "DefinitionCollector.h" -#include "FillCounter.h" +#include "feed_handler/feed_observers/DefinitionCollector.h" +#include "feed_handler/feed_observers/FillCounter.h" +#include "domain/polygons/polygon_utils.h" #include "feed_handler/utils/mdp3_utils.h" #include namespace bts::spartan::mdp3 { -const SecurityDefinition & -find_instr(DefinitionCollector &defs, SecurityID sec_id) { +const SecurityDefinition &find_instr( + DefinitionCollector &defs, SecurityID sec_id) { auto it = defs.result.find(sec_id); bts_assert(it != defs.result.end()); return it->second; @@ -27,8 +27,7 @@ bool apply_filter_to_legs( instr.security_type() == bts::api::SecurityType::SECURITYTYPE_SPREAD); bts_assert(instr.legs().size() > 0); for (const auto &ldef : instr.legs()) { - const SecurityDefinition &leg_instr = - find_instr(defs, ldef.security_id); + const SecurityDefinition &leg_instr = find_instr(defs, ldef.security_id); bts_assert( leg_instr.security_type() == bts::api::SecurityType::SECURITYTYPE_FUTURE); diff --git a/src/server/sparkd/cmds/spartan/feed_handler/feed_observers/PolygonFinder.h b/src/server/sparkd/cmds/spartan/domain/polygons/PolygonFinder.h similarity index 96% rename from src/server/sparkd/cmds/spartan/feed_handler/feed_observers/PolygonFinder.h rename to src/server/sparkd/cmds/spartan/domain/polygons/PolygonFinder.h index 8c3b625c8..2ec37f59c 100644 --- a/src/server/sparkd/cmds/spartan/feed_handler/feed_observers/PolygonFinder.h +++ b/src/server/sparkd/cmds/spartan/domain/polygons/PolygonFinder.h @@ -1,8 +1,8 @@ #pragma once +#include "domain/polygons/polygon_utils.h" #include "feed_handler/IFeedObserver.h" #include "feed_handler/common/mdp3_common.h" -#include "feed_handler/utils/polygon_utils.h" #include "lib/config/config.h" #include "lib/config/protos/spartan.pb.h" #include diff --git a/src/server/sparkd/cmds/spartan/feed_handler/feed_observers/PolygonOpportunityFinder.cpp b/src/server/sparkd/cmds/spartan/domain/polygons/PolygonOpportunityFinder.cpp similarity index 100% rename from src/server/sparkd/cmds/spartan/feed_handler/feed_observers/PolygonOpportunityFinder.cpp rename to src/server/sparkd/cmds/spartan/domain/polygons/PolygonOpportunityFinder.cpp diff --git a/src/server/sparkd/cmds/spartan/feed_handler/feed_observers/PolygonOpportunityFinder.h b/src/server/sparkd/cmds/spartan/domain/polygons/PolygonOpportunityFinder.h similarity index 98% rename from src/server/sparkd/cmds/spartan/feed_handler/feed_observers/PolygonOpportunityFinder.h rename to src/server/sparkd/cmds/spartan/domain/polygons/PolygonOpportunityFinder.h index e4ad471e7..991c4cbb0 100644 --- a/src/server/sparkd/cmds/spartan/feed_handler/feed_observers/PolygonOpportunityFinder.h +++ b/src/server/sparkd/cmds/spartan/domain/polygons/PolygonOpportunityFinder.h @@ -2,7 +2,7 @@ #include "feed_handler/common/mdp3_common.h" #include "feed_handler/IFeedObserver.h" -#include "feed_handler/utils/polygon_utils.h" +#include "domain/polygons/polygon_utils.h" #include namespace bts::spartan::mdp3 { diff --git a/src/server/sparkd/cmds/spartan/feed_handler/utils/polygon_utils.cpp b/src/server/sparkd/cmds/spartan/domain/polygons/polygon_utils.cpp similarity index 100% rename from src/server/sparkd/cmds/spartan/feed_handler/utils/polygon_utils.cpp rename to src/server/sparkd/cmds/spartan/domain/polygons/polygon_utils.cpp diff --git a/src/server/sparkd/cmds/spartan/feed_handler/utils/polygon_utils.h b/src/server/sparkd/cmds/spartan/domain/polygons/polygon_utils.h similarity index 99% rename from src/server/sparkd/cmds/spartan/feed_handler/utils/polygon_utils.h rename to src/server/sparkd/cmds/spartan/domain/polygons/polygon_utils.h index 5fd994a90..ad79ed4a0 100644 --- a/src/server/sparkd/cmds/spartan/feed_handler/utils/polygon_utils.h +++ b/src/server/sparkd/cmds/spartan/domain/polygons/polygon_utils.h @@ -1,6 +1,6 @@ #pragma once -#include "../common/mdp3_common.h" +#include "feed_handler/common/mdp3_common.h" #include "server/sparkd/cmds/spartan/domain/SecurityMap.h" #include #include diff --git a/src/server/sparkd/cmds/spartan/feed_handler/utils/tests/test_polygon_finder.cpp b/src/server/sparkd/cmds/spartan/domain/polygons/tests/test_polygon_finder.cpp similarity index 99% rename from src/server/sparkd/cmds/spartan/feed_handler/utils/tests/test_polygon_finder.cpp rename to src/server/sparkd/cmds/spartan/domain/polygons/tests/test_polygon_finder.cpp index ad22b634a..dadbb4d07 100644 --- a/src/server/sparkd/cmds/spartan/feed_handler/utils/tests/test_polygon_finder.cpp +++ b/src/server/sparkd/cmds/spartan/domain/polygons/tests/test_polygon_finder.cpp @@ -1,4 +1,4 @@ -#include "../polygon_utils.h" +#include "domain/polygons/polygon_utils.h" #include namespace bts::spartan::mdp3 { diff --git a/src/server/sparkd/cmds/spartan/feed_handler/FeedHandler.cpp b/src/server/sparkd/cmds/spartan/feed_handler/FeedHandler.cpp index 21555f96b..86930aa26 100644 --- a/src/server/sparkd/cmds/spartan/feed_handler/FeedHandler.cpp +++ b/src/server/sparkd/cmds/spartan/feed_handler/FeedHandler.cpp @@ -1,9 +1,9 @@ #include "FeedHandler.h" #include "IFeedObserver.h" -#include "feed_handler/feed_control/AB_Arbitrageur.h" -#include "feed_handler/feed_control/IFeedController.h" -#include "feed_handler/realtime/RealTimeHandler.h" -#include "feed_handler/recovery/RecoveryHandler.h" +#include "feed_handler/detail/AB_Arbitrageur.h" +#include "feed_handler/detail/IFeedController.h" +#include "feed_handler/detail/RealTimeMDHandler.h" +#include "feed_handler/detail/RecoveryMDHandler.h" #include "server/sparkd/cmds/spartan/domain/SecuritySnapshot.h" namespace bts::spartan::mdp3 { @@ -15,8 +15,8 @@ struct FeedHandler::RunState { : real_time_ab{}, real_time_handler(obs), recovery_handler() {} AB_Arbitrageur real_time_ab; - RealTimeMDP3Handler real_time_handler; - RecoveryHandler recovery_handler; + RealTimeMDHandler real_time_handler; + RecoveryMDHandler recovery_handler; }; struct FeedHandler::PImpl { diff --git a/src/server/sparkd/cmds/spartan/feed_handler/FeedHandler.h b/src/server/sparkd/cmds/spartan/feed_handler/FeedHandler.h index 5d9754942..27df9ecf5 100644 --- a/src/server/sparkd/cmds/spartan/feed_handler/FeedHandler.h +++ b/src/server/sparkd/cmds/spartan/feed_handler/FeedHandler.h @@ -3,7 +3,7 @@ #include #include -#include "feed_handler/feed_control/PickedFeed.h" +#include "feed_handler/detail/PickedFeed.h" #include "feed_handler/parsing/MDP3Parser.h" namespace bts::spartan::mdp3 { diff --git a/src/server/sparkd/cmds/spartan/feed_handler/FeedHandlerBinder.h b/src/server/sparkd/cmds/spartan/feed_handler/FeedHandlerBinder.h index 303314d82..0258cc845 100644 --- a/src/server/sparkd/cmds/spartan/feed_handler/FeedHandlerBinder.h +++ b/src/server/sparkd/cmds/spartan/feed_handler/FeedHandlerBinder.h @@ -1,7 +1,7 @@ #pragma once -#include "feed_handler/feed_control/IFeedController.h" #include "FeedHandler.h" +#include "feed_handler/detail/IFeedController.h" #include "feed_handler/utils/mdp3_utils.h" #include diff --git a/src/server/sparkd/cmds/spartan/feed_handler/IFeedObserver.h b/src/server/sparkd/cmds/spartan/feed_handler/IFeedObserver.h index ed6afe4ed..139049e5c 100644 --- a/src/server/sparkd/cmds/spartan/feed_handler/IFeedObserver.h +++ b/src/server/sparkd/cmds/spartan/feed_handler/IFeedObserver.h @@ -1,12 +1,12 @@ #pragma once -#include "realtime/IMDP3RealTimeObserver.h" -#include "recovery/IMDP3RecoveryObserver.h" +#include "feed_handler/detail/IRealTimeMDObserver.h" +#include "feed_handler/detail/IMDP3RecoveryObserver.h" namespace bts::spartan::mdp3 { class IFeedObserver : public IMDP3RecoveryObserver, - public IMDP3RealTimeObserver { + public IRealTimeMDObserver { public: virtual void init() {} virtual void finit() {} diff --git a/src/server/sparkd/cmds/spartan/feed_handler/feed_control/AB_Arbitrageur.h b/src/server/sparkd/cmds/spartan/feed_handler/detail/AB_Arbitrageur.h similarity index 96% rename from src/server/sparkd/cmds/spartan/feed_handler/feed_control/AB_Arbitrageur.h rename to src/server/sparkd/cmds/spartan/feed_handler/detail/AB_Arbitrageur.h index 67f77bc7c..355f8e07c 100644 --- a/src/server/sparkd/cmds/spartan/feed_handler/feed_control/AB_Arbitrageur.h +++ b/src/server/sparkd/cmds/spartan/feed_handler/detail/AB_Arbitrageur.h @@ -1,6 +1,6 @@ #pragma once -#include "../feed_control/PickedFeed.h" -#include "../parsing/MDP3Parser.h" +#include "feed_handler/detail/PickedFeed.h" +#include "feed_handler/parsing/MDP3Parser.h" #include "lib/utils/bts_assert.h" diff --git a/src/server/sparkd/cmds/spartan/feed_handler/recovery/BookSnapshot.cpp b/src/server/sparkd/cmds/spartan/feed_handler/detail/BookSnapshot.cpp similarity index 100% rename from src/server/sparkd/cmds/spartan/feed_handler/recovery/BookSnapshot.cpp rename to src/server/sparkd/cmds/spartan/feed_handler/detail/BookSnapshot.cpp diff --git a/src/server/sparkd/cmds/spartan/feed_handler/recovery/BookSnapshot.h b/src/server/sparkd/cmds/spartan/feed_handler/detail/BookSnapshot.h similarity index 100% rename from src/server/sparkd/cmds/spartan/feed_handler/recovery/BookSnapshot.h rename to src/server/sparkd/cmds/spartan/feed_handler/detail/BookSnapshot.h diff --git a/src/server/sparkd/cmds/spartan/feed_handler/recovery/DefinitionSnapshot.cpp b/src/server/sparkd/cmds/spartan/feed_handler/detail/DefinitionSnapshot.cpp similarity index 100% rename from src/server/sparkd/cmds/spartan/feed_handler/recovery/DefinitionSnapshot.cpp rename to src/server/sparkd/cmds/spartan/feed_handler/detail/DefinitionSnapshot.cpp diff --git a/src/server/sparkd/cmds/spartan/feed_handler/recovery/DefinitionSnapshot.h b/src/server/sparkd/cmds/spartan/feed_handler/detail/DefinitionSnapshot.h similarity index 100% rename from src/server/sparkd/cmds/spartan/feed_handler/recovery/DefinitionSnapshot.h rename to src/server/sparkd/cmds/spartan/feed_handler/detail/DefinitionSnapshot.h diff --git a/src/server/sparkd/cmds/spartan/feed_handler/feed_control/IFeedController.cpp b/src/server/sparkd/cmds/spartan/feed_handler/detail/IFeedController.cpp similarity index 100% rename from src/server/sparkd/cmds/spartan/feed_handler/feed_control/IFeedController.cpp rename to src/server/sparkd/cmds/spartan/feed_handler/detail/IFeedController.cpp diff --git a/src/server/sparkd/cmds/spartan/feed_handler/feed_control/IFeedController.h b/src/server/sparkd/cmds/spartan/feed_handler/detail/IFeedController.h similarity index 100% rename from src/server/sparkd/cmds/spartan/feed_handler/feed_control/IFeedController.h rename to src/server/sparkd/cmds/spartan/feed_handler/detail/IFeedController.h diff --git a/src/server/sparkd/cmds/spartan/feed_handler/recovery/IMDP3RecoveryObserver.h b/src/server/sparkd/cmds/spartan/feed_handler/detail/IMDP3RecoveryObserver.h similarity index 100% rename from src/server/sparkd/cmds/spartan/feed_handler/recovery/IMDP3RecoveryObserver.h rename to src/server/sparkd/cmds/spartan/feed_handler/detail/IMDP3RecoveryObserver.h diff --git a/src/server/sparkd/cmds/spartan/feed_handler/realtime/IMDP3RealTimeObserver.h b/src/server/sparkd/cmds/spartan/feed_handler/detail/IRealTimeMDObserver.h similarity index 83% rename from src/server/sparkd/cmds/spartan/feed_handler/realtime/IMDP3RealTimeObserver.h rename to src/server/sparkd/cmds/spartan/feed_handler/detail/IRealTimeMDObserver.h index 0afc3b2b2..6d4fc1250 100644 --- a/src/server/sparkd/cmds/spartan/feed_handler/realtime/IMDP3RealTimeObserver.h +++ b/src/server/sparkd/cmds/spartan/feed_handler/detail/IRealTimeMDObserver.h @@ -1,17 +1,18 @@ #pragma once -#include "server/sparkd/cmds/spartan/domain/book/Book.h" +#include "domain/book/Book.h" namespace bts::spartan::mdp3 { class MDP3Event; class MDP3PacketView; + class SecuritySnapshot; struct TradeSummarySignal; -class IMDP3RealTimeObserver { +class IRealTimeMDObserver { public: - virtual ~IMDP3RealTimeObserver() {} + virtual ~IRealTimeMDObserver() {} virtual void on_packet_begin(MDP3PacketView const &) = 0; virtual void on_packet_end() = 0; diff --git a/src/server/sparkd/cmds/spartan/feed_handler/recovery/IncrementalQueue.cpp b/src/server/sparkd/cmds/spartan/feed_handler/detail/IncrementalQueue.cpp similarity index 100% rename from src/server/sparkd/cmds/spartan/feed_handler/recovery/IncrementalQueue.cpp rename to src/server/sparkd/cmds/spartan/feed_handler/detail/IncrementalQueue.cpp diff --git a/src/server/sparkd/cmds/spartan/feed_handler/recovery/IncrementalQueue.h b/src/server/sparkd/cmds/spartan/feed_handler/detail/IncrementalQueue.h similarity index 100% rename from src/server/sparkd/cmds/spartan/feed_handler/recovery/IncrementalQueue.h rename to src/server/sparkd/cmds/spartan/feed_handler/detail/IncrementalQueue.h diff --git a/src/server/sparkd/cmds/spartan/feed_handler/feed_control/PickedFeed.h b/src/server/sparkd/cmds/spartan/feed_handler/detail/PickedFeed.h similarity index 100% rename from src/server/sparkd/cmds/spartan/feed_handler/feed_control/PickedFeed.h rename to src/server/sparkd/cmds/spartan/feed_handler/detail/PickedFeed.h diff --git a/src/server/sparkd/cmds/spartan/feed_handler/realtime/RealTimeHandler.cpp b/src/server/sparkd/cmds/spartan/feed_handler/detail/RealTimeMDHandler.cpp similarity index 87% rename from src/server/sparkd/cmds/spartan/feed_handler/realtime/RealTimeHandler.cpp rename to src/server/sparkd/cmds/spartan/feed_handler/detail/RealTimeMDHandler.cpp index f8f489df6..c33f716a4 100644 --- a/src/server/sparkd/cmds/spartan/feed_handler/realtime/RealTimeHandler.cpp +++ b/src/server/sparkd/cmds/spartan/feed_handler/detail/RealTimeMDHandler.cpp @@ -1,16 +1,17 @@ -#include "RealTimeHandler.h" -#include "IMDP3RealTimeObserver.h" -#include "server/sparkd/cmds/spartan/domain/SecuritySnapshot.h" -#include "server/sparkd/cmds/spartan/domain/TradeSummarySignal.h" -#include "server/sparkd/cmds/spartan/feed_handler/common/mdp3_common.h" -#include "server/sparkd/cmds/spartan/feed_handler/gen/src/MDIncrementalRefreshBook46.h" -#include "server/sparkd/cmds/spartan/feed_handler/parsing/MDP3Parser.h" +#include "RealTimeMDHandler.h" + +#include "IRealTimeMDObserver.h" +#include "domain/SecuritySnapshot.h" +#include "domain/TradeSummarySignal.h" +#include "feed_handler/common/mdp3_common.h" +#include "feed_handler/gen/src/MDIncrementalRefreshBook46.h" +#include "feed_handler/parsing/MDP3Parser.h" #include namespace bts::spartan::mdp3 { -struct RealTimeMDP3Handler::PendingTradeSummary { +struct RealTimeMDHandler::PendingTradeSummary { ::mdp3::MDUpdateAction::Value update_action; SecuritySnapshot *security; Price price; @@ -20,13 +21,13 @@ struct RealTimeMDP3Handler::PendingTradeSummary { MDP3TradeEntryID trade_entry_id; }; -struct RealTimeMDP3Handler::PendingTradeOrderDetail { +struct RealTimeMDHandler::PendingTradeOrderDetail { OrderKey order_id; Quantity quantity; }; -struct RealTimeMDP3Handler::PImpl { - PImpl(IMDP3RealTimeObserver &o) +struct RealTimeMDHandler::PImpl { + PImpl(IRealTimeMDObserver &o) : securities(), current_packet_send_time(TimeStamp{0}), current_packet_sn(0), current_event(), observer(o), pending_ts(), pending_trade_order_detail() {} @@ -36,15 +37,15 @@ struct RealTimeMDP3Handler::PImpl { TimeStamp current_packet_send_time; uint32_t current_packet_sn; MDP3Event current_event; - IMDP3RealTimeObserver &observer; + IRealTimeMDObserver &observer; std::vector pending_ts; std::vector pending_trade_order_detail; }; -struct RealTimeMDP3Handler::EventGuard { +struct RealTimeMDHandler::EventGuard { template - EventGuard(RealTimeMDP3Handler &owner, M &m) : owner(owner) { + EventGuard(RealTimeMDHandler &owner, M &m) : owner(owner) { bts_assert(owner.me->current_packet_sn); auto &info = owner.me->current_event; if (info.transact_time == TimeStamp{0}) { @@ -68,7 +69,7 @@ struct RealTimeMDP3Handler::EventGuard { } EventGuard( - RealTimeMDP3Handler &owner, TimeStamp last_update_time, bool end_of_event) + RealTimeMDHandler &owner, TimeStamp last_update_time, bool end_of_event) : owner(owner) { bts_assert(owner.me->current_packet_sn); auto &info = owner.me->current_event; @@ -108,46 +109,47 @@ struct RealTimeMDP3Handler::EventGuard { info.add_sec(s); } - RealTimeMDP3Handler &owner; + RealTimeMDHandler &owner; }; -RealTimeMDP3Handler::RealTimeMDP3Handler(IMDP3RealTimeObserver &o) : me(new PImpl(o)) {} +RealTimeMDHandler::RealTimeMDHandler(IRealTimeMDObserver &o) + : me(new PImpl(o)) {} -RealTimeMDP3Handler::~RealTimeMDP3Handler() {} +RealTimeMDHandler::~RealTimeMDHandler() {} -void RealTimeMDP3Handler::add_snapshot( +void RealTimeMDHandler::add_snapshot( std::unique_ptr &&snapshot) { bts_assert(!is_processing_multi_message_event()); bts_assert(find_security(snapshot->security_id()) == nullptr); me->securities[snapshot->security_id()] = std::move(snapshot); } -void RealTimeMDP3Handler::add_snapshots(std::vector &snaps) { +void RealTimeMDHandler::add_snapshots(std::vector &snaps) { for (auto &s : snaps) add_snapshot(std::move(s)); } -bool RealTimeMDP3Handler::is_processing_multi_message_event() const { +bool RealTimeMDHandler::is_processing_multi_message_event() const { return me->current_event.transact_time != TimeStamp{}; } std::vector> -RealTimeMDP3Handler::move_all_securities_and_reset() { +RealTimeMDHandler::move_all_securities_and_reset() { std::vector> result; for (auto &p : me->securities) result.push_back(std::move(p.second)); return result; } -void RealTimeMDP3Handler::reset() { me = std::make_unique(me->observer); } +void RealTimeMDHandler::reset() { me = std::make_unique(me->observer); } -void RealTimeMDP3Handler::on_begin_packet(MDP3PacketView const &h) { +void RealTimeMDHandler::on_begin_packet(MDP3PacketView const &h) { me->observer.on_packet_begin(h); me->current_packet_sn = h.seq_num(); me->current_packet_send_time = TimeStamp{h.sending_time()}; } -void RealTimeMDP3Handler::on_end_packet() { +void RealTimeMDHandler::on_end_packet() { me->observer.on_packet_end(); me->current_packet_sn = 0; me->current_packet_send_time = TimeStamp{0}; @@ -167,7 +169,7 @@ inline Side convert_side(::mdp3::MDEntryTypeBook::Value v) { } } -void RealTimeMDP3Handler::operator()(::mdp3::MDIncrementalRefreshBook46 &m) { +void RealTimeMDHandler::operator()(::mdp3::MDIncrementalRefreshBook46 &m) { EventGuard ev(*this, m); struct MDEntryCache { @@ -281,7 +283,7 @@ void RealTimeMDP3Handler::operator()(::mdp3::MDIncrementalRefreshBook46 &m) { }); } -void RealTimeMDP3Handler::operator()( +void RealTimeMDHandler::operator()( ::mdp3::MDIncrementalRefreshDailyStatistics49 &m) { EventGuard ev(*this, m); @@ -313,7 +315,7 @@ void RealTimeMDP3Handler::operator()( }); } -void RealTimeMDP3Handler::operator()( +void RealTimeMDHandler::operator()( ::mdp3::MDIncrementalRefreshLimitsBanding50 &m) { EventGuard ev(*this, m); @@ -335,7 +337,7 @@ void RealTimeMDP3Handler::operator()( }); } -void RealTimeMDP3Handler::operator()(::mdp3::MDIncrementalRefreshOrderBook47 &m) { +void RealTimeMDHandler::operator()(::mdp3::MDIncrementalRefreshOrderBook47 &m) { EventGuard ev(*this, m); m.noMDEntries().forEach([&ev, this](auto &md_entry) { @@ -370,7 +372,7 @@ void RealTimeMDP3Handler::operator()(::mdp3::MDIncrementalRefreshOrderBook47 &m) }); } -void RealTimeMDP3Handler::operator()( +void RealTimeMDHandler::operator()( ::mdp3::MDIncrementalRefreshSessionStatistics51 &m) { EventGuard ev(*this, m); @@ -433,12 +435,12 @@ void RealTimeMDP3Handler::operator()( }); } -void RealTimeMDP3Handler::operator()( +void RealTimeMDHandler::operator()( ::mdp3::MDIncrementalRefreshTradeSummary48 &m) { EventGuard ev(*this, m); auto map_aggressor = [](::mdp3::AggressorSide::Value s) { - switch(s) { + switch (s) { case ::mdp3::AggressorSide::Buy: return AggressorSide::Buy; case ::mdp3::AggressorSide::Sell: @@ -461,12 +463,12 @@ void RealTimeMDP3Handler::operator()( 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 + else t_signal.signal.aggressor_side = aggressor; } @@ -474,18 +476,17 @@ void RealTimeMDP3Handler::operator()( 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 ++; - + 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 = sptr; - summary.price = Price{md_entry.mDEntryPx().mantissa(), md_entry.mDEntryPx().exponent()}; + 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(); @@ -493,9 +494,9 @@ void RealTimeMDP3Handler::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); - + 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) { PendingTradeOrderDetail detail; detail.order_id = OrderKey{order_id_entry.orderID()}; @@ -504,7 +505,7 @@ void RealTimeMDP3Handler::operator()( }); } -void RealTimeMDP3Handler::operator()(::mdp3::MDIncrementalRefreshVolume37 &m) { +void RealTimeMDHandler::operator()(::mdp3::MDIncrementalRefreshVolume37 &m) { EventGuard ev(*this, m); m.noMDEntries().forEach([&ev, this](auto &md_entry) { auto sid = SecurityID{md_entry.securityID()}; @@ -518,7 +519,7 @@ void RealTimeMDP3Handler::operator()(::mdp3::MDIncrementalRefreshVolume37 &m) { } template -void RealTimeMDP3Handler::on_instrument_definition(DefM &d) { +void RealTimeMDHandler::on_instrument_definition(DefM &d) { SecurityDefinition def{d}; EventGuard ev( *this, TimeStamp{d.lastUpdateTime()}, @@ -546,23 +547,23 @@ void RealTimeMDP3Handler::on_instrument_definition(DefM &d) { } } -void RealTimeMDP3Handler::operator()(::mdp3::MDInstrumentDefinitionFuture54 &d) { +void RealTimeMDHandler::operator()(::mdp3::MDInstrumentDefinitionFuture54 &d) { on_instrument_definition(d); } -void RealTimeMDP3Handler::operator()(::mdp3::MDInstrumentDefinitionOption55 &d) { +void RealTimeMDHandler::operator()(::mdp3::MDInstrumentDefinitionOption55 &d) { on_instrument_definition(d); } -void RealTimeMDP3Handler::operator()(::mdp3::MDInstrumentDefinitionSpread56 &d) { +void RealTimeMDHandler::operator()(::mdp3::MDInstrumentDefinitionSpread56 &d) { on_instrument_definition(d); } -void RealTimeMDP3Handler::operator()(::mdp3::QuoteRequest39 &qr) { +void RealTimeMDHandler::operator()(::mdp3::QuoteRequest39 &qr) { EventGuard ev(*this, qr); } -void RealTimeMDP3Handler::operator()(::mdp3::SecurityStatus30 &ss) { +void RealTimeMDHandler::operator()(::mdp3::SecurityStatus30 &ss) { EventGuard ev(*this, ss); auto update_implied_matching = [&ss](auto &sptr) { @@ -626,17 +627,17 @@ void RealTimeMDP3Handler::operator()(::mdp3::SecurityStatus30 &ss) { } } -void RealTimeMDP3Handler::operator()(::mdp3::ChannelReset4 &r) { +void RealTimeMDHandler::operator()(::mdp3::ChannelReset4 &r) { EventGuard ev(*this, r); for (auto &p : me->securities) p.second->reset_books(); } -void RealTimeMDP3Handler::on_start_of_event() { +void RealTimeMDHandler::on_start_of_event() { me->observer.on_event_begin(me->current_event); } -void RealTimeMDP3Handler::on_end_of_event() { +void RealTimeMDHandler::on_end_of_event() { // Trade summary messages have to be processed together once all of // them have been received. We do this here, because we know the // event is over and therefore so are the trade summaries @@ -704,7 +705,7 @@ void RealTimeMDP3Handler::on_end_of_event() { } } -SecuritySnapshot *RealTimeMDP3Handler::find_security(SecurityID id) { +SecuritySnapshot *RealTimeMDHandler::find_security(SecurityID id) { auto it = me->securities.find(id); if (it == me->securities.end()) return nullptr; diff --git a/src/server/sparkd/cmds/spartan/feed_handler/realtime/RealTimeHandler.h b/src/server/sparkd/cmds/spartan/feed_handler/detail/RealTimeMDHandler.h similarity index 94% rename from src/server/sparkd/cmds/spartan/feed_handler/realtime/RealTimeHandler.h rename to src/server/sparkd/cmds/spartan/feed_handler/detail/RealTimeMDHandler.h index bf031f7b2..455888897 100644 --- a/src/server/sparkd/cmds/spartan/feed_handler/realtime/RealTimeHandler.h +++ b/src/server/sparkd/cmds/spartan/feed_handler/detail/RealTimeMDHandler.h @@ -1,7 +1,7 @@ #pragma once -#include "../common/mdp3_common.h" -#include "server/sparkd/cmds/spartan/domain/SecuritySnapshotPtr.h" +#include "feed_handler/common/mdp3_common.h" +#include "domain/SecuritySnapshotPtr.h" #include #include @@ -25,7 +25,7 @@ class SecurityStatus30; namespace bts::spartan::mdp3 { class SecuritySnapshot; -class IMDP3RealTimeObserver; +class IRealTimeMDObserver; class MDP3PacketView; // Updates a set of security snapshots with the incremental changes @@ -36,10 +36,10 @@ class MDP3PacketView; // snapshot. In addition to updating the passed snapshots this class // will also create new snapshots for any new securities discovered // through the real time incremental feed. -class RealTimeMDP3Handler { +class RealTimeMDHandler { public: - RealTimeMDP3Handler(IMDP3RealTimeObserver &); - ~RealTimeMDP3Handler(); + RealTimeMDHandler(IRealTimeMDObserver &); + ~RealTimeMDHandler(); // Add a snapshot, including the security definition and its book // to the list of updated snapshots. Ownership of the passed diff --git a/src/server/sparkd/cmds/spartan/feed_handler/recovery/RecoveryHandler.cpp b/src/server/sparkd/cmds/spartan/feed_handler/detail/RecoveryMDHandler.cpp similarity index 85% rename from src/server/sparkd/cmds/spartan/feed_handler/recovery/RecoveryHandler.cpp rename to src/server/sparkd/cmds/spartan/feed_handler/detail/RecoveryMDHandler.cpp index 1e057d6c6..ef8fdc97f 100644 --- a/src/server/sparkd/cmds/spartan/feed_handler/recovery/RecoveryHandler.cpp +++ b/src/server/sparkd/cmds/spartan/feed_handler/detail/RecoveryMDHandler.cpp @@ -1,9 +1,9 @@ -#include "RecoveryHandler.h" -#include "../realtime/IMDP3RealTimeObserver.h" -#include "../realtime/RealTimeHandler.h" +#include "RecoveryMDHandler.h" #include "BookSnapshot.h" #include "DefinitionSnapshot.h" #include "IncrementalQueue.h" +#include "feed_handler/detail/IRealTimeMDObserver.h" +#include "feed_handler/detail/RealTimeMDHandler.h" #include "server/sparkd/cmds/spartan/domain/SecuritySnapshot.h" namespace bts::spartan::mdp3 { @@ -35,8 +35,8 @@ inline spartan::Side convert_side(::mdp3::MDEntryTypeBook::Value v) { } } -struct RecoveryHandler::PImpl { - PImpl(RecoveryHandler &owner) +struct RecoveryMDHandler::PImpl { + PImpl(RecoveryMDHandler &owner) : owner(owner), book_snapshot(), definition_snapshot(), incremental_queue(), @@ -44,7 +44,7 @@ struct RecoveryHandler::PImpl { instrument_feed_handler(*this), snapshot_feed_handler(*this), incremental_feed_handler(*this) {} - RecoveryHandler &owner; + RecoveryMDHandler &owner; BookSnapshot book_snapshot; DefinitionSnapshot definition_snapshot; @@ -55,20 +55,21 @@ struct RecoveryHandler::PImpl { IncrementalFeedHandler incremental_feed_handler; }; -RecoveryHandler::RecoveryHandler() +RecoveryMDHandler::RecoveryMDHandler() : me(new PImpl(*this)), on_instrument_feed(me->instrument_feed_handler), on_snapshot_feed(me->snapshot_feed_handler), on_incremental_feed(me->incremental_feed_handler) {} -RecoveryHandler::~RecoveryHandler() {} +RecoveryMDHandler::~RecoveryMDHandler() {} -void RecoveryHandler::reset() { +void RecoveryMDHandler::reset() { me->book_snapshot.reset(); me->definition_snapshot.reset(); me->incremental_queue.reset(); } -RecoveryHandler::MaybeSnapshot RecoveryHandler::try_build_snapshot_and_reset() { +RecoveryMDHandler::MaybeSnapshot +RecoveryMDHandler::try_build_snapshot_and_reset() { if (!me->book_snapshot.is_complete()) return {}; if (!me->definition_snapshot.is_complete()) @@ -177,16 +178,18 @@ RecoveryHandler::MaybeSnapshot RecoveryHandler::try_build_snapshot_and_reset() { // building the respective book. We can now apply our queued // messages, ensuring that we only add an instrument when the next // event in the queue has not yet been seen by the snapshot. - struct NullObserver : IMDP3RealTimeObserver { - void on_event_begin(MDP3Event 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() {} - void on_packet_begin(MDP3PacketView const &) {} - void on_packet_end() {} + struct NullObserver : IRealTimeMDObserver { + void on_event_begin(MDP3Event 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() {} + void on_packet_begin(MDP3PacketView const &) {} + void on_packet_end() {} } null_observer; - RealTimeMDP3Handler rt_handler(null_observer); + RealTimeMDHandler rt_handler(null_observer); auto pending_packets = me->incremental_queue.get_queued_packets_and_reset(); auto current_snapshot = sortable_snapshots.begin(); uint32_t last_applied_packet = 0; @@ -241,112 +244,112 @@ RecoveryHandler::MaybeSnapshot RecoveryHandler::try_build_snapshot_and_reset() { } // Instrument feed ------------------------------------------- -void RecoveryHandler::InstrumentFeedHandler::on_begin_packet( +void RecoveryMDHandler::InstrumentFeedHandler::on_begin_packet( MDP3PacketView const &p) { me.definition_snapshot.on_begin_packet(p); } -void RecoveryHandler::InstrumentFeedHandler::on_end_packet() { +void RecoveryMDHandler::InstrumentFeedHandler::on_end_packet() { me.definition_snapshot.on_end_packet(); } -void RecoveryHandler::InstrumentFeedHandler::operator()( +void RecoveryMDHandler::InstrumentFeedHandler::operator()( ::mdp3::MDInstrumentDefinitionFuture54 &d) { me.definition_snapshot(d); } -void RecoveryHandler::InstrumentFeedHandler::operator()( +void RecoveryMDHandler::InstrumentFeedHandler::operator()( ::mdp3::MDInstrumentDefinitionOption55 &d) { me.definition_snapshot(d); } -void RecoveryHandler::InstrumentFeedHandler::operator()( +void RecoveryMDHandler::InstrumentFeedHandler::operator()( ::mdp3::MDInstrumentDefinitionSpread56 &d) { me.definition_snapshot(d); } // Snapshot feed ------------------------------------------- -void RecoveryHandler::SnapshotFeedHandler::on_begin_packet( +void RecoveryMDHandler::SnapshotFeedHandler::on_begin_packet( MDP3PacketView const &p) { me.book_snapshot.on_begin_packet(p); } -void RecoveryHandler::SnapshotFeedHandler::on_end_packet() { +void RecoveryMDHandler::SnapshotFeedHandler::on_end_packet() { me.book_snapshot.on_end_packet(); } -void RecoveryHandler::SnapshotFeedHandler::operator()( +void RecoveryMDHandler::SnapshotFeedHandler::operator()( ::mdp3::SnapshotFullRefresh52 &snap) { me.book_snapshot(snap); } -void RecoveryHandler::SnapshotFeedHandler::operator()( +void RecoveryMDHandler::SnapshotFeedHandler::operator()( ::mdp3::SnapshotFullRefreshOrderBook53 &snap) { me.book_snapshot(snap); } // Incremental feed ------------------------------------------- -void RecoveryHandler::IncrementalFeedHandler::on_begin_packet( +void RecoveryMDHandler::IncrementalFeedHandler::on_begin_packet( MDP3PacketView const &p) { me.incremental_queue.on_begin_packet(p); } -void RecoveryHandler::IncrementalFeedHandler::on_end_packet() { +void RecoveryMDHandler::IncrementalFeedHandler::on_end_packet() { me.incremental_queue.on_end_packet(); } -void RecoveryHandler::IncrementalFeedHandler::operator()( +void RecoveryMDHandler::IncrementalFeedHandler::operator()( ::mdp3::MDIncrementalRefreshBook46 &m) { me.incremental_queue(m); } -void RecoveryHandler::IncrementalFeedHandler::operator()( +void RecoveryMDHandler::IncrementalFeedHandler::operator()( ::mdp3::MDIncrementalRefreshDailyStatistics49 &m) { me.incremental_queue(m); } -void RecoveryHandler::IncrementalFeedHandler::operator()( +void RecoveryMDHandler::IncrementalFeedHandler::operator()( ::mdp3::MDIncrementalRefreshLimitsBanding50 &m) { me.incremental_queue(m); } -void RecoveryHandler::IncrementalFeedHandler::operator()( +void RecoveryMDHandler::IncrementalFeedHandler::operator()( ::mdp3::MDIncrementalRefreshOrderBook47 &m) { me.incremental_queue(m); } -void RecoveryHandler::IncrementalFeedHandler::operator()( +void RecoveryMDHandler::IncrementalFeedHandler::operator()( ::mdp3::MDIncrementalRefreshSessionStatistics51 &m) { me.incremental_queue(m); } -void RecoveryHandler::IncrementalFeedHandler::operator()( +void RecoveryMDHandler::IncrementalFeedHandler::operator()( ::mdp3::MDIncrementalRefreshTradeSummary48 &m) { me.incremental_queue(m); } -void RecoveryHandler::IncrementalFeedHandler::operator()( +void RecoveryMDHandler::IncrementalFeedHandler::operator()( ::mdp3::MDIncrementalRefreshVolume37 &m) { me.incremental_queue(m); } -void RecoveryHandler::IncrementalFeedHandler::operator()( +void RecoveryMDHandler::IncrementalFeedHandler::operator()( ::mdp3::MDInstrumentDefinitionFuture54 &m) { me.incremental_queue(m); } -void RecoveryHandler::IncrementalFeedHandler::operator()( +void RecoveryMDHandler::IncrementalFeedHandler::operator()( ::mdp3::MDInstrumentDefinitionOption55 &m) { me.incremental_queue(m); } -void RecoveryHandler::IncrementalFeedHandler::operator()( +void RecoveryMDHandler::IncrementalFeedHandler::operator()( ::mdp3::MDInstrumentDefinitionSpread56 &m) { me.incremental_queue(m); } -void RecoveryHandler::IncrementalFeedHandler::operator()( +void RecoveryMDHandler::IncrementalFeedHandler::operator()( ::mdp3::QuoteRequest39 &m) { me.incremental_queue(m); } -void RecoveryHandler::IncrementalFeedHandler::operator()( +void RecoveryMDHandler::IncrementalFeedHandler::operator()( ::mdp3::SecurityStatus30 &m) { me.incremental_queue(m); } -void RecoveryHandler::IncrementalFeedHandler::operator()( +void RecoveryMDHandler::IncrementalFeedHandler::operator()( ::mdp3::ChannelReset4 &m) { me.incremental_queue(m); } -void RecoveryHandler::update_book_in_snapshot( +void RecoveryMDHandler::update_book_in_snapshot( SecuritySnapshot &snap, ::mdp3::SnapshotFullRefresh52 &r) { snap.set_high_limit_price( Price{r.highLimitPrice().mantissa(), r.highLimitPrice().exponent()}); @@ -425,7 +428,7 @@ void RecoveryHandler::update_book_in_snapshot( }); } -void RecoveryHandler::update_book_chunk_in_snapshot( +void RecoveryMDHandler::update_book_chunk_in_snapshot( SecuritySnapshot &snap, ::mdp3::SnapshotFullRefreshOrderBook53 &fr) { fr.noMDEntries().forEach([&snap](auto &md_entry) { MDP3Order order; diff --git a/src/server/sparkd/cmds/spartan/feed_handler/recovery/RecoveryHandler.h b/src/server/sparkd/cmds/spartan/feed_handler/detail/RecoveryMDHandler.h similarity index 95% rename from src/server/sparkd/cmds/spartan/feed_handler/recovery/RecoveryHandler.h rename to src/server/sparkd/cmds/spartan/feed_handler/detail/RecoveryMDHandler.h index 0dd4669fd..46cd64f45 100644 --- a/src/server/sparkd/cmds/spartan/feed_handler/recovery/RecoveryHandler.h +++ b/src/server/sparkd/cmds/spartan/feed_handler/detail/RecoveryMDHandler.h @@ -33,8 +33,7 @@ class IRecoveryObserver; // multicast loss and when booting the system. Once a snapshot is // built this class will reset its internal state and begin to recover // another snapshot. - -class RecoveryHandler { +class RecoveryMDHandler { private: struct PImpl; std::unique_ptr me; @@ -44,8 +43,8 @@ class RecoveryHandler { SecuritySnapshot &, ::mdp3::SnapshotFullRefreshOrderBook53 &); public: - RecoveryHandler(); - ~RecoveryHandler(); + RecoveryMDHandler(); + ~RecoveryMDHandler(); using MaybeSnapshot = std::optional>; void reset(); MaybeSnapshot try_build_snapshot_and_reset(); @@ -59,7 +58,7 @@ class RecoveryHandler { void operator()(::mdp3::MDInstrumentDefinitionSpread56 &); private: - friend class RecoveryHandler; + friend class RecoveryMDHandler; InstrumentFeedHandler(PImpl &me) : me(me) {} PImpl &me; }; @@ -73,7 +72,7 @@ class RecoveryHandler { void operator()(::mdp3::SnapshotFullRefreshOrderBook53 &); private: - friend class RecoveryHandler; + friend class RecoveryMDHandler; SnapshotFeedHandler(PImpl &me) : me(me) {} PImpl &me; }; @@ -101,7 +100,7 @@ class RecoveryHandler { void operator()(::mdp3::ChannelReset4 &); private: - friend class RecoveryHandler; + friend class RecoveryMDHandler; IncrementalFeedHandler(PImpl &me) : me(me) {} PImpl &me; }; diff --git a/src/server/sparkd/cmds/spartan/feed_handler/common/tests/book_merging_tests.cpp b/src/server/sparkd/cmds/spartan/feed_handler/tests/book_merging_tests.cpp similarity index 100% rename from src/server/sparkd/cmds/spartan/feed_handler/common/tests/book_merging_tests.cpp rename to src/server/sparkd/cmds/spartan/feed_handler/tests/book_merging_tests.cpp diff --git a/src/server/sparkd/cmds/spartan/feed_handler/tests/spartan_md_tests.cpp b/src/server/sparkd/cmds/spartan/feed_handler/tests/spartan_md_tests.cpp index e5f03767b..6a0f130ac 100644 --- a/src/server/sparkd/cmds/spartan/feed_handler/tests/spartan_md_tests.cpp +++ b/src/server/sparkd/cmds/spartan/feed_handler/tests/spartan_md_tests.cpp @@ -5,18 +5,18 @@ #include "back_testing/matcher/FifoPriceLevelMatcher.h" #include "back_testing/matcher/FifoSecurityMatcher.h" #include "domain/SecuritySnapshot.h" +#include "feed_handler/FeedHandler.h" +#include "feed_handler/IFeedObserver.h" +#include "feed_handler/detail/AB_Arbitrageur.h" +#include "feed_handler/detail/BookSnapshot.h" +#include "feed_handler/detail/DefinitionSnapshot.h" +#include "feed_handler/detail/IFeedController.h" +#include "feed_handler/detail/IncrementalQueue.h" +#include "feed_handler/detail/RecoveryMDHandler.h" +#include "feed_handler/utils/mdp3_utils.h" #include "lib/utils/TempFile.h" #include "lib/utils/overloaded.h" #include "lib/utils/type_name.h" -#include "feed_handler/feed_control/AB_Arbitrageur.h" -#include "feed_handler/feed_control/IFeedController.h" -#include "feed_handler/FeedHandler.h" -#include "feed_handler/IFeedObserver.h" -#include "feed_handler/recovery/BookSnapshot.h" -#include "feed_handler/recovery/DefinitionSnapshot.h" -#include "feed_handler/recovery/IncrementalQueue.h" -#include "feed_handler/recovery/RecoveryHandler.h" -#include "feed_handler/utils/mdp3_utils.h" #include "system/PCapReader.h" #include @@ -215,9 +215,9 @@ TEST_CASE("spartan_md", "[spartan_md] [spartan_slow]") { } SECTION("can_build_snapshot") { - RecoveryHandler recovery; + RecoveryMDHandler recovery; AB_Arbitrageur ab; - RecoveryHandler::MaybeSnapshot maybe_snapshot; + RecoveryMDHandler::MaybeSnapshot maybe_snapshot; reader.on_packet() = [&](auto const &info, auto const &payload) { if ((info.dst_ip == feed_map.incremental[0].ip && info.dst_port == feed_map.incremental[0].port)) { diff --git a/src/server/sparkd/cmds/spartan/feed_handler/utils/tests/synthetic_book_tests.cpp b/src/server/sparkd/cmds/spartan/feed_handler/tests/synthetic_book_tests.cpp similarity index 100% rename from src/server/sparkd/cmds/spartan/feed_handler/utils/tests/synthetic_book_tests.cpp rename to src/server/sparkd/cmds/spartan/feed_handler/tests/synthetic_book_tests.cpp diff --git a/src/server/sparkd/cmds/spartan/feed_handler/utils/mdp3_utils.cpp b/src/server/sparkd/cmds/spartan/feed_handler/utils/mdp3_utils.cpp index eab656445..691d06983 100644 --- a/src/server/sparkd/cmds/spartan/feed_handler/utils/mdp3_utils.cpp +++ b/src/server/sparkd/cmds/spartan/feed_handler/utils/mdp3_utils.cpp @@ -1,26 +1,26 @@ #include "mdp3_utils.h" #include "domain/SecuritySnapshot.h" +#include "domain/polygons/PolygonFinder.h" +#include "domain/polygons/PolygonOpportunityFinder.h" +#include "feed_handler/FeedHandler.h" +#include "feed_handler/detail/AB_Arbitrageur.h" +#include "feed_handler/detail/IFeedController.h" +#include "feed_handler/feed_observers/DefinitionCollector.h" +#include "feed_handler/feed_observers/IcebergFinder.h" +#include "feed_handler/gen/src/MDIncrementalRefreshOrderBook47.h" +#include "feed_handler/gen/src/MDInstrumentDefinitionFuture54.h" +#include "feed_handler/gen/src/MDInstrumentDefinitionOption55.h" +#include "feed_handler/gen/src/MDInstrumentDefinitionSpread56.h" +#include "feed_handler/gen/src/SnapshotFullRefreshOrderBook53.h" +#include "feed_handler/parsing/MDP3Packet.h" +#include "feed_handler/parsing/MDP3Parser.h" #include "lib/config/config.h" #include "lib/config/protos/spartan.pb.h" #include "lib/jetfix/codec/f_toa.h" #include "lib/utils/TempFile.h" #include "lib/utils/bts_chrono.h" #include "lib/utils/overloaded.h" -#include "feed_handler/feed_control/AB_Arbitrageur.h" -#include "feed_handler/feed_control/IFeedController.h" -#include "feed_handler/feed_observers/DefinitionCollector.h" -#include "feed_handler/feed_observers/IcebergFinder.h" -#include "feed_handler/feed_observers/PolygonFinder.h" -#include "feed_handler/feed_observers/PolygonOpportunityFinder.h" -#include "feed_handler/gen/src/MDIncrementalRefreshOrderBook47.h" -#include "feed_handler/gen/src/MDInstrumentDefinitionFuture54.h" -#include "feed_handler/gen/src/MDInstrumentDefinitionOption55.h" -#include "feed_handler/gen/src/MDInstrumentDefinitionSpread56.h" -#include "feed_handler/gen/src/SnapshotFullRefreshOrderBook53.h" -#include "feed_handler/FeedHandler.h" -#include "feed_handler/parsing/MDP3Packet.h" -#include "feed_handler/parsing/MDP3Parser.h" #include "system/PCapReader.h" #include @@ -396,8 +396,7 @@ struct PCapStreamer::PImpl { std::array buffers; }; -PCapStreamer::PCapStreamer( - std::string const &file, mdp3::IFeedObserver &obs) +PCapStreamer::PCapStreamer(std::string const &file, mdp3::IFeedObserver &obs) : me(new PImpl(file, obs)) { Guesser guesser; me->reader.on_packet() = [&](auto const &info, auto const &payload) { @@ -454,13 +453,11 @@ void observe_channel(std::string const &file, mdp3::IFeedObserver &obs) { } void observe_channel( - std::string const &pcap, - std::initializer_list observers) { + std::string const &pcap, std::initializer_list observers) { struct Composite : IFeedObserver { std::initializer_list const &obs; - Composite(std::initializer_list const &obs) - : obs(obs) {} + Composite(std::initializer_list const &obs) : obs(obs) {} void init() override { for (auto o : obs)