From 69e337bcd2dac54a8dd7573b5dd924c265e125e1 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Sun, 18 Mar 2018 18:55:03 -0400 Subject: [PATCH] TimeBox order work. --- .../sparkd/orderman/orders/TimeBoxOrder.cpp | 456 ++++++++++-------- 1 file changed, 256 insertions(+), 200 deletions(-) diff --git a/src/server/sparkd/orderman/orders/TimeBoxOrder.cpp b/src/server/sparkd/orderman/orders/TimeBoxOrder.cpp index 4de254886..23d0f309b 100644 --- a/src/server/sparkd/orderman/orders/TimeBoxOrder.cpp +++ b/src/server/sparkd/orderman/orders/TimeBoxOrder.cpp @@ -1,224 +1,280 @@ -// #include "TimeBoxOrder.h" -// #include "lib/utils/PBUtils.h" -// #include "server/sparkd/orderman/actors/order_manager/OrderBuilder.h" -// #include +#include "TimeBoxOrder.h" +#include "lib/utils/PBUtils.h" +#include "server/sparkd/orderman/actors/order_manager/OrderBuilder.h" +#include -// namespace bts { -// namespace orderman { +namespace bts { +namespace orderman { -// using namespace api::orderman; +using namespace api::orderman; -// struct TimeBoxOrder::PImpl { -// PImpl() {} +struct TimeBoxOrder::PImpl { + PImpl() {} -// OrderServices *services; -// ChildOrder child; -// OrderBuilder child_builder; -// api::orderman::OrderDefinition def; -// api::orderman::OrderState state; -// google::protobuf::Timestamp start_time; -// google::protobuf::Timestamp stop_time; -// }; + OrderServices *services; + ChildOrder child; + OrderBuilder child_builder; + api::orderman::OrderDefinition def; + api::orderman::OrderState state; + api::orderman::OrderState child_state; + google::protobuf::Timestamp start_time; + google::protobuf::Timestamp stop_time; +}; -// TimeBoxOrder::TimeBoxOrder() : me(new PImpl()) {} +TimeBoxOrder::TimeBoxOrder() : me(new PImpl()) {} -// TimeBoxOrder::~TimeBoxOrder() {} +TimeBoxOrder::~TimeBoxOrder() {} -// api::orderman::OrderDefinition const &TimeBoxOrder::definition() { -// return me->def; -// } +api::orderman::OrderDefinition const &TimeBoxOrder::definition() { + return me->def; +} -// void TimeBoxOrder::on_init_new(api::orderman::OrderDefinition const &def, -// const PreActivationOrderServices &services) { -// me->services = nullptr; -// me->def = def; -// me->state.mutable_time_box(); -// auto const &timebox_def = def.custom_def().time_box(); -// me->start_time = timebox_def.start(); -// me->stop_time = timebox_def.stop(); +void TimeBoxOrder::on_init_new(api::orderman::OrderDefinition const &def, + const PreActivationOrderServices &services) { + me->services = nullptr; + me->def = def; + me->state.mutable_time_box(); + auto const &timebox_def = def.custom_def().time_box(); + me->start_time = timebox_def.start(); + me->stop_time = timebox_def.stop(); + me->child_state.set_status(ORDER_STATUS_INACTIVE); + + auto child_def = def; + *child_def.mutable_custom_def() = timebox_def.child(); + if (me->start_time.seconds() > utils::pb::pb_now().seconds() && + me->stop_time.seconds() > me->start_time.seconds()) { + me->child_builder = OrderBuilder(key(), child_def, services, 1); + transition(ORDER_STATUS_INACTIVE); + } else { + auto msg = fmt::format("Invalid time"); + me->state.set_last_msg(msg); + transition(ORDER_STATUS_REJECTED_BY_SPARK, msg); + } +} -// auto child_def = def; -// *child_def.mutable_custom_def() = timebox_def.child(); -// if (me->start_time.seconds() > utils::pb::pb_now().seconds() && -// me->stop_time.seconds() > me->start_time.seconds()) { -// me->child_builder = OrderBuilder(key(), child_def, services, 1); -// transition(ORDER_STATUS_INACTIVE); -// } else { -// auto msg = fmt::format("Invalid time"); -// me->state.set_last_msg(msg); -// transition(ORDER_STATUS_REJECTED_BY_SPARK, msg); -// } -// } +void TimeBoxOrder::on_init_recovered(api::orderman::OrderRecord const &rec, + const PreActivationOrderServices &) { + auto const &def = rec.def(); + me->def = def; + me->state = rec.state(); + switch (me->state.status()) { -// void TimeBoxOrder::on_init_recovered(api::orderman::OrderRecord const &rec, -// const PreActivationOrderServices &) { -// auto const &def = rec.def(); -// me->def = def; -// me->state = rec.state(); -// switch (me->state.status()) { + case ORDER_STATUS_WORKING: + case ORDER_STATUS_DISCONNECTED: { + auto msg = "System restarted with active time box order"; + me->state.set_last_msg(msg); + transition(ORDER_STATUS_ERROR, msg); + break; + } + // terminal states + case ORDER_STATUS_ERROR: + case ORDER_STATUS_REJECTED_BY_SPARK: + case ORDER_STATUS_COMPLETED: + case ORDER_STATUS_CANCELED: + break; -// case ORDER_STATUS_WORKING: -// case ORDER_STATUS_DISCONNECTED: { -// auto msg = "System restarted with active time order"; -// me->state.set_last_msg(msg); -// transition(ORDER_STATUS_ERROR, msg); -// break; -// } -// // terminal states -// case ORDER_STATUS_ERROR: -// case ORDER_STATUS_REJECTED_BY_SPARK: -// case ORDER_STATUS_COMPLETED: -// case ORDER_STATUS_CANCELED: -// break; + case ORDER_STATUS_PENDING_WORKING: + case ORDER_STATUS_INACTIVE: + case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: + case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: + bts_assert(false); + break; + } +} -// case ORDER_STATUS_PENDING_WORKING: -// case ORDER_STATUS_INACTIVE: -// case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: -// case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: -// bts_assert(false); -// break; -// } -// } +void TimeBoxOrder::on_activate(Price p, Quantity q, OrderServices &services) { + bts_assert(!me->services); + me->services = &services; + me->child_builder.activate(services); -// void TimeBoxOrder::on_activate(Price p, Quantity q, OrderServices &services) { -// bts_assert(!me->services); -// me->services = &services; -// me->child_builder.activate(services); + switch (me->state.status()) { + case ORDER_STATUS_INACTIVE: + me->state.set_price(p.value()); + me->state.set_quantity(q.value()); + services.child_updates.sub( + key(), [this](auto const &os) { this->on_child_order_update(os); }); + services.time_change.sub([this](auto) { this->on_time_change(); }); + transition(ORDER_STATUS_WORKING); + break; -// switch (me->state.status()) { -// case ORDER_STATUS_INACTIVE: -// me->state.set_price(p.value()); -// me->state.set_quantity(q.value()); -// services.child_updates.sub( -// key(), [this](auto const &os) { this->on_child_order_update(os); }); -// services.time_change.sub([this](auto) { this->on_time_change(); }); -// transition(ORDER_STATUS_WORKING); -// break; + // these are not possible since the on_init_recovered code + // would have transitioned us to error already + case ORDER_STATUS_WORKING: + case ORDER_STATUS_PENDING_WORKING: + case ORDER_STATUS_DISCONNECTED: { + bts_assert(false); + break; + } + // terminal states + case ORDER_STATUS_ERROR: + case ORDER_STATUS_REJECTED_BY_SPARK: + case ORDER_STATUS_COMPLETED: + case ORDER_STATUS_CANCELED: + break; + case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: + case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: + bts_assert(false); + break; + } + report_state(); +} -// // these are not possible since the on_init_recovered code -// // would have transitioned us to error already -// case ORDER_STATUS_WORKING: -// case ORDER_STATUS_PENDING_WORKING: -// case ORDER_STATUS_DISCONNECTED: { -// bts_assert(false); -// break; -// } -// // terminal states -// case ORDER_STATUS_ERROR: -// case ORDER_STATUS_REJECTED_BY_SPARK: -// case ORDER_STATUS_COMPLETED: -// case ORDER_STATUS_CANCELED: -// break; -// case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: -// case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: -// bts_assert(false); -// break; -// } -// report_state(); -// } +void TimeBoxOrder::on_update(Price p, Quantity q) { + LOG(OrderMan, Info, "Updating TimeBox Order {}", key().value()); -// void TimeBoxOrder::on_update(Price p, Quantity q) { -// switch (me->state.status()) { -// case ORDER_STATUS_WORKING: -// LOG(OrderMan, Info, "Updating TimeBox order {} to price {} quantity {}", -// key().value(), p.value(), q.value()); -// me->state.set_price(p.value()); -// me->state.set_quantity(q.value()); -// if (me->child.is_active()) { -// me->child.update(p, q); -// } -// break; -// case ORDER_STATUS_DISCONNECTED: -// case ORDER_STATUS_PENDING_WORKING: -// case ORDER_STATUS_REJECTED_BY_SPARK: -// case ORDER_STATUS_COMPLETED: -// case ORDER_STATUS_CANCELED: -// case ORDER_STATUS_ERROR: -// transition(me->state.status(), "Cannot update order"); -// break; + switch (me->state.status()) { + case ORDER_STATUS_WORKING: + switch (me->child_state.status()) { + case ORDER_STATUS_INACTIVE: + me->state.set_price(p.value()); + me->state.set_quantity(q.value()); + break; + case ORDER_STATUS_WORKING: + me->state.set_price(p.value()); + me->state.set_quantity(q.value()); + me->child.update(p,q); + break; + case ORDER_STATUS_PENDING_WORKING: + transition(me->state.status(), "Cannot update order"); + break; + case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_ERROR: + case ORDER_STATUS_REJECTED_BY_SPARK: + case ORDER_STATUS_COMPLETED: + case ORDER_STATUS_CANCELED: + case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: + case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: + bts_assert(false); + break; + } + break; + case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_PENDING_WORKING: + case ORDER_STATUS_REJECTED_BY_SPARK: + case ORDER_STATUS_COMPLETED: + case ORDER_STATUS_CANCELED: + case ORDER_STATUS_ERROR: + transition(me->state.status(), "Cannot update order"); + break; + case ORDER_STATUS_INACTIVE: + case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: + case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: + bts_assert(false); + break; + } + report_state(); +} -// case ORDER_STATUS_INACTIVE: -// case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: -// case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: -// bts_assert(false); -// break; -// } -// report_state(); -// } +void TimeBoxOrder::on_crack() {} -// void TimeBoxOrder::on_crack() {} +void TimeBoxOrder::on_cancel() { + LOG(OrderMan, Info, "Canceling TimeBox Order {}", key().value()); -// void TimeBoxOrder::on_cancel() { -// switch (me->state.status()) { -// case ORDER_STATUS_WORKING: -// LOG(OrderMan, Info, "Canceling Iceberg Order {}", key().value()); -// if (me->child.is_active()) -// me->child.cancel(); -// transition(ORDER_STATUS_CANCELED); -// break; -// case ORDER_STATUS_PENDING_WORKING: -// case ORDER_STATUS_DISCONNECTED: -// case ORDER_STATUS_REJECTED_BY_SPARK: -// case ORDER_STATUS_COMPLETED: -// case ORDER_STATUS_CANCELED: -// case ORDER_STATUS_ERROR: -// transition(me->state.status(), "Cannot cancel order"); -// break; + switch (me->state.status()) { + case ORDER_STATUS_WORKING: + switch (me->child_state.status()) { + case ORDER_STATUS_INACTIVE: + transition(ORDER_STATUS_CANCELED); + break; + case ORDER_STATUS_WORKING: + me->child.cancel(); + transition(ORDER_STATUS_CANCELED); + break; + case ORDER_STATUS_PENDING_WORKING: + transition(me->state.status(), "Cannot cancel order"); + break; + case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_ERROR: + case ORDER_STATUS_REJECTED_BY_SPARK: + case ORDER_STATUS_COMPLETED: + case ORDER_STATUS_CANCELED: + case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: + case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: + bts_assert(false); + break; + } + break; + case ORDER_STATUS_PENDING_WORKING: + case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_REJECTED_BY_SPARK: + case ORDER_STATUS_COMPLETED: + case ORDER_STATUS_CANCELED: + case ORDER_STATUS_ERROR: + transition(me->state.status(), "Cannot cancel order"); + break; + case ORDER_STATUS_INACTIVE: + case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: + case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: + bts_assert(false); + break; + } + report_state(); +} -// case ORDER_STATUS_INACTIVE: -// case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: -// case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: -// bts_assert(false); -// break; -// } -// report_state(); -// } +void TimeBoxOrder::transition(api::orderman::OrderStatus new_status, + std::string msg) { + auto const &from = OrderStatus_Name(me->state.status()); + auto const &to = OrderStatus_Name(new_status); + LOG(OrderMan, Info, "Transitioning time box order {} from {} to {}. Msg: {}", + key().value(), from, to, msg); + me->state.set_status(new_status); +} -// void TimeBoxOrder::transition(api::orderman::OrderStatus new_status, -// std::string msg) { -// auto const &from = OrderStatus_Name(me->state.status()); -// auto const &to = OrderStatus_Name(new_status); -// LOG(OrderMan, Info, "Transitioning time box order {} from {} to {}. Msg: {}", -// key().value(), from, to, msg); -// me->state.set_status(new_status); -// } +void TimeBoxOrder::report_state() { me->services->report_state(me->state); } -// void TimeBoxOrder::report_state() { me->services->report_state(me->state); } +void TimeBoxOrder::on_time_change() { + switch (me->state.status()) { + case ORDER_STATUS_WORKING: + switch (me->child_state.status()) { + case ORDER_STATUS_INACTIVE: + if (utils::pb::pb_now().seconds() > me->start_time.seconds()) { + LOG(OrderMan, Info, "TimeBox order {} launching child {}", + key().value(), me->child.key().value()); + me->child.activate(Price(me->state.price()), + Quantity(me->state.quantity())); + me->child_state.set_status(ORDER_STATUS_PENDING_WORKING); + transition(ORDER_STATUS_WORKING); + } + break; + case ORDER_STATUS_WORKING: + if (utils::pb::pb_now().seconds() > me->stop_time.seconds()) { + LOG(OrderMan, Info, "TimeBox order {} canceling child {}", + key().value(), me->child.key().value()); + me->child.cancel(); + transition(ORDER_STATUS_CANCELED); + } + break; + case ORDER_STATUS_PENDING_WORKING: + break; + case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_ERROR: + case ORDER_STATUS_REJECTED_BY_SPARK: + case ORDER_STATUS_COMPLETED: + case ORDER_STATUS_CANCELED: + case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: + case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: + bts_assert(false); + break; + } + case ORDER_STATUS_PENDING_WORKING: + case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_REJECTED_BY_SPARK: + case ORDER_STATUS_COMPLETED: + case ORDER_STATUS_CANCELED: + case ORDER_STATUS_ERROR: + break; -// void TimeBoxOrder::on_time_change() { -// switch (me->state.status()) { -// case ORDER_STATUS_WORKING: -// if (!me->child.is_active()) { -// if (utils::pb::pb_now().seconds() > me->start_time.seconds()) { -// LOG(OrderMan, Info, "TimeBox order {} launching child {}", -// key().value(), me->child.key().value()); -// me->child.activate(Price(me->state.price()), -// Quantity(me->state.quantity())); -// } -// } -// else { -// // child is active -// if (utils::pb::pb_now().seconds() -// if (me->child.is_active()) -// me->child.cancel(); -// transition(ORDER_STATUS_CANCELED); -// break; -// case ORDER_STATUS_PENDING_WORKING: -// case ORDER_STATUS_DISCONNECTED: -// case ORDER_STATUS_REJECTED_BY_SPARK: -// case ORDER_STATUS_COMPLETED: -// case ORDER_STATUS_CANCELED: -// case ORDER_STATUS_ERROR: -// transition(me->state.status(), "Cannot cancel order"); -// break; + case ORDER_STATUS_INACTIVE: + case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: + case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: + bts_assert(false); + break; + } + report_state(); +} -// case ORDER_STATUS_INACTIVE: -// case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: -// case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: -// bts_assert(false); -// break; -// } -// report_state(); -// } -// } -// } +void TimeBoxOrder::on_child_order_update(OrderStateUpdateEvent const&) +{} + +} +}