diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp index 689dce72d..55060b5bf 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp @@ -141,7 +141,7 @@ void SpreaderOrder::_on_child_order_update(const OrderStateUpdateEvent& ord_ev){ return; } SpreaderLegData* leg_data_ptr = _bookkeeping_data().find_leg_from_quoter_orderkey(order_key); - _order_services->order_services().log(ord_ev.trace,"_on_child_order_update:1", key().value()); + _order_services->log(ord_ev.trace,"_on_child_order_update:1", key().value()); if (leg_data_ptr != nullptr){ SpreaderLegData& leg_data = *leg_data_ptr; ChildOrderError order_error = _get_order_error (ord_ev, @@ -155,7 +155,7 @@ void SpreaderOrder::_on_child_order_update(const OrderStateUpdateEvent& ord_ev){ filled_qty, order_price, last_price, ord_ev.last_msg, static_cast(order_error)); leg_data.order_update_message().on_order_update(ord_ev); - _order_services->order_services().log(ord_ev.trace,"_on_child_order_update:2", key().value()); + _order_services->log(ord_ev.trace,"_on_child_order_update:2", key().value()); if (order_error == ChildOrderError::NONE){ if (leg_data.order_update_message().last_update_filled_quantity().value() > 0){ cb_type='f'; @@ -166,7 +166,7 @@ void SpreaderOrder::_on_child_order_update(const OrderStateUpdateEvent& ord_ev){ cb_type='q'; LOG(OrderMan,Info,"h_p q child update {0}",_diff_ns()); _state_worker->on_quoter_order_status_update (leg_data); - _order_services->order_services().log(ord_ev.trace,"_on_child_order_update:4", key().value()); + _order_services->log(ord_ev.trace,"_on_child_order_update:4", key().value()); } } else @@ -202,7 +202,7 @@ void SpreaderOrder::_on_child_order_update(const OrderStateUpdateEvent& ord_ev){ } LOG(OrderMan,Info,"h_p cb done {} {}",cb_type, _diff_ns()); _send_check_termination(true); - _order_services->order_services().log(ord_ev.trace,"_on_child_order_update:5", key().value()); + _order_services->log(ord_ev.trace,"_on_child_order_update:5", key().value()); _report_state(); _order_services->log(ord_ev.trace,"end_on_child_order_update", key().value()); LOG(OrderMan, Info,"h_p end {} {}",cb_type, _diff_ns()); @@ -338,14 +338,14 @@ void SpreaderOrder::_send_hedge(size_t hedge_leg_index, Quantity hedge_qty, const trace::CorID trace){ auto scoped_log = - _order_services->order_services().log_scope(trace,"SpreaderOrder::_send_hedge"); + _order_services->log_scope(trace,"SpreaderOrder::_send_hedge"); SingleFillHedger& hedger = _bookkeeping_data().add_new_hedger (*this, hedge_leg_index, hedge_price, hedge_qty, - &_order_services->order_services(), + _order_services, trace); - _order_services->order_services().log(trace,"SpreaderOrder::_send_hedge:2"); + _order_services->log(trace,"SpreaderOrder::_send_hedge:2"); hedger.init (); } void SpreaderOrder::_compute_hedge_price_quantity(size_t filled_leg_index, diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp index 276fee5ec..4e03cf961 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp @@ -84,7 +84,7 @@ SingleFillHedger& SpreaderBookkeepingData::add_new_hedger(ISpreaderManager& spre size_t leg_index, bts::Price hedge_price, bts::Quantity hedge_quantity, - OrderServices *serv, + SpreaderOrderServices* serv, const trace::CorID &trace){ if (serv) serv->log(trace, "SpreaderBookkeepingData::add_new_hedger"); diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h index 5ee70be5c..bb141f4c9 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h @@ -108,7 +108,7 @@ public: size_t leg_index, bts::Price hedge_price, bts::Quantity hedge_quantity, - OrderServices *services, + SpreaderOrderServices *services, trace::CorID const &); // finds the spreader fill, price (ie averages it out, using // the size and price ratio, across all legs) diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp index 036d4dbd8..6ce905520 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp @@ -80,7 +80,7 @@ void SpreaderWorkingStateWorker::on_quoter_order_error(SpreaderLegData& leg_data void SpreaderWorkingStateWorker::on_quoter_order_fill(SpreaderLegData& leg_data, trace::CorID trace){ LOG(OrderMan, Info,"h_p w start {0}",_spreader->_diff_ns()); - _spreader->_order_services->order_services().log_scope(trace, "SpreaderWorkingStateWorker::on_quoter_order_fill"); + _spreader->_order_services->log_scope(trace, "SpreaderWorkingStateWorker::on_quoter_order_fill"); // this is the most complex part of the spreader. the following needs to be done // 1. tell other quoters about it (so they reduce their sizes) @@ -106,7 +106,7 @@ void SpreaderWorkingStateWorker::on_quoter_order_fill(SpreaderLegData& leg_data, Price hedge_price; double hedge_qty; - _spreader->_order_services->order_services().log(trace, "SpreaderWorkingStateWorker::on_quoter_order_fill:1"); + _spreader->_order_services->log(trace, "SpreaderWorkingStateWorker::on_quoter_order_fill:1"); _spreader->_compute_hedge_price_quantity(leg_data.leg_property_data().leg_index(), order_update_message.last_update_filled_price(), order_update_message.last_update_filled_quantity().value(), @@ -114,7 +114,7 @@ void SpreaderWorkingStateWorker::on_quoter_order_fill(SpreaderLegData& leg_data, q_idx, hedge_price, hedge_qty); - _spreader->_order_services->order_services().log(trace, "SpreaderWorkingStateWorker::on_quoter_order_fill:2"); + _spreader->_order_services->log(trace, "SpreaderWorkingStateWorker::on_quoter_order_fill:2"); UnhedgedDelta& leg_unhedged_delta = other_leg_data.unhedged_delta(); leg_unhedged_delta.add_unhedged(hedge_price.value(), hedge_qty); uint32_t total_unhedged_qty=leg_unhedged_delta.subtract_hedge_if_available(); @@ -123,14 +123,14 @@ void SpreaderWorkingStateWorker::on_quoter_order_fill(SpreaderLegData& leg_data, // if it is an actively quoting leg, inform the quoter about it // so it can decrease the proportional size if (other_leg_data.leg_property_data().is_active_quoting()){ - auto scoped = _spreader->_order_services->order_services().log_scope(trace, "SpreaderWorkingStateWorker::on_quoter_order_fill:4"); + auto scoped = _spreader->_order_services->log_scope(trace, "SpreaderWorkingStateWorker::on_quoter_order_fill:4"); other_leg_data.quoter().update_other_leg_fills(leg_data.leg_property_data().leg_index(), Quantity(total_unhedged_qty)); LOG(OrderMan, Info,"h_p q minus {0} {1}", q_idx, _spreader->_diff_ns()); } // a hedge is sent regardless - _spreader->_order_services->order_services().log(trace, "SpreaderWorkingStateWorker::on_quoter_order_fill:4"); + _spreader->_order_services->log(trace, "SpreaderWorkingStateWorker::on_quoter_order_fill:4"); _spreader->_send_hedge(other_leg_data.leg_property_data().leg_index(), hedge_price, Quantity(total_unhedged_qty),