From e24e04ca4f4e53ce26d0537a23af4fa937560841 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Thu, 7 Mar 2019 13:27:05 -0500 Subject: [PATCH] Fixed OrderManager reentrancy problem reported by Taha --- src/lib/orderman/actors/order_manager/OrderManager.cpp | 8 ++++---- src/lib/orderman/actors/order_manager/OrderServices.h | 8 +++++++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/lib/orderman/actors/order_manager/OrderManager.cpp b/src/lib/orderman/actors/order_manager/OrderManager.cpp index 94bab97d7..37f03c800 100644 --- a/src/lib/orderman/actors/order_manager/OrderManager.cpp +++ b/src/lib/orderman/actors/order_manager/OrderManager.cpp @@ -201,7 +201,7 @@ void OrderManager::on_activate_order( order->init_order_services(me->services_data); auto r = me->orders.emplace(order->key(), order); bts_assert(r.second); - order->on_activate(ev.price, ev.quantity, *order->_services, ev.trace); + order->_services->activate(ev.price, ev.quantity, ev.trace); } } @@ -211,7 +211,7 @@ void OrderManager::on_update_order(const mercury::Update &m) { auto k = ev.key(); auto it = me->orders.find(k); if (it != me->orders.end()) - it->second->on_update(ev.price, ev.quantity, ev.trace); + it->second->_services->update(ev.price, ev.quantity, ev.trace); else { LOG(OrderMan, Error, "Received an update request for an unknown order {}. " @@ -227,7 +227,7 @@ void OrderManager::on_cancel_order(const mercury::Update &m) { auto k = ev.key(); auto it = me->orders.find(k); if (it != me->orders.end()) - it->second->on_cancel(ev.trace); + it->second->_services->cancel(ev.trace); else { LOG(OrderMan, Error, "Received a cancel request for an unknown order {}. " @@ -243,7 +243,7 @@ void OrderManager::on_crack_order(const mercury::Update &m) { auto k = ev.key(); auto it = me->orders.find(k); if (it != me->orders.end()) - it->second->on_crack(ev.trace); + it->second->_services->crack(ev.trace); else { LOG(OrderMan, Error, "Received a crack request for an unknown order {}. " diff --git a/src/lib/orderman/actors/order_manager/OrderServices.h b/src/lib/orderman/actors/order_manager/OrderServices.h index f910cbda1..b86396787 100644 --- a/src/lib/orderman/actors/order_manager/OrderServices.h +++ b/src/lib/orderman/actors/order_manager/OrderServices.h @@ -280,7 +280,8 @@ class OrderServices { private: friend class OrderBuilder; - + friend class OrderManager; + template void on_external_event(EV const &ev, C const &c) { bts_assert(!_busy); @@ -340,6 +341,11 @@ class OrderServices { o.warm_up_activate(*_data,*this); } + void activate(Price p, Quantity q, trace::CorID const &trace) { + on_inter_order_call([p, q, trace](OrderServices &self) { + self._owner->on_activate(p, q, self,trace); + }); + } void update(Price p, Quantity q, trace::CorID const &trace) { on_inter_order_call([p, q, trace](OrderServices &self) { self._owner->on_update(p, q, trace);