diff --git a/src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp b/src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp index 7593e76fd..4f39e8df5 100644 --- a/src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp +++ b/src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp @@ -369,7 +369,10 @@ void AlgoWrapperOrder::subscribe_book(SecurityKey k) { bts_assert(me->book_subs.find(k) == me->book_subs.end()); me->book_subs[k] = me->services->subscribe_to_book( - k, [this, k](auto const &ev) { me->algo->on_book(k, ev.book); }); + k, [this, k](auto const &ev) { + ReportStateGuard _(*this); + me->algo->on_book(k, ev.book); + }); } void AlgoWrapperOrder::unsubscribe_book(SecurityKey k) { @@ -423,7 +426,10 @@ void AlgoWrapperOrder::subscribe_timer() { bts_assert(!me->has_timer_sub); me->has_timer_sub = true; me->services->subscribe_to_time( - [this](auto const &) { me->algo->on_timer(); }); + [this](auto const &) { + ReportStateGuard _(*this); + me->algo->on_timer(); + }); } void AlgoWrapperOrder::unsubscribe_timer() { @@ -519,7 +525,6 @@ void AlgoWrapperOrder::update_fill_state(Quantity q, Price p) { if (!is_working() && !is_shutting_down()) return; - ReportStateGuard _(*this); auto previous_qty = me->state().filled_quantity(); if (previous_qty > q.value()) { LOG(OrderMan, Error, @@ -541,15 +546,12 @@ void AlgoWrapperOrder::update_fill_state(Quantity q, Price p) { void AlgoWrapperOrder::set_ladder_visibility(bool is_visible) { if (!is_working()) return; - - ReportStateGuard _(*this); me->set_ladder_visibility(is_visible); } void AlgoWrapperOrder::cancel(std::string const &msg) { if (!is_working()) return; - ReportStateGuard _(*this); if (working_children_count() == 0) terminate(ORDER_STATUS_CANCELED, msg); else @@ -559,24 +561,18 @@ void AlgoWrapperOrder::cancel(std::string const &msg) { void AlgoWrapperOrder::terminate_error(std::string const &msg) { if (!is_working() && !is_shutting_down() && me->status != Status::W_ATTACH) return; - ReportStateGuard _(*this); // If we attached and an error was signaled we do not want to // cancel our child because that child might be a long running // order with a good queue position that we want to preserve if (is_attaching()) me->children.erase(me->attach_target); - // This just detected error superseeds whatever triggered the shutdown - if (is_shutting_down()) - me->pending_terminate.reset(); terminate(ORDER_STATUS_ERROR, msg); } void AlgoWrapperOrder::complete() { if (!is_working()) return; - ReportStateGuard _(*this); - if (working_children_count() == 0) terminate(ORDER_STATUS_COMPLETED); else @@ -670,7 +666,8 @@ void AlgoWrapperOrder::on_child_order_update( } } else LOG(OrderMan, Info, - "AlgoOrder {} received update for presumably detached order {}", + "AlgoOrder {} received update for presumably detached order {}. " + "Ignoring it", key().value(), child_key.value()); break; case Status::COMPLETED: @@ -692,10 +689,8 @@ void AlgoWrapperOrder::try_complete_shutdown() { if (working_children_count() == 0) { LOG(OrderMan, Info, "AlgoOrder {} completed shutdown. Terminated", key().value()); - auto st = me->pending_terminate.value().first; - auto msg = me->pending_terminate.value().second; - me->pending_terminate.reset(); - terminate(st, msg); + terminate(me->pending_terminate.value().first, + me->pending_terminate.value().second); } else { LOG(OrderMan, Info, "AlgoOrder {} still has {} orders working. Shutdown still in " @@ -755,6 +750,7 @@ void AlgoWrapperOrder::setup_transitions() { me->transition_actions[{Status::SHUTTING_DOWN, Status::COMPLETED}] = [this]() { me->children.clear(); + me->pending_terminate.reset(); _transition(Status::COMPLETED); }; } @@ -792,6 +788,8 @@ void AlgoWrapperOrder::check_invariants() { bts_assert(me->services); bts_assert(me->security); bts_assert(me->external_status() == ORDER_STATUS_WORKING); + bts_assert(me->book_subs.empty()); + bts_assert(!me->has_timer_sub); bts_assert(!me->pending_update.has_value()); bts_assert(me->pending_terminate.has_value()); break; diff --git a/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.cpp index 783bcd960..6117c69f1 100644 --- a/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.cpp @@ -10,7 +10,7 @@ namespace orderman { using namespace api::orderman; -enum class CoverAlgo::Status { WORKING, WAITING_FOR_HEDGES, DONE }; +enum class CoverAlgo::Status { WORKING, WAITING_FOR_HEDGES, DONE, CANCELING }; const char *CoverAlgo::status_name(Status st) { switch (st) { case Status::WORKING: @@ -18,7 +18,9 @@ const char *CoverAlgo::status_name(Status st) { case Status::WAITING_FOR_HEDGES: return "WAITING_FOR_HEDGES"; case Status::DONE: - return "Done"; + return "DONE"; + case Status::CANCELING: + return "CANCELING"; } return nullptr; } @@ -124,13 +126,23 @@ void CoverAlgo::on_child_change(OrderKey k, ChildState const &st) { "CoverAlgo {}. Child is completed, waiting for hedges ", algo().order_key().value()); algo().set_ladder_visibility(false); - me->status = Status::WAITING_FOR_HEDGES; + if (me->status == Status::WORKING) + me->status = Status::WAITING_FOR_HEDGES; + else { + me->status = Status::DONE; + algo().cancel(); + } break; case ChildStatus::CANCELED: - LOG(OrderMan, Info, "CoverAlgo {}. Child was canceled, terminating", - algo().order_key().value()); - me->status = Status::DONE; - algo().terminate_error("Unexpected child cancel"); + if (me->status == Status::WORKING) { + LOG(OrderMan, Info, "CoverAlgo {}. Child was canceled, terminating", + algo().order_key().value()); + me->status = Status::DONE; + algo().terminate_error("Unexpected child cancel"); + } else if (me->status == Status::CANCELING) { + me->status = Status::DONE; + algo().cancel(); + } break; } } else { @@ -225,9 +237,25 @@ void CoverAlgo::check_terminate() { } IAlgoOrder::OnCancelResponse CoverAlgo::on_cancel() { - if (!me->cancel_hedges_on_cancel) - for (auto &k : me->hedges) - algo().detach_child(k); + switch (me->status) { + case Status::WORKING: { + if (!me->cancel_hedges_on_cancel) + for (auto &k : me->hedges) + algo().detach_child(k); + algo().cancel_child(me->child_key); + me->status = Status::CANCELING; + return IAlgoOrder::OnCancelResponse::IGNORE; + } + case Status::CANCELING: + return IAlgoOrder::OnCancelResponse::IGNORE; + case Status::WAITING_FOR_HEDGES: + return IAlgoOrder::OnCancelResponse::HONOR; + case Status::DONE: + bts_assert(false); + return IAlgoOrder::OnCancelResponse::HONOR; + } + + bts_assert(false); return IAlgoOrder::OnCancelResponse::HONOR; } diff --git a/src/lib/orderman/orders/algo/doc/algo_wrapper_sm.png b/src/lib/orderman/orders/algo/doc/algo_wrapper_sm.png new file mode 100644 index 000000000..4e49734d6 Binary files /dev/null and b/src/lib/orderman/orders/algo/doc/algo_wrapper_sm.png differ diff --git a/src/lib/orderman/orders/algo/doc/state_machine.org b/src/lib/orderman/orders/algo/doc/state_machine.org new file mode 100644 index 000000000..5eaf1b7bf --- /dev/null +++ b/src/lib/orderman/orders/algo/doc/state_machine.org @@ -0,0 +1,39 @@ +#+TITLE: Algo Wrapper State Machien +#+OPTIONS: ^:nil +#+OPTIONS: H:2 +#+OPTIONS: ^:nil H:2 author:nil creator:nil timestamp:nil toc:nil +#+OPTIONS: html-postamble:nil + + +* State Machine +#+begin_src dot :file algo_wrapper_sm.png :cmdline -Kdot -Tpng +digraph G { + bgcolor="transparent"; + edge [ fontname=Helvetica, fontsize=12 ]; + + start [style=invisible]; + COMPLETED [style=filled] ; + start -> INACTIVE; + INACTIVE -> COMPLETED [label="qty=0|error"]; + INACTIVE -> W_ATTACH [label="ok & attach"]; + INACTIVE -> WORKING [label="ok & !attach"]; + W_ATTACH -> COMPLETED [label=attach_fail]; + W_ATTACH -> WORKING [label=attach_ok]; + WORKING -> COMPLETED [label="[wchild=0]cancel|complete"]; + WORKING -> COMPLETED [label=error]; + WORKING -> SHUTTING_DOWN [label="[wchild>0]cancel|complete"]; + SHUTTING_DOWN -> COMPLETED [label="wchild==0|error|on_detach"]; +} +#+END_SRC + +#+RESULTS: +[[file:algo_wrapper_sm.png]] + +* Invariants +| | attach_target | exernal_status | pending_update | pending_terminate | working_children | subs | +|---------------+---------------+--------------------------------------+----------------+-------------------+------------------+------| +| INACTIVE | | | | | | 0 | +| W_ATTACH | 1 | WORKING | | 0 | 0 | 0 | +| WORKING | | WORKING | 0 | 0 | | | +| SHUTTING_DOWN | | WORKING | 0 | 1 | >0 | 0 | +| COMPLETED | | CANCELED, COMPLETED, ERROR, REJECTED | 0 | 0 | 0 | 0 |