From d9efbb879d4fef9f212f64e35efc3079031866fa Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Wed, 19 Oct 2022 15:29:40 -0400 Subject: [PATCH] IDGenerator is a thread-safe singleton now --- src/lib/md/ccApi/CCMarketDataListener.cpp | 3 ++- src/lib/persistence/IDGenerator.cpp | 12 ++++++++++++ src/lib/persistence/IDGenerator.h | 12 +++++++++++- .../sparkd/md/platforms/emumba/EmMDListener.cpp | 3 ++- 4 files changed, 27 insertions(+), 3 deletions(-) diff --git a/src/lib/md/ccApi/CCMarketDataListener.cpp b/src/lib/md/ccApi/CCMarketDataListener.cpp index cf8bca803..f46d0afe2 100644 --- a/src/lib/md/ccApi/CCMarketDataListener.cpp +++ b/src/lib/md/ccApi/CCMarketDataListener.cpp @@ -61,7 +61,8 @@ struct CCMarketDataListener::PImpl { const bool use_cc_id_as_bts_id = true; const std::string cc_name_prefix = "cc_security"; size_t n_bk_updates = 0; - bts::persistence::IDGenerator id_gen = {}; + bts::persistence::IDGenerator &id_gen = + bts::persistence::IDGenerator::insance(); CCSecurityIndex &index; MDProducer &md_producer; // map of logical key (venue + exchange key) to id diff --git a/src/lib/persistence/IDGenerator.cpp b/src/lib/persistence/IDGenerator.cpp index f88ac7dc1..0a5b5aff5 100644 --- a/src/lib/persistence/IDGenerator.cpp +++ b/src/lib/persistence/IDGenerator.cpp @@ -8,6 +8,9 @@ namespace bts::persistence { +IDGenerator *IDGenerator::_instance = nullptr; +std::mutex IDGenerator::_instance_mx; + struct IDGenerator::PImpl { std::unique_ptr kv_store; PImpl() : kv_store(std::make_unique("key_ids")) {} @@ -15,6 +18,14 @@ struct IDGenerator::PImpl { IDGenerator::IDGenerator() : me(new PImpl()) {} +IDGenerator &IDGenerator::insance() { + std::lock_guard myLock(_instance_mx); + if (!_instance) { + _instance = new IDGenerator(); + } + return *_instance; +} + inline uint64_t str_to_id(const std::string id_str) { return std::stoull(id_str); } @@ -35,6 +46,7 @@ uint64_t get_next_id( std::optional IDGenerator::get_id( const std::string &ns, const std::string &key, bool add_if_new) { + std::lock_guard myLock(_instance_mx); auto [exists, val] = me->kv_store->retrieve_one(ns, key); if (exists) { uint64_t rv = str_to_id(val); diff --git a/src/lib/persistence/IDGenerator.h b/src/lib/persistence/IDGenerator.h index 9f998f9f1..b89a72e45 100644 --- a/src/lib/persistence/IDGenerator.h +++ b/src/lib/persistence/IDGenerator.h @@ -3,20 +3,30 @@ #include #include #include +#include #include namespace bts::persistence { class IDGenerator { - public: + private: IDGenerator(); ~IDGenerator(); + IDGenerator(const IDGenerator &) = delete; + IDGenerator &operator=(const IDGenerator &) = delete; + + public: std::optional get_id( const std::string &ns, const std::string &key, bool add_if_new); + public: + static IDGenerator &insance(); + private: struct PImpl; std::unique_ptr me; + static IDGenerator *_instance; + static std::mutex _instance_mx; }; } // namespace bts::persistence diff --git a/src/server/sparkd/md/platforms/emumba/EmMDListener.cpp b/src/server/sparkd/md/platforms/emumba/EmMDListener.cpp index 79c701209..2c93c158c 100644 --- a/src/server/sparkd/md/platforms/emumba/EmMDListener.cpp +++ b/src/server/sparkd/md/platforms/emumba/EmMDListener.cpp @@ -342,7 +342,8 @@ struct EmMDListener::PImpl { uint32_t n_updates = 0; // to generate exchange_id's (the rest of the system demands it, whereas the // exchange does not give us a numeric id in this case) - bts::persistence::IDGenerator id_gen = {}; + bts::persistence::IDGenerator &id_gen = + bts::persistence::IDGenerator::insance(); emumba::deribit_connector::deribit_handler *handler = nullptr; std::vector trading_sessions; // shared memory