From 9bfd33320e2a74b19f0d3d00a4df722ff92fface Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Fri, 21 Aug 2020 10:33:48 -0400 Subject: [PATCH] More changes to instrument definition. C++ continues to mistify. --- src/server/sparkd/CMakeDeps.cmake | 2 +- .../md/mdp3/common/InstrumentDefinition.cpp | 44 ------------- .../md/mdp3/common/InstrumentDefinition.h | 63 ++++++++++++++----- 3 files changed, 49 insertions(+), 60 deletions(-) delete mode 100644 src/server/sparkd/cmds/spartan/md/mdp3/common/InstrumentDefinition.cpp diff --git a/src/server/sparkd/CMakeDeps.cmake b/src/server/sparkd/CMakeDeps.cmake index 8625b880a..4d12003cf 100644 --- a/src/server/sparkd/CMakeDeps.cmake +++ b/src/server/sparkd/CMakeDeps.cmake @@ -1 +1 @@ -set(sources algo/AlgoDefinitionServiceServer.cpp;cmds/AdminReport.cpp;cmds/AutoCert.cpp;cmds/Benchmark.cpp;cmds/CMECertCmd.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/FIXSim.cpp;cmds/Help.cpp;cmds/KeyCode.cpp;cmds/Md.cpp;cmds/ParseHistoricalFIX.cpp;cmds/PrintHedgeOrders.cpp;cmds/QuickTest.cpp;cmds/Run.cpp;cmds/Span.cpp;cmds/Spartan.cpp;cmds/Test.cpp;cmds/Web.cpp;cmds/spartan/algo/RunTAS.cpp;cmds/spartan/algo/TASOrderReactor.cpp;cmds/spartan/algo/TASTriggerDef.cpp;cmds/spartan/md/mdp3/back_testing/FifoPriceLevelMatcher.cpp;cmds/spartan/md/mdp3/back_testing/FifoSecurityMatcher.cpp;cmds/spartan/md/mdp3/common/InstrumentDefinition.cpp;cmds/spartan/md/mdp3/common/InstrumentSnapshot.cpp;cmds/spartan/md/mdp3/feed_control/IFeedController.cpp;cmds/spartan/md/mdp3/handler/ChannelHandler.cpp;cmds/spartan/md/mdp3/parsing/MDP3MsgBox.cpp;cmds/spartan/md/mdp3/realtime/RealTimeHandler.cpp;cmds/spartan/md/mdp3/recovery/BookSnapshot.cpp;cmds/spartan/md/mdp3/recovery/DefinitionSnapshot.cpp;cmds/spartan/md/mdp3/recovery/IncrementalQueue.cpp;cmds/spartan/md/mdp3/recovery/RecoveryHandler.cpp;cmds/spartan/md/mdp3/tests/spartan_md_tests.cpp;cmds/spartan/md/mdp3/utils/mdp3_utils.cpp;cmds/spartan/util/MCastReceiver.cpp;cmds/spartan/util/PCapReader.cpp;cmds/spartan/util/SecurityDB.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/tests/mdp3_tests.cpp;md/run_md.cpp;position/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/MarginServiceServer.cpp;position/PositionAggregator.cpp;position/PositionMap.cpp;position/PositionServicePNLHelper.cpp;position/PositionServiceServer.cpp;position/import/BasePositionServiceServer.cpp;position/import/DownloadCommonStateMachine.cpp;position/import/DownloadWindow.cpp;position/import/MoneyFileServiceServer.cpp;position/import/parsing/gmi_parser.cpp;position/import/parsing/money_parser.cpp;position/import/parsing/parser_common.cpp;position/tests/PositionTests.cpp;position/tests/position_tests_internal.cpp;subprocess/SubProcessRunner.cpp;support/ErrorReportService.cpp;support/ShellLatencyServer.cpp;user/AdminServiceDB.cpp;user/AdminServiceServer.cpp;user/AuthServiceServer.cpp;user/tests/admin_service_tests.cpp) \ No newline at end of file +set(sources algo/AlgoDefinitionServiceServer.cpp;cmds/AdminReport.cpp;cmds/AutoCert.cpp;cmds/Benchmark.cpp;cmds/CMECertCmd.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/FIXSim.cpp;cmds/Help.cpp;cmds/KeyCode.cpp;cmds/Md.cpp;cmds/ParseHistoricalFIX.cpp;cmds/PrintHedgeOrders.cpp;cmds/QuickTest.cpp;cmds/Run.cpp;cmds/Span.cpp;cmds/Spartan.cpp;cmds/Test.cpp;cmds/Web.cpp;cmds/spartan/algo/RunTAS.cpp;cmds/spartan/algo/TASOrderReactor.cpp;cmds/spartan/algo/TASTriggerDef.cpp;cmds/spartan/md/mdp3/back_testing/FifoPriceLevelMatcher.cpp;cmds/spartan/md/mdp3/back_testing/FifoSecurityMatcher.cpp;cmds/spartan/md/mdp3/common/InstrumentSnapshot.cpp;cmds/spartan/md/mdp3/feed_control/IFeedController.cpp;cmds/spartan/md/mdp3/handler/ChannelHandler.cpp;cmds/spartan/md/mdp3/parsing/MDP3MsgBox.cpp;cmds/spartan/md/mdp3/realtime/RealTimeHandler.cpp;cmds/spartan/md/mdp3/recovery/BookSnapshot.cpp;cmds/spartan/md/mdp3/recovery/DefinitionSnapshot.cpp;cmds/spartan/md/mdp3/recovery/IncrementalQueue.cpp;cmds/spartan/md/mdp3/recovery/RecoveryHandler.cpp;cmds/spartan/md/mdp3/tests/spartan_md_tests.cpp;cmds/spartan/md/mdp3/utils/mdp3_utils.cpp;cmds/spartan/util/MCastReceiver.cpp;cmds/spartan/util/PCapReader.cpp;cmds/spartan/util/SecurityDB.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/tests/mdp3_tests.cpp;md/run_md.cpp;position/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/MarginServiceServer.cpp;position/PositionAggregator.cpp;position/PositionMap.cpp;position/PositionServicePNLHelper.cpp;position/PositionServiceServer.cpp;position/import/BasePositionServiceServer.cpp;position/import/DownloadCommonStateMachine.cpp;position/import/DownloadWindow.cpp;position/import/MoneyFileServiceServer.cpp;position/import/parsing/gmi_parser.cpp;position/import/parsing/money_parser.cpp;position/import/parsing/parser_common.cpp;position/tests/PositionTests.cpp;position/tests/position_tests_internal.cpp;subprocess/SubProcessRunner.cpp;support/ErrorReportService.cpp;support/ShellLatencyServer.cpp;user/AdminServiceDB.cpp;user/AdminServiceServer.cpp;user/AuthServiceServer.cpp;user/tests/admin_service_tests.cpp) \ No newline at end of file diff --git a/src/server/sparkd/cmds/spartan/md/mdp3/common/InstrumentDefinition.cpp b/src/server/sparkd/cmds/spartan/md/mdp3/common/InstrumentDefinition.cpp deleted file mode 100644 index 10185f062..000000000 --- a/src/server/sparkd/cmds/spartan/md/mdp3/common/InstrumentDefinition.cpp +++ /dev/null @@ -1,44 +0,0 @@ -#include "InstrumentDefinition.h" - -namespace bts::spartan::mdp3 { - -MDP3TimeStamp InstrumentDefinition::last_update_time() const { - return std::visit( - [](auto &box) { return MDP3TimeStamp{box->lastUpdateTime()}; }, _def); -} - -size_t InstrumentDefinition::tot_num_reports() const { - return std::visit([](auto const &box) { return box->totNumReports(); }, - _def); -} - -MDP3SecurityID InstrumentDefinition::security_id() const { - return std::visit( - [](auto const &box) { return MDP3SecurityID{box->securityID()}; }, _def); -} - -const char *InstrumentDefinition::symbol() const { - return std::visit([](auto const &box) { return box->symbol(); }, _def); -} - -::mdp3::MatchEventIndicator -InstrumentDefinition::match_event_indicator() const { - return std::visit([](auto &box) { return box->matchEventIndicator(); }, - _def); -} - -const char *InstrumentDefinition::security_group() const { - return std::visit([](auto &box) { return box->securityGroup(); }, _def); -} - -const char *InstrumentDefinition::asset() const { - return std::visit([](auto &box) { return box->asset(); }, _def); -} - -::mdp3::SecurityTradingStatus::Value -InstrumentDefinition::trading_status() const { - return std::visit([](auto &box) { return box->mDSecurityTradingStatus(); }, - _def); -} - -} // namespace bts::spartan::mdp3 diff --git a/src/server/sparkd/cmds/spartan/md/mdp3/common/InstrumentDefinition.h b/src/server/sparkd/cmds/spartan/md/mdp3/common/InstrumentDefinition.h index 8940d1abc..a1fb5405a 100644 --- a/src/server/sparkd/cmds/spartan/md/mdp3/common/InstrumentDefinition.h +++ b/src/server/sparkd/cmds/spartan/md/mdp3/common/InstrumentDefinition.h @@ -8,9 +8,11 @@ namespace bts::spartan::mdp3 { -// A simple abstraction for a instrument definition, which can be a -// option, a spread or a future. To get the actual definition type use -// the visit() method. +// A simple abstraction for a instrument definition, which can be one of: +// ::mdp3::MDInstrumentDefinitionFuture54 +// ::mdp3::MDInstrumentDefinitionOption55 +// ::mdp3::MDInstrumentDefinitionSpread56 +// To get the actual definition type use the visit() method. class InstrumentDefinition { public: @@ -22,21 +24,52 @@ class InstrumentDefinition { template InstrumentDefinition(M const &d) : _def(MDP3MsgBox(d)) {} - // Common elements to every instrument definition - MDP3TimeStamp last_update_time() const; - size_t tot_num_reports() const; - MDP3SecurityID security_id() const; - const char *symbol() const; - ::mdp3::MatchEventIndicator match_event_indicator() const; - const char *security_group() const; - const char *asset() const; - ::mdp3::SecurityTradingStatus::Value trading_status() const; - // Visit specific type in this definition - template void visit(Visitor &v) const{ - std::visit([&v] (auto &m) {v(*m);}); + template void visit(Visitor v) const { + std::visit([&v](auto &m) { v(*m); }, _def); } + // Query the specific type contained in this definition and return + // something about it + template auto get(Getter g) const { + return std::visit([g](auto &m) { return g(*m); }, _def); + } + + // Helpers + MDP3TimeStamp last_update_time() const { + return MDP3TimeStamp{ + get([](auto const &m) { return m.lastUpdateTime(); })}; + } + size_t tot_num_reports() const { + return get([](auto const &m) { return m.totNumReports(); }); + } + MDP3SecurityID security_id() const { + return MDP3SecurityID{get([](auto const &m) { return m.securityID(); })}; + } + const char *symbol() const { + return get([](auto const &m) { return m.symbol(); }); + } + + ::mdp3::MatchEventIndicator match_event_indicator() const { + // matchEventIndicator() is not marked as const so we cannot use + // the get() method + return std::visit([](auto &box) { return box->matchEventIndicator(); }, + _def); + } + + const char *security_group() const { + return get([](auto const &m) { return m.securityGroup(); }); + } + + const char *asset() const { + return get([](auto const &m) { return m.asset(); }); + } + + ::mdp3::SecurityTradingStatus::Value trading_status() const { + return get([](auto const &m) { return m.mDSecurityTradingStatus(); }); + } + + private: using DefVar = std::variant,