diff --git a/src/server/sparkd/cmds/Spartan.cpp b/src/server/sparkd/cmds/Spartan.cpp index 28db93b40..24336a43a 100644 --- a/src/server/sparkd/cmds/Spartan.cpp +++ b/src/server/sparkd/cmds/Spartan.cpp @@ -252,7 +252,7 @@ void stats(std::string const &pcap) { StatPrinter(std::ostream &out) : out{out} {} std::ostream &out; void on_event_end(MDP3Event const &ev) override { - for (auto s : ev.affected_securities) { + for (auto s : ev.affected_securities()) { total_orders += s->orders().size(); } } diff --git a/src/server/sparkd/cmds/spartan/back_testing/matcher/validation/matcher_validation_observer.cpp b/src/server/sparkd/cmds/spartan/back_testing/matcher/validation/matcher_validation_observer.cpp index 2596fe4a6..7f216faf5 100644 --- a/src/server/sparkd/cmds/spartan/back_testing/matcher/validation/matcher_validation_observer.cpp +++ b/src/server/sparkd/cmds/spartan/back_testing/matcher/validation/matcher_validation_observer.cpp @@ -90,7 +90,7 @@ void _sync_orders( bool _has_multiple_aggressor_secs(const MDP3Event &ev) { bool aggr_sec_found = false; - for (auto *s : ev.affected_securities) { + for (auto *s : ev.affected_securities()) { for (auto f : s->fills()) { switch (f.aggressor) { case MDP3Fill::Aggressor::THIS_BUY: @@ -279,7 +279,7 @@ struct MatcherValidationObserver::PImpl { EventFlags flags = EventFlags::None; if (_has_multiple_aggressor_secs(ev)) flags |= EventFlags::MultipleSecurityAggressors; - for (const auto *s : ev.affected_securities) { + for (const auto *s : ev.affected_securities()) { for (auto &f : s->fills()) { if (icebergs.find(f.key) != icebergs.end()) flags |= EventFlags::IcebergOrders; @@ -334,14 +334,14 @@ bool MatcherValidationObserver::_is_ready_to_trade( } void MatcherValidationObserver::_sync_current_orders(MDP3Event const &ev) { - for (auto s : ev.affected_securities) { + for (auto s : ev.affected_securities()) { auto &new_orders = _me->get_security_data(*s, ev.event_id).current_orders; _sync_orders(ev.event_id, *s, new_orders, _me->icebergs); } } void MatcherValidationObserver::_sync_previous_orders(const MDP3Event &ev) { - for (auto s : ev.affected_securities) { + for (auto s : ev.affected_securities()) { auto &old_orders = _me->get_security_data(*s, ev.event_id).previous_orders; _sync_orders(ev.event_id, *s, old_orders, _me->icebergs); @@ -413,7 +413,7 @@ void MatcherValidationObserver::on_event_end(MDP3Event const &ev) { // in a particular order, sorted hierarchically by symbol, then expiration. // 'sorted_secs' will contain the proper order of securities. std::vector sorted_secs; - for (auto *s : ev.affected_securities) { + for (auto *s : ev.affected_securities()) { if (_is_interesting_sec(*s)) sorted_secs.push_back(s); } diff --git a/src/server/sparkd/cmds/spartan/back_testing/sim/pcap/PCapEventGenerator.cpp b/src/server/sparkd/cmds/spartan/back_testing/sim/pcap/PCapEventGenerator.cpp index 3cd9024e2..526638249 100644 --- a/src/server/sparkd/cmds/spartan/back_testing/sim/pcap/PCapEventGenerator.cpp +++ b/src/server/sparkd/cmds/spartan/back_testing/sim/pcap/PCapEventGenerator.cpp @@ -91,7 +91,7 @@ void PCapEventGenerator::on_event_end(MDP3Event const &ev_in) { ev.first_packet_sn = ev.first_packet_sn; ev.last_packet_sn = ev.last_packet_sn; - for (auto snap_ptr : ev_in.affected_securities) { + for (auto snap_ptr : ev_in.affected_securities()) { auto &snap_cpy = ev.affected_securities.emplace_back(); // light_copy() does not copy the orders, just the order changes // Observers of this class should see a continuous stream of diff --git a/src/server/sparkd/cmds/spartan/md/channel_observers/DefinitionCollector.cpp b/src/server/sparkd/cmds/spartan/md/channel_observers/DefinitionCollector.cpp index bfe9da583..11aa688b5 100644 --- a/src/server/sparkd/cmds/spartan/md/channel_observers/DefinitionCollector.cpp +++ b/src/server/sparkd/cmds/spartan/md/channel_observers/DefinitionCollector.cpp @@ -19,7 +19,7 @@ void DefinitionCollector::on_recovery_complete( } void DefinitionCollector::on_event_end(MDP3Event const &ev) { - for (auto s : ev.affected_securities) { + for (auto s : ev.affected_securities()) { auto it = result.find(s->security_id()); if (it == result.end()) result.insert({s->security_id(), s->definition()}); diff --git a/src/server/sparkd/cmds/spartan/md/channel_observers/FillCounter.cpp b/src/server/sparkd/cmds/spartan/md/channel_observers/FillCounter.cpp index cc9e68a90..89eae5fba 100644 --- a/src/server/sparkd/cmds/spartan/md/channel_observers/FillCounter.cpp +++ b/src/server/sparkd/cmds/spartan/md/channel_observers/FillCounter.cpp @@ -34,7 +34,7 @@ void FillCounter::on_recovery_complete( } void FillCounter::on_event_end(MDP3Event const &ev) { - for (auto snap : ev.affected_securities) { + for (auto snap : ev.affected_securities()) { auto &c = me->counts[snap->security_id()]; if (c.sec_id.value() == 0) { c.sec_id = snap->security_id(); diff --git a/src/server/sparkd/cmds/spartan/md/channel_observers/IcebergFinder.cpp b/src/server/sparkd/cmds/spartan/md/channel_observers/IcebergFinder.cpp index 489f136db..3ef6ecb8d 100644 --- a/src/server/sparkd/cmds/spartan/md/channel_observers/IcebergFinder.cpp +++ b/src/server/sparkd/cmds/spartan/md/channel_observers/IcebergFinder.cpp @@ -189,7 +189,7 @@ void IcebergFinder::on_recovery_complete(InitialSnapshot const &snap) { void IcebergFinder::on_event_end(MDP3Event const &ev) { me->fills.clear(); - for (auto s : ev.affected_securities) { + for (auto s : ev.affected_securities()) { _on_fills(s->fills()); _on_security_changed(ev.event_id, *s); } diff --git a/src/server/sparkd/cmds/spartan/md/channel_observers/PolygonOpportunityFinder.cpp b/src/server/sparkd/cmds/spartan/md/channel_observers/PolygonOpportunityFinder.cpp index a3d0175de..66e7b6248 100644 --- a/src/server/sparkd/cmds/spartan/md/channel_observers/PolygonOpportunityFinder.cpp +++ b/src/server/sparkd/cmds/spartan/md/channel_observers/PolygonOpportunityFinder.cpp @@ -312,7 +312,7 @@ void PolygonOpportunityFinder::on_event_end(MDP3Event const &ev) { std::unordered_set to_recalc = me->active_polygons; me->active_polygons.clear(); - for (auto &s : ev.affected_securities) { + for (auto &s : ev.affected_securities()) { me->all_snapshots[s->security_id()] = {s, ev.event_id}; auto &these_dependencies = me->dependencies[s->security_id()]; to_recalc.insert(these_dependencies.begin(), these_dependencies.end()); diff --git a/src/server/sparkd/cmds/spartan/md/channel_observers/SyntheticBookRecorder.cpp b/src/server/sparkd/cmds/spartan/md/channel_observers/SyntheticBookRecorder.cpp index 46977b552..05e4d8f83 100644 --- a/src/server/sparkd/cmds/spartan/md/channel_observers/SyntheticBookRecorder.cpp +++ b/src/server/sparkd/cmds/spartan/md/channel_observers/SyntheticBookRecorder.cpp @@ -219,8 +219,8 @@ void SyntheticBookRecorder::on_recovery_complete(const InitialSnapshot &snap) { void SyntheticBookRecorder::on_event_end(const MDP3Event &ev) { on_securities_changed( - ev.event_id, ev.affected_securities.begin(), - ev.affected_securities.end(), _me->synthetic_defs(), _me->reverse_legs(), + ev.event_id, ev.affected_securities().begin(), + ev.affected_securities().end(), _me->synthetic_defs(), _me->reverse_legs(), _me->mbooks(), _me->msynthetic_book_history()); } void SyntheticBookRecorder::on_packet_loss() {} diff --git a/src/server/sparkd/cmds/spartan/md/common/mdp3_common.h b/src/server/sparkd/cmds/spartan/md/common/mdp3_common.h index 5f71d33dc..0583df020 100644 --- a/src/server/sparkd/cmds/spartan/md/common/mdp3_common.h +++ b/src/server/sparkd/cmds/spartan/md/common/mdp3_common.h @@ -5,34 +5,48 @@ #include "lib/md/IntPrice.h" #include "lib/utils/ValueWrapper.h" #include "lib/utils/overloaded.h" -#include "server/sparkd/cmds/spartan/common/TimeStamp.h" -#include "server/sparkd/cmds/spartan/common/OrderKey.h" -#include "server/sparkd/cmds/spartan/common/SecurityID.h" -#include "server/sparkd/cmds/spartan/common/Quantity.h" #include "server/sparkd/cmds/spartan/common/IcebergQuantity.h" +#include "server/sparkd/cmds/spartan/common/OrderKey.h" #include "server/sparkd/cmds/spartan/common/Price.h" +#include "server/sparkd/cmds/spartan/common/Quantity.h" +#include "server/sparkd/cmds/spartan/common/SecurityID.h" +#include "server/sparkd/cmds/spartan/common/TimeStamp.h" #include #include #include - namespace bts::spartan::mdp3 { class InstrumentSnapshot; class MDP3Event { public: - TimeStamp transact_time = TimeStamp{0}; size_t event_id = 0; + TimeStamp transact_time = TimeStamp{0}; TimeStamp first_packet_send_time; TimeStamp last_packet_send_time; uint32_t first_packet_sn; uint32_t last_packet_sn; - boost::container::flat_set affected_securities; + + std::vector const &affected_securities() const { + return _affected_securities; + } + + bool add(InstrumentSnapshot const *sec) { + for (auto s : _affected_securities) + if (s == sec) + return false; + _affected_securities.push_back(sec); + return true; + } + void reset() { transact_time = TimeStamp{0}; - affected_securities.clear(); + _affected_securities.clear(); } + + private: + std::vector _affected_securities; }; inline std::string str_from_fixed_array(const char *ptr, size_t max_len) { diff --git a/src/server/sparkd/cmds/spartan/md/realtime/RealTimeHandler.cpp b/src/server/sparkd/cmds/spartan/md/realtime/RealTimeHandler.cpp index 9138ff071..abd1f0c6b 100644 --- a/src/server/sparkd/cmds/spartan/md/realtime/RealTimeHandler.cpp +++ b/src/server/sparkd/cmds/spartan/md/realtime/RealTimeHandler.cpp @@ -104,7 +104,7 @@ struct RealTimeHandler::EventGuard { void record_security_change(InstrumentSnapshot *s) { auto &info = owner.me->current_event; s->set_last_msg_processed_sn(owner.me->current_packet_sn); - info.affected_securities.insert(s); + info.add(s); } RealTimeHandler &owner; @@ -654,7 +654,7 @@ void RealTimeHandler::on_end_of_event() { me->current_event.event_id++; me->observer.on_event_end(me->current_event); - for (auto s : me->current_event.affected_securities) { + for (auto s : me->current_event.affected_securities()) { const_cast(s)->clear_fills(); const_cast(s)->clear_order_changes(); } diff --git a/src/server/sparkd/cmds/spartan/md/tests/spartan_md_tests.cpp b/src/server/sparkd/cmds/spartan/md/tests/spartan_md_tests.cpp index 87a562ec6..c8e31e548 100644 --- a/src/server/sparkd/cmds/spartan/md/tests/spartan_md_tests.cpp +++ b/src/server/sparkd/cmds/spartan/md/tests/spartan_md_tests.cpp @@ -58,7 +58,7 @@ TEST_CASE("spartan_md", "[spartan_md]") { } void on_event_end(MDP3Event const &ev) override { real_time = true; - for (auto i : ev.affected_securities) + for (auto i : ev.affected_securities()) instruments[i->security_id()] = i; } void on_packet_loss() override { REQUIRE(false); } @@ -111,7 +111,7 @@ TEST_CASE("spartan_md", "[spartan_md]") { } } void on_event_end(MDP3Event const &ev) override { - for (auto is : ev.affected_securities) { + for (auto is : ev.affected_securities()) { if (is->trading_status() == ::mdp3::SecurityTradingStatus::ReadyToTrade) { auto buy_ok = is->build_book_from_orders(api::SIDE_BUY) == diff --git a/src/server/sparkd/cmds/spartan/md/utils/mdp3_utils.cpp b/src/server/sparkd/cmds/spartan/md/utils/mdp3_utils.cpp index 7184cb875..8c227c919 100644 --- a/src/server/sparkd/cmds/spartan/md/utils/mdp3_utils.cpp +++ b/src/server/sparkd/cmds/spartan/md/utils/mdp3_utils.cpp @@ -592,7 +592,7 @@ struct CSVObs : IChannelObserver { << ev.last_packet_send_time // last packet send time << std::endl; - for (auto s : ev.affected_securities) { + for (auto s : ev.affected_securities()) { if (known_securities.count(s->security_id()) == 0) { known_securities.insert(s->security_id()); diff --git a/src/server/sparkd/cmds/spartan/md/utils/queries/BookStatRecorder.cpp b/src/server/sparkd/cmds/spartan/md/utils/queries/BookStatRecorder.cpp index 1d6568134..4edbf6ff2 100644 --- a/src/server/sparkd/cmds/spartan/md/utils/queries/BookStatRecorder.cpp +++ b/src/server/sparkd/cmds/spartan/md/utils/queries/BookStatRecorder.cpp @@ -185,7 +185,7 @@ void BookStatRecorder::on_event_end(MDP3Event const &ev) { case bts::spartan::EventOrdinal::Interesting: _me->event_id = ev.event_id; record_data( - ev.affected_securities, ev.event_id, _me->block_size, _me->num_blocks, + ev.affected_securities(), ev.event_id, _me->block_size, _me->num_blocks, _me->out); break; case bts::spartan::EventOrdinal::Done: