From e53c186ea975c57c9dd64776a88e6deb032f136d Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 7 May 2018 10:10:08 -0400 Subject: [PATCH] Batched new secs in a single call to limiter. --- .../sparkd/orderman/actors/order_manager/OrderManager.cpp | 5 ++++- src/server/sparkd/orderman/limiter/Limiter.cpp | 1 + src/server/sparkd/orderman/limiter/Limiter.h | 1 + src/server/sparkd/orderman/limiter/LimiterDataStructures.h | 5 +++-- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/server/sparkd/orderman/actors/order_manager/OrderManager.cpp b/src/server/sparkd/orderman/actors/order_manager/OrderManager.cpp index a116ccd90..3a91ce638 100644 --- a/src/server/sparkd/orderman/actors/order_manager/OrderManager.cpp +++ b/src/server/sparkd/orderman/actors/order_manager/OrderManager.cpp @@ -56,12 +56,15 @@ void OrderManager::on_securities( const mercury::Update &update) { if (update.events) { - // update our security db + // update our security db and accumulate for the sake of the limiter + std::vector secs; 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); if (me->state == State::WAIT_SEC) { LOG(OrderMan, Info, "Order manager received initial set of {} " diff --git a/src/server/sparkd/orderman/limiter/Limiter.cpp b/src/server/sparkd/orderman/limiter/Limiter.cpp index 89bb79646..08b1be5c4 100644 --- a/src/server/sparkd/orderman/limiter/Limiter.cpp +++ b/src/server/sparkd/orderman/limiter/Limiter.cpp @@ -14,6 +14,7 @@ Limiter::~Limiter() {} void Limiter::update(api::admin::AdminData const &) {} +void Limiter::add_securities(std::vector const&) {} void Limiter::add_security(api::Security const &) {} void Limiter::add(api::Security const &, AccountID, api::Side, Quantity) {} diff --git a/src/server/sparkd/orderman/limiter/Limiter.h b/src/server/sparkd/orderman/limiter/Limiter.h index 35f449770..2fe543a8e 100644 --- a/src/server/sparkd/orderman/limiter/Limiter.h +++ b/src/server/sparkd/orderman/limiter/Limiter.h @@ -18,6 +18,7 @@ class Limiter { Limiter(); void update(api::admin::AdminData const &); + void add_securities(std::vector const&secs); void add_security(api::Security const &new_sec); void add(api::Security const &, AccountID, api::Side, Quantity); diff --git a/src/server/sparkd/orderman/limiter/LimiterDataStructures.h b/src/server/sparkd/orderman/limiter/LimiterDataStructures.h index bc8411fe0..4b61ea0f0 100644 --- a/src/server/sparkd/orderman/limiter/LimiterDataStructures.h +++ b/src/server/sparkd/orderman/limiter/LimiterDataStructures.h @@ -195,7 +195,7 @@ public: if (it == _sec_map.end()) return nullptr; else - &it->second; + return &it->second; } ProductLimitTree* find_product(api::Product& product){ for(auto it=_prod_map.begin(); it!= _prod_map.end(); it++){ @@ -279,4 +279,5 @@ private: return _prod_map.back(); } }; -}} \ No newline at end of file +}} +