From 5657fc81e378e20b802d0fd6916bb594b683dca6 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Fri, 23 Aug 2024 17:30:50 +0000 Subject: [PATCH] refactor: Move ValueWrapper into lib_system So other projects can use it --- src/lib_spark/spark/core/ValueWrapper.h | 3 +- src/lib_spark/spark/domain/AccountID.h | 2 +- src/lib_spark/spark/domain/OrderKey.h | 2 +- src/lib_spark/spark/domain/Quantity.h | 2 +- src/lib_spark/spark/domain/SecurityID.h | 2 +- src/lib_spark/spark/domain/UserID.h | 2 +- .../spark/domain_model/SecurityKey.h | 2 +- src/lib_spark/spark/domain_model/common.h | 2 +- src/lib_spark/spark/md/ExchangeOrderKey.h | 2 +- src/lib_spark/spark/md/ExchangeSecurityKey.h | 2 +- src/lib_spark/spark/md/Shm/FixedSecurity.h | 2 +- src/lib_spark/spark/md/SizeTypes.h | 4 +- .../spark/mercury/common/mercury_common.h | 2 +- .../gateways/ExecutionGatewayFactory.cpp | 2 +- .../spark/orderman/orderman_utils/PriceComp.h | 2 +- .../orderman/orderman_utils/orderman_common.h | 2 +- .../spark/quickbus/core/SubscriptionID.h | 2 +- src/lib_spark/spark/quickbus/core/TableID.h | 2 +- src/lib_spark/spark/quickbus/core/Topic.h | 2 +- .../spark/quickbus/message_model/Record.h | 2 +- .../spark/quickbus/message_model/RecordKey.h | 2 +- src/lib_spark/spark/quickbus/routing/NodeID.h | 2 +- .../spark/quickbus/rpc/RPCServiceName.h | 2 +- .../spark/quickbus/rpc/RPCSessionID.h | 2 +- src/lib_spark/spark/utils/ValueWrapper.h | 150 +---------------- src/lib_system/system/value_wrapper.h | 151 ++++++++++++++++++ 26 files changed, 178 insertions(+), 174 deletions(-) create mode 100644 src/lib_system/system/value_wrapper.h diff --git a/src/lib_spark/spark/core/ValueWrapper.h b/src/lib_spark/spark/core/ValueWrapper.h index 243f17e5e..7fdf00e2a 100644 --- a/src/lib_spark/spark/core/ValueWrapper.h +++ b/src/lib_spark/spark/core/ValueWrapper.h @@ -1,5 +1,6 @@ #pragma once -#include "spark/utils/ValueWrapper.h" + +#include "system/value_wrapper.h" namespace bts::core { diff --git a/src/lib_spark/spark/domain/AccountID.h b/src/lib_spark/spark/domain/AccountID.h index 6fd2920c3..7eb2253b3 100644 --- a/src/lib_spark/spark/domain/AccountID.h +++ b/src/lib_spark/spark/domain/AccountID.h @@ -1,5 +1,5 @@ #pragma once -#include "spark/utils/ValueWrapper.h" +#include "system/value_wrapper.h" #include namespace bts::domain { diff --git a/src/lib_spark/spark/domain/OrderKey.h b/src/lib_spark/spark/domain/OrderKey.h index 0d4a2f3e5..d432975fc 100644 --- a/src/lib_spark/spark/domain/OrderKey.h +++ b/src/lib_spark/spark/domain/OrderKey.h @@ -1,5 +1,5 @@ #pragma once -#include "spark/utils/ValueWrapper.h" +#include "system/value_wrapper.h" #include namespace bts::domain { diff --git a/src/lib_spark/spark/domain/Quantity.h b/src/lib_spark/spark/domain/Quantity.h index 664e37582..59c6b73dd 100644 --- a/src/lib_spark/spark/domain/Quantity.h +++ b/src/lib_spark/spark/domain/Quantity.h @@ -3,7 +3,7 @@ #include "spark/core/FMT_IMPL.h" #include "spark/io/JsonReader.h" #include "spark/logging/logging.h" -#include "spark/utils/ValueWrapper.h" +#include "system/value_wrapper.h" #include #include diff --git a/src/lib_spark/spark/domain/SecurityID.h b/src/lib_spark/spark/domain/SecurityID.h index 333058f46..ed29cf970 100644 --- a/src/lib_spark/spark/domain/SecurityID.h +++ b/src/lib_spark/spark/domain/SecurityID.h @@ -1,7 +1,7 @@ #pragma once #include "spark/core/FMT_IMPL.h" -#include "spark/utils/ValueWrapper.h" +#include "system/value_wrapper.h" #include #include diff --git a/src/lib_spark/spark/domain/UserID.h b/src/lib_spark/spark/domain/UserID.h index 326d53158..ccf4819ce 100644 --- a/src/lib_spark/spark/domain/UserID.h +++ b/src/lib_spark/spark/domain/UserID.h @@ -1,5 +1,5 @@ #pragma once -#include "spark/utils/ValueWrapper.h" +#include "system/value_wrapper.h" #include namespace bts::domain { diff --git a/src/lib_spark/spark/domain_model/SecurityKey.h b/src/lib_spark/spark/domain_model/SecurityKey.h index c09ae55cb..9fe72f889 100644 --- a/src/lib_spark/spark/domain_model/SecurityKey.h +++ b/src/lib_spark/spark/domain_model/SecurityKey.h @@ -1,7 +1,7 @@ #pragma once #include "spark/core/FMT_IMPL.h" -#include "spark/utils/ValueWrapper.h" +#include "system/value_wrapper.h" #include diff --git a/src/lib_spark/spark/domain_model/common.h b/src/lib_spark/spark/domain_model/common.h index 01da10dbf..a5d92c2fb 100644 --- a/src/lib_spark/spark/domain_model/common.h +++ b/src/lib_spark/spark/domain_model/common.h @@ -9,7 +9,7 @@ #include "spark/core/FMT_IMPL.h" #include "spark/domain_model/SecurityKey.h" -#include "spark/utils/ValueWrapper.h" +#include "system/value_wrapper.h" namespace bts { struct CQuantity { diff --git a/src/lib_spark/spark/md/ExchangeOrderKey.h b/src/lib_spark/spark/md/ExchangeOrderKey.h index 1dfcf39e9..8db3e9c37 100644 --- a/src/lib_spark/spark/md/ExchangeOrderKey.h +++ b/src/lib_spark/spark/md/ExchangeOrderKey.h @@ -1,6 +1,6 @@ #pragma once -#include "spark/utils/ValueWrapper.h" +#include "system/value_wrapper.h" #include diff --git a/src/lib_spark/spark/md/ExchangeSecurityKey.h b/src/lib_spark/spark/md/ExchangeSecurityKey.h index 41bbed5c0..2990e3036 100644 --- a/src/lib_spark/spark/md/ExchangeSecurityKey.h +++ b/src/lib_spark/spark/md/ExchangeSecurityKey.h @@ -1,6 +1,6 @@ #pragma once -#include "spark/utils/ValueWrapper.h" +#include "system/value_wrapper.h" #include diff --git a/src/lib_spark/spark/md/Shm/FixedSecurity.h b/src/lib_spark/spark/md/Shm/FixedSecurity.h index 72c948e2b..1e684c5e9 100644 --- a/src/lib_spark/spark/md/Shm/FixedSecurity.h +++ b/src/lib_spark/spark/md/Shm/FixedSecurity.h @@ -5,7 +5,7 @@ #include "spark/core/TimeStamp.h" #include "spark/io/JsonDumper.h" #include "spark/io/JsonReader.h" -#include "spark/utils/ValueWrapper.h" +#include "system/value_wrapper.h" #include "spark/utils/bts_assert.h" #include "spark/utils/bts_export.h" #include "spark/utils/bts_no_copy.h" diff --git a/src/lib_spark/spark/md/SizeTypes.h b/src/lib_spark/spark/md/SizeTypes.h index eb45e3591..ff37c8652 100644 --- a/src/lib_spark/spark/md/SizeTypes.h +++ b/src/lib_spark/spark/md/SizeTypes.h @@ -1,7 +1,7 @@ #pragma once -#include "spark/utils/ValueWrapper.h" +#include "system/value_wrapper.h" namespace bts { namespace md { using ImpliedSize = utils::ValueWrapper; } -} // namespace bts \ No newline at end of file +} // namespace bts diff --git a/src/lib_spark/spark/mercury/common/mercury_common.h b/src/lib_spark/spark/mercury/common/mercury_common.h index 2c4a1cff0..c99f99006 100644 --- a/src/lib_spark/spark/mercury/common/mercury_common.h +++ b/src/lib_spark/spark/mercury/common/mercury_common.h @@ -2,7 +2,7 @@ #include "spark/core/FMT_IMPL.h" #include "spark/mercury/common/FatWrapper.h" -#include "spark/utils/ValueWrapper.h" +#include "system/value_wrapper.h" #include #include #include diff --git a/src/lib_spark/spark/orderman/gateways/ExecutionGatewayFactory.cpp b/src/lib_spark/spark/orderman/gateways/ExecutionGatewayFactory.cpp index 447a8d81e..b47508d85 100644 --- a/src/lib_spark/spark/orderman/gateways/ExecutionGatewayFactory.cpp +++ b/src/lib_spark/spark/orderman/gateways/ExecutionGatewayFactory.cpp @@ -14,7 +14,7 @@ #include "spark/orderman/gateways/sim/SimExecutionGatewayUniqueWrapper.h" #include "spark/tracing/PerfLog.h" #include "spark/utils/PBUtils.h" -#include "spark/utils/ValueWrapper.h" +#include "system/value_wrapper.h" #include #include diff --git a/src/lib_spark/spark/orderman/orderman_utils/PriceComp.h b/src/lib_spark/spark/orderman/orderman_utils/PriceComp.h index c09c169ce..33c2353a7 100644 --- a/src/lib_spark/spark/orderman/orderman_utils/PriceComp.h +++ b/src/lib_spark/spark/orderman/orderman_utils/PriceComp.h @@ -2,7 +2,7 @@ #include "spark/domain_model/Security.h" #include "spark/md/IntPrice.h" #include "spark/domain_model/Security.pb.h" -#include "spark/utils/ValueWrapper.h" +#include "system/value_wrapper.h" #include "spark/utils/overloaded.h" namespace bts { 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 9ab0bfb6b..c295d4071 100644 --- a/src/lib_spark/spark/orderman/orderman_utils/orderman_common.h +++ b/src/lib_spark/spark/orderman/orderman_utils/orderman_common.h @@ -10,7 +10,7 @@ #include "spark/api/services/OrderService.pb.h" #include "spark/core/FMT_IMPL.h" #include "spark/domain_model/common.h" -#include "spark/utils/ValueWrapper.h" +#include "system/value_wrapper.h" #include "spark/utils/bts_assert.h" #include "spark/utils/bts_chrono.h" #include "spark/utils/overloaded.h" diff --git a/src/lib_spark/spark/quickbus/core/SubscriptionID.h b/src/lib_spark/spark/quickbus/core/SubscriptionID.h index 70c2f14a7..c1df72e5d 100644 --- a/src/lib_spark/spark/quickbus/core/SubscriptionID.h +++ b/src/lib_spark/spark/quickbus/core/SubscriptionID.h @@ -1,6 +1,6 @@ #pragma once -#include "spark/utils/ValueWrapper.h" +#include "system/value_wrapper.h" #include namespace bts { diff --git a/src/lib_spark/spark/quickbus/core/TableID.h b/src/lib_spark/spark/quickbus/core/TableID.h index 137d27162..4d9b81e2b 100644 --- a/src/lib_spark/spark/quickbus/core/TableID.h +++ b/src/lib_spark/spark/quickbus/core/TableID.h @@ -1,6 +1,6 @@ #pragma once -#include "spark/utils/ValueWrapper.h" +#include "system/value_wrapper.h" #include namespace bts { diff --git a/src/lib_spark/spark/quickbus/core/Topic.h b/src/lib_spark/spark/quickbus/core/Topic.h index 726746702..613ed7a03 100644 --- a/src/lib_spark/spark/quickbus/core/Topic.h +++ b/src/lib_spark/spark/quickbus/core/Topic.h @@ -1,6 +1,6 @@ #pragma once -#include "spark/utils/ValueWrapper.h" +#include "system/value_wrapper.h" #include namespace bts { diff --git a/src/lib_spark/spark/quickbus/message_model/Record.h b/src/lib_spark/spark/quickbus/message_model/Record.h index caf476b6c..be31d07aa 100644 --- a/src/lib_spark/spark/quickbus/message_model/Record.h +++ b/src/lib_spark/spark/quickbus/message_model/Record.h @@ -1,6 +1,6 @@ #pragma once -#include "spark/utils/ValueWrapper.h" +#include "system/value_wrapper.h" #include namespace bts { diff --git a/src/lib_spark/spark/quickbus/message_model/RecordKey.h b/src/lib_spark/spark/quickbus/message_model/RecordKey.h index 346e9bd38..8b8893bb6 100644 --- a/src/lib_spark/spark/quickbus/message_model/RecordKey.h +++ b/src/lib_spark/spark/quickbus/message_model/RecordKey.h @@ -1,6 +1,6 @@ #pragma once -#include "spark/utils/ValueWrapper.h" +#include "system/value_wrapper.h" namespace bts { namespace qbus { diff --git a/src/lib_spark/spark/quickbus/routing/NodeID.h b/src/lib_spark/spark/quickbus/routing/NodeID.h index dd5f88670..f2757a6d0 100644 --- a/src/lib_spark/spark/quickbus/routing/NodeID.h +++ b/src/lib_spark/spark/quickbus/routing/NodeID.h @@ -1,6 +1,6 @@ #pragma once -#include "spark/utils/ValueWrapper.h" +#include "system/value_wrapper.h" #include namespace bts { diff --git a/src/lib_spark/spark/quickbus/rpc/RPCServiceName.h b/src/lib_spark/spark/quickbus/rpc/RPCServiceName.h index 6a9dbc04b..87fc9171c 100644 --- a/src/lib_spark/spark/quickbus/rpc/RPCServiceName.h +++ b/src/lib_spark/spark/quickbus/rpc/RPCServiceName.h @@ -1,6 +1,6 @@ #pragma once -#include "spark/utils/ValueWrapper.h" +#include "system/value_wrapper.h" #include #include diff --git a/src/lib_spark/spark/quickbus/rpc/RPCSessionID.h b/src/lib_spark/spark/quickbus/rpc/RPCSessionID.h index 3d85227c3..ce5498693 100644 --- a/src/lib_spark/spark/quickbus/rpc/RPCSessionID.h +++ b/src/lib_spark/spark/quickbus/rpc/RPCSessionID.h @@ -1,6 +1,6 @@ #pragma once -#include "spark/utils/ValueWrapper.h" +#include "system/value_wrapper.h" #include #include diff --git a/src/lib_spark/spark/utils/ValueWrapper.h b/src/lib_spark/spark/utils/ValueWrapper.h index e8dda75ab..882ad10b3 100644 --- a/src/lib_spark/spark/utils/ValueWrapper.h +++ b/src/lib_spark/spark/utils/ValueWrapper.h @@ -1,151 +1,3 @@ #pragma once -#include -#include - -namespace bts { -namespace utils { - -template -class ValueWrapper { - public: - typedef ValueT Value; - - constexpr ValueWrapper() = default; - constexpr explicit ValueWrapper(const ValueT &v); - constexpr explicit ValueWrapper(ValueT &&v); - - constexpr ValueWrapper(const ValueWrapper &v) = default; - constexpr ValueWrapper(ValueWrapper &&v) = default; - - ValueWrapper &operator=(ValueWrapper const &v) = default; - ValueWrapper &operator=(ValueWrapper &&v) = default; - - constexpr const ValueT &value() const; - constexpr ValueT &value(); - - private: - ValueT v_; -}; - -template -constexpr bool operator==( - const ValueWrapper &lhs, const ValueWrapper &rhs); - -template -constexpr bool operator!=( - const ValueWrapper &lhs, const ValueWrapper &rhs); - -template -constexpr bool operator>( - const ValueWrapper &lhs, const ValueWrapper &rhs); - -template -constexpr bool operator>=( - const ValueWrapper &lhs, const ValueWrapper &rhs); - -template -constexpr bool operator<( - const ValueWrapper &lhs, const ValueWrapper &rhs); - -template -constexpr bool operator<=( - const ValueWrapper &lhs, const ValueWrapper &rhs); - -template -std::ostream &operator<<(std::ostream &s, ValueWrapper const &v); - -} // namespace utils -} // namespace bts - -namespace std { - -template -struct hash> { - std::size_t operator()(const bts::utils::ValueWrapper &k) const; -}; - -} // namespace std - -////////////////////////////////////////////////// -// Definition -////////////////////////////////////////////////// - -namespace bts { -namespace utils { - -template -constexpr ValueWrapper::ValueWrapper(const ValueT &v) : v_(v) {} - -template -constexpr ValueWrapper::ValueWrapper(ValueT &&v) - : v_(std::move(v)) {} - -template -constexpr ValueT const &ValueWrapper::value() const { - return v_; -} - -template -constexpr ValueT &ValueWrapper::value() { - return v_; -} - -#define BIN_OP(result_t, op) \ - template \ - constexpr result_t operator op( \ - const ValueWrapper &lhs, \ - const ValueWrapper &rhs) { \ - return result_t(lhs.value() op rhs.value()); \ - } - -BIN_OP(bool, ==) -BIN_OP(bool, !=) -BIN_OP(bool, >) -BIN_OP(bool, >=) -BIN_OP(bool, <) -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(); - return s; -} - -} // namespace utils -} // namespace bts - -namespace std { - -template -std::size_t hash>::operator()( - const bts::utils::ValueWrapper &k) const { - return hash()(k.value()); -} - -} // namespace std +#include "system/value_wrapper.h" diff --git a/src/lib_system/system/value_wrapper.h b/src/lib_system/system/value_wrapper.h new file mode 100644 index 000000000..e8dda75ab --- /dev/null +++ b/src/lib_system/system/value_wrapper.h @@ -0,0 +1,151 @@ +#pragma once + +#include +#include + +namespace bts { +namespace utils { + +template +class ValueWrapper { + public: + typedef ValueT Value; + + constexpr ValueWrapper() = default; + constexpr explicit ValueWrapper(const ValueT &v); + constexpr explicit ValueWrapper(ValueT &&v); + + constexpr ValueWrapper(const ValueWrapper &v) = default; + constexpr ValueWrapper(ValueWrapper &&v) = default; + + ValueWrapper &operator=(ValueWrapper const &v) = default; + ValueWrapper &operator=(ValueWrapper &&v) = default; + + constexpr const ValueT &value() const; + constexpr ValueT &value(); + + private: + ValueT v_; +}; + +template +constexpr bool operator==( + const ValueWrapper &lhs, const ValueWrapper &rhs); + +template +constexpr bool operator!=( + const ValueWrapper &lhs, const ValueWrapper &rhs); + +template +constexpr bool operator>( + const ValueWrapper &lhs, const ValueWrapper &rhs); + +template +constexpr bool operator>=( + const ValueWrapper &lhs, const ValueWrapper &rhs); + +template +constexpr bool operator<( + const ValueWrapper &lhs, const ValueWrapper &rhs); + +template +constexpr bool operator<=( + const ValueWrapper &lhs, const ValueWrapper &rhs); + +template +std::ostream &operator<<(std::ostream &s, ValueWrapper const &v); + +} // namespace utils +} // namespace bts + +namespace std { + +template +struct hash> { + std::size_t operator()(const bts::utils::ValueWrapper &k) const; +}; + +} // namespace std + +////////////////////////////////////////////////// +// Definition +////////////////////////////////////////////////// + +namespace bts { +namespace utils { + +template +constexpr ValueWrapper::ValueWrapper(const ValueT &v) : v_(v) {} + +template +constexpr ValueWrapper::ValueWrapper(ValueT &&v) + : v_(std::move(v)) {} + +template +constexpr ValueT const &ValueWrapper::value() const { + return v_; +} + +template +constexpr ValueT &ValueWrapper::value() { + return v_; +} + +#define BIN_OP(result_t, op) \ + template \ + constexpr result_t operator op( \ + const ValueWrapper &lhs, \ + const ValueWrapper &rhs) { \ + return result_t(lhs.value() op rhs.value()); \ + } + +BIN_OP(bool, ==) +BIN_OP(bool, !=) +BIN_OP(bool, >) +BIN_OP(bool, >=) +BIN_OP(bool, <) +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(); + return s; +} + +} // namespace utils +} // namespace bts + +namespace std { + +template +std::size_t hash>::operator()( + const bts::utils::ValueWrapper &k) const { + return hash()(k.value()); +} + +} // namespace std