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

@@ -39,33 +39,33 @@ class ChildOrder {
bool is_active() const { return _active; }
void activate(Price p, Quantity q, trace::CorID const &trace = trace::CorID()) {
void activate(Price p, Quantity q) {
bts_assert(_order);
bts_assert(!_active);
_child_order_services =
&_parent_order_services->activate_child(*_order, p, q, trace);
&_parent_order_services->activate_child(*_order, p, q);
_active = true;
}
void update(Price p, Quantity q, trace::CorID const &trace = trace::CorID()) {
void update(Price p, Quantity q) {
bts_assert(_order);
bts_assert(_active);
_child_order_services->update(p, q, trace);
_child_order_services->update(p, q);
}
void update(api::orderman::Update const&update, trace::CorID const& trace = trace::CorID()) {
void update(api::orderman::Update const&update) {
bts_assert(_order);
bts_assert(_active);
_child_order_services->update(update,trace);
_child_order_services->update(update);
}
void crack(trace::CorID const &trace = trace::CorID()) {
void crack() {
bts_assert(_order);
bts_assert(_active);
_child_order_services->crack(trace);
_child_order_services->crack();
}
void cancel(trace::CorID const &trace = trace::CorID()) {
void cancel() {
bts_assert(_order);
bts_assert(_active);
_child_order_services->cancel(trace);
_child_order_services->cancel();
}
private:
@@ -156,8 +156,7 @@ void OrderManager::on_order_recovery(
bts_assert(r.second);
auto const &ostate = ev.order_record.state();
order.on_activate(Price(ostate.price()),
Quantity(ostate.quantity()), *order._services,
trace::CorID());
Quantity(ostate.quantity()), *order._services);
}
// signal that we are ready
@@ -193,7 +192,7 @@ void OrderManager::on_execution_report(
auto r = me->orders.emplace(order->key(), order);
bts_assert(r.second);
order->on_activate(report.data->price, report.data->quantity,
*order->_services, trace::CorID());
*order->_services);
}
}
}
@@ -208,7 +207,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);
auto op_r = order->on_activate(ev.price, ev.quantity, *order->_services, ev.trace);
auto op_r = order->on_activate(ev.price, ev.quantity, *order->_services);
publish(me->services_data.report_order_op_result_pub,order->key(),ev.req_id,op_r);
}
}
@@ -221,10 +220,9 @@ void OrderManager::on_update_order(const mercury::Update<UpdateOrderEvent> &m) {
OrderOpResult op_r;
if (it != me->orders.end()) {
if (ev.is_full_update())
op_r = it->second->on_update(ev.full_update(), trace::CorID{});
op_r = it->second->on_update(ev.full_update());
else
op_r = it->second->on_update(Price(ev.price()), Quantity(ev.quantity()),
trace::CorID{});
op_r = it->second->on_update(Price(ev.price()), Quantity(ev.quantity()));
} else {
op_r = OrderOpResult{api::orderman::ORDER_ERROR_UNKNOWN_ORDER,"Unknown order"};
LOG(OrderMan, Error,
@@ -243,7 +241,7 @@ void OrderManager::on_cancel_order(const mercury::Update<CancelOrderEvent> &m) {
auto it = me->orders.find(k);
OrderOpResult op_r;
if (it != me->orders.end())
op_r = it->second->on_cancel(ev.trace);
op_r = it->second->on_cancel();
else {
op_r = OrderOpResult{api::orderman::ORDER_ERROR_UNKNOWN_ORDER,"Unknown order"};
LOG(OrderMan, Error,
@@ -262,7 +260,7 @@ void OrderManager::on_crack_order(const mercury::Update<CrackOrderEvent> &m) {
auto it = me->orders.find(k);
OrderOpResult op_r;
if (it != me->orders.end())
it->second->on_crack(trace::CorID{});
it->second->on_crack();
else {
op_r = OrderOpResult{api::orderman::ORDER_ERROR_UNKNOWN_ORDER,"Unknown order"};
LOG(OrderMan, Error,
@@ -284,15 +282,14 @@ void OrderManager::on_gateway_state(
}
OrderServices &OrderManager::activate_child(OrderServices &parent, Order &order,
Price p, Quantity q,
trace::CorID const &trace) {
Price p, Quantity q) {
auto const &def = order.def();
publish_order_def_update(order.key(), def);
order.init_order_services(me->services_data, parent);
auto r = me->orders.emplace(order.key(), &order);
bts_assert(r.second);
order.on_activate(p, q, *order._services, trace);
order.on_activate(p, q, *order._services);
return *order._services;
}
@@ -92,7 +92,7 @@ class OrderManager : public mercury::Actor, public mercury::IPollableActor {
void after_event() override;
OrderServices &activate_child(OrderServices &parent, Order &, Price,
Quantity, trace::CorID const &);
Quantity);
void publish_order_def_update(
OrderKey k,
@@ -64,12 +64,12 @@ class SessionServices {
}
void queue_fix(jetfix::MessageTypes mt, jetfix::FIXFragment const &f,
trace::CorID const &trace) {
trace::CorID const &corid) {
auto &stream = _session_data->current_buffer->first_stream();
stream.new_msg(mt).append(f);
if (stream.n_msgs() == 1)
_session_data->current_trace = trace;
_session_data->current_trace = corid;
}
bool is_gateway_connected() const { return _session_data->gw_connected; }
@@ -143,33 +143,34 @@ class OrderServices {
Governor &governor(SessionServices &ss) { return ss.governor(); }
void queue_fix(SessionServices &ss, jetfix::MessageTypes mt,
jetfix::FIXFragment const &f, trace::CorID const &trace) {
ss.queue_fix(mt, f, trace);
jetfix::FIXFragment const &f) {
ss.queue_fix(mt, f, _corid);
}
void log(trace::CorID cid, const char *entry_kind, uint64_t uint64_1 = 0,
void log(const char *entry_kind, uint64_t uint64_1 = 0,
const char *txt_1 = "", uint32_t uint32_1 = 0) {
_data->log.log(cid, entry_kind, uint64_1, txt_1, uint32_1);
_data->log.log(_corid, entry_kind, uint64_1, txt_1, uint32_1);
}
trace::ScopedPerfLogEntry log_scope(trace::CorID cid, const char *entry_kind,
trace::ScopedPerfLogEntry log_scope(const char *entry_kind,
uint64_t uint64_1 = 0,
const char *txt_1 = "",
uint32_t uint32_1 = 0) {
return trace::ScopedPerfLogEntry(_data->log, cid, entry_kind, uint64_1,
return trace::ScopedPerfLogEntry(_data->log, _corid, entry_kind, uint64_1,
txt_1, uint32_1);
}
void report_definition(const api::orderman::OrderDefinition &def) {
_owner->set_def(def);
void report_definition(const api::orderman::CustomOrderDefinition &cdef) {
auto new_def = *_owner->def();
*new_def.mutable_custom_def() = cdef;
_owner->set_def(new_def);
_data->owner.publish(_data->report_order_definition_pub, _owner->key(),
_owner->def());
}
void report_state(const api::orderman::OrderState &state,
trace::CorID const &trace = trace::CorID()) {
void report_state(const api::orderman::OrderState &state) {
OrderStateUpdateEvent ev(_owner->key(), _owner->parent_key(), state,
trace);
_corid);
_data->owner.publish(_data->report_order_state_pub, ev);
if (orderman::in_terminal_state(state.status())) {
@@ -202,8 +203,10 @@ class OrderServices {
// Book
using BookSubID = EventStream<BookUpdateEvent>::SubID;
template <class CB> BookSubID subscribe_to_book(SecurityKey k, CB &&cb) {
return _book_updates.sub(
k, [this, cb](auto const &ev) { this->on_external_event(ev, cb); });
return _book_updates.sub(k, [this, cb](auto const &ev) {
_corid = ev.trace;
this->on_external_event(ev, cb);
});
}
void unsubscribe_from_book(BookSubID sid) { _book_updates.unsub(sid); }
@@ -231,8 +234,10 @@ class OrderServices {
using ExeReportSubID = EventStream<NewExecutionReportEvent>::SubID;
template <class CB>
void subscribe_to_exe_report(SessionServices &ss, OrderKey k, CB &&cb) {
ss.subscribe_to_exe_report(
k, [this, cb](auto const &ev) { this->on_external_event(ev, cb); });
ss.subscribe_to_exe_report(k, [this, cb](auto const &ev) {
_corid = ev.trace;
this->on_external_event(ev, cb);
});
}
void unsubscribe_from_exe_report(SessionServices &ss, ExeReportSubID sid) {
ss.unsubscribe_from_exe_report(sid);
@@ -287,9 +292,10 @@ class OrderServices {
}
_pending_calls.clear();
_busy = false;
_corid = trace::CorID{};
}
template <class C> void on_inter_order_call(C const &c) {
template <class C> void call_with_reentrancy_guard(C const &c) {
if (_busy)
_pending_calls.emplace_back(c);
else {
@@ -326,36 +332,33 @@ class OrderServices {
friend class ChildOrder;
OrderServices &activate_child(Order &o, Price p, Quantity q,
trace::CorID const &trace) {
return _data->owner.activate_child(*this, o, p, q, trace);
OrderServices &activate_child(Order &o, Price p, Quantity q) {
return _data->owner.activate_child(*this, o, p, q);
}
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);
});
void update(Price p, Quantity q) {
call_with_reentrancy_guard(
[p, q](OrderServices &self) { self._owner->on_update(p, q); });
}
void update(api::orderman::Update const &update, trace::CorID const &trace) {
on_inter_order_call([update, trace](OrderServices &self) {
self._owner->on_update(update, trace);
});
void update(api::orderman::Update const &update) {
call_with_reentrancy_guard(
[update](OrderServices &self) { self._owner->on_update(update); });
}
void crack(trace::CorID const &trace) {
on_inter_order_call(
[trace](OrderServices &self) { self._owner->on_crack(trace); });
void crack() {
call_with_reentrancy_guard(
[](OrderServices &self) { self._owner->on_crack(); });
}
void cancel(trace::CorID const &trace) {
on_inter_order_call(
[trace](OrderServices &self) { self._owner->on_cancel(trace); });
void cancel() {
call_with_reentrancy_guard(
[](OrderServices &self) { self._owner->on_cancel(); });
}
void on_child_update(OrderStateUpdateEvent const &ev) {
on_inter_order_call(
call_with_reentrancy_guard(
[ev](OrderServices &self) { self._child_update_cb(ev); });
}
bool _busy;
trace::CorID corid;
trace::CorID _corid;
boost::container::small_vector<std::function<void(OrderServices &)>, 10>
_pending_calls;
Order *_owner;
@@ -17,6 +17,8 @@ class BookUpdateEvent : public mercury::Event<BookUpdateEvent> {
trace::CorID trace;
SecurityKey key() const { return book.security_key(); }
BookUpdateEvent(const Book &b)
: book(b), trace() {}
BookUpdateEvent(const Book &b, trace::CorID const &trace)
: book(b), trace(trace) {}
};
+3 -4
View File
@@ -44,14 +44,13 @@ void DynamicOrder::on_init_recovered(api::orderman::OrderRecord const &rec,
me->state.set_last_msg(msg);
}
OrderOpResult DynamicOrder::on_activate(Price, Quantity, OrderServices &services,
trace::CorID const &) {
OrderOpResult DynamicOrder::on_activate(Price, Quantity, OrderServices &services) {
services.report_state(me->state);
return OrderOpResult{};
}
OrderOpResult DynamicOrder::on_update(Price, Quantity, trace::CorID const &) {return OrderOpResult{};}
OrderOpResult DynamicOrder::on_cancel(trace::CorID const &) {return OrderOpResult{};}
OrderOpResult DynamicOrder::on_update(Price, Quantity) {return OrderOpResult{};}
OrderOpResult DynamicOrder::on_cancel() {return OrderOpResult{};}
} // namespace orderman
} // namespace bts
+3 -3
View File
@@ -18,9 +18,9 @@ public:
const PreActivationOrderServices&) override;
void on_init_recovered(api::orderman::OrderRecord const&,
const PreActivationOrderServices &) override;
OrderOpResult on_activate(Price,Quantity,OrderServices &, trace::CorID const&) override ;
OrderOpResult on_update(Price , Quantity,trace::CorID const&) override ;
OrderOpResult on_cancel(trace::CorID const&) override ;
OrderOpResult on_activate(Price,Quantity,OrderServices &) override ;
OrderOpResult on_update(Price , Quantity) override ;
OrderOpResult on_cancel() override ;
private:
struct PImpl;
+6 -10
View File
@@ -104,8 +104,7 @@ void IcebergOrder::on_init_recovered(api::orderman::OrderRecord const &rec,
}
OrderOpResult IcebergOrder::on_activate(Price p, Quantity q,
OrderServices &services,
trace::CorID const &) {
OrderServices &services) {
bts_assert(!me->services);
me->services = &services;
me->child_builder.activate(services);
@@ -147,8 +146,7 @@ OrderOpResult IcebergOrder::on_activate(Price p, Quantity q,
return OrderOpResult{};
}
OrderOpResult IcebergOrder::on_update(Price p, Quantity q,
trace::CorID const &) {
OrderOpResult IcebergOrder::on_update(Price p, Quantity q) {
switch (me->state.status()) {
case ORDER_STATUS_WORKING:
case ORDER_STATUS_PENDING_WORKING:
@@ -175,17 +173,16 @@ OrderOpResult IcebergOrder::on_update(Price p, Quantity q,
return OrderOpResult{};
}
OrderOpResult IcebergOrder::on_update(api::orderman::Update const &,
trace::CorID const &) {
OrderOpResult IcebergOrder::on_update(api::orderman::Update const &) {
return OrderOpResult{};
}
OrderOpResult IcebergOrder::on_crack(trace::CorID const &) {
OrderOpResult IcebergOrder::on_crack() {
return OrderOpResult{};
}
OrderOpResult IcebergOrder::on_cancel(trace::CorID const &) {
OrderOpResult IcebergOrder::on_cancel() {
switch (me->state.status()) {
case ORDER_STATUS_WORKING:
LOG(OrderMan, Info, "Canceling Iceberg Order {}", key().value());
@@ -268,8 +265,7 @@ void IcebergOrder::send_next_child_order() {
key().value(), me->child.order.key().value(), to_send, me->state.price(),
me->state.filled_quantity(), me->state.quantity());
me->child.order.activate(Price(me->state.price()), Quantity(to_send),
trace::CorID());
me->child.order.activate(Price(me->state.price()), Quantity(to_send));
}
void IcebergOrder::on_child_order_update(OrderStateUpdateEvent const &ev) {
+5 -5
View File
@@ -20,11 +20,11 @@ public:
const PreActivationOrderServices&) override;
void on_init_recovered(api::orderman::OrderRecord const&,
const PreActivationOrderServices &) override;
OrderOpResult on_activate(Price,Quantity,OrderServices &, trace::CorID const&) override ;
OrderOpResult on_update(Price , Quantity,trace::CorID const&) override ;
OrderOpResult on_update(api::orderman::Update const&update, trace::CorID const&trace) override;
OrderOpResult on_crack(trace::CorID const&) override ;
OrderOpResult on_cancel(trace::CorID const&) override ;
OrderOpResult on_activate(Price,Quantity,OrderServices &) override ;
OrderOpResult on_update(Price , Quantity) override ;
OrderOpResult on_update(api::orderman::Update const&update) override;
OrderOpResult on_crack() override ;
OrderOpResult on_cancel() override ;
private:
void report_state();
+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() {
+5 -6
View File
@@ -24,11 +24,10 @@ class NativeOrder : public Order {
void on_init_recovered(api::orderman::OrderRecord const &,
const PreActivationOrderServices &) override;
OrderOpResult on_activate(Price, Quantity, OrderServices &,
trace::CorID const &) override;
OrderOpResult on_update(Price, Quantity, trace::CorID const &) override;
OrderOpResult on_crack(trace::CorID const &) override;
OrderOpResult on_cancel(trace::CorID const &) override;
OrderOpResult on_activate(Price, Quantity, OrderServices &) override;
OrderOpResult on_update(Price, Quantity) override;
OrderOpResult on_crack() override;
OrderOpResult on_cancel() override;
api::orderman::OrderDefinition
on_init_from_exe_report(ExecutionReport const &,
@@ -40,7 +39,7 @@ class NativeOrder : public Order {
void on_exe_report(const NewExecutionReportEvent &);
void on_cancel_reject(const CancelRejectEvent &);
void on_gateway_status(const GatewayStatusChangeEvent &);
void report_state(trace::CorID const &trace = trace::CorID());
void report_state();
void init_fix();
void add_exchange_order_id_to_fix();
+2 -3
View File
@@ -16,15 +16,14 @@ void Order::init_order_services(OrderServicesData &osd, OrderServices &parent) {
Order::~Order() {}
OrderOpResult Order::on_update(api::orderman::Update const &,
trace::CorID const &) {
OrderOpResult Order::on_update(api::orderman::Update const &) {
return OrderOpResult{api::orderman::ORDER_ERROR_OP_NOT_SUPPORTED,
"The update operation is not supported by this order type"
};
}
OrderOpResult Order::on_crack(trace::CorID const&) {
OrderOpResult Order::on_crack() {
return OrderOpResult{api::orderman::ORDER_ERROR_OP_NOT_SUPPORTED,
"The crack operation is not supported by this order type"
+5 -5
View File
@@ -46,13 +46,13 @@ class Order {
const PreActivationOrderServices &) = 0;
// activation - cannot be slow
virtual OrderOpResult on_activate(Price, Quantity, OrderServices &, trace::CorID const&) = 0;
virtual OrderOpResult on_activate(Price, Quantity, OrderServices &) = 0;
// order is running, maintenance
virtual OrderOpResult on_update(Price, Quantity, trace::CorID const&) = 0;
virtual OrderOpResult on_update(api::orderman::Update const&, trace::CorID const&) ;
virtual OrderOpResult on_crack(trace::CorID const&);
virtual OrderOpResult on_cancel(trace::CorID const&) = 0;
virtual OrderOpResult on_update(Price, Quantity) = 0;
virtual OrderOpResult on_update(api::orderman::Update const&) ;
virtual OrderOpResult on_crack();
virtual OrderOpResult on_cancel() = 0;
private:
OrderKey _key;
+4 -6
View File
@@ -85,8 +85,7 @@ void TimeBoxOrder::on_init_recovered(api::orderman::OrderRecord const &rec,
}
OrderOpResult TimeBoxOrder::on_activate(Price p, Quantity q,
OrderServices &services,
trace::CorID const &) {
OrderServices &services) {
bts_assert(!me->services);
me->services = &services;
me->child_builder.activate(services);
@@ -125,8 +124,7 @@ OrderOpResult TimeBoxOrder::on_activate(Price p, Quantity q,
return OrderOpResult{};
}
OrderOpResult TimeBoxOrder::on_update(Price p, Quantity q,
trace::CorID const &) {
OrderOpResult TimeBoxOrder::on_update(Price p, Quantity q) {
LOG(OrderMan, Info, "Updating TimeBox Order {}", key().value());
switch (me->state.status()) {
@@ -187,11 +185,11 @@ OrderOpResult TimeBoxOrder::on_update(Price p, Quantity q,
return OrderOpResult{};
}
OrderOpResult TimeBoxOrder::on_crack(trace::CorID const &) {
OrderOpResult TimeBoxOrder::on_crack() {
return OrderOpResult{};
}
OrderOpResult TimeBoxOrder::on_cancel(trace::CorID const &) {
OrderOpResult TimeBoxOrder::on_cancel() {
LOG(OrderMan, Info, "Canceling TimeBox Order {}", key().value());
switch (me->state.status()) {
+4 -4
View File
@@ -19,10 +19,10 @@ public:
const PreActivationOrderServices&) override;
void on_init_recovered(api::orderman::OrderRecord const&,
const PreActivationOrderServices &) override;
OrderOpResult on_activate(Price,Quantity,OrderServices &, trace::CorID const&) override ;
OrderOpResult on_update(Price , Quantity,trace::CorID const&) override ;
OrderOpResult on_crack(trace::CorID const&) override ;
OrderOpResult on_cancel(trace::CorID const&) override ;
OrderOpResult on_activate(Price,Quantity,OrderServices &) override ;
OrderOpResult on_update(Price , Quantity) override ;
OrderOpResult on_crack() override ;
OrderOpResult on_cancel() override ;
private:
void report_state();
+3 -4
View File
@@ -101,7 +101,7 @@ void TriggerOrder::on_init_recovered(const api::orderman::OrderRecord &rec,
}
}
OrderOpResult TriggerOrder::on_activate(Price price, Quantity qty,
OrderServices &services, trace::CorID const &) {
OrderServices &services) {
LOG(OrderMan, Info,
"TriggerOrder::on_activate key:{} state:{} price:{} qty:{}", key(),
_state, price, qty);
@@ -141,8 +141,7 @@ OrderOpResult TriggerOrder::on_activate(Price price, Quantity qty,
return OrderOpResult{};
}
// order price, qty change
OrderOpResult TriggerOrder::on_update(Price price, Quantity qty,
trace::CorID const &) {
OrderOpResult TriggerOrder::on_update(Price price, Quantity qty) {
LOG(OrderMan, Info,
"TriggerOrder::on_update key:{} state:{} price:{} qty:{}", key(), _state,
price, qty);
@@ -169,7 +168,7 @@ OrderOpResult TriggerOrder::on_update(Price price, Quantity qty,
}
return OrderOpResult{};
}
OrderOpResult TriggerOrder::on_cancel(trace::CorID const &) {
OrderOpResult TriggerOrder::on_cancel() {
LOG(OrderMan, Info, "TriggerOrder::on_cancel key:{} state:{}", key(),
_state);
me->cancel_mode = CancelMode::external;
+3 -4
View File
@@ -55,10 +55,9 @@ public:
void on_init_recovered(api::orderman::OrderRecord const&,
const PreActivationOrderServices &) override;
OrderOpResult on_activate(Price, Quantity,
OrderServices&,
trace::CorID const&) override ;
OrderOpResult on_update(Price, Quantity, trace::CorID const&) override;
OrderOpResult on_cancel(trace::CorID const&) override;
OrderServices&) override ;
OrderOpResult on_update(Price, Quantity) override;
OrderOpResult on_cancel() override;
private:
// callbacks from book and child order udpates
void _on_book_update(const BookUpdateEvent&);
@@ -139,8 +139,7 @@ void BookAlgo::on_init_recovered(const api::orderman::OrderRecord &rec,
}
}
OrderOpResult BookAlgo::on_activate(Price p, Quantity q, OrderServices &services,
trace::CorID const &) {
OrderOpResult BookAlgo::on_activate(Price p, Quantity q, OrderServices &services) {
bts_assert(!me->services);
me->services = &services;
switch (this_state().status()) {
@@ -182,7 +181,7 @@ OrderOpResult BookAlgo::on_activate(Price p, Quantity q, OrderServices &services
return OrderOpResult{};
}
OrderOpResult BookAlgo::on_update(Price p, Quantity q, trace::CorID const &) {
OrderOpResult BookAlgo::on_update(Price p, Quantity q) {
LOG(OrderMan, Info, "Updating BookAlgo {}", key().value());
switch (this_state().status()) {
case ORDER_STATUS_WORKING:
@@ -237,7 +236,7 @@ OrderOpResult BookAlgo::on_update(Price p, Quantity q, trace::CorID const &) {
return OrderOpResult{};
}
OrderOpResult BookAlgo::on_cancel(trace::CorID const &) {
OrderOpResult BookAlgo::on_cancel() {
LOG(OrderMan, Info, "Canceling BookAlgo Order {}", key().value());
switch (this_state().status()) {
@@ -24,9 +24,9 @@ public:
const PreActivationOrderServices&) override;
void on_init_recovered(const api::orderman::OrderRecord&,
const PreActivationOrderServices &) override;
OrderOpResult on_activate(Price,Quantity,OrderServices &, trace::CorID const&) override ;
OrderOpResult on_update(Price , Quantity,trace::CorID const&) override ;
OrderOpResult on_cancel(trace::CorID const&) override ;
OrderOpResult on_activate(Price,Quantity,OrderServices &) override ;
OrderOpResult on_update(Price , Quantity) override ;
OrderOpResult on_cancel() override ;
protected:
virtual void setup_child(const api::orderman::OrderDefinition& parent, const PreActivationOrderServices&,
@@ -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&) = 0;
// 15. settlement price update
virtual void on_settlement_price(const SettlementUpdateEvent&) = 0;
// 7. time event called by the infrastructure
@@ -42,8 +42,7 @@ public:
// 8. when a quoter order ack from the exchange has an error
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;
virtual void on_quoter_order_fill(SpreaderLegData& leg_data) = 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
@@ -7,7 +7,6 @@
#include "lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h"
#include "lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h"
#include "lib/orderman/events/SettlementUpdateEvent.h"
#include "lib/tracing/bts_trace.h"
#include "lib/utils/helper_macros.h"
namespace bts {
@@ -55,14 +54,14 @@ void SpreaderOrder::on_init_recovered(const bts::api::orderman::OrderRecord& ord
_report_state();
}
OrderOpResult SpreaderOrder::on_activate(Price price, Quantity quantity,
OrderServices& services, const trace::CorID&){
OrderServices& services){
if (!_active) return OrderOpResult{api::orderman::ORDER_ERROR_INVALID_OP,"Order is not active"};
SpreaderOrderServices spreader_order_services (&services);
_on_activate(price, quantity, spreader_order_services);
_report_state();
return OrderOpResult{};
}
OrderOpResult SpreaderOrder::on_update(Price price, Quantity quantity,trace::CorID const&){
OrderOpResult SpreaderOrder::on_update(Price price, Quantity quantity){
if (!_active) return OrderOpResult{api::orderman::ORDER_ERROR_INVALID_OP,"Order is not active"};
LOG(OrderMan, Info, "SpreaderOrder.on_update key:{} price:{} quantity:{}",
key().value(), price.value(), quantity.value());
@@ -70,7 +69,7 @@ OrderOpResult SpreaderOrder::on_update(Price price, Quantity quantity,trace::Cor
_report_state();
return OrderOpResult{};
}
OrderOpResult SpreaderOrder::on_cancel(trace::CorID const&){
OrderOpResult SpreaderOrder::on_cancel(){
if (!_active) return OrderOpResult{api::orderman::ORDER_ERROR_INVALID_OP,"Order is not active"};
LOG(OrderMan, Info, "SpreaderOrder.on_cancel key:{}", key().value());
_state_worker->on_cancel();
@@ -98,9 +97,8 @@ void SpreaderOrder::_on_time(const bts::mercury::TimerEvent& t_event){
}
void SpreaderOrder::_on_book_update(const BookUpdateEvent& book_event){
if (!_active) return;
auto scoped = _order_services->log_scope(book_event.trace,
"SpreaderOrder::_on_book_update", key().value());
_state_worker->on_book (book_event.book,book_event.trace);
auto scoped = _order_services->log_scope("SpreaderOrder::_on_book_update", key().value());
_state_worker->on_book (book_event.book);
//_keep_hedging_path_hot ();
}
void SpreaderOrder::_on_settlement_update(const SettlementUpdateEvent&
@@ -119,8 +117,7 @@ void SpreaderOrder::_on_child_order_update(const OrderStateUpdateEvent& ord_ev){
auto now = _perf_ts;
char cb_type='q'; //q=quoter non fill, f=quoter fill, h=hedger
auto scoped_log =
_order_services->log_scope(ord_ev.trace,
"SpreaderOrder::_on_child_order_update",
_order_services->log_scope("SpreaderOrder::_on_child_order_update",
key().value());
OrderKey order_key = ord_ev.key;
bts::api::orderman::OrderStatus status = ord_ev.status;
@@ -153,7 +150,7 @@ void SpreaderOrder::_on_child_order_update(const OrderStateUpdateEvent& ord_ev){
if (leg_data.order_update_message().last_update_filled_quantity().value() > 0){
cb_type='f';
LOG(OrderMan,Info,"h_p f child update {0}",_diff_ns());
_state_worker->on_quoter_order_fill (leg_data,ord_ev.trace);
_state_worker->on_quoter_order_fill (leg_data);
}
else{
cb_type='q';
@@ -324,14 +321,12 @@ 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){
Quantity hedge_qty){
SingleFillHedger& hedger = _bookkeeping_data().add_new_hedger (*this,
hedge_leg_index,
hedge_price,
hedge_qty,
_order_services,
trace);
_order_services);
hedger.init ();
}
void SpreaderOrder::_compute_hedge_price_quantity(size_t filled_leg_index,
@@ -100,12 +100,12 @@ public:
const PreActivationOrderServices&) override;
// this is in the critical path, orders can be submitted now
// (this is only called once and after the on_init_new)
OrderOpResult on_activate(Price, Quantity, OrderServices&,trace::CorID const&) override;
OrderOpResult on_activate(Price, Quantity, OrderServices&) override;
// called when the user (or a higher level order)
// updates the order's price or quantity
OrderOpResult on_update(Price, Quantity,trace::CorID const&) override;
OrderOpResult on_update(Price, Quantity) override;
// called when the user (or higher level order) cancels an order
OrderOpResult on_cancel(trace::CorID const&) override;
OrderOpResult on_cancel() override;
// ISpreaderManager ////////////////////
////////////////////////////////////////
public:
@@ -175,8 +175,7 @@ private:
// quantity 'filled_quantity'
void _send_hedge(size_t hedge_leg_index,
Price hedge_price,
Quantity hedge_qty,
trace::CorID const);
Quantity hedge_qty);
void _compute_hedge_price_quantity(size_t filled_leg_index,
Price filled_price,
double filled_quantity,
@@ -257,7 +256,7 @@ public:
SpreaderBookkeepingData& test_only_func_spreader_full_data () {return _bookkeeping_data();}
int64_t test_cancel_timeout () {return _cancel_timeout;}
void test_only_on_book_update(const bts::orderman::BookUpdateEvent& b) {_on_book_update(b);}
void test_only_on_book_update(const bts::orderman::Book& b, trace::CorID const&trace) {_on_book_update(bts::orderman::BookUpdateEvent(b, trace));}
void test_only_on_book_update(const bts::orderman::Book& b) {_on_book_update(bts::orderman::BookUpdateEvent(b,trace::CorID{}));}
void test_only_on_child_order_update (bts::orderman::OrderKey order_key, bts::api::orderman::OrderStatus status, Quantity total_filled_qty, Price avg_price)
{
bts::api::orderman::OrderDefinition order_def;
@@ -266,7 +265,7 @@ public:
order_state.set_status(status);
order_state.set_filled_quantity(total_filled_qty.value());
order_state.set_last_price(avg_price.value());
OrderStateUpdateEvent ord_ev (order_key, OrderKey(0), order_state,trace::CorID());
OrderStateUpdateEvent ord_ev (order_key, OrderKey(0), order_state);
_on_child_order_update (ord_ev);
}
void test_only_on_init_new(const bts::api::orderman::OrderDefinition& order_def, const SpreaderPreActivationOrderServices& pao_services) {_on_init_new(order_def, pao_services);}
@@ -14,7 +14,6 @@ SingleFillHedger::SingleFillHedger(ISpreaderManager& spreader_manager,
ChildOrder& child_order,
bts::Price hedge_price,
bts::Quantity hedge_quantity,
trace::CorID const &fill_trace,
bool is_live)
:
_spreader(spreader_manager),
@@ -26,7 +25,6 @@ _child_order_state (child_order,
_price_quantity_state(hedge_price,
hedge_quantity,
leg_property_data.trading_side()),
_fill_trace(fill_trace),
_worker (nullptr),
_start_state_worker (this),
_waiting_for_first_ack_state_worker (this),
@@ -46,7 +44,6 @@ _spreader (other._spreader),
_leg_property_data (other._leg_property_data),
_child_order_state (std::move(other._child_order_state)),
_price_quantity_state (other._price_quantity_state),
_fill_trace(other._fill_trace),
_worker(nullptr),
_start_state_worker (this, other._start_state_worker),
_waiting_for_first_ack_state_worker (this, other._waiting_for_first_ack_state_worker),
@@ -94,8 +91,8 @@ void SingleFillHedger::on_order_update(const SpreaderChildOrderState& u){
u.last_update_filled_quantity());
_worker->on_order_update (u);
}
void SingleFillHedger::on_book(const bts::orderman::Book& book,trace::CorID &trace){
_worker->on_book (book,trace);
void SingleFillHedger::on_book(const bts::orderman::Book& book){
_worker->on_book (book);
}
void SingleFillHedger::cancel_hedge(){
LOG(OrderMan, Info, "SingleFillHedger::cancel_order key:{} state:{}",
@@ -30,7 +30,6 @@ private:
const LegPropertyData& _leg_property_data;
SpreaderChildOrderState _child_order_state;
HedgePriceQuantityState _price_quantity_state;
trace::CorID _fill_trace;
IHedgerStateWorker* _worker;
HedgerStartStateWorker _start_state_worker;
HedgerWaitingForFirstAckStateWorker _waiting_for_first_ack_state_worker;
@@ -52,8 +51,7 @@ private:
Quantity quantity) {
_child_order_state.place_order(price,
quantity,
_spreader.current_time(),
_fill_trace);
_spreader.current_time());
}
void _modify_order (Price new_price){
_price_quantity_state.update_out_price (new_price);
@@ -71,7 +69,6 @@ public:
ChildOrder& child_order,
bts::Price hedge_price,
bts::Quantity hedge_quantity,
trace::CorID const &trace,
bool is_live);
SingleFillHedger() = delete;
SingleFillHedger (const SingleFillHedger&) = delete;
@@ -88,7 +85,7 @@ public:
void on_order_update(const SpreaderChildOrderState& order_update_message);
//c. called when the market data associated
// with this security is changed
void on_book(const bts::orderman::Book& book,trace::CorID &);
void on_book(const bts::orderman::Book& book);
//d. called when the hedge order is cancelled, either
// manually or automatically
void cancel_hedge();
@@ -108,9 +108,9 @@ 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){
if (_active_quoting)
_worker->on_book (leg_index, book,trace);
_worker->on_book (leg_index, book);
}
void SingleLegQuoter::update_other_leg_fills(size_t leg_index,
Quantity filled_quantity){
@@ -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&);
//d. called when the order is cancelled, either
// manually or automatically
void cancel_order();
@@ -161,15 +161,13 @@ private:
return _price_quantity_state.target_reached();
}
void _place_order (Price price,
Quantity quantity,
const trace::CorID &trace) {
Quantity quantity) {
_child_order_state.place_order(price,
quantity,
_spreader.current_time(),
trace);
_spreader.current_time());
}
void _modify_order (Price price, Quantity quantity, trace::CorID &trace) {
_child_order_state.modify_order(price, quantity, trace);
void _modify_order (Price price, Quantity quantity) {
_child_order_state.modify_order(price, quantity);
}
void _cancel_order () {_child_order_state.cancel_order();}
// this updates the hedge reduction in _price_quantity_state
@@ -93,11 +93,10 @@ SingleFillHedger& SpreaderBookkeepingData::add_new_hedger(ISpreaderManager& spre
size_t leg_index,
bts::Price hedge_price,
bts::Quantity hedge_quantity,
SpreaderOrderServices* ,
const trace::CorID &trace){
SpreaderOrderServices* ){
LOG(OrderMan, Info, "SpreaderBookkeepingData::add_new_hedger "
"leg_index:{} price:{} quantity:{} cid:{}",
leg_index, hedge_price, hedge_quantity,trace.sn);
"leg_index:{} price:{} quantity:{} ",
leg_index, hedge_price, hedge_quantity);
bts_assert(leg_index < _n_legs);
SpreaderLegData& leg_data = _leg_data[leg_index];
std::vector<SingleFillHedger>& leg_hedgers = _hedgers[leg_index];
@@ -107,7 +106,6 @@ SingleFillHedger& SpreaderBookkeepingData::add_new_hedger(ISpreaderManager& spre
hedge_order,
hedge_price,
hedge_quantity,
trace,
_is_live);
return leg_hedgers.back();
}
@@ -110,8 +110,7 @@ public:
size_t leg_index,
bts::Price hedge_price,
bts::Quantity hedge_quantity,
SpreaderOrderServices *services,
trace::CorID const &);
SpreaderOrderServices *services);
// finds the spreader fill, price (ie averages it out, using
// the size and price ratio, across all legs)
void total_fills (Quantity& out_quantity, Price& out_price) const;
@@ -129,8 +129,7 @@ public:
/////////////////////////////////////
void place_order(Price price,
Quantity quantity,
bts::TimeStamp curr_time,
const trace::CorID& trace){
bts::TimeStamp curr_time){
_out_price = price;
_out_quantity = quantity;
_order_place_time=curr_time;
@@ -138,17 +137,13 @@ public:
_n_place_orders++;
LOG(OrderMan, Info, "SpreaderChildOrderState::place_order "
"key:{} is_quoting:{} sec_key:{} live:{} "
"price:{} qty:{} cid:{}",
"price:{} qty:{}",
order_key(), _is_quoting, _sec_key,
_is_live, price, quantity, trace.sn);
_is_live, price, quantity);
if (_is_live)
_child_order.activate(price, quantity, trace);
_child_order.activate(price, quantity);
}
void modify_order(Price price, Quantity quantity){
trace::CorID dont_care;
modify_order(price,quantity,dont_care);
}
void modify_order(Price price, Quantity quantity, trace::CorID &trace){
_out_price = price;
_out_quantity = quantity;
_n_modify_orders++;
@@ -158,7 +153,7 @@ public:
order_key(), _is_quoting, _sec_key,
_is_live, price, quantity, _n_modify_orders);
if (_is_live) {
_child_order.update(price, quantity, trace);
_child_order.update(price, quantity);
}
}
void cancel_order(){
@@ -55,9 +55,9 @@ public:
SpreaderOrderServices (bts::orderman::OrderServices* order_services);
bts::orderman::OrderServices& order_services();
void report_state(const api::orderman::OrderState &state);
trace::ScopedPerfLogEntry log_scope(trace::CorID cid, const char *entry_kind,
trace::ScopedPerfLogEntry log_scope(const char *entry_kind,
uint64_t uint64_1 = 0,const char *txt_1 = "",uint32_t uint32_1 = 0);
void log(trace::CorID cid, const char *entry_kind,
void log(const char *entry_kind,
uint64_t uint64_1 = 0,const char *txt_1 = "",uint32_t uint32_1 = 0);
bool is_live();
};
@@ -16,24 +16,22 @@ void SpreaderOrderServices::report_state(const api::orderman::OrderState &state)
if (is_live())
_order_services->report_state(state);
}
trace::ScopedPerfLogEntry SpreaderOrderServices::log_scope(trace::CorID cid,
const char *entry_kind,
trace::ScopedPerfLogEntry SpreaderOrderServices::log_scope(const char *entry_kind,
uint64_t uint64_1,
const char *txt_1,
uint32_t uint32_1){
if(_is_live)
return _order_services->log_scope(cid,entry_kind,uint64_1,txt_1,uint32_1);
return _order_services->log_scope(entry_kind,uint64_1,txt_1,uint32_1);
else
return
trace::ScopedPerfLogEntry ();
}
void SpreaderOrderServices::log(trace::CorID cid,
const char *entry_kind,
void SpreaderOrderServices::log(const char *entry_kind,
uint64_t uint64_1,
const char *txt_1,
uint32_t uint32_1) {
if(_is_live)
_order_services->log(cid, entry_kind, uint64_1, txt_1, uint32_1);
_order_services->log(entry_kind, uint64_1, txt_1, uint32_1);
}
bool SpreaderOrderServices::is_live()
{return _is_live;}
@@ -25,7 +25,7 @@ public:
virtual void on_order_update (const SpreaderChildOrderState& order_update) = 0;
// called only when the security that the hedger is working on
// has a market data update
virtual void on_book (const bts::orderman::Book& book,trace::CorID &) = 0;
virtual void on_book (const bts::orderman::Book& book) = 0;
// when the spreader wants the hedger to cancel its order
virtual void cancel() = 0;
// on terminate, the hedger should simply go to its end state
@@ -9,7 +9,7 @@ void HedgerEndStateWorker::init(){
}
void HedgerEndStateWorker::on_order_update(const SpreaderChildOrderState&){
}
void HedgerEndStateWorker::on_book(const bts::orderman::Book&,trace::CorID &){
void HedgerEndStateWorker::on_book(const bts::orderman::Book&){
}
void HedgerEndStateWorker::cancel(){
}
@@ -17,7 +17,7 @@ public:
const std::string state_text () const override {return "END";}
void init () override;
void on_order_update (const SpreaderChildOrderState& order_update) override;
void on_book (const bts::orderman::Book& book,trace::CorID &) override;
void on_book (const bts::orderman::Book& book) override;
void cancel() override;
void terminate() override;
void on_time(const TimeStamp&) override;
@@ -18,7 +18,7 @@ void HedgerStartStateWorker::init(){
void HedgerStartStateWorker::on_order_update(const SpreaderChildOrderState&){
bts_assert_msg (false, "HedgerStartStateWorker::on_order_update illegal operation");
}
void HedgerStartStateWorker::on_book(const bts::orderman::Book&,trace::CorID &){
void HedgerStartStateWorker::on_book(const bts::orderman::Book&){
// market data will not be sent until out of start.
bts_assert_msg (false, "HedgerStartStateWorker::on_book illegal operation");
}
@@ -21,7 +21,7 @@ public:
const std::string state_text () const override {return "START";}
void init () override;
void on_order_update (const SpreaderChildOrderState& order_update) override;
void on_book (const bts::orderman::Book& book,trace::CorID &) override;
void on_book (const bts::orderman::Book& book) override;
void cancel() override;
void terminate() override;
void on_time(const TimeStamp&) override;
@@ -17,7 +17,7 @@ void HedgerWaitingForCancelAckStateWorker::on_order_update(const SpreaderChildOr
_hedger->transform_to_END ();
}
}
void HedgerWaitingForCancelAckStateWorker::on_book(const bts::orderman::Book&,trace::CorID &){
void HedgerWaitingForCancelAckStateWorker::on_book(const bts::orderman::Book&){
}
void HedgerWaitingForCancelAckStateWorker::cancel(){
}
@@ -21,7 +21,7 @@ public:
const std::string state_text () const override {return "WAITING_FOR_CANCEL_ACK";}
void init () override;
void on_order_update (const SpreaderChildOrderState& order_update) override;
void on_book (const bts::orderman::Book& book,trace::CorID &) override;
void on_book (const bts::orderman::Book& book) override;
void cancel() override;
void terminate() override;
void on_time(const TimeStamp&) override;
@@ -23,7 +23,7 @@ void HedgerWaitingForFirstAckCancelledStateWorker::on_order_update(const Spreade
_hedger->transform_to_WAITING_FOR_CANCEL_ACK ();
}
}
void HedgerWaitingForFirstAckCancelledStateWorker::on_book(const bts::orderman::Book&,trace::CorID &){
void HedgerWaitingForFirstAckCancelledStateWorker::on_book(const bts::orderman::Book&){
}
void HedgerWaitingForFirstAckCancelledStateWorker::cancel(){
}
@@ -21,7 +21,7 @@ public:
const std::string state_text () const override {return "WAITING_FOR_FIRST_ACK_CANCELLED";}
void init () override;
void on_order_update (const SpreaderChildOrderState& order_update) override;
void on_book (const bts::orderman::Book& book,trace::CorID &) override;
void on_book (const bts::orderman::Book& book) override;
void cancel() override;
void terminate() override;
void on_time(const TimeStamp&) override;
@@ -18,7 +18,7 @@ void HedgerWaitingForFirstAckStateWorker::on_order_update(const SpreaderChildOrd
// this means the first ack
_hedger->transform_to_WORKING ();
}
void HedgerWaitingForFirstAckStateWorker::on_book(const bts::orderman::Book&,trace::CorID &){
void HedgerWaitingForFirstAckStateWorker::on_book(const bts::orderman::Book&){
}
void HedgerWaitingForFirstAckStateWorker::cancel(){
_hedger->transform_to_WAITING_FOR_FIRST_ACK_CANCELLED ();
@@ -21,7 +21,7 @@ public:
const std::string state_text () const override {return "WAITING_FOR_FIRST_ACK";}
void init () override;
void on_order_update (const SpreaderChildOrderState& order_update) override;
void on_book (const bts::orderman::Book& book,trace::CorID &) override;
void on_book (const bts::orderman::Book& book) override;
void cancel() override;
void terminate() override;
void on_time(const TimeStamp&) override;
@@ -20,7 +20,7 @@ void HedgerWorkingStateWorker::on_order_update(const SpreaderChildOrderState& or
_hedger->transform_to_END ();
}
}
void HedgerWorkingStateWorker::on_book(const bts::orderman::Book&,trace::CorID &){
void HedgerWorkingStateWorker::on_book(const bts::orderman::Book&){
double new_price;
if (SpreaderUtils::post_hedge_market_based_price_action (_hedger->_price_quantity_state.out_price().value(),
_hedger->_price_quantity_state.out_quantity().value(),
@@ -24,7 +24,7 @@ public:
const std::string state_text () const override {return "WORKING";}
void init () override;
void on_order_update (const SpreaderChildOrderState& order_update) override;
void on_book (const bts::orderman::Book& book,trace::CorID &) override;
void on_book (const bts::orderman::Book& book) override;
void cancel() override;
void terminate() override;
void on_time(const TimeStamp&) override;
@@ -26,7 +26,7 @@ public:
virtual void on_order_update (const SpreaderChildOrderState& order_update) = 0;
// called when any of the legs in the spread has a book update
//virtual void on_book (TickToTradeCorID corid, size_t leg_id, const Book& book) = 0;
virtual void on_book (size_t, const bts::orderman::Book&,trace::CorID &) = 0;
virtual void on_book (size_t, const bts::orderman::Book&) = 0;
// when the spreader wants the quoter to cancel its order
virtual void cancel() = 0;
// on terminate, the quoter should simply go to its end state
@@ -29,7 +29,7 @@ void QuoterEndStateWorker::one_time_activate (Price, Quantity){
void QuoterEndStateWorker::on_order_update (const SpreaderChildOrderState&)
{}
void QuoterEndStateWorker::on_book (size_t,
const bts::orderman::Book&,trace::CorID &)
const bts::orderman::Book&)
{}
void QuoterEndStateWorker::cancel()
{}
@@ -25,7 +25,7 @@ public:
virtual void on_transition () override;
void one_time_activate (Price, Quantity) override;
void on_order_update (const SpreaderChildOrderState& order_update) override;
void on_book (size_t leg_id, const bts::orderman::Book& book,trace::CorID &) override;
void on_book (size_t leg_id, const bts::orderman::Book& book) override;
void cancel() override;
void terminate() override;
void on_time(const TimeStamp& ts) override;
@@ -24,7 +24,7 @@ void QuoterStartStateWorker::on_order_update (const SpreaderChildOrderState&){
bts_assert_msg (false, "QuoterStartStateWorker::on_order_update is an illegal operation, nothing can happen before one_time_activate");
}
void QuoterStartStateWorker::on_book (size_t,
const bts::orderman::Book&,trace::CorID &){
const bts::orderman::Book&){
}
void QuoterStartStateWorker::cancel(){
// since no order has been sent for this leg,
@@ -23,7 +23,7 @@ public:
virtual void on_transition () override {}
void one_time_activate (Price, Quantity) override;
void on_order_update (const SpreaderChildOrderState& order_update) override;
void on_book (size_t leg_id, const bts::orderman::Book& book,trace::CorID &) override;
void on_book (size_t leg_id, const bts::orderman::Book& book) override;
void cancel() override;
void terminate() override;
void on_time(const TimeStamp& ts) override;
@@ -20,8 +20,7 @@ void QuoterWaitingForCancelAckStateWorker::on_order_update (const SpreaderChildO
_quoter->_transform_to_END ();
}
void QuoterWaitingForCancelAckStateWorker::on_book (size_t,
const bts::orderman::Book&,
trace::CorID &){
const bts::orderman::Book&){
}
void QuoterWaitingForCancelAckStateWorker::cancel(){
}
@@ -24,7 +24,7 @@ public:
virtual void on_transition () override {}
void one_time_activate (Price, Quantity) override;
void on_order_update (const SpreaderChildOrderState& order_update) override;
void on_book (size_t leg_id, const bts::orderman::Book& book,trace::CorID &) override;
void on_book (size_t leg_id, const bts::orderman::Book& book) override;
void cancel() override;
void terminate() override;
void on_time(const TimeStamp& ts) override;
@@ -25,7 +25,7 @@ void QuoterWaitingForFirstAckCancelledWorker::on_order_update (const SpreaderChi
_quoter->_transform_to_WAITING_FOR_CANCEL_ACK ();
}
}
void QuoterWaitingForFirstAckCancelledWorker::on_book (size_t , const bts::orderman::Book& ,trace::CorID &) {
void QuoterWaitingForFirstAckCancelledWorker::on_book (size_t , const bts::orderman::Book& ) {
}
void QuoterWaitingForFirstAckCancelledWorker::cancel(){
}
@@ -30,7 +30,7 @@ public:
virtual void on_transition () override {}
void one_time_activate (Price, Quantity) override;
void on_order_update (const SpreaderChildOrderState& order_update) override;
void on_book (size_t leg_id, const bts::orderman::Book& book,trace::CorID &) override;
void on_book (size_t leg_id, const bts::orderman::Book& book) override;
void cancel() override;
void terminate() override;
void on_time(const TimeStamp& ts) override;
@@ -22,7 +22,7 @@ void QuoterWaitingForFirstAckWorker::on_order_update (const SpreaderChildOrderSt
_quoter->_transform_to_WORKING ();
}
void QuoterWaitingForFirstAckWorker::on_book (size_t,
const bts::orderman::Book&,trace::CorID &){
const bts::orderman::Book&){
_analyze_and_act();
}
void QuoterWaitingForFirstAckWorker::cancel(){
@@ -28,7 +28,7 @@ public:
virtual void on_transition () override {}
void one_time_activate (Price, Quantity) override;
void on_order_update (const SpreaderChildOrderState& order_update) override;
void on_book (size_t leg_id, const bts::orderman::Book& book,trace::CorID & ) override;
void on_book (size_t leg_id, const bts::orderman::Book& book) override;
void cancel() override;
void terminate() override;
void on_time(const TimeStamp& ts) override;
@@ -24,7 +24,7 @@ void QuoterWaitingForIOCWorker::on_order_update (const SpreaderChildOrderState&
}
}
void QuoterWaitingForIOCWorker::on_book (size_t,
const bts::orderman::Book&,trace::CorID &){
const bts::orderman::Book&){
}
void QuoterWaitingForIOCWorker::cancel(){
_quoter->_transform_to_WAITING_FOR_FIRST_ACK_CANCELLED ();
@@ -31,7 +31,7 @@ public:
void one_time_activate (Price, Quantity) override;
void on_order_update (const SpreaderChildOrderState& order_update) override;
void on_book (size_t leg_id,
const bts::orderman::Book& book,trace::CorID &) override;
const bts::orderman::Book& book) override;
void cancel() override;
void terminate() override;
void on_time(const TimeStamp& ts) override;
@@ -19,9 +19,8 @@ void QuoterWaitingForSizeStateWorker::on_order_update (const SpreaderChildOrderS
bts_assert_msg (false, "QuoterWaitingForSizeStateWorker::on_order_update "
"is an illegal operation");
}
void QuoterWaitingForSizeStateWorker::on_book (size_t,
const Book&,trace::CorID &trace){
_longpath_analyze_and_act (trace);
void QuoterWaitingForSizeStateWorker::on_book (size_t, const bts::orderman::Book& ){
_longpath_analyze_and_act ();
}
void QuoterWaitingForSizeStateWorker::cancel(){
// since no order has been sent for this leg, cancel just takes
@@ -45,10 +44,6 @@ void QuoterWaitingForSizeStateWorker::update_spreader_order (Price price,
_longpath_analyze_and_act ();
}
void QuoterWaitingForSizeStateWorker::_longpath_analyze_and_act(){
trace::CorID trace;
_longpath_analyze_and_act(trace);
}
void QuoterWaitingForSizeStateWorker::_longpath_analyze_and_act(trace::CorID &){
if (_quoter->_price_quantity_state.target_reached()){
LOG(OrderMan, Info, "QuoterWaitingForSizeStateWorker key:{} "
"target reached, transforming to end",
@@ -65,7 +60,7 @@ void QuoterWaitingForSizeStateWorker::_longpath_analyze_and_act(trace::CorID &){
"key:{} price:{} quantity:{}",
_quoter->_key(), out_price, out_quantity);
// this is the only place where a quoter order is entered
_quoter->_place_order(out_price, out_quantity, trace::CorID {});
_quoter->_place_order(out_price, out_quantity);
if(_quoter->_hidden_order) _quoter->_transform_to_WAITING_FOR_IOC();
else _quoter->_transform_to_WAITING_FOR_FIRST_ACK ();
}
@@ -30,7 +30,7 @@ public:
virtual void on_transition () override {}
void one_time_activate (Price, Quantity) override;
void on_order_update (const SpreaderChildOrderState& order_update) override;
void on_book (size_t leg_id, const bts::orderman::Book& book,trace::CorID &) override;
void on_book (size_t leg_id, const bts::orderman::Book& book) override;
void cancel() override;
void terminate() override;
void on_time(const TimeStamp& ts) override;
@@ -41,6 +41,5 @@ private:
// if it has. otherwise computes the price, qty and if
// its valid, places an order goes to waiting_for_first_ack
void _longpath_analyze_and_act ();
void _longpath_analyze_and_act (trace::CorID &);
};
}}
@@ -30,9 +30,8 @@ void QuoterWorkingStateWorker::on_order_update (const SpreaderChildOrderState& u
_longpath_analyze_and_act ();
}
void QuoterWorkingStateWorker::on_book (size_t,
const bts::orderman::Book&,
trace::CorID &trace){
_longpath_analyze_and_act (trace);
const bts::orderman::Book&){
_longpath_analyze_and_act ();
}
void QuoterWorkingStateWorker::cancel(){
_quoter->_cancel_order();
@@ -54,11 +53,6 @@ void QuoterWorkingStateWorker::update_spreader_order (Price price,
_longpath_analyze_and_act ();
}
void QuoterWorkingStateWorker::_longpath_analyze_and_act ()
{
trace::CorID trace;
_longpath_analyze_and_act(trace);
}
void QuoterWorkingStateWorker::_longpath_analyze_and_act (trace::CorID &trace)
{
if (_quoter->_price_quantity_state.target_reached()){
// this could happen if
@@ -82,25 +76,25 @@ void QuoterWorkingStateWorker::_longpath_analyze_and_act (trace::CorID &trace)
if (order_quantity.value() != _quoter->_price_quantity_state.out_quantity().value())
// this is a size change, size changes always go through regardless of the
// quoting parameters
_modify_order (computed_price, order_quantity,trace);
_modify_order (computed_price, order_quantity);
else{
bool reprice = true;
if (_quoter->_this_leg_data.leg_params().quote_params().has_quote_mute_zone())
reprice = SpreaderUtils::reprice_quote_mute_zone(_quoter->_price_quantity_state.out_price().value(), computed_price.value(), _quoter->_this_leg_data.trading_side(),
_quoter->_this_leg_data.tick_size(), _quoter->_this_leg_data.leg_params().quote_params().quote_mute_zone());
if (reprice)
_modify_order (computed_price, order_quantity,trace);
_modify_order (computed_price, order_quantity);
}
}
}
}
void QuoterWorkingStateWorker::_modify_order (Price price, Quantity quantity,trace::CorID &trace ){
void QuoterWorkingStateWorker::_modify_order (Price price, Quantity quantity){
bool same_price_qty = _quoter->_price_quantity_state.out_quantity() == quantity &&
bts::securities::test_price_equality(_quoter->_price_quantity_state.out_price().value(),
price.value(), _quoter->_this_leg_data.tick_size());
if (!same_price_qty){
_quoter->_commit_drivers (price);
_quoter->_modify_order(price, quantity,trace);
_quoter->_modify_order(price, quantity);
}
}
}}
@@ -23,7 +23,7 @@ public:
virtual void on_transition () override;
void one_time_activate (Price, Quantity) override;
void on_order_update (const SpreaderChildOrderState& order_update) override;
void on_book (size_t leg_id, const bts::orderman::Book& book,trace::CorID &) override;
void on_book (size_t leg_id, const bts::orderman::Book& book) override;
void cancel() override;
void terminate() override;
void on_time(const TimeStamp& ts) override;
@@ -34,8 +34,7 @@ private:
// i. if target reached => cxl order and go to waiting_for_cancel_ack_final
// ii. if computed_qty = 0 => cxl order and go to waiting_for_cancel_ack_continue
// iii. if reprice (ie qty changed or price changed beyond the threshold) => requote
void _longpath_analyze_and_act (trace::CorID &);
void _longpath_analyze_and_act ();
void _modify_order (Price price, Quantity quantity,trace::CorID &);
void _modify_order (Price price, Quantity quantity);
};
}}
@@ -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&){
}
void SpreaderEndStateWorker::on_settlement_price(const SettlementUpdateEvent&){
}
@@ -42,8 +42,7 @@ void SpreaderEndStateWorker::on_time(const TimeStamp&){
}
void SpreaderEndStateWorker::on_quoter_order_error(SpreaderLegData&){
}
void SpreaderEndStateWorker::on_quoter_order_fill(SpreaderLegData&,
trace::CorID){
void SpreaderEndStateWorker::on_quoter_order_fill(SpreaderLegData&){
}
void SpreaderEndStateWorker::on_quoter_order_status_update(SpreaderLegData&){
}
@@ -20,12 +20,11 @@ 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&) 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;
void on_quoter_order_fill(SpreaderLegData& leg_data) 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;
@@ -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&){
bts_assert_msg (false, "SpreaderStartStateWorker::on_book is an illegal operation");
}
void SpreaderStartStateWorker::on_settlement_price(const SettlementUpdateEvent&){
@@ -130,8 +130,7 @@ void SpreaderStartStateWorker::on_time(const TimeStamp&){
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){
void SpreaderStartStateWorker::on_quoter_order_fill(SpreaderLegData&){
bts_assert_msg (false, "SpreaderStartStateWorker::on_quoter_order_fill is an illegal operation");
}
void SpreaderStartStateWorker::on_quoter_order_status_update(SpreaderLegData&){
@@ -25,12 +25,11 @@ 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&) 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;
void on_quoter_order_fill(SpreaderLegData& leg_data) 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;
@@ -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&){
}
void SpreaderWaitingForCancelAllStateWorker::on_time(const TimeStamp& ts){
if (ms_diff (ts, _cancel_timestamp) >= _spreader->_cancel_timeout){
@@ -47,8 +47,7 @@ void SpreaderWaitingForCancelAllStateWorker::on_settlement_price(const Settlemen
void SpreaderWaitingForCancelAllStateWorker::on_quoter_order_error(SpreaderLegData& leg_data){
leg_data.quoter().update_order_status (leg_data.order_update_message());
}
void SpreaderWaitingForCancelAllStateWorker::on_quoter_order_fill(SpreaderLegData& leg_data,
trace::CorID ){
void SpreaderWaitingForCancelAllStateWorker::on_quoter_order_fill(SpreaderLegData& leg_data){
leg_data.quoter().update_order_status (leg_data.order_update_message());
}
void SpreaderWaitingForCancelAllStateWorker::on_quoter_order_status_update(SpreaderLegData& leg_data){
@@ -23,12 +23,11 @@ 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&) 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;
void on_quoter_order_fill(SpreaderLegData& leg_data) 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;
@@ -45,8 +45,7 @@ void SpreaderWaitingForInitialDataStateWorker::on_update(Price,
void SpreaderWaitingForInitialDataStateWorker::on_cancel(){
_spreader->_transform_to_END();
}
void SpreaderWaitingForInitialDataStateWorker::on_book(const Book& book,
trace::CorID){
void SpreaderWaitingForInitialDataStateWorker::on_book(const Book& book){
SpreaderBookkeepingData& bookkeeping_data = _spreader->_bookkeeping_data();
SpreaderLegData& md_leg = bookkeeping_data.get_leg_data(book.security_key());
md_leg.update_book(book);
@@ -70,8 +69,7 @@ void SpreaderWaitingForInitialDataStateWorker::on_quoter_order_error(SpreaderLeg
bts_assert_msg (false, "SpreaderWaitingForInitialDataStateWorker::"
"on_quoter_order_error is an illegal operation");
}
void SpreaderWaitingForInitialDataStateWorker::on_quoter_order_fill(SpreaderLegData&,
trace::CorID){
void SpreaderWaitingForInitialDataStateWorker::on_quoter_order_fill(SpreaderLegData&){
bts_assert_msg (false, "SpreaderWaitingForInitialDataStateWorker::"
"on_quoter_order_fill is an illegal operation");
}
@@ -25,12 +25,11 @@ 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&) 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;
void on_quoter_order_fill(SpreaderLegData& leg_data) 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;
@@ -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){
SpreaderBookkeepingData& bookkeeping_data = _spreader->_bookkeeping_data();
// this is a key->index lookup
SpreaderLegData& md_leg = bookkeeping_data.get_leg_data(book.security_key());
@@ -53,11 +53,11 @@ void SpreaderWorkingStateWorker::on_book(const Book& book,trace::CorID trace){
for (size_t q_idx = 0; q_idx < bookkeeping_data.n_legs(); q_idx++){
SpreaderLegData& d = bookkeeping_data.get_leg_data(q_idx);
if (d.leg_property_data().is_active_quoting())
d.quoter().on_book(md_leg.leg_property_data().leg_index(), book,trace);
d.quoter().on_book(md_leg.leg_property_data().leg_index(), book);
}
//send md to hedgers hedging this security only
for (size_t h_idx = 0; h_idx < md_leg.n_hedgers(); h_idx++)
md_leg.get_hedger(h_idx).on_book(book,trace);
md_leg.get_hedger(h_idx).on_book(book);
}
void SpreaderWorkingStateWorker::on_settlement_price(const SettlementUpdateEvent&){
}
@@ -77,10 +77,9 @@ void SpreaderWorkingStateWorker::on_quoter_order_error(SpreaderLegData& leg_data
_spreader->_cancel_orders (true, true);
_spreader->_transform_to_WAITING_FOR_CANCEL_ALL ();
}
void SpreaderWorkingStateWorker::on_quoter_order_fill(SpreaderLegData& leg_data,
trace::CorID trace){
void SpreaderWorkingStateWorker::on_quoter_order_fill(SpreaderLegData& leg_data){
LOG(OrderMan, Info,"h_p w start {0}",_spreader->_diff_ns());
_spreader->_order_services->log_scope(trace, "SpreaderWorkingStateWorker::on_quoter_order_fill");
_spreader->_order_services->log_scope("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)
@@ -129,8 +128,7 @@ void SpreaderWorkingStateWorker::on_quoter_order_fill(SpreaderLegData& leg_data,
// a hedge is sent regardless
_spreader->_send_hedge(other_leg_data.leg_property_data().leg_index(),
hedge_price,
Quantity(total_unhedged_qty),
trace);
Quantity(total_unhedged_qty));
LOG(OrderMan, Info,"h_p send hedge {0} {1}",
q_idx, _spreader->_diff_ns());
}
@@ -22,12 +22,11 @@ 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&) 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;
void on_quoter_order_fill(SpreaderLegData& leg_data) 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;
@@ -390,8 +390,7 @@ void fire_book_update (double* prices, uint16_t* sizes, api::Side side, size_t l
bts::orderman::Book book;
fill_book (book, prices, sizes, side);
sm.set_book (book, leg_index);
trace::CorID trace;
quoter.on_book (leg_index, book,trace);
quoter.on_book (leg_index, book);
}
void verify_leg_data (SpreaderLegData& l, bts::orderman::OrderKey, size_t leg_index, uint32_t sec_key, uint32_t exp_yr, uint32_t exp_m, uint32_t exp_day, const std::string& symbol, double leg_mult, double price_mult, api::Side side)
{
@@ -441,8 +440,7 @@ void fire_book_update_hedger (double* prices, uint16_t* sizes, api::Side side, S
{
bts::orderman::Book book;
fill_book (book, prices, sizes, side);
trace::CorID trace;
hedger.on_book (book,trace);
hedger.on_book (book);
}
void verify_complete_hedger_state (const SingleFillHedger& hedger, HedgerState state, Price target_price, Quantity target_quantity, Quantity aggregated_filled_quantity,
Price out_price, Quantity, Quantity remaining_to_fill)
@@ -525,11 +523,11 @@ void set_spreader_orders (SpreaderOrder& spreader, double* leg_1_bid_prices, uin
bts::orderman::Book book_leg_1 = get_book (SecurityKey (leg_1_id), 5,
leg_1_bid_prices, leg_1_bid_sizes,
leg_1_ask_prices, leg_1_ask_sizes, true);
spreader.test_only_on_book_update (bts::orderman::BookUpdateEvent(book_leg_1, trace::CorID()));
spreader.test_only_on_book_update (bts::orderman::BookUpdateEvent(book_leg_1));
bts::orderman::Book book_leg_2 = get_book (SecurityKey (leg_2_id), 5,
leg_2_bid_prices, leg_2_bid_sizes,
leg_2_ask_prices, leg_2_ask_sizes, true);
spreader.test_only_on_book_update (bts::orderman::BookUpdateEvent(book_leg_2,trace::CorID()));
spreader.test_only_on_book_update (bts::orderman::BookUpdateEvent(book_leg_2));
spreader.test_only_on_child_order_update (leg_data_1.order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (leg_1_fills), Price (leg_1_filled_price));
spreader.test_only_on_child_order_update (leg_data_2.order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (leg_2_fills), Price (leg_2_filled_price));
}
+1 -1
View File
@@ -1 +1 @@
set(sources ../../externals/linux/include/google/protobuf/descriptor.proto;../../externals/linux/include/google/protobuf/timestamp.proto;../lib/api/apicore.proto;../lib/api/apigateway.proto;../lib/api/apioptions.proto;../lib/api/services/AdminService.proto;../lib/api/services/ApiUnitTestService.proto;../lib/api/services/AuthService.proto;../lib/api/services/ErrorReportService.proto;../lib/api/services/HelloService.proto;../lib/api/services/MarketDataAuxiliaryService.proto;../lib/api/services/MarketDataRelay.proto;../lib/api/services/OrderService.proto;../lib/api/services/OutOfProcessURLListener.proto;../lib/api/services/PersistenceService.proto;../lib/api/services/PositionService.proto;../lib/api/services/ShellDiagnosticService.proto;../lib/api/services/ShellLatencyService.proto;../lib/api/services/SyntheticSecurityService.proto;../lib/domain_model/Security.proto;../lib/md/protos/co2.proto;../lib/sparkproto/SparkProtos.proto;api/build.sh;api/node_modules/exit/test/fixtures/create-files.sh;api/node_modules/protobufjs/cli/node_modules/acorn-jsx/node_modules/acorn/bin/update_authors.sh;api/node_modules/watch/release.sh;api/quiet_build.sh;api/src/DynamicService.ts;api/src/ServiceContext.ts;api/src/bts_assert.ts;ui/src/Access.fs;ui/src/Accounts/ClipLimits.fs;ui/src/Accounts/ProductLimits.fs;ui/src/Accounts/SecurityLimits.fs;ui/src/Accounts/State.fs;ui/src/Accounts/Types.fs;ui/src/Accounts/View.fs;ui/src/App.fs;ui/src/Cmd.fs;ui/src/Controls/Button.fs;ui/src/Controls/DataGrid.fs;ui/src/Controls/Fields.fs;ui/src/Controls/Modal.fs;ui/src/Controls/ReactGrid.fs;ui/src/Controls/Table.fs;ui/src/Controls/nbsp.fs;ui/src/Global.fs;ui/src/Imports.fs;ui/src/Lens.fs;ui/src/Login/Login.fs;ui/src/Nav.fs;ui/src/State.fs;ui/src/Types.fs;ui/src/Users/State.fs;ui/src/Users/Types.fs;ui/src/Users/View.fs;ui/src/Util/EnumUtils.fs;ui/src/Util/JSMap.fs;ui/src/obj/Debug/netstandard2.0/ui.AssemblyInfo.fs)
set(sources ../../externals/linux/include/google/protobuf/descriptor.proto;../../externals/linux/include/google/protobuf/timestamp.proto;../lib/api/apicore.proto;../lib/api/apigateway.proto;../lib/api/apioptions.proto;../lib/api/services/AdminService.proto;../lib/api/services/ApiUnitTestService.proto;../lib/api/services/AuthService.proto;../lib/api/services/ErrorReportService.proto;../lib/api/services/HelloService.proto;../lib/api/services/MarketDataAuxiliaryService.proto;../lib/api/services/MarketDataRelay.proto;../lib/api/services/OrderService.proto;../lib/api/services/OutOfProcessURLListener.proto;../lib/api/services/PersistenceService.proto;../lib/api/services/PositionService.proto;../lib/api/services/ShellDiagnosticService.proto;../lib/api/services/ShellLatencyService.proto;../lib/api/services/SyntheticSecurityService.proto;../lib/domain_model/Security.proto;../lib/md/protos/co2.proto;../lib/sparkproto/SparkProtos.proto;api/build.sh;api/node_modules/cssstyle/scripts/run_tests.sh;api/node_modules/exit/test/fixtures/create-files.sh;api/node_modules/protobufjs/cli/node_modules/acorn-jsx/node_modules/acorn/bin/update_authors.sh;api/node_modules/watch/release.sh;api/quiet_build.sh;api/src/DynamicService.ts;api/src/ServiceContext.ts;api/src/bts_assert.ts;ui/src/Access.fs;ui/src/Accounts/ClipLimits.fs;ui/src/Accounts/ProductLimits.fs;ui/src/Accounts/SecurityLimits.fs;ui/src/Accounts/State.fs;ui/src/Accounts/Types.fs;ui/src/Accounts/View.fs;ui/src/App.fs;ui/src/Cmd.fs;ui/src/Controls/Button.fs;ui/src/Controls/DataGrid.fs;ui/src/Controls/Fields.fs;ui/src/Controls/Modal.fs;ui/src/Controls/ReactGrid.fs;ui/src/Controls/Table.fs;ui/src/Controls/nbsp.fs;ui/src/Global.fs;ui/src/Imports.fs;ui/src/Lens.fs;ui/src/Login/Login.fs;ui/src/Nav.fs;ui/src/State.fs;ui/src/Types.fs;ui/src/Users/State.fs;ui/src/Users/Types.fs;ui/src/Users/View.fs;ui/src/Util/EnumUtils.fs;ui/src/Util/JSMap.fs;ui/src/obj/Debug/netstandard2.0/ui.AssemblyInfo.fs)