diff --git a/src/server/sparkd/orderman/orders/spreader_orders/ISpreaderStateWorker.h b/src/server/sparkd/orderman/orders/spreader_orders/ISpreaderStateWorker.h index ceae18b62..bf709d66f 100644 --- a/src/server/sparkd/orderman/orders/spreader_orders/ISpreaderStateWorker.h +++ b/src/server/sparkd/orderman/orders/spreader_orders/ISpreaderStateWorker.h @@ -21,6 +21,8 @@ public: // 1. called once before the other calls. state should be // constructed here virtual void on_init_new(api::orderman::OrderDefinition const&, const SpreaderPreActivationOrderServices&) = 0; + // when constructed on recovery (with partial state) + virtual void on_init_recovered(const bts::api::orderman::OrderRecord&, const SpreaderPreActivationOrderServices&) = 0; // 2. this is the end of the construction cycle. should happen // after on_init_new and before all other calls. market data subs // and quoter order creation happens here @@ -46,9 +48,7 @@ public: // 14. is called periodically virtual void on_check_termination () = 0; // 15. - virtual void on_crack () - { - } + virtual void on_crack () {} }; }} diff --git a/src/server/sparkd/orderman/orders/spreader_orders/SpreaderOrder.cpp b/src/server/sparkd/orderman/orders/spreader_orders/SpreaderOrder.cpp index 910c6e801..187009002 100644 --- a/src/server/sparkd/orderman/orders/spreader_orders/SpreaderOrder.cpp +++ b/src/server/sparkd/orderman/orders/spreader_orders/SpreaderOrder.cpp @@ -36,6 +36,11 @@ void SpreaderOrder::on_init_new(const api::orderman::OrderDefinition& order_def, if (!_active) return; _on_init_new(order_def, SpreaderPreActivationOrderServices(&pao_services)); } +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)); +} void SpreaderOrder::on_activate(Price price, Quantity quantity, OrderServices& services) { if (!_active) return; diff --git a/src/server/sparkd/orderman/orders/spreader_orders/SpreaderOrder.h b/src/server/sparkd/orderman/orders/spreader_orders/SpreaderOrder.h index 26bec7489..36e34d33c 100644 --- a/src/server/sparkd/orderman/orders/spreader_orders/SpreaderOrder.h +++ b/src/server/sparkd/orderman/orders/spreader_orders/SpreaderOrder.h @@ -62,7 +62,7 @@ public: // this is the construction, can be slow void on_init_new(const bts::api::orderman::OrderDefinition& order_def, const bts::orderman::PreActivationOrderServices&) override; // called when the order is recovered from disk (not dealing with it now) - void on_init_recovered(bts::api::orderman::OrderRecord const&, const bts::orderman::PreActivationOrderServices&) override {bts_assert (false);} + void on_init_recovered(bts::api::orderman::OrderRecord const&, const bts::orderman::PreActivationOrderServices&) override; // this is in the critical path, orders can be submitted now // (this is only called once and after the on_init_new) void on_activate(Price, Quantity, OrderServices&) override; diff --git a/src/server/sparkd/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp b/src/server/sparkd/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp index 122e73884..e4092114a 100644 --- a/src/server/sparkd/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp +++ b/src/server/sparkd/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp @@ -18,6 +18,10 @@ void SpreaderEndStateWorker::on_init_new(api::orderman::OrderDefinition const&, { bts_assert_msg (false, "SpreaderEndStateWorker::on_init_new is an illegal operation"); } +void SpreaderEndStateWorker::on_init_recovered(const bts::api::orderman::OrderRecord&, const SpreaderPreActivationOrderServices&) +{ + bts_assert_msg (false, "SpreaderEndStateWorker::on_init_new is an illegal operation"); +} void SpreaderEndStateWorker::on_activate(Price price, Quantity quantity, SpreaderOrderServices&) { // this can only happen if the security could not be resolved diff --git a/src/server/sparkd/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.h b/src/server/sparkd/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.h index 07047a3cc..974161246 100644 --- a/src/server/sparkd/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.h +++ b/src/server/sparkd/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.h @@ -15,6 +15,7 @@ public: void on_transition() override; SpreaderState state() const override; void on_init_new(api::orderman::OrderDefinition const&, const SpreaderPreActivationOrderServices&) override; + void on_init_recovered(const bts::api::orderman::OrderRecord&, const SpreaderPreActivationOrderServices&) override; void on_activate(Price, Quantity, SpreaderOrderServices&) override; void on_update(Price, Quantity) override; void on_cancel() override; diff --git a/src/server/sparkd/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp b/src/server/sparkd/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp index 0a97e57d2..857c658fb 100644 --- a/src/server/sparkd/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp +++ b/src/server/sparkd/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp @@ -29,6 +29,15 @@ void SpreaderStartStateWorker::on_init_new(const api::orderman::OrderDefinition& _spreader->_transform_to_END (&msg); } } +void SpreaderStartStateWorker::on_init_recovered(const bts::api::orderman::OrderRecord& order_record, const SpreaderPreActivationOrderServices& spreader_pao_services) +{ + bts_assert(!_spreader->_inited()); + // we are not handling this yet, so lets send it directly to END + _spreader->_bookkeeping_data_ptr = new SpreaderBookkeepingData (*_spreader, _spreader->key(), order_record.def(), spreader_pao_services, std::vector()); + LOG(OrderMan, Error, "SpreaderStartStateWorker.on_init_recovered key: {} , going to END", _spreader->key().value()); + std::string msg = "Recovered spreader orders and not supported"; + _spreader->_transform_to_END (&msg); +} void SpreaderStartStateWorker::on_activate(Price price, Quantity quantity, SpreaderOrderServices& order_services) { // 1. update price, qty diff --git a/src/server/sparkd/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.h b/src/server/sparkd/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.h index 5b8c5e85e..63d3ede13 100644 --- a/src/server/sparkd/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.h +++ b/src/server/sparkd/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.h @@ -16,7 +16,8 @@ public: SpreaderStartStateWorker (SpreaderOrder* spreader); void on_transition() override; SpreaderState state() const override; - void on_init_new(api::orderman::OrderDefinition const&, const SpreaderPreActivationOrderServices&) override; + void on_init_new(const api::orderman::OrderDefinition&, const SpreaderPreActivationOrderServices&) override; + void on_init_recovered(const bts::api::orderman::OrderRecord&, const SpreaderPreActivationOrderServices&) override; void on_activate(Price, Quantity, SpreaderOrderServices&) override; void on_update(Price, Quantity) override; void on_cancel() override; diff --git a/src/server/sparkd/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp b/src/server/sparkd/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp index f437ae92c..db4158e30 100644 --- a/src/server/sparkd/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp +++ b/src/server/sparkd/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp @@ -18,6 +18,10 @@ void SpreaderWaitingForCancelAllStateWorker::on_init_new(api::orderman::OrderDef { bts_assert_msg (false, "SpreaderWaitingForCancelAllStateWorker::on_init_new is an illegal operation"); } +void SpreaderWaitingForCancelAllStateWorker::on_init_recovered(const bts::api::orderman::OrderRecord&, const SpreaderPreActivationOrderServices&) +{ + bts_assert_msg (false, "SpreaderWaitingForCancelAllStateWorker::on_init_new is an illegal operation"); +} void SpreaderWaitingForCancelAllStateWorker::on_activate(Price, Quantity, SpreaderOrderServices&) { bts_assert_msg (false, "SpreaderWaitingForCancelAllStateWorker::on_activate is an illegal operation"); diff --git a/src/server/sparkd/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.h b/src/server/sparkd/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.h index 4d1d7a489..e742e7da3 100644 --- a/src/server/sparkd/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.h +++ b/src/server/sparkd/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.h @@ -16,6 +16,7 @@ public: void on_transition() override; SpreaderState state() const override; void on_init_new(api::orderman::OrderDefinition const&, const SpreaderPreActivationOrderServices&) override; + void on_init_recovered(const bts::api::orderman::OrderRecord&, const SpreaderPreActivationOrderServices&) override; void on_activate(Price, Quantity, SpreaderOrderServices&) override; void on_update(Price, Quantity) override; void on_cancel() override; diff --git a/src/server/sparkd/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp b/src/server/sparkd/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp index 422e4290a..245318208 100644 --- a/src/server/sparkd/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp +++ b/src/server/sparkd/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp @@ -17,6 +17,10 @@ void SpreaderWorkingStateWorker::on_init_new(api::orderman::OrderDefinition cons { bts_assert_msg (false, "SpreaderWorkingStateWorker::on_init_new is an illegal operation"); } +void SpreaderWorkingStateWorker::on_init_recovered(const bts::api::orderman::OrderRecord&, const SpreaderPreActivationOrderServices&) +{ + bts_assert_msg (false, "SpreaderWorkingStateWorker::on_init_recovered is an illegal operation"); +} void SpreaderWorkingStateWorker::on_activate(Price, Quantity, SpreaderOrderServices&) { bts_assert_msg (false, "SpreaderWorkingStateWorker::on_activate is an illegal operation"); diff --git a/src/server/sparkd/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.h b/src/server/sparkd/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.h index d2415fc01..aea89c9cc 100644 --- a/src/server/sparkd/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.h +++ b/src/server/sparkd/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.h @@ -15,6 +15,7 @@ public: void on_transition() override; SpreaderState state() const override; void on_init_new(api::orderman::OrderDefinition const&, const SpreaderPreActivationOrderServices&) override; + void on_init_recovered(const bts::api::orderman::OrderRecord&, const SpreaderPreActivationOrderServices&) override; void on_activate(Price, Quantity, SpreaderOrderServices&) override; void on_update(Price, Quantity) override; void on_cancel() override;