diff --git a/src/lib/md/SecurityOracle.h b/src/lib/md/SecurityOracle.h index e45ba062f..82163a1e1 100644 --- a/src/lib/md/SecurityOracle.h +++ b/src/lib/md/SecurityOracle.h @@ -1,8 +1,9 @@ #pragma once -#include "SecurityPtr.h" +#include "lib/domain_model/SecurityKey.h" #include namespace bts { +namespace api {class Security;} namespace md { class MDClient; class SecurityOracle { diff --git a/src/lib/orderman/actors/AsyncFactory.cpp b/src/lib/orderman/actors/AsyncFactory.cpp index 91b76045e..f6543a5b2 100644 --- a/src/lib/orderman/actors/AsyncFactory.cpp +++ b/src/lib/orderman/actors/AsyncFactory.cpp @@ -7,7 +7,6 @@ #include "lib/orderman/events/CreateOrderReplyEvent.h" #include "lib/orderman/events/CreateOrderRequestEvent.h" #include "lib/orderman/events/NewAdminDataEvent.h" -#include "lib/orderman/events/NewSecuritiesEvent.h" #include "lib/orderman/order_factory/OrderFactory.h" #include "lib/orderman/order_router/OrderRouter.h" #include "lib/orderman/securities/MapSecurityDB.h" @@ -16,8 +15,8 @@ namespace bts { namespace orderman { struct AsyncFactory::PImpl { - PImpl(DynamicOrderRegistry const &b) - : orders_stream(), fix_buffer_stream(), db(), order_router(), + PImpl(DynamicOrderRegistry const &b, md::SecurityOracle o) + : orders_stream(), fix_buffer_stream(), db(o), order_router(), order_factory(db, order_router, b) {} mercury::Stream orders_stream; @@ -27,7 +26,7 @@ struct AsyncFactory::PImpl { OrderFactory order_factory; }; -AsyncFactory::AsyncFactory(DynamicOrderRegistry const &b) : me(new PImpl(b)) {} +AsyncFactory::AsyncFactory(DynamicOrderRegistry const &b, md::SecurityOracle o) : me(new PImpl(b, o)) {} AsyncFactory::~AsyncFactory() {} void AsyncFactory::init() { @@ -40,12 +39,6 @@ void AsyncFactory::init() { me->order_router.update(*ev.admin_data); }); - subscribe([this](auto const &u) { - if (u.events) - for (auto const &ev : *(u.events)) - me->db.securities[SecurityKey(ev.security->id())] = ev.security; - }); - subscribe([this](const auto &u) { if (u.events) for (auto const &ev : *u.events) { diff --git a/src/lib/orderman/actors/AsyncFactory.h b/src/lib/orderman/actors/AsyncFactory.h index 76214701c..d66aebab8 100644 --- a/src/lib/orderman/actors/AsyncFactory.h +++ b/src/lib/orderman/actors/AsyncFactory.h @@ -4,6 +4,7 @@ #include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/mercury/actors/Actor.h" #include "lib/config/protos/jetfix.pb.h" +#include "lib/md/SecurityOracle.h" namespace bts { namespace orderman { @@ -13,7 +14,7 @@ class DynamicOrderRegistry; class AsyncFactory : public mercury::Actor { public: - AsyncFactory(DynamicOrderRegistry const&); + AsyncFactory(DynamicOrderRegistry const&, md::SecurityOracle); ~AsyncFactory(); void init() override; diff --git a/src/lib/orderman/actors/ServiceBridge.cpp b/src/lib/orderman/actors/ServiceBridge.cpp index 62a5ba336..81e96c7b8 100644 --- a/src/lib/orderman/actors/ServiceBridge.cpp +++ b/src/lib/orderman/actors/ServiceBridge.cpp @@ -6,7 +6,6 @@ #include "lib/orderman/events/CancelOrderEvent.h" #include "lib/orderman/events/CrackOrderEvent.h" #include "lib/orderman/events/NewAdminDataEvent.h" -#include "lib/orderman/events/NewSecuritiesEvent.h" #include "lib/orderman/events/OrderManagerReadyEvent.h" #include "lib/orderman/events/StoredFillEvent.h" #include "lib/orderman/events/StoredOrderEvent.h" @@ -29,10 +28,10 @@ struct ServiceBridge::PImpl { PImpl(OnReady const &on_ready, OnOrders const &on_orders, OnFills const &on_fills, DynamicOrderRegistry const &dyn_order_registry, - mercury::BrokerProxy &service_call_marshaller) + mercury::BrokerProxy &service_call_marshaller, md::SecurityOracle o) : on_ready(on_ready), on_orders(on_orders), on_fills(on_fills), - have_orders(false), have_securities(false), order_manager_ready(false), - sec_db(), order_router(), + have_orders(false), order_manager_ready(false), + sec_db(o), order_router(), order_factory(sec_db, order_router, dyn_order_registry), known_orders(), service_call_marshaller(service_call_marshaller) {} @@ -40,7 +39,6 @@ struct ServiceBridge::PImpl { OnOrders on_orders; OnFills on_fills; bool have_orders; - bool have_securities; bool order_manager_ready; securities::MapSecurityDB sec_db; OrderRouter order_router; @@ -59,9 +57,9 @@ struct ServiceBridge::PImpl { ServiceBridge::ServiceBridge(OnReady const &on_ready, OnOrders const &on_orders, OnFills const &on_fills, DynamicOrderRegistry const &dyn_order_registry, - mercury::BrokerProxy &service_call_marshaller) + mercury::BrokerProxy &service_call_marshaller, md::SecurityOracle o) : me(new PImpl(on_ready, on_orders, on_fills, dyn_order_registry, - service_call_marshaller)) {} + service_call_marshaller, o)) {} ServiceBridge::~ServiceBridge() {} @@ -69,7 +67,6 @@ void ServiceBridge::block_until_ready() { me->ready.get_future().wait(); } void ServiceBridge::init() { subscribe([this](auto const &u) { this->on(u); }); - subscribe([this](auto const &u) { this->on(u); }); subscribe([this](auto const &u) { this->on(u); }); subscribe([this](auto const &u) { this->on(u); }); subscribe([this](auto const &u) { this->on(u); }); @@ -108,20 +105,6 @@ void ServiceBridge::on(mercury::Update const &update) { } } -void ServiceBridge::on(mercury::Update const &update) { - if (update.events) { - - // update our security db - for (auto ev : *(update.events)) { - auto sec_ptr = ev.security; - me->sec_db.securities[SecurityKey(sec_ptr->id())] = sec_ptr; - } - bool was_ready = is_ready(); - me->have_securities = true; - maybe_signal_ready(was_ready); - } -} - void ServiceBridge::on(mercury::Update const &update) { if (update.events) { bool was_ready = is_ready(); @@ -247,7 +230,7 @@ void ServiceBridge::update_admin_data( } bool ServiceBridge::is_ready() const { - return me->have_orders && me->have_securities && me->order_manager_ready; + return me->have_orders && me->order_manager_ready; } void ServiceBridge::maybe_signal_ready(bool old_ready) { diff --git a/src/lib/orderman/actors/ServiceBridge.h b/src/lib/orderman/actors/ServiceBridge.h index f78f0a6c6..1c949f061 100644 --- a/src/lib/orderman/actors/ServiceBridge.h +++ b/src/lib/orderman/actors/ServiceBridge.h @@ -2,6 +2,7 @@ #include "lib/config/protos/jetfix.pb.h" #include "lib/mercury/actors/Actor.h" +#include "lib/md/SecurityOracle.h" #include // fwds @@ -25,7 +26,6 @@ class Crack; namespace orderman { class StoredFillEvent; class StoredOrderEvent; -class NewSecuritiesEvent; class OrderManagerReadyEvent; class NewAdminDataEvent; class DynamicOrderRegistry; @@ -50,8 +50,8 @@ class ServiceBridge : public mercury::Actor { ServiceBridge(OnReady const &, OnOrders const &, OnFills const &, DynamicOrderRegistry const &, - - mercury::BrokerProxy &service_call_marshaller); + mercury::BrokerProxy &service_call_marshaller, + md::SecurityOracle o); void init() override; ~ServiceBridge(); @@ -74,7 +74,6 @@ class ServiceBridge : public mercury::Actor { void on(mercury::Update const &); void on(mercury::Update const &); - void on(mercury::Update const &); void on(mercury::Update const &); void on(mercury::Update const &); }; diff --git a/src/lib/orderman/actors/order_manager/OrderManager.cpp b/src/lib/orderman/actors/order_manager/OrderManager.cpp index 68a99d941..4a8ed4482 100644 --- a/src/lib/orderman/actors/order_manager/OrderManager.cpp +++ b/src/lib/orderman/actors/order_manager/OrderManager.cpp @@ -8,6 +8,7 @@ #include "lib/orderman/events/OrderManagerReadyEvent.h" #include "lib/orderman/events/StoredFillEvent.h" #include "lib/orderman/events/StoredOrderEvent.h" +#include "lib/orderman/events/NewSecuritiesEvent.h" #include "lib/orderman/order_factory/OrderFactory.h" #include "lib/orderman/orders/Order.h" #include "lib/orderman/securities/ISecurityDB.h" @@ -31,8 +32,8 @@ enum class OrderManager::State { }; struct OrderManager::PImpl { - PImpl(OrderManager &owner, DynamicOrderRegistry const &b, trace::PerfLog &l) - : state(State::WAIT_ADMIN), services_data(owner, b, l) {} + PImpl(OrderManager &owner, DynamicOrderRegistry const &b, trace::PerfLog &l, md::SecurityOracle o) + : state(State::WAIT_ADMIN), services_data(owner, b, l, o) {} State state; std::unordered_map orders; @@ -42,8 +43,8 @@ struct OrderManager::PImpl { mercury::Stream pub_ready; }; -OrderManager::OrderManager(DynamicOrderRegistry const &b, trace::PerfLog &l) - : me(new PImpl(*this, b, l)) {} +OrderManager::OrderManager(DynamicOrderRegistry const &b, trace::PerfLog &l, md::SecurityOracle o) + : me(new PImpl(*this, b, l, o)) {} OrderManager::~OrderManager() {} void OrderManager::init() { @@ -85,8 +86,6 @@ void OrderManager::on_securities( for (auto const &ev : *(update.events)) { auto sec_ptr = ev.security; secs.push_back(sec_ptr); - me->services_data.sec_db.securities[SecurityKey(sec_ptr->id())] = - sec_ptr; } me->services_data.limiter.add_securities(secs); diff --git a/src/lib/orderman/actors/order_manager/OrderManager.h b/src/lib/orderman/actors/order_manager/OrderManager.h index a8ec11582..4bee86449 100644 --- a/src/lib/orderman/actors/order_manager/OrderManager.h +++ b/src/lib/orderman/actors/order_manager/OrderManager.h @@ -4,6 +4,7 @@ #include "lib/jetfix/common/OutFIXPtr.h" #include "lib/mercury/actors/Actor.h" #include "lib/mercury/actors/IPollableActor.h" +#include "lib/md/SecurityOracle.h" #include "lib/orderman/events/ActivateOrderEvent.h" #include "lib/orderman/events/CancelOrderEvent.h" #include "lib/orderman/events/CrackOrderEvent.h" @@ -60,7 +61,7 @@ namespace orderman { class OrderManager : public mercury::Actor, public mercury::IPollableActor { public: - OrderManager(DynamicOrderRegistry const &dyn_order_builder, trace::PerfLog &); + OrderManager(DynamicOrderRegistry const &dyn_order_builder, trace::PerfLog &, md::SecurityOracle); ~OrderManager(); void init() override; diff --git a/src/lib/orderman/actors/order_manager/OrderServicesData.cpp b/src/lib/orderman/actors/order_manager/OrderServicesData.cpp index 5b19f6e44..253f56317 100644 --- a/src/lib/orderman/actors/order_manager/OrderServicesData.cpp +++ b/src/lib/orderman/actors/order_manager/OrderServicesData.cpp @@ -7,8 +7,8 @@ namespace orderman { OrderServicesData::OrderServicesData(OrderManager &owner, DynamicOrderRegistry const &b, - trace::PerfLog &l) - : owner(owner), log(l), order_router(), + trace::PerfLog &l, md::SecurityOracle o) + : owner(owner), log(l), sec_db(o), order_router(), order_factory(sec_db, order_router, b), last_timer_ev( Timer::now(), diff --git a/src/lib/orderman/actors/order_manager/OrderServicesData.h b/src/lib/orderman/actors/order_manager/OrderServicesData.h index e664aec0a..21afdbc4d 100644 --- a/src/lib/orderman/actors/order_manager/OrderServicesData.h +++ b/src/lib/orderman/actors/order_manager/OrderServicesData.h @@ -8,6 +8,7 @@ #include "lib/orderman/securities/MapSecurityDB.h" #include "lib/mercury/events/TimerEvent.h" +#include "lib/md/SecurityOracle.h" #include "lib/orderman/actors/ExecutionGateway.h" #include "lib/orderman/events/ActivateOrderEvent.h" #include "lib/orderman/events/BookUpdateEvent.h" @@ -22,7 +23,6 @@ #include "lib/orderman/events/GatewayStatusChangeEvent.h" #include "lib/orderman/events/MDRequestEvent.h" #include "lib/orderman/events/NewExecutionReportEvent.h" -#include "lib/orderman/events/NewSecuritiesEvent.h" #include "lib/orderman/events/OrderStateUpdateEvent.h" #include "lib/orderman/events/SettlementRequestEvent.h" #include "lib/orderman/events/SettlementUpdateEvent.h" @@ -75,7 +75,7 @@ class OrderServicesData { public: OrderServicesData(OrderManager &owner, DynamicOrderRegistry const &b, - trace::PerfLog &l); + trace::PerfLog &l, md::SecurityOracle); OrderManager &owner; trace::PerfLog &log; diff --git a/src/lib/orderman/orders/NativeOrder.cpp b/src/lib/orderman/orders/NativeOrder.cpp index 60e1a615f..9ff30477d 100644 --- a/src/lib/orderman/orders/NativeOrder.cpp +++ b/src/lib/orderman/orders/NativeOrder.cpp @@ -4,6 +4,7 @@ #include "lib/jetfix/codec/FIXFragment.h" #include "lib/jetfix/codec/FieldDefinitions.h" #include "lib/logging/logging.h" +#include "lib/domain_model/Security.h" #include "lib/orderman/order_factory/IOrderFactory.h" #include "lib/orderman/order_router/OrderRouter.h" #include "lib/orderman/orderman_utils/ExecutionReport.h" diff --git a/src/lib/orderman/securities/ISecurityDB.h b/src/lib/orderman/securities/ISecurityDB.h index eb7a23fad..427d1171b 100644 --- a/src/lib/orderman/securities/ISecurityDB.h +++ b/src/lib/orderman/securities/ISecurityDB.h @@ -14,7 +14,6 @@ public: virtual ~ISecurityDB() {}; virtual api::Security const *resolve(SecurityKey const&k) const = 0; using SecurityMap = std::unordered_map ; - virtual SecurityMap retrieve_all() const = 0; }; }} diff --git a/src/lib/orderman/securities/MapSecurityDB.h b/src/lib/orderman/securities/MapSecurityDB.h index 2c447d6f9..b2c80252c 100644 --- a/src/lib/orderman/securities/MapSecurityDB.h +++ b/src/lib/orderman/securities/MapSecurityDB.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include "lib/md/SecurityOracle.h" #include "lib/orderman/securities/ISecurityDB.h" namespace bts { @@ -9,15 +9,12 @@ namespace securities { struct MapSecurityDB : public securities::ISecurityDB { + MapSecurityDB(md::SecurityOracle oracle): _oracle(oracle) {} api::Security const *resolve(SecurityKey const&k) const override { - auto it = securities.find(k); - if (it != securities.end()) - return it->second; - else - return nullptr; + return _oracle.get_security(k); } - SecurityMap retrieve_all() const override {return securities;} - SecurityMap securities; + private: + md::SecurityOracle _oracle; }; }} diff --git a/src/lib/orderman/server/OrderServiceServer.cpp b/src/lib/orderman/server/OrderServiceServer.cpp index caf1c67b2..1782d39f7 100644 --- a/src/lib/orderman/server/OrderServiceServer.cpp +++ b/src/lib/orderman/server/OrderServiceServer.cpp @@ -146,7 +146,7 @@ OrderServiceServer::OrderServiceServer( bts_assert_msg(thread, "Could not find a configured thread for OrderManager. See " "the OrdermanCfg key"); - thread->executor.spawn(d,me->log); + thread->executor.spawn(d,me->log, mdc.oracle()); // Timer thread = find_thread_for_actor("Timer", me->actor_threads); @@ -160,7 +160,7 @@ OrderServiceServer::OrderServiceServer( bts_assert_msg(thread, "Could not find a configured thread for AsyncFactory. See " "the OrdermanCfg key"); - thread->executor.spawn(d); + thread->executor.spawn(d, mdc.oracle()); // OrderStore thread = find_thread_for_actor("OrderStore", me->actor_threads); @@ -206,7 +206,7 @@ OrderServiceServer::OrderServiceServer( [this, &ctx](auto const &fill) { ctx.post([this, fill] { this->on_fills(fill); }); }, - me->dyn_order_registry, thread->executor.make_proxy()); + me->dyn_order_registry, thread->executor.make_proxy(),mdc.oracle()); thread->executor.activate(me->service_bridge);