Fixed OrderManager reentrancy problem reported by Taha

This commit is contained in:
Pedro Pinto committed 2019-03-12 10:01:57 -04:00
1 parent 08a1e07ab6
commit e24e04ca4f
2 files changed
+11 -5

No files matched your search

@@ -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<UpdateOrderEvent> &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<CancelOrderEvent> &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<CrackOrderEvent> &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 {}. "
@@ -280,7 +280,8 @@ class OrderServices {
private:
friend class OrderBuilder;
friend class OrderManager;
template <class EV, class C>
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);