diff --git a/src/lib/orderman/events/OrderStateUpdateEvent.h b/src/lib/orderman/events/OrderStateUpdateEvent.h index 4d735c0f2..70f7b0c82 100644 --- a/src/lib/orderman/events/OrderStateUpdateEvent.h +++ b/src/lib/orderman/events/OrderStateUpdateEvent.h @@ -47,6 +47,7 @@ public: auto native_state = get_native_state(state); if (native_state) { exchange_order_id = native_state->exchange_order_id(); + exchange_order_id64 = native_state->exchange_order_id64(); last_msg_seq_num = native_state->last_msg_seq_num(); sub_error_code = native_state->sub_error_code(); native_status = native_state->native_status(); @@ -79,6 +80,7 @@ public: // native order state std::string exchange_order_id; + uint64_t exchange_order_id64; uint64_t last_msg_seq_num; api::orderman::NativeOrderState::SubError sub_error_code; api::orderman::NativeOrderStatus native_status; @@ -187,6 +189,7 @@ private: void rebuild_native_state(api::orderman::NativeOrderState *st) const { st->set_stop_px(stop_px); st->set_exchange_order_id(exchange_order_id); + st->set_exchange_order_id64(exchange_order_id64); st->set_last_msg_seq_num(last_msg_seq_num); st->set_sub_error_code(sub_error_code); st->set_native_status(native_status); diff --git a/src/lib/orderman/orderman_utils/ExecutionReport.h b/src/lib/orderman/orderman_utils/ExecutionReport.h index 07ae0aa62..13ed06717 100644 --- a/src/lib/orderman/orderman_utils/ExecutionReport.h +++ b/src/lib/orderman/orderman_utils/ExecutionReport.h @@ -34,7 +34,7 @@ public: Price avg_price; Price stop_price; ExchangeFillID exchange_fill_id; - std::variant transact_time; + ExchangeTimeStampVar transact_time; config::JetFIX::Connection const *cfg; std::string cust_order_handling_inst; std::string msg; diff --git a/src/lib/orderman/orderman_utils/orderman_common.h b/src/lib/orderman/orderman_utils/orderman_common.h index 5dd86f1aa..6c6013d8a 100644 --- a/src/lib/orderman/orderman_utils/orderman_common.h +++ b/src/lib/orderman/orderman_utils/orderman_common.h @@ -6,17 +6,19 @@ #include #include +#include "lib/api/services/OrderService.pb.h" #include "lib/domain_model/common.h" #include "lib/utils/ValueWrapper.h" #include "lib/utils/bts_assert.h" #include "lib/utils/bts_chrono.h" -#include "lib/api/services/OrderService.pb.h" +#include "lib/utils/overloaded.h" namespace bts { namespace api { class Security; } namespace orderman { +using SecurityPtr = const api::Security *; using AccountID = utils::ValueWrapper; using UserID = utils::ValueWrapper; using OrderKey = utils::ValueWrapper; @@ -27,26 +29,6 @@ using AccountName = using GatewayName = utils::ValueWrapper; using ExchangeFillID = utils::ValueWrapper>; -using ExchangeOrderID = - utils::ValueWrapper>; -using ExchangeOrderIDu64 = - utils::ValueWrapper; - - -using ExchangeTimeStampStr = - utils::ValueWrapper>; -using SecurityPtr = const api::Security *; -// Nanoseconds since unix epoch -using ExchangeTimeStamp64 = utils::ValueWrapper; - -#if __cplusplus >= 201703L -using ExchangeOrderIDVar = std::variant; -using TimeStampVar = std::variant; -#endif -//using ExchangeTimeStampVar = std::variant<,ExchangeTimeStamp64>; - - const uint16_t NullTickToTradeCorID = 0; const auto fix_buffer_pool_size = 10000; @@ -83,17 +65,16 @@ template inline std::string to_str(T const &t) { template std::pair find_trim_str(std::array const &in) { auto i = N; - for (; i!= 0; i--) - if (in[i-1] != ' ' || in[i-1] == 0) + for (; i != 0; i--) + if (in[i - 1] != ' ' || in[i - 1] == 0) break; return std::make_pair(&in[0], i); } -template -std::string to_trim_str(T const&t) { +template std::string to_trim_str(T const &t) { auto ts = find_trim_str(t.value()); - return std::string(ts.first,ts.second); + return std::string(ts.first, ts.second); } inline bool in_terminal_state(bts::api::orderman::OrderStatus order_status) { @@ -104,4 +85,70 @@ inline bool in_terminal_state(bts::api::orderman::OrderStatus order_status) { api::orderman::OrderStatus::ORDER_STATUS_REJECTED_BY_SPARK; } -}} // namespace bts +// Exchange order ids +using ExchangeOrderID = + utils::ValueWrapper>; +using ExchangeOrderID64 = + utils::ValueWrapper; +// Exchange timestamps +using ExchangeTimeStampStr = + utils::ValueWrapper>; +using ExchangeTimeStamp64 = + utils::ValueWrapper; + +#if __cplusplus >= 201703L +using ExchangeTimeStampVar = + std::variant; +using ExchangeOrderIDVar = std::variant; + +inline ExchangeOrderIDVar +get_exchange_order_id(api::orderman::NativeOrderState const &st) { + if (st.exchange_order_id().size()) { + ExchangeOrderID result; + str_to(st.exchange_order_id(), &result); + return result; + } else { + return ExchangeOrderID64{st.exchange_order_id64()}; + } +} +inline void set_exchange_order_id(ExchangeOrderIDVar const &v, + api::orderman::NativeOrderState *out) { + std::visit(overloaded{[out](ExchangeOrderID const &str) { + out->set_exchange_order_id64(0); + *(out->mutable_exchange_order_id()) = to_trim_str(str); + }, + [out](ExchangeOrderID64 oid) { + out->set_exchange_order_id64(oid.value()); + out->clear_exchange_order_id(); + }}, + v); +} + +inline ExchangeTimeStampVar +get_last_transact(api::orderman::NativeOrderState const&st) { + if (st.last_transact_time().size()) { + ExchangeTimeStampStr result; + str_to(st.last_transact_time(),&result); + return result; + } + else { + return ExchangeTimeStamp64 {st.last_transact_time_unix_ns()}; + } +} +inline void set_last_transact_time(ExchangeTimeStampVar const&v, + api::orderman::NativeOrderState *out) { + std::visit(overloaded{[out](ExchangeTimeStampStr const &str) { + out->set_last_transact_time_unix_ns(0); + *(out->mutable_last_transact_time()) = to_trim_str(str); + }, + [out](ExchangeTimeStamp64 ts) { + out->set_last_transact_time_unix_ns(ts.value()); + out->clear_last_transact_time(); + }}, + v); +} +#endif + +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/orders/GLBXNativeOrder.cpp b/src/lib/orderman/orders/GLBXNativeOrder.cpp index 3e989fda1..afcae50ed 100644 --- a/src/lib/orderman/orders/GLBXNativeOrder.cpp +++ b/src/lib/orderman/orders/GLBXNativeOrder.cpp @@ -45,7 +45,6 @@ struct NativeOrder::PImpl { : services(nullptr), session_services(), sec(nullptr), previous_working_position(0), definition(), state(), price_encoding_precision(7), exchange_order_id() { - exchange_order_id.reserve(100); } OrderServices *services; @@ -59,7 +58,7 @@ struct NativeOrder::PImpl { OrderDefinition definition; OrderState state; int price_encoding_precision; - std::string exchange_order_id; + std::optional exchange_order_id; OrderServices::ExeReportSubID exe_report_sid; OrderServices::CancelRejectSubID cancel_reject_sid; @@ -195,8 +194,8 @@ void NativeOrder::on_init_recovered(OrderRecord const &rec, init_encodings(); if (me->state.status() != ORDER_STATUS_PENDING_WORKING) { - me->exchange_order_id = native_state.exchange_order_id(); - me->encoder->update_exchange_order_id(me->exchange_order_id); + me->exchange_order_id = get_exchange_order_id(native_state); + me->encoder->update_exchange_order_id(me->exchange_order_id.value()); } return; } @@ -710,7 +709,7 @@ void NativeOrder::on_attached( *native_state.mutable_routing_record() = rq.routing_record; init_encodings(); if (has_exchange_order_id()) - me->encoder->update_exchange_order_id(me->exchange_order_id); + me->encoder->update_exchange_order_id(me->exchange_order_id.value()); // Update user, account and manual order indicator based on new parent me->definition.set_manual_order_indicator( @@ -846,13 +845,7 @@ void NativeOrder::on_exe_report(const NewExecutionReportEvent &er) { } native_state.set_last_msg_seq_num(er.data->msg_seq_num); - - orderman::ExchangeTimeStampStr ts_str; - ExchangeTimeStamp64 ts_64; - er.data->get_ts(&ts_str,&ts_64); - - native_state.set_last_transact_time_unix_ns(ts_64.value()); - native_state.set_last_transact_time(to_str(ts_str)); + set_last_transact_time(er.data->transact_time,&native_state); auto external_status = map_external_status(er.data->order_status); // filled quantity is reset back to 0 when the order is canceled @@ -894,10 +887,9 @@ void NativeOrder::on_exe_report(const NewExecutionReportEvent &er) { bool got_first_exchange_order_id = !has_exchange_order_id(); if (got_first_exchange_order_id) { - me->exchange_order_id = - to_trim_str(std::get(er.data->exchange_order_id)); - native_state.set_exchange_order_id(me->exchange_order_id); - me->encoder->update_exchange_order_id(me->exchange_order_id); + me->exchange_order_id = er.data->exchange_order_id; + set_exchange_order_id(me->exchange_order_id.value(),&native_state); + me->encoder->update_exchange_order_id(me->exchange_order_id.value()); } if (!terminal_state(me->state.status())) { @@ -1138,7 +1130,7 @@ OrderStatus map_external_status(NativeOrderStatus status) { } bool NativeOrder::has_exchange_order_id() { - return me->exchange_order_id.size(); + return me->exchange_order_id.has_value(); } void NativeOrder::transition(api::orderman::OrderStatus new_status, diff --git a/src/lib/orderman/orders/glbx/IGLBXOrderEncoder.h b/src/lib/orderman/orders/glbx/IGLBXOrderEncoder.h index fb0b1cf34..9a33b1082 100644 --- a/src/lib/orderman/orders/glbx/IGLBXOrderEncoder.h +++ b/src/lib/orderman/orders/glbx/IGLBXOrderEncoder.h @@ -27,7 +27,7 @@ class IGLBXOrderEncoder { int price_encoding_precision, bool stop_order_has_been_triggered) = 0; - virtual void update_exchange_order_id(std::string const &) = 0; + virtual void update_exchange_order_id(ExchangeOrderIDVar const&) = 0; virtual void update_create_order_encoding(Price p, int price_precision, Quantity q, OrderServices &) = 0; diff --git a/src/lib/orderman/orders/glbx/iLink2OrderEncoder.h b/src/lib/orderman/orders/glbx/iLink2OrderEncoder.h index d12c29e1a..baceb64f4 100644 --- a/src/lib/orderman/orders/glbx/iLink2OrderEncoder.h +++ b/src/lib/orderman/orders/glbx/iLink2OrderEncoder.h @@ -14,7 +14,7 @@ class iLink2OrderEncoder : public IGLBXOrderEncoder { api::orderman::OrderDefinition const &def, int price_encoding_precision, bool stop_order_has_been_triggered) override; - void update_exchange_order_id(std::string const &) override; + void update_exchange_order_id(ExchangeOrderIDVar const&) override; void update_create_order_encoding(Price p, int price_precision, Quantity q, OrderServices &services) override; void update_cancel_replace_stop_px(Price stop_px, diff --git a/src/lib/orderman/orders/glbx/iLink3OrderEncoder.cpp b/src/lib/orderman/orders/glbx/iLink3OrderEncoder.cpp index 710d1a82c..4b06a2290 100644 --- a/src/lib/orderman/orders/glbx/iLink3OrderEncoder.cpp +++ b/src/lib/orderman/orders/glbx/iLink3OrderEncoder.cpp @@ -110,8 +110,8 @@ void iLink3OrderEncoder::init(OrderKey key, me->cancel.routing_record = &rr; } -void iLink3OrderEncoder::update_exchange_order_id(std::string const &oid) { - me->cancel_replace.exchange_order_id = ExchangeOrderIDu64{std::stoull(oid)}; +void iLink3OrderEncoder::update_exchange_order_id(ExchangeOrderIDVar const&v) { + me->cancel_replace.exchange_order_id = std::get (v); me->cancel.exchange_order_id = me->cancel_replace.exchange_order_id; } diff --git a/src/lib/orderman/orders/glbx/iLink3OrderEncoder.h b/src/lib/orderman/orders/glbx/iLink3OrderEncoder.h index c48f14506..28cbba7d2 100644 --- a/src/lib/orderman/orders/glbx/iLink3OrderEncoder.h +++ b/src/lib/orderman/orders/glbx/iLink3OrderEncoder.h @@ -13,7 +13,7 @@ class iLink3OrderEncoder : public IGLBXOrderEncoder { api::orderman::OrderDefinition const &def, int price_encoding_precision, bool stop_order_has_been_triggered) override; - void update_exchange_order_id(std::string const &) override; + void update_exchange_order_id(ExchangeOrderIDVar const&) override; void update_create_order_encoding(Price p, int price_precision, Quantity q, OrderServices &services) override; void update_cancel_replace_stop_px(Price stop_px, diff --git a/src/lib/utils/overloaded.h b/src/lib/utils/overloaded.h index 91954cd21..c3b6c2627 100644 --- a/src/lib/utils/overloaded.h +++ b/src/lib/utils/overloaded.h @@ -1,7 +1,10 @@ #pragma once + +#if __cplusplus >= 201703L #include // Helper to visit std::variant namespace bts { template struct overloaded : Ts... { using Ts::operator()...; }; template overloaded(Ts...) -> overloaded; // not needed as of C++20 -} \ No newline at end of file +} +#endif