Removed trace::CorID from most of the order code.

This commit is contained in:
Pedro Pinto committed 2019-01-12 15:45:08 -05:00
1 parent af91ee1512
commit dcd2cc22e1
73 files changed
+237 -304

No files matched your search

+16 -20
View File
@@ -10,7 +10,6 @@
#include "lib/orderman/orderman_utils/fix_order_codec.h"
#include "lib/orderman/orders/PreActivationOrderServices.h"
#include "lib/orderman/securities/ISecurityDB.h"
#include "lib/tracing/bts_trace.h"
#include "lib/utils/PBUtils.h"
#include "lib/utils/bts_chrono.h"
@@ -275,10 +274,9 @@ NativeOrder::on_init_from_exe_report(ExecutionReport const &er,
NativeOrder::~NativeOrder() {}
OrderOpResult NativeOrder::on_activate(Price p, Quantity q,
bts::orderman::OrderServices &services,
trace::CorID const &trace) {
bts::orderman::OrderServices &services) {
auto scoped_log =
services.log_scope(trace, "NativeOrder::on_activate", key().value());
services.log_scope("NativeOrder::on_activate", key().value());
bts_assert(!me->services);
me->services = &services;
@@ -393,7 +391,7 @@ OrderOpResult NativeOrder::on_activate(Price p, Quantity q,
me->services->queue_fix(*me->session_services,
jetfix::MessageTypes::NewOrderSingle,
me->create_encoding, trace);
me->create_encoding);
me->services->governor(*me->session_services).record_sent();
me->state.set_status(ORDER_STATUS_PENDING_WORKING);
@@ -468,10 +466,9 @@ OrderOpResult NativeOrder::on_activate(Price p, Quantity q,
return OrderOpResult{};
}
OrderOpResult NativeOrder::on_update(Price p, Quantity q,
trace::CorID const &trace) {
OrderOpResult NativeOrder::on_update(Price p, Quantity q) {
auto scoped_log =
me->services->log_scope(trace, "NativeOrder::on_update", key().value());
me->services->log_scope("NativeOrder::on_update", key().value());
switch (me->state.status()) {
@@ -503,7 +500,7 @@ OrderOpResult NativeOrder::on_update(Price p, Quantity q,
transition(me->state.status(), msg);
else {
me->state.set_last_msg(msg);
on_cancel(trace);
on_cancel();
}
break;
}
@@ -518,7 +515,7 @@ OrderOpResult NativeOrder::on_update(Price p, Quantity q,
transition(me->state.status(), msg);
else {
me->state.set_last_msg(msg);
on_cancel(trace);
on_cancel();
}
break;
}
@@ -538,7 +535,7 @@ OrderOpResult NativeOrder::on_update(Price p, Quantity q,
me->services->queue_fix(*me->session_services,
jetfix::MessageTypes::CancelReplace,
me->update_encoding, trace);
me->update_encoding);
me->services->governor(*me->session_services).record_sent();
update_working_position();
@@ -568,13 +565,13 @@ OrderOpResult NativeOrder::on_update(Price p, Quantity q,
return OrderOpResult{};
}
OrderOpResult NativeOrder::on_crack(trace::CorID const &) {
OrderOpResult NativeOrder::on_crack() {
return OrderOpResult{};
}
OrderOpResult NativeOrder::on_cancel(trace::CorID const &trace) {
OrderOpResult NativeOrder::on_cancel() {
auto scoped_log =
me->services->log_scope(trace, "NativeOrder::on_cancel", key().value());
me->services->log_scope("NativeOrder::on_cancel", key().value());
switch (me->state.status()) {
case ORDER_STATUS_WORKING: {
@@ -584,8 +581,7 @@ OrderOpResult NativeOrder::on_cancel(trace::CorID const &trace) {
me->cancel_transact_time_bm, &ts.value()[0], ts.value().size());
me->services->queue_fix(*me->session_services,
jetfix::MessageTypes::Cancel, me->cancel_encoding,
trace);
jetfix::MessageTypes::Cancel, me->cancel_encoding);
break;
}
@@ -633,7 +629,7 @@ bool NativeOrder::is_old_exe_report(
void NativeOrder::on_exe_report(const NewExecutionReportEvent &er) {
auto scoped_log = me->services->log_scope(
er.trace, "NativeOrder::on_exe_report", key().value());
"NativeOrder::on_exe_report", key().value());
auto &state = me->state;
auto &native_state = get_native_state(state);
@@ -727,7 +723,7 @@ void NativeOrder::on_exe_report(const NewExecutionReportEvent &er) {
bts_assert(false);
break;
}
report_state(er.trace);
report_state();
// we only need the exhange order id and the routing record
// reported once, since they are both immutable, so we clear them
@@ -829,9 +825,9 @@ void NativeOrder::update_working_position() {
key().value(), me->definition.security_key());
}
void NativeOrder::report_state(trace::CorID const &trace) {
void NativeOrder::report_state() {
update_working_position();
me->services->report_state(me->state, trace);
me->services->report_state(me->state);
}
void NativeOrder::init_fix() {