From f60a55815d39803cffaedf669c5833b4bcb09e0e Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Thu, 11 Feb 2021 17:47:12 -0500 Subject: [PATCH] Cleaned up gateway. --- src/server/sparkd/CMakeDeps.cmake | 2 +- .../sparkd/cmds/spartan/algo/AlgoManager.h | 2 +- .../feed_handler/{common => }/FeedEvent.cpp | 0 .../feed_handler/{common => }/FeedEvent.h | 0 .../cmds/spartan/feed_handler/FeedHandler.cpp | 8 +- .../cmds/spartan/feed_handler/FeedHandler.h | 6 +- .../feed_handler/FeedHandlerBinder.cpp | 19 ++-- .../spartan/feed_handler/FeedHandlerBinder.h | 2 +- .../{common => }/InitialSnapshot.h | 0 .../spartan/feed_handler/common/mdp3_common.h | 2 +- ...edHandler.cpp => FeedHandler_RealTime.cpp} | 68 ++++++------- ...meFeedHandler.h => FeedHandler_RealTime.h} | 6 +- ...edHandler.cpp => FeedHandler_Recovery.cpp} | 77 ++++++++------- ...ryFeedHandler.h => FeedHandler_Recovery.h} | 12 +-- .../detail/IRealTimeFeedObserver.h | 32 ------- .../detail/IRecoveryFeedObserver.h | 15 --- .../feed_observers/FeedObserver.h | 2 +- .../feed_handler/tests/spartan_md_tests.cpp | 6 +- .../sparkd/cmds/spartan/gateway/Gateway.cpp | 34 +++---- .../sparkd/cmds/spartan/gateway/GatewayCfg.h | 2 +- .../spartan/gateway/PartyDetailsSetter.cpp | 4 +- .../detail/{handlers => }/GatewayInitRec.cpp | 0 .../detail/{handlers => }/GatewayInitRec.h | 2 +- ...atewayInitHandler.cpp => Gateway_Init.cpp} | 96 +++++++++---------- .../GatewayInitHandler.h => Gateway_Init.h} | 8 +- ...alTimeHandler.cpp => Gateway_RealTime.cpp} | 70 +++++++------- ...ayRealTimeHandler.h => Gateway_RealTime.h} | 6 +- .../detail/{store => }/IIL3SessionStore.h | 0 .../detail/{parsing => }/IL3FramingHeader.h | 0 .../gateway/detail/{parsing => }/IL3MsgBox.h | 2 +- .../detail/{common => }/IL3MsgFramer.cc | 0 .../detail/{common => }/IL3MsgFramer.cpp | 0 .../detail/{common => }/IL3MsgFramer.h | 2 +- .../detail/{parsing => }/IL3MsgHeader.h | 0 .../detail/{common => }/IL3OutgoingQueue.cc | 2 +- .../detail/{common => }/IL3OutgoingQueue.cpp | 0 .../detail/{common => }/IL3OutgoingQueue.h | 2 +- .../gateway/detail/{parsing => }/IL3Parser.cc | 2 +- .../detail/{parsing => }/IL3Parser.cpp | 0 .../gateway/detail/{parsing => }/IL3Parser.h | 0 .../{store => }/IL3SessionFileStore.cpp | 4 +- .../detail/{store => }/IL3SessionFileStore.h | 4 +- .../gateway/detail/{common => }/IL3UUID.h | 0 .../gateway/tests/order_execution_tests.cpp | 20 ++-- 44 files changed, 234 insertions(+), 285 deletions(-) rename src/server/sparkd/cmds/spartan/feed_handler/{common => }/FeedEvent.cpp (100%) rename src/server/sparkd/cmds/spartan/feed_handler/{common => }/FeedEvent.h (100%) rename src/server/sparkd/cmds/spartan/feed_handler/{common => }/InitialSnapshot.h (100%) rename src/server/sparkd/cmds/spartan/feed_handler/detail/{RealTimeFeedHandler.cpp => FeedHandler_RealTime.cpp} (92%) rename src/server/sparkd/cmds/spartan/feed_handler/detail/{RealTimeFeedHandler.h => FeedHandler_RealTime.h} (98%) rename src/server/sparkd/cmds/spartan/feed_handler/detail/{RecoveryFeedHandler.cpp => FeedHandler_Recovery.cpp} (86%) rename src/server/sparkd/cmds/spartan/feed_handler/detail/{RecoveryFeedHandler.h => FeedHandler_Recovery.h} (94%) delete mode 100644 src/server/sparkd/cmds/spartan/feed_handler/detail/IRealTimeFeedObserver.h delete mode 100644 src/server/sparkd/cmds/spartan/feed_handler/detail/IRecoveryFeedObserver.h rename src/server/sparkd/cmds/spartan/gateway/detail/{handlers => }/GatewayInitRec.cpp (100%) rename src/server/sparkd/cmds/spartan/gateway/detail/{handlers => }/GatewayInitRec.h (83%) rename src/server/sparkd/cmds/spartan/gateway/detail/{handlers/GatewayInitHandler.cpp => Gateway_Init.cpp} (81%) rename src/server/sparkd/cmds/spartan/gateway/detail/{handlers/GatewayInitHandler.h => Gateway_Init.h} (96%) rename src/server/sparkd/cmds/spartan/gateway/detail/{handlers/GatewayRealTimeHandler.cpp => Gateway_RealTime.cpp} (86%) rename src/server/sparkd/cmds/spartan/gateway/detail/{handlers/GatewayRealTimeHandler.h => Gateway_RealTime.h} (96%) rename src/server/sparkd/cmds/spartan/gateway/detail/{store => }/IIL3SessionStore.h (100%) rename src/server/sparkd/cmds/spartan/gateway/detail/{parsing => }/IL3FramingHeader.h (100%) rename src/server/sparkd/cmds/spartan/gateway/detail/{parsing => }/IL3MsgBox.h (95%) rename src/server/sparkd/cmds/spartan/gateway/detail/{common => }/IL3MsgFramer.cc (100%) rename src/server/sparkd/cmds/spartan/gateway/detail/{common => }/IL3MsgFramer.cpp (100%) rename src/server/sparkd/cmds/spartan/gateway/detail/{common => }/IL3MsgFramer.h (93%) rename src/server/sparkd/cmds/spartan/gateway/detail/{parsing => }/IL3MsgHeader.h (100%) rename src/server/sparkd/cmds/spartan/gateway/detail/{common => }/IL3OutgoingQueue.cc (93%) rename src/server/sparkd/cmds/spartan/gateway/detail/{common => }/IL3OutgoingQueue.cpp (100%) rename src/server/sparkd/cmds/spartan/gateway/detail/{common => }/IL3OutgoingQueue.h (94%) rename src/server/sparkd/cmds/spartan/gateway/detail/{parsing => }/IL3Parser.cc (99%) rename src/server/sparkd/cmds/spartan/gateway/detail/{parsing => }/IL3Parser.cpp (100%) rename src/server/sparkd/cmds/spartan/gateway/detail/{parsing => }/IL3Parser.h (100%) rename src/server/sparkd/cmds/spartan/gateway/detail/{store => }/IL3SessionFileStore.cpp (95%) rename src/server/sparkd/cmds/spartan/gateway/detail/{store => }/IL3SessionFileStore.h (89%) rename src/server/sparkd/cmds/spartan/gateway/detail/{common => }/IL3UUID.h (100%) diff --git a/src/server/sparkd/CMakeDeps.cmake b/src/server/sparkd/CMakeDeps.cmake index 5092db0ff..de46117c6 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/algo/AlgoManager.cpp;cmds/spartan/algo/IAlgo.cpp;cmds/spartan/algo/IAlgoInitService.cpp;cmds/spartan/algo/IAlgoRunService.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/DataPacket.cpp;cmds/spartan/common/EndPoint.cpp;cmds/spartan/common/SpartanError.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/BookUpdate.cpp;cmds/spartan/domain/CancelReplace.cpp;cmds/spartan/domain/IcebergQuantity.cpp;cmds/spartan/domain/NewOrder.cpp;cmds/spartan/domain/OrderUpdate.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/TradeSummaryUpdate.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/algos/tas/RunTAS.cpp;cmds/spartan/engine/algos/tas/TASOrderReactor.cpp;cmds/spartan/engine/algos/tas/TASTriggerDef.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/FeedEvent.cpp;cmds/spartan/feed_handler/common/IcebergQuantityModification.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/IncrementalQueue.cpp;cmds/spartan/feed_handler/detail/MDP3MsgBox.cpp;cmds/spartan/feed_handler/detail/MDP3Parser.cpp;cmds/spartan/feed_handler/detail/RealTimeFeedHandler.cpp;cmds/spartan/feed_handler/detail/RecoveryFeedHandler.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/FeedObserver.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/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/gateway/Gateway.cpp;cmds/spartan/gateway/GatewayCfg.cpp;cmds/spartan/gateway/PartyDetailsSetter.cpp;cmds/spartan/gateway/detail/common/IL3MsgFramer.cpp;cmds/spartan/gateway/detail/common/IL3OutgoingQueue.cpp;cmds/spartan/gateway/detail/handlers/GatewayInitHandler.cpp;cmds/spartan/gateway/detail/handlers/GatewayInitRec.cpp;cmds/spartan/gateway/detail/handlers/GatewayRealTimeHandler.cpp;cmds/spartan/gateway/detail/parsing/IL3Parser.cpp;cmds/spartan/gateway/detail/store/IL3SessionFileStore.cpp;cmds/spartan/gateway/tests/order_execution_tests.cpp;cmds/spartan/system/Delegate.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/algo/AlgoManager.cpp;cmds/spartan/algo/IAlgo.cpp;cmds/spartan/algo/IAlgoInitService.cpp;cmds/spartan/algo/IAlgoRunService.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/DataPacket.cpp;cmds/spartan/common/EndPoint.cpp;cmds/spartan/common/SpartanError.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/BookUpdate.cpp;cmds/spartan/domain/CancelReplace.cpp;cmds/spartan/domain/IcebergQuantity.cpp;cmds/spartan/domain/NewOrder.cpp;cmds/spartan/domain/OrderUpdate.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/TradeSummaryUpdate.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/algos/tas/RunTAS.cpp;cmds/spartan/engine/algos/tas/TASOrderReactor.cpp;cmds/spartan/engine/algos/tas/TASTriggerDef.cpp;cmds/spartan/feed_handler/FeedEvent.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/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/FeedHandler_RealTime.cpp;cmds/spartan/feed_handler/detail/FeedHandler_Recovery.cpp;cmds/spartan/feed_handler/detail/IncrementalQueue.cpp;cmds/spartan/feed_handler/detail/MDP3MsgBox.cpp;cmds/spartan/feed_handler/detail/MDP3Parser.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/FeedObserver.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/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/gateway/Gateway.cpp;cmds/spartan/gateway/GatewayCfg.cpp;cmds/spartan/gateway/PartyDetailsSetter.cpp;cmds/spartan/gateway/detail/GatewayInitRec.cpp;cmds/spartan/gateway/detail/Gateway_Init.cpp;cmds/spartan/gateway/detail/Gateway_RealTime.cpp;cmds/spartan/gateway/detail/IL3MsgFramer.cpp;cmds/spartan/gateway/detail/IL3OutgoingQueue.cpp;cmds/spartan/gateway/detail/IL3Parser.cpp;cmds/spartan/gateway/detail/IL3SessionFileStore.cpp;cmds/spartan/gateway/tests/order_execution_tests.cpp;cmds/spartan/system/Delegate.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/algo/AlgoManager.h b/src/server/sparkd/cmds/spartan/algo/AlgoManager.h index b768780ff..a8697094f 100644 --- a/src/server/sparkd/cmds/spartan/algo/AlgoManager.h +++ b/src/server/sparkd/cmds/spartan/algo/AlgoManager.h @@ -1,7 +1,7 @@ #pragma once #include "domain/OrderHandle.h" -#include "feed_handler/common/InitialSnapshot.h" +#include "feed_handler/InitialSnapshot.h" #include "system/Delegate.h" #include diff --git a/src/server/sparkd/cmds/spartan/feed_handler/common/FeedEvent.cpp b/src/server/sparkd/cmds/spartan/feed_handler/FeedEvent.cpp similarity index 100% rename from src/server/sparkd/cmds/spartan/feed_handler/common/FeedEvent.cpp rename to src/server/sparkd/cmds/spartan/feed_handler/FeedEvent.cpp diff --git a/src/server/sparkd/cmds/spartan/feed_handler/common/FeedEvent.h b/src/server/sparkd/cmds/spartan/feed_handler/FeedEvent.h similarity index 100% rename from src/server/sparkd/cmds/spartan/feed_handler/common/FeedEvent.h rename to src/server/sparkd/cmds/spartan/feed_handler/FeedEvent.h diff --git a/src/server/sparkd/cmds/spartan/feed_handler/FeedHandler.cpp b/src/server/sparkd/cmds/spartan/feed_handler/FeedHandler.cpp index e3eaca911..f1e06cc97 100644 --- a/src/server/sparkd/cmds/spartan/feed_handler/FeedHandler.cpp +++ b/src/server/sparkd/cmds/spartan/feed_handler/FeedHandler.cpp @@ -1,8 +1,8 @@ #include "FeedHandler.h" #include "feed_handler/detail/AB_Arbitrageur.h" -#include "feed_handler/detail/RealTimeFeedHandler.h" -#include "feed_handler/detail/RecoveryFeedHandler.h" +#include "feed_handler/detail/FeedHandler_RealTime.h" +#include "feed_handler/detail/FeedHandler_Recovery.h" #include "server/sparkd/cmds/spartan/domain/SecuritySnapshot.h" #include "common/SpartanError.h" @@ -13,8 +13,8 @@ enum class FeedHandler::State { INIT, RECOVERY, REALTIME }; struct FeedHandler::PImpl { State state = State::INIT; mdp3::AB_Arbitrageur real_time_ab; - RealTimeFeedHandler real_time_handler; - mdp3::RecoveryFeedHandler recovery_handler; + FeedHandler_RealTime real_time_handler; + mdp3::FeedHandler_Recovery recovery_handler; }; struct FeedHandler::RecoveryGuard { diff --git a/src/server/sparkd/cmds/spartan/feed_handler/FeedHandler.h b/src/server/sparkd/cmds/spartan/feed_handler/FeedHandler.h index 37c15f8f8..1ec543d16 100644 --- a/src/server/sparkd/cmds/spartan/feed_handler/FeedHandler.h +++ b/src/server/sparkd/cmds/spartan/feed_handler/FeedHandler.h @@ -3,8 +3,7 @@ #include #include -#include "feed_handler/common/InitialSnapshot.h" -#include "feed_handler/detail/MDP3Parser.h" +#include "feed_handler/InitialSnapshot.h" #include "feed_handler/detail/PickedFeed.h" #include "system/Delegate.h" @@ -33,16 +32,13 @@ class FeedHandler { Delegate on_snapshot; Delegate on_book; Delegate on_trade_summary; - // Packet processing Delegate on_packet_begin; Delegate on_packet_end; Delegate on_error; - // Event processing Delegate on_event_begin; Delegate on_event_end; - // Stream control. An MD3 feed consists of 4 different multicast // streams: incremental A, incremental B, snapshot and // instrument. The delegates below can be used to minimize the diff --git a/src/server/sparkd/cmds/spartan/feed_handler/FeedHandlerBinder.cpp b/src/server/sparkd/cmds/spartan/feed_handler/FeedHandlerBinder.cpp index 8c5006317..60a1548b1 100644 --- a/src/server/sparkd/cmds/spartan/feed_handler/FeedHandlerBinder.cpp +++ b/src/server/sparkd/cmds/spartan/feed_handler/FeedHandlerBinder.cpp @@ -1,11 +1,13 @@ #include "FeedHandlerBinder.h" +#include "common/DataPacket.h" #include "common/EndPoint.h" +#include "feed_handler/FeedHandler.h" #include "feed_handler/utils/mdp3_utils.h" #include "system/reactor/IConnection.h" #include "system/reactor/IConnectionObserver.h" #include "system/reactor/Reactor.h" -#include "common/DataPacket.h" +#include "feed_handler/detail/MDP3PacketView.h" namespace bts::spartan { @@ -96,18 +98,17 @@ void FeedHandlerBinder::bind( h.start_incremental_stream .bind<&FeedHandlerBinder::start_incremental_stream>(*this); - h.stop_incremental_stream - .bind<&FeedHandlerBinder::stop_incremental_stream>(*this); + h.stop_incremental_stream.bind<&FeedHandlerBinder::stop_incremental_stream>( + *this); - h.start_snapshot_stream - .bind<&FeedHandlerBinder::start_snapshot_stream>(*this); - h.stop_snapshot_stream - .bind<&FeedHandlerBinder::stop_snapshot_stream>(*this); + h.start_snapshot_stream.bind<&FeedHandlerBinder::start_snapshot_stream>( + *this); + h.stop_snapshot_stream.bind<&FeedHandlerBinder::stop_snapshot_stream>(*this); h.start_incremental_stream .bind<&FeedHandlerBinder::start_incremental_stream>(*this); - h.stop_incremental_stream - .bind<&FeedHandlerBinder::stop_incremental_stream>(*this); + h.stop_incremental_stream.bind<&FeedHandlerBinder::stop_incremental_stream>( + *this); } void FeedHandlerBinder::start_instrument_stream() { diff --git a/src/server/sparkd/cmds/spartan/feed_handler/FeedHandlerBinder.h b/src/server/sparkd/cmds/spartan/feed_handler/FeedHandlerBinder.h index 160932729..44140e825 100644 --- a/src/server/sparkd/cmds/spartan/feed_handler/FeedHandlerBinder.h +++ b/src/server/sparkd/cmds/spartan/feed_handler/FeedHandlerBinder.h @@ -1,12 +1,12 @@ #pragma once -#include "FeedHandler.h" #include "feed_handler/utils/mdp3_utils.h" #include namespace bts::spartan { class Reactor; +class FeedHandler; struct BinderConfig { mdp3::FeedMap feed_map; diff --git a/src/server/sparkd/cmds/spartan/feed_handler/common/InitialSnapshot.h b/src/server/sparkd/cmds/spartan/feed_handler/InitialSnapshot.h similarity index 100% rename from src/server/sparkd/cmds/spartan/feed_handler/common/InitialSnapshot.h rename to src/server/sparkd/cmds/spartan/feed_handler/InitialSnapshot.h diff --git a/src/server/sparkd/cmds/spartan/feed_handler/common/mdp3_common.h b/src/server/sparkd/cmds/spartan/feed_handler/common/mdp3_common.h index 784f8bf12..e2b8d1845 100644 --- a/src/server/sparkd/cmds/spartan/feed_handler/common/mdp3_common.h +++ b/src/server/sparkd/cmds/spartan/feed_handler/common/mdp3_common.h @@ -15,7 +15,7 @@ #include "server/sparkd/cmds/spartan/domain/order/Order.h" #include "server/sparkd/cmds/spartan/domain/order/OrderChange.h" #include "server/sparkd/cmds/spartan/domain/order/OrderKey.h" -#include "server/sparkd/cmds/spartan/feed_handler/common/FeedEvent.h" +#include "server/sparkd/cmds/spartan/feed_handler/FeedEvent.h" #include #include diff --git a/src/server/sparkd/cmds/spartan/feed_handler/detail/RealTimeFeedHandler.cpp b/src/server/sparkd/cmds/spartan/feed_handler/detail/FeedHandler_RealTime.cpp similarity index 92% rename from src/server/sparkd/cmds/spartan/feed_handler/detail/RealTimeFeedHandler.cpp rename to src/server/sparkd/cmds/spartan/feed_handler/detail/FeedHandler_RealTime.cpp index fdb62c257..5025cd04e 100644 --- a/src/server/sparkd/cmds/spartan/feed_handler/detail/RealTimeFeedHandler.cpp +++ b/src/server/sparkd/cmds/spartan/feed_handler/detail/FeedHandler_RealTime.cpp @@ -1,4 +1,4 @@ -#include "RealTimeFeedHandler.h" +#include "FeedHandler_RealTime.h" #include "domain/SecuritySnapshot.h" #include "domain/BookUpdate.h" @@ -11,7 +11,7 @@ namespace bts::spartan { -struct RealTimeFeedHandler::PendingTradeSummary { +struct FeedHandler_RealTime::PendingTradeSummary { ::mdp3::MDUpdateAction::Value update_action; SecuritySnapshot *security; mdp3::Price price; @@ -21,12 +21,12 @@ struct RealTimeFeedHandler::PendingTradeSummary { MDP3TradeEntryID trade_entry_id; }; -struct RealTimeFeedHandler::PendingTradeOrderDetail { +struct FeedHandler_RealTime::PendingTradeOrderDetail { OrderKey order_id; mdp3::Quantity quantity; }; -struct RealTimeFeedHandler::PImpl { +struct FeedHandler_RealTime::PImpl { PImpl() : securities(), current_packet_send_time(TimeStamp{0}), current_packet_sn(0), current_event(), pending_ts(), @@ -40,10 +40,10 @@ struct RealTimeFeedHandler::PImpl { std::vector pending_trade_order_detail; }; -struct RealTimeFeedHandler::EventGuard { +struct FeedHandler_RealTime::EventGuard { template - EventGuard(RealTimeFeedHandler &owner, M &m) : owner(owner) { + EventGuard(FeedHandler_RealTime &owner, M &m) : owner(owner) { bts_assert(owner.me->current_packet_sn); auto &info = owner.me->current_event; if (info.transact_time == TimeStamp{0}) { @@ -67,7 +67,7 @@ struct RealTimeFeedHandler::EventGuard { } EventGuard( - RealTimeFeedHandler &owner, + FeedHandler_RealTime &owner, TimeStamp last_update_time, bool end_of_event) : owner(owner) { @@ -109,47 +109,47 @@ struct RealTimeFeedHandler::EventGuard { info.add_sec(s); } - RealTimeFeedHandler &owner; + FeedHandler_RealTime &owner; }; -RealTimeFeedHandler::RealTimeFeedHandler() : me(new PImpl()) {} +FeedHandler_RealTime::FeedHandler_RealTime() : me(new PImpl()) {} -RealTimeFeedHandler::~RealTimeFeedHandler() {} +FeedHandler_RealTime::~FeedHandler_RealTime() {} -void RealTimeFeedHandler::add_snapshot( +void FeedHandler_RealTime::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 RealTimeFeedHandler::add_snapshots( +void FeedHandler_RealTime::add_snapshots( std::vector &snaps) { for (auto &s : snaps) add_snapshot(std::move(s)); } -bool RealTimeFeedHandler::is_processing_multi_message_event() const { +bool FeedHandler_RealTime::is_processing_multi_message_event() const { return me->current_event.transact_time != TimeStamp{}; } std::vector> -RealTimeFeedHandler::move_all_securities_and_reset() { +FeedHandler_RealTime::move_all_securities_and_reset() { std::vector> result; for (auto &p : me->securities) result.push_back(std::move(p.second)); return result; } -void RealTimeFeedHandler::reset() { me = std::make_unique(); } +void FeedHandler_RealTime::reset() { me = std::make_unique(); } -void RealTimeFeedHandler::packet_begin(MDP3PacketView const &h) { +void FeedHandler_RealTime::packet_begin(MDP3PacketView const &h) { me->current_packet_sn = h.seq_num(); me->current_packet_arrival_time = h.arrival_time(); me->current_packet_send_time = TimeStamp{h.sending_time()}; } -void RealTimeFeedHandler::packet_end(MDP3PacketView const&) { +void FeedHandler_RealTime::packet_end(MDP3PacketView const&) { me->current_packet_sn = 0; me->current_packet_send_time = TimeStamp{0}; } @@ -168,7 +168,7 @@ inline Side convert_side(::mdp3::MDEntryTypeBook::Value v) { } } -void RealTimeFeedHandler::operator()(::mdp3::MDIncrementalRefreshBook46 &m) { +void FeedHandler_RealTime::operator()(::mdp3::MDIncrementalRefreshBook46 &m) { EventGuard ev(*this, m); struct MDEntryCache { @@ -284,7 +284,7 @@ void RealTimeFeedHandler::operator()(::mdp3::MDIncrementalRefreshBook46 &m) { }); } -void RealTimeFeedHandler::operator()( +void FeedHandler_RealTime::operator()( ::mdp3::MDIncrementalRefreshDailyStatistics49 &m) { EventGuard ev(*this, m); @@ -316,7 +316,7 @@ void RealTimeFeedHandler::operator()( }); } -void RealTimeFeedHandler::operator()( +void FeedHandler_RealTime::operator()( ::mdp3::MDIncrementalRefreshLimitsBanding50 &m) { EventGuard ev(*this, m); @@ -338,7 +338,7 @@ void RealTimeFeedHandler::operator()( }); } -void RealTimeFeedHandler::operator()( +void FeedHandler_RealTime::operator()( ::mdp3::MDIncrementalRefreshOrderBook47 &m) { EventGuard ev(*this, m); @@ -374,7 +374,7 @@ void RealTimeFeedHandler::operator()( }); } -void RealTimeFeedHandler::operator()( +void FeedHandler_RealTime::operator()( ::mdp3::MDIncrementalRefreshSessionStatistics51 &m) { EventGuard ev(*this, m); @@ -437,7 +437,7 @@ void RealTimeFeedHandler::operator()( }); } -void RealTimeFeedHandler::operator()( +void FeedHandler_RealTime::operator()( ::mdp3::MDIncrementalRefreshTradeSummary48 &m) { EventGuard ev(*this, m); @@ -509,7 +509,7 @@ void RealTimeFeedHandler::operator()( }); } -void RealTimeFeedHandler::operator()(::mdp3::MDIncrementalRefreshVolume37 &m) { +void FeedHandler_RealTime::operator()(::mdp3::MDIncrementalRefreshVolume37 &m) { EventGuard ev(*this, m); m.noMDEntries().forEach([&ev, this](auto &md_entry) { auto sid = SecurityID{md_entry.securityID()}; @@ -523,7 +523,7 @@ void RealTimeFeedHandler::operator()(::mdp3::MDIncrementalRefreshVolume37 &m) { } template -void RealTimeFeedHandler::on_instrument_definition(DefM &d) { +void FeedHandler_RealTime::on_instrument_definition(DefM &d) { SecurityDefinition def{d}; EventGuard ev( *this, TimeStamp{d.lastUpdateTime()}, @@ -551,26 +551,26 @@ void RealTimeFeedHandler::on_instrument_definition(DefM &d) { } } -void RealTimeFeedHandler::operator()( +void FeedHandler_RealTime::operator()( ::mdp3::MDInstrumentDefinitionFuture54 &d) { on_instrument_definition(d); } -void RealTimeFeedHandler::operator()( +void FeedHandler_RealTime::operator()( ::mdp3::MDInstrumentDefinitionOption55 &d) { on_instrument_definition(d); } -void RealTimeFeedHandler::operator()( +void FeedHandler_RealTime::operator()( ::mdp3::MDInstrumentDefinitionSpread56 &d) { on_instrument_definition(d); } -void RealTimeFeedHandler::operator()(::mdp3::QuoteRequest39 &qr) { +void FeedHandler_RealTime::operator()(::mdp3::QuoteRequest39 &qr) { EventGuard ev(*this, qr); } -void RealTimeFeedHandler::operator()(::mdp3::SecurityStatus30 &ss) { +void FeedHandler_RealTime::operator()(::mdp3::SecurityStatus30 &ss) { EventGuard ev(*this, ss); auto update_implied_matching = [&ss](auto &sptr) { @@ -634,17 +634,17 @@ void RealTimeFeedHandler::operator()(::mdp3::SecurityStatus30 &ss) { } } -void RealTimeFeedHandler::operator()(::mdp3::ChannelReset4 &r) { +void FeedHandler_RealTime::operator()(::mdp3::ChannelReset4 &r) { EventGuard ev(*this, r); for (auto &p : me->securities) p.second->reset_books(); } -void RealTimeFeedHandler::on_start_of_event() { +void FeedHandler_RealTime::on_start_of_event() { on_event_begin(me->current_event); } -void RealTimeFeedHandler::on_end_of_event() { +void FeedHandler_RealTime::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 @@ -712,7 +712,7 @@ void RealTimeFeedHandler::on_end_of_event() { } } -SecuritySnapshot *RealTimeFeedHandler::find_security(SecurityID id) { +SecuritySnapshot *FeedHandler_RealTime::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/detail/RealTimeFeedHandler.h b/src/server/sparkd/cmds/spartan/feed_handler/detail/FeedHandler_RealTime.h similarity index 98% rename from src/server/sparkd/cmds/spartan/feed_handler/detail/RealTimeFeedHandler.h rename to src/server/sparkd/cmds/spartan/feed_handler/detail/FeedHandler_RealTime.h index 5882b52b2..9e68df7a6 100644 --- a/src/server/sparkd/cmds/spartan/feed_handler/detail/RealTimeFeedHandler.h +++ b/src/server/sparkd/cmds/spartan/feed_handler/detail/FeedHandler_RealTime.h @@ -41,10 +41,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 RealTimeFeedHandler { +class FeedHandler_RealTime { public: - RealTimeFeedHandler(); - ~RealTimeFeedHandler(); + FeedHandler_RealTime(); + ~FeedHandler_RealTime(); // Delegates ------------------------------------------------------------- Delegate on_event_begin; diff --git a/src/server/sparkd/cmds/spartan/feed_handler/detail/RecoveryFeedHandler.cpp b/src/server/sparkd/cmds/spartan/feed_handler/detail/FeedHandler_Recovery.cpp similarity index 86% rename from src/server/sparkd/cmds/spartan/feed_handler/detail/RecoveryFeedHandler.cpp rename to src/server/sparkd/cmds/spartan/feed_handler/detail/FeedHandler_Recovery.cpp index b1e96a6ce..8ad1fe76c 100644 --- a/src/server/sparkd/cmds/spartan/feed_handler/detail/RecoveryFeedHandler.cpp +++ b/src/server/sparkd/cmds/spartan/feed_handler/detail/FeedHandler_Recovery.cpp @@ -1,11 +1,10 @@ -#include "RecoveryFeedHandler.h" +#include "FeedHandler_Recovery.h" #include "BookSnapshot.h" #include "DefinitionSnapshot.h" #include "IncrementalQueue.h" -#include "feed_handler/detail/IRealTimeFeedObserver.h" -#include "feed_handler/detail/RealTimeFeedHandler.h" -#include "server/sparkd/cmds/spartan/domain/SecuritySnapshot.h" +#include "domain/SecuritySnapshot.h" +#include "feed_handler/detail/FeedHandler_RealTime.h" namespace bts::spartan::mdp3 { @@ -36,8 +35,8 @@ inline spartan::Side convert_side(::mdp3::MDEntryTypeBook::Value v) { } } -struct RecoveryFeedHandler::PImpl { - PImpl(RecoveryFeedHandler &owner) +struct FeedHandler_Recovery::PImpl { + PImpl(FeedHandler_Recovery &owner) : owner(owner), book_snapshot(), definition_snapshot(), incremental_queue(), @@ -45,7 +44,7 @@ struct RecoveryFeedHandler::PImpl { instrument_stream_handler(*this), snapshot_stream_handler(*this), incremental_stream_handler(*this) {} - RecoveryFeedHandler &owner; + FeedHandler_Recovery &owner; BookSnapshot book_snapshot; DefinitionSnapshot definition_snapshot; @@ -56,22 +55,22 @@ struct RecoveryFeedHandler::PImpl { IncrementalStreamHandler incremental_stream_handler; }; -RecoveryFeedHandler::RecoveryFeedHandler() +FeedHandler_Recovery::FeedHandler_Recovery() : me(new PImpl(*this)), instrument_stream_handler(me->instrument_stream_handler), snapshot_stream_handler(me->snapshot_stream_handler), incremental_stream_handler(me->incremental_stream_handler) {} -RecoveryFeedHandler::~RecoveryFeedHandler() {} +FeedHandler_Recovery::~FeedHandler_Recovery() {} -void RecoveryFeedHandler::reset() { +void FeedHandler_Recovery::reset() { me->book_snapshot.reset(); me->definition_snapshot.reset(); me->incremental_queue.reset(); } -RecoveryFeedHandler::MaybeSnapshot -RecoveryFeedHandler::try_build_snapshot_and_reset() { +FeedHandler_Recovery::MaybeSnapshot +FeedHandler_Recovery::try_build_snapshot_and_reset() { if (!me->book_snapshot.is_complete()) return {}; if (!me->definition_snapshot.is_complete()) @@ -180,7 +179,7 @@ RecoveryFeedHandler::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. - RealTimeFeedHandler rt_handler; + FeedHandler_RealTime rt_handler; auto pending_packets = me->incremental_queue.get_queued_packets_and_reset(); auto current_snapshot = sortable_snapshots.begin(); uint32_t last_applied_packet = 0; @@ -235,115 +234,115 @@ RecoveryFeedHandler::try_build_snapshot_and_reset() { } // Instrument feed ------------------------------------------- -void RecoveryFeedHandler::InstrumentStreamHandler::packet_begin( +void FeedHandler_Recovery::InstrumentStreamHandler::packet_begin( MDP3PacketView const &p) { me.definition_snapshot.packet_begin(p); } -void RecoveryFeedHandler::InstrumentStreamHandler::packet_end( +void FeedHandler_Recovery::InstrumentStreamHandler::packet_end( MDP3PacketView const &mvp) { me.definition_snapshot.packet_end(mvp); } -void RecoveryFeedHandler::InstrumentStreamHandler::operator()( +void FeedHandler_Recovery::InstrumentStreamHandler::operator()( ::mdp3::MDInstrumentDefinitionFuture54 &d) { me.definition_snapshot(d); } -void RecoveryFeedHandler::InstrumentStreamHandler::operator()( +void FeedHandler_Recovery::InstrumentStreamHandler::operator()( ::mdp3::MDInstrumentDefinitionOption55 &d) { me.definition_snapshot(d); } -void RecoveryFeedHandler::InstrumentStreamHandler::operator()( +void FeedHandler_Recovery::InstrumentStreamHandler::operator()( ::mdp3::MDInstrumentDefinitionSpread56 &d) { me.definition_snapshot(d); } // Snapshot feed ------------------------------------------- -void RecoveryFeedHandler::SnapshotStreamHandler::packet_begin( +void FeedHandler_Recovery::SnapshotStreamHandler::packet_begin( MDP3PacketView const &p) { me.book_snapshot.packet_begin(p); } -void RecoveryFeedHandler::SnapshotStreamHandler::packet_end( +void FeedHandler_Recovery::SnapshotStreamHandler::packet_end( MDP3PacketView const &mvp) { me.book_snapshot.packet_end(mvp); } -void RecoveryFeedHandler::SnapshotStreamHandler::operator()( +void FeedHandler_Recovery::SnapshotStreamHandler::operator()( ::mdp3::SnapshotFullRefresh52 &snap) { me.book_snapshot(snap); } -void RecoveryFeedHandler::SnapshotStreamHandler::operator()( +void FeedHandler_Recovery::SnapshotStreamHandler::operator()( ::mdp3::SnapshotFullRefreshOrderBook53 &snap) { me.book_snapshot(snap); } // Incremental feed ------------------------------------------- -void RecoveryFeedHandler::IncrementalStreamHandler::packet_begin( +void FeedHandler_Recovery::IncrementalStreamHandler::packet_begin( MDP3PacketView const &p) { me.incremental_queue.packet_begin(p); } -void RecoveryFeedHandler::IncrementalStreamHandler::packet_end( +void FeedHandler_Recovery::IncrementalStreamHandler::packet_end( MDP3PacketView const &mvp) { me.incremental_queue.packet_end(mvp); } -void RecoveryFeedHandler::IncrementalStreamHandler::operator()( +void FeedHandler_Recovery::IncrementalStreamHandler::operator()( ::mdp3::MDIncrementalRefreshBook46 &m) { me.incremental_queue(m); } -void RecoveryFeedHandler::IncrementalStreamHandler::operator()( +void FeedHandler_Recovery::IncrementalStreamHandler::operator()( ::mdp3::MDIncrementalRefreshDailyStatistics49 &m) { me.incremental_queue(m); } -void RecoveryFeedHandler::IncrementalStreamHandler::operator()( +void FeedHandler_Recovery::IncrementalStreamHandler::operator()( ::mdp3::MDIncrementalRefreshLimitsBanding50 &m) { me.incremental_queue(m); } -void RecoveryFeedHandler::IncrementalStreamHandler::operator()( +void FeedHandler_Recovery::IncrementalStreamHandler::operator()( ::mdp3::MDIncrementalRefreshOrderBook47 &m) { me.incremental_queue(m); } -void RecoveryFeedHandler::IncrementalStreamHandler::operator()( +void FeedHandler_Recovery::IncrementalStreamHandler::operator()( ::mdp3::MDIncrementalRefreshSessionStatistics51 &m) { me.incremental_queue(m); } -void RecoveryFeedHandler::IncrementalStreamHandler::operator()( +void FeedHandler_Recovery::IncrementalStreamHandler::operator()( ::mdp3::MDIncrementalRefreshTradeSummary48 &m) { me.incremental_queue(m); } -void RecoveryFeedHandler::IncrementalStreamHandler::operator()( +void FeedHandler_Recovery::IncrementalStreamHandler::operator()( ::mdp3::MDIncrementalRefreshVolume37 &m) { me.incremental_queue(m); } -void RecoveryFeedHandler::IncrementalStreamHandler::operator()( +void FeedHandler_Recovery::IncrementalStreamHandler::operator()( ::mdp3::MDInstrumentDefinitionFuture54 &m) { me.incremental_queue(m); } -void RecoveryFeedHandler::IncrementalStreamHandler::operator()( +void FeedHandler_Recovery::IncrementalStreamHandler::operator()( ::mdp3::MDInstrumentDefinitionOption55 &m) { me.incremental_queue(m); } -void RecoveryFeedHandler::IncrementalStreamHandler::operator()( +void FeedHandler_Recovery::IncrementalStreamHandler::operator()( ::mdp3::MDInstrumentDefinitionSpread56 &m) { me.incremental_queue(m); } -void RecoveryFeedHandler::IncrementalStreamHandler::operator()( +void FeedHandler_Recovery::IncrementalStreamHandler::operator()( ::mdp3::QuoteRequest39 &m) { me.incremental_queue(m); } -void RecoveryFeedHandler::IncrementalStreamHandler::operator()( +void FeedHandler_Recovery::IncrementalStreamHandler::operator()( ::mdp3::SecurityStatus30 &m) { me.incremental_queue(m); } -void RecoveryFeedHandler::IncrementalStreamHandler::operator()( +void FeedHandler_Recovery::IncrementalStreamHandler::operator()( ::mdp3::ChannelReset4 &m) { me.incremental_queue(m); } -void RecoveryFeedHandler::update_book_in_snapshot( +void FeedHandler_Recovery::update_book_in_snapshot( SecuritySnapshot &snap, ::mdp3::SnapshotFullRefresh52 &r) { snap.set_high_limit_price( Price{r.highLimitPrice().mantissa(), r.highLimitPrice().exponent()}); @@ -422,7 +421,7 @@ void RecoveryFeedHandler::update_book_in_snapshot( }); } -void RecoveryFeedHandler::update_book_chunk_in_snapshot( +void FeedHandler_Recovery::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/detail/RecoveryFeedHandler.h b/src/server/sparkd/cmds/spartan/feed_handler/detail/FeedHandler_Recovery.h similarity index 94% rename from src/server/sparkd/cmds/spartan/feed_handler/detail/RecoveryFeedHandler.h rename to src/server/sparkd/cmds/spartan/feed_handler/detail/FeedHandler_Recovery.h index 1660e2e26..907562840 100644 --- a/src/server/sparkd/cmds/spartan/feed_handler/detail/RecoveryFeedHandler.h +++ b/src/server/sparkd/cmds/spartan/feed_handler/detail/FeedHandler_Recovery.h @@ -37,7 +37,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 RecoveryFeedHandler { +class FeedHandler_Recovery { private: struct PImpl; std::unique_ptr me; @@ -47,8 +47,8 @@ class RecoveryFeedHandler { SecuritySnapshot &, ::mdp3::SnapshotFullRefreshOrderBook53 &); public: - RecoveryFeedHandler(); - ~RecoveryFeedHandler(); + FeedHandler_Recovery(); + ~FeedHandler_Recovery(); using MaybeSnapshot = std::optional>; void reset(); MaybeSnapshot try_build_snapshot_and_reset(); @@ -62,7 +62,7 @@ class RecoveryFeedHandler { void operator()(::mdp3::MDInstrumentDefinitionSpread56 &); private: - friend class RecoveryFeedHandler; + friend class FeedHandler_Recovery; InstrumentStreamHandler(PImpl &me) : me(me) {} PImpl &me; }; @@ -76,7 +76,7 @@ class RecoveryFeedHandler { void operator()(::mdp3::SnapshotFullRefreshOrderBook53 &); private: - friend class RecoveryFeedHandler; + friend class FeedHandler_Recovery; SnapshotStreamHandler(PImpl &me) : me(me) {} PImpl &me; }; @@ -104,7 +104,7 @@ class RecoveryFeedHandler { void operator()(::mdp3::ChannelReset4 &); private: - friend class RecoveryFeedHandler; + friend class FeedHandler_Recovery; IncrementalStreamHandler(PImpl &me) : me(me) {} PImpl &me; }; diff --git a/src/server/sparkd/cmds/spartan/feed_handler/detail/IRealTimeFeedObserver.h b/src/server/sparkd/cmds/spartan/feed_handler/detail/IRealTimeFeedObserver.h deleted file mode 100644 index f18a442c3..000000000 --- a/src/server/sparkd/cmds/spartan/feed_handler/detail/IRealTimeFeedObserver.h +++ /dev/null @@ -1,32 +0,0 @@ -#pragma once - -#include "domain/book/Book.h" - -namespace bts::spartan::mdp3 { -class FeedEvent; -struct TradeSummarySignal; -} - -namespace bts::spartan { - -class MDP3PacketView; -class SecuritySnapshot; - -class IRealTimeFeedObserver { - public: - virtual ~IRealTimeFeedObserver() {} - virtual void on_packet_begin(MDP3PacketView const &) = 0; - virtual void on_packet_end() = 0; - - virtual void on_event_begin(FeedEvent const &) = 0; - virtual void on_books( - SecuritySnapshot const &, - mdp3::Book const &, - mdp3::ImpliedBook const &) = 0; - virtual void on_trade_summary_signal( - SecuritySnapshot const &, mdp3::TradeSummarySignal const &) = 0; - virtual void on_event_end(FeedEvent const &) = 0; - - virtual void on_packet_loss() = 0; -}; -} // namespace bts::spartan diff --git a/src/server/sparkd/cmds/spartan/feed_handler/detail/IRecoveryFeedObserver.h b/src/server/sparkd/cmds/spartan/feed_handler/detail/IRecoveryFeedObserver.h deleted file mode 100644 index e8b32b14a..000000000 --- a/src/server/sparkd/cmds/spartan/feed_handler/detail/IRecoveryFeedObserver.h +++ /dev/null @@ -1,15 +0,0 @@ -#pragma once -#include - -namespace bts::spartan { -class SecuritySnapshot; -} - -namespace bts::spartan { - -class IRecoveryFeedObserver { - public: - using InitialSnapshot = std::vector; - virtual void on_recovery_complete(InitialSnapshot const &) = 0; -}; -} // namespace bts::spartan diff --git a/src/server/sparkd/cmds/spartan/feed_handler/feed_observers/FeedObserver.h b/src/server/sparkd/cmds/spartan/feed_handler/feed_observers/FeedObserver.h index 80983bda2..d569d233d 100644 --- a/src/server/sparkd/cmds/spartan/feed_handler/feed_observers/FeedObserver.h +++ b/src/server/sparkd/cmds/spartan/feed_handler/feed_observers/FeedObserver.h @@ -1,6 +1,6 @@ #pragma once -#include "feed_handler/common/InitialSnapshot.h" +#include "feed_handler/InitialSnapshot.h" #include "lib/utils/bts_assert.h" namespace bts::spartan{ 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 29ec54d86..665940978 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 @@ -7,9 +7,9 @@ #include "feed_handler/detail/AB_Arbitrageur.h" #include "feed_handler/detail/BookSnapshot.h" #include "feed_handler/detail/DefinitionSnapshot.h" +#include "feed_handler/detail/FeedHandler_Recovery.h" #include "feed_handler/detail/IncrementalQueue.h" #include "feed_handler/detail/MDP3Parser.h" -#include "feed_handler/detail/RecoveryFeedHandler.h" #include "feed_handler/feed_observers/FeedObserver.h" #include "feed_handler/utils/mdp3_utils.h" #include "lib/utils/TempFile.h" @@ -210,9 +210,9 @@ TEST_CASE("spartan_md", "[spartan_md] [spartan_slow]") { } SECTION("can_build_snapshot") { - RecoveryFeedHandler recovery; + FeedHandler_Recovery recovery; AB_Arbitrageur ab; - RecoveryFeedHandler::MaybeSnapshot maybe_snapshot; + FeedHandler_Recovery::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/gateway/Gateway.cpp b/src/server/sparkd/cmds/spartan/gateway/Gateway.cpp index 259b6fc6b..15b5c70b8 100644 --- a/src/server/sparkd/cmds/spartan/gateway/Gateway.cpp +++ b/src/server/sparkd/cmds/spartan/gateway/Gateway.cpp @@ -1,15 +1,15 @@ #include "Gateway.h" #include "common/DataPacket.h" -#include "domain/CancelReplace.h" #include "common/SpartanError.h" +#include "domain/CancelReplace.h" #include "domain/OrderHandle.h" #include "gateway/GatewayCfg.h" -#include "gateway/detail/common/IL3MsgFramer.h" -#include "gateway/detail/common/IL3OutgoingQueue.h" -#include "gateway/detail/handlers/GatewayInitHandler.h" -#include "gateway/detail/handlers/GatewayRealTimeHandler.h" -#include "gateway/detail/parsing/IL3Parser.h" +#include "gateway/detail/IL3MsgFramer.h" +#include "gateway/detail/IL3OutgoingQueue.h" +#include "gateway/detail/Gateway_RealTime.h" +#include "gateway/detail/Gateway_Init.h" +#include "gateway/detail/IL3Parser.h" #include "lib/utils/bts_assert.h" #include @@ -32,8 +32,8 @@ enum class Gateway::State { struct Gateway::PImpl { State state; IL3IncomingMsgFramer incoming_msg_framer; - GatewayRealTimeHandler real_time_handler; - GatewayInitHandler init_handler; + Gateway_RealTime realtime_handler; + Gateway_Init init_handler; const GatewayCfg cfg; }; @@ -66,10 +66,10 @@ void Gateway::init_success(GatewayInitRec const &rec) { bts_assert(me->state == State::INITIALIZING); transition(State::READY); - me->real_time_handler.init(me->cfg, rec); - me->real_time_handler.on_error.bind<&Gateway::handle_error>(*this); - me->real_time_handler.on_order_update = on_order_update; - me->real_time_handler.on_outgoing_bytes = on_outgoing_bytes; + me->realtime_handler.init(me->cfg, rec); + me->realtime_handler.on_error.bind<&Gateway::handle_error>(*this); + me->realtime_handler.on_order_update = on_order_update; + me->realtime_handler.on_outgoing_bytes = on_outgoing_bytes; on_ready(); } @@ -79,7 +79,7 @@ void Gateway::process_incoming_data(DataPacket const &dp) { dp.payload, [this, ts = dp.arrival_time](std::string_view msg) { switch (me->state) { case State::READY: - me->real_time_handler.process_framed_msg(ts,msg); + me->realtime_handler.process_framed_msg(ts, msg); break; case State::INITIALIZING: me->init_handler.process_framed_msg(msg); @@ -96,7 +96,7 @@ void Gateway::process_incoming_data(DataPacket const &dp) { OrderHandle Gateway::queue_new_order(NewOrder const &no) { switch (me->state) { case State::READY: - return me->real_time_handler.queue_new_order(no); + return me->realtime_handler.queue_new_order(no); case State::SETUP: case State::INITIALIZING: bts_assert(false); @@ -111,7 +111,7 @@ OrderHandle Gateway::queue_new_order(NewOrder const &no) { void Gateway::queue_cancel_replace(OrderHandle h, CancelReplace cr) { switch (me->state) { case State::READY: - return me->real_time_handler.queue_cancel_replace(h, cr); + return me->realtime_handler.queue_cancel_replace(h, cr); case State::SETUP: case State::INITIALIZING: bts_assert(false); @@ -124,7 +124,7 @@ void Gateway::queue_cancel_replace(OrderHandle h, CancelReplace cr) { void Gateway::queue_cancel(OrderHandle h) { switch (me->state) { case State::READY: - return me->real_time_handler.queue_cancel(h); + return me->realtime_handler.queue_cancel(h); case State::SETUP: case State::INITIALIZING: bts_assert(false); @@ -137,7 +137,7 @@ void Gateway::queue_cancel(OrderHandle h) { void Gateway::send_queued() { switch (me->state) { case State::READY: - return me->real_time_handler.send_queued(); + return me->realtime_handler.send_queued(); case State::SETUP: case State::INITIALIZING: bts_assert(false); diff --git a/src/server/sparkd/cmds/spartan/gateway/GatewayCfg.h b/src/server/sparkd/cmds/spartan/gateway/GatewayCfg.h index 5bb2aa4de..7bfdeae76 100644 --- a/src/server/sparkd/cmds/spartan/gateway/GatewayCfg.h +++ b/src/server/sparkd/cmds/spartan/gateway/GatewayCfg.h @@ -1,7 +1,7 @@ #pragma once #include -#include "gateway/detail/common/IL3UUID.h" +#include "gateway/detail/IL3UUID.h" namespace bts::spartan { diff --git a/src/server/sparkd/cmds/spartan/gateway/PartyDetailsSetter.cpp b/src/server/sparkd/cmds/spartan/gateway/PartyDetailsSetter.cpp index 2bcc33646..8370e4442 100644 --- a/src/server/sparkd/cmds/spartan/gateway/PartyDetailsSetter.cpp +++ b/src/server/sparkd/cmds/spartan/gateway/PartyDetailsSetter.cpp @@ -3,7 +3,7 @@ #include "common/TimeStamp.h" #include "common/SpartanError.h" #include "gateway/PartyDetailsCfg.h" -#include "gateway/detail/common/IL3OutgoingQueue.h" +#include "gateway/detail/IL3OutgoingQueue.h" #include "gateway/detail/gen/src/BusinessReject521.h" #include "gateway/detail/gen/src/Establish503.h" #include "gateway/detail/gen/src/EstablishmentAck504.h" @@ -14,7 +14,7 @@ #include "gateway/detail/gen/src/PartyDetailsDefinitionRequest518.h" #include "gateway/detail/gen/src/PartyDetailsDefinitionRequestAck519.h" #include "gateway/detail/gen/src/Terminate507.h" -#include "gateway/detail/parsing/IL3Parser.h" +#include "gateway/detail/IL3Parser.h" #include "lib/utils/SecureLogon.h" #include "lib/utils/bts_assert.h" diff --git a/src/server/sparkd/cmds/spartan/gateway/detail/handlers/GatewayInitRec.cpp b/src/server/sparkd/cmds/spartan/gateway/detail/GatewayInitRec.cpp similarity index 100% rename from src/server/sparkd/cmds/spartan/gateway/detail/handlers/GatewayInitRec.cpp rename to src/server/sparkd/cmds/spartan/gateway/detail/GatewayInitRec.cpp diff --git a/src/server/sparkd/cmds/spartan/gateway/detail/handlers/GatewayInitRec.h b/src/server/sparkd/cmds/spartan/gateway/detail/GatewayInitRec.h similarity index 83% rename from src/server/sparkd/cmds/spartan/gateway/detail/handlers/GatewayInitRec.h rename to src/server/sparkd/cmds/spartan/gateway/detail/GatewayInitRec.h index 78b52a242..7a0efbf9b 100644 --- a/src/server/sparkd/cmds/spartan/gateway/detail/handlers/GatewayInitRec.h +++ b/src/server/sparkd/cmds/spartan/gateway/detail/GatewayInitRec.h @@ -2,7 +2,7 @@ #include #include -#include "gateway/detail/parsing/IL3MsgBox.h" +#include "gateway/detail/IL3MsgBox.h" namespace bts::spartan { diff --git a/src/server/sparkd/cmds/spartan/gateway/detail/handlers/GatewayInitHandler.cpp b/src/server/sparkd/cmds/spartan/gateway/detail/Gateway_Init.cpp similarity index 81% rename from src/server/sparkd/cmds/spartan/gateway/detail/handlers/GatewayInitHandler.cpp rename to src/server/sparkd/cmds/spartan/gateway/detail/Gateway_Init.cpp index a2fe6286b..fdd09a559 100644 --- a/src/server/sparkd/cmds/spartan/gateway/detail/handlers/GatewayInitHandler.cpp +++ b/src/server/sparkd/cmds/spartan/gateway/detail/Gateway_Init.cpp @@ -1,8 +1,8 @@ -#include "GatewayInitHandler.h" +#include "Gateway_Init.h" #include "common/TimeStamp.h" #include "gateway/GatewayCfg.h" #include "common/SpartanError.h" -#include "gateway/detail/common/IL3OutgoingQueue.h" +#include "gateway/detail/IL3OutgoingQueue.h" #include "gateway/detail/gen/src/BusinessReject521.h" #include "gateway/detail/gen/src/Establish503.h" #include "gateway/detail/gen/src/EstablishmentAck504.h" @@ -31,8 +31,8 @@ #include "gateway/detail/gen/src/RetransmitRequest508.h" #include "gateway/detail/gen/src/Sequence506.h" #include "gateway/detail/gen/src/Terminate507.h" -#include "gateway/detail/handlers/GatewayInitRec.h" -#include "gateway/detail/parsing/IL3Parser.h" +#include "gateway/detail/GatewayInitRec.h" +#include "gateway/detail/IL3Parser.h" #include "lib/logging/logging.h" #include "lib/utils/SecureLogon.h" #include "lib/utils/bts_assert.h" @@ -41,7 +41,7 @@ namespace bts::spartan { -enum class GatewayInitHandler::State { +enum class Gateway_Init::State { // Sent a negotiate message, awaiting reply NEGOTIATING, // Sent an estabilsh message, awaiting reply @@ -52,14 +52,14 @@ enum class GatewayInitHandler::State { DONE }; -struct GatewayInitHandler::RetransmitReq { +struct Gateway_Init::RetransmitReq { static constexpr uint32_t MAX_RECOVERY = 2500; uint64_t uuid; uint32_t from; uint32_t to; }; -struct GatewayInitHandler::PImpl { +struct Gateway_Init::PImpl { GatewayCfg const cfg; State state; IL3OutgoingQueue out_queue = {}; @@ -68,15 +68,15 @@ struct GatewayInitHandler::PImpl { TimeStamp arrival_time = {}; }; -GatewayInitHandler::GatewayInitHandler() : me() {} -GatewayInitHandler::~GatewayInitHandler() {} +Gateway_Init::Gateway_Init() : me() {} +Gateway_Init::~Gateway_Init() {} -void GatewayInitHandler::init(GatewayCfg const &cfg) { +void Gateway_Init::init(GatewayCfg const &cfg) { bts_assert(!me); me.reset(new PImpl{cfg, State::DONE}); } -void GatewayInitHandler::run() { +void Gateway_Init::run() { LOG(Spartan, Warn, "Starting gateway {}", me->cfg.segment); if (me->cfg.is_new_session()) { me->state = State::NEGOTIATING; @@ -89,7 +89,7 @@ void GatewayInitHandler::run() { } } -void GatewayInitHandler::process_framed_msg(std::string_view msg_bytes) { +void Gateway_Init::process_framed_msg(std::string_view msg_bytes) { bts_assert(me->state != State::DONE); if (!IL3Parser::parse(msg_bytes, *this)) handle_error( @@ -98,7 +98,7 @@ void GatewayInitHandler::process_framed_msg(std::string_view msg_bytes) { } // Negotiate ------------------------------------------------------------ -void GatewayInitHandler::send_negotiate() { +void Gateway_Init::send_negotiate() { bts_assert(me->state == State::NEGOTIATING); LOG(Spartan, Warn, "Negotiating UUID {} on gateway {}", me->cfg.uuid, @@ -121,7 +121,7 @@ void GatewayInitHandler::send_negotiate() { // Expect -> NegotiationResponse501 or NegotiationReject502 } -void GatewayInitHandler::operator()(::il3::NegotiationResponse501) { +void Gateway_Init::operator()(::il3::NegotiationResponse501) { bts_assert(me->state == State::NEGOTIATING); LOG(Spartan, Warn, "Successfull negotiation on UUID {} on gateway {}", me->cfg.uuid, me->cfg.segment); @@ -130,7 +130,7 @@ void GatewayInitHandler::operator()(::il3::NegotiationResponse501) { } // Establish ------------------------------------------------------------ -void GatewayInitHandler::send_establish() { +void Gateway_Init::send_establish() { bts_assert(me->state == State::ESTABLISHING); LOG(Spartan, Warn, "Establishing UUID {} on gateway {}. From: {} To: {}", @@ -162,7 +162,7 @@ void GatewayInitHandler::send_establish() { // expect -> EstablishmentAck504 or EstablishmentReject505 } -void GatewayInitHandler::operator()(::il3::EstablishmentAck504 msg) { +void Gateway_Init::operator()(::il3::EstablishmentAck504 msg) { bts_assert(me->state == State::ESTABLISHING); LOG(Spartan, Warn, "Successfull establishment on UUID {} on gateway {}", me->cfg.uuid, me->cfg.segment); @@ -215,11 +215,11 @@ void GatewayInitHandler::operator()(::il3::EstablishmentAck504 msg) { // Retransmission management // --------------------------------------------------------- -void GatewayInitHandler::operator()(::il3::Retransmission509) { +void Gateway_Init::operator()(::il3::Retransmission509) { bts_assert(me->state == State::RETRANSMITTING); } -void GatewayInitHandler::enqueue_retransmit( +void Gateway_Init::enqueue_retransmit( uint32_t from, uint32_t to, uint64_t uuid) { LOG(Spartan, Warn, "Prepare retransmit from: {} to: {}", from, to); bts_assert(to >= from); @@ -231,7 +231,7 @@ void GatewayInitHandler::enqueue_retransmit( } while (from < to); } -void GatewayInitHandler::begin_retransmit() { +void Gateway_Init::begin_retransmit() { bts_assert(me->state == State::RETRANSMITTING); bts_assert(has_pending_retransmit()); @@ -247,7 +247,7 @@ void GatewayInitHandler::begin_retransmit() { send_retransmit_request(working.uuid, working.from, count); } -void GatewayInitHandler::send_retransmit_request( +void Gateway_Init::send_retransmit_request( uint64_t uuid, uint32_t from, size_t count) { bts_assert(me->state == State::RETRANSMITTING); @@ -261,45 +261,45 @@ void GatewayInitHandler::send_retransmit_request( on_outgoing_bytes(me->out_queue.pop_all()); } -bool GatewayInitHandler::has_pending_retransmit() const { +bool Gateway_Init::has_pending_retransmit() const { return me->pending_retransmit.size(); } using namespace ::il3; -void GatewayInitHandler::operator()(BusinessReject521 m) { on_msg({m}); } -void GatewayInitHandler::operator()(ExecutionReportNew522 m) { on_msg({m}); } -void GatewayInitHandler::operator()(ExecutionReportReject523 m) { on_msg({m}); } -void GatewayInitHandler::operator()(ExecutionReportElimination524 m) { +void Gateway_Init::operator()(BusinessReject521 m) { on_msg({m}); } +void Gateway_Init::operator()(ExecutionReportNew522 m) { on_msg({m}); } +void Gateway_Init::operator()(ExecutionReportReject523 m) { on_msg({m}); } +void Gateway_Init::operator()(ExecutionReportElimination524 m) { on_msg({m}); } -void GatewayInitHandler::operator()(ExecutionReportTradeOutright525 m) { +void Gateway_Init::operator()(ExecutionReportTradeOutright525 m) { on_msg({m}); } -void GatewayInitHandler::operator()(ExecutionReportTradeSpread526 m) { +void Gateway_Init::operator()(ExecutionReportTradeSpread526 m) { on_msg({m}); } -void GatewayInitHandler::operator()(ExecutionReportTradeSpreadLeg527 m) { +void Gateway_Init::operator()(ExecutionReportTradeSpreadLeg527 m) { on_msg({m}); } -void GatewayInitHandler::operator()(ExecutionReportModify531 m) { on_msg({m}); } -void GatewayInitHandler::operator()(ExecutionReportStatus532 m) { on_msg({m}); } -void GatewayInitHandler::operator()(ExecutionReportCancel534 m) { on_msg({m}); } -void GatewayInitHandler::operator()(OrderCancelReject535 m) { on_msg({m}); } -void GatewayInitHandler::operator()(OrderCancelReplaceReject536 m) { +void Gateway_Init::operator()(ExecutionReportModify531 m) { on_msg({m}); } +void Gateway_Init::operator()(ExecutionReportStatus532 m) { on_msg({m}); } +void Gateway_Init::operator()(ExecutionReportCancel534 m) { on_msg({m}); } +void Gateway_Init::operator()(OrderCancelReject535 m) { on_msg({m}); } +void Gateway_Init::operator()(OrderCancelReplaceReject536 m) { on_msg({m}); } -void GatewayInitHandler::operator()(ExecutionReportTradeAddendumOutright548 m) { +void Gateway_Init::operator()(ExecutionReportTradeAddendumOutright548 m) { on_msg({m}); } -void GatewayInitHandler::operator()(ExecutionReportTradeAddendumSpread549 m) { +void Gateway_Init::operator()(ExecutionReportTradeAddendumSpread549 m) { on_msg({m}); } -void GatewayInitHandler::operator()( +void Gateway_Init::operator()( ExecutionReportTradeAddendumSpreadLeg550 m) { on_msg({m}); } -void GatewayInitHandler::on_msg(IL3MsgBox const &msg) { +void Gateway_Init::on_msg(IL3MsgBox const &msg) { LOG(Spartan, Info, "Received business message on segment {}, UUID: {} seq_num: {}" " Retransmit: {}", @@ -335,7 +335,7 @@ void GatewayInitHandler::on_msg(IL3MsgBox const &msg) { } } -void GatewayInitHandler::on_replay_complete() { +void Gateway_Init::on_replay_complete() { bts_assert( me->state == State::ESTABLISHING || me->state == State::RETRANSMITTING); transition(State::DONE); @@ -345,7 +345,7 @@ void GatewayInitHandler::on_replay_complete() { on_init_success(me->init_rec); } -void GatewayInitHandler::send_sequence() { +void Gateway_Init::send_sequence() { bts_assert( me->state == State::ESTABLISHING || me->state == State::RETRANSMITTING); auto msg = me->out_queue.push<::il3::Sequence506>(); @@ -356,39 +356,39 @@ void GatewayInitHandler::send_sequence() { on_outgoing_bytes(me->out_queue.pop_all()); } -void GatewayInitHandler::operator()(::il3::Sequence506 msg) { +void Gateway_Init::operator()(::il3::Sequence506 msg) { me->init_rec.from_cme = msg.nextSeqNo() - 1; send_sequence(); } -uint32_t GatewayInitHandler::inc_sec_num() { return me->init_rec.to_cme++; } +uint32_t Gateway_Init::inc_sec_num() { return me->init_rec.to_cme++; } // Error Handling ----------------------------------------------------------- -void GatewayInitHandler::operator()(::il3::Terminate507 msg) { +void Gateway_Init::operator()(::il3::Terminate507 msg) { auto error = SpartanError::il3_unexpected_terminate( std::string{msg.reason()}, msg.errorCodes()); handle_error(error); } -void GatewayInitHandler::operator()(::il3::NegotiationReject502 msg) { +void Gateway_Init::operator()(::il3::NegotiationReject502 msg) { bts_assert(me->state == State::NEGOTIATING); LOG(Spartan, Warn, "Negotiation rejection for UUID {} on gateway {}", me->cfg.uuid, me->cfg.segment); handle_error(SpartanError::il3_negotiation_reject(msg.errorCodes())); } -void GatewayInitHandler::operator()(::il3::EstablishmentReject505 msg) { +void Gateway_Init::operator()(::il3::EstablishmentReject505 msg) { bts_assert(me->state == State::ESTABLISHING); handle_error(SpartanError::il3_establish_reject(msg.errorCodes())); } -void GatewayInitHandler::operator()(::il3::RetransmitReject510 msg) { +void Gateway_Init::operator()(::il3::RetransmitReject510 msg) { bts_assert(me->state == State::RETRANSMITTING); handle_error( SpartanError{SpartanError::GW_RETRANSMIT_FAILURE, msg.getReasonAsString()}); } -void GatewayInitHandler::handle_error(SpartanError const &e) { +void Gateway_Init::handle_error(SpartanError const &e) { LOG(Spartan, Error, "Error connecting to gateway {}: {}", me->cfg.segment, e); transition(State::DONE); @@ -396,7 +396,7 @@ void GatewayInitHandler::handle_error(SpartanError const &e) { } // State Transition ----------------------------------------------------------- -const char *GatewayInitHandler::state_name(State state) { +const char *Gateway_Init::state_name(State state) { switch (state) { case State::DONE: return "DONE"; @@ -411,7 +411,7 @@ const char *GatewayInitHandler::state_name(State state) { return nullptr; } -void GatewayInitHandler::transition(State new_state) { +void Gateway_Init::transition(State new_state) { LOG(Spartan, Warn, "Transitioning gateway {} from {} to {}", me->cfg.segment, log::CharPtrWrapper{state_name(me->state)}, log::CharPtrWrapper{state_name(new_state)}); diff --git a/src/server/sparkd/cmds/spartan/gateway/detail/handlers/GatewayInitHandler.h b/src/server/sparkd/cmds/spartan/gateway/detail/Gateway_Init.h similarity index 96% rename from src/server/sparkd/cmds/spartan/gateway/detail/handlers/GatewayInitHandler.h rename to src/server/sparkd/cmds/spartan/gateway/detail/Gateway_Init.h index 37a0ce0ef..f78ddae7e 100644 --- a/src/server/sparkd/cmds/spartan/gateway/detail/handlers/GatewayInitHandler.h +++ b/src/server/sparkd/cmds/spartan/gateway/detail/Gateway_Init.h @@ -1,7 +1,7 @@ #pragma once #include "gateway/detail/gen/il3_fwd.h" -#include "gateway/detail/parsing/IL3MsgBox.h" +#include "gateway/detail/IL3MsgBox.h" #include "system/Delegate.h" #include #include @@ -21,10 +21,10 @@ class TimeStamp; // is after the init() methods is called the class will either invoke // on_init_success() or on_init_failure() and then transition to a // terminal state. -class GatewayInitHandler { +class Gateway_Init { public: - GatewayInitHandler(); - ~GatewayInitHandler(); + Gateway_Init(); + ~Gateway_Init(); // Initialization, call these only once void init(GatewayCfg const &cfg); diff --git a/src/server/sparkd/cmds/spartan/gateway/detail/handlers/GatewayRealTimeHandler.cpp b/src/server/sparkd/cmds/spartan/gateway/detail/Gateway_RealTime.cpp similarity index 86% rename from src/server/sparkd/cmds/spartan/gateway/detail/handlers/GatewayRealTimeHandler.cpp rename to src/server/sparkd/cmds/spartan/gateway/detail/Gateway_RealTime.cpp index 878cf94a8..680085ea8 100644 --- a/src/server/sparkd/cmds/spartan/gateway/detail/handlers/GatewayRealTimeHandler.cpp +++ b/src/server/sparkd/cmds/spartan/gateway/detail/Gateway_RealTime.cpp @@ -1,11 +1,11 @@ -#include "GatewayRealTimeHandler.h" +#include "Gateway_RealTime.h" #include "common/SpartanError.h" #include "domain/CancelReplace.h" #include "domain/NewOrder.h" #include "domain/OrderUpdate.h" #include "domain/order/OrderKey.h" #include "gateway/GatewayCfg.h" -#include "gateway/detail/common/IL3OutgoingQueue.h" +#include "gateway/detail/IL3OutgoingQueue.h" #include "gateway/detail/gen/src/BusinessReject521.h" #include "gateway/detail/gen/src/ExecutionReportCancel534.h" #include "gateway/detail/gen/src/ExecutionReportElimination524.h" @@ -26,8 +26,8 @@ #include "gateway/detail/gen/src/OrderCancelRequest516.h" #include "gateway/detail/gen/src/Sequence506.h" #include "gateway/detail/gen/src/Terminate507.h" -#include "gateway/detail/handlers/GatewayInitRec.h" -#include "gateway/detail/parsing/IL3Parser.h" +#include "gateway/detail/GatewayInitRec.h" +#include "gateway/detail/IL3Parser.h" #include "lib/jetfix/codec/i32_toa.h" #include "lib/logging/logging.h" @@ -35,7 +35,7 @@ namespace bts::spartan { -struct GatewayRealTimeHandler::WorkingOrder { +struct Gateway_RealTime::WorkingOrder { OrderKey clorid = {}; OrderKey ok = {}; SecurityID security_id = {}; @@ -50,7 +50,7 @@ struct GatewayRealTimeHandler::WorkingOrder { }; }; -struct GatewayRealTimeHandler::PImpl { +struct Gateway_RealTime::PImpl { uint64_t party_reg_id; uint32_t next_sn; // Small String optimization should kick in to avoid indirection in @@ -63,7 +63,7 @@ struct GatewayRealTimeHandler::PImpl { GatewayCfg const cfg; }; -inline size_t GatewayRealTimeHandler::alloc_working_order() { +inline size_t Gateway_RealTime::alloc_working_order() { size_t n = 0; for (auto &w : me->working_orders) if (w.is_empty()) @@ -74,7 +74,7 @@ inline size_t GatewayRealTimeHandler::alloc_working_order() { return n; } -inline size_t GatewayRealTimeHandler::get_working_order( +inline size_t Gateway_RealTime::get_working_order( std::string_view clorid_str) const { uint64_t clorid_v = 0; for (auto c : clorid_str) @@ -87,7 +87,7 @@ inline size_t GatewayRealTimeHandler::get_working_order( return 0; } -inline size_t GatewayRealTimeHandler::get_working_order( +inline size_t Gateway_RealTime::get_working_order( OrderKey exchange_k) const { for (size_t i = 0; i < me->working_orders.size(); i++) if (me->working_orders[i].ok == exchange_k) @@ -96,10 +96,10 @@ inline size_t GatewayRealTimeHandler::get_working_order( return 0; } -GatewayRealTimeHandler::GatewayRealTimeHandler() {} -GatewayRealTimeHandler::~GatewayRealTimeHandler() {} +Gateway_RealTime::Gateway_RealTime() {} +Gateway_RealTime::~Gateway_RealTime() {} -void GatewayRealTimeHandler::init( +void Gateway_RealTime::init( GatewayCfg const &cfg, GatewayInitRec const &init_rec) { bts_assert(!me); me.reset(new PImpl{ @@ -113,7 +113,7 @@ void GatewayRealTimeHandler::init( cfg}); } -OrderHandle GatewayRealTimeHandler::queue_new_order(NewOrder const &o) { +OrderHandle Gateway_RealTime::queue_new_order(NewOrder const &o) { auto now = TimeStamp::now().value(); auto m = me->out_queue.push<::il3::NewOrderSingle514>(); @@ -167,7 +167,7 @@ OrderHandle GatewayRealTimeHandler::queue_new_order(NewOrder const &o) { return OrderHandle{w_idx}; } -void GatewayRealTimeHandler::queue_cancel_replace( +void Gateway_RealTime::queue_cancel_replace( OrderHandle h, CancelReplace cr) { bts_assert_d(h.value() < me->working_orders.size()); auto &w = me->working_orders[h.value()]; @@ -221,7 +221,7 @@ void GatewayRealTimeHandler::queue_cancel_replace( m.shortSaleType(::il3::ShortSaleType::NULL_VALUE); } -void GatewayRealTimeHandler::queue_cancel(OrderHandle h) { +void Gateway_RealTime::queue_cancel(OrderHandle h) { bts_assert_d(h.value() < me->working_orders.size()); auto &w = me->working_orders[h.value()]; bts_assert_d(w.ok.value()); @@ -247,11 +247,11 @@ void GatewayRealTimeHandler::queue_cancel(OrderHandle h) { w = {}; } -void GatewayRealTimeHandler::send_queued() { +void Gateway_RealTime::send_queued() { on_outgoing_bytes(me->out_queue.pop_all()); } -void GatewayRealTimeHandler::process_framed_msg( +void Gateway_RealTime::process_framed_msg( TimeStamp arrival_t, std::string_view msg_bytes) { me->arrival_time = arrival_t; if (!IL3Parser::parse(msg_bytes, *this)) @@ -259,7 +259,7 @@ void GatewayRealTimeHandler::process_framed_msg( {SpartanError::GW_UNKNOWN_MESSAGE, "Could not parse real time message"}); } -void GatewayRealTimeHandler::operator()(::il3::Sequence506) { +void Gateway_RealTime::operator()(::il3::Sequence506) { auto msg = me->out_queue.push<::il3::Sequence506>(); msg.uUID(me->cfg.uuid.value()); msg.nextSeqNo(me->next_sn); @@ -268,7 +268,7 @@ void GatewayRealTimeHandler::operator()(::il3::Sequence506) { send_queued(); } -void GatewayRealTimeHandler::operator()(::il3::BusinessReject521 rej) { +void Gateway_RealTime::operator()(::il3::BusinessReject521 rej) { auto error = SpartanError::il3_bussiness_reject(rej.businessRejectReason()); LOG(Spartan, Error, "Business reject in real time handler on segment: {} Error: {}", @@ -276,7 +276,7 @@ void GatewayRealTimeHandler::operator()(::il3::BusinessReject521 rej) { handle_error(error); } -void GatewayRealTimeHandler::operator()(::il3::ExecutionReportNew522 m) { +void Gateway_RealTime::operator()(::il3::ExecutionReportNew522 m) { auto ok = OrderKey{m.orderID()}; auto clorid = m.getClOrdIDAsStringView(); auto oidx = get_working_order(clorid); @@ -288,7 +288,7 @@ void GatewayRealTimeHandler::operator()(::il3::ExecutionReportNew522 m) { o.total_fills, me->arrival_time, m.seqNum()}); } -void GatewayRealTimeHandler::operator()(::il3::ExecutionReportReject523 m) { +void Gateway_RealTime::operator()(::il3::ExecutionReportReject523 m) { auto clorid = m.getClOrdIDAsStringView(); auto oidx = get_working_order(clorid); auto &o = me->working_orders[oidx]; @@ -298,7 +298,7 @@ void GatewayRealTimeHandler::operator()(::il3::ExecutionReportReject523 m) { handle_error(error); } -void GatewayRealTimeHandler::operator()( +void Gateway_RealTime::operator()( ::il3::ExecutionReportElimination524 m) { auto ok = OrderKey{m.orderID()}; auto oidx = get_working_order(ok); @@ -310,7 +310,7 @@ void GatewayRealTimeHandler::operator()( } template -void GatewayRealTimeHandler::process_trade_common(M m) { +void Gateway_RealTime::process_trade_common(M m) { auto ok = OrderKey{m.orderID()}; auto oidx = get_working_order(ok); auto &o = me->working_orders[oidx]; @@ -342,20 +342,20 @@ void GatewayRealTimeHandler::process_trade_common(M m) { me->arrival_time, m.seqNum()}); } -void GatewayRealTimeHandler::operator()( +void Gateway_RealTime::operator()( ::il3::ExecutionReportTradeOutright525 m) { process_trade_common(m); } -void GatewayRealTimeHandler::operator()( +void Gateway_RealTime::operator()( ::il3::ExecutionReportTradeSpread526 m) { process_trade_common(m); } // Modifies are supposed to work, so nothing to do if they do. -void GatewayRealTimeHandler::operator()(::il3::ExecutionReportModify531) {} +void Gateway_RealTime::operator()(::il3::ExecutionReportModify531) {} // A cancel that works will result in the order being canceled -void GatewayRealTimeHandler::operator()(::il3::ExecutionReportCancel534 m) { +void Gateway_RealTime::operator()(::il3::ExecutionReportCancel534 m) { auto ok = OrderKey{m.orderID()}; auto oidx = get_working_order(ok); auto &o = me->working_orders[oidx]; @@ -369,15 +369,15 @@ void GatewayRealTimeHandler::operator()(::il3::ExecutionReportCancel534 m) { } // Ignore these -void GatewayRealTimeHandler::operator()( +void Gateway_RealTime::operator()( ::il3::ExecutionReportTradeSpreadLeg527) {} -void GatewayRealTimeHandler::operator()(::il3::Terminate507 m) { +void Gateway_RealTime::operator()(::il3::Terminate507 m) { auto error = SpartanError::il3_unexpected_terminate(m.reason(), m.errorCodes()); handle_error(error); } -void GatewayRealTimeHandler::operator()(::il3::OrderCancelReject535 m) { +void Gateway_RealTime::operator()(::il3::OrderCancelReject535 m) { auto error = SpartanError::il3_cancel_reject(m.getTextAsString(), m.cxlRejReason()); if (error.error_code() != SpartanError::GW_ATTEMPT_TO_CANCEL_UNKNOWN_ORDER) @@ -389,7 +389,7 @@ void GatewayRealTimeHandler::operator()(::il3::OrderCancelReject535 m) { } } -void GatewayRealTimeHandler::operator()(::il3::OrderCancelReplaceReject536 m) { +void Gateway_RealTime::operator()(::il3::OrderCancelReplaceReject536 m) { auto error = SpartanError::il3_cancel_replace_reject( m.getTextAsString(), m.cxlRejReason()); if (error.error_code() != @@ -402,23 +402,23 @@ void GatewayRealTimeHandler::operator()(::il3::OrderCancelReplaceReject536 m) { } } -void GatewayRealTimeHandler::operator()( +void Gateway_RealTime::operator()( ::il3::ExecutionReportTradeAddendumOutright548) { auto error = SpartanError{SpartanError::GW_TRADE_CORRECTION}; handle_error(error); } -void GatewayRealTimeHandler::operator()( +void Gateway_RealTime::operator()( ::il3::ExecutionReportTradeAddendumSpread549) { auto error = SpartanError{SpartanError::GW_TRADE_CORRECTION}; handle_error(error); } -void GatewayRealTimeHandler::operator()( +void Gateway_RealTime::operator()( ::il3::ExecutionReportTradeAddendumSpreadLeg550) { auto error = SpartanError{SpartanError::GW_TRADE_CORRECTION}; handle_error(error); } -void GatewayRealTimeHandler::handle_error(SpartanError const &e) { +void Gateway_RealTime::handle_error(SpartanError const &e) { on_error(e); } } // namespace bts::spartan diff --git a/src/server/sparkd/cmds/spartan/gateway/detail/handlers/GatewayRealTimeHandler.h b/src/server/sparkd/cmds/spartan/gateway/detail/Gateway_RealTime.h similarity index 96% rename from src/server/sparkd/cmds/spartan/gateway/detail/handlers/GatewayRealTimeHandler.h rename to src/server/sparkd/cmds/spartan/gateway/detail/Gateway_RealTime.h index b575032aa..b716284a2 100644 --- a/src/server/sparkd/cmds/spartan/gateway/detail/handlers/GatewayRealTimeHandler.h +++ b/src/server/sparkd/cmds/spartan/gateway/detail/Gateway_RealTime.h @@ -19,10 +19,10 @@ struct OrderUpdate; // Handles the happy path of an ilink3 connection: sending, canceling // and updating orders and processing execution reports -class GatewayRealTimeHandler { +class Gateway_RealTime { public: - GatewayRealTimeHandler(); - ~GatewayRealTimeHandler(); + Gateway_RealTime(); + ~Gateway_RealTime(); // Initialization, call these only once void init(GatewayCfg const &cfg, GatewayInitRec const &); diff --git a/src/server/sparkd/cmds/spartan/gateway/detail/store/IIL3SessionStore.h b/src/server/sparkd/cmds/spartan/gateway/detail/IIL3SessionStore.h similarity index 100% rename from src/server/sparkd/cmds/spartan/gateway/detail/store/IIL3SessionStore.h rename to src/server/sparkd/cmds/spartan/gateway/detail/IIL3SessionStore.h diff --git a/src/server/sparkd/cmds/spartan/gateway/detail/parsing/IL3FramingHeader.h b/src/server/sparkd/cmds/spartan/gateway/detail/IL3FramingHeader.h similarity index 100% rename from src/server/sparkd/cmds/spartan/gateway/detail/parsing/IL3FramingHeader.h rename to src/server/sparkd/cmds/spartan/gateway/detail/IL3FramingHeader.h diff --git a/src/server/sparkd/cmds/spartan/gateway/detail/parsing/IL3MsgBox.h b/src/server/sparkd/cmds/spartan/gateway/detail/IL3MsgBox.h similarity index 95% rename from src/server/sparkd/cmds/spartan/gateway/detail/parsing/IL3MsgBox.h rename to src/server/sparkd/cmds/spartan/gateway/detail/IL3MsgBox.h index 45d839f58..8215cad0f 100644 --- a/src/server/sparkd/cmds/spartan/gateway/detail/parsing/IL3MsgBox.h +++ b/src/server/sparkd/cmds/spartan/gateway/detail/IL3MsgBox.h @@ -1,6 +1,6 @@ #pragma once -#include "gateway/detail/parsing/IL3MsgHeader.h" +#include "gateway/detail/IL3MsgHeader.h" #include "gateway/detail/gen/src/BooleanFlag.h" namespace bts::spartan { diff --git a/src/server/sparkd/cmds/spartan/gateway/detail/common/IL3MsgFramer.cc b/src/server/sparkd/cmds/spartan/gateway/detail/IL3MsgFramer.cc similarity index 100% rename from src/server/sparkd/cmds/spartan/gateway/detail/common/IL3MsgFramer.cc rename to src/server/sparkd/cmds/spartan/gateway/detail/IL3MsgFramer.cc diff --git a/src/server/sparkd/cmds/spartan/gateway/detail/common/IL3MsgFramer.cpp b/src/server/sparkd/cmds/spartan/gateway/detail/IL3MsgFramer.cpp similarity index 100% rename from src/server/sparkd/cmds/spartan/gateway/detail/common/IL3MsgFramer.cpp rename to src/server/sparkd/cmds/spartan/gateway/detail/IL3MsgFramer.cpp diff --git a/src/server/sparkd/cmds/spartan/gateway/detail/common/IL3MsgFramer.h b/src/server/sparkd/cmds/spartan/gateway/detail/IL3MsgFramer.h similarity index 93% rename from src/server/sparkd/cmds/spartan/gateway/detail/common/IL3MsgFramer.h rename to src/server/sparkd/cmds/spartan/gateway/detail/IL3MsgFramer.h index cf5d3066e..a09d52f06 100644 --- a/src/server/sparkd/cmds/spartan/gateway/detail/common/IL3MsgFramer.h +++ b/src/server/sparkd/cmds/spartan/gateway/detail/IL3MsgFramer.h @@ -1,6 +1,6 @@ #pragma once -#include "gateway/detail/parsing/IL3MsgHeader.h" +#include "gateway/detail/IL3MsgHeader.h" #include // Simple class that takes an input byte stream and frames it into diff --git a/src/server/sparkd/cmds/spartan/gateway/detail/parsing/IL3MsgHeader.h b/src/server/sparkd/cmds/spartan/gateway/detail/IL3MsgHeader.h similarity index 100% rename from src/server/sparkd/cmds/spartan/gateway/detail/parsing/IL3MsgHeader.h rename to src/server/sparkd/cmds/spartan/gateway/detail/IL3MsgHeader.h diff --git a/src/server/sparkd/cmds/spartan/gateway/detail/common/IL3OutgoingQueue.cc b/src/server/sparkd/cmds/spartan/gateway/detail/IL3OutgoingQueue.cc similarity index 93% rename from src/server/sparkd/cmds/spartan/gateway/detail/common/IL3OutgoingQueue.cc rename to src/server/sparkd/cmds/spartan/gateway/detail/IL3OutgoingQueue.cc index 85023209f..6bf3fc17d 100644 --- a/src/server/sparkd/cmds/spartan/gateway/detail/common/IL3OutgoingQueue.cc +++ b/src/server/sparkd/cmds/spartan/gateway/detail/IL3OutgoingQueue.cc @@ -1,6 +1,6 @@ #include "IL3OutgoingQueue.h" #include "lib/utils/bts_assert.h" -#include "gateway/detail/parsing/IL3MsgHeader.h" +#include "gateway/detail/IL3MsgHeader.h" namespace bts::spartan { diff --git a/src/server/sparkd/cmds/spartan/gateway/detail/common/IL3OutgoingQueue.cpp b/src/server/sparkd/cmds/spartan/gateway/detail/IL3OutgoingQueue.cpp similarity index 100% rename from src/server/sparkd/cmds/spartan/gateway/detail/common/IL3OutgoingQueue.cpp rename to src/server/sparkd/cmds/spartan/gateway/detail/IL3OutgoingQueue.cpp diff --git a/src/server/sparkd/cmds/spartan/gateway/detail/common/IL3OutgoingQueue.h b/src/server/sparkd/cmds/spartan/gateway/detail/IL3OutgoingQueue.h similarity index 94% rename from src/server/sparkd/cmds/spartan/gateway/detail/common/IL3OutgoingQueue.h rename to src/server/sparkd/cmds/spartan/gateway/detail/IL3OutgoingQueue.h index 9c8e657cc..3f0dfaa3d 100644 --- a/src/server/sparkd/cmds/spartan/gateway/detail/common/IL3OutgoingQueue.h +++ b/src/server/sparkd/cmds/spartan/gateway/detail/IL3OutgoingQueue.h @@ -1,6 +1,6 @@ #pragma once -#include "gateway/detail/parsing/IL3MsgHeader.h" +#include "gateway/detail/IL3MsgHeader.h" #include #include diff --git a/src/server/sparkd/cmds/spartan/gateway/detail/parsing/IL3Parser.cc b/src/server/sparkd/cmds/spartan/gateway/detail/IL3Parser.cc similarity index 99% rename from src/server/sparkd/cmds/spartan/gateway/detail/parsing/IL3Parser.cc rename to src/server/sparkd/cmds/spartan/gateway/detail/IL3Parser.cc index 1b8b97d3d..9148508b1 100644 --- a/src/server/sparkd/cmds/spartan/gateway/detail/parsing/IL3Parser.cc +++ b/src/server/sparkd/cmds/spartan/gateway/detail/IL3Parser.cc @@ -35,7 +35,7 @@ #include "gateway/detail/gen/src/RetransmitRequest508.h" #include "gateway/detail/gen/src/Sequence506.h" #include "gateway/detail/gen/src/Terminate507.h" -#include "gateway/detail/parsing/IL3MsgHeader.h" +#include "gateway/detail/IL3MsgHeader.h" #include "system/sbe/SBEHeader.h" #include "system/sbe/SBEParser.h" diff --git a/src/server/sparkd/cmds/spartan/gateway/detail/parsing/IL3Parser.cpp b/src/server/sparkd/cmds/spartan/gateway/detail/IL3Parser.cpp similarity index 100% rename from src/server/sparkd/cmds/spartan/gateway/detail/parsing/IL3Parser.cpp rename to src/server/sparkd/cmds/spartan/gateway/detail/IL3Parser.cpp diff --git a/src/server/sparkd/cmds/spartan/gateway/detail/parsing/IL3Parser.h b/src/server/sparkd/cmds/spartan/gateway/detail/IL3Parser.h similarity index 100% rename from src/server/sparkd/cmds/spartan/gateway/detail/parsing/IL3Parser.h rename to src/server/sparkd/cmds/spartan/gateway/detail/IL3Parser.h diff --git a/src/server/sparkd/cmds/spartan/gateway/detail/store/IL3SessionFileStore.cpp b/src/server/sparkd/cmds/spartan/gateway/detail/IL3SessionFileStore.cpp similarity index 95% rename from src/server/sparkd/cmds/spartan/gateway/detail/store/IL3SessionFileStore.cpp rename to src/server/sparkd/cmds/spartan/gateway/detail/IL3SessionFileStore.cpp index 494f8c9d7..e08b36a51 100644 --- a/src/server/sparkd/cmds/spartan/gateway/detail/store/IL3SessionFileStore.cpp +++ b/src/server/sparkd/cmds/spartan/gateway/detail/IL3SessionFileStore.cpp @@ -2,8 +2,8 @@ #include "lib/utils/datetime.h" #include "lib/utils/file_utils.h" #include "lib/utils/type_name.h" -#include "server/sparkd/cmds/spartan/gateway/detail/common/IL3MsgFramer.h" -#include "server/sparkd/cmds/spartan/gateway/detail/parsing/IL3Parser.h" +#include "server/sparkd/cmds/spartan/gateway/detail/IL3MsgFramer.h" +#include "server/sparkd/cmds/spartan/gateway/detail/IL3Parser.h" #include #include #include diff --git a/src/server/sparkd/cmds/spartan/gateway/detail/store/IL3SessionFileStore.h b/src/server/sparkd/cmds/spartan/gateway/detail/IL3SessionFileStore.h similarity index 89% rename from src/server/sparkd/cmds/spartan/gateway/detail/store/IL3SessionFileStore.h rename to src/server/sparkd/cmds/spartan/gateway/detail/IL3SessionFileStore.h index 5d6352ae5..915115e34 100644 --- a/src/server/sparkd/cmds/spartan/gateway/detail/store/IL3SessionFileStore.h +++ b/src/server/sparkd/cmds/spartan/gateway/detail/IL3SessionFileStore.h @@ -1,7 +1,7 @@ #pragma once -#include "gateway/detail/store/IIL3SessionStore.h" -#include "gateway/detail/common/IL3UUID.h" +#include "gateway/detail/IIL3SessionStore.h" +#include "gateway/detail/IL3UUID.h" #include #include diff --git a/src/server/sparkd/cmds/spartan/gateway/detail/common/IL3UUID.h b/src/server/sparkd/cmds/spartan/gateway/detail/IL3UUID.h similarity index 100% rename from src/server/sparkd/cmds/spartan/gateway/detail/common/IL3UUID.h rename to src/server/sparkd/cmds/spartan/gateway/detail/IL3UUID.h diff --git a/src/server/sparkd/cmds/spartan/gateway/tests/order_execution_tests.cpp b/src/server/sparkd/cmds/spartan/gateway/tests/order_execution_tests.cpp index be16e95e1..edd8e51cc 100644 --- a/src/server/sparkd/cmds/spartan/gateway/tests/order_execution_tests.cpp +++ b/src/server/sparkd/cmds/spartan/gateway/tests/order_execution_tests.cpp @@ -2,16 +2,16 @@ // #include "common/EndPoint.h" // #include "common/SpartanError.h" -// #include "gateway/detail/common/IL3GatewayCfg.h" -// #include "gateway/detail/common/IL3MsgFramer.h" -// #include "gateway/detail/common/IL3MsgSender.h" -// #include "gateway/detail/common/PartyDetailsCfg.h" -// #include "gateway/detail/handlers/IIL3InitObserver.h" -// #include "gateway/detail/handlers/IL3InitHandler.h" -// #include "gateway/detail/handlers/IL3PartyDetailsHandler.h" -// #include "gateway/detail/handlers/IPartyDetailsObserver.h" -// #include "gateway/detail/parsing/IL3Parser.h" -// #include "gateway/detail/store/IL3SessionFileStore.h" +// #include "gateway/detail/IL3GatewayCfg.h" +// #include "gateway/detail/IL3MsgFramer.h" +// #include "gateway/detail/IL3MsgSender.h" +// #include "gateway/detail/PartyDetailsCfg.h" +// #include "gateway/detail/IIL3InitObserver.h" +// #include "gateway/detail/IL3InitHandler.h" +// #include "gateway/detail/IL3PartyDetailsHandler.h" +// #include "gateway/detail/IPartyDetailsObserver.h" +// #include "gateway/detail/IL3Parser.h" +// #include "gateway/detail/IL3SessionFileStore.h" // #include "system/Clock.h" // #include "system/reactor/IConnection.h" // #include "system/reactor/IConnectionObserver.h"