diff --git a/src/server/sparkd/order_man/components/NativeOrderMan.cpp b/src/server/sparkd/order_man/components/NativeOrderMan.cpp index 24969408d..edc752101 100644 --- a/src/server/sparkd/order_man/components/NativeOrderMan.cpp +++ b/src/server/sparkd/order_man/components/NativeOrderMan.cpp @@ -17,6 +17,7 @@ #include "server/sparkd/order_man/events/CancelNativeOrder.h" #include "server/sparkd/order_man/events/GatewayStatusChange.h" #include "server/sparkd/order_man/events/ExecutionReport.h" +#include "lib/utils/datetime.h" #include @@ -35,14 +36,16 @@ struct NativeOrderMan::PImpl state(State::REPLAY), order_map(), sec_db(sec_db), - keep_alive_reject_msgs() + keep_alive_reject_msgs(), + latest_timestamp(to (datetime::FIX_timestamp(datetime::now()))) {} Observer &obs; State state; + OrderTimeStamp latest_timestamp; + OrderMap order_map; securities::SecurityDB &sec_db; - std::vector> keep_alive_reject_msgs; }; NativeOrderMan::NativeOrderMan (securities::SecurityDB &sec_db, @@ -69,6 +72,8 @@ NativeOrderMan::NativeOrderMan (securities::SecurityDB &sec_db, void NativeOrderMan::on(grid::event::Init const&) { + LOG(OrderMan,Diag, "NativeOrderMan init"); + bts_assert(me->state == State::REPLAY); for (auto const &kvp : me->order_map) { @@ -79,9 +84,12 @@ void NativeOrderMan::on(grid::event::Init const&) void NativeOrderMan::on(event::CreateNativeOrder const&create) { + auto &order = *create.order; auto k = order.key(); + LOG(OrderMan,Diag, "NativeOrderMan CreateNativeOrder {}",k.value()); + auto &order_ptr = me->order_map[k]; if (order_ptr) { @@ -97,14 +105,13 @@ void NativeOrderMan::on(event::CreateNativeOrder const&create) switch (me->state) { case State::REPLAY: - case State::DISCONNECTED: - order._state.status = api::orderman::OS_REJECTED_BY_SPARK; - order._state.reject_msg = "Could not connect to the order gateway"; + case State::DISCONNECTED: + order.mark_rejected_by_spark("Could not connect to the order gateway"); break; case State::CONNECTED: order.set_status (api::orderman::OS_UNACKNOWLEDGED); auto buffer = get_fix_bufer(); - order.encode_create(create.price,create.quantity,buffer); + order.encode_create(latest_timestamp,create.price,create.quantity,buffer); me->obs.on(event::OutGatewayMsg {buffer}); break; } @@ -115,21 +122,29 @@ void NativeOrderMan::on(event::CreateNativeOrder const&create) void NativeOrderMan::on(event::UpdateNativeOrder const&update) { auto &order = *update.order; + + LOG(OrderMan,Diag, "NativeOrderMan UpdateNativeOrder {}",order.key().value()); + auto buffer = get_fix_bufer(); - order.encode_update(update.price,update.quantity,buffer); + order.encode_update(latest_timestamp,update.price,update.quantity,buffer); me->obs.on(event::OutGatewayMsg {buffer}); } void NativeOrderMan::on(event::CancelNativeOrder const&cancel) { auto &order = *cancel.order; + + LOG(OrderMan,Diag, "NativeOrderMan CancelNativeOrder {}",order.key().value()); + auto buffer = get_fix_bufer(); - order.encode_cancel(buffer); + order.encode_cancel(latest_timestamp,buffer); me->obs.on(event::OutGatewayMsg {buffer}); } void NativeOrderMan::on(event::GatewayStatusChange const&status) { + LOG(OrderMan,Diag, "NativeOrderMan GatewayStatusChange {}",status.is_connected); + if (status.is_connected) { switch (me->state) { case State::REPLAY: @@ -154,32 +169,40 @@ void NativeOrderMan::on(event::GatewayStatusChange const&status) } void NativeOrderMan::on(event::GatewayBeginReplay const&) -{bts_assert(me->state == State::REPLAY);} +{ + LOG(OrderMan,Diag, "NativeOrderMan GatewayBeginReplay"); + + bts_assert(me->state == State::REPLAY); +} void NativeOrderMan::on(event::GatewayEndReplay const&) { + LOG(OrderMan,Diag, "NativeOrderMan GatewayEndReplay"); + bts_assert(me->state == State::REPLAY); transition(State::DISCONNECTED); } void NativeOrderMan::on(event::ExecutionReport const&er) { + auto k = er.order_key; + auto it = me->order_map.find(k); + + LOG(OrderMan,Diag, "NativeOrderMan ExecutionReport for order {}",k.value()); + + if (it != me->order_map.end()) { + auto &order = *it->second; + order.on(er); + me->obs.on(event::NativeOrderStateChange {&order.header(),order.state()}); + } + else { + LOG(OrderMan,Error, + "Received an execution report for unknown order {} " + "will try to recover order state from the report ", + " + } } -case State::DISCONNECTED: - order._state.status = api::orderman::OS_REJECTED_BY_SPARK; - order._state.reject_msg = "Could not connect to the order gateway"; - break; - case State::CONNECTED: - order.set_status (api::orderman::OS_UNACKNOWLEDGED); - auto buffer = get_fix_bufer(); - order.encode_create(create.price,create.quantity,buffer); - me->obs.on(event::OutGatewayMsg {buffer}); - break; -} -} - -} jetfix::OutFIXPtr NativeOrderMan::get_fix_bufer() {return jetfix::OutFIXPtr();} diff --git a/src/server/sparkd/order_man/native_orders/NativeOrder.h b/src/server/sparkd/order_man/native_orders/NativeOrder.h index f9350c317..302c99979 100644 --- a/src/server/sparkd/order_man/native_orders/NativeOrder.h +++ b/src/server/sparkd/order_man/native_orders/NativeOrder.h @@ -24,9 +24,18 @@ public: _header(header) {} - void encode_create(Price,Quantity, jetfix::OutFIXPtr &); - void encode_update(Price,Quantity, jetfix::OutFIXPtr &); - void encode_cancel(jetfix::OutFIXPtr &); + void mark_rejected_by_spark(std::string const&msg) + { + _state.status = api::orderman::OS_REJECTED_BY_SPARK; + auto cached_msg = std::make_shared (msg); + _keep_alive_rej.push_back(cached_msg); + _state.reject_msg = cached_msg->c_str(); + } + + void on(event::ExecutionReport const&er); + void encode_create(OrderTimeStamp const&ts,Price,Quantity, jetfix::OutFIXPtr &); + void encode_update(OrderTimeStamp const&ts,Price,Quantity, jetfix::OutFIXPtr &); + void encode_cancel(OrderTimeStamp const&ts,jetfix::OutFIXPtr &); OrderKey key() const {return _header.order_key;} NativeOrderHeader const &header() const {return _header;}; @@ -39,6 +48,7 @@ private: NativeOrderFIXData _fix_data; NativeOrderState _state; NativeOrderHeader _header; + std::vector> _keep_alive_rej; }; using NativeOrderPtr = std::unique_ptr; diff --git a/src/server/sparkd/order_man/order_man_utils.h b/src/server/sparkd/order_man/order_man_utils.h index ae0da6b69..f7e37fad3 100644 --- a/src/server/sparkd/order_man/order_man_utils.h +++ b/src/server/sparkd/order_man/order_man_utils.h @@ -53,5 +53,6 @@ inline std::string to_str (T const&t) return result; } + }}