diff --git a/externals b/externals index 8ba5cf52b..608d627e9 160000 --- a/externals +++ b/externals @@ -1 +1 @@ -Subproject commit 8ba5cf52b15a0717132d829f1a901f6f4b22b464 +Subproject commit 608d627e9b489a710a88bbd9a4298aefa0aa8f28 diff --git a/src/lib/api/services/OrderService.h b/src/lib/api/services/OrderService.h new file mode 100644 index 000000000..ea0dd855d --- /dev/null +++ b/src/lib/api/services/OrderService.h @@ -0,0 +1,31 @@ +#pragma once + +#include "lib/api/services/OrderService.pb.h" +#include "lib/core/EnumMacros.h" +#include "lib/core/FMT_IMPL.h" +#include "lib/io/JsonReader.h" +#include "lib/logging/logging.h" + +#include + +namespace bts::api::orderman { + +PB_ENUM_FROM_JSON(OrderStatus) +PB_ENUM_TO_JSON(OrderStatus) + +PB_ENUM_FROM_JSON(TriggerPriceType) +PB_ENUM_TO_JSON(TriggerPriceType) + +} // namespace bts::api::orderman + +FMT_IMPL( + bts::api::orderman::OrderStatus, + s, + "{}", + bts::api::orderman::OrderStatus_Name(s)); + +FMT_IMPL( + bts::api::orderman::TriggerPriceType, + t, + "{}", + bts::api::orderman::TriggerPriceType_Name(t)); diff --git a/src/lib/cmake/GetSparkdLinkLibraries.cmake b/src/lib/cmake/GetSparkdLinkLibraries.cmake index ef4b96201..84fee5adf 100644 --- a/src/lib/cmake/GetSparkdLinkLibraries.cmake +++ b/src/lib/cmake/GetSparkdLinkLibraries.cmake @@ -15,7 +15,8 @@ function(get_link_libraries dest) uuid ssl crypto - fmt + debug fmtd + optimized fmt tbb cryptopp pugixml diff --git a/src/lib/config/ConfigurationState.cpp b/src/lib/config/ConfigurationState.cpp index dbfd17944..495704e03 100644 --- a/src/lib/config/ConfigurationState.cpp +++ b/src/lib/config/ConfigurationState.cpp @@ -873,7 +873,7 @@ urdl::url url_from_string( (*log), Warn, "Failed to convert '{}' to a url. urdl::url::from_string " "resulted in error code {}", - path, ec); + path, ec.message()); } } bts_assert_msg(!required || !ec, ec.message().c_str()); diff --git a/src/lib/core/FMT.h b/src/lib/core/FMT.h index 6448d2180..3665d8573 100644 --- a/src/lib/core/FMT.h +++ b/src/lib/core/FMT.h @@ -1,7 +1,28 @@ #pragma once + +#include #include +#include +#include #define FMT(template_str, ...) fmt::format(template_str, __VA_ARGS__) -#define FMT_JOIN(range, delimiter) fmt::to_string(fmt::join(range, delimiter)) +#define FMT_JOIN(range, delimiter) \ + fmt::to_string(fmt::join(range.begin(), range.end(), delimiter)) + +namespace bts { + +template +std::string _fmt_join(Range range, const char *delimiter) { + return fmt::join(range.begin(), range.end(), delimiter); +} + +template +std::string _fmt_join_fn(Range range, const char *delimiter, Op op) { + return fmt::to_string( + fmt::join(range | ranges::views::transform(op), delimiter)); +} + +} // namespace bts + #define FMT_JOIN_FN(range, delimiter, fn) \ - fmt::to_string(fmt::join(range | ranges::views::transform(fn), delimiter)) + bts::_fmt_join_fn(range, delimiter, fn) diff --git a/src/lib/core/FMT_IMPL.h b/src/lib/core/FMT_IMPL.h index 09f4100b1..f82a06095 100644 --- a/src/lib/core/FMT_IMPL.h +++ b/src/lib/core/FMT_IMPL.h @@ -17,6 +17,20 @@ } \ } +#define FMT_IMPL_T(Type, var_name, ...) \ + struct fmt::formatter { \ + constexpr auto parse(fmt::format_parse_context &ctx) \ + -> decltype(ctx.end()) { \ + return ctx.end(); \ + } \ + \ + template \ + auto format(const Type &var_name, FormatContext &ctx) const \ + -> decltype(ctx.out()) { \ + return fmt::format_to(ctx.out(), __VA_ARGS__); \ + } \ + } + #define FMT_IMPL_OSTREAM(T) \ template <> \ struct fmt::formatter { \ diff --git a/src/lib/domain/Price.h b/src/lib/domain/Price.h index 6f60ecb33..db9d948ea 100644 --- a/src/lib/domain/Price.h +++ b/src/lib/domain/Price.h @@ -1,12 +1,16 @@ #pragma once + #include "Side.h" +#include "lib/core/FMT_IMPL.h" #include "lib/io/JsonReader.h" #include "lib/utils/bts_assert.h" + #include #include #include #include #include +#include #if bts_assert_msg #define __ASSERT_MSG(EXP, msg) bts_assert_msg(EXP, msg) @@ -515,6 +519,8 @@ inline std::ostream &operator<<(std::ostream &out, Price p) noexcept { } // namespace bts::domain +FMT_IMPL(bts::domain::Price, p, "{}", p.to_double()); + namespace std { // NOLINT constexpr size_t hash::operator()( diff --git a/src/lib/domain/Quantity.h b/src/lib/domain/Quantity.h index 75bfdb029..47e226cc7 100644 --- a/src/lib/domain/Quantity.h +++ b/src/lib/domain/Quantity.h @@ -1,7 +1,10 @@ #pragma once + +#include "lib/core/FMT_IMPL.h" #include "lib/io/JsonReader.h" #include "lib/logging/logging.h" #include "lib/utils/ValueWrapper.h" + #include #include @@ -129,3 +132,5 @@ QTY_UINT32_BIN_REF_OP(/=) #undef QTY_UINT32_BIN_REF_OP } // namespace bts::domain + +FMT_IMPL(bts::domain::Quantity, q, "{}", *q); diff --git a/src/lib/domain/SecurityCriteriaClause.cpp b/src/lib/domain/SecurityCriteriaClause.cpp index 6abd2c8ff..fec5954de 100644 --- a/src/lib/domain/SecurityCriteriaClause.cpp +++ b/src/lib/domain/SecurityCriteriaClause.cpp @@ -162,7 +162,11 @@ std::string SecurityCriteriaClause::to_expression_str() const { FMT("(currency == {})", FMT_JOIN(currencies, " || currency == "))); } if (!ids.empty()) { - and_parts.push_back(FMT("(id == {})", FMT_JOIN(ids, " || id == "))); + std::vector ids_vec; + for (auto id : ids) { + ids_vec.push_back(id.value()); + } + and_parts.push_back(FMT("(id == {})", FMT_JOIN(ids_vec, " || id == "))); } // Combine names and name_regexps into an 'or' clause. If both fields are // populated, the security name can match with either. @@ -206,7 +210,8 @@ std::string SecurityCriteriaClause::to_expression_str_h() const { and_parts.push_back(FMT("currency IN ({})", FMT_JOIN(currencies, ", "))); } if (!ids.empty()) { - and_parts.push_back(FMT("id IN ({})", FMT_JOIN(ids, ", "))); + std::vector ids_vec{ids.begin(), ids.end()}; + and_parts.push_back(FMT("id IN ({})", FMT_JOIN(ids_vec, ", "))); } if (!names.empty() || !name_regexps.empty()) { std::vector or_parts; diff --git a/src/lib/domain/SecurityID.h b/src/lib/domain/SecurityID.h index a4c54d600..c1e0e4179 100644 --- a/src/lib/domain/SecurityID.h +++ b/src/lib/domain/SecurityID.h @@ -1,5 +1,6 @@ #pragma once +#include "lib/core/FMT_IMPL.h" #include "lib/utils/ValueWrapper.h" #include @@ -25,3 +26,5 @@ inline void to_json(nlohmann::json &j, const SecurityID &sec_id) { } } // namespace bts::domain + +FMT_IMPL(bts::domain::SecurityID, id, "{}", *id); diff --git a/src/lib/domain_model/Security.h b/src/lib/domain_model/Security.h index 7a9620239..850d4c27e 100644 --- a/src/lib/domain_model/Security.h +++ b/src/lib/domain_model/Security.h @@ -1,12 +1,15 @@ #pragma once -#include "lib/utils/datetime.h" -#include -#include - +#include "lib/core/FMT_IMPL.h" #include "lib/domain_model/Security.pb.h" +#include "lib/domain_model/Side.h" +#include "lib/domain_model/Venue.h" #include "lib/domain_model/common.h" #include "lib/utils/bts_assert.h" +#include "lib/utils/datetime.h" + +#include +#include namespace boost { namespace gregorian { diff --git a/src/lib/domain_model/Side.h b/src/lib/domain_model/Side.h new file mode 100644 index 000000000..edb967170 --- /dev/null +++ b/src/lib/domain_model/Side.h @@ -0,0 +1,18 @@ +#pragma once + +#include "lib/core/EnumMacros.h" +#include "lib/core/FMT_IMPL.h" +#include "lib/domain_model/Security.pb.h" +#include "lib/io/JsonReader.h" +#include "lib/logging/logging.h" + +#include + +namespace bts::api { + +PB_ENUM_FROM_JSON(Side) +PB_ENUM_TO_JSON(Side) + +} // namespace bts::api + +FMT_IMPL(bts::api::Side, s, "{}", bts::api::Side_Name(s)); diff --git a/src/lib/domain_model/Venue.h b/src/lib/domain_model/Venue.h new file mode 100644 index 000000000..fe05c6c61 --- /dev/null +++ b/src/lib/domain_model/Venue.h @@ -0,0 +1,18 @@ +#pragma once + +#include "lib/core/EnumMacros.h" +#include "lib/core/FMT_IMPL.h" +#include "lib/domain_model/Security.pb.h" +#include "lib/io/JsonReader.h" +#include "lib/logging/logging.h" + +#include + +namespace bts::api { + +PB_ENUM_FROM_JSON(Venue) +PB_ENUM_TO_JSON(Venue) + +} // namespace bts::api + +FMT_IMPL(bts::api::Venue, v, "{}", bts::api::Venue_Name(v)); diff --git a/src/lib/domain_model/common.h b/src/lib/domain_model/common.h index 03c791c35..5dc8fb770 100644 --- a/src/lib/domain_model/common.h +++ b/src/lib/domain_model/common.h @@ -7,6 +7,7 @@ #include #include +#include "lib/core/FMT_IMPL.h" #include "lib/domain_model/SecurityKey.h" #include "lib/utils/ValueWrapper.h" @@ -113,3 +114,6 @@ using Price = utils::ValueWrapper; using Quantity = CQuantity; using UserLogin = utils::ValueWrapper; } // namespace bts + +FMT_IMPL(bts::Price, p, "{}", p.value()); +FMT_IMPL(bts::Quantity, q, "{}", q.value()); diff --git a/src/lib/io/websocket/WebsocketSSLClientInternal.cpp b/src/lib/io/websocket/WebsocketSSLClientInternal.cpp index 06ba75093..3ab6fd20c 100644 --- a/src/lib/io/websocket/WebsocketSSLClientInternal.cpp +++ b/src/lib/io/websocket/WebsocketSSLClientInternal.cpp @@ -89,7 +89,7 @@ void WebsocketSSLClientInternal::_handle_error( str << "Error_code:" << error_code << " Text:" << err_msg; LOG(OrderMan, Info, "WebsocketSSLClientInternal::_handle_error error_code:{} err_msg:{}", - error_code, err_msg); + error_code.message(), err_msg); _listener->on_error({err_type, str.str()}); close_connection(); } @@ -131,7 +131,8 @@ void WebsocketSSLClientInternal::_on_connect( return; } LOG(OrderMan, Info, - "WebsocketSSLClientInternal::_on_connect successfull ep:{}", ep); + "WebsocketSSLClientInternal::_on_connect successfull ep: {}:{}", + ep.address().to_string(), ep.port()); ip_port = _conf.ip + ':' + std::to_string(ep.port()); // Set a timeout on the operation boost::beast::get_lowest_layer(_ws).expires_after(std::chrono::seconds(30)); diff --git a/src/lib/logging/MsgPacking.h b/src/lib/logging/MsgPacking.h index cec7ae865..ffeaa6e72 100644 --- a/src/lib/logging/MsgPacking.h +++ b/src/lib/logging/MsgPacking.h @@ -4,6 +4,7 @@ #include #include #include +#include namespace bts { namespace log { @@ -12,7 +13,12 @@ template std::string format_tuple( const char *msg_template, Tuple const &t, std::index_sequence) { try { - return fmt::format(msg_template, std::get(t)...); + using ctx = fmt::format_context; + std::vector> fmt_args; + (fmt_args.push_back(fmt::detail::make_arg(std::get(t))), ...); + return fmt::vformat( + msg_template, + fmt::basic_format_args(fmt_args.data(), fmt_args.size())); } catch (fmt::format_error const &e) { return fmt::format( "Bad log message template: '{}' Error: '{}'", msg_template, e.what()); diff --git a/src/lib/logging/tests/logging_tests.cpp b/src/lib/logging/tests/logging_tests.cpp index 6f3eb2536..b16458b38 100644 --- a/src/lib/logging/tests/logging_tests.cpp +++ b/src/lib/logging/tests/logging_tests.cpp @@ -1,8 +1,11 @@ #include "catch/catch.hpp" #include "lib/config/config.h" #include "lib/config/protos/logging.pb.h" -#include "lib/utils/bts_chrono.h" #include "lib/logging/logging.h" +#include "lib/utils/bts_chrono.h" + +#include +#include namespace bts { int logging_tests; @@ -22,7 +25,8 @@ TEST_CASE("Logging Tests", "[logging] [benchmark]") { SECTION("timestamp_interpolation") { auto start = bts::Timer::now(); for (int i = 0; i < sz; i++) - LOG(Gen, Info, "Hello World. It is now: {0}", Timer::now()); + LOG(Gen, Info, "Hello World. It is now: {}", + Timer::now().time_since_epoch()); auto stop = Timer::now(); LOG(Testing, Info, "Logging: ns/msg for log with timestamps: {} tt: {} ", bts::ns_diff(stop, start) / sz, bts::ns_diff(stop, start)); diff --git a/src/lib/md/MBOProcessor.h b/src/lib/md/MBOProcessor.h index 093abf4cf..c23326457 100644 --- a/src/lib/md/MBOProcessor.h +++ b/src/lib/md/MBOProcessor.h @@ -2,6 +2,7 @@ #include "ExchangeOrderKey.h" #include "IntPrice.h" #include "MDProducerHandle.h" +#include "lib/core/FMT_IMPL.h" #include "lib/domain_model/Security.h" #include "lib/domain_model/SecurityKey.h" #include "lib/utils/TimeStamp.h" @@ -169,3 +170,5 @@ class MBOProcessor { namespace std { std::ostream &operator<<(std::ostream &os, const bts::md::inc::Update &); } + +FMT_IMPL_OSTREAM(bts::md::inc::Update); diff --git a/src/lib/md/MDConsumer.cpp b/src/lib/md/MDConsumer.cpp index b71c708f9..7efdd12cc 100644 --- a/src/lib/md/MDConsumer.cpp +++ b/src/lib/md/MDConsumer.cpp @@ -984,7 +984,7 @@ class MDConsumerImpl { } bts_assert_msgf( false, "Invalid MDConsumer::get_channel. sym: {}; typ: {}; exch: {}", - symbol, type, exchange); + symbol, SecurityType_Name(type), Venue_Name(exchange)); } bool all_heartbeats_ok() const { diff --git a/src/lib/md/MarketDataError.h b/src/lib/md/MarketDataError.h index eb2f75811..227807e28 100644 --- a/src/lib/md/MarketDataError.h +++ b/src/lib/md/MarketDataError.h @@ -1,5 +1,9 @@ #pragma once + +#include "lib/core/FMT_IMPL.h" + #include +#include #include namespace bts::md { @@ -30,3 +34,5 @@ constexpr const char *MarketDataError::type_name() const noexcept { } } // namespace bts::md + +FMT_IMPL_OSTREAM(bts::md::MarketDataError); diff --git a/src/lib/md/MarketDataListenerID.h b/src/lib/md/MarketDataListenerID.h index 99b675937..8af8d5818 100644 --- a/src/lib/md/MarketDataListenerID.h +++ b/src/lib/md/MarketDataListenerID.h @@ -1,5 +1,7 @@ #pragma once #ifndef _WIN32 + +#include "lib/core/FMT_IMPL.h" #include "lib/core/ValueWrapper.h" namespace bts::md { @@ -8,4 +10,6 @@ using MarketDataListenerID = core::ValueWrapper; } // namespace bts::md + +FMT_IMPL(bts::md::MarketDataListenerID, id, "{}", *id); #endif diff --git a/src/lib/md/Shm/FixedSecurity.h b/src/lib/md/Shm/FixedSecurity.h index d2a542725..220443e4a 100644 --- a/src/lib/md/Shm/FixedSecurity.h +++ b/src/lib/md/Shm/FixedSecurity.h @@ -1,6 +1,7 @@ #pragma once #include "../common.h" +#include "lib/core/FMT_IMPL.h" #include "lib/io/JsonDumper.h" #include "lib/io/JsonReader.h" #include "lib/utils/ValueWrapper.h" @@ -385,3 +386,5 @@ void with_security_like(const api::Security &security, C cb) { } // namespace md } // namespace bts + +FMT_IMPL(bts::md::SecurityKey, k, "{}", *k); diff --git a/src/lib/md/SyntheticSecurityService.cpp b/src/lib/md/SyntheticSecurityService.cpp index f14960f72..75aa362b5 100644 --- a/src/lib/md/SyntheticSecurityService.cpp +++ b/src/lib/md/SyntheticSecurityService.cpp @@ -162,7 +162,7 @@ void SyntheticSecurityService::create_synthetic( } else { LOG(Api, Info, "Failed to un-delete security {}. Error {}", id, - result.error()); + UpdateResult_Error_Name(result.error())); send_reply( reply, CreateResult::ERROR_SECURITY_ALREADY_EXISTS, id); diff --git a/src/lib/md/deribit/DeribitComboLeg.h b/src/lib/md/deribit/DeribitComboLeg.h index 5fca815e1..9bddf8e81 100644 --- a/src/lib/md/deribit/DeribitComboLeg.h +++ b/src/lib/md/deribit/DeribitComboLeg.h @@ -1,9 +1,12 @@ #pragma once #ifdef SPARK_ENABLE_CCAPI +#include "lib/core/FMT_IMPL.h" + #include #include #include +#include #include namespace bts::md::deribit { @@ -31,3 +34,5 @@ NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(DeribitComboLeg, instrument_name, amount) } // namespace bts::md::deribit #endif + +FMT_IMPL_OSTREAM(bts::md::deribit::DeribitComboLeg); diff --git a/src/lib/md/deribit/DeribitInstrumentStore.cpp b/src/lib/md/deribit/DeribitInstrumentStore.cpp index 5a53c63ee..63a92aa1d 100644 --- a/src/lib/md/deribit/DeribitInstrumentStore.cpp +++ b/src/lib/md/deribit/DeribitInstrumentStore.cpp @@ -1,6 +1,7 @@ #ifdef SPARK_ENABLE_CCAPI #include "DeribitInstrumentStore.h" +#include "lib/api/domain/SecurityType.h" #include "lib/collections/Contains.h" #include "lib/collections/Remove.h" #include "lib/core/FMT.h" diff --git a/src/lib/md/ftx/FTXFuture.h b/src/lib/md/ftx/FTXFuture.h index 10ab39d32..85c52ef72 100644 --- a/src/lib/md/ftx/FTXFuture.h +++ b/src/lib/md/ftx/FTXFuture.h @@ -71,3 +71,5 @@ std::ostream &operator<<(std::ostream &out, const FTXFuture &fut) noexcept; } // namespace bts::md::ftx #endif + +FMT_IMPL(bts::md::ftx::FTXFuture, f, "{}", f.name); diff --git a/src/lib/md/ftx/FTXSecurityType.h b/src/lib/md/ftx/FTXSecurityType.h index bc60a34ca..902be25bd 100644 --- a/src/lib/md/ftx/FTXSecurityType.h +++ b/src/lib/md/ftx/FTXSecurityType.h @@ -1,9 +1,13 @@ #pragma once #ifdef SPARK_ENABLE_CCAPI + #include "lib/api/domain/SecurityType.pb.h" #include "lib/core/EnumMacros.h" +#include "lib/core/FMT_IMPL.h" + #include #include +#include namespace bts::md::ftx { @@ -62,4 +66,6 @@ constexpr api::domain::SecurityType FTXSecurityType::to_security_type() const { #undef FOR_ALL_VALUES } // namespace bts::md::ftx + +FMT_IMPL(bts::md::ftx::FTXSecurityType, t, "{}", t.name()); #endif diff --git a/src/lib/md/vendor/OnixsUtils.cpp b/src/lib/md/vendor/OnixsUtils.cpp index 3a06fb915..6b0b48919 100644 --- a/src/lib/md/vendor/OnixsUtils.cpp +++ b/src/lib/md/vendor/OnixsUtils.cpp @@ -62,7 +62,7 @@ OnixsTemplLicense onixs_create_temporary_license() { LOG(md, Warn, "Licensing error. Failed to write to '{}'. Please ensure it is " "writeable.", - linfo.path); + linfo.path.string()); } } return linfo; diff --git a/src/lib/mercury/broker/Broker.cpp b/src/lib/mercury/broker/Broker.cpp index bf099e65e..5a2001be6 100644 --- a/src/lib/mercury/broker/Broker.cpp +++ b/src/lib/mercury/broker/Broker.cpp @@ -369,14 +369,13 @@ void Broker::notify( if (srec->is_local() || srec->sub_id == ex_subid) { LOG(Latency, Diag, "Started handling event {} on broker {}", - log::CharPtrWrapper{srec->topic_str}, me->my_id.value()); + std::string{srec->topic_str}, me->my_id); auto start = Timer::now(); srec->notify(payload); auto stop = Timer::now(); LOG(Latency, Diag, "Finished handling event {} on broker {}. Time: {}us", - log::CharPtrWrapper{srec->topic_str}, me->my_id.value(), - us_diff(stop, start)); + std::string{srec->topic_str}, me->my_id, us_diff(stop, start)); } } diff --git a/src/lib/mercury/common/mercury_common.h b/src/lib/mercury/common/mercury_common.h index cc744bd25..572928568 100644 --- a/src/lib/mercury/common/mercury_common.h +++ b/src/lib/mercury/common/mercury_common.h @@ -1,5 +1,6 @@ #pragma once +#include "lib/core/FMT_IMPL.h" #include "lib/mercury/common/FatWrapper.h" #include "lib/utils/ValueWrapper.h" #include @@ -30,3 +31,6 @@ using TimeStampStr = utils::ValueWrapper< } // namespace mercury } // namespace bts + +FMT_IMPL(bts::mercury::BrokerID, id, "{}", *id); +FMT_IMPL(bts::mercury::LocalSubID, id, "{}", *id); diff --git a/src/lib/mercury/topics/Topic.h b/src/lib/mercury/topics/Topic.h index 2e7745318..f6bb45664 100644 --- a/src/lib/mercury/topics/Topic.h +++ b/src/lib/mercury/topics/Topic.h @@ -1,8 +1,10 @@ #pragma once +#include "lib/core/FMT_IMPL.h" #include "lib/mercury/events/Event.h" #include "lib/mercury/topics/ITopic.h" #include "lib/utils/type_name.h" + #include #include @@ -52,3 +54,13 @@ template class Topic : public ITopic { } // namespace mercury } // namespace bts + +#define _TOPIC(...) bts::mercury::Topic<__VA_ARGS__> + +template +FMT_IMPL_T(_TOPIC(EV, true), t, "{}", t.to_str()); + +template +FMT_IMPL_T(_TOPIC(EV, false), t, "{}", t.to_str()); + +#undef _TOPIC diff --git a/src/lib/orderman/CancelOrderMsg.h b/src/lib/orderman/CancelOrderMsg.h index ab8991f57..579b61600 100644 --- a/src/lib/orderman/CancelOrderMsg.h +++ b/src/lib/orderman/CancelOrderMsg.h @@ -1,7 +1,11 @@ #pragma once + #include "lib/api/services/OrderService.pb.h" +#include "lib/core/FMT_IMPL.h" #include "lib/orderman/orderman_utils/orderman_common.h" +#include + namespace bts::orderman { struct CancelOrderMsg { @@ -20,3 +24,5 @@ inline std::ostream &operator<<(std::ostream &out, CancelOrderMsg const &msg) { } } // namespace bts::orderman + +FMT_IMPL_OSTREAM(bts::orderman::CancelOrderMsg); diff --git a/src/lib/orderman/CancelReplaceOrderMsg.h b/src/lib/orderman/CancelReplaceOrderMsg.h index f1b3936d5..6bc6ffad6 100644 --- a/src/lib/orderman/CancelReplaceOrderMsg.h +++ b/src/lib/orderman/CancelReplaceOrderMsg.h @@ -1,7 +1,11 @@ #pragma once + +#include "lib/core/FMT_IMPL.h" #include "lib/orderman/CreateOrderMsg.h" #include "lib/orderman/orderman_utils/orderman_common.h" +#include + namespace bts::orderman { struct CancelReplaceOrderMsg { @@ -17,3 +21,5 @@ inline std::ostream &operator<<( } } // namespace bts::orderman + +FMT_IMPL_OSTREAM(bts::orderman::CancelReplaceOrderMsg); diff --git a/src/lib/orderman/CreateOrderMsg.h b/src/lib/orderman/CreateOrderMsg.h index bdd05e5ee..6b30f822a 100644 --- a/src/lib/orderman/CreateOrderMsg.h +++ b/src/lib/orderman/CreateOrderMsg.h @@ -1,9 +1,13 @@ #pragma once + +#include "lib/core/FMT_IMPL.h" #include "lib/domain_model/Security.h" #include "lib/domain_model/common.h" #include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/utils/PBUtils.h" +#include + namespace bts::orderman { struct CreateOrderMsg { @@ -40,3 +44,5 @@ inline std::ostream &operator<<(std::ostream &out, CreateOrderMsg const &msg) { } } // namespace bts::orderman + +FMT_IMPL_OSTREAM(bts::orderman::CreateOrderMsg); diff --git a/src/lib/orderman/OrderMsg.h b/src/lib/orderman/OrderMsg.h index ca4d361bd..8a52cffbf 100644 --- a/src/lib/orderman/OrderMsg.h +++ b/src/lib/orderman/OrderMsg.h @@ -1,9 +1,12 @@ #pragma once + #include "lib/domain_model/Security.pb.h" #include "lib/orderman/CancelOrderMsg.h" #include "lib/orderman/CancelReplaceOrderMsg.h" #include "lib/orderman/CreateOrderMsg.h" #include "lib/orderman/RFQMsg.h" +#include "lib/utils/overloaded.h" + #include namespace bts::orderman { @@ -26,3 +29,32 @@ inline std::ostream &operator<<(std::ostream &out, OrderMsg const &msg) { return out; } } // namespace bts::orderman + +template <> +struct fmt ::formatter { + constexpr auto parse(fmt ::format_parse_context &ctx) + -> decltype(ctx.end()) { + return ctx.end(); + } + template + auto format(const bts ::orderman ::OrderMsg &m, FormatContext &ctx) const + -> decltype(ctx.out()) { + std::visit( + bts::overloaded{ + [&ctx](const bts::orderman::CreateOrderMsg &m) { + fmt::format_to(ctx.out(), "{}", m); + }, + [&ctx](const bts::orderman::CancelReplaceOrderMsg &m) { + fmt::format_to(ctx.out(), "{}", m); + }, + [&ctx](const bts::orderman::CancelOrderMsg &m) { + fmt::format_to(ctx.out(), "{}", m); + }, + [&ctx](const bts::orderman::RFQMsg &r) { + fmt::format_to(ctx.out(), "{}", r); + }, + []() {}}, + m); + return fmt::format_to(ctx.out(), "{}", m); + } +}; diff --git a/src/lib/orderman/RFQMsg.h b/src/lib/orderman/RFQMsg.h index 33ba3a80e..83fdcd185 100644 --- a/src/lib/orderman/RFQMsg.h +++ b/src/lib/orderman/RFQMsg.h @@ -1,8 +1,11 @@ #pragma once + #include "lib/api/services/OrderService.pb.h" +#include "lib/core/FMT_IMPL.h" #include "lib/domain_model/Security.pb.h" #include "lib/orderman/events/RFQEvent.h" #include "lib/orderman/orderman_utils/orderman_common.h" + #include namespace bts::orderman { @@ -13,3 +16,5 @@ struct RFQMsg { }; } // namespace bts::orderman + +FMT_IMPL(bts::orderman::RFQMsg, m, "{}", m.rfq.DebugString()); diff --git a/src/lib/orderman/actors/order_manager/OrderManager.cpp b/src/lib/orderman/actors/order_manager/OrderManager.cpp index baa5afb8c..5fce47096 100644 --- a/src/lib/orderman/actors/order_manager/OrderManager.cpp +++ b/src/lib/orderman/actors/order_manager/OrderManager.cpp @@ -642,7 +642,7 @@ void OrderManager::after_event() { LOG(Latency, Info, "entry_type:after_event channel:{} sn:{} app_arrival:{} now:{} " "delta:{}", - log::CharPtrWrapper{corid.channel}, corid.sn, + std::string{corid.channel}, corid.sn, corid.app_arrival.to_uint64(), now.to_uint64(), (now - corid.app_arrival).nanoseconds()); osd->gw->send_msgs(queued_ops, osd->current_trace); diff --git a/src/lib/orderman/ccapi/CCAPIOrderState.h b/src/lib/orderman/ccapi/CCAPIOrderState.h index c421f8f49..a693e798f 100644 --- a/src/lib/orderman/ccapi/CCAPIOrderState.h +++ b/src/lib/orderman/ccapi/CCAPIOrderState.h @@ -1,15 +1,18 @@ #pragma once #include "CCAPIOrderCallbackMsgs.h" #include "lib/api/services/OrderService.pb.h" +#include "lib/core/FMT_IMPL.h" #include "lib/domain/OrderStatus.h" #include "lib/domain_model/Security.h" #include "lib/domain_model/Security.pb.h" #include "lib/domain_model/SecurityKey.h" #include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/os/os.h" + #include #include #include +#include namespace bts::orderman { @@ -80,3 +83,5 @@ inline std::ostream &operator<<(std::ostream &out, CCAPIOrderState const &s) { } } // namespace bts::orderman + +FMT_IMPL_OSTREAM(bts::orderman::CCAPIOrderState); diff --git a/src/lib/orderman/events/RFQEvent.h b/src/lib/orderman/events/RFQEvent.h index 86ff61f07..29f2e4dca 100644 --- a/src/lib/orderman/events/RFQEvent.h +++ b/src/lib/orderman/events/RFQEvent.h @@ -1,6 +1,7 @@ #pragma once #include "lib/api/services/OrderService.pb.h" +#include "lib/core/FMT_IMPL.h" #include "lib/domain_model/Security.pb.h" #include "lib/mercury/events/Event.h" #include "lib/tracing/PerfLog.h" @@ -20,3 +21,5 @@ class RFQEvent : public mercury::Event { } // namespace orderman } // namespace bts + +FMT_IMPL(bts::orderman::RFQEvent, e, "{}", e.rfq.DebugString()); diff --git a/src/lib/orderman/gateways/GLBXiLink3ExecutionGateway.cpp b/src/lib/orderman/gateways/GLBXiLink3ExecutionGateway.cpp index 69fe37951..bb534a49a 100644 --- a/src/lib/orderman/gateways/GLBXiLink3ExecutionGateway.cpp +++ b/src/lib/orderman/gateways/GLBXiLink3ExecutionGateway.cpp @@ -4,6 +4,7 @@ #include "lib/domain_model/Security.h" #include "lib/jetfix/common/OutFIX.h" #include "lib/jetfix/store/session_name.h" +#include "lib/logging/logging.h" #include "lib/orderman/events/NewSecuritiesEvent.h" #include "lib/orderman/gateways/GLBXExecutionGateway.h" #include "lib/orderman/ilink3/IL3GW.h" @@ -25,14 +26,6 @@ struct OrderStats { size_t n_cxls = 0; }; -enum class GLBXiLink3ExecutionGateway::State { - - WAITING_FOR_SECURITIES, - PAUSED, - CONNECTING, - READY -}; - struct GLBXiLink3ExecutionGateway::PImpl { PImpl( config::JetFIX::Connection const &cfg, @@ -95,7 +88,7 @@ void GLBXiLink3ExecutionGateway::start() { void GLBXiLink3ExecutionGateway::dispatch_incoming_fix_messages() { if (me->started) { - switch (me->state) { + switch (me->state.value) { case State::WAITING_FOR_SECURITIES: break; case State::PAUSED: @@ -184,9 +177,8 @@ void GLBXiLink3ExecutionGateway::connect(jetfix::SessionName const &sn) { me->gw->subscribe_state([this](auto gw_state) { LOG(iLink3, Info, "Internal gateway state change in {}. State is now {}", - me->gw_name.value(), - log::CharPtrWrapper{ilink3::state_string(gw_state)}); - switch (me->state) { + me->gw_name.value(), gw_state); + switch (me->state.value) { case State::CONNECTING: if (gw_state == ilink3::State::READY) { transition(State::READY); @@ -265,7 +257,7 @@ void GLBXiLink3ExecutionGateway::send_msgs( auto cancel_replace_ptr = std::get_if(&m); if (cancel_replace_ptr) { LOG(Latency, Info, "Cancel Replace. CorID:{}.{} Order:{}", - log::CharPtrWrapper{corid.channel}, corid.sn, + std::string{corid.channel}, corid.sn, cancel_replace_ptr->exchange_order_id); me->gw->send_cancel_replace(*cancel_replace_ptr, corid); @@ -310,24 +302,9 @@ GLBXiLink3ExecutionGateway::on_exchange_open_orders() { return me->on_exchange_open_orders; } -log::CharPtrWrapper GLBXiLink3ExecutionGateway::state_name(State st) { - switch (st) { - case State::WAITING_FOR_SECURITIES: - return {"WAITING_FOR_SECURITIES"}; - case State::PAUSED: - return {"PAUSED"}; - case State::CONNECTING: - return {"CONNECTING"}; - case State::READY: - return {"READY"}; - } - bts_assert(false); - return {""}; -} - void GLBXiLink3ExecutionGateway::transition(State new_state) { LOG(iLink3, Info, "Transitioning {} from {} to {}", me->gw_name.value(), - state_name(me->state), state_name(new_state)); + me->state, new_state); me->state = new_state; } diff --git a/src/lib/orderman/gateways/GLBXiLink3ExecutionGateway.h b/src/lib/orderman/gateways/GLBXiLink3ExecutionGateway.h index 26438dde2..32da66a94 100644 --- a/src/lib/orderman/gateways/GLBXiLink3ExecutionGateway.h +++ b/src/lib/orderman/gateways/GLBXiLink3ExecutionGateway.h @@ -1,7 +1,7 @@ #pragma once #include "IExecutionGateway.h" -#include "lib/logging/logging.h" +#include "lib/orderman/gateways/GLBXiLink3ExecutionGatewayState.h" namespace bts { namespace jetfix { @@ -36,7 +36,7 @@ class GLBXiLink3ExecutionGateway : public IExecutionGateway { OnExchangeOpenOrdersState &on_exchange_open_orders() override; private: - enum class State; + using State = GLBXiLink3ExecutionGatewayState; struct PImpl; std::unique_ptr me; @@ -44,7 +44,6 @@ class GLBXiLink3ExecutionGateway : public IExecutionGateway { void on_time(); bool pause_in_effect() const; bool max_failures_reached() const; - static log::CharPtrWrapper state_name(State); void transition(State); void pause(); diff --git a/src/lib/orderman/gateways/GLBXiLink3ExecutionGatewayState.h b/src/lib/orderman/gateways/GLBXiLink3ExecutionGatewayState.h new file mode 100644 index 000000000..06a79db83 --- /dev/null +++ b/src/lib/orderman/gateways/GLBXiLink3ExecutionGatewayState.h @@ -0,0 +1,32 @@ +#pragma once +#ifdef SPARK_ENABLE_CCAPI + +#include "lib/core/EnumMacros.h" +#include "lib/core/FMT_IMPL.h" + +#include +#include +#include +#include + +namespace bts::orderman::ilink3 { + +// clang-format off +#define FOR_EACH_GLBX_ILINK3_EXECUTION_GATEWAY_STATE(per_value) \ + per_value(GLBXiLink3ExecutionGatewayState, WAITING_FOR_SECURITIES) \ + per_value(GLBXiLink3ExecutionGatewayState, PAUSED) \ + per_value(GLBXiLink3ExecutionGatewayState, CONNECTING) \ + per_value(GLBXiLink3ExecutionGatewayState, READY) +// clang-format on + +ENUM_CLASS_DEF( + GLBXiLink3ExecutionGatewayState, + FOR_EACH_GLBX_ILINK3_EXECUTION_GATEWAY_STATE) + +#undef FOR_EACH_GLBX_ILINK3_EXECUTION_GATEWAY_STATE + +} // namespace bts::orderman::ilink3 +#endif + +FMT_IMPL( + bts::orderman::ilink3::GLBXiLink3ExecutionGatewayState, s, "{}", s.name()); diff --git a/src/lib/orderman/ilink3/IL3GW.cpp b/src/lib/orderman/ilink3/IL3GW.cpp index a8f28da10..fdebb43d2 100644 --- a/src/lib/orderman/ilink3/IL3GW.cpp +++ b/src/lib/orderman/ilink3/IL3GW.cpp @@ -35,7 +35,7 @@ namespace bts { namespace orderman { namespace ilink3 { -log::CharPtrWrapper wrap(const char *str) { return log::CharPtrWrapper{str}; } +using std::string; IL3GW::IL3GW( IL3Connection &con, @@ -254,11 +254,9 @@ void IL3GW::send_order( _current_corid = corid; auto now = utils::TimeStamp::now(); LOG(Latency, Info, - "entry_type:send_order channel:{} sn:{} app_arrival:{} now:{} " - "delta:{}", - log::CharPtrWrapper{corid.channel}, corid.sn, - corid.app_arrival.to_uint64(), now.to_uint64(), - (now - corid.app_arrival).nanoseconds()); + "entry_type:send_order channel:{} sn:{} app_arrival:{} now:{} delta:{}", + string{corid.channel}, corid.sn, corid.app_arrival.to_uint64(), + now.to_uint64(), (now - corid.app_arrival).nanoseconds()); bts_assert_d(create.routing_record); bts_assert_d(create.security); bts_assert_d(create.security->has_glbx()); @@ -437,31 +435,9 @@ void IL3GW::flush(bool publish) { publish_session_update(); } -const char *state_string(State s) { - switch (s) { - case State::INIT: - return "INIT"; - case State::CONNECTING: - return "CONNECTING"; - case State::NEGOTIATING: - return "NEGOTIATING"; - case State::ESTABLISHING: - return "ESTABLISHING"; - case State::RETRANSMITTING: - return "RETRANSMITTING"; - case State::READY: - return "READY"; - case State::ERROR: - return "ERROR"; - } - return "UNKNOWN"; -} -log::CharPtrWrapper wstate_string(State s) { return wrap(state_string(s)); } - void IL3GW::set_state(State s) { if (s != _x_state) { - LOG(iLink3, Info, "ILinkGW {}: {}->{}", _session.uuid, - wstate_string(_x_state), wstate_string(s)); + LOG(iLink3, Info, "ILinkGW {}: {}->{}", _session.uuid, _x_state, s); _x_state = s; if (_on_state_change) _on_state_change(s); @@ -627,8 +603,8 @@ void IL3GW::handle(const iLinkBinary::Sequence506 &msg) { void IL3GW::handle(const iLinkBinary::Terminate507 &msg) { // https://www.cmegroup.com/confluence/display/EPICSANDBOX/Terminate LOG(iLink3, Error, "Terminated by exchange. Code: {} Reason: {} Text: {}", - msg.errorCodes(), wrap(msg.reason()), - wrap(translate_terminate(msg.errorCodes()))); + msg.errorCodes(), std::string{msg.reason()}, + std::string{translate_terminate(msg.errorCodes())}); if (msg.errorCodes() == 11 || msg.errorCodes() == 10) { // This indicates our sequence number is too low. We will jump // forward one at a time. That should eventually fix it. @@ -662,7 +638,7 @@ void IL3GW::handle( } void IL3GW::handle(const iLinkBinary::BusinessReject521 &msg) { LOG(iLink3, Error, "Business Reject: {} '{}'.", msg.businessRejectReason(), - wrap(translate_business_reject_reason(msg.businessRejectReason()))); + string{translate_business_reject_reason(msg.businessRejectReason())}); handle_common(msg); // A business reject can de-sync the sequence number because it rejects // the sequence number of the rejected message. Send a sequence message @@ -674,7 +650,7 @@ void IL3GW::handle(const iLinkBinary::ExecutionReportNew522 &msg) { handle_exe_report(msg); } void IL3GW::handle(const iLinkBinary::ExecutionReportReject523 &msg) { - LOG(iLink3, Error, "Execution report reject: {}", wrap(msg.text())); + LOG(iLink3, Error, "Execution report reject: {}", string{msg.text()}); handle_exe_report(msg); } void IL3GW::handle(const iLinkBinary::ExecutionReportElimination524 &msg) { diff --git a/src/lib/orderman/ilink3/IL3GW.h b/src/lib/orderman/ilink3/IL3GW.h index fcf787d7f..e73983bc9 100644 --- a/src/lib/orderman/ilink3/IL3GW.h +++ b/src/lib/orderman/ilink3/IL3GW.h @@ -6,6 +6,7 @@ #include "TimeKeeper.h" #include "generated/MessageHeader.h" #include "lib/config/protos/jetfix.pb.h" +#include "lib/orderman/ilink3/IL3State.h" #include "lib/orderman/ilink3/RawMsg.h" #include "lib/orderman/gateways/IExecutionGateway.h" #include "lib/orderman/orderman_utils/CancelReject.h" @@ -42,16 +43,8 @@ struct Config { raw_message_logger; }; -enum class State { - INIT, - CONNECTING, - NEGOTIATING, - ESTABLISHING, - RETRANSMITTING, - READY, - ERROR -}; -const char *state_string(State s); +using State = IL3State; + typedef std::function OnStateChange; typedef std::function OnExecutionReport; typedef std::function OnSessionChange; diff --git a/src/lib/orderman/ilink3/IL3Reactor.cpp b/src/lib/orderman/ilink3/IL3Reactor.cpp index 8b0df2ff6..1f459df2d 100644 --- a/src/lib/orderman/ilink3/IL3Reactor.cpp +++ b/src/lib/orderman/ilink3/IL3Reactor.cpp @@ -130,7 +130,7 @@ struct IL3Reactor::Connection : public IL3Connection { LOG(Latency, Info, "entry_type:socket_write channel:{} sn:{} app_arrival:{} now:{} " "delta:{}", - log::CharPtrWrapper{corid.channel}, corid.sn, + std::string{corid.channel}, corid.sn, corid.app_arrival.to_uint64(), before_write.to_uint64(), (before_write - corid.app_arrival).nanoseconds()); diff --git a/src/lib/orderman/ilink3/IL3State.h b/src/lib/orderman/ilink3/IL3State.h new file mode 100644 index 000000000..fdb5c7524 --- /dev/null +++ b/src/lib/orderman/ilink3/IL3State.h @@ -0,0 +1,32 @@ +#pragma once +#ifdef SPARK_ENABLE_CCAPI + +#include "lib/core/EnumMacros.h" +#include "lib/core/FMT_IMPL.h" + +#include +#include +#include +#include + +namespace bts::orderman::ilink3 { + +// clang-format off +#define FOR_EACH_IL3_STATE(per_value) \ + per_value(IL3State, INIT) \ + per_value(IL3State, CONNECTING) \ + per_value(IL3State, NEGOTIATING) \ + per_value(IL3State, ESTABLISHING) \ + per_value(IL3State, RETRANSMITTING) \ + per_value(IL3State, READY) \ + per_value(IL3State, ERROR) +// clang-format on + +ENUM_CLASS_DEF(IL3State, FOR_EACH_IL3_STATE) + +#undef FOR_EACH_IL3_STATE + +} // namespace bts::orderman::ilink3 +#endif + +FMT_IMPL(bts::orderman::ilink3::IL3State, s, "{}", s.name()); diff --git a/src/lib/orderman/orderman_utils/orderman_common.h b/src/lib/orderman/orderman_utils/orderman_common.h index ac4d53fa4..c6cc71cb0 100644 --- a/src/lib/orderman/orderman_utils/orderman_common.h +++ b/src/lib/orderman/orderman_utils/orderman_common.h @@ -8,6 +8,7 @@ #include #include "lib/api/services/OrderService.pb.h" +#include "lib/core/FMT_IMPL.h" #include "lib/domain_model/common.h" #include "lib/utils/ValueWrapper.h" #include "lib/utils/bts_assert.h" @@ -281,3 +282,8 @@ inline Quantity get_update_quantity(const bts::api::orderman::Update &u) { } // namespace orderman } // namespace bts + +FMT_IMPL(bts::orderman::AccountID, id, "{}", *id); +FMT_IMPL(bts::orderman::ExchangeOrderID64, id, "{}", *id); +FMT_IMPL(bts::orderman::GatewayName, n, "{}", *n); +FMT_IMPL(bts::orderman::OrderKey, k, "{}", *k); diff --git a/src/lib/orderman/orders/GLBXNativeOrder.cpp b/src/lib/orderman/orders/GLBXNativeOrder.cpp index eec55604b..0f682a914 100644 --- a/src/lib/orderman/orders/GLBXNativeOrder.cpp +++ b/src/lib/orderman/orders/GLBXNativeOrder.cpp @@ -27,6 +27,8 @@ namespace orderman { using namespace api::orderman; +using std::string; + OrderStatus map_external_status(NativeOrderStatus); bool use_ilink3(std::string const &for_session) { @@ -458,9 +460,8 @@ OrderOpResult GLBXNativeOrder::on_activate( LOG(Latency, Info, "entry_type:on_activate_1 channel:{} sn:{} app_arrival:{} now:{} " "delta:{}", - log::CharPtrWrapper{corid.channel}, corid.sn, - corid.app_arrival.to_uint64(), now.to_uint64(), - (now - corid.app_arrival).nanoseconds()); + string{corid.channel}, corid.sn, corid.app_arrival.to_uint64(), + now.to_uint64(), (now - corid.app_arrival).nanoseconds()); result = _on_activate(Warn, Info, p, q, services); if (result.ok()) { @@ -468,9 +469,8 @@ OrderOpResult GLBXNativeOrder::on_activate( LOG(Latency, Info, "entry_type:on_activate_2 channel:{} sn:{} app_arrival:{} now:{} " "delta:{}", - log::CharPtrWrapper{corid.channel}, corid.sn, - corid.app_arrival.to_uint64(), now.to_uint64(), - (now - corid.app_arrival).nanoseconds()); + string{corid.channel}, corid.sn, corid.app_arrival.to_uint64(), + now.to_uint64(), (now - corid.app_arrival).nanoseconds()); me->encoder->send_create(*me->services, *me->session_services); me->services->governor(*me->session_services).record_sent(); @@ -1264,8 +1264,8 @@ bool GLBXNativeOrder::terminal_state(api::orderman::OrderStatus status) const { return false; } -api::orderman::NativeOrderState & -GLBXNativeOrder::get_native_state(api::orderman::OrderState &st) { +api::orderman::NativeOrderState &GLBXNativeOrder::get_native_state( + api::orderman::OrderState &st) { switch (st.custom_case()) { case OrderState::kMarket: return *st.mutable_market()->mutable_native_state(); diff --git a/src/lib/orderman/orders/TriggerOrder.cpp b/src/lib/orderman/orders/TriggerOrder.cpp index c8cfa491f..47c24741a 100644 --- a/src/lib/orderman/orders/TriggerOrder.cpp +++ b/src/lib/orderman/orders/TriggerOrder.cpp @@ -1,4 +1,5 @@ #include "TriggerOrder.h" +#include "lib/api/services/OrderService.h" #include "lib/domain_model/Security.h" #include "lib/logging/logging.h" #include "lib/orderman/OrderBuilder.h" @@ -62,7 +63,7 @@ void TriggerOrder::on_init_new( const PreActivationOrderServices &pre_os) { LOG(OrderMan, Info, "TriggerOrder::on_init_new key:{} state:{}", key(), _state); - switch (_state) { + switch (_state.value) { case State::START: me->is_succ_inited = _on_init_new(order_def, pre_os); break; @@ -81,7 +82,7 @@ void TriggerOrder::on_init_recovered( const PreActivationOrderServices &pre_os) { LOG(OrderMan, Info, "TriggerOrder::on_init_recovered key:{} state:{}", key(), _state); - switch (_state) { + switch (_state.value) { case State::START: me->is_succ_inited = _on_init_new(rec.def(), pre_os); // get the state from what was recovered (we will only use @@ -109,7 +110,7 @@ TriggerOrder::on_activate(Price price, Quantity qty, OrderServices &services) { LOG(OrderMan, Info, "TriggerOrder::on_activate key:{} state:{} price:{} qty:{}", key(), _state, price, qty); - switch (_state) { + switch (_state.value) { case State::START: me->services = &services; me->state.set_price(price.value()); @@ -150,7 +151,7 @@ OrderOpResult TriggerOrder::on_update(Price price, Quantity qty) { LOG(OrderMan, Info, "TriggerOrder::on_update key:{} state:{} price:{} qty:{}", key(), _state, price, qty); - switch (_state) { + switch (_state.value) { case State::START: me->state.set_price(price.value()); me->state.set_quantity(qty.value()); @@ -177,7 +178,7 @@ OrderOpResult TriggerOrder::on_cancel() { LOG(OrderMan, Info, "TriggerOrder::on_cancel key:{} state:{}", key(), _state); me->cancel_mode = CancelMode::external; - switch (_state) { + switch (_state.value) { case State::START: _switch_state(State::END); break; @@ -200,7 +201,7 @@ OrderOpResult TriggerOrder::on_cancel() { return OrderOpResult{}; } void TriggerOrder::_on_book_update(const BookUpdateEvent &b_event) { - switch (_state) { + switch (_state.value) { case State::START: break; case State::WAITING_FOR_TRIGGER: @@ -227,7 +228,7 @@ void TriggerOrder::_on_child_order_update(const OrderStateUpdateEvent &o_ev) { if (o_ev.key == me->child_order.key()) { auto ev_state = o_ev.rebuild_state(); me->child_state = ev_state; - switch (_state) { + switch (_state.value) { case State::START: case State::WAITING_FOR_TRIGGER: bts_assert(false); @@ -251,7 +252,7 @@ void TriggerOrder::_on_child_order_update(const OrderStateUpdateEvent &o_ev) { } } void TriggerOrder::_on_time(const bts::mercury::TimerEvent &) { - switch (_state) { + switch (_state.value) { case State::START: case State::WAITING_FOR_TRIGGER: case State::WAITING_FOR_FIRST_ACK: @@ -342,7 +343,7 @@ void TriggerOrder::_report_state() { } } void TriggerOrder::_switch_state(State new_state) { - switch (new_state) { + switch (new_state.value) { case State::START: break; case State::WAITING_FOR_TRIGGER: @@ -415,7 +416,7 @@ void TriggerOrder::_analyze_trigger_and_cancel() { } } api::orderman::OrderStatus TriggerOrder::_status() const { - switch (_state) { + switch (_state.value) { // will only be called once the order // has been activated case State::START: @@ -440,7 +441,7 @@ api::orderman::OrderStatus TriggerOrder::_status() const { return api::orderman::OrderStatus::ORDER_STATUS_COMPLETED; else if (SpreaderUtils::order_in_cancelled_state( me->child_state.status())) { - switch (me->cancel_mode) { + switch (me->cancel_mode.value) { case CancelMode::none: // this means an unscolicted child cxl case CancelMode::external: return api::orderman::OrderStatus::ORDER_STATUS_CANCELED; diff --git a/src/lib/orderman/orders/TriggerOrder.h b/src/lib/orderman/orders/TriggerOrder.h index 7e5f70c01..c9741ec48 100644 --- a/src/lib/orderman/orders/TriggerOrder.h +++ b/src/lib/orderman/orders/TriggerOrder.h @@ -2,6 +2,8 @@ #include "lib/api/services/OrderService.server.pb.h" #include "lib/orderman/orders/Order.h" +#include "lib/orderman/orders/TriggerOrderCancelMode.h" +#include "lib/orderman/orders/TriggerOrderState.h" #include namespace bts { @@ -24,34 +26,8 @@ class PreActivationOrderServices; class TriggerOrder : public Order { private: - enum State { - // remains here till on_actiavte is called - START = 0, - // waiting for trigger conditions, sends - // order and waits to steady - WAITING_FOR_TRIGGER = 1, - // once the order is submitted it gets into - // this state until getting a callback - // from the child order - WAITING_FOR_FIRST_ACK = 2, - // order is out - STEADY = 3, - END = 4 - }; - // this is the ways a child order - // can be cancelled - enum CancelMode { - // not cancelled, initial value - none = 0, - // meaning the trigger order - // cancelled the child order because - // of time or conditional reasons - trigger, - // the trigger order is itself - // externally cancelled - // through the cancel call - external - }; + using State = TriggerOrderState; + using CancelMode = TriggerOrderCancelMode; public: TriggerOrder(); diff --git a/src/lib/orderman/orders/TriggerOrderCancelMode.h b/src/lib/orderman/orders/TriggerOrderCancelMode.h new file mode 100644 index 000000000..e6ad9d56e --- /dev/null +++ b/src/lib/orderman/orders/TriggerOrderCancelMode.h @@ -0,0 +1,34 @@ +#pragma once + +#include "lib/core/EnumMacros.h" +#include "lib/core/FMT_IMPL.h" + +#include +#include +#include +#include + +namespace bts::orderman { + +// clang-format off +#define FOR_ALL_VALUES(per_value) \ + /* not cancelled, initial value */ \ + per_value(TriggerOrderCancelMode, none) \ + /* meaning the trigger order cancelled the child order because of time */ \ + /* or conditional reasons */ \ + per_value(TriggerOrderCancelMode, trigger) \ + /* the trigger order is itself externally cancelled through the cancel */ \ + /* call */ \ + per_value(TriggerOrderCancelMode, external) +// clang-format on + +/** + * @brief Represents the ways a TriggerOrder child order can be cancelled + */ +ENUM_CLASS_DEF(TriggerOrderCancelMode, FOR_ALL_VALUES) + +#undef FOR_ALL_VALUES + +} // namespace bts::orderman + +FMT_IMPL(bts::orderman::TriggerOrderCancelMode, cm, "{}", cm.name()); diff --git a/src/lib/orderman/orders/TriggerOrderState.h b/src/lib/orderman/orders/TriggerOrderState.h new file mode 100644 index 000000000..53afdb4aa --- /dev/null +++ b/src/lib/orderman/orders/TriggerOrderState.h @@ -0,0 +1,33 @@ +#pragma once + +#include "lib/core/EnumMacros.h" +#include "lib/core/FMT_IMPL.h" + +#include +#include +#include +#include + +namespace bts::orderman { + +// clang-format off +#define FOR_EACH_TRIGGER_ORDER_STATE(per_value) \ + /* remains here till on_actiavte is called */ \ + per_value(TriggerOrderState, START) \ + /* waiting for trigger conditions, sends order and waits to steady */ \ + per_value(TriggerOrderState, WAITING_FOR_TRIGGER) \ + /* once the order is submitted it gets into this state until getting a */ \ + /* callback from the child order */ \ + per_value(TriggerOrderState, WAITING_FOR_FIRST_ACK) \ + /* order is out */ \ + per_value(TriggerOrderState, STEADY) \ + per_value(TriggerOrderState, END) +// clang-format on + +ENUM_CLASS_DEF(TriggerOrderState, FOR_EACH_TRIGGER_ORDER_STATE) + +#undef FOR_EACH_TRIGGER_ORDER_STATE + +} // namespace bts::orderman + +FMT_IMPL(bts::orderman::TriggerOrderState, s, "{}", s.name()); diff --git a/src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp b/src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp index 3ab3d950a..27d45f7b6 100644 --- a/src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp +++ b/src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp @@ -1129,7 +1129,7 @@ bool AlgoWrapperOrder::is_working() const { return me->status == Status::WORKING; } -log::CharPtrWrapper AlgoWrapperOrder::state_name(Status st) { +std::string AlgoWrapperOrder::state_name(Status st) { switch (st) { case Status::COMPLETED: return {"COMPLETED"}; diff --git a/src/lib/orderman/orders/algo/AlgoWrapperOrder.h b/src/lib/orderman/orders/algo/AlgoWrapperOrder.h index fb325da7b..441cea7a9 100644 --- a/src/lib/orderman/orders/algo/AlgoWrapperOrder.h +++ b/src/lib/orderman/orders/algo/AlgoWrapperOrder.h @@ -105,7 +105,7 @@ class AlgoWrapperOrder : public Order, private IAlgoServices { OrderKey index_and_launch_child(ChildOrder &&, Price, Quantity, bool); bool is_working() const; size_t working_children_count() const; - log::CharPtrWrapper state_name(Status); + std::string state_name(Status); ChildStatus map_child_status(api::orderman::OrderStatus); bool _is_attaching(api::orderman::OrderDefinition const &) const; }; diff --git a/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.cpp index 5f406e902..6b4fd4daa 100644 --- a/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.cpp @@ -10,6 +10,8 @@ namespace orderman { using namespace api::orderman; +using std::string; + enum class CoverAlgo::Status { WORKING, WAITING_FOR_HEDGES, DONE, CANCELING }; struct CoverAlgo::PImpl { @@ -262,8 +264,7 @@ void CoverAlgo::update_definition( void CoverAlgo::terminate_if_hedges_complete() { LOG(OrderMan, Diag, "CoverAlgo {} check_terminate. State: {} Hedge count: {}", - algo().order_key(), log::CharPtrWrapper{status_name(me->status)}, - me->hedges.size()); + algo().order_key(), string{status_name(me->status)}, me->hedges.size()); if (me->status == Status::WAITING_FOR_HEDGES && me->hedges.empty()) { LOG(OrderMan, Info, "CoverAlgo {}. Last hedge completed, terminating", diff --git a/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.cpp index 9b2599924..6f9233955 100644 --- a/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.cpp @@ -13,6 +13,8 @@ namespace orderman { using namespace api::orderman; +using std::string; + enum class ProRataAlgo::Status { WAITING_FOR_MD, WORKING, @@ -373,8 +375,7 @@ void ProRataAlgo::set_parameters( void ProRataAlgo::check_terminate() { LOG(OrderMan, Diag, "ProRataAlgo {} check_terminate. State: {} Hedge count: {}", - algo().order_key(), log::CharPtrWrapper{status_name(me->status)}, - me->hedges.size()); + algo().order_key(), string{status_name(me->status)}, me->hedges.size()); if (me->status == Status::DONE_WORKING && me->hedges.empty() && me->overfill_hedges.empty()) { diff --git a/src/lib/orderman/orders/algo/algo_orders/SniperAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/SniperAlgo.cpp index 92a0ec95b..0bc33ee0f 100644 --- a/src/lib/orderman/orders/algo/algo_orders/SniperAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/SniperAlgo.cpp @@ -30,6 +30,8 @@ using namespace google::protobuf; using namespace boost; using namespace google::protobuf::util; +using std::string; + enum class SniperAlgo::FireImpetus { Book = 0, Lookahead = 1, OrderUpdate = 2, Time = 3 }; struct SniperAlgo::PImpl { @@ -303,9 +305,8 @@ void SniperAlgo::on_trade_summary_signal( LOG(Latency, Info, "entry_type:SniperAlgo::on_trade_signal channel:{} sn:{} " "app_arrival:{} now:{} delta:{}", - log::CharPtrWrapper{corid.channel}, corid.sn, - corid.app_arrival.to_uint64(), ts_now.to_uint64(), - (ts_now - corid.app_arrival).nanoseconds()); + string{corid.channel}, corid.sn, corid.app_arrival.to_uint64(), + ts_now.to_uint64(), (ts_now - corid.app_arrival).nanoseconds()); auto it = me->sec_map.find(key); bts_assert(it != me->sec_map.end()); auto &sec_data = it->second; diff --git a/src/lib/orderman/orders/algo/algo_orders/SniperAlgoCommon.h b/src/lib/orderman/orders/algo/algo_orders/SniperAlgoCommon.h index ba4aeaf6b..11b217d11 100644 --- a/src/lib/orderman/orders/algo/algo_orders/SniperAlgoCommon.h +++ b/src/lib/orderman/orders/algo/algo_orders/SniperAlgoCommon.h @@ -30,6 +30,8 @@ namespace orderman { //using namespace api::orderman; //using namespace google::protobuf; +using std::string; + // main types ///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// @@ -439,7 +441,7 @@ void log_perf_compute(trace::CorID corid){ LOG(Latency, Info, "entry_type:SniperAlgo::compute channel:{} sn:{} " "app_arrival:{} now:{} delta:{}", - log::CharPtrWrapper{corid.channel}, corid.sn, + string{corid.channel}, corid.sn, corid.app_arrival.to_uint64(), ts_now.to_uint64(), (ts_now - corid.app_arrival).nanoseconds()); } @@ -449,9 +451,8 @@ void log_lookahead_fire(trace::CorID corid){ LOG(Latency, Info, "entry_type:SniperAlgo::fire channel:{} sn:{} " "app_arrival:{} now:{} delta:{}", - log::CharPtrWrapper{corid.channel}, corid.sn, - corid.app_arrival.to_uint64(), ts_now.to_uint64(), - (ts_now - corid.app_arrival).nanoseconds()); + string{corid.channel}, corid.sn, corid.app_arrival.to_uint64(), + ts_now.to_uint64(), (ts_now - corid.app_arrival).nanoseconds()); } void log_polygon_state(SniperPolygon& p, bool log_legs = true){ @@ -592,4 +593,4 @@ void validate_zero_net_position(const SniperPolygon& p){ bts_assert(kv.second == 0); } -}} \ No newline at end of file +}} diff --git a/src/lib/orderman/orders/book_algos/BookOrderBase.cpp b/src/lib/orderman/orders/book_algos/BookOrderBase.cpp index d6fc9d5bc..d22ae6c1a 100644 --- a/src/lib/orderman/orders/book_algos/BookOrderBase.cpp +++ b/src/lib/orderman/orders/book_algos/BookOrderBase.cpp @@ -734,7 +734,7 @@ void BookOrderBase::launch_child( me->child.activate(Price(me->state.price()), Quantity(me->state.quantity())); } -log::CharPtrWrapper BookOrderBase::state_name(InternalStatus st) { +std::string BookOrderBase::state_name(InternalStatus st) { switch (st) { case InternalStatus::W_MD: return {"W_MD"}; diff --git a/src/lib/orderman/orders/book_algos/BookOrderBase.h b/src/lib/orderman/orders/book_algos/BookOrderBase.h index e6b819c85..4086aec5c 100644 --- a/src/lib/orderman/orders/book_algos/BookOrderBase.h +++ b/src/lib/orderman/orders/book_algos/BookOrderBase.h @@ -80,7 +80,7 @@ class BookOrderBase : public Order { ChildOrder const &, api::orderman::OrderDefinition const &, api::orderman::OrderState const &); - log::CharPtrWrapper state_name(InternalStatus); + std::string state_name(InternalStatus); void terminate_error(std::string const &msg); void terminate(api::orderman::OrderStatus, std::string const &error = ""); void check_invariants(); diff --git a/src/lib/orderman/orders/queue_holder/QueueHolderOrder.cpp b/src/lib/orderman/orders/queue_holder/QueueHolderOrder.cpp index b78185142..372741e9d 100644 --- a/src/lib/orderman/orders/queue_holder/QueueHolderOrder.cpp +++ b/src/lib/orderman/orders/queue_holder/QueueHolderOrder.cpp @@ -1,4 +1,5 @@ #include "QueueHolderOrder.h" +#include "lib/api/services/OrderService.h" #include "lib/domain_model/Security.h" #include "lib/logging/logging.h" #include "lib/orderman/OrderBuilder.h" @@ -68,8 +69,8 @@ void QueueHolderOrder::_on_book_update(const BookUpdateEvent &b) { } void QueueHolderOrder::_on_child_order_update(const OrderStateUpdateEvent &c) { LOG(OrderMan, Diag, - "QueueHolderOrder::_on_child_order_update key:{} state:{} " - "order_key:{} order_state:{}", + "QueueHolderOrder::_on_child_order_update key:{} state:{} order_key:{} " + "order_state:{}", key(), _state_int(), c.key, c.status); _state_worker->on_child_order_update(c); _report_state(); @@ -113,8 +114,8 @@ void QueueHolderOrder::_switch_state(QueueHolderOrderState new_state) { LOG(OrderMan, Info, "QueueHolderOrder::_switch_state key:{} {}->{}", key(), s0, _state_int()); } -api::orderman::OrderStatus -QueueHolderOrder::_status(std::string &message) const { +api::orderman::OrderStatus QueueHolderOrder::_status( + std::string &message) const { QueueHolderOrderState curr_state = _state_worker == nullptr ? QueueHolderOrderState::START : _state(); switch (curr_state) { diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h index 9f9ff48b4..e03dc11c4 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/api/services/OrderService.pb.h" +#include "lib/api/services/OrderService.h" #include "lib/domain_model/Security.pb.h" #include "lib/logging/logging.h" #include "lib/mercury/events/TimerEvent.h" @@ -186,10 +186,9 @@ class SpreaderOrder : public Order, public ISpreaderManager { ChildOrderError order_error = _get_order_error(ord_ev, leg_data.quoter().expecting_cancel_update()); LOG(OrderMan, _cw_helper.llevel, - "SpreaderOrder::_on_child_order_update quoter order " - "key:{} state:{} order_key:{} status:{} " - "filled_qty:{} price:{} last_price:{} " - "msg:{} child_order_error:{}", + "SpreaderOrder::_on_child_order_update quoter order key:{} state:{} " + "order_key:{} status:{} filled_qty:{} price:{} last_price:{} msg:{} " + "child_order_error:{}", key(), static_cast(_state_worker->state()), ord_ev.key, ord_ev.status, ord_ev.filled_quantity, ord_ev.price, ord_ev.last_price, ord_ev.last_msg, static_cast(order_error)); diff --git a/src/lib/plugin/plugin.cpp b/src/lib/plugin/plugin.cpp index b255bbcfe..30d85cc8f 100644 --- a/src/lib/plugin/plugin.cpp +++ b/src/lib/plugin/plugin.cpp @@ -62,7 +62,7 @@ void init_plugins(SparkServices &services) { } catch (boost::system::system_error const &e) { LOG(Plugin, Error, "Failed to initialize plugin {}. Error: {} (OS error code: {})", - pl, std::string(e.what()), e.code()); + pl, std::string(e.what()), e.code().value()); } } } diff --git a/src/lib/utils/SharedMemory.cpp b/src/lib/utils/SharedMemory.cpp index 88a7c0173..ea1c8d8d1 100644 --- a/src/lib/utils/SharedMemory.cpp +++ b/src/lib/utils/SharedMemory.cpp @@ -87,7 +87,7 @@ struct BoostLowLevelSharedMemoryImpl { LOG(md, Error, "SharedMemory::create interprocess_exception what: {} error_code: " "{} native_error: {}", - std::string(ex.what()), ex.get_error_code(), + std::string(ex.what()), static_cast(ex.get_error_code()), ex.get_native_error()); return make_segment(0, nullptr); } catch (...) { diff --git a/src/lib/utils/ValueWrapper.h b/src/lib/utils/ValueWrapper.h index 64a71a2eb..e8dda75ab 100644 --- a/src/lib/utils/ValueWrapper.h +++ b/src/lib/utils/ValueWrapper.h @@ -1,4 +1,5 @@ #pragma once + #include #include @@ -107,6 +108,29 @@ BIN_OP(bool, <=) #undef BIN_OP +template +V &operator*(ValueWrapper &v); + +template +const V &operator*(const ValueWrapper &v); + +template +std::ostream &operator<<(std::ostream &s, ValueWrapper const &v); + +////////////////////////////////////////////////// +// Definition +////////////////////////////////////////////////// + +template +V &operator*(ValueWrapper &v) { + return v.value(); +} + +template +const V &operator*(const ValueWrapper &v) { + return v.value(); +} + template std::ostream &operator<<(std::ostream &s, ValueWrapper const &v) { s << v.value(); diff --git a/src/lib/utils/sftp.cpp b/src/lib/utils/sftp.cpp index 5d8817bea..f8d5a95f3 100644 --- a/src/lib/utils/sftp.cpp +++ b/src/lib/utils/sftp.cpp @@ -159,7 +159,7 @@ DownloadResult sftp_download( std::ofstream out{temp.string()}; if (out.bad()) { return DownloadFailure{ - fmt::format("Failed to open temp file '{}'", temp)}; + fmt::format("Failed to open temp file '{}'", temp.string())}; } do { diff --git a/src/server/sparkd/cmds/crypto/DeribitDemoConfiguration.cpp b/src/server/sparkd/cmds/crypto/DeribitDemoConfiguration.cpp index 7930b60d1..3051b4551 100644 --- a/src/server/sparkd/cmds/crypto/DeribitDemoConfiguration.cpp +++ b/src/server/sparkd/cmds/crypto/DeribitDemoConfiguration.cpp @@ -143,7 +143,8 @@ std::optional DeribitDemoConfiguration::read_file( rapidjson::Document doc{}; auto &res = doc.ParseStream(isw); if (res.HasParseError()) { - LOG(md, Error, "Error in parsing config from {}: {}", config_path, res.GetParseError()); + LOG(md, Error, "Error in parsing config from {}: {}", config_path, + static_cast(res.GetParseError())); return std::nullopt; } diff --git a/src/server/sparkd/cmds/crypto/DeribitDemoConfiguration.h b/src/server/sparkd/cmds/crypto/DeribitDemoConfiguration.h index 52eb4557a..46ac86f0a 100644 --- a/src/server/sparkd/cmds/crypto/DeribitDemoConfiguration.h +++ b/src/server/sparkd/cmds/crypto/DeribitDemoConfiguration.h @@ -1,9 +1,13 @@ #pragma once + +#include "lib/core/FMT_IMPL.h" + #include #include #include #include #include +#include #include namespace bts::cmds { @@ -46,3 +50,5 @@ inline std::ostream &operator<<( } } // namespace bts::cmds + +FMT_IMPL_OSTREAM(bts::cmds::DeribitDemoConfiguration); diff --git a/src/server/sparkd/cmds/md/cmds/Cleanup.cpp b/src/server/sparkd/cmds/md/cmds/Cleanup.cpp index 27e8cc48c..6ce9494c7 100644 --- a/src/server/sparkd/cmds/md/cmds/Cleanup.cpp +++ b/src/server/sparkd/cmds/md/cmds/Cleanup.cpp @@ -24,7 +24,7 @@ void clean_dir(std::string base_path) { boost::system::error_code err; fs::remove(dir_iter->path(), err); if (!err) - LOG(md, Info, "Cleaned up {}", dir_iter->path()); + LOG(md, Info, "Cleaned up {}", dir_iter->path().string()); } } else if (fs::is_directory(dir_iter->status())) { std::string path = dir_iter->path().string(); diff --git a/src/server/sparkd/exchange_sim/ExchangeSimApplication.cpp b/src/server/sparkd/exchange_sim/ExchangeSimApplication.cpp index 21ed01f5f..514bc9ffe 100644 --- a/src/server/sparkd/exchange_sim/ExchangeSimApplication.cpp +++ b/src/server/sparkd/exchange_sim/ExchangeSimApplication.cpp @@ -302,14 +302,14 @@ void ExchangeSimApplication::onMessage( message.get(side); message.get(account); - LOG(ExSim, Info, "Got order change: {} {}@{}", clOrdID.getString(), orderQty, - price); + LOG(ExSim, Info, "Got order change: {} {}@{}", clOrdID.getString(), + orderQty.getValue(), price.getValue()); try { auto &matcher = me->matchers[sec_desc]; auto order = matcher.get_order(clOrdID); if (!order) { LOG(ExSim, Info, "Receive cancel/replace for unknown order {}", - clOrdID); + clOrdID.getString()); throw std::logic_error("Unknown order"); } else { if (order->executed_quantity() >= orderQty) { diff --git a/src/server/sparkd/exchange_sim/book/Book.h b/src/server/sparkd/exchange_sim/book/Book.h index a1f524530..7aced7d6e 100644 --- a/src/server/sparkd/exchange_sim/book/Book.h +++ b/src/server/sparkd/exchange_sim/book/Book.h @@ -1,8 +1,12 @@ #pragma once + +#include "lib/core/FMT_IMPL.h" #include "lib/domain_model/Security.pb.h" #include "lib/orderman/orderman_utils/orderman_common.h" #include "server/sparkd/exchange_sim/book/Order.h" + #include +#include namespace bts { namespace ex_sim { @@ -141,3 +145,5 @@ inline std::ostream &operator<<(std::ostream &out, const Book &book) { } } // namespace ex_sim } // namespace bts + +FMT_IMPL_OSTREAM(bts::ex_sim::Book); diff --git a/src/server/sparkd/http/WebServer.cpp b/src/server/sparkd/http/WebServer.cpp index 27d593d32..0ac2d4869 100644 --- a/src/server/sparkd/http/WebServer.cpp +++ b/src/server/sparkd/http/WebServer.cpp @@ -354,7 +354,7 @@ struct ServerState { void return_file(connection_ptr &con, const boost::filesystem::path &path) { con->set_body(read_file(path.string())); con->set_status(websocketpp::http::status_code::ok); - LOG(Http, Info, "WebServer::return_file. path: {}", path); + LOG(Http, Info, "WebServer::return_file. path: {}", path.string()); } void return_bts_installer(connection_ptr &con) { diff --git a/src/server/sparkd/md/platforms/emumba/EmMDListener.cpp b/src/server/sparkd/md/platforms/emumba/EmMDListener.cpp index 5a6f91365..35e6a42b2 100644 --- a/src/server/sparkd/md/platforms/emumba/EmMDListener.cpp +++ b/src/server/sparkd/md/platforms/emumba/EmMDListener.cpp @@ -588,17 +588,17 @@ void EmMDListener::on_order_update( order_state.exchange_order_state); // these are all logs LOG(OrderMan, Info, - "IEMOrderMuxer::on_order_update em_ord_key: {} tid: {} sub_acct_idx: " - "{} " + "IEMOrderMuxer::on_order_update em_ord_key: {} tid: {} sub_acct_idx: {} " "ec.value: {} ec.message: {} ec.details: {} update_type: {} " - "exchange_key: {} status: " - "{} pr: {} qty: {} filled_pr: {} fills: {} n_trades: {}", + "exchange_key: {} status: {} pr: {} qty: {} filled_pr: {} fills: {} " + "n_trades: {}", order_key.value(), os::get_thread_id(), order_state.subaccount_index, - ec.value(), ec.message(), ec.details(), order_state.order_update_type, - exchange_order_state.exchange_order_id, order_state.order_status, - order_state.px.to_double(), extract_qty(order_state.qty), - order_state.avg_price.to_double(), extract_qty(order_state.total_fills), - order_state.trades.size()); + ec.value(), ec.message(), ec.details(), + static_cast(order_state.order_update_type), + exchange_order_state.exchange_order_id, + static_cast(order_state.order_status), order_state.px.to_double(), + extract_qty(order_state.qty), order_state.avg_price.to_double(), + extract_qty(order_state.total_fills), order_state.trades.size()); for (const auto &t : order_state.trades) { LOG(OrderMan, Info, "IEMOrderMuxer::on_order_update trade sec: {} agg: {} pr: {} qty: " diff --git a/src/server/sparkd/md/platforms/emumba/IEMOrderMuxer.h b/src/server/sparkd/md/platforms/emumba/IEMOrderMuxer.h index 4140eaa87..fb5b2e9ec 100644 --- a/src/server/sparkd/md/platforms/emumba/IEMOrderMuxer.h +++ b/src/server/sparkd/md/platforms/emumba/IEMOrderMuxer.h @@ -262,3 +262,7 @@ class IEMOrderMuxer { }; } // namespace bts::orderman + +FMT_IMPL_OSTREAM(bts::orderman::EMOpenOrder); +FMT_IMPL_OSTREAM(bts::orderman::EMOrderState); +FMT_IMPL_OSTREAM(bts::orderman::EMPosition); diff --git a/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp b/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp index a16f530e9..0161c7351 100644 --- a/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp +++ b/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp @@ -3,6 +3,8 @@ #include "lib/md/protos/co2.pb.h" #include "lib/utils/datetime.h" #include "lib/utils/helper_macros.h" + +#include #include using namespace std; @@ -63,7 +65,8 @@ void ICEListener::onFeedError( onixs_ice::FeedId feedid, onixs_ice::ErrorCode code, const std::string &desc) { - LOG(md, Warn, "OnixS ICE FeedError: {} - {}", feedid, desc, code); + LOG(md, Warn, "OnixS ICE FeedError: {} - {}", feedid, desc, + string{onixs_ice::KnownErrors::toString(code)}); } void ICEListener::onWarning(const onixs_ice::Warning &warning) { LOG(md, Warn, "OnixS ICE Warn: {} - {}", warning.toString(), @@ -85,8 +88,10 @@ void ICEListener::onFuturesProductDefinition( msg.marketDesc, // NG Swing GDD Futures - Henry - 10 Jul 20, msg.stripName, // 10 Jul 20 msg.contractSymbol, // CGS SDN1020.N1020, - msg.productId, msg.marketId, msg.requestMarketType, msg.securitySubType, - msg.contractSymbolExtra, msg.clearedAlias, msg.isSpread); + msg.productId, msg.marketId, msg.requestMarketType, + string{onixs_ice::SecuritySubType::toString(msg.securitySubType)}, + msg.contractSymbolExtra ? *msg.contractSymbolExtra : string{}, + msg.clearedAlias, msg.isSpread); } void ICEListener::onNewExpiry( @@ -99,10 +104,11 @@ void ICEListener::onNewExpiry( void ICEListener::onFuturesStrategyDefinition( const onixs_ice::FuturesStrategyDefinition &msg, bool &is_interested) { on_uds_future_spread(msg, is_interested); - LOG(md, Diag, "ICE_Strategy,{},{},{},{},{},{},{},{},{},{},{},{},{},{}", + LOG(md, Diag, "ICE_Strategy,{},{},{},{},{},{},{},{},{},{},{},{},{}", is_interested, msg.productName, msg.hubAlias, msg.marketDesc, msg.stripName, msg.contractSymbol, msg.productId, msg.marketId, - msg.requestMarketType, msg.securitySubType, log::CharPtrWrapper{""}, + msg.requestMarketType, + string{onixs_ice::SecuritySubType::toString(msg.securitySubType)}, msg.clearedAlias, msg.productName, 0); } diff --git a/src/server/sparkd/position/PositionMap.cpp b/src/server/sparkd/position/PositionMap.cpp index 7ed42f066..e3daeb198 100644 --- a/src/server/sparkd/position/PositionMap.cpp +++ b/src/server/sparkd/position/PositionMap.cpp @@ -4,10 +4,12 @@ #include "lib/api/services/AdminService.pb.h" #include "lib/config/config.h" #include "lib/config/protos/toggles.pb.h" +#include "lib/domain_model/Side.h" #include "lib/logging/logging.h" #include "lib/orderman/actors/SODPosition.h" #include "lib/utils/PBUtils.h" #include "lib/utils/bts_assert.h" + #include #include #include @@ -254,4 +256,4 @@ const std::map &PositionMap::test_only_fills() const { } } // namespace orderman -} // namespace bts \ No newline at end of file +} // namespace bts diff --git a/src/server/sparkd/position/import/DownloadWindow.h b/src/server/sparkd/position/import/DownloadWindow.h index fdd98466a..65f684854 100644 --- a/src/server/sparkd/position/import/DownloadWindow.h +++ b/src/server/sparkd/position/import/DownloadWindow.h @@ -1,7 +1,10 @@ #pragma once +#include "lib/core/FMT_IMPL.h" #include "lib/utils/datetime.h" + #include +#include namespace bts { namespace position { @@ -31,3 +34,5 @@ std::ostream &operator<<(std::ostream &, DownloadWindow const &); } // namespace position } // namespace bts + +FMT_IMPL_OSTREAM(bts::position::DownloadWindow);