diff --git a/src/lib/jetfix/gateway/CoreGateway.cpp b/src/lib/jetfix/gateway/CoreGateway.cpp index 67c54111f..e6bac0847 100644 --- a/src/lib/jetfix/gateway/CoreGateway.cpp +++ b/src/lib/jetfix/gateway/CoreGateway.cpp @@ -258,8 +258,6 @@ void CoreGateway::sync_stop(EventData const &) { } void CoreGateway::sync_send(EventData const &ev) { - tracepoint(bts_trace, trace_order, (char *)"CoreGateway.sync_send", 0, - ev.trace.md_sn, 0); switch (me->state) { case State::OFF: bts_assert(false); diff --git a/src/lib/jetfix/gateway/Session.cpp b/src/lib/jetfix/gateway/Session.cpp index 05609d611..ba7a69069 100644 --- a/src/lib/jetfix/gateway/Session.cpp +++ b/src/lib/jetfix/gateway/Session.cpp @@ -561,13 +561,10 @@ void Session::internal_send(trace::CorID trace, OutFIXPtr const &msgs) { data_vec[i].first = s.data(); data_vec[i].second = s.size(); } - tracepoint(bts_trace, trace_order, (char *)"Session.internal_send.pre_write", 0, trace.md_sn,0); if (me->connection.write(data_vec, msgs->fix.size(), trace) < 0) { terminate_session(JetFIXError::CONNECTION_ERROR); return; } - tracepoint(bts_trace, trace_order, - (char *)"Session.internal_send.post_write", 0, trace.md_sn, 0); me->last_sent_msg_timestamp = me->now(); me->store.store(msgs); msgs->set_ts(OutFIX::POST_STORE, utils::TimeStamp::now()); diff --git a/src/lib/orderman/actors/ExecutionGateway.cpp b/src/lib/orderman/actors/ExecutionGateway.cpp index 334f484ed..c50d75ad2 100644 --- a/src/lib/orderman/actors/ExecutionGateway.cpp +++ b/src/lib/orderman/actors/ExecutionGateway.cpp @@ -186,8 +186,6 @@ void ExecutionGateway::on_exe_report( data->exec_type = api::orderman::ExecType(msg.get()); data->msg_seq_num = msg.get(); - tracepoint(bts_trace, trace_order, - (char *)"ExecutionGateway.on_exe_report", 0, 0, 0); // copy data from fix msg to our structure if (msg.has()) diff --git a/src/lib/orderman/orders/NativeOrder.cpp b/src/lib/orderman/orders/NativeOrder.cpp index 78e4a1c26..33b89aadd 100644 --- a/src/lib/orderman/orders/NativeOrder.cpp +++ b/src/lib/orderman/orders/NativeOrder.cpp @@ -505,9 +505,6 @@ void NativeOrder::on_update(Price p, Quantity q, trace::CorID const &trace) { break; } - tracepoint(bts_trace, trace_order, (char *)"on_update.after_limits", 0, - trace.md_sn, trace.order_key); - // all good auto &encoding = me->update_encoding; me->update_price_bm = encoding.overwrite( @@ -517,9 +514,6 @@ void NativeOrder::on_update(Price p, Quantity q, trace::CorID const &trace) { me->update_quantity_bm = encoding.overwrite(me->update_quantity_bm, q.value(), quantity_sz()); - tracepoint(bts_trace, trace_order, (char *)"on_update.half_way", 0, - trace.md_sn, trace.order_key); - auto const &ts = me->services->get_time_str(); me->update_transact_time_bm = encoding.overwrite( me->update_transact_time_bm, &ts.value()[0], ts.value().size()); diff --git a/src/lib/orderman/orders/spreader_orders/ISpreaderStateWorker.h b/src/lib/orderman/orders/spreader_orders/ISpreaderStateWorker.h index f4ef18dca..07cefede3 100644 --- a/src/lib/orderman/orders/spreader_orders/ISpreaderStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/ISpreaderStateWorker.h @@ -34,7 +34,7 @@ public: // 5. called when the user cancels an order virtual void on_cancel() = 0; // 6. on market data update (support late joiners) - virtual void on_book(const Book&,trace::CorID &) = 0; + virtual void on_book(const Book&,trace::CorID ) = 0; // 15. settlement price update virtual void on_settlement_price(const SettlementUpdateEvent&) = 0; // 7. time event called by the infrastructure @@ -43,7 +43,7 @@ public: virtual void on_quoter_order_error(SpreaderLegData& leg_data) = 0; // 9. on a quoter order fill virtual void on_quoter_order_fill(SpreaderLegData& leg_data, - trace::CorID &) = 0; + trace::CorID ) = 0; // 10. on a quoter status update without a fill virtual void on_quoter_order_status_update(SpreaderLegData& leg_data) = 0; // 11. when a hedger order ack from the exchange has an error diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp index 8b5131a7e..0737f204f 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp @@ -115,9 +115,8 @@ void SpreaderOrder::_on_settlement_update(const SettlementUpdateEvent& _state_worker->on_settlement_price(settlement_event); } void SpreaderOrder::_on_child_order_update(const OrderStateUpdateEvent& ord_ev){ - auto trace = ord_ev.trace; - trace.spreader_on_child_order_update = utils::TimeStamp::now(); if (!_active) return; + _order_services->order_services().log(ord_ev.trace,"begin_on_child_order_update", key().value()); SecurityKey sec_key = SecurityKey(ord_ev.definition->security_key()); OrderKey order_key = ord_ev.key; bts::api::orderman::OrderStatus status = ord_ev.status; @@ -149,7 +148,7 @@ void SpreaderOrder::_on_child_order_update(const OrderStateUpdateEvent& ord_ev){ leg_data.order_update_message().on_order_update(ord_ev); if (order_error == ChildOrderError::NONE){ if (leg_data.order_update_message().last_update_filled_quantity().value() > 0) - _state_worker->on_quoter_order_fill (leg_data,trace); + _state_worker->on_quoter_order_fill (leg_data,ord_ev.trace); else _state_worker->on_quoter_order_status_update (leg_data); } @@ -185,8 +184,7 @@ void SpreaderOrder::_on_child_order_update(const OrderStateUpdateEvent& ord_ev){ } _send_check_termination(true); _report_state(); - LOG(Latency,Diag, "_on_child_order_update k:{} t:{}us", key().value(), - (utils::TimeStamp::now() - trace.spreader_on_child_order_update).microseconds()); + _order_services->order_services().log(ord_ev.trace,"end_on_child_order_update", key().value()); } // State Transformations //////////////////// ///////////////////////////////////////////// @@ -314,10 +312,8 @@ bool SpreaderOrder::_quoters_can_accept_modification (){ void SpreaderOrder::_send_hedge(size_t hedge_leg_index, Price hedge_price, Quantity hedge_qty, - const trace::CorID &trace){ - LOG(OrderMan, Info, "SpreaderOrder::_send_hedge key:{} hedge_leg_index:{} " - "hedge_price:{} hedge_qty:{} cid:{}", - key(), hedge_leg_index, hedge_price, hedge_qty, trace.md_sn); + const trace::CorID trace){ + SingleFillHedger& hedger = _bookkeeping_data().add_new_hedger (*this, hedge_leg_index, hedge_price, diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h index f97a8e68c..3835e922b 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h @@ -178,7 +178,7 @@ private: void _send_hedge(size_t hedge_leg_index, Price hedge_price, Quantity hedge_qty, - trace::CorID const&); + trace::CorID const); void _compute_hedge_price_quantity(size_t filled_leg_index, Price filled_price, double filled_quantity, diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp index b48208383..23860e5dd 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp @@ -101,7 +101,7 @@ void SingleLegQuoter::update_order_status(const SpreaderChildOrderState& u){ } } void SingleLegQuoter::on_book(size_t leg_index, - const bts::orderman::Book& book,trace::CorID &trace){ + const bts::orderman::Book& book,trace::CorID trace){ if (_active_quoting) _worker->on_book (leg_index, book,trace); } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h index 5139254d9..0a35fb934 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h @@ -101,7 +101,7 @@ public: //c. called when the market data associated // with this security is changed void on_book(size_t leg_index, - const bts::orderman::Book&,trace::CorID &); + const bts::orderman::Book&,trace::CorID ); //d. called when the order is cancelled, either // manually or automatically void cancel_order(); diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp index 4c74d2bf0..b0bc2c9dc 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp @@ -34,7 +34,7 @@ void SpreaderEndStateWorker::on_update(Price, Quantity){ } void SpreaderEndStateWorker::on_cancel(){ } -void SpreaderEndStateWorker::on_book(const Book&,trace::CorID&){ +void SpreaderEndStateWorker::on_book(const Book&,trace::CorID){ } void SpreaderEndStateWorker::on_settlement_price(const SettlementUpdateEvent&){ } @@ -43,7 +43,7 @@ void SpreaderEndStateWorker::on_time(const TimeStamp&){ void SpreaderEndStateWorker::on_quoter_order_error(SpreaderLegData&){ } void SpreaderEndStateWorker::on_quoter_order_fill(SpreaderLegData&, - trace::CorID&){ + trace::CorID){ } void SpreaderEndStateWorker::on_quoter_order_status_update(SpreaderLegData&){ } diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.h index 69bee63ed..cdf791845 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.h @@ -20,12 +20,12 @@ public: void on_activate(Price, Quantity, SpreaderOrderServices&) override; void on_update(Price, Quantity) override; void on_cancel() override; - void on_book(const Book&,trace::CorID&) override; + void on_book(const Book&,trace::CorID) override; void on_settlement_price(const SettlementUpdateEvent&) override; void on_time(const TimeStamp&) override; void on_quoter_order_error(SpreaderLegData& leg_data) override; void on_quoter_order_fill(SpreaderLegData& leg_data, - trace::CorID&) override; + trace::CorID) override; void on_quoter_order_status_update(SpreaderLegData& leg_data) override; void on_hedger_order_error(SingleFillHedger&) override; void on_hedger_order_update(SingleFillHedger&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp index 522f8dcdd..adc4108e2 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp @@ -117,7 +117,7 @@ void SpreaderStartStateWorker::on_cancel(){ // and hence it goes directly to END _spreader->_transform_to_END(); } -void SpreaderStartStateWorker::on_book(const bts::orderman::Book&,trace::CorID &){ +void SpreaderStartStateWorker::on_book(const bts::orderman::Book&,trace::CorID ){ bts_assert_msg (false, "SpreaderStartStateWorker::on_book is an illegal operation"); } void SpreaderStartStateWorker::on_settlement_price(const SettlementUpdateEvent&){ @@ -131,7 +131,7 @@ void SpreaderStartStateWorker::on_quoter_order_error(SpreaderLegData&){ bts_assert_msg (false, "SpreaderStartStateWorker::on_quoter_order_error is an illegal operation"); } void SpreaderStartStateWorker::on_quoter_order_fill(SpreaderLegData&, - trace::CorID&){ + trace::CorID){ bts_assert_msg (false, "SpreaderStartStateWorker::on_quoter_order_fill is an illegal operation"); } void SpreaderStartStateWorker::on_quoter_order_status_update(SpreaderLegData&){ diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.h index b14d8e08f..78e92a3cd 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.h @@ -25,12 +25,12 @@ public: SpreaderOrderServices&) override; void on_update(Price, Quantity) override; void on_cancel() override; - void on_book(const Book&,trace::CorID &) override; + void on_book(const Book&,trace::CorID ) override; void on_time(const TimeStamp&) override; void on_settlement_price(const SettlementUpdateEvent&) override; void on_quoter_order_error(SpreaderLegData& leg_data) override; void on_quoter_order_fill(SpreaderLegData& leg_data, - trace::CorID &) override; + trace::CorID ) override; void on_quoter_order_status_update(SpreaderLegData& leg_data) override; void on_hedger_order_error(SingleFillHedger&) override; void on_hedger_order_update(SingleFillHedger&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp index 36669f38e..d58ea59d5 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp @@ -33,7 +33,7 @@ void SpreaderWaitingForCancelAllStateWorker::on_update(Price, } void SpreaderWaitingForCancelAllStateWorker::on_cancel(){ } -void SpreaderWaitingForCancelAllStateWorker::on_book(const Book&,trace::CorID &){ +void SpreaderWaitingForCancelAllStateWorker::on_book(const Book&,trace::CorID ){ } void SpreaderWaitingForCancelAllStateWorker::on_time(const TimeStamp& ts){ if (ms_diff (ts, _cancel_timestamp) >= _spreader->_cancel_timeout){ @@ -48,7 +48,7 @@ void SpreaderWaitingForCancelAllStateWorker::on_quoter_order_error(SpreaderLegDa leg_data.quoter().update_order_status (leg_data.order_update_message()); } void SpreaderWaitingForCancelAllStateWorker::on_quoter_order_fill(SpreaderLegData& leg_data, - trace::CorID &){ + trace::CorID ){ leg_data.quoter().update_order_status (leg_data.order_update_message()); } void SpreaderWaitingForCancelAllStateWorker::on_quoter_order_status_update(SpreaderLegData& leg_data){ diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.h index 96c3128e5..cf6f7ca0b 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.h @@ -23,12 +23,12 @@ public: SpreaderOrderServices&) override; void on_update(Price, Quantity) override; void on_cancel() override; - void on_book(const Book&,trace::CorID &) override; + void on_book(const Book&,trace::CorID ) override; void on_settlement_price(const SettlementUpdateEvent&) override; void on_time(const TimeStamp&) override; void on_quoter_order_error(SpreaderLegData& leg_data) override; void on_quoter_order_fill(SpreaderLegData& leg_data, - trace::CorID &) override; + trace::CorID ) override; void on_quoter_order_status_update(SpreaderLegData& leg_data) override; void on_hedger_order_error(SingleFillHedger&) override; void on_hedger_order_update(SingleFillHedger&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp index 0e7cfd266..e69c0e62a 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp @@ -46,7 +46,7 @@ void SpreaderWaitingForInitialDataStateWorker::on_cancel(){ _spreader->_transform_to_END(); } void SpreaderWaitingForInitialDataStateWorker::on_book(const Book& book, - trace::CorID&){ + trace::CorID){ SpreaderBookkeepingData& bookkeeping_data = _spreader->_bookkeeping_data(); SpreaderLegData& md_leg = bookkeeping_data.get_leg_data(book.security_key()); md_leg.update_book(book); @@ -71,7 +71,7 @@ void SpreaderWaitingForInitialDataStateWorker::on_quoter_order_error(SpreaderLeg "on_quoter_order_error is an illegal operation"); } void SpreaderWaitingForInitialDataStateWorker::on_quoter_order_fill(SpreaderLegData&, - trace::CorID&){ + trace::CorID){ bts_assert_msg (false, "SpreaderWaitingForInitialDataStateWorker::" "on_quoter_order_fill is an illegal operation"); } diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.h index 4477edacf..c344a8542 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.h @@ -25,12 +25,12 @@ public: SpreaderOrderServices&) override; void on_update(Price, Quantity) override; void on_cancel() override; - void on_book(const Book&,trace::CorID &) override; + void on_book(const Book&,trace::CorID) override; void on_settlement_price(const SettlementUpdateEvent&) override; void on_time(const TimeStamp&) override; void on_quoter_order_error(SpreaderLegData& leg_data) override; void on_quoter_order_fill(SpreaderLegData& leg_data, - trace::CorID &) override; + trace::CorID ) override; void on_quoter_order_status_update(SpreaderLegData& leg_data) override; void on_hedger_order_error(SingleFillHedger&) override; void on_hedger_order_update(SingleFillHedger&) override; 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 989a46e3f..59fc70fbb 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp @@ -42,7 +42,7 @@ void SpreaderWorkingStateWorker::on_cancel(){ _spreader->_cancel_orders (true, true); _spreader->_transform_to_WAITING_FOR_CANCEL_ALL (); } -void SpreaderWorkingStateWorker::on_book(const Book& book,trace::CorID &trace){ +void SpreaderWorkingStateWorker::on_book(const Book& book,trace::CorID trace){ SpreaderBookkeepingData& bookkeeping_data = _spreader->_bookkeeping_data(); // this is a key->index lookup SpreaderLegData& md_leg = bookkeeping_data.get_leg_data(book.security_key()); @@ -78,7 +78,7 @@ void SpreaderWorkingStateWorker::on_quoter_order_error(SpreaderLegData& leg_data _spreader->_transform_to_WAITING_FOR_CANCEL_ALL (); } void SpreaderWorkingStateWorker::on_quoter_order_fill(SpreaderLegData& leg_data, - trace::CorID &trace){ + trace::CorID trace){ // 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) // 2. launch a new hedger diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.h index 1ff8e4dab..214e2eba1 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.h @@ -22,12 +22,12 @@ public: SpreaderOrderServices&) override; void on_update(Price, Quantity) override; void on_cancel() override; - void on_book(const Book&,trace::CorID &) override; + void on_book(const Book&,trace::CorID ) override; void on_settlement_price(const SettlementUpdateEvent&) override; void on_time(const TimeStamp&) override; void on_quoter_order_error(SpreaderLegData& leg_data) override; void on_quoter_order_fill(SpreaderLegData& leg_data, - trace::CorID &) override; + trace::CorID ) override; void on_quoter_order_status_update(SpreaderLegData& leg_data) override; void on_hedger_order_error(SingleFillHedger&) override; void on_hedger_order_update(SingleFillHedger&) override; diff --git a/src/lib/orderman/server/OrderServiceServer.cpp b/src/lib/orderman/server/OrderServiceServer.cpp index 0b53e4a13..9259a2a7c 100644 --- a/src/lib/orderman/server/OrderServiceServer.cpp +++ b/src/lib/orderman/server/OrderServiceServer.cpp @@ -137,7 +137,7 @@ OrderServiceServer::OrderServiceServer( bts_assert_msg(thread, "Could not find a configured thread for MDSource. See the " "OrdermanCfg key"); - thread->executor.spawn(me->md_consumer, me->stats); + thread->executor.spawn(me->md_consumer, me->stats,log); // OrderManager thread = find_thread_for_actor("OrderManager", me->actor_threads); diff --git a/src/sdk/examples/order_plugin_example.cpp b/src/sdk/examples/order_plugin_example.cpp index 8949c21f9..3202d102a 100644 --- a/src/sdk/examples/order_plugin_example.cpp +++ b/src/sdk/examples/order_plugin_example.cpp @@ -24,10 +24,10 @@ class DynamicIcebergOrder : public DynamicOrder { void on_init_recovered(OrderRecord const &, const PreActivationOrderServices &) override; void on_activate(Price, Quantity, OrderServices &, - PerfTrace const &) override; - void on_update(Price, Quantity, PerfTrace const &) override; - void on_crack(PerfTrace const &) override; - void on_cancel(PerfTrace const &) override; + trace::CorID const&) override; + void on_update(Price, Quantity, trace::CorID const&) override; + void on_crack(trace::CorID const &) override; + void on_cancel(trace::CorID const &) override; private: void report_state(); @@ -127,7 +127,7 @@ void DynamicIcebergOrder::on_init_recovered( void DynamicIcebergOrder::on_activate(Price p, Quantity q, OrderServices &services, - PerfTrace const &) { + trace::CorID const &) { bts_assert(!me->services); me->services = &services; me->child_builder.activate(services); @@ -136,8 +136,8 @@ void DynamicIcebergOrder::on_activate(Price p, Quantity q, case ORDER_STATUS_INACTIVE: me->state.set_price(p.value()); me->state.set_quantity(q.value()); - services.child_updates.sub( - key(), [this](auto const &os) { this->on_child_order_update(os); }); + services.subscribe_to_child_updates( + [this](auto const &os) { this->on_child_order_update(os); }); transition(ORDER_STATUS_WORKING); send_next_child_order(); break; @@ -164,7 +164,7 @@ void DynamicIcebergOrder::on_activate(Price p, Quantity q, report_state(); } -void DynamicIcebergOrder::on_update(Price p, Quantity q, PerfTrace const &) { +void DynamicIcebergOrder::on_update(Price p, Quantity q, trace::CorID const &) { switch (me->state.status()) { case ORDER_STATUS_WORKING: case ORDER_STATUS_PENDING_WORKING: @@ -191,9 +191,9 @@ void DynamicIcebergOrder::on_update(Price p, Quantity q, PerfTrace const &) { report_state(); } -void DynamicIcebergOrder::on_crack(PerfTrace const &) {} +void DynamicIcebergOrder::on_crack(trace::CorID const &) {} -void DynamicIcebergOrder::on_cancel(PerfTrace const &) { +void DynamicIcebergOrder::on_cancel(trace::CorID const &) { switch (me->state.status()) { case ORDER_STATUS_WORKING: LOG(Plugin, Info, "Canceling DynamicIceberg Order {}", key().value()); diff --git a/src/server/sparkd/cmds/Benchmark.cpp b/src/server/sparkd/cmds/Benchmark.cpp index 089222abd..eb35d3ce8 100644 --- a/src/server/sparkd/cmds/Benchmark.cpp +++ b/src/server/sparkd/cmds/Benchmark.cpp @@ -271,18 +271,6 @@ static void init_with_clean_os(benchmark::State &state) { } BENCHMARK(init_with_clean_os); -static void init_with_old_order_update(benchmark::State &state) { - api::orderman::OrderDefinition def; - auto order_state = - utils::pb::from_string(order_state_str); - PerfTrace trace; - OrderKey k(1); - for (auto _ : state) - benchmark::DoNotOptimize( - orderman::OrderStateUpdateEvent(k, k, def, order_state, trace)); -} -BENCHMARK(init_with_old_order_update); - static void serialize_update(benchmark::State &state) { api::orderman::Update update; update.set_order_key(1);