From e87e4b2dcb7bee8fbdba985c3b7f3f768cd6bd85 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Fri, 11 Oct 2024 15:55:26 +0000 Subject: [PATCH] refactor: Change raw IDGenerator ptr to shared_ptr --- src/app_sparkd/sparkd/md/MarketDataGateway.cpp | 4 ++-- .../sparkd/md/ccapi/CCApiMarketDataProvider.cpp | 2 +- src/lib_spark/spark/md/GeneralMarketDataListener.cpp | 10 ++++++---- src/lib_spark/spark/md/GeneralMarketDataListener.h | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/app_sparkd/sparkd/md/MarketDataGateway.cpp b/src/app_sparkd/sparkd/md/MarketDataGateway.cpp index e31fe1e66..af72bc3d4 100644 --- a/src/app_sparkd/sparkd/md/MarketDataGateway.cpp +++ b/src/app_sparkd/sparkd/md/MarketDataGateway.cpp @@ -51,7 +51,7 @@ struct MarketDataGateway::PImpl { shared_ptr md_producer; shared_ptr listener; - MdSink(api::Venue venue, IDGenerator *sec_id_store) + MdSink(api::Venue venue, shared_ptr sec_id_store) : sec_index(std::make_shared()), md_producer(std::make_shared()), listener(std::make_shared( @@ -103,7 +103,7 @@ void MarketDataGateway::start() { for (auto &[venue, source] : provider->get_sources()) { const auto v = domain::DomainSecurityUtils::convert(venue); auto &sink = me_->sinks.emplace_back( - std::make_unique(v, me_->sec_id_store.get())); + std::make_unique(v, me_->sec_id_store)); source->start(sink->listener); } } diff --git a/src/app_sparkd/sparkd/md/ccapi/CCApiMarketDataProvider.cpp b/src/app_sparkd/sparkd/md/ccapi/CCApiMarketDataProvider.cpp index 090ddc381..aeb2ca40b 100644 --- a/src/app_sparkd/sparkd/md/ccapi/CCApiMarketDataProvider.cpp +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiMarketDataProvider.cpp @@ -47,7 +47,7 @@ struct CCApiMarketDataProvider::PImpl { VenueSink(api::Venue venue, shared_ptr sec_id_store) : sec_index(), md_producer(std::make_shared()), listener(std::make_shared( - sec_index, md_producer, venue, sec_id_store.get())) {} + sec_index, md_producer, venue, sec_id_store)) {} }; MarketDataConfig config; diff --git a/src/lib_spark/spark/md/GeneralMarketDataListener.cpp b/src/lib_spark/spark/md/GeneralMarketDataListener.cpp index bd083485d..f4f3139f0 100644 --- a/src/lib_spark/spark/md/GeneralMarketDataListener.cpp +++ b/src/lib_spark/spark/md/GeneralMarketDataListener.cpp @@ -52,6 +52,8 @@ namespace bts::md { +using bts::persistence::IDGenerator; + using MDArray = std::array; #define SEC_TYPE(x) bts::domain::protobufs::SECURITY_TYPE_##x @@ -176,7 +178,7 @@ struct GeneralMarketDataListener::PImpl { const std::string cc_name_prefix = "cc_security"; const bool use_given_sec_key = false; size_t n_bk_updates = 0; - bts::persistence::IDGenerator *id_gen; + std::shared_ptr id_gen; std::shared_ptr index; std::shared_ptr md_producer; const std::shared_ptr sim_ex_gwy = @@ -195,8 +197,8 @@ struct GeneralMarketDataListener::PImpl { std::shared_ptr index, std::shared_ptr md_producer, std::shared_ptr sim_ex_gwy, - persistence::IDGenerator *sec_id_store) - : venue(venue), id_gen(sec_id_store), index(std::move(index)), + std::shared_ptr sec_id_store) + : venue(venue), id_gen(std::move(sec_id_store)), index(std::move(index)), md_producer(std::move(md_producer)), sim_ex_gwy(std::move(sim_ex_gwy)) { if (this->sim_ex_gwy != nullptr) { @@ -252,7 +254,7 @@ GeneralMarketDataListener::GeneralMarketDataListener( std::shared_ptr index, std::shared_ptr md_producer, api::Venue venue, - persistence::IDGenerator *sec_id_store) + std::shared_ptr sec_id_store) : me(std::make_unique( domain::DomainSecurityUtils::convert(venue), index, diff --git a/src/lib_spark/spark/md/GeneralMarketDataListener.h b/src/lib_spark/spark/md/GeneralMarketDataListener.h index d5e6dcb3c..f3568bd51 100644 --- a/src/lib_spark/spark/md/GeneralMarketDataListener.h +++ b/src/lib_spark/spark/md/GeneralMarketDataListener.h @@ -20,7 +20,7 @@ class GeneralMarketDataListener : public IMarketDataListener { std::shared_ptr index, std::shared_ptr md_producer, api::Venue venue, - persistence::IDGenerator *sec_id_store); + std::shared_ptr sec_id_store); virtual ~GeneralMarketDataListener(); void on_securities(const std::vector &complete_security_list) override;