reporting shored up a bit

This commit is contained in:
Taha Afzal committed 2018-02-19 15:09:32 -05:00
1 parent 014971295b
commit 9f744bbd75
5 files changed
+44 -17

No files matched your search

@@ -12,6 +12,7 @@ namespace orderman {
/**************************Cons/Dest*******************************/
SpreaderOrder::SpreaderOrder()
:
_cancelled (false),
_cancel_timeout (5000),// TODO:get it from config
_active(true),
_bookkeeping_data_ptr(nullptr),
@@ -35,35 +36,41 @@ void SpreaderOrder::on_init_new(const api::orderman::OrderDefinition& order_def,
{
if (!_active) return;
_on_init_new(order_def, SpreaderPreActivationOrderServices(&pao_services));
_report_state ();
}
void SpreaderOrder::on_init_recovered(const bts::api::orderman::OrderRecord& order_record, const bts::orderman::PreActivationOrderServices& pao_services)
{
LOG(OrderMan, Info, "SpreaderOrder.on_init_recovered order_key: {}", key().value());
_state_worker->on_init_recovered(order_record, SpreaderPreActivationOrderServices(&pao_services));
_report_state();
}
void SpreaderOrder::on_activate(Price price, Quantity quantity, OrderServices& services)
{
if (!_active) return;
SpreaderOrderServices spreader_order_services (&services);
_on_activate(price, quantity, spreader_order_services);
_report_state();
}
void SpreaderOrder::on_update(Price price, Quantity quantity)
{
if (!_active) return;
LOG(OrderMan, Info, "SpreaderOrder.on_update key: {} price: {} quantity: {}", key().value(), price.value(), quantity.value());
LOG(OrderMan, Info, "SpreaderOrder.on_update key: {} price: {} quantity: {}", key().value(), price.value(), quantity.value());
_state_worker->on_update(price, quantity);
_report_state();
}
void SpreaderOrder::on_cancel()
{
if (!_active) return;
LOG(OrderMan, Info, "SpreaderOrder.on_cancel key: {}", key().value());
_state_worker->on_cancel();
_report_state();
}
void SpreaderOrder::on_crack()
{
if (!_active) return;
LOG(OrderMan, Info, "SpreaderOrder.on_crack key: {}", key().value());
_state_worker->on_crack();
_report_state();
}
/***********************************************************************/
/****************************ISpreaderManager***************************/
@@ -143,6 +150,7 @@ void SpreaderOrder::_on_child_order_update(const bts::orderman::OrderStateUpdate
bts_assert_msg (false, "This order was not initiated in this spreader");
}
_state_worker->on_check_termination ();
_report_state();
}
/***********************************************************************/
/*************************State Transformations*************************/
@@ -172,6 +180,7 @@ void SpreaderOrder::_switch_state (ISpreaderStateWorker* new_state)
LOG(OrderMan, Info, "SpreaderOrder::_switch_state key: {}, {} -> {} ", key().value(), (_state_worker == nullptr ? -1 : (int)_state_worker->state()), (int)new_state->state());
_state_worker = new_state;
_state_worker->on_transition();
_report_state();
}
/***********************************************************************/
/*********************************Misc**********************************/
@@ -298,18 +307,39 @@ void SpreaderOrder::_compute_hedge_price_quantity(size_t filled_leg_index,
hedged_leg_data.leg_property_data(), hedge_price, hedge_quantity);
}
}
void SpreaderOrder::_report_state (api::orderman::OrderStatus status, std::string* msg)
void SpreaderOrder::_report_state ()
{
if (_activated())
{
SpreaderBookkeepingData& bookkeeping_data = _bookkeeping_data();
api::orderman::OrderStatus status = _get_order_status ();
SpreaderBookkeepingData& bookkeeping_data = _bookkeeping_data();
_reported_state.set_status(status);
_reported_state.set_price(bookkeeping_data.price().value());
_reported_state.set_quantity(bookkeeping_data.quantity().value());
if (msg != nullptr)
_reported_state.set_last_msg(*msg);
// TODO fill in filled_qty etc
LOG(OrderMan, Info, "SpreaderOrder::_report_state key: {} status: {} price: {} qty: {}", key(), status, _reported_state.price(), _reported_state.quantity());
_order_services->report_state(_reported_state);
}
}
bts::api::orderman::OrderStatus SpreaderOrder::_get_order_status ()
{
SpreaderState curr_state = _state_worker == nullptr ? SpreaderState::START : _state_worker->state();
bts::api::orderman::OrderStatus rv;
switch (curr_state)
{
case SpreaderState::WORKING:
rv = bts::api::orderman::OrderStatus::ORDER_STATUS_WORKING;
break;
case SpreaderState::WAITING_FOR_CANCEL_ALL:
rv = bts::api::orderman::OrderStatus::ORDER_STATUS_WORKING;
break;
case SpreaderState::END:
rv = _cancelled ? bts::api::orderman::OrderStatus::ORDER_STATUS_CANCELED : bts::api::orderman::OrderStatus::ORDER_STATUS_COMPLETED;
break;
case SpreaderState::START:
rv = bts::api::orderman::OrderStatus::ORDER_STATUS_INACTIVE;
break;
}
return rv;
}
}}
@@ -32,6 +32,8 @@ friend class SpreaderWorkingStateWorker;
friend class SpreaderWaitingForCancelAllStateWorker;
friend class SpreaderEndStateWorker;
private:
// if the order is _cancelled, this is set to true
bool _cancelled;
// timeout before cancel waiting goes to end
const int64_t _cancel_timeout;
// is false if created from disk
@@ -126,7 +128,7 @@ private:
size_t hedged_leg_index,
Price& hedge_price, Quantity& hedge_quantity);
// sends the report out
void _report_state (api::orderman::OrderStatus order_status, std::string* message = nullptr);
void _report_state ();
SpreaderBookkeepingData& _bookkeeping_data()
{
bts_assert (_bookkeeping_data_ptr != nullptr);
@@ -139,6 +141,8 @@ private:
}
// just sets the price and qty in the bookkeeping data
void _set_price_quantity (Price price, Quantity quantity) {_bookkeeping_data().update_order (price, quantity);}
// returns the equivelant order status of the spreader order
bts::api::orderman::OrderStatus _get_order_status ();
/**************************Testing only***********************************/
public:
SpreaderState test_only_func_spreader_state () {return _state_worker->state();}
@@ -10,10 +10,7 @@ _spreader(spreader)
{}
SpreaderState SpreaderEndStateWorker::state() const {return SpreaderState::END;}
void SpreaderEndStateWorker::on_transition ()
{
// TODO, need to know if its ORDER_STATUS_COMPLETED/ORDER_STATUS_CANCELED or ORDER_STATUS_ERROR
_spreader->_report_state(bts::api::orderman::OrderStatus::ORDER_STATUS_COMPLETED);
}
{}
void SpreaderEndStateWorker::on_init_new(api::orderman::OrderDefinition const&, const SpreaderPreActivationOrderServices&)
{
bts_assert_msg (false, "SpreaderEndStateWorker::on_init_new is an illegal operation");
@@ -29,7 +26,6 @@ void SpreaderEndStateWorker::on_activate(Price price, Quantity quantity, Spreade
// be called
bts_assert (!_spreader->_bookkeeping_data().all_legs_resolved());
_spreader->_bookkeeping_data().update_order(price, quantity);
_spreader->_report_state(bts::api::orderman::OrderStatus::ORDER_STATUS_COMPLETED);
}
void SpreaderEndStateWorker::on_update(Price, Quantity)
{}
@@ -10,9 +10,9 @@ _spreader(spreader)
{}
SpreaderState SpreaderWaitingForCancelAllStateWorker::state() const {return SpreaderState::WAITING_FOR_CANCEL_ALL;}
void SpreaderWaitingForCancelAllStateWorker::on_transition ()
{
{
_spreader->_cancelled = true;
_cancel_timestamp = _spreader->_curr_timestamp;
_spreader->_report_state(bts::api::orderman::OrderStatus::ORDER_STATUS_WORKING);
}
void SpreaderWaitingForCancelAllStateWorker::on_init_new(api::orderman::OrderDefinition const&, const SpreaderPreActivationOrderServices&)
{
@@ -10,9 +10,7 @@ _spreader(spreader)
{}
SpreaderState SpreaderWorkingStateWorker::state() const {return SpreaderState::WORKING;}
void SpreaderWorkingStateWorker::on_transition()
{
_spreader->_report_state(bts::api::orderman::OrderStatus::ORDER_STATUS_WORKING);
}
{}
void SpreaderWorkingStateWorker::on_init_new(api::orderman::OrderDefinition const&, const SpreaderPreActivationOrderServices&)
{
bts_assert_msg (false, "SpreaderWorkingStateWorker::on_init_new is an illegal operation");
@@ -37,7 +35,6 @@ void SpreaderWorkingStateWorker::on_update(Price price, Quantity quantity)
if (leg_data.leg_property_data().is_active_quoting())
leg_data.quoter().update_order_price_quantity (price, quantity);
}
_spreader->_report_state(api::orderman::OrderStatus::ORDER_STATUS_WORKING);
}
}
void SpreaderWorkingStateWorker::on_cancel()