diff --git a/src/lib/md/MDClient.cpp b/src/lib/md/MDClient.cpp index a0f5313b0..dbe3eab5b 100644 --- a/src/lib/md/MDClient.cpp +++ b/src/lib/md/MDClient.cpp @@ -1,6 +1,7 @@ #include "MDClient.h" #include "get_symbols.h" #include "SecurityCache.h" +#include "SecurityOracle.h" #include namespace bts { @@ -14,14 +15,16 @@ struct MDClientImpl{ utils::DispatcherTimer _recovery_timer; MDConsumer _consumer; utils::Event _event; + SecurityOracle _oracle; - MDClientImpl(utils::Dispatcher& d, std::shared_ptr s): + MDClientImpl(utils::Dispatcher& d, std::shared_ptr s, SecurityOracle o): _dispatcher(d), _ss(s), _security_timer(d, config::get().security_scan_interval(),[this]() { scan_securities(); }), _recovery_timer(d, config::get().recovery_interval(), [this]() { check_heartbeats(); }), _consumer(s, _cache), - _event() + _event(), + _oracle(o) { _security_timer.start(); _recovery_timer.start(); @@ -57,8 +60,8 @@ struct MDClientImpl{ }; -MDClient::MDClient(utils::Dispatcher& d, std::shared_ptr s) : _self(new MDClientImpl(d,s)) { - +MDClient::MDClient(utils::Dispatcher& d, std::shared_ptr s) : + _self(new MDClientImpl(d,s, SecurityOracle(*this))) { } MDClient::~MDClient() { } @@ -66,11 +69,11 @@ MDClient::~MDClient() { utils::EventSubscriber& MDClient::on_consumer() { return _self->_event; } -MDConsumer MDClient::current_consumer() const { +MDConsumer& MDClient::current_consumer() const { return _self->_consumer; } -SecurityOracle MDClient::oracle() { - return SecurityOracle(*this); +SecurityOracle& MDClient::oracle() const { + return _self->_oracle; } }}//namespace \ No newline at end of file diff --git a/src/lib/md/MDClient.h b/src/lib/md/MDClient.h index b82549ae7..e80bb4a1e 100644 --- a/src/lib/md/MDClient.h +++ b/src/lib/md/MDClient.h @@ -3,12 +3,12 @@ #include "lib/utils/Dispatcher.h" #include "lib/utils/Event.h" #include "ISyntheticSecurityService.h" -#include "SecurityOracle.h" #include namespace bts { namespace md { +class SecurityOracle; struct MDClientImpl; class MDClient { std::unique_ptr _self; @@ -18,8 +18,8 @@ public: ~MDClient(); utils::EventSubscriber& on_consumer(); - MDConsumer current_consumer() const; - SecurityOracle oracle(); + MDConsumer& current_consumer() const; + SecurityOracle& oracle() const; }; diff --git a/src/lib/md/MDConsumerInterop.cpp b/src/lib/md/MDConsumerInterop.cpp index 7048354c5..142270e6f 100644 --- a/src/lib/md/MDConsumerInterop.cpp +++ b/src/lib/md/MDConsumerInterop.cpp @@ -2,6 +2,7 @@ #include "common.h" #include "UserSymbol.h" #include "MDConsumer.h" +#include "SecurityCache.h" #include "get_symbols.h" #include "relay/RelayClient.h" #include "lib/utils/Dispatcher.h" @@ -27,15 +28,16 @@ struct BlitUserSymbol { CAPI MDConsumer* create_md_consumer(BlitUserSymbol* usersymbols, uint32_t count, bool shared) { std::shared_ptr pnull = nullptr; + SecurityCache cache; if (usersymbols == nullptr || count == 0) { - return new MDConsumer(pnull, shared); + return new MDConsumer(pnull, cache, shared); } else { std::set symbols; for (size_t x = 0; x < count; ++x) { symbols.insert(UserSymbol(usersymbols[x].symbol, usersymbols[x].exchange, usersymbols[x].type)); } - return new MDConsumer(symbols, pnull, shared); + return new MDConsumer(symbols, pnull, cache, shared); } } diff --git a/src/lib/md/SecurityOracle.cpp b/src/lib/md/SecurityOracle.cpp index 6a7f81ea1..7691f6e4c 100644 --- a/src/lib/md/SecurityOracle.cpp +++ b/src/lib/md/SecurityOracle.cpp @@ -4,28 +4,10 @@ namespace bts { namespace md { -struct SecurityOracleImpl { - SecurityOracleImpl(MDClient& client): - client(client), - consumer(client.current_consumer()) - { - sub = client.on_consumer().subscribe([this](const MDConsumer& c) { - consumer = c; - }); - } - ~SecurityOracleImpl() { - client.on_consumer().unsubscribe(sub); - } - MDClient& client; - MDConsumer consumer; - int sub; - -}; - -SecurityOracle::SecurityOracle(MDClient& client): _self(new SecurityOracleImpl(client)) { } +SecurityOracle::SecurityOracle(const MDClient& client): _client(client) {} SecurityOracle::~SecurityOracle() { } const api::Security* SecurityOracle::get_security(SecurityKey key) const { - return _self->consumer.get_security(key); + return _client.current_consumer().get_security(key); } }}//namespace \ No newline at end of file diff --git a/src/lib/md/SecurityOracle.h b/src/lib/md/SecurityOracle.h index da0210f18..e45ba062f 100644 --- a/src/lib/md/SecurityOracle.h +++ b/src/lib/md/SecurityOracle.h @@ -4,14 +4,11 @@ namespace bts { namespace md { - class MDClient; - -struct SecurityOracleImpl; class SecurityOracle { - std::unique_ptr _self; + const MDClient& _client; public: - SecurityOracle(MDClient&); + SecurityOracle(const MDClient&); ~SecurityOracle(); const api::Security* get_security(SecurityKey key) const; };