From 3e817d4fb08206eaeb9ed3284a85aa6bc7c474bb Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Wed, 29 Apr 2020 13:16:16 -0400 Subject: [PATCH] Refactor --- src/lib/utils/stats.h | 50 ++++++ src/server/sparkd/CMakeDeps.cmake | 2 +- src/server/sparkd/cmds/Spartan.cpp | 94 ++++++---- src/server/sparkd/cmds/Spartan.h | 1 + .../algo/TASOrderReactor.cpp | 8 +- .../algo/TASOrderReactor.h | 10 +- .../algo/TASTriggerDef.cpp | 0 .../algo/TASTriggerDef.h | 0 .../analysis/ActionableEventAnalyzer.cpp | 1 + .../analysis/ActionableEventAnalyzer.h | 59 +++++++ src/server/sparkd/cmds/spartan/db | 0 .../mdp3_gen/AdminHeartbeat12.h | 0 .../mdp3_gen/AdminLogin15.h | 0 .../mdp3_gen/AdminLogout16.h | 0 .../mdp3_gen/AggressorSide.h | 0 .../mdp3_gen/ChannelReset4.h | 0 .../mdp3_gen/Decimal9.h | 0 .../mdp3_gen/Decimal9NULL.h | 0 .../mdp3_gen/DecimalQty.h | 0 .../mdp3_gen/EventType.h | 0 .../{spartan_tas => spartan}/mdp3_gen/FLOAT.h | 0 .../mdp3_gen/GroupSize.h | 0 .../mdp3_gen/GroupSize8Byte.h | 0 .../mdp3_gen/HaltReason.h | 0 .../mdp3_gen/InstAttribValue.h | 0 .../mdp3_gen/LegSide.h | 0 .../mdp3_gen/MDEntryType.h | 0 .../mdp3_gen/MDEntryTypeBook.h | 0 .../mdp3_gen/MDEntryTypeDailyStatistics.h | 0 .../mdp3_gen/MDEntryTypeStatistics.h | 0 .../mdp3_gen/MDIncrementalRefreshBook32.h | 0 .../mdp3_gen/MDIncrementalRefreshBook46.h | 0 .../MDIncrementalRefreshDailyStatistics33.h | 0 .../MDIncrementalRefreshDailyStatistics49.h | 0 .../MDIncrementalRefreshLimitsBanding34.h | 0 .../MDIncrementalRefreshLimitsBanding50.h | 0 .../MDIncrementalRefreshOrderBook43.h | 0 .../MDIncrementalRefreshOrderBook47.h | 0 .../MDIncrementalRefreshSessionStatistics35.h | 0 .../MDIncrementalRefreshSessionStatistics51.h | 0 .../MDIncrementalRefreshTradeSummary42.h | 0 .../MDIncrementalRefreshTradeSummary48.h | 0 .../mdp3_gen/MDIncrementalRefreshVolume37.h | 0 .../mdp3_gen/MDInstrumentDefinitionFuture27.h | 0 .../mdp3_gen/MDInstrumentDefinitionFuture54.h | 0 .../mdp3_gen/MDInstrumentDefinitionOption41.h | 0 .../mdp3_gen/MDInstrumentDefinitionOption55.h | 0 .../mdp3_gen/MDInstrumentDefinitionSpread29.h | 0 .../mdp3_gen/MDInstrumentDefinitionSpread56.h | 0 .../mdp3_gen/MDUpdateAction.h | 0 .../mdp3_gen/MatchEventIndicator.h | 0 .../mdp3_gen/MaturityMonthYear.h | 0 .../mdp3_gen/MessageHeader.h | 0 .../mdp3_gen/OpenCloseSettlFlag.h | 0 .../mdp3_gen/OrderUpdateAction.h | 0 .../{spartan_tas => spartan}/mdp3_gen/PRICE.h | 0 .../mdp3_gen/PRICE9.h | 0 .../mdp3_gen/PRICENULL.h | 0 .../mdp3_gen/PRICENULL9.h | 0 .../mdp3_gen/PutOrCall.h | 0 .../mdp3_gen/QuoteRequest39.h | 0 .../mdp3_gen/SecurityStatus30.h | 0 .../mdp3_gen/SecurityTradingEvent.h | 0 .../mdp3_gen/SecurityTradingStatus.h | 0 .../mdp3_gen/SecurityUpdateAction.h | 0 .../mdp3_gen/SettlPriceType.h | 0 .../mdp3_gen/SnapshotFullRefresh38.h | 0 .../mdp3_gen/SnapshotFullRefresh52.h | 0 .../mdp3_gen/SnapshotFullRefreshOrderBook44.h | 0 .../mdp3_gen/SnapshotFullRefreshOrderBook53.h | 0 .../util/MCastReceiver.cpp | 2 +- .../util/MCastReceiver.h | 2 +- .../{spartan_tas => spartan}/util/MDPParser.h | 164 ++++++------------ .../util/PCapReader.cpp | 2 +- .../util/PCapReader.h | 2 +- .../util/SecurityDB.cpp | 0 .../util/SecurityDB.h | 0 .../sparkd/cmds/spartan/util/meta_type_pack.h | 11 ++ .../cmds/spartan_tas/util/MDPWriter.cpp | 1 - .../sparkd/cmds/spartan_tas/util/MDPWriter.h | 57 ------ .../cmds/spartan_tas/util/meta_type_pack.h | 11 -- 81 files changed, 249 insertions(+), 228 deletions(-) rename src/server/sparkd/cmds/{spartan_tas => spartan}/algo/TASOrderReactor.cpp (96%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/algo/TASOrderReactor.h (84%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/algo/TASTriggerDef.cpp (100%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/algo/TASTriggerDef.h (100%) create mode 100644 src/server/sparkd/cmds/spartan/analysis/ActionableEventAnalyzer.cpp create mode 100644 src/server/sparkd/cmds/spartan/analysis/ActionableEventAnalyzer.h create mode 100644 src/server/sparkd/cmds/spartan/db rename src/server/sparkd/cmds/{spartan_tas => spartan}/mdp3_gen/AdminHeartbeat12.h (100%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/mdp3_gen/AdminLogin15.h (100%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/mdp3_gen/AdminLogout16.h (100%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/mdp3_gen/AggressorSide.h (100%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/mdp3_gen/ChannelReset4.h (100%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/mdp3_gen/Decimal9.h (100%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/mdp3_gen/Decimal9NULL.h (100%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/mdp3_gen/DecimalQty.h (100%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/mdp3_gen/EventType.h (100%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/mdp3_gen/FLOAT.h (100%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/mdp3_gen/GroupSize.h (100%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/mdp3_gen/GroupSize8Byte.h (100%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/mdp3_gen/HaltReason.h (100%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/mdp3_gen/InstAttribValue.h (100%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/mdp3_gen/LegSide.h (100%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/mdp3_gen/MDEntryType.h (100%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/mdp3_gen/MDEntryTypeBook.h (100%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/mdp3_gen/MDEntryTypeDailyStatistics.h (100%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/mdp3_gen/MDEntryTypeStatistics.h (100%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/mdp3_gen/MDIncrementalRefreshBook32.h (100%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/mdp3_gen/MDIncrementalRefreshBook46.h (100%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/mdp3_gen/MDIncrementalRefreshDailyStatistics33.h (100%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/mdp3_gen/MDIncrementalRefreshDailyStatistics49.h (100%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/mdp3_gen/MDIncrementalRefreshLimitsBanding34.h (100%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/mdp3_gen/MDIncrementalRefreshLimitsBanding50.h (100%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/mdp3_gen/MDIncrementalRefreshOrderBook43.h (100%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/mdp3_gen/MDIncrementalRefreshOrderBook47.h (100%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/mdp3_gen/MDIncrementalRefreshSessionStatistics35.h (100%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/mdp3_gen/MDIncrementalRefreshSessionStatistics51.h (100%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/mdp3_gen/MDIncrementalRefreshTradeSummary42.h (100%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/mdp3_gen/MDIncrementalRefreshTradeSummary48.h (100%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/mdp3_gen/MDIncrementalRefreshVolume37.h (100%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/mdp3_gen/MDInstrumentDefinitionFuture27.h (100%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/mdp3_gen/MDInstrumentDefinitionFuture54.h (100%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/mdp3_gen/MDInstrumentDefinitionOption41.h (100%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/mdp3_gen/MDInstrumentDefinitionOption55.h (100%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/mdp3_gen/MDInstrumentDefinitionSpread29.h (100%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/mdp3_gen/MDInstrumentDefinitionSpread56.h (100%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/mdp3_gen/MDUpdateAction.h (100%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/mdp3_gen/MatchEventIndicator.h (100%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/mdp3_gen/MaturityMonthYear.h (100%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/mdp3_gen/MessageHeader.h (100%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/mdp3_gen/OpenCloseSettlFlag.h (100%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/mdp3_gen/OrderUpdateAction.h (100%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/mdp3_gen/PRICE.h (100%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/mdp3_gen/PRICE9.h (100%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/mdp3_gen/PRICENULL.h (100%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/mdp3_gen/PRICENULL9.h (100%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/mdp3_gen/PutOrCall.h (100%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/mdp3_gen/QuoteRequest39.h (100%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/mdp3_gen/SecurityStatus30.h (100%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/mdp3_gen/SecurityTradingEvent.h (100%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/mdp3_gen/SecurityTradingStatus.h (100%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/mdp3_gen/SecurityUpdateAction.h (100%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/mdp3_gen/SettlPriceType.h (100%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/mdp3_gen/SnapshotFullRefresh38.h (100%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/mdp3_gen/SnapshotFullRefresh52.h (100%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/mdp3_gen/SnapshotFullRefreshOrderBook44.h (100%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/mdp3_gen/SnapshotFullRefreshOrderBook53.h (100%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/util/MCastReceiver.cpp (99%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/util/MCastReceiver.h (96%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/util/MDPParser.h (53%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/util/PCapReader.cpp (98%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/util/PCapReader.h (94%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/util/SecurityDB.cpp (100%) rename src/server/sparkd/cmds/{spartan_tas => spartan}/util/SecurityDB.h (100%) create mode 100644 src/server/sparkd/cmds/spartan/util/meta_type_pack.h delete mode 100644 src/server/sparkd/cmds/spartan_tas/util/MDPWriter.cpp delete mode 100644 src/server/sparkd/cmds/spartan_tas/util/MDPWriter.h delete mode 100644 src/server/sparkd/cmds/spartan_tas/util/meta_type_pack.h diff --git a/src/lib/utils/stats.h b/src/lib/utils/stats.h index 3951d79ff..0c7a3db6b 100644 --- a/src/lib/utils/stats.h +++ b/src/lib/utils/stats.h @@ -11,6 +11,56 @@ double min(std::vector const&v); double max(std::vector const&v); double sum(std::vector const&v); double avg(std::vector const&v); + +inline double med(std::vector const&v) { + return percentile(v,0.5); +} + +template +std::vector extract(C const&ts, E const &e) { + std::vector result; + result.reserve(ts.size()); + for (auto const&t :ts) + result.push_back(e(t)); + return result; +} + +template +double stdev(C const&ts, E const&e) { + return stddev(extract(ts,e)); +} + +template +double percentile(C const&ts,E const&e,double p) { + return percentile(extract(ts,e),p); +} + +template +double med(C const&ts,E const&e) { + return med(extract(ts,e)); +} +template +double min(C const&ts, E const&e) { + return min(extract(ts,e)); +} + +template +double max(C const&ts, E const&e) { + return max(extract(ts,e)); +} + +template +double sum(C const&ts, E const&e) { + return sum(extract(ts,e)); +} + +template +double avg(C const&ts, E const&e) { + return avg(extract(ts,e)); +} + + }} + diff --git a/src/server/sparkd/CMakeDeps.cmake b/src/server/sparkd/CMakeDeps.cmake index 580c3ab86..f6f6236cd 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/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/TestCeloxica.cpp;cmds/Web.cpp;cmds/spartan_tas/algo/TASOrderReactor.cpp;cmds/spartan_tas/algo/TASTriggerDef.cpp;cmds/spartan_tas/util/MCastReceiver.cpp;cmds/spartan_tas/util/MDPWriter.cpp;cmds/spartan_tas/util/PCapReader.cpp;cmds/spartan_tas/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/celoxica/CXListener.cpp;md/platforms/celoxica/CXMain.cpp;md/platforms/celoxica/tests/cx_tests.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/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/TestCeloxica.cpp;cmds/Web.cpp;cmds/spartan/algo/TASOrderReactor.cpp;cmds/spartan/algo/TASTriggerDef.cpp;cmds/spartan/analysis/ActionableEventAnalyzer.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/celoxica/CXListener.cpp;md/platforms/celoxica/CXMain.cpp;md/platforms/celoxica/tests/cx_tests.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.cpp b/src/server/sparkd/cmds/Spartan.cpp index 9f16582d0..357e19e12 100644 --- a/src/server/sparkd/cmds/Spartan.cpp +++ b/src/server/sparkd/cmds/Spartan.cpp @@ -5,13 +5,15 @@ #include "lib/config/protos/spartan.pb.h" #include "lib/logging/logging.h" #include "lib/md/cme/MDP3Utils.h" -#include "server/sparkd/cmds/spartan_tas/algo/TASOrderReactor.h" -#include "server/sparkd/cmds/spartan_tas/algo/TASTriggerDef.h" -#include "server/sparkd/cmds/spartan_tas/util/MCastReceiver.h" -#include "server/sparkd/cmds/spartan_tas/util/MDPParser.h" -#include "server/sparkd/cmds/spartan_tas/util/MDPWriter.h" -#include "server/sparkd/cmds/spartan_tas/util/PCapReader.h" -#include "server/sparkd/cmds/spartan_tas/util/SecurityDB.h" +#include "lib/utils/stats.h" +#include "lib/utils/type_name.h" +#include "server/sparkd/cmds/spartan/algo/TASOrderReactor.h" +#include "server/sparkd/cmds/spartan/algo/TASTriggerDef.h" +#include "server/sparkd/cmds/spartan/analysis/ActionableEventAnalyzer.h" +#include "server/sparkd/cmds/spartan/util/MCastReceiver.h" +#include "server/sparkd/cmds/spartan/util/MDPParser.h" +#include "server/sparkd/cmds/spartan/util/PCapReader.h" +#include "server/sparkd/cmds/spartan/util/SecurityDB.h" #include "server/sparkd/user/AdminServiceDB.h" #include @@ -42,8 +44,8 @@ build_trigger_defs(SecurityDB &db, config::SpartanTASCfg const &cfg) { for (auto const &t : cfg.tas_trigger()) { auto sec = db.query_single([t](auto const &sec) { return sec.has_glbx() && - securities::security_type(sec) == t.security_type() && - securities::descriptor(sec) == t.security(); + securities::security_type(sec) == t.security_type() && + securities::descriptor(sec) == t.security(); }); bts_assert(sec); admin::AdminServiceOperationResult result; @@ -129,8 +131,8 @@ std::set get_symbols(SecurityDB &db, for (auto const &t : cfg.tas_trigger()) { auto sec = db.query_single([&t](auto const &sec) { return sec.has_glbx() && - securities::security_type(sec) == t.security_type() && - securities::descriptor(sec) == t.security(); + securities::security_type(sec) == t.security_type() && + securities::descriptor(sec) == t.security(); }); bts_assert(sec); @@ -183,17 +185,14 @@ int Spartan::run_from_mcast(std::vector const &args) { } boost::asio::io_service io; - utils::MDPParser parser; + MDPParser parser; TASOrderReactor reactor(triggers); + bind(parser, reactor); - parser.set_handler( - [&reactor](auto const &sec_status) { - reactor.on_security_status(sec_status); - }); - std::vector> mc_receivers; + std::vector> mc_receivers; for (auto const &c : connections) { auto receiver = - std::make_unique(io, "0.0.0.0", c.ip, c.port); + std::make_unique(io, "0.0.0.0", c.ip, c.port); receiver->on_receive() = [&parser](auto const &bytes) { parser.on_bytes(bytes); }; @@ -207,6 +206,25 @@ int Spartan::run_from_mcast(std::vector const &args) { return 0; } +int Spartan::analyze_pcap(std::vector const &args) { + if (args.size() != 2) + return 1; + PCapReader pcap_reader(args[1]); + MDPParser parser; + ActionableEventAnalyzer analyzer; + Binder{parser, analyzer}; + + pcap_reader.on_packet() = [&parser](auto const &bytes) { + parser.on_bytes(bytes); + }; + + while (pcap_reader.read_next()) + ; + return 0; +} + int Spartan::run_from_pcap(std::vector const &args) { if (args.size() != 2) return 1; @@ -215,13 +233,9 @@ int Spartan::run_from_pcap(std::vector const &args) { auto triggers = build_and_validate_triggers(db); TASOrderReactor reactor(triggers); - utils::PCapReader pcap_reader(args[1]); - utils::MDPParser parser; - - parser.set_handler( - [&reactor](auto const &sec_status) { - reactor.on_security_status(sec_status); - }); + PCapReader pcap_reader(args[1]); + MDPParser parser; + bind(parser, reactor); pcap_reader.on_packet() = [&parser](auto const &bytes) { parser.on_bytes(bytes); @@ -234,22 +248,35 @@ int Spartan::run_from_pcap(std::vector const &args) { return 0; } +struct SummaryWriter { + SummaryWriter() { std::cout << "SeqNum,SendingTime,TransactTime,MsgType\n"; } + + template void operator()(Header const &h, const M &m) { + std::cout << h.msg_seq_num << "," + << h.sending_time << "," + << m.transactTime() << "," + << utils::type_name() << "\n"; + } +}; + int Spartan::parse_pcap(std::vector const &args) { if (args.size() != 2 && args.size() != 3) return 1; - std::cout << "[\n"; - utils::MDPParser parser; - utils::MDPWriter writer(std::cout, parser); - utils::PCapReader pcap_reader( + MDPParser parser; + SummaryWriter writer; + bind(parser, writer); + + PCapReader pcap_reader( args[1], args.size() == 3 ? std::string("net ") + args[2] : ""); pcap_reader.on_packet() = [&parser](auto const &bytes) { - if (parser.on_bytes(bytes)) - std::cout << ",\n"; + parser.on_bytes(bytes); }; + while (pcap_reader.read_next()) ; - std::cout << "]\n"; return 0; } @@ -262,6 +289,8 @@ int Spartan::execute(std::vector const &args) { error = run_from_pcap(args); else if (args[0] == "run_from_mcast") error = run_from_mcast(args); + else if (args[0] == "analyze_pcap") + error = analyze_pcap(args); } if (error) std::cout << help(); @@ -271,6 +300,7 @@ int Spartan::execute(std::vector const &args) { std::string Spartan::help() { return fmt::format("\tparse_pcap file [filter]\n" "\trun_from_pcap pcap_file\n" + "\tanalyze_pcap pcap_file\n" "\trun_from_mcast\n"); } diff --git a/src/server/sparkd/cmds/Spartan.h b/src/server/sparkd/cmds/Spartan.h index 2742187ee..40151221a 100644 --- a/src/server/sparkd/cmds/Spartan.h +++ b/src/server/sparkd/cmds/Spartan.h @@ -14,6 +14,7 @@ private: int run_from_pcap(std::vector const &); int run_from_mcast(std::vector const &); int parse_pcap(std::vector const &); + int analyze_pcap(std::vector const &); void run(std::vector const &); }; diff --git a/src/server/sparkd/cmds/spartan_tas/algo/TASOrderReactor.cpp b/src/server/sparkd/cmds/spartan/algo/TASOrderReactor.cpp similarity index 96% rename from src/server/sparkd/cmds/spartan_tas/algo/TASOrderReactor.cpp rename to src/server/sparkd/cmds/spartan/algo/TASOrderReactor.cpp index 5123eb227..58df4cdfc 100644 --- a/src/server/sparkd/cmds/spartan_tas/algo/TASOrderReactor.cpp +++ b/src/server/sparkd/cmds/spartan/algo/TASOrderReactor.cpp @@ -7,8 +7,9 @@ #include "lib/jetfix/gateway/JetFIXGateway.h" #include "lib/orderman/order_factory/OrderFactory.h" #include "lib/orderman/orderman_utils/fix_order_codec.h" -#include "server/sparkd/cmds/spartan_tas/algo/TASTriggerDef.h" -#include "server/sparkd/cmds/spartan_tas/mdp3_gen/SecurityStatus30.h" +#include "TASTriggerDef.h" +#include "../mdp3_gen/SecurityStatus30.h" +#include "../util/MDPParser.h" #include @@ -80,8 +81,7 @@ bool TASOrderReactor::do_work() { return me->pending_reactions; } -void TASOrderReactor::on_security_status( - mktdata::SecurityStatus30 const &status) { +void TASOrderReactor::operator()(Header const&, mktdata::SecurityStatus30 const &status) { for (auto &r : me->group_reactors) { if (status.getSecurityGroupAsStringView() == r.group) { for (auto &gr : r.gw_reactors) { diff --git a/src/server/sparkd/cmds/spartan_tas/algo/TASOrderReactor.h b/src/server/sparkd/cmds/spartan/algo/TASOrderReactor.h similarity index 84% rename from src/server/sparkd/cmds/spartan_tas/algo/TASOrderReactor.h rename to src/server/sparkd/cmds/spartan/algo/TASOrderReactor.h index 59f9759c2..cc70560a8 100644 --- a/src/server/sparkd/cmds/spartan_tas/algo/TASOrderReactor.h +++ b/src/server/sparkd/cmds/spartan/algo/TASOrderReactor.h @@ -11,19 +11,21 @@ namespace mktdata { class SecurityStatus30; } namespace bts { -namespace jetfix { -template class JetFIXGateway; -}} +namespace jetfix {template class JetFIXGateway;} +} namespace bts { namespace spartan { +struct Header; + class TASOrderReactor { public: TASOrderReactor(std::vector const &); ~TASOrderReactor(); bool do_work(); - void on_security_status(mktdata::SecurityStatus30 const &status); + void operator()(Header const&header, + mktdata::SecurityStatus30 const &status); private: struct PImpl; diff --git a/src/server/sparkd/cmds/spartan_tas/algo/TASTriggerDef.cpp b/src/server/sparkd/cmds/spartan/algo/TASTriggerDef.cpp similarity index 100% rename from src/server/sparkd/cmds/spartan_tas/algo/TASTriggerDef.cpp rename to src/server/sparkd/cmds/spartan/algo/TASTriggerDef.cpp diff --git a/src/server/sparkd/cmds/spartan_tas/algo/TASTriggerDef.h b/src/server/sparkd/cmds/spartan/algo/TASTriggerDef.h similarity index 100% rename from src/server/sparkd/cmds/spartan_tas/algo/TASTriggerDef.h rename to src/server/sparkd/cmds/spartan/algo/TASTriggerDef.h diff --git a/src/server/sparkd/cmds/spartan/analysis/ActionableEventAnalyzer.cpp b/src/server/sparkd/cmds/spartan/analysis/ActionableEventAnalyzer.cpp new file mode 100644 index 000000000..3c32c39d8 --- /dev/null +++ b/src/server/sparkd/cmds/spartan/analysis/ActionableEventAnalyzer.cpp @@ -0,0 +1 @@ +#include "ActionableEventAnalyzer.h" diff --git a/src/server/sparkd/cmds/spartan/analysis/ActionableEventAnalyzer.h b/src/server/sparkd/cmds/spartan/analysis/ActionableEventAnalyzer.h new file mode 100644 index 000000000..f61bfc327 --- /dev/null +++ b/src/server/sparkd/cmds/spartan/analysis/ActionableEventAnalyzer.h @@ -0,0 +1,59 @@ +#pragma once +#include "../util/MDPParser.h" +#include "lib/utils/stats.h" +#include +#include + +namespace bts { +namespace spartan { + +struct ActionableEventAnalyzer { + + struct Event { + uint64_t transact_time; + uint64_t send_time; + uint64_t actionable_window; + uint64_t exchange_latency; + uint64_t time_from_last_transaction; + }; + std::vector events; + template void operator()(Header const &h, const M &m) { + Event e{m.transactTime(), h.sending_time, 0, + h.sending_time - m.transactTime(), 0}; + if (events.size()) { + auto &previous = events.back(); + previous.actionable_window = + std::max(0l, (int64_t)(previous.send_time - m.transactTime())); + previous.time_from_last_transaction = m.transactTime() - previous.transact_time; + } + events.push_back(e); + } + + std::string single_stat(uint64_t Event::*field) { + std::ostringstream str; + str.precision(0); + str << std::fixed << "\tmin: " + << stats::min(events, [field](auto const &ev) { return ev.*field; }) + << "\t\tmed: " + << stats::med(events, [field](auto const &ev) { return ev.*field; }) + << "\t\tmax: " + << stats::max(events, [field](auto const &ev) { return ev.*field; }); + return str.str(); + } + + ~ActionableEventAnalyzer() { + std::cout << "Data points:\n \t\t" << events.size() + + << "\nExchange Latency:\n" + << single_stat(&Event::exchange_latency) + + << "\nTransaction Gap:\n" + << single_stat(&Event::time_from_last_transaction) + + << "\nActionable Window:\n" + << single_stat(&Event::actionable_window) << "\n"; + } +}; + +} // namespace spartan +} // namespace bts diff --git a/src/server/sparkd/cmds/spartan/db b/src/server/sparkd/cmds/spartan/db new file mode 100644 index 000000000..e69de29bb diff --git a/src/server/sparkd/cmds/spartan_tas/mdp3_gen/AdminHeartbeat12.h b/src/server/sparkd/cmds/spartan/mdp3_gen/AdminHeartbeat12.h similarity index 100% rename from src/server/sparkd/cmds/spartan_tas/mdp3_gen/AdminHeartbeat12.h rename to src/server/sparkd/cmds/spartan/mdp3_gen/AdminHeartbeat12.h diff --git a/src/server/sparkd/cmds/spartan_tas/mdp3_gen/AdminLogin15.h b/src/server/sparkd/cmds/spartan/mdp3_gen/AdminLogin15.h similarity index 100% rename from src/server/sparkd/cmds/spartan_tas/mdp3_gen/AdminLogin15.h rename to src/server/sparkd/cmds/spartan/mdp3_gen/AdminLogin15.h diff --git a/src/server/sparkd/cmds/spartan_tas/mdp3_gen/AdminLogout16.h b/src/server/sparkd/cmds/spartan/mdp3_gen/AdminLogout16.h similarity index 100% rename from src/server/sparkd/cmds/spartan_tas/mdp3_gen/AdminLogout16.h rename to src/server/sparkd/cmds/spartan/mdp3_gen/AdminLogout16.h diff --git a/src/server/sparkd/cmds/spartan_tas/mdp3_gen/AggressorSide.h b/src/server/sparkd/cmds/spartan/mdp3_gen/AggressorSide.h similarity index 100% rename from src/server/sparkd/cmds/spartan_tas/mdp3_gen/AggressorSide.h rename to src/server/sparkd/cmds/spartan/mdp3_gen/AggressorSide.h diff --git a/src/server/sparkd/cmds/spartan_tas/mdp3_gen/ChannelReset4.h b/src/server/sparkd/cmds/spartan/mdp3_gen/ChannelReset4.h similarity index 100% rename from src/server/sparkd/cmds/spartan_tas/mdp3_gen/ChannelReset4.h rename to src/server/sparkd/cmds/spartan/mdp3_gen/ChannelReset4.h diff --git a/src/server/sparkd/cmds/spartan_tas/mdp3_gen/Decimal9.h b/src/server/sparkd/cmds/spartan/mdp3_gen/Decimal9.h similarity index 100% rename from src/server/sparkd/cmds/spartan_tas/mdp3_gen/Decimal9.h rename to src/server/sparkd/cmds/spartan/mdp3_gen/Decimal9.h diff --git a/src/server/sparkd/cmds/spartan_tas/mdp3_gen/Decimal9NULL.h b/src/server/sparkd/cmds/spartan/mdp3_gen/Decimal9NULL.h similarity index 100% rename from src/server/sparkd/cmds/spartan_tas/mdp3_gen/Decimal9NULL.h rename to src/server/sparkd/cmds/spartan/mdp3_gen/Decimal9NULL.h diff --git a/src/server/sparkd/cmds/spartan_tas/mdp3_gen/DecimalQty.h b/src/server/sparkd/cmds/spartan/mdp3_gen/DecimalQty.h similarity index 100% rename from src/server/sparkd/cmds/spartan_tas/mdp3_gen/DecimalQty.h rename to src/server/sparkd/cmds/spartan/mdp3_gen/DecimalQty.h diff --git a/src/server/sparkd/cmds/spartan_tas/mdp3_gen/EventType.h b/src/server/sparkd/cmds/spartan/mdp3_gen/EventType.h similarity index 100% rename from src/server/sparkd/cmds/spartan_tas/mdp3_gen/EventType.h rename to src/server/sparkd/cmds/spartan/mdp3_gen/EventType.h diff --git a/src/server/sparkd/cmds/spartan_tas/mdp3_gen/FLOAT.h b/src/server/sparkd/cmds/spartan/mdp3_gen/FLOAT.h similarity index 100% rename from src/server/sparkd/cmds/spartan_tas/mdp3_gen/FLOAT.h rename to src/server/sparkd/cmds/spartan/mdp3_gen/FLOAT.h diff --git a/src/server/sparkd/cmds/spartan_tas/mdp3_gen/GroupSize.h b/src/server/sparkd/cmds/spartan/mdp3_gen/GroupSize.h similarity index 100% rename from src/server/sparkd/cmds/spartan_tas/mdp3_gen/GroupSize.h rename to src/server/sparkd/cmds/spartan/mdp3_gen/GroupSize.h diff --git a/src/server/sparkd/cmds/spartan_tas/mdp3_gen/GroupSize8Byte.h b/src/server/sparkd/cmds/spartan/mdp3_gen/GroupSize8Byte.h similarity index 100% rename from src/server/sparkd/cmds/spartan_tas/mdp3_gen/GroupSize8Byte.h rename to src/server/sparkd/cmds/spartan/mdp3_gen/GroupSize8Byte.h diff --git a/src/server/sparkd/cmds/spartan_tas/mdp3_gen/HaltReason.h b/src/server/sparkd/cmds/spartan/mdp3_gen/HaltReason.h similarity index 100% rename from src/server/sparkd/cmds/spartan_tas/mdp3_gen/HaltReason.h rename to src/server/sparkd/cmds/spartan/mdp3_gen/HaltReason.h diff --git a/src/server/sparkd/cmds/spartan_tas/mdp3_gen/InstAttribValue.h b/src/server/sparkd/cmds/spartan/mdp3_gen/InstAttribValue.h similarity index 100% rename from src/server/sparkd/cmds/spartan_tas/mdp3_gen/InstAttribValue.h rename to src/server/sparkd/cmds/spartan/mdp3_gen/InstAttribValue.h diff --git a/src/server/sparkd/cmds/spartan_tas/mdp3_gen/LegSide.h b/src/server/sparkd/cmds/spartan/mdp3_gen/LegSide.h similarity index 100% rename from src/server/sparkd/cmds/spartan_tas/mdp3_gen/LegSide.h rename to src/server/sparkd/cmds/spartan/mdp3_gen/LegSide.h diff --git a/src/server/sparkd/cmds/spartan_tas/mdp3_gen/MDEntryType.h b/src/server/sparkd/cmds/spartan/mdp3_gen/MDEntryType.h similarity index 100% rename from src/server/sparkd/cmds/spartan_tas/mdp3_gen/MDEntryType.h rename to src/server/sparkd/cmds/spartan/mdp3_gen/MDEntryType.h diff --git a/src/server/sparkd/cmds/spartan_tas/mdp3_gen/MDEntryTypeBook.h b/src/server/sparkd/cmds/spartan/mdp3_gen/MDEntryTypeBook.h similarity index 100% rename from src/server/sparkd/cmds/spartan_tas/mdp3_gen/MDEntryTypeBook.h rename to src/server/sparkd/cmds/spartan/mdp3_gen/MDEntryTypeBook.h diff --git a/src/server/sparkd/cmds/spartan_tas/mdp3_gen/MDEntryTypeDailyStatistics.h b/src/server/sparkd/cmds/spartan/mdp3_gen/MDEntryTypeDailyStatistics.h similarity index 100% rename from src/server/sparkd/cmds/spartan_tas/mdp3_gen/MDEntryTypeDailyStatistics.h rename to src/server/sparkd/cmds/spartan/mdp3_gen/MDEntryTypeDailyStatistics.h diff --git a/src/server/sparkd/cmds/spartan_tas/mdp3_gen/MDEntryTypeStatistics.h b/src/server/sparkd/cmds/spartan/mdp3_gen/MDEntryTypeStatistics.h similarity index 100% rename from src/server/sparkd/cmds/spartan_tas/mdp3_gen/MDEntryTypeStatistics.h rename to src/server/sparkd/cmds/spartan/mdp3_gen/MDEntryTypeStatistics.h diff --git a/src/server/sparkd/cmds/spartan_tas/mdp3_gen/MDIncrementalRefreshBook32.h b/src/server/sparkd/cmds/spartan/mdp3_gen/MDIncrementalRefreshBook32.h similarity index 100% rename from src/server/sparkd/cmds/spartan_tas/mdp3_gen/MDIncrementalRefreshBook32.h rename to src/server/sparkd/cmds/spartan/mdp3_gen/MDIncrementalRefreshBook32.h diff --git a/src/server/sparkd/cmds/spartan_tas/mdp3_gen/MDIncrementalRefreshBook46.h b/src/server/sparkd/cmds/spartan/mdp3_gen/MDIncrementalRefreshBook46.h similarity index 100% rename from src/server/sparkd/cmds/spartan_tas/mdp3_gen/MDIncrementalRefreshBook46.h rename to src/server/sparkd/cmds/spartan/mdp3_gen/MDIncrementalRefreshBook46.h diff --git a/src/server/sparkd/cmds/spartan_tas/mdp3_gen/MDIncrementalRefreshDailyStatistics33.h b/src/server/sparkd/cmds/spartan/mdp3_gen/MDIncrementalRefreshDailyStatistics33.h similarity index 100% rename from src/server/sparkd/cmds/spartan_tas/mdp3_gen/MDIncrementalRefreshDailyStatistics33.h rename to src/server/sparkd/cmds/spartan/mdp3_gen/MDIncrementalRefreshDailyStatistics33.h diff --git a/src/server/sparkd/cmds/spartan_tas/mdp3_gen/MDIncrementalRefreshDailyStatistics49.h b/src/server/sparkd/cmds/spartan/mdp3_gen/MDIncrementalRefreshDailyStatistics49.h similarity index 100% rename from src/server/sparkd/cmds/spartan_tas/mdp3_gen/MDIncrementalRefreshDailyStatistics49.h rename to src/server/sparkd/cmds/spartan/mdp3_gen/MDIncrementalRefreshDailyStatistics49.h diff --git a/src/server/sparkd/cmds/spartan_tas/mdp3_gen/MDIncrementalRefreshLimitsBanding34.h b/src/server/sparkd/cmds/spartan/mdp3_gen/MDIncrementalRefreshLimitsBanding34.h similarity index 100% rename from src/server/sparkd/cmds/spartan_tas/mdp3_gen/MDIncrementalRefreshLimitsBanding34.h rename to src/server/sparkd/cmds/spartan/mdp3_gen/MDIncrementalRefreshLimitsBanding34.h diff --git a/src/server/sparkd/cmds/spartan_tas/mdp3_gen/MDIncrementalRefreshLimitsBanding50.h b/src/server/sparkd/cmds/spartan/mdp3_gen/MDIncrementalRefreshLimitsBanding50.h similarity index 100% rename from src/server/sparkd/cmds/spartan_tas/mdp3_gen/MDIncrementalRefreshLimitsBanding50.h rename to src/server/sparkd/cmds/spartan/mdp3_gen/MDIncrementalRefreshLimitsBanding50.h diff --git a/src/server/sparkd/cmds/spartan_tas/mdp3_gen/MDIncrementalRefreshOrderBook43.h b/src/server/sparkd/cmds/spartan/mdp3_gen/MDIncrementalRefreshOrderBook43.h similarity index 100% rename from src/server/sparkd/cmds/spartan_tas/mdp3_gen/MDIncrementalRefreshOrderBook43.h rename to src/server/sparkd/cmds/spartan/mdp3_gen/MDIncrementalRefreshOrderBook43.h diff --git a/src/server/sparkd/cmds/spartan_tas/mdp3_gen/MDIncrementalRefreshOrderBook47.h b/src/server/sparkd/cmds/spartan/mdp3_gen/MDIncrementalRefreshOrderBook47.h similarity index 100% rename from src/server/sparkd/cmds/spartan_tas/mdp3_gen/MDIncrementalRefreshOrderBook47.h rename to src/server/sparkd/cmds/spartan/mdp3_gen/MDIncrementalRefreshOrderBook47.h diff --git a/src/server/sparkd/cmds/spartan_tas/mdp3_gen/MDIncrementalRefreshSessionStatistics35.h b/src/server/sparkd/cmds/spartan/mdp3_gen/MDIncrementalRefreshSessionStatistics35.h similarity index 100% rename from src/server/sparkd/cmds/spartan_tas/mdp3_gen/MDIncrementalRefreshSessionStatistics35.h rename to src/server/sparkd/cmds/spartan/mdp3_gen/MDIncrementalRefreshSessionStatistics35.h diff --git a/src/server/sparkd/cmds/spartan_tas/mdp3_gen/MDIncrementalRefreshSessionStatistics51.h b/src/server/sparkd/cmds/spartan/mdp3_gen/MDIncrementalRefreshSessionStatistics51.h similarity index 100% rename from src/server/sparkd/cmds/spartan_tas/mdp3_gen/MDIncrementalRefreshSessionStatistics51.h rename to src/server/sparkd/cmds/spartan/mdp3_gen/MDIncrementalRefreshSessionStatistics51.h diff --git a/src/server/sparkd/cmds/spartan_tas/mdp3_gen/MDIncrementalRefreshTradeSummary42.h b/src/server/sparkd/cmds/spartan/mdp3_gen/MDIncrementalRefreshTradeSummary42.h similarity index 100% rename from src/server/sparkd/cmds/spartan_tas/mdp3_gen/MDIncrementalRefreshTradeSummary42.h rename to src/server/sparkd/cmds/spartan/mdp3_gen/MDIncrementalRefreshTradeSummary42.h diff --git a/src/server/sparkd/cmds/spartan_tas/mdp3_gen/MDIncrementalRefreshTradeSummary48.h b/src/server/sparkd/cmds/spartan/mdp3_gen/MDIncrementalRefreshTradeSummary48.h similarity index 100% rename from src/server/sparkd/cmds/spartan_tas/mdp3_gen/MDIncrementalRefreshTradeSummary48.h rename to src/server/sparkd/cmds/spartan/mdp3_gen/MDIncrementalRefreshTradeSummary48.h diff --git a/src/server/sparkd/cmds/spartan_tas/mdp3_gen/MDIncrementalRefreshVolume37.h b/src/server/sparkd/cmds/spartan/mdp3_gen/MDIncrementalRefreshVolume37.h similarity index 100% rename from src/server/sparkd/cmds/spartan_tas/mdp3_gen/MDIncrementalRefreshVolume37.h rename to src/server/sparkd/cmds/spartan/mdp3_gen/MDIncrementalRefreshVolume37.h diff --git a/src/server/sparkd/cmds/spartan_tas/mdp3_gen/MDInstrumentDefinitionFuture27.h b/src/server/sparkd/cmds/spartan/mdp3_gen/MDInstrumentDefinitionFuture27.h similarity index 100% rename from src/server/sparkd/cmds/spartan_tas/mdp3_gen/MDInstrumentDefinitionFuture27.h rename to src/server/sparkd/cmds/spartan/mdp3_gen/MDInstrumentDefinitionFuture27.h diff --git a/src/server/sparkd/cmds/spartan_tas/mdp3_gen/MDInstrumentDefinitionFuture54.h b/src/server/sparkd/cmds/spartan/mdp3_gen/MDInstrumentDefinitionFuture54.h similarity index 100% rename from src/server/sparkd/cmds/spartan_tas/mdp3_gen/MDInstrumentDefinitionFuture54.h rename to src/server/sparkd/cmds/spartan/mdp3_gen/MDInstrumentDefinitionFuture54.h diff --git a/src/server/sparkd/cmds/spartan_tas/mdp3_gen/MDInstrumentDefinitionOption41.h b/src/server/sparkd/cmds/spartan/mdp3_gen/MDInstrumentDefinitionOption41.h similarity index 100% rename from src/server/sparkd/cmds/spartan_tas/mdp3_gen/MDInstrumentDefinitionOption41.h rename to src/server/sparkd/cmds/spartan/mdp3_gen/MDInstrumentDefinitionOption41.h diff --git a/src/server/sparkd/cmds/spartan_tas/mdp3_gen/MDInstrumentDefinitionOption55.h b/src/server/sparkd/cmds/spartan/mdp3_gen/MDInstrumentDefinitionOption55.h similarity index 100% rename from src/server/sparkd/cmds/spartan_tas/mdp3_gen/MDInstrumentDefinitionOption55.h rename to src/server/sparkd/cmds/spartan/mdp3_gen/MDInstrumentDefinitionOption55.h diff --git a/src/server/sparkd/cmds/spartan_tas/mdp3_gen/MDInstrumentDefinitionSpread29.h b/src/server/sparkd/cmds/spartan/mdp3_gen/MDInstrumentDefinitionSpread29.h similarity index 100% rename from src/server/sparkd/cmds/spartan_tas/mdp3_gen/MDInstrumentDefinitionSpread29.h rename to src/server/sparkd/cmds/spartan/mdp3_gen/MDInstrumentDefinitionSpread29.h diff --git a/src/server/sparkd/cmds/spartan_tas/mdp3_gen/MDInstrumentDefinitionSpread56.h b/src/server/sparkd/cmds/spartan/mdp3_gen/MDInstrumentDefinitionSpread56.h similarity index 100% rename from src/server/sparkd/cmds/spartan_tas/mdp3_gen/MDInstrumentDefinitionSpread56.h rename to src/server/sparkd/cmds/spartan/mdp3_gen/MDInstrumentDefinitionSpread56.h diff --git a/src/server/sparkd/cmds/spartan_tas/mdp3_gen/MDUpdateAction.h b/src/server/sparkd/cmds/spartan/mdp3_gen/MDUpdateAction.h similarity index 100% rename from src/server/sparkd/cmds/spartan_tas/mdp3_gen/MDUpdateAction.h rename to src/server/sparkd/cmds/spartan/mdp3_gen/MDUpdateAction.h diff --git a/src/server/sparkd/cmds/spartan_tas/mdp3_gen/MatchEventIndicator.h b/src/server/sparkd/cmds/spartan/mdp3_gen/MatchEventIndicator.h similarity index 100% rename from src/server/sparkd/cmds/spartan_tas/mdp3_gen/MatchEventIndicator.h rename to src/server/sparkd/cmds/spartan/mdp3_gen/MatchEventIndicator.h diff --git a/src/server/sparkd/cmds/spartan_tas/mdp3_gen/MaturityMonthYear.h b/src/server/sparkd/cmds/spartan/mdp3_gen/MaturityMonthYear.h similarity index 100% rename from src/server/sparkd/cmds/spartan_tas/mdp3_gen/MaturityMonthYear.h rename to src/server/sparkd/cmds/spartan/mdp3_gen/MaturityMonthYear.h diff --git a/src/server/sparkd/cmds/spartan_tas/mdp3_gen/MessageHeader.h b/src/server/sparkd/cmds/spartan/mdp3_gen/MessageHeader.h similarity index 100% rename from src/server/sparkd/cmds/spartan_tas/mdp3_gen/MessageHeader.h rename to src/server/sparkd/cmds/spartan/mdp3_gen/MessageHeader.h diff --git a/src/server/sparkd/cmds/spartan_tas/mdp3_gen/OpenCloseSettlFlag.h b/src/server/sparkd/cmds/spartan/mdp3_gen/OpenCloseSettlFlag.h similarity index 100% rename from src/server/sparkd/cmds/spartan_tas/mdp3_gen/OpenCloseSettlFlag.h rename to src/server/sparkd/cmds/spartan/mdp3_gen/OpenCloseSettlFlag.h diff --git a/src/server/sparkd/cmds/spartan_tas/mdp3_gen/OrderUpdateAction.h b/src/server/sparkd/cmds/spartan/mdp3_gen/OrderUpdateAction.h similarity index 100% rename from src/server/sparkd/cmds/spartan_tas/mdp3_gen/OrderUpdateAction.h rename to src/server/sparkd/cmds/spartan/mdp3_gen/OrderUpdateAction.h diff --git a/src/server/sparkd/cmds/spartan_tas/mdp3_gen/PRICE.h b/src/server/sparkd/cmds/spartan/mdp3_gen/PRICE.h similarity index 100% rename from src/server/sparkd/cmds/spartan_tas/mdp3_gen/PRICE.h rename to src/server/sparkd/cmds/spartan/mdp3_gen/PRICE.h diff --git a/src/server/sparkd/cmds/spartan_tas/mdp3_gen/PRICE9.h b/src/server/sparkd/cmds/spartan/mdp3_gen/PRICE9.h similarity index 100% rename from src/server/sparkd/cmds/spartan_tas/mdp3_gen/PRICE9.h rename to src/server/sparkd/cmds/spartan/mdp3_gen/PRICE9.h diff --git a/src/server/sparkd/cmds/spartan_tas/mdp3_gen/PRICENULL.h b/src/server/sparkd/cmds/spartan/mdp3_gen/PRICENULL.h similarity index 100% rename from src/server/sparkd/cmds/spartan_tas/mdp3_gen/PRICENULL.h rename to src/server/sparkd/cmds/spartan/mdp3_gen/PRICENULL.h diff --git a/src/server/sparkd/cmds/spartan_tas/mdp3_gen/PRICENULL9.h b/src/server/sparkd/cmds/spartan/mdp3_gen/PRICENULL9.h similarity index 100% rename from src/server/sparkd/cmds/spartan_tas/mdp3_gen/PRICENULL9.h rename to src/server/sparkd/cmds/spartan/mdp3_gen/PRICENULL9.h diff --git a/src/server/sparkd/cmds/spartan_tas/mdp3_gen/PutOrCall.h b/src/server/sparkd/cmds/spartan/mdp3_gen/PutOrCall.h similarity index 100% rename from src/server/sparkd/cmds/spartan_tas/mdp3_gen/PutOrCall.h rename to src/server/sparkd/cmds/spartan/mdp3_gen/PutOrCall.h diff --git a/src/server/sparkd/cmds/spartan_tas/mdp3_gen/QuoteRequest39.h b/src/server/sparkd/cmds/spartan/mdp3_gen/QuoteRequest39.h similarity index 100% rename from src/server/sparkd/cmds/spartan_tas/mdp3_gen/QuoteRequest39.h rename to src/server/sparkd/cmds/spartan/mdp3_gen/QuoteRequest39.h diff --git a/src/server/sparkd/cmds/spartan_tas/mdp3_gen/SecurityStatus30.h b/src/server/sparkd/cmds/spartan/mdp3_gen/SecurityStatus30.h similarity index 100% rename from src/server/sparkd/cmds/spartan_tas/mdp3_gen/SecurityStatus30.h rename to src/server/sparkd/cmds/spartan/mdp3_gen/SecurityStatus30.h diff --git a/src/server/sparkd/cmds/spartan_tas/mdp3_gen/SecurityTradingEvent.h b/src/server/sparkd/cmds/spartan/mdp3_gen/SecurityTradingEvent.h similarity index 100% rename from src/server/sparkd/cmds/spartan_tas/mdp3_gen/SecurityTradingEvent.h rename to src/server/sparkd/cmds/spartan/mdp3_gen/SecurityTradingEvent.h diff --git a/src/server/sparkd/cmds/spartan_tas/mdp3_gen/SecurityTradingStatus.h b/src/server/sparkd/cmds/spartan/mdp3_gen/SecurityTradingStatus.h similarity index 100% rename from src/server/sparkd/cmds/spartan_tas/mdp3_gen/SecurityTradingStatus.h rename to src/server/sparkd/cmds/spartan/mdp3_gen/SecurityTradingStatus.h diff --git a/src/server/sparkd/cmds/spartan_tas/mdp3_gen/SecurityUpdateAction.h b/src/server/sparkd/cmds/spartan/mdp3_gen/SecurityUpdateAction.h similarity index 100% rename from src/server/sparkd/cmds/spartan_tas/mdp3_gen/SecurityUpdateAction.h rename to src/server/sparkd/cmds/spartan/mdp3_gen/SecurityUpdateAction.h diff --git a/src/server/sparkd/cmds/spartan_tas/mdp3_gen/SettlPriceType.h b/src/server/sparkd/cmds/spartan/mdp3_gen/SettlPriceType.h similarity index 100% rename from src/server/sparkd/cmds/spartan_tas/mdp3_gen/SettlPriceType.h rename to src/server/sparkd/cmds/spartan/mdp3_gen/SettlPriceType.h diff --git a/src/server/sparkd/cmds/spartan_tas/mdp3_gen/SnapshotFullRefresh38.h b/src/server/sparkd/cmds/spartan/mdp3_gen/SnapshotFullRefresh38.h similarity index 100% rename from src/server/sparkd/cmds/spartan_tas/mdp3_gen/SnapshotFullRefresh38.h rename to src/server/sparkd/cmds/spartan/mdp3_gen/SnapshotFullRefresh38.h diff --git a/src/server/sparkd/cmds/spartan_tas/mdp3_gen/SnapshotFullRefresh52.h b/src/server/sparkd/cmds/spartan/mdp3_gen/SnapshotFullRefresh52.h similarity index 100% rename from src/server/sparkd/cmds/spartan_tas/mdp3_gen/SnapshotFullRefresh52.h rename to src/server/sparkd/cmds/spartan/mdp3_gen/SnapshotFullRefresh52.h diff --git a/src/server/sparkd/cmds/spartan_tas/mdp3_gen/SnapshotFullRefreshOrderBook44.h b/src/server/sparkd/cmds/spartan/mdp3_gen/SnapshotFullRefreshOrderBook44.h similarity index 100% rename from src/server/sparkd/cmds/spartan_tas/mdp3_gen/SnapshotFullRefreshOrderBook44.h rename to src/server/sparkd/cmds/spartan/mdp3_gen/SnapshotFullRefreshOrderBook44.h diff --git a/src/server/sparkd/cmds/spartan_tas/mdp3_gen/SnapshotFullRefreshOrderBook53.h b/src/server/sparkd/cmds/spartan/mdp3_gen/SnapshotFullRefreshOrderBook53.h similarity index 100% rename from src/server/sparkd/cmds/spartan_tas/mdp3_gen/SnapshotFullRefreshOrderBook53.h rename to src/server/sparkd/cmds/spartan/mdp3_gen/SnapshotFullRefreshOrderBook53.h diff --git a/src/server/sparkd/cmds/spartan_tas/util/MCastReceiver.cpp b/src/server/sparkd/cmds/spartan/util/MCastReceiver.cpp similarity index 99% rename from src/server/sparkd/cmds/spartan_tas/util/MCastReceiver.cpp rename to src/server/sparkd/cmds/spartan/util/MCastReceiver.cpp index 379744b7a..77ca0a8af 100644 --- a/src/server/sparkd/cmds/spartan_tas/util/MCastReceiver.cpp +++ b/src/server/sparkd/cmds/spartan/util/MCastReceiver.cpp @@ -5,7 +5,7 @@ #include namespace bts { -namespace utils { +namespace spartan { struct MCastReceiver::PImpl { PImpl(boost::asio::io_service &io) : socket(io) {} diff --git a/src/server/sparkd/cmds/spartan_tas/util/MCastReceiver.h b/src/server/sparkd/cmds/spartan/util/MCastReceiver.h similarity index 96% rename from src/server/sparkd/cmds/spartan_tas/util/MCastReceiver.h rename to src/server/sparkd/cmds/spartan/util/MCastReceiver.h index 4a9840511..d57a63675 100644 --- a/src/server/sparkd/cmds/spartan_tas/util/MCastReceiver.h +++ b/src/server/sparkd/cmds/spartan/util/MCastReceiver.h @@ -13,7 +13,7 @@ class io_service; } // namespace boost namespace bts { -namespace utils { +namespace spartan { class MCastReceiver { public: diff --git a/src/server/sparkd/cmds/spartan_tas/util/MDPParser.h b/src/server/sparkd/cmds/spartan/util/MDPParser.h similarity index 53% rename from src/server/sparkd/cmds/spartan_tas/util/MDPParser.h rename to src/server/sparkd/cmds/spartan/util/MDPParser.h index 0232da73c..ee0cfacf4 100644 --- a/src/server/sparkd/cmds/spartan_tas/util/MDPParser.h +++ b/src/server/sparkd/cmds/spartan/util/MDPParser.h @@ -29,14 +29,14 @@ #include "../mdp3_gen/SnapshotFullRefresh52.h" #include "../mdp3_gen/SnapshotFullRefreshOrderBook44.h" #include "../mdp3_gen/SnapshotFullRefreshOrderBook53.h" -#include "server/sparkd/cmds/spartan_tas/util/meta_type_pack.h" +#include "meta_type_pack.h" #include "lib/utils/bts_assert.h" #include namespace bts { -namespace utils { +namespace spartan { struct __attribute__((__packed__)) Header { uint32_t msg_seq_num; @@ -61,132 +61,68 @@ class MDPParser { } bool on_bytes(std::string_view const &bytes) { - bts_assert_d(bytes.size() >= sizeof(utils::Header)); - utils::MDP3Msg *msg = (utils::MDP3Msg *)bytes.data(); + bts_assert_d(bytes.size() >= sizeof(spartan::Header)); + spartan::MDP3Msg *msg = (spartan::MDP3Msg *)bytes.data(); return handlers[msg->header.template_id](*msg); } - template void set_handler(C const &c) { - handlers[T::sbeTemplateId()] = [c](auto const &msg) { - c(T{(char*)msg.payload.data(), msg.payload.size()}); + template void set_handler(C &c) { + handlers[T::sbeTemplateId()] = [&c](auto const &msg) { + c(msg.header,T{(char*)msg.payload.data(), msg.payload.size()}); return true; }; } private: - std::array, + std::array, std::numeric_limits::max()> handlers; }; +template +void bind(MDPParser &p, Handler &h) { + p.set_handler (h); + bind(p,h); +} + +template +void bind(MDPParser &, Handler&) {} + +template struct Binder { + template Binder(MDPParser &p,Handler &h) { + bind (p,h); + } +}; + +using ForAllMDPTypes = + meta_type_pack< + mktdata::AdminLogin15, mktdata::AdminLogout16, + mktdata::ChannelReset4, mktdata::MDIncrementalRefreshBook32, + mktdata::MDIncrementalRefreshBook46, + mktdata::MDIncrementalRefreshDailyStatistics33, + mktdata::MDIncrementalRefreshDailyStatistics49, + mktdata::MDIncrementalRefreshLimitsBanding34, + mktdata::MDIncrementalRefreshLimitsBanding50, + mktdata::MDIncrementalRefreshOrderBook43, + mktdata::MDIncrementalRefreshOrderBook47, + mktdata::MDIncrementalRefreshSessionStatistics35, + mktdata::MDIncrementalRefreshSessionStatistics51, + mktdata::MDIncrementalRefreshTradeSummary42, + mktdata::MDIncrementalRefreshTradeSummary48, + mktdata::MDIncrementalRefreshVolume37, + mktdata::MDInstrumentDefinitionFuture27, + mktdata::MDInstrumentDefinitionFuture54, + mktdata::MDInstrumentDefinitionOption41, + mktdata::MDInstrumentDefinitionOption55, + mktdata::MDInstrumentDefinitionSpread29, + mktdata::MDInstrumentDefinitionSpread56, mktdata::QuoteRequest39, + mktdata::SecurityStatus30, mktdata::SnapshotFullRefresh38, + mktdata::SnapshotFullRefresh52, mktdata::SnapshotFullRefreshOrderBook44, + mktdata::SnapshotFullRefreshOrderBook53>; + +using AllMDTypesBinder = ForAllMDPTypes::type; } // namespace utils } // namespace bts - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/server/sparkd/cmds/spartan_tas/util/PCapReader.cpp b/src/server/sparkd/cmds/spartan/util/PCapReader.cpp similarity index 98% rename from src/server/sparkd/cmds/spartan_tas/util/PCapReader.cpp rename to src/server/sparkd/cmds/spartan/util/PCapReader.cpp index 0aabefb32..e57cfa77e 100644 --- a/src/server/sparkd/cmds/spartan_tas/util/PCapReader.cpp +++ b/src/server/sparkd/cmds/spartan/util/PCapReader.cpp @@ -5,7 +5,7 @@ #include namespace bts { -namespace utils { +namespace spartan { struct PCapReader::PImpl { PImpl(std::string const &file_path) diff --git a/src/server/sparkd/cmds/spartan_tas/util/PCapReader.h b/src/server/sparkd/cmds/spartan/util/PCapReader.h similarity index 94% rename from src/server/sparkd/cmds/spartan_tas/util/PCapReader.h rename to src/server/sparkd/cmds/spartan/util/PCapReader.h index bf4278b2a..d4814104a 100644 --- a/src/server/sparkd/cmds/spartan_tas/util/PCapReader.h +++ b/src/server/sparkd/cmds/spartan/util/PCapReader.h @@ -5,7 +5,7 @@ namespace bts { -namespace utils { +namespace spartan { class PCapReader { public: diff --git a/src/server/sparkd/cmds/spartan_tas/util/SecurityDB.cpp b/src/server/sparkd/cmds/spartan/util/SecurityDB.cpp similarity index 100% rename from src/server/sparkd/cmds/spartan_tas/util/SecurityDB.cpp rename to src/server/sparkd/cmds/spartan/util/SecurityDB.cpp diff --git a/src/server/sparkd/cmds/spartan_tas/util/SecurityDB.h b/src/server/sparkd/cmds/spartan/util/SecurityDB.h similarity index 100% rename from src/server/sparkd/cmds/spartan_tas/util/SecurityDB.h rename to src/server/sparkd/cmds/spartan/util/SecurityDB.h diff --git a/src/server/sparkd/cmds/spartan/util/meta_type_pack.h b/src/server/sparkd/cmds/spartan/util/meta_type_pack.h new file mode 100644 index 000000000..88b540ada --- /dev/null +++ b/src/server/sparkd/cmds/spartan/util/meta_type_pack.h @@ -0,0 +1,11 @@ +#pragma once + +namespace bts { +namespace spartan { + +template struct meta_type_pack { + template