diff --git a/src/app_sparkd/sparkd/execution/EMExecutionGateway.cpp b/src/app_sparkd/sparkd/execution/EMExecutionGateway.cpp index f2fe6b4d7..57a407b3a 100644 --- a/src/app_sparkd/sparkd/execution/EMExecutionGateway.cpp +++ b/src/app_sparkd/sparkd/execution/EMExecutionGateway.cpp @@ -482,8 +482,7 @@ void EMExecutionGateway::_process_cb_and_fire_er(const EMCallbackMsg &em_cb) { std::string exch_oid = std::to_string(em_cb.order_key.value()); // TODO, should we put EM order or Deribit ? // (this is not used by EMNativeOrder so we are ok) - auto &er_exch_oid = std::get(er.exchange_order_id).value(); - to_array(exch_oid, &er_exch_oid); + std::get(er.exchange_order_id).value().copy_from(exch_oid); er.price.value() = em_cb.order_state.order_px; er.quantity = em_cb.order_state.order_qty; // fractional qty diff --git a/src/lib_spark/spark/core/small_string.h b/src/lib_spark/spark/core/small_string.h index eac7a2cda..49bc54635 100644 --- a/src/lib_spark/spark/core/small_string.h +++ b/src/lib_spark/spark/core/small_string.h @@ -7,6 +7,7 @@ #include #include #include +#include #include namespace bts::core { @@ -55,14 +56,16 @@ struct SmallString { std::array data_; std::uint8_t length_ = 0; - friend struct fmt::formatter>; - - friend std::ostream &operator<<( - std::ostream &out, const SmallString &lhs) noexcept; friend bool operator==( - const SmallString &lhs, const std::string &rhs) noexcept; + const SmallString &lhs, const std::string &rhs) noexcept { + const std::size_t sz = lhs.size(); + return sz == rhs.size() && std::memcmp(&lhs.data_[0], &rhs[0], sz) == 0; + } + friend bool operator!=( - const SmallString &lhs, const std::string &rhs) noexcept; + const SmallString &lhs, const std::string &rhs) noexcept { + return !(lhs == rhs); + } }; template @@ -72,7 +75,7 @@ template void from_json(const nlohmann::json &j, SmallString &ss); template -std::ostream &operator<<(std::ostream &out, const SmallString &lhs) noexcept; +std::ostream &operator<<(std::ostream &out, const SmallString &ss); template bool operator==(const SmallString &lhs, const std::string &rhs) noexcept; @@ -175,8 +178,12 @@ void SmallString::copy_to(std::string &dest) const { template std::int32_t SmallString::toi() const { + if (length_ == 0) { + throw std::logic_error( + "SmallString::toi failed because string is empty"); + } std::int32_t rv = 0; - for (std::size_t i = length_ - 1; i > -1; i--) { + for (std::size_t i = length_ - 1; i >= 0; i--) { rv = rv * 10 + (data_[i] - '0'); } return rv; @@ -184,8 +191,12 @@ std::int32_t SmallString::toi() const { template std::int64_t SmallString::tol() const { + if (length_ == 0) { + throw std::logic_error( + "SmallString::tol failed because string is empty"); + } std::int64_t rv = 0; - for (std::size_t i = length_ - 1; i > -1; i--) { + for (std::size_t i = length_ - 1; i >= 0; i--) { rv = rv * 10 + (data_[i] - '0'); } return rv; @@ -193,6 +204,10 @@ std::int64_t SmallString::tol() const { template std::uint64_t SmallString::toul() const { + if (length_ == 0) { + throw std::logic_error( + "SmallString::toul failed because string is empty"); + } std::uint64_t rv = 0; for (std::size_t i = length_ - 1; i >= 0; i--) { rv = rv * 10ul + static_cast(data_[i] - '0'); @@ -240,9 +255,9 @@ void from_json(const nlohmann::json &j, SmallString &ss) { } template -std::ostream &operator<<( - std::ostream &out, const SmallString &small_str) noexcept { - return out.write(small_str.data_, small_str.length_); +std::ostream &operator<<(std::ostream &out, const SmallString &ss) { + out << ss.to_string_view(); + return out; } template @@ -267,7 +282,6 @@ struct fmt::formatter> { template auto format(const bts::core::SmallString &s, FormatContext &ctx) const -> decltype(ctx.out()) { - return fmt::format_to( - ctx.out(), "{}", std::string_view(&s.data_[0], s.length_)); + return fmt::format_to(ctx.out(), "{}", s.to_string_view()); } }; diff --git a/src/lib_spark/spark/md/MBOServiceServer.cpp b/src/lib_spark/spark/md/MBOServiceServer.cpp index 83796b73a..226144587 100644 --- a/src/lib_spark/spark/md/MBOServiceServer.cpp +++ b/src/lib_spark/spark/md/MBOServiceServer.cpp @@ -230,7 +230,7 @@ void try_add( auto u64_key = std::visit( overloaded{ [](orderman::ExchangeOrderID const &str) { - return std::stoul(str.value().data()); + return str.value().toul(); }, [](orderman::ExchangeOrderID64 oid) { return oid.value(); }}, ex_key); diff --git a/src/lib_spark/spark/orderman/gateways/CCAPIExecutionGateway.cpp b/src/lib_spark/spark/orderman/gateways/CCAPIExecutionGateway.cpp index a323eaf3e..1a8a5caf1 100644 --- a/src/lib_spark/spark/orderman/gateways/CCAPIExecutionGateway.cpp +++ b/src/lib_spark/spark/orderman/gateways/CCAPIExecutionGateway.cpp @@ -351,7 +351,7 @@ void CCAPIExecutionGateway::_on_order_cb(const CCAPIOrderState &s) { er.manual_order_indicator = api::orderman::ManualOrderIndicator::MANUAL_ORDER_INDICATOR_NO; auto &er_exch_oid = std::get(er.exchange_order_id).value(); - to_array(s.cc_order_key, &er_exch_oid); + er_exch_oid.copy_from(s.cc_order_key); er.price.value() = s.order_px; er.quantity = s.order_qty; er.msg = s.msg; diff --git a/src/lib_spark/spark/orderman/gateways/GLBXExecutionGateway.cpp b/src/lib_spark/spark/orderman/gateways/GLBXExecutionGateway.cpp index fed9810cc..36b27dabd 100644 --- a/src/lib_spark/spark/orderman/gateways/GLBXExecutionGateway.cpp +++ b/src/lib_spark/spark/orderman/gateways/GLBXExecutionGateway.cpp @@ -236,9 +236,9 @@ void GLBXExecutionGateway::on_exe_report( msg.get() ? api::orderman::MANUAL_ORDER_INDICATOR_YES : api::orderman::MANUAL_ORDER_INDICATOR_YES; - str_to( - msg.get(), - &std::get(data->exchange_order_id)); + std::get(data->exchange_order_id) + .value() + .copy_from(msg.get()); if (msg.has()) data->price = securities::decode_exchange_price( diff --git a/src/lib_spark/spark/orderman/gateways/ICEExecutionGateway.cpp b/src/lib_spark/spark/orderman/gateways/ICEExecutionGateway.cpp index 673f51567..72738eee8 100644 --- a/src/lib_spark/spark/orderman/gateways/ICEExecutionGateway.cpp +++ b/src/lib_spark/spark/orderman/gateways/ICEExecutionGateway.cpp @@ -407,8 +407,8 @@ void ICEExecutionGateway::on_exe_report( api::orderman::NativeOrderStatus(msg.get()); data->manual_order_indicator = api::orderman::MANUAL_ORDER_INDICATOR_NO; - std::string oid_string = get_ice_order_id_string(msg); - str_to(oid_string, &std::get(data->exchange_order_id)); + data->exchange_order_id.emplace( + get_ice_order_id_string(msg)); data->ice_cl_ord_id = 0; if (msg.has()) data->ice_cl_ord_id = msg.get(); diff --git a/src/lib_spark/spark/orderman/gateways/sim/SimExecutionGateway.cpp b/src/lib_spark/spark/orderman/gateways/sim/SimExecutionGateway.cpp index 4f58a086a..5b61e4ca9 100644 --- a/src/lib_spark/spark/orderman/gateways/sim/SimExecutionGateway.cpp +++ b/src/lib_spark/spark/orderman/gateways/sim/SimExecutionGateway.cpp @@ -777,8 +777,7 @@ void fill_execution_report(const SEGOrderState &seg_os, ExecutionReport &er) { er.manual_order_indicator = api::orderman::ManualOrderIndicator::MANUAL_ORDER_INDICATOR_NO; std::string exch_oid = std::to_string(cr_msg.key.value()); - auto &er_exch_oid = std::get(er.exchange_order_id).value(); - to_array(exch_oid, &er_exch_oid); + std::get(er.exchange_order_id).value().copy_from(exch_oid); er.price.value() = seg_os.price().value(); er.quantity = seg_os.qty(); // fractional qty diff --git a/src/lib_spark/spark/orderman/log_messages/execution_report_log.cpp b/src/lib_spark/spark/orderman/log_messages/execution_report_log.cpp index 0696eb546..a20f489ef 100644 --- a/src/lib_spark/spark/orderman/log_messages/execution_report_log.cpp +++ b/src/lib_spark/spark/orderman/log_messages/execution_report_log.cpp @@ -10,8 +10,7 @@ namespace bts::orderman { static std::string get_exch_id_str(ExchangeOrderIDVar exch_id) { std::string rv; if (std::holds_alternative(exch_id)) { - rv = bts::orderman::to_trim_str( - std::get(exch_id)); + std::get(exch_id).value().copy_to(rv); } else { rv = std::to_string(*std::get(exch_id)); } diff --git a/src/lib_spark/spark/orderman/orderman_utils/exchange_order_id.h b/src/lib_spark/spark/orderman/orderman_utils/exchange_order_id.h new file mode 100644 index 000000000..831497cfa --- /dev/null +++ b/src/lib_spark/spark/orderman/orderman_utils/exchange_order_id.h @@ -0,0 +1,11 @@ +#pragma once + +#include "spark/core/small_string.h" +#include "spark/utils/ValueWrapper.h" + +namespace bts::orderman { + +using ExchangeOrderID = + utils::ValueWrapper>; + +} // namespace bts::orderman diff --git a/src/lib_spark/spark/orderman/orderman_utils/orderman_common.h b/src/lib_spark/spark/orderman/orderman_utils/orderman_common.h index 359da6492..84e607133 100644 --- a/src/lib_spark/spark/orderman/orderman_utils/orderman_common.h +++ b/src/lib_spark/spark/orderman/orderman_utils/orderman_common.h @@ -6,6 +6,7 @@ #include "spark/orderman/account_id.h" #include "spark/orderman/account_name.h" #include "spark/orderman/order_key.h" +#include "spark/orderman/orderman_utils/exchange_order_id.h" #include "spark/utils/ValueWrapper.h" #include "spark/utils/bts_assert.h" #include "spark/utils/bts_chrono.h" @@ -173,8 +174,6 @@ inline bool in_terminal_state(bts::api::orderman::OrderStatus order_status) { } // Exchange order ids -using ExchangeOrderID = - utils::ValueWrapper>; using ExchangeOrderID64 = utils::ValueWrapper; // Exchange timestamps @@ -192,9 +191,7 @@ 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; + return ExchangeOrderID{{st.exchange_order_id()}}; } else { return ExchangeOrderID64{st.exchange_order_id_u64()}; } @@ -205,7 +202,7 @@ inline void set_exchange_order_id( overloaded{ [out](ExchangeOrderID const &str) { out->set_exchange_order_id_u64(0); - *(out->mutable_exchange_order_id()) = to_trim_strn(str); + str.value().copy_to(*out->mutable_exchange_order_id()); }, [out](ExchangeOrderID64 oid) { out->set_exchange_order_id_u64(oid.value()); @@ -331,7 +328,7 @@ inline void set_update_quantity( } // namespace bts FMT_IMPL(bts::orderman::AccountID, id, "{}", *id); -FMT_IMPL(bts::orderman::ExchangeOrderID, id, "{}", bts::orderman::to_strn(id)); +FMT_IMPL(bts::orderman::ExchangeOrderID, id, "{}", id.value()); FMT_IMPL(bts::orderman::ExchangeOrderID64, id, "{}", *id); template <> diff --git a/src/lib_spark/spark/orderman/orders/ICENativeOrder.cpp b/src/lib_spark/spark/orderman/orders/ICENativeOrder.cpp index 179eb69ff..f02cd9715 100644 --- a/src/lib_spark/spark/orderman/orders/ICENativeOrder.cpp +++ b/src/lib_spark/spark/orderman/orders/ICENativeOrder.cpp @@ -19,6 +19,7 @@ #include #include #include +#include namespace bts { namespace orderman { @@ -287,8 +288,10 @@ api::orderman::OrderDefinition ICENativeOrder::on_init_from_exe_report( } auto &native_state = get_native_state(state); - native_state.set_exchange_order_id( - to_trim_str(std::get(er.exchange_order_id))); + bts_assert(std::holds_alternative(er.exchange_order_id)); + std::get(er.exchange_order_id) + .value() + .copy_to(*native_state.mutable_exchange_order_id()); native_state.set_last_msg_seq_num(er.msg_seq_num); native_state.set_native_type(er.order_type); @@ -887,7 +890,9 @@ void ICENativeOrder::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)); + std::get(er.data->exchange_order_id) + .value() + .to_string(); native_state.set_exchange_order_id(me->exchange_order_id); add_exchange_order_id_to_fix(); } diff --git a/src/lib_spark/spark/orderman/orders/glbx/iLink2OrderEncoder.cpp b/src/lib_spark/spark/orderman/orders/glbx/iLink2OrderEncoder.cpp index 954f5f660..ded205bd3 100644 --- a/src/lib_spark/spark/orderman/orders/glbx/iLink2OrderEncoder.cpp +++ b/src/lib_spark/spark/orderman/orders/glbx/iLink2OrderEncoder.cpp @@ -274,7 +274,7 @@ void iLink2OrderEncoder::init( } void iLink2OrderEncoder::update_exchange_order_id(ExchangeOrderIDVar const &v) { - auto oid = to_trim_str(std::get(v)); + auto oid = std::get(v).value().to_string(); me->update_encoding.add(oid); me->cancel_encoding.add(oid); //CME EXECUTION NEEDS TO BE UPDATED, can be commented out