diff --git a/src/app_sparkd/sparkd/cmds/crypto/DeribitDemoConfiguration.h b/src/app_sparkd/sparkd/cmds/crypto/DeribitDemoConfiguration.h index 1e797b964..82120d61e 100644 --- a/src/app_sparkd/sparkd/cmds/crypto/DeribitDemoConfiguration.h +++ b/src/app_sparkd/sparkd/cmds/crypto/DeribitDemoConfiguration.h @@ -1,6 +1,6 @@ #pragma once -#include "spark/core/FMT_IMPL.h" +#include "system/FMT_IMPL.h" #include #include diff --git a/src/app_sparkd/sparkd/exchange_sim/book/Book.h b/src/app_sparkd/sparkd/exchange_sim/book/Book.h index 85e308698..dcdaeb81f 100644 --- a/src/app_sparkd/sparkd/exchange_sim/book/Book.h +++ b/src/app_sparkd/sparkd/exchange_sim/book/Book.h @@ -1,9 +1,9 @@ #pragma once -#include "spark/core/FMT_IMPL.h" #include "spark/domain_model/Security.pb.h" #include "spark/orderman/orderman_utils/orderman_common.h" #include "sparkd/exchange_sim/book/Order.h" +#include "system/FMT_IMPL.h" #include #include diff --git a/src/app_sparkd/sparkd/md/MarketDataError.h b/src/app_sparkd/sparkd/md/MarketDataError.h index 8227839a9..d75f9c978 100644 --- a/src/app_sparkd/sparkd/md/MarketDataError.h +++ b/src/app_sparkd/sparkd/md/MarketDataError.h @@ -1,6 +1,6 @@ #pragma once -#include "spark/core/FMT_IMPL.h" +#include "system/FMT_IMPL.h" #include #include diff --git a/src/app_sparkd/sparkd/md/MarketDataGateway.cpp b/src/app_sparkd/sparkd/md/MarketDataGateway.cpp index 450104519..5291ba962 100644 --- a/src/app_sparkd/sparkd/md/MarketDataGateway.cpp +++ b/src/app_sparkd/sparkd/md/MarketDataGateway.cpp @@ -2,7 +2,6 @@ #include "domain/security_id.h" #include "spark/api/md/MarketDataConfig.pb.h" #include "spark/api/md/MarketDataConfigUtils.h" -#include "spark/core/FMT.h" #include "spark/domain/DomainSecurityUtils.h" #include "spark/logging/logging.h" #include "spark/md/GeneralMarketDataListener.h" @@ -21,6 +20,7 @@ #include "sparkd/md/databento/DatabentoMarketDataProvider.h" #include "sparkd/md/emumba/EmumbaMarketDataProvider.h" #include "sparkd/md/taifex/TaifexMarketDataProvider.h" +#include "system/FMT.h" #include #include diff --git a/src/app_sparkd/sparkd/md/MarketDataListenerID.h b/src/app_sparkd/sparkd/md/MarketDataListenerID.h index 809957535..207cf4a66 100644 --- a/src/app_sparkd/sparkd/md/MarketDataListenerID.h +++ b/src/app_sparkd/sparkd/md/MarketDataListenerID.h @@ -1,8 +1,8 @@ #pragma once #ifndef _WIN32 -#include "spark/core/FMT_IMPL.h" #include "spark/core/ValueWrapper.h" +#include "system/FMT_IMPL.h" namespace bts::md { diff --git a/src/app_sparkd/sparkd/md/PyMarketDataSubscription.cpp b/src/app_sparkd/sparkd/md/PyMarketDataSubscription.cpp index caec51768..12f78111e 100644 --- a/src/app_sparkd/sparkd/md/PyMarketDataSubscription.cpp +++ b/src/app_sparkd/sparkd/md/PyMarketDataSubscription.cpp @@ -13,12 +13,12 @@ #include "python_md/py_security.h" #include "python_md/py_security_list.h" #include "python_md/py_trade.h" -#include "spark/core/TimeStamp.h" #include "spark/logging/logging.h" #include "spark/md/IMarketDataListener.h" #include "spark/os/os.h" #include "spark/persistence/IDGenerator.h" #include "spark/utils/bts_assert.h" +#include "system/time_stamp.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance/BinanceContractType.h b/src/app_sparkd/sparkd/md/binance/BinanceContractType.h index 2a986022f..7e6ec9caf 100644 --- a/src/app_sparkd/sparkd/md/binance/BinanceContractType.h +++ b/src/app_sparkd/sparkd/md/binance/BinanceContractType.h @@ -1,7 +1,7 @@ #pragma once -#include "spark/core/EnumMacros.h" -#include "spark/core/FMT_IMPL.h" +#include "system/FMT_IMPL.h" +#include "system/enum_macros.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance/BinanceFilterTuple.h b/src/app_sparkd/sparkd/md/binance/BinanceFilterTuple.h index 20abddaa6..e5fb64680 100644 --- a/src/app_sparkd/sparkd/md/binance/BinanceFilterTuple.h +++ b/src/app_sparkd/sparkd/md/binance/BinanceFilterTuple.h @@ -1,7 +1,5 @@ #pragma once -#include "spark/io/JsonDumper.h" -#include "spark/io/JsonReader.h" #include "sparkd/md/binance/BinanceFilterType.h" #include "sparkd/md/binance/BinanceIcebergPartsFilter.h" #include "sparkd/md/binance/BinanceLotSizeFilter.h" @@ -15,6 +13,8 @@ #include "sparkd/md/binance/BinancePercentPriceFilter.h" #include "sparkd/md/binance/BinancePriceFilter.h" #include "sparkd/md/binance/BinanceTrailingDeltaFilter.h" +#include "system/json/json_dumper.h" +#include "system/json/json_reader.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance/BinanceFilterType.h b/src/app_sparkd/sparkd/md/binance/BinanceFilterType.h index f22107b70..341a3a4ab 100644 --- a/src/app_sparkd/sparkd/md/binance/BinanceFilterType.h +++ b/src/app_sparkd/sparkd/md/binance/BinanceFilterType.h @@ -1,7 +1,7 @@ #pragma once -#include "spark/core/EnumMacros.h" -#include "spark/core/FMT_IMPL.h" +#include "system/FMT_IMPL.h" +#include "system/enum_macros.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance/BinanceIcebergPartsFilter.h b/src/app_sparkd/sparkd/md/binance/BinanceIcebergPartsFilter.h index ac9473144..075eaee97 100644 --- a/src/app_sparkd/sparkd/md/binance/BinanceIcebergPartsFilter.h +++ b/src/app_sparkd/sparkd/md/binance/BinanceIcebergPartsFilter.h @@ -1,8 +1,8 @@ #pragma once -#include "spark/io/JsonMacros.h" -#include "spark/io/JsonReader.h" #include "sparkd/md/binance/BinanceFilterType.h" +#include "system/json/json_macros.h" +#include "system/json/json_reader.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance/BinanceInstrumentStatus.h b/src/app_sparkd/sparkd/md/binance/BinanceInstrumentStatus.h index 4c4b630cc..9392bc471 100644 --- a/src/app_sparkd/sparkd/md/binance/BinanceInstrumentStatus.h +++ b/src/app_sparkd/sparkd/md/binance/BinanceInstrumentStatus.h @@ -1,7 +1,7 @@ #pragma once -#include "spark/core/EnumMacros.h" -#include "spark/core/FMT_IMPL.h" +#include "system/FMT_IMPL.h" +#include "system/enum_macros.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance/BinanceLotSizeFilter.h b/src/app_sparkd/sparkd/md/binance/BinanceLotSizeFilter.h index 745804ae7..f0cd4fc85 100644 --- a/src/app_sparkd/sparkd/md/binance/BinanceLotSizeFilter.h +++ b/src/app_sparkd/sparkd/md/binance/BinanceLotSizeFilter.h @@ -1,8 +1,8 @@ #pragma once -#include "spark/io/JsonReader.h" #include "spark/logging/logging.h" #include "sparkd/md/binance/BinanceFilterType.h" +#include "system/json/json_reader.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance/BinanceMarketLotSizeFilter.h b/src/app_sparkd/sparkd/md/binance/BinanceMarketLotSizeFilter.h index c6ac0098b..4c7227605 100644 --- a/src/app_sparkd/sparkd/md/binance/BinanceMarketLotSizeFilter.h +++ b/src/app_sparkd/sparkd/md/binance/BinanceMarketLotSizeFilter.h @@ -1,7 +1,7 @@ #pragma once -#include "spark/io/JsonReader.h" #include "sparkd/md/binance/BinanceFilterType.h" +#include "system/json/json_reader.h" #include diff --git a/src/app_sparkd/sparkd/md/binance/BinanceMaxNumAlgoOrdersFilter.h b/src/app_sparkd/sparkd/md/binance/BinanceMaxNumAlgoOrdersFilter.h index 5897885b8..34af0ed80 100644 --- a/src/app_sparkd/sparkd/md/binance/BinanceMaxNumAlgoOrdersFilter.h +++ b/src/app_sparkd/sparkd/md/binance/BinanceMaxNumAlgoOrdersFilter.h @@ -1,7 +1,7 @@ #pragma once -#include "spark/io/JsonReader.h" #include "sparkd/md/binance/BinanceFilterType.h" +#include "system/json/json_reader.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance/BinanceMaxNumOrdersFilter.h b/src/app_sparkd/sparkd/md/binance/BinanceMaxNumOrdersFilter.h index ab5f2e56c..44933f1aa 100644 --- a/src/app_sparkd/sparkd/md/binance/BinanceMaxNumOrdersFilter.h +++ b/src/app_sparkd/sparkd/md/binance/BinanceMaxNumOrdersFilter.h @@ -1,7 +1,7 @@ #pragma once -#include "spark/io/JsonReader.h" #include "sparkd/md/binance/BinanceFilterType.h" +#include "system/json/json_reader.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance/BinanceMaxPositionFilter.h b/src/app_sparkd/sparkd/md/binance/BinanceMaxPositionFilter.h index c393cade1..510cdeb6d 100644 --- a/src/app_sparkd/sparkd/md/binance/BinanceMaxPositionFilter.h +++ b/src/app_sparkd/sparkd/md/binance/BinanceMaxPositionFilter.h @@ -1,7 +1,7 @@ #pragma once -#include "spark/io/JsonReader.h" #include "sparkd/md/binance/BinanceFilterType.h" +#include "system/json/json_reader.h" #include diff --git a/src/app_sparkd/sparkd/md/binance/BinanceMessageType.h b/src/app_sparkd/sparkd/md/binance/BinanceMessageType.h index b13e6ef0e..93651a273 100644 --- a/src/app_sparkd/sparkd/md/binance/BinanceMessageType.h +++ b/src/app_sparkd/sparkd/md/binance/BinanceMessageType.h @@ -1,7 +1,7 @@ #pragma once -#include "spark/core/EnumMacros.h" -#include "spark/core/FMT_IMPL.h" +#include "system/FMT_IMPL.h" +#include "system/enum_macros.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance/BinanceMinNotionalFilter.h b/src/app_sparkd/sparkd/md/binance/BinanceMinNotionalFilter.h index 18a8bc36c..335d981fb 100644 --- a/src/app_sparkd/sparkd/md/binance/BinanceMinNotionalFilter.h +++ b/src/app_sparkd/sparkd/md/binance/BinanceMinNotionalFilter.h @@ -1,8 +1,8 @@ #pragma once -#include "spark/io/JsonMacros.h" -#include "spark/io/JsonReader.h" #include "sparkd/md/binance/BinanceFilterType.h" +#include "system/json/json_macros.h" +#include "system/json/json_reader.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance/BinanceMiniTickerUpdate.cpp b/src/app_sparkd/sparkd/md/binance/BinanceMiniTickerUpdate.cpp index af46a7834..5dd77a9a8 100644 --- a/src/app_sparkd/sparkd/md/binance/BinanceMiniTickerUpdate.cpp +++ b/src/app_sparkd/sparkd/md/binance/BinanceMiniTickerUpdate.cpp @@ -2,11 +2,11 @@ #include "BinanceMiniTickerUpdate.h" #include "domain/price.h" #include "domain/quantity.h" -#include "spark/core/TimeStamp.h" #include "spark/domain/SecurityMarketDataStatistics.h" -#include "spark/io/JsonDumper.h" -#include "spark/io/JsonReader.h" #include "sparkd/md/ccapi/CCApiReader.h" +#include "system/json/json_dumper.h" +#include "system/json/json_reader.h" +#include "system/time_stamp.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance/BinanceMiniTickerUpdate.h b/src/app_sparkd/sparkd/md/binance/BinanceMiniTickerUpdate.h index b9dd5133e..987cc9825 100644 --- a/src/app_sparkd/sparkd/md/binance/BinanceMiniTickerUpdate.h +++ b/src/app_sparkd/sparkd/md/binance/BinanceMiniTickerUpdate.h @@ -1,8 +1,8 @@ #pragma once -#include "spark/core/TimeStamp.h" #include "spark/domain/SecurityMarketDataStatistics.h" #include "sparkd/md/binance/BinanceMiniTickerEventType.h" +#include "system/time_stamp.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance/BinanceNotionalFilter.h b/src/app_sparkd/sparkd/md/binance/BinanceNotionalFilter.h index f7fd2b93b..13b15fb77 100644 --- a/src/app_sparkd/sparkd/md/binance/BinanceNotionalFilter.h +++ b/src/app_sparkd/sparkd/md/binance/BinanceNotionalFilter.h @@ -1,8 +1,8 @@ #pragma once -#include "spark/io/JsonMacros.h" -#include "spark/io/JsonReader.h" #include "sparkd/md/binance/BinanceFilterType.h" +#include "system/json/json_macros.h" +#include "system/json/json_reader.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance/BinanceOrderType.h b/src/app_sparkd/sparkd/md/binance/BinanceOrderType.h index 5b1a04ce7..9331912f6 100644 --- a/src/app_sparkd/sparkd/md/binance/BinanceOrderType.h +++ b/src/app_sparkd/sparkd/md/binance/BinanceOrderType.h @@ -1,7 +1,7 @@ #pragma once -#include "spark/core/EnumMacros.h" -#include "spark/core/FMT_IMPL.h" +#include "system/FMT_IMPL.h" +#include "system/enum_macros.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance/BinancePercentPriceBySideFilter.h b/src/app_sparkd/sparkd/md/binance/BinancePercentPriceBySideFilter.h index aeda9ec39..1c1c40471 100644 --- a/src/app_sparkd/sparkd/md/binance/BinancePercentPriceBySideFilter.h +++ b/src/app_sparkd/sparkd/md/binance/BinancePercentPriceBySideFilter.h @@ -1,8 +1,8 @@ #pragma once -#include "spark/io/JsonDumper.h" -#include "spark/io/JsonReader.h" #include "sparkd/md/binance/BinanceFilterType.h" +#include "system/json/json_dumper.h" +#include "system/json/json_reader.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance/BinancePercentPriceFilter.h b/src/app_sparkd/sparkd/md/binance/BinancePercentPriceFilter.h index 7a7a39a40..ea44302fb 100644 --- a/src/app_sparkd/sparkd/md/binance/BinancePercentPriceFilter.h +++ b/src/app_sparkd/sparkd/md/binance/BinancePercentPriceFilter.h @@ -1,7 +1,7 @@ #pragma once -#include "spark/io/JsonReader.h" #include "sparkd/md/binance/BinanceFilterType.h" +#include "system/json/json_reader.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance/BinancePermission.h b/src/app_sparkd/sparkd/md/binance/BinancePermission.h index 79fde3a4d..0e1c05f08 100644 --- a/src/app_sparkd/sparkd/md/binance/BinancePermission.h +++ b/src/app_sparkd/sparkd/md/binance/BinancePermission.h @@ -1,7 +1,7 @@ #pragma once -#include "spark/core/EnumMacros.h" -#include "spark/core/FMT_IMPL.h" +#include "system/FMT_IMPL.h" +#include "system/enum_macros.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance/BinancePriceFilter.h b/src/app_sparkd/sparkd/md/binance/BinancePriceFilter.h index 16d3dc53f..6c611cbd7 100644 --- a/src/app_sparkd/sparkd/md/binance/BinancePriceFilter.h +++ b/src/app_sparkd/sparkd/md/binance/BinancePriceFilter.h @@ -1,8 +1,8 @@ #pragma once -#include "spark/io/JsonDumper.h" -#include "spark/io/JsonReader.h" #include "sparkd/md/binance/BinanceFilterType.h" +#include "system/json/json_dumper.h" +#include "system/json/json_reader.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance/BinancePriceStatistics.cpp b/src/app_sparkd/sparkd/md/binance/BinancePriceStatistics.cpp index fda8181ef..88b8a56ee 100644 --- a/src/app_sparkd/sparkd/md/binance/BinancePriceStatistics.cpp +++ b/src/app_sparkd/sparkd/md/binance/BinancePriceStatistics.cpp @@ -1,11 +1,11 @@ #include "BinancePriceStatistics.h" #include "domain/price.h" #include "domain/quantity.h" -#include "spark/core/TimeStamp.h" #include "spark/domain/SecurityMarketDataStatistics.h" -#include "spark/io/JsonDumper.h" -#include "spark/io/JsonReader.h" #include "sparkd/md/ccapi/CCApiReader.h" +#include "system/json/json_dumper.h" +#include "system/json/json_reader.h" +#include "system/time_stamp.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance/BinancePriceStatistics.h b/src/app_sparkd/sparkd/md/binance/BinancePriceStatistics.h index 5fcc050f3..aeb7999f5 100644 --- a/src/app_sparkd/sparkd/md/binance/BinancePriceStatistics.h +++ b/src/app_sparkd/sparkd/md/binance/BinancePriceStatistics.h @@ -1,6 +1,6 @@ #pragma once -#include "spark/core/TimeStamp.h" +#include "system/time_stamp.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance/BinanceQuoteAsset.h b/src/app_sparkd/sparkd/md/binance/BinanceQuoteAsset.h index f2e9fdb61..a5e0cdca3 100644 --- a/src/app_sparkd/sparkd/md/binance/BinanceQuoteAsset.h +++ b/src/app_sparkd/sparkd/md/binance/BinanceQuoteAsset.h @@ -1,8 +1,8 @@ #pragma once #include "domain/protobufs/currency.pb.h" -#include "spark/core/EnumMacros.h" -#include "spark/core/FMT_IMPL.h" +#include "system/FMT_IMPL.h" +#include "system/enum_macros.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance/BinanceSpot.cpp b/src/app_sparkd/sparkd/md/binance/BinanceSpot.cpp index 4cf22f6a6..dce6dd4d3 100644 --- a/src/app_sparkd/sparkd/md/binance/BinanceSpot.cpp +++ b/src/app_sparkd/sparkd/md/binance/BinanceSpot.cpp @@ -2,8 +2,8 @@ #include "domain/protobufs/venue.pb.h" #include "domain/quantity.h" #include "domain/security.h" -#include "spark/io/JsonReader.h" #include "spark/logging/logging.h" +#include "system/json/json_reader.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance/BinanceSpot.h b/src/app_sparkd/sparkd/md/binance/BinanceSpot.h index 996218f5f..2876dbd93 100644 --- a/src/app_sparkd/sparkd/md/binance/BinanceSpot.h +++ b/src/app_sparkd/sparkd/md/binance/BinanceSpot.h @@ -1,13 +1,13 @@ #pragma once #include "domain/protobufs/venue.h" -#include "spark/core/FMT_IMPL.h" -#include "spark/io/JsonMacros.h" #include "sparkd/md/binance/BinanceFilterTuple.h" #include "sparkd/md/binance/BinanceInstrumentStatus.h" #include "sparkd/md/binance/BinanceOrderType.h" #include "sparkd/md/binance/BinancePermission.h" #include "sparkd/md/binance/BinanceQuoteAsset.h" +#include "system/FMT_IMPL.h" +#include "system/json/json_macros.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance/BinanceSubscription.cpp b/src/app_sparkd/sparkd/md/binance/BinanceSubscription.cpp index 8c9dbfcfa..722db5f4d 100644 --- a/src/app_sparkd/sparkd/md/binance/BinanceSubscription.cpp +++ b/src/app_sparkd/sparkd/md/binance/BinanceSubscription.cpp @@ -3,7 +3,6 @@ #include "domain/security.h" #include "domain/security_criteria.h" #include "spark/api/md/BinanceMarketDataConfig.pb.h" -#include "spark/core/FMT.h" #include "spark/io/ProtoPrinter.h" #include "spark/io/QueryParams.h" #include "spark/logging/logging.h" @@ -18,6 +17,7 @@ #include "sparkd/md/ccapi/CCApiMessageLogger.h" #include "sparkd/md/ccapi/CCApiSession.h" #include "sparkd/md/ccapi/CCApiTradeAdaptor.h" +#include "system/FMT.h" #include "system/collections/unordered_set_factory.h" #include diff --git a/src/app_sparkd/sparkd/md/binance/BinanceTrailingDeltaFilter.h b/src/app_sparkd/sparkd/md/binance/BinanceTrailingDeltaFilter.h index 6278e043a..9cd975190 100644 --- a/src/app_sparkd/sparkd/md/binance/BinanceTrailingDeltaFilter.h +++ b/src/app_sparkd/sparkd/md/binance/BinanceTrailingDeltaFilter.h @@ -1,8 +1,8 @@ #pragma once -#include "spark/io/JsonDumper.h" -#include "spark/io/JsonReader.h" #include "sparkd/md/binance/BinanceFilterType.h" +#include "system/json/json_dumper.h" +#include "system/json/json_reader.h" #include diff --git a/src/app_sparkd/sparkd/md/binance_us/BinanceUsMessageType.h b/src/app_sparkd/sparkd/md/binance_us/BinanceUsMessageType.h index 161f55cf7..b2bc101a6 100644 --- a/src/app_sparkd/sparkd/md/binance_us/BinanceUsMessageType.h +++ b/src/app_sparkd/sparkd/md/binance_us/BinanceUsMessageType.h @@ -1,7 +1,7 @@ #pragma once -#include "spark/core/EnumMacros.h" -#include "spark/core/FMT_IMPL.h" +#include "system/FMT_IMPL.h" +#include "system/enum_macros.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance_us/BinanceUsPriceStatistics.cpp b/src/app_sparkd/sparkd/md/binance_us/BinanceUsPriceStatistics.cpp index 2ed32a7b4..d0ad63316 100644 --- a/src/app_sparkd/sparkd/md/binance_us/BinanceUsPriceStatistics.cpp +++ b/src/app_sparkd/sparkd/md/binance_us/BinanceUsPriceStatistics.cpp @@ -1,11 +1,11 @@ #include "BinanceUsPriceStatistics.h" #include "domain/price.h" #include "domain/quantity.h" -#include "spark/core/TimeStamp.h" #include "spark/domain/SecurityMarketDataStatistics.h" -#include "spark/io/JsonDumper.h" -#include "spark/io/JsonReader.h" #include "sparkd/md/ccapi/CCApiReader.h" +#include "system/json/json_dumper.h" +#include "system/json/json_reader.h" +#include "system/time_stamp.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance_us/BinanceUsPriceStatistics.h b/src/app_sparkd/sparkd/md/binance_us/BinanceUsPriceStatistics.h index 59c3976c9..e74ce342b 100644 --- a/src/app_sparkd/sparkd/md/binance_us/BinanceUsPriceStatistics.h +++ b/src/app_sparkd/sparkd/md/binance_us/BinanceUsPriceStatistics.h @@ -1,6 +1,6 @@ #pragma once -#include "spark/core/TimeStamp.h" +#include "system/time_stamp.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance_us/BinanceUsSubscription.cpp b/src/app_sparkd/sparkd/md/binance_us/BinanceUsSubscription.cpp index b16b918aa..3f7a2574d 100644 --- a/src/app_sparkd/sparkd/md/binance_us/BinanceUsSubscription.cpp +++ b/src/app_sparkd/sparkd/md/binance_us/BinanceUsSubscription.cpp @@ -3,7 +3,6 @@ #include "domain/security.h" #include "domain/security_criteria.h" #include "spark/api/md/BinanceUsMarketDataConfig.pb.h" -#include "spark/core/FMT.h" #include "spark/io/ProtoPrinter.h" #include "spark/io/QueryParams.h" #include "spark/logging/logging.h" @@ -19,6 +18,7 @@ #include "sparkd/md/ccapi/CCApiMessageLogger.h" #include "sparkd/md/ccapi/CCApiSession.h" #include "sparkd/md/ccapi/CCApiTradeAdaptor.h" +#include "system/FMT.h" #include "system/collections/unordered_set_factory.h" #include diff --git a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuture.cpp b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuture.cpp index 231239d1c..289a513d4 100644 --- a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuture.cpp +++ b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuture.cpp @@ -2,9 +2,9 @@ #include "domain/price.h" #include "domain/quantity.h" #include "domain/security.h" -#include "spark/io/JsonDumper.h" -#include "spark/io/JsonReader.h" #include "spark/logging/logging.h" +#include "system/json/json_dumper.h" +#include "system/json/json_reader.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesContractType.h b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesContractType.h index 1b80adfc5..3a1421d93 100644 --- a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesContractType.h +++ b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesContractType.h @@ -1,7 +1,7 @@ #pragma once -#include "spark/core/EnumMacros.h" -#include "spark/core/FMT_IMPL.h" +#include "system/FMT_IMPL.h" +#include "system/enum_macros.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesFilterTuple.h b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesFilterTuple.h index 0c780b8d1..2bc58ab30 100644 --- a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesFilterTuple.h +++ b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesFilterTuple.h @@ -1,7 +1,5 @@ #pragma once -#include "spark/io/JsonDumper.h" -#include "spark/io/JsonReader.h" #include "sparkd/md/binance/BinanceFilterType.h" #include "sparkd/md/binance/BinanceIcebergPartsFilter.h" #include "sparkd/md/binance/BinanceLotSizeFilter.h" @@ -14,6 +12,8 @@ #include "sparkd/md/binance_usds_futures/BinanceUsdsFuturesMaxNumAlgoOrdersFilter.h" #include "sparkd/md/binance_usds_futures/BinanceUsdsFuturesMaxNumOrdersFilter.h" #include "sparkd/md/binance_usds_futures/BinanceUsdsFuturesPercentPriceFilter.h" +#include "system/json/json_dumper.h" +#include "system/json/json_reader.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesMaxNumAlgoOrdersFilter.h b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesMaxNumAlgoOrdersFilter.h index ce32ad820..23e2a2019 100644 --- a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesMaxNumAlgoOrdersFilter.h +++ b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesMaxNumAlgoOrdersFilter.h @@ -1,8 +1,8 @@ #pragma once -#include "spark/io/JsonDumper.h" -#include "spark/io/JsonReader.h" #include "sparkd/md/binance/BinanceFilterType.h" +#include "system/json/json_dumper.h" +#include "system/json/json_reader.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesMaxNumOrdersFilter.h b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesMaxNumOrdersFilter.h index 85bff3366..0968b8e6e 100644 --- a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesMaxNumOrdersFilter.h +++ b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesMaxNumOrdersFilter.h @@ -1,8 +1,8 @@ #pragma once -#include "spark/io/JsonDumper.h" -#include "spark/io/JsonReader.h" #include "sparkd/md/binance/BinanceFilterType.h" +#include "system/json/json_dumper.h" +#include "system/json/json_reader.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesMessageType.h b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesMessageType.h index cbca2fe13..572f00bbd 100644 --- a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesMessageType.h +++ b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesMessageType.h @@ -1,7 +1,7 @@ #pragma once -#include "spark/core/EnumMacros.h" -#include "spark/core/FMT_IMPL.h" +#include "system/FMT_IMPL.h" +#include "system/enum_macros.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPercentPriceFilter.h b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPercentPriceFilter.h index 176b6c4d6..f5b121844 100644 --- a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPercentPriceFilter.h +++ b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPercentPriceFilter.h @@ -1,8 +1,8 @@ #pragma once -#include "spark/io/JsonDumper.h" -#include "spark/io/JsonReader.h" #include "sparkd/md/binance/BinanceFilterType.h" +#include "system/json/json_dumper.h" +#include "system/json/json_reader.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatistics.cpp b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatistics.cpp index 7468391d5..ef5e72946 100644 --- a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatistics.cpp +++ b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatistics.cpp @@ -2,8 +2,8 @@ #include "domain/price.h" #include "domain/quantity.h" #include "spark/domain/SecurityMarketDataStatistics.h" -#include "spark/io/JsonReader.h" #include "sparkd/md/ccapi/CCApiReader.h" +#include "system/json/json_reader.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatistics.h b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatistics.h index 43f2c65f4..918d2e918 100644 --- a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatistics.h +++ b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatistics.h @@ -1,7 +1,7 @@ #pragma once -#include "spark/io/JsonMacros.h" -#include "spark/io/JsonReader.h" +#include "system/json/json_macros.h" +#include "system/json/json_reader.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSecurityRequestor.cpp b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSecurityRequestor.cpp index 3ea925638..b53fe0a08 100644 --- a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSecurityRequestor.cpp +++ b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSecurityRequestor.cpp @@ -3,7 +3,6 @@ #include "domain/security_criteria.h" #include "domain/security_id.h" #include "spark/api/md/BinanceUsdsFuturesMarketDataConfig.pb.h" -#include "spark/core/FMT.h" #include "spark/logging/logging.h" #include "spark/persistence/IDGenerator.h" #include "spark/utils/bts_fatal.h" @@ -12,6 +11,7 @@ #include "sparkd/md/ccapi/CCApiCorrelationID.h" #include "sparkd/md/ccapi/CCApiMessageHandler.h" #include "sparkd/md/ccapi/CCApiSession.h" +#include "system/FMT.h" #include "system/collections/contains.h" #include "system/collections/remove.h" #include "system/collections/unordered_set_factory.h" diff --git a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSubscription.cpp b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSubscription.cpp index 9c801f71f..b1e62c3b1 100644 --- a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSubscription.cpp +++ b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSubscription.cpp @@ -4,7 +4,6 @@ #include "domain/security_criteria.h" #include "domain/security_id.h" #include "spark/api/md/BinanceUsdsFuturesMarketDataConfig.pb.h" -#include "spark/core/FMT.h" #include "spark/io/ProtoPrinter.h" #include "spark/io/QueryParams.h" #include "spark/logging/logging.h" @@ -17,6 +16,7 @@ #include "sparkd/md/ccapi/CCApiMarketDepthAdaptor.h" #include "sparkd/md/ccapi/CCApiSession.h" #include "sparkd/md/ccapi/CCApiTradeAdaptor.h" +#include "system/FMT.h" #include #include diff --git a/src/app_sparkd/sparkd/md/ccapi/CCApiCorrelationID.h b/src/app_sparkd/sparkd/md/ccapi/CCApiCorrelationID.h index 07b5f9ec0..e168bc16d 100644 --- a/src/app_sparkd/sparkd/md/ccapi/CCApiCorrelationID.h +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiCorrelationID.h @@ -1,9 +1,9 @@ #pragma once -#include "spark/core/FMT_IMPL.h" #include "spark/core/StringFinder.h" #include "spark/core/StringJoiner.h" #include "spark/utils/bts_assert.h" +#include "system/FMT_IMPL.h" #include #include diff --git a/src/app_sparkd/sparkd/md/ccapi/CCApiJsonRpcRouter.cpp b/src/app_sparkd/sparkd/md/ccapi/CCApiJsonRpcRouter.cpp index f9fa0cf28..687f5a730 100644 --- a/src/app_sparkd/sparkd/md/ccapi/CCApiJsonRpcRouter.cpp +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiJsonRpcRouter.cpp @@ -1,8 +1,8 @@ #include "CCApiJsonRpcRouter.h" -#include "spark/algorithm/TryCatch.h" #include "spark/io/websocket/JsonRpcHandler.h" #include "spark/utils/bts_fatal.h" #include "sparkd/md/ccapi/CCApiReader.h" +#include "system/algorithm/try_catch.h" #include #include diff --git a/src/app_sparkd/sparkd/md/ccapi/CCApiMessageLogger.cpp b/src/app_sparkd/sparkd/md/ccapi/CCApiMessageLogger.cpp index fcdb352b6..3fe95665b 100644 --- a/src/app_sparkd/sparkd/md/ccapi/CCApiMessageLogger.cpp +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiMessageLogger.cpp @@ -1,6 +1,6 @@ #include "CCApiMessageLogger.h" #include "spark/core/StringJoiner.h" -#include "spark/core/TimeStamp.h" +#include "system/time_stamp.h" #include #include diff --git a/src/app_sparkd/sparkd/md/ccapi/CCApiTradeAdaptor.cpp b/src/app_sparkd/sparkd/md/ccapi/CCApiTradeAdaptor.cpp index 8562bad2f..8a9736083 100644 --- a/src/app_sparkd/sparkd/md/ccapi/CCApiTradeAdaptor.cpp +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiTradeAdaptor.cpp @@ -1,11 +1,11 @@ #include "CCApiTradeAdaptor.h" #include "domain/security_id.h" #include "domain/trade_record.h" -#include "spark/core/TimeStamp.h" #include "spark/utils/bts_fatal.h" #include "sparkd/md/ccapi/CCApiCorrelationID.h" #include "sparkd/md/ccapi/CCApiTradeRecord.h" #include "sparkd/md/ccapi/ICCApiMessageHandler.h" +#include "system/time_stamp.h" #include #include diff --git a/src/app_sparkd/sparkd/md/ccapi/CCApiTradeRecord.cpp b/src/app_sparkd/sparkd/md/ccapi/CCApiTradeRecord.cpp index 5477bd8dd..0f2d49897 100644 --- a/src/app_sparkd/sparkd/md/ccapi/CCApiTradeRecord.cpp +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiTradeRecord.cpp @@ -3,11 +3,11 @@ #include "domain/protobufs/aggressor_side.pb.h" #include "domain/quantity.h" #include "domain/trade_record.h" -#include "spark/io/JsonDumper.h" -#include "spark/io/JsonReader.h" #include "spark/utils/bts_chrono.h" #include "spark/utils/datetime.h" #include "sparkd/md/ccapi/CCApiReader.h" +#include "system/json/json_dumper.h" +#include "system/json/json_reader.h" #include #include diff --git a/src/app_sparkd/sparkd/md/coinbase/CoinbaseMessageType.h b/src/app_sparkd/sparkd/md/coinbase/CoinbaseMessageType.h index 82401250b..c3c0eed12 100644 --- a/src/app_sparkd/sparkd/md/coinbase/CoinbaseMessageType.h +++ b/src/app_sparkd/sparkd/md/coinbase/CoinbaseMessageType.h @@ -1,7 +1,7 @@ #pragma once -#include "spark/core/EnumMacros.h" -#include "spark/core/FMT_IMPL.h" +#include "system/FMT_IMPL.h" +#include "system/enum_macros.h" #include #include diff --git a/src/app_sparkd/sparkd/md/coinbase/CoinbasePriceStatistics.cpp b/src/app_sparkd/sparkd/md/coinbase/CoinbasePriceStatistics.cpp index b60bd3e46..e3cbf7398 100644 --- a/src/app_sparkd/sparkd/md/coinbase/CoinbasePriceStatistics.cpp +++ b/src/app_sparkd/sparkd/md/coinbase/CoinbasePriceStatistics.cpp @@ -1,11 +1,11 @@ #include "CoinbasePriceStatistics.h" #include "domain/price.h" #include "domain/quantity.h" -#include "spark/core/TimeStamp.h" #include "spark/domain/SecurityMarketDataStatistics.h" -#include "spark/io/JsonDumper.h" -#include "spark/io/JsonReader.h" #include "sparkd/md/ccapi/CCApiReader.h" +#include "system/json/json_dumper.h" +#include "system/json/json_reader.h" +#include "system/time_stamp.h" #include #include diff --git a/src/app_sparkd/sparkd/md/coinbase/CoinbasePriceStatistics.h b/src/app_sparkd/sparkd/md/coinbase/CoinbasePriceStatistics.h index c13dc386c..8580871c6 100644 --- a/src/app_sparkd/sparkd/md/coinbase/CoinbasePriceStatistics.h +++ b/src/app_sparkd/sparkd/md/coinbase/CoinbasePriceStatistics.h @@ -1,6 +1,6 @@ #pragma once -#include "spark/core/TimeStamp.h" +#include "system/time_stamp.h" #include #include diff --git a/src/app_sparkd/sparkd/md/coinbase/CoinbaseSpot.cpp b/src/app_sparkd/sparkd/md/coinbase/CoinbaseSpot.cpp index d297f3405..b00b37b99 100644 --- a/src/app_sparkd/sparkd/md/coinbase/CoinbaseSpot.cpp +++ b/src/app_sparkd/sparkd/md/coinbase/CoinbaseSpot.cpp @@ -2,8 +2,8 @@ #include "domain/protobufs/currency.pb.h" #include "domain/quantity.h" #include "domain/security.h" -#include "spark/io/JsonReader.h" #include "spark/logging/logging.h" +#include "system/json/json_reader.h" #include #include diff --git a/src/app_sparkd/sparkd/md/deribit/DeribitChannelDemuxer.cpp b/src/app_sparkd/sparkd/md/deribit/DeribitChannelDemuxer.cpp index 66e0f6670..49cb0f1ab 100644 --- a/src/app_sparkd/sparkd/md/deribit/DeribitChannelDemuxer.cpp +++ b/src/app_sparkd/sparkd/md/deribit/DeribitChannelDemuxer.cpp @@ -1,7 +1,7 @@ #include "DeribitChannelDemuxer.h" -#include "spark/io/JsonReader.h" #include "sparkd/md/ccapi/CCApiCorrelationID.h" #include "sparkd/md/ccapi/CCApiReader.h" +#include "system/json/json_reader.h" #include #include diff --git a/src/app_sparkd/sparkd/md/deribit/DeribitCombo.cpp b/src/app_sparkd/sparkd/md/deribit/DeribitCombo.cpp index d8bddc267..828af2575 100644 --- a/src/app_sparkd/sparkd/md/deribit/DeribitCombo.cpp +++ b/src/app_sparkd/sparkd/md/deribit/DeribitCombo.cpp @@ -1,6 +1,6 @@ #include "DeribitCombo.h" -#include "spark/core/FMT.h" -#include "spark/io/JsonReader.h" +#include "system/FMT.h" +#include "system/json/json_reader.h" #include #include diff --git a/src/app_sparkd/sparkd/md/deribit/DeribitCombo.h b/src/app_sparkd/sparkd/md/deribit/DeribitCombo.h index 684204c12..49a649828 100644 --- a/src/app_sparkd/sparkd/md/deribit/DeribitCombo.h +++ b/src/app_sparkd/sparkd/md/deribit/DeribitCombo.h @@ -1,7 +1,7 @@ #pragma once -#include "spark/core/TimeStamp.h" #include "sparkd/md/deribit/DeribitComboLeg.h" +#include "system/time_stamp.h" #include #include diff --git a/src/app_sparkd/sparkd/md/deribit/DeribitComboLeg.h b/src/app_sparkd/sparkd/md/deribit/DeribitComboLeg.h index a30ccbb3d..35bce0590 100644 --- a/src/app_sparkd/sparkd/md/deribit/DeribitComboLeg.h +++ b/src/app_sparkd/sparkd/md/deribit/DeribitComboLeg.h @@ -1,6 +1,6 @@ #pragma once -#include "spark/core/FMT_IMPL.h" +#include "system/FMT_IMPL.h" #include #include diff --git a/src/app_sparkd/sparkd/md/deribit/DeribitComboRequest.h b/src/app_sparkd/sparkd/md/deribit/DeribitComboRequest.h index 1f532fede..fe1adc36e 100644 --- a/src/app_sparkd/sparkd/md/deribit/DeribitComboRequest.h +++ b/src/app_sparkd/sparkd/md/deribit/DeribitComboRequest.h @@ -1,8 +1,8 @@ #pragma once -#include "spark/core/BoolName.h" -#include "spark/core/FMT.h" -#include "spark/core/FMT_IMPL.h" +#include "system/FMT.h" +#include "system/FMT_IMPL.h" +#include "system/bool_name.h" #include #include diff --git a/src/app_sparkd/sparkd/md/deribit/DeribitInstrument.cpp b/src/app_sparkd/sparkd/md/deribit/DeribitInstrument.cpp index 04560ac6b..7baa18981 100644 --- a/src/app_sparkd/sparkd/md/deribit/DeribitInstrument.cpp +++ b/src/app_sparkd/sparkd/md/deribit/DeribitInstrument.cpp @@ -1,5 +1,5 @@ #include "DeribitInstrument.h" -#include "spark/io/JsonReader.h" +#include "system/json/json_reader.h" #include #include diff --git a/src/app_sparkd/sparkd/md/deribit/DeribitInstrument.h b/src/app_sparkd/sparkd/md/deribit/DeribitInstrument.h index 8de2c2f0a..c423fae50 100644 --- a/src/app_sparkd/sparkd/md/deribit/DeribitInstrument.h +++ b/src/app_sparkd/sparkd/md/deribit/DeribitInstrument.h @@ -1,7 +1,7 @@ #pragma once -#include "spark/core/TimeStamp.h" #include "sparkd/md/deribit/DeribitInstrumentKind.h" +#include "system/time_stamp.h" #include #include diff --git a/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentKind.h b/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentKind.h index a8dbf2e19..2d3233ff4 100644 --- a/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentKind.h +++ b/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentKind.h @@ -2,10 +2,10 @@ #include "domain/protobufs/security_type.pb.h" #include "spark/algorithm/StringCaseConverter.h" -#include "spark/core/EnumMacros.h" -#include "spark/core/FMT_IMPL.h" #include "spark/domain_model/Security.pb.h" +#include "system/FMT_IMPL.h" #include "system/collections/HASH_IMPL.h" +#include "system/enum_macros.h" #include #include diff --git a/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentRequest.h b/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentRequest.h index ff4bed44a..09f22c186 100644 --- a/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentRequest.h +++ b/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentRequest.h @@ -2,9 +2,9 @@ #include "domain/security_criteria.h" #include "domain/security_criteria_clause.h" -#include "spark/core/FMT.h" -#include "spark/core/FMT_IMPL.h" #include "sparkd/md/deribit/DeribitInstrumentKind.h" +#include "system/FMT.h" +#include "system/FMT_IMPL.h" #include "system/collections/contains.h" #include diff --git a/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentState.h b/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentState.h index b1aa5ab40..023ecef45 100644 --- a/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentState.h +++ b/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentState.h @@ -1,11 +1,10 @@ #pragma once -#include "spark/core/FMT_IMPL.h" -#include "spark/core/TimeStamp.h" #include "sparkd/md/deribit/DeribitInstrumentStateType.h" +#include "system/FMT_IMPL.h" +#include "system/time_stamp.h" -#include -#include +#include #include #include diff --git a/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentStateType.h b/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentStateType.h index d3e01e193..540ef3178 100644 --- a/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentStateType.h +++ b/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentStateType.h @@ -1,7 +1,7 @@ #pragma once -#include "spark/core/EnumMacros.h" -#include "spark/core/FMT_IMPL.h" +#include "system/FMT_IMPL.h" +#include "system/enum_macros.h" #include #include diff --git a/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentStore.cpp b/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentStore.cpp index c79ed85cf..9d0259780 100644 --- a/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentStore.cpp +++ b/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentStore.cpp @@ -1,7 +1,6 @@ #include "DeribitInstrumentStore.h" #include "domain/protobufs/security_type.h" #include "domain/security.h" -#include "spark/io/JsonReader.h" #include "spark/logging/logging.h" #include "spark/persistence/IDGenerator.h" #include "spark/utils/bts_fatal.h" @@ -9,6 +8,7 @@ #include "sparkd/md/deribit/DeribitInstrument.h" #include "system/collections/contains.h" #include "system/collections/remove.h" +#include "system/json/json_reader.h" #include #include diff --git a/src/app_sparkd/sparkd/md/deribit/DeribitMessageType.h b/src/app_sparkd/sparkd/md/deribit/DeribitMessageType.h index 91006adef..2b8fa940d 100644 --- a/src/app_sparkd/sparkd/md/deribit/DeribitMessageType.h +++ b/src/app_sparkd/sparkd/md/deribit/DeribitMessageType.h @@ -1,7 +1,7 @@ #pragma once -#include "spark/core/EnumMacros.h" -#include "spark/core/FMT_IMPL.h" +#include "system/FMT_IMPL.h" +#include "system/enum_macros.h" #include #include diff --git a/src/app_sparkd/sparkd/md/deribit/DeribitSubscription.cpp b/src/app_sparkd/sparkd/md/deribit/DeribitSubscription.cpp index 8231f041f..2b0cf6ec0 100644 --- a/src/app_sparkd/sparkd/md/deribit/DeribitSubscription.cpp +++ b/src/app_sparkd/sparkd/md/deribit/DeribitSubscription.cpp @@ -3,8 +3,6 @@ #include "domain/security.h" #include "domain/security_criteria.h" #include "spark/api/md/DeribitMarketDataConfig.pb.h" -#include "spark/core/FMT.h" -#include "spark/core/TimeStamp.h" #include "spark/domain_model/Security.pb.h" #include "spark/io/ProtoPrinter.h" #include "spark/io/websocket/JsonRpcError.h" @@ -23,10 +21,12 @@ #include "sparkd/md/deribit/DeribitSecurityRequestor.h" #include "sparkd/md/deribit/DeribitTickerAdaptor.h" #include "sparkd/md/deribit/DeribitTradeAdaptor.h" +#include "system/FMT.h" #include "system/collections/chunk.h" #include "system/collections/contains.h" #include "system/collections/remove.h" #include "system/collections/transform.h" +#include "system/time_stamp.h" #include #include diff --git a/src/app_sparkd/sparkd/md/deribit/DeribitTickerAdaptor.cpp b/src/app_sparkd/sparkd/md/deribit/DeribitTickerAdaptor.cpp index 14cd11e60..6b3b918a5 100644 --- a/src/app_sparkd/sparkd/md/deribit/DeribitTickerAdaptor.cpp +++ b/src/app_sparkd/sparkd/md/deribit/DeribitTickerAdaptor.cpp @@ -1,8 +1,8 @@ #include "DeribitTickerAdaptor.h" #include "domain/security_id.h" #include "spark/domain/SecurityMarketDataStatistics.h" -#include "spark/io/JsonReader.h" #include "spark/md/IMarketDataListener.h" +#include "system/json/json_reader.h" #include diff --git a/src/app_sparkd/sparkd/md/deribit/DeribitTradeAdaptor.cpp b/src/app_sparkd/sparkd/md/deribit/DeribitTradeAdaptor.cpp index c8417d90d..373c3ec9f 100644 --- a/src/app_sparkd/sparkd/md/deribit/DeribitTradeAdaptor.cpp +++ b/src/app_sparkd/sparkd/md/deribit/DeribitTradeAdaptor.cpp @@ -2,9 +2,9 @@ #include "domain/protobufs/aggressor_side.pb.h" #include "domain/security_id.h" #include "domain/trade_record.h" -#include "spark/core/TimeStamp.h" #include "spark/md/IMarketDataListener.h" #include "spark/utils/bts_fatal.h" +#include "system/time_stamp.h" #include #include diff --git a/src/app_sparkd/sparkd/md/ftx/FTXFuture.cpp b/src/app_sparkd/sparkd/md/ftx/FTXFuture.cpp index 2b0db716c..9f9878ca6 100644 --- a/src/app_sparkd/sparkd/md/ftx/FTXFuture.cpp +++ b/src/app_sparkd/sparkd/md/ftx/FTXFuture.cpp @@ -4,8 +4,8 @@ #include "domain/protobufs/venue.pb.h" #include "domain/security.h" #include "spark/core/TableFormatter.h" -#include "spark/io/JsonReader.h" #include "spark/logging/logging.h" +#include "system/json/json_reader.h" #include #include diff --git a/src/app_sparkd/sparkd/md/ftx/FTXFuture.h b/src/app_sparkd/sparkd/md/ftx/FTXFuture.h index 22a21cdcc..b6ce9f5a0 100644 --- a/src/app_sparkd/sparkd/md/ftx/FTXFuture.h +++ b/src/app_sparkd/sparkd/md/ftx/FTXFuture.h @@ -1,7 +1,7 @@ #pragma once -#include "spark/core/TimeStamp.h" #include "sparkd/md/ftx/FTXSecurityType.h" +#include "system/time_stamp.h" #include #include diff --git a/src/app_sparkd/sparkd/md/ftx/FTXHistoricalPriceRecord.cpp b/src/app_sparkd/sparkd/md/ftx/FTXHistoricalPriceRecord.cpp index 062eb78c3..e38dd7768 100644 --- a/src/app_sparkd/sparkd/md/ftx/FTXHistoricalPriceRecord.cpp +++ b/src/app_sparkd/sparkd/md/ftx/FTXHistoricalPriceRecord.cpp @@ -1,8 +1,8 @@ #include "FTXHistoricalPriceRecord.h" -#include "spark/domain/Price.h" +#include "domain/price.h" #include "spark/domain/SecurityMarketDataStatistics.h" -#include "spark/io/JsonReader.h" #include "sparkd/md/ccapi/CCApiReader.h" +#include "system/json/json_reader.h" #include #include diff --git a/src/app_sparkd/sparkd/md/ftx/FTXHistoricalPriceRecord.h b/src/app_sparkd/sparkd/md/ftx/FTXHistoricalPriceRecord.h index 629a7c455..1b5882319 100644 --- a/src/app_sparkd/sparkd/md/ftx/FTXHistoricalPriceRecord.h +++ b/src/app_sparkd/sparkd/md/ftx/FTXHistoricalPriceRecord.h @@ -1,7 +1,7 @@ #pragma once #include "domain/security_id.h" -#include "spark/core/TimeStamp.h" +#include "system/time_stamp.h" #include diff --git a/src/app_sparkd/sparkd/md/ftx/FTXMarket.cpp b/src/app_sparkd/sparkd/md/ftx/FTXMarket.cpp index a643c74e9..ccc7caaa5 100644 --- a/src/app_sparkd/sparkd/md/ftx/FTXMarket.cpp +++ b/src/app_sparkd/sparkd/md/ftx/FTXMarket.cpp @@ -3,10 +3,10 @@ #include "domain/security.h" #include "spark/core/NaN.h" #include "spark/core/TableFormatter.h" -#include "spark/io/JsonReader.h" #include "spark/logging/logging.h" #include "spark/utils/bts_fatal.h" #include "sparkd/md/ftx/FTXSecurityType.h" +#include "system/json/json_reader.h" #include #include diff --git a/src/app_sparkd/sparkd/md/ftx/FTXMessageType.h b/src/app_sparkd/sparkd/md/ftx/FTXMessageType.h index bea5250e1..33f0c50c6 100644 --- a/src/app_sparkd/sparkd/md/ftx/FTXMessageType.h +++ b/src/app_sparkd/sparkd/md/ftx/FTXMessageType.h @@ -1,7 +1,7 @@ #pragma once -#include "spark/core/EnumMacros.h" -#include "spark/core/FMT_IMPL.h" +#include "system/FMT_IMPL.h" +#include "system/enum_macros.h" #include #include diff --git a/src/app_sparkd/sparkd/md/ftx/FTXSecurityType.h b/src/app_sparkd/sparkd/md/ftx/FTXSecurityType.h index c8e7ddbc6..5a476ea6e 100644 --- a/src/app_sparkd/sparkd/md/ftx/FTXSecurityType.h +++ b/src/app_sparkd/sparkd/md/ftx/FTXSecurityType.h @@ -1,8 +1,8 @@ #pragma once #include "domain/protobufs/security_type.pb.h" -#include "spark/core/EnumMacros.h" -#include "spark/core/FMT_IMPL.h" +#include "system/FMT_IMPL.h" +#include "system/enum_macros.h" #include diff --git a/src/app_sparkd/sparkd/md/okx/OkxChannel.h b/src/app_sparkd/sparkd/md/okx/OkxChannel.h index a15239e96..0991c4aa5 100644 --- a/src/app_sparkd/sparkd/md/okx/OkxChannel.h +++ b/src/app_sparkd/sparkd/md/okx/OkxChannel.h @@ -1,8 +1,8 @@ #pragma once -#include "spark/core/FMT_IMPL.h" #include "spark/io/JsonOptional.h" #include "sparkd/md/okx/OkxInstrumentType.h" +#include "system/FMT_IMPL.h" #include "system/collections/HASH_IMPL.h" #include diff --git a/src/app_sparkd/sparkd/md/okx/OkxChannelDemuxer.cpp b/src/app_sparkd/sparkd/md/okx/OkxChannelDemuxer.cpp index 42233e268..efe1fb150 100644 --- a/src/app_sparkd/sparkd/md/okx/OkxChannelDemuxer.cpp +++ b/src/app_sparkd/sparkd/md/okx/OkxChannelDemuxer.cpp @@ -1,9 +1,9 @@ #include "OkxChannelDemuxer.h" #include "domain/protobufs/venue.h" -#include "spark/io/JsonReader.h" #include "sparkd/md/ccapi/CCApiCorrelationID.h" #include "sparkd/md/ccapi/CCApiReader.h" #include "sparkd/md/okx/OkxChannel.h" +#include "system/json/json_reader.h" #include #include diff --git a/src/app_sparkd/sparkd/md/okx/OkxDepthAdaptor.cpp b/src/app_sparkd/sparkd/md/okx/OkxDepthAdaptor.cpp index dfe4857ca..13abe46ec 100644 --- a/src/app_sparkd/sparkd/md/okx/OkxDepthAdaptor.cpp +++ b/src/app_sparkd/sparkd/md/okx/OkxDepthAdaptor.cpp @@ -2,10 +2,10 @@ #include "domain/book.h" #include "domain/book_level_comp.h" #include "domain/security_id.h" -#include "spark/io/JsonReader.h" #include "spark/logging/logging.h" #include "spark/md/IMarketDataListener.h" #include "sparkd/md/ccapi/CCApiCorrelationID.h" +#include "system/json/json_reader.h" #include #include diff --git a/src/app_sparkd/sparkd/md/okx/OkxInstrument.cpp b/src/app_sparkd/sparkd/md/okx/OkxInstrument.cpp index 38dffba8b..3e36c4351 100644 --- a/src/app_sparkd/sparkd/md/okx/OkxInstrument.cpp +++ b/src/app_sparkd/sparkd/md/okx/OkxInstrument.cpp @@ -1,5 +1,5 @@ #include "OkxInstrument.h" -#include "spark/io/JsonReader.h" +#include "system/json/json_reader.h" namespace bts::md::okx { diff --git a/src/app_sparkd/sparkd/md/okx/OkxInstrument.h b/src/app_sparkd/sparkd/md/okx/OkxInstrument.h index 3b15f9031..a9c734560 100644 --- a/src/app_sparkd/sparkd/md/okx/OkxInstrument.h +++ b/src/app_sparkd/sparkd/md/okx/OkxInstrument.h @@ -1,8 +1,8 @@ #pragma once -#include "spark/core/TimeStamp.h" #include "sparkd/md/okx/OkxInstrumentStatus.h" #include "sparkd/md/okx/OkxInstrumentType.h" +#include "system/time_stamp.h" #include #include diff --git a/src/app_sparkd/sparkd/md/okx/OkxInstrumentStatus.h b/src/app_sparkd/sparkd/md/okx/OkxInstrumentStatus.h index 16b760216..65975bcea 100644 --- a/src/app_sparkd/sparkd/md/okx/OkxInstrumentStatus.h +++ b/src/app_sparkd/sparkd/md/okx/OkxInstrumentStatus.h @@ -1,8 +1,8 @@ #pragma once #include "spark/algorithm/StringCaseConverter.h" -#include "spark/core/EnumMacros.h" -#include "spark/core/FMT_IMPL.h" +#include "system/FMT_IMPL.h" +#include "system/enum_macros.h" #include #include diff --git a/src/app_sparkd/sparkd/md/okx/OkxInstrumentType.h b/src/app_sparkd/sparkd/md/okx/OkxInstrumentType.h index 4da64e8d5..d4d84a30e 100644 --- a/src/app_sparkd/sparkd/md/okx/OkxInstrumentType.h +++ b/src/app_sparkd/sparkd/md/okx/OkxInstrumentType.h @@ -1,7 +1,7 @@ #pragma once -#include "spark/core/EnumMacros.h" -#include "spark/core/FMT_IMPL.h" +#include "system/FMT_IMPL.h" +#include "system/enum_macros.h" #include #include diff --git a/src/app_sparkd/sparkd/md/okx/OkxMessageType.h b/src/app_sparkd/sparkd/md/okx/OkxMessageType.h index 2af1f9bf7..523d96239 100644 --- a/src/app_sparkd/sparkd/md/okx/OkxMessageType.h +++ b/src/app_sparkd/sparkd/md/okx/OkxMessageType.h @@ -1,6 +1,6 @@ #pragma once -#include "spark/core/EnumMacros.h" +#include "system/enum_macros.h" #include #include diff --git a/src/app_sparkd/sparkd/md/okx/OkxSecuritySubscription.cpp b/src/app_sparkd/sparkd/md/okx/OkxSecuritySubscription.cpp index a149fca1d..e446cfbf2 100644 --- a/src/app_sparkd/sparkd/md/okx/OkxSecuritySubscription.cpp +++ b/src/app_sparkd/sparkd/md/okx/OkxSecuritySubscription.cpp @@ -1,6 +1,5 @@ #include "OkxSecuritySubscription.h" #include "domain/security_criteria.h" -#include "spark/io/JsonReader.h" #include "sparkd/md/ccapi/CCApiCorrelationID.h" #include "sparkd/md/ccapi/CCApiHttpParams.h" #include "sparkd/md/ccapi/CCApiMessageHandler.h" @@ -16,6 +15,7 @@ #include "sparkd/md/okx/OkxRequest.h" #include "system/collections/contains.h" #include "system/collections/remove.h" +#include "system/json/json_reader.h" #include #include diff --git a/src/app_sparkd/sparkd/md/okx/OkxSide.h b/src/app_sparkd/sparkd/md/okx/OkxSide.h index d02310cc7..36196bb8f 100644 --- a/src/app_sparkd/sparkd/md/okx/OkxSide.h +++ b/src/app_sparkd/sparkd/md/okx/OkxSide.h @@ -2,8 +2,8 @@ #include "domain/protobufs/aggressor_side.pb.h" #include "domain/side.h" -#include "spark/core/EnumMacros.h" -#include "spark/core/FMT_IMPL.h" +#include "system/FMT_IMPL.h" +#include "system/enum_macros.h" #include #include diff --git a/src/app_sparkd/sparkd/md/okx/OkxSubscription.cpp b/src/app_sparkd/sparkd/md/okx/OkxSubscription.cpp index 8964d7baa..ab9b67d56 100644 --- a/src/app_sparkd/sparkd/md/okx/OkxSubscription.cpp +++ b/src/app_sparkd/sparkd/md/okx/OkxSubscription.cpp @@ -3,7 +3,6 @@ #include "domain/security.h" #include "domain/security_criteria.h" #include "spark/api/md/OkxMarketDataConfig.pb.h" -#include "spark/core/FMT.h" #include "spark/io/ProtoPrinter.h" #include "spark/logging/logging.h" #include "spark/md/IMarketDataListener.h" @@ -17,6 +16,7 @@ #include "sparkd/md/okx/OkxSecuritySubscription.h" #include "sparkd/md/okx/OkxTickerAdaptor.h" #include "sparkd/md/okx/OkxTradeAdaptor.h" +#include "system/FMT.h" #include "system/collections/chunk.h" #include "system/collections/contains.h" #include "system/collections/transform.h" diff --git a/src/app_sparkd/sparkd/md/okx/OkxTicker.cpp b/src/app_sparkd/sparkd/md/okx/OkxTicker.cpp index e1f73da6d..7764f8973 100644 --- a/src/app_sparkd/sparkd/md/okx/OkxTicker.cpp +++ b/src/app_sparkd/sparkd/md/okx/OkxTicker.cpp @@ -1,5 +1,5 @@ #include "OkxTicker.h" -#include "spark/io/JsonReader.h" +#include "system/json/json_reader.h" #include diff --git a/src/app_sparkd/sparkd/md/okx/OkxTicker.h b/src/app_sparkd/sparkd/md/okx/OkxTicker.h index d1bdfe82b..aad8a14c2 100644 --- a/src/app_sparkd/sparkd/md/okx/OkxTicker.h +++ b/src/app_sparkd/sparkd/md/okx/OkxTicker.h @@ -2,8 +2,8 @@ #include "domain/price.h" #include "domain/quantity.h" -#include "spark/core/TimeStamp.h" #include "sparkd/md/okx/OkxInstrumentType.h" +#include "system/time_stamp.h" #include #include diff --git a/src/app_sparkd/sparkd/md/okx/OkxTickerAdaptor.cpp b/src/app_sparkd/sparkd/md/okx/OkxTickerAdaptor.cpp index 660c33416..a9783db94 100644 --- a/src/app_sparkd/sparkd/md/okx/OkxTickerAdaptor.cpp +++ b/src/app_sparkd/sparkd/md/okx/OkxTickerAdaptor.cpp @@ -2,10 +2,10 @@ #include "domain/price.h" #include "domain/security_id.h" #include "spark/domain/SecurityMarketDataStatistics.h" -#include "spark/io/JsonReader.h" #include "spark/md/IMarketDataListener.h" #include "sparkd/md/ccapi/CCApiCorrelationID.h" #include "sparkd/md/okx/OkxTicker.h" +#include "system/json/json_reader.h" #include #include diff --git a/src/app_sparkd/sparkd/md/okx/OkxTrade.cpp b/src/app_sparkd/sparkd/md/okx/OkxTrade.cpp index 367ea89f6..f3b3659b1 100644 --- a/src/app_sparkd/sparkd/md/okx/OkxTrade.cpp +++ b/src/app_sparkd/sparkd/md/okx/OkxTrade.cpp @@ -1,5 +1,5 @@ #include "OkxTrade.h" -#include "spark/io/JsonReader.h" +#include "system/json/json_reader.h" #include diff --git a/src/app_sparkd/sparkd/md/okx/OkxTrade.h b/src/app_sparkd/sparkd/md/okx/OkxTrade.h index abb94f833..1fceb7ac1 100644 --- a/src/app_sparkd/sparkd/md/okx/OkxTrade.h +++ b/src/app_sparkd/sparkd/md/okx/OkxTrade.h @@ -2,8 +2,8 @@ #include "domain/price.h" #include "domain/quantity.h" -#include "spark/core/TimeStamp.h" #include "sparkd/md/okx/OkxSide.h" +#include "system/time_stamp.h" #include #include diff --git a/src/app_sparkd/sparkd/md/okx/OkxTradeAdaptor.cpp b/src/app_sparkd/sparkd/md/okx/OkxTradeAdaptor.cpp index 2b65234e1..47d27ebf2 100644 --- a/src/app_sparkd/sparkd/md/okx/OkxTradeAdaptor.cpp +++ b/src/app_sparkd/sparkd/md/okx/OkxTradeAdaptor.cpp @@ -1,11 +1,11 @@ #include "OkxTradeAdaptor.h" #include "domain/security_id.h" #include "domain/trade_record.h" -#include "spark/io/JsonReader.h" #include "spark/md/IMarketDataListener.h" #include "spark/utils/bts_fatal.h" #include "sparkd/md/ccapi/CCApiCorrelationID.h" #include "sparkd/md/okx/OkxTrade.h" +#include "system/json/json_reader.h" #include #include diff --git a/src/app_sparkd/sparkd/md/recording/MDRecorder.cpp b/src/app_sparkd/sparkd/md/recording/MDRecorder.cpp index 38e6bf338..75813d0d1 100644 --- a/src/app_sparkd/sparkd/md/recording/MDRecorder.cpp +++ b/src/app_sparkd/sparkd/md/recording/MDRecorder.cpp @@ -5,7 +5,6 @@ #include "spark/api/services/MarketDataRelay.pb.h" #include "spark/config/config.h" #include "spark/config/protos/system_config.pb.h" -#include "spark/core/TimeStamp.h" #include "spark/domain_model/Security.pb.h" #include "spark/logging/logging.h" #include "spark/md/MDClient.h" @@ -19,6 +18,7 @@ #include "spark/utils/bts_assert.h" #include "spark/utils/datetime.h" #include "spark/utils/thread_manager.h" +#include "system/time_stamp.h" #include #include diff --git a/src/app_sparkd/sparkd/md/recording/MDReplayer.cpp b/src/app_sparkd/sparkd/md/recording/MDReplayer.cpp index e4252e61d..623968bd2 100644 --- a/src/app_sparkd/sparkd/md/recording/MDReplayer.cpp +++ b/src/app_sparkd/sparkd/md/recording/MDReplayer.cpp @@ -7,7 +7,6 @@ #include "domain/security_id.h" #include "domain/side.h" #include "domain/trade_record.h" -#include "spark/core/TimeStamp.h" #include "spark/domain/DomainSecurityUtils.h" #include "spark/domain/SecurityMarketDataStatistics.h" #include "spark/domain_model/Security.pb.h" @@ -21,6 +20,7 @@ #include "spark/utils/PBUtils.h" #include "spark/utils/bts_assert.h" #include "sparkd/md/recording/MDRecorder.h" +#include "system/time_stamp.h" #include #include diff --git a/src/app_sparkd/sparkd/position/import/DownloadWindow.h b/src/app_sparkd/sparkd/position/import/DownloadWindow.h index 3aee271d6..4745b0dc8 100644 --- a/src/app_sparkd/sparkd/position/import/DownloadWindow.h +++ b/src/app_sparkd/sparkd/position/import/DownloadWindow.h @@ -1,7 +1,7 @@ #pragma once -#include "spark/core/FMT_IMPL.h" #include "spark/utils/datetime.h" +#include "system/FMT_IMPL.h" #include #include diff --git a/src/lib_spark/spark/algorithm/TryCatch.h b/src/lib_spark/spark/algorithm/TryCatch.h deleted file mode 100644 index a6e31b56a..000000000 --- a/src/lib_spark/spark/algorithm/TryCatch.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#include "system/algorithm/try_catch.h" diff --git a/src/lib_spark/spark/all_cpps.txt b/src/lib_spark/spark/all_cpps.txt new file mode 100644 index 000000000..db41c2339 --- /dev/null +++ b/src/lib_spark/spark/all_cpps.txt @@ -0,0 +1,348 @@ +./api/core/ApiClientInterop.cpp +./api/core/ApiServerInterop.cpp +./api/md/MarketDataConfigUtils.cpp +./api/public/ApiServer.cpp +./api/public/ClientChannel.cpp +./api/public/QuickbusClientChannel.cpp +./api/public/ServerChannel.cpp +./api/public/ServiceContext.cpp +./api/service_helpers/AdminServiceUtils.cpp +./api/service_helpers/AlgoServiceUtils.cpp +./api/service_helpers/PositionUtilities.cpp +./api/test/ApiTests.cpp +./api/test/HelloServiceServer.cpp +./communincation/websockets/tests/WebsocketSyncClientTests.cpp +./config/ConfigDownloader.cpp +./config/ConfigErrorCollector.cpp +./config/ConfigPropertyEvaluator.cpp +./config/ConfigQuerier.cpp +./config/ConfigValueQueue.cpp +./config/ConfigurationException.cpp +./config/ConfigurationState.cpp +./config/PreprocessInputStream.cpp +./config/config.cpp +./config/tests/HTTPServer.cpp +./config/tests/config_ref_tests.cpp +./config/tests/config_tests.cpp +./config/text_format/text_format.cpp +./datastreams/Tables/tests/stream_tests.cpp +./domain/DomainSecurityUtils.cpp +./domain/NewOrder.cpp +./domain/OrderDefinition.cpp +./domain/OrderStatus.cpp +./domain/OrderUpdate.cpp +./domain/TimeInForce.cpp +./domain_model/Security.cpp +./domain_model/SecurityTests.cpp +./domain_model/sod.cpp +./domain_model/tests/domain_tests.cpp +./expression/BooleanGrammar.cpp +./expression/ExpressionEvaluator.cpp +./expression/ParserExceptions.cpp +./expression/Value.cpp +./expression/tests/expression_parser_tests.cpp +./io/QueryParams.cpp +./io/URL.cpp +./io/http/CurlHandle.cpp +./io/http/HTTPClient.cpp +./io/http/HTTPHeaders.cpp +./io/http/HTTPRequest.cpp +./io/http/HTTPResponse.cpp +./io/websocket/IJsonRpcHandler.cpp +./io/websocket/JsonRpcHandler.cpp +./io/websocket/WebsocketClient.cpp +./io/websocket/WebsocketClientConfiguration.cpp +./io/websocket/WebsocketError.cpp +./io/websocket/WebsocketMessage.cpp +./io/websocket/WebsocketSSLClientInternal.cpp +./io/websocket/tests/WebsocketClientTests.cpp +./jetfix/codec/FIXArray.cpp +./jetfix/common/OutFIX.cpp +./jetfix/connection/AsyncReader.cpp +./jetfix/connection/IConnection.cpp +./jetfix/connection/SocketConnection.cpp +./jetfix/gateway/CoreGateway.cpp +./jetfix/gateway/JetFIXGateway.cpp +./jetfix/gateway/Session.cpp +./jetfix/store/FIXFileStore.cpp +./jetfix/store/session_name.cpp +./jetfix/tests/async_reader_tests.cpp +./jetfix/tests/decoding_tests.cpp +./jetfix/tests/fix_encoding_stream_tests.cpp +./jetfix/tests/fix_fragment_tests.cpp +./jetfix/tests/jetfix_performance_tests.cpp +./jetfix/tests/sample_fix.cpp +./jetfix/tests/store_tests.cpp +./logging/LoggerHub.cpp +./logging/Sink.cpp +./logging/logging.cpp +./logging/tests/logging_tests.cpp +./md/Diag/MDPeriodicDumper.cpp +./md/Diag/ShmDumper.cpp +./md/GeneralMarketDataListener.cpp +./md/MBOProcessor.cpp +./md/MBOServiceServer.cpp +./md/MDClient.cpp +./md/MDConsumer.cpp +./md/MDConsumerHandle.cpp +./md/MDConsumerInterop.cpp +./md/MDProducer.cpp +./md/MDProducerHandle.cpp +./md/MemorySegmentUtils.cpp +./md/PriceSize.cpp +./md/Product.cpp +./md/SecurityCache.cpp +./md/SecurityDB.cpp +./md/SecurityIDRecorder.cpp +./md/SecurityMapper.cpp +./md/SecurityMarketState.cpp +./md/SecurityOracle.cpp +./md/SecurityStore.cpp +./md/SettlementRecorder.cpp +./md/Shm/FixedSecurity.cpp +./md/ShmSegmentName.cpp +./md/SyntheticSecurityService.cpp +./md/cme/MDP3Utils.cpp +./md/common.cpp +./md/ice/ICEUtils.cpp +./md/relay/QueryServer.cpp +./md/relay/RelayClient.cpp +./md/relay/RelayRecorder.cpp +./md/service/MarketDataServiceServer.cpp +./md/test/Co2ManagedTestHelper.cpp +./md/test/Co2TestInstrument.cpp +./md/test/mbo_tests.cpp +./md/test/md2_tests.cpp +./md/test/md_test_utils.cpp +./md/test/synthetic_book_merge_tests.cpp +./md/vendor/OnixsUtils.cpp +./mercury/actors/IPollableActor.cpp +./mercury/broker/Broker.cpp +./mercury/broker/BrokerProxy.cpp +./mercury/broker/ILocalBroker.cpp +./mercury/broker/IRemoteBroker.cpp +./mercury/common/mercury_common.cpp +./mercury/events/TimerEvent.cpp +./mercury/executor/Executor.cpp +./mercury/topics/Topic.cpp +./metrics/metrics.cpp +./metrics/system_metrics.cpp +./orderman/ChildOrder.cpp +./orderman/Governor.cpp +./orderman/OrderBuilder.cpp +./orderman/OrderRouter.cpp +./orderman/OrderServiceServer.cpp +./orderman/OrderServices.cpp +./orderman/actors/AsyncFactory.cpp +./orderman/actors/FillStore.cpp +./orderman/actors/MDSupplementarySource.cpp +./orderman/actors/OrderStore.cpp +./orderman/actors/SODPosition.cpp +./orderman/actors/SecuritySrc.cpp +./orderman/actors/ServiceBridge.cpp +./orderman/actors/order_manager/OrderManager.cpp +./orderman/actors/order_manager/OrderServicesData.cpp +./orderman/actors/order_manager/PositionIndex.cpp +./orderman/calculations/TheoCalculator.cpp +./orderman/ccapi/CCAPIDeribitHelpers.cpp +./orderman/ccapi/CCAPIDeribitOrderMux.cpp +./orderman/ccapi/CCAPIOrderCallbackMsgs.cpp +./orderman/ccapi/CCAPIOrderState.cpp +./orderman/ccapi/CCAPISingleOrderManager.cpp +./orderman/events/CancelRejectEvent.cpp +./orderman/events/FilledPositionEvent.cpp +./orderman/events/NewExecutionReportEvent.cpp +./orderman/gateways/CCAPIExecutionGateway.cpp +./orderman/gateways/ExecutionGatewayFactory.cpp +./orderman/gateways/FakeExecutionGateway.cpp +./orderman/gateways/GLBXExecutionGateway.cpp +./orderman/gateways/GLBXiLink3ExecutionGateway.cpp +./orderman/gateways/ICEExecutionGateway.cpp +./orderman/gateways/IFIXGenericAdapter.cpp +./orderman/gateways/sim/SimExecutionGateway.cpp +./orderman/gateways/sim/SimExecutionGatewayFactory.cpp +./orderman/gateways/sim/SimExecutionGatewayUniqueWrapper.cpp +./orderman/ilink3/IL3ConnectionHandler.cpp +./orderman/ilink3/IL3GW.cpp +./orderman/ilink3/IL3Parser.cpp +./orderman/ilink3/IL3Reactor.cpp +./orderman/ilink3/ILink3Utils.cpp +./orderman/ilink3/SessionStore.cpp +./orderman/ilink3/test/ILinkGWTests.cpp +./orderman/limiter/LimitStore.cpp +./orderman/limiter/Limiter.cpp +./orderman/limiter/ProductLimitNode.cpp +./orderman/limiter/ProductLimitTree.cpp +./orderman/limiter/SecurityLimitNode.cpp +./orderman/limiter/SecurityLimitTree.cpp +./orderman/limiter/tests/limit_tests.cpp +./orderman/order_factory/DynamicOrderRegistry.cpp +./orderman/order_factory/OrderFactory.cpp +./orderman/orderman_utils/BookUtils.cpp +./orderman/orderman_utils/ExecutionReport.cpp +./orderman/orderman_utils/fix_order_codec.cpp +./orderman/orderman_utils/orderman_utils.cpp +./orderman/orders/CompositeOrder.cpp +./orderman/orders/DynamicOrder.cpp +./orderman/orders/EMNativeOrder.cpp +./orderman/orders/GLBXNativeOrder.cpp +./orderman/orders/ICENativeOrder.cpp +./orderman/orders/Order.cpp +./orderman/orders/TimeBoxOrder.cpp +./orderman/orders/TriggerOrder.cpp +./orderman/orders/algo/AlgoWrapperOrder.cpp +./orderman/orders/algo/DynamicHelpers.cpp +./orderman/orders/algo/IAlgoServices.cpp +./orderman/orders/algo/IBeforeLaunchAlgoServices.cpp +./orderman/orders/algo/PositionUpdate.cpp +./orderman/orders/algo/algo_orders/CoverAlgo.cpp +./orderman/orders/algo/algo_orders/DeleteAndCoverAlgo.cpp +./orderman/orders/algo/algo_orders/DormanAlgo.cpp +./orderman/orders/algo/algo_orders/IcebergAlgo.cpp +./orderman/orders/algo/algo_orders/JoinAlgo.cpp +./orderman/orders/algo/algo_orders/LeanAlgo.cpp +./orderman/orders/algo/algo_orders/LimitCoverAlgo.cpp +./orderman/orders/algo/algo_orders/OffsetAlgo.cpp +./orderman/orders/algo/algo_orders/OnSignalAlgo.cpp +./orderman/orders/algo/algo_orders/ProRataAlgo.cpp +./orderman/orders/algo/algo_orders/PyramidAlgo.cpp +./orderman/orders/algo/algo_orders/QuotingAlgo.cpp +./orderman/orders/algo/algo_orders/RegisterDorman.cpp +./orderman/orders/algo/algo_orders/ScratchAlgo.cpp +./orderman/orders/algo/algo_orders/SniperAlgo.cpp +./orderman/orders/algo/algo_orders/SplitterAlgo.cpp +./orderman/orders/algo/algo_orders/TASAlgo.cpp +./orderman/orders/algo/algo_orders/TASCounterAlgo.cpp +./orderman/orders/algo/algo_orders/TaskingEyeAlgo.cpp +./orderman/orders/algo/algo_orders/TopAlgo.cpp +./orderman/orders/algo/algo_orders/VolAlgo.cpp +./orderman/orders/algo/algo_orders/limit_cover/LimitCoverAdapter.cpp +./orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp +./orderman/orders/algo/algo_orders/tests/ExecutiontTesterAlgo.cpp +./orderman/orders/algo/algo_orders/tests/LimitCoverTests.cpp +./orderman/orders/algo/algo_orders/tests/dorman_tests.cpp +./orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverState.cpp +./orderman/orders/algo/algo_orders/tests/limit_cover/TestSteps.cpp +./orderman/orders/algo/algo_orders/tests/splitter_tests.cpp +./orderman/orders/book_algos/BookAlgo.cpp +./orderman/orders/book_algos/BookOrderBase.cpp +./orderman/orders/book_algos/OCOOrder.cpp +./orderman/orders/book_algos/PricerOrder.cpp +./orderman/orders/glbx/IGLBXOrderEncoder.cpp +./orderman/orders/glbx/iLink2OrderEncoder.cpp +./orderman/orders/glbx/iLink3OrderEncoder.cpp +./orderman/orders/queue_holder/QueueHolderOrder.cpp +./orderman/orders/queue_holder/state_workers/QHOEndStateWorker.cpp +./orderman/orders/queue_holder/state_workers/QHOStartStateWorker.cpp +./orderman/orders/queue_holder/state_workers/QHOWaitingForAckStateWorker.cpp +./orderman/orders/queue_holder/state_workers/QHOWaitingForCancelAllStateWorker.cpp +./orderman/orders/queue_holder/state_workers/QHOWorkingStateWorker.cpp +./orderman/orders/spreader_orders/SpreaderOrder.cpp +./orderman/orders/spreader_orders/spreader/LegFillState.cpp +./orderman/orders/spreader_orders/spreader/LegPropertyData.cpp +./orderman/orders/spreader_orders/spreader/NLegsHedgeRecompData.cpp +./orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp +./orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp +./orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp +./orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp +./orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp +./orderman/orders/spreader_orders/spreader/SpreaderFractionalQtyHelper.cpp +./orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp +./orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp +./orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp +./orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp +./orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp +./orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp +./orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp +./orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp +./orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp +./orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp +./orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp +./orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp +./orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp +./orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp +./orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp +./orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp +./orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp +./orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp +./orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp +./orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp +./orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp +./orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp +./orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp +./orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp +./orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp +./orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp +./orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp +./orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp +./orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp +./orderman/orders/spreader_orders/tests/spreader_tests.cpp +./orderman/tests/CCApiExecutionTests.cpp +./orderman/tests/fat_wrapper_tests.cpp +./os/os.cpp +./os/tests/os_tests.cpp +./persistence/IDGenerator.cpp +./persistence/IStore.cpp +./persistence/PersistenceServiceServer.cpp +./persistence/SqliteStore.cpp +./persistence/persistence_utils.cpp +./persistence/tests/PersistenceServiceTests.cpp +./plugin/SparkServices.cpp +./plugin/plugin.cpp +./quickbus/core/LocalNode.cpp +./quickbus/core/Quickbus.cpp +./quickbus/core/SubscriptionID.cpp +./quickbus/core/TableID.cpp +./quickbus/message_model/Update.cpp +./quickbus/message_model/merge_updates.cpp +./quickbus/network/QBConnection.cpp +./quickbus/network/QBConnectionManager.cpp +./quickbus/network/endpoint_description.cpp +./quickbus/pubsub/TablePublisher.cpp +./quickbus/pubsub/TableSubscriber.cpp +./quickbus/pubsub/tests/qb_pubsub_tests.cpp +./quickbus/routing/INode.cpp +./quickbus/routing/NodeID.cpp +./quickbus/routing/Router.cpp +./quickbus/rpc/RPCClient.cpp +./quickbus/rpc/RPCServer.cpp +./quickbus/rpc/RPCSessionID.cpp +./quickbus/rpc/rpc_utils.cpp +./quickbus/rpc/tests/qb_rpc_tests.cpp +./quickbus/tests/quickbus_tests.cpp +./testing/catch_test_runner.cpp +./tracing/PerfLog.cpp +./tracing/bts_trace.cpp +./utils/AuthSessionManager.cpp +./utils/AuthToken.cpp +./utils/Dispatcher.cpp +./utils/FileUtils.cpp +./utils/GrowableSPSCQueue.cpp +./utils/HTTPStream.cpp +./utils/MathUtils.cpp +./utils/PBUtils.cpp +./utils/Puid.cpp +./utils/SecureLogon.cpp +./utils/SharedMemory.cpp +./utils/Sqlite_utils.cpp +./utils/Uuid.cpp +./utils/crypto/CipherType.cpp +./utils/crypto/CryptoInit.cpp +./utils/crypto/Digest.cpp +./utils/crypto/KeyCodeHelper.cpp +./utils/crypto/PasswordCallback.cpp +./utils/crypto/PrivateKey.cpp +./utils/crypto/PublicKey.cpp +./utils/crypto/iostreambio.cpp +./utils/datetime.cpp +./utils/download.cpp +./utils/file_utils.cpp +./utils/init_spark_lib.cpp +./utils/is_unittest_environment.cpp +./utils/sftp.cpp +./utils/stats.cpp +./utils/tests/AuthTokenTests.cpp +./utils/tests/IDGeneratorTests.cpp +./utils/tests/MathUtilsTests.cpp +./utils/tests/SingleWriterConcurrentVectorTests.cpp +./utils/thread_manager.cpp diff --git a/src/lib_spark/spark/api/services/OrderService.h b/src/lib_spark/spark/api/services/OrderService.h index cbc3740a9..697334c8b 100644 --- a/src/lib_spark/spark/api/services/OrderService.h +++ b/src/lib_spark/spark/api/services/OrderService.h @@ -1,10 +1,10 @@ #pragma once #include "spark/api/services/OrderService.pb.h" -#include "spark/core/EnumMacros.h" -#include "spark/core/FMT_IMPL.h" -#include "spark/io/JsonReader.h" #include "spark/logging/logging.h" +#include "system/FMT_IMPL.h" +#include "system/enum_macros.h" +#include "system/json/json_reader.h" #include diff --git a/src/lib_spark/spark/config/ConfigQuerier.cpp b/src/lib_spark/spark/config/ConfigQuerier.cpp index 524454a1c..6e1762fe8 100644 --- a/src/lib_spark/spark/config/ConfigQuerier.cpp +++ b/src/lib_spark/spark/config/ConfigQuerier.cpp @@ -2,9 +2,9 @@ #include "config.h" #include "spark/config/ConfigQueryErrors.h" #include "spark/config/text_format/text_format.h" -#include "spark/core/EnumMacros.h" #include "spark/utils/TimeStamp.h" #include "spark/utils/bts_export.h" +#include "system/enum_macros.h" #include #include diff --git a/src/lib_spark/spark/config/ConfigQueryErrors.h b/src/lib_spark/spark/config/ConfigQueryErrors.h index 12cba1db9..6dfcd4af5 100644 --- a/src/lib_spark/spark/config/ConfigQueryErrors.h +++ b/src/lib_spark/spark/config/ConfigQueryErrors.h @@ -1,5 +1,6 @@ #pragma once -#include "spark/core/EnumMacros.h" + +#include "system/enum_macros.h" namespace bts::config { diff --git a/src/lib_spark/spark/config/ConfigurationState.cpp b/src/lib_spark/spark/config/ConfigurationState.cpp index a79ec1ff0..f3adea0f7 100644 --- a/src/lib_spark/spark/config/ConfigurationState.cpp +++ b/src/lib_spark/spark/config/ConfigurationState.cpp @@ -1,21 +1,19 @@ #include "ConfigurationState.h" - -#include "ConfigErrorCollector.h" -#include "ConfigPropertyEvaluator.h" -#include "ConfigValueQueue.h" -#include "ConfigurationException.h" -#include "PreprocessInputStream.h" -#include "config.h" -#include "spark/core/FMT.h" +#include "spark/config/ConfigErrorCollector.h" +#include "spark/config/ConfigPropertyEvaluator.h" +#include "spark/config/ConfigValueQueue.h" +#include "spark/config/ConfigurationException.h" +#include "spark/config/PreprocessInputStream.h" +#include "spark/config/config.h" +#include "spark/config/protos/system_config.pb.h" #include "spark/io/ProtoPrinter.h" #include "spark/os/os.h" #include "spark/utils/bts_assert.h" #include "spark/utils/defer.h" #include "spark/utils/is_unittest_environment.h" +#include "system/FMT.h" #include "system/bts_array_size.h" -#include "spark/config/protos/system_config.pb.h" - #include #include // iequals #include diff --git a/src/lib_spark/spark/core/BoolName.h b/src/lib_spark/spark/core/BoolName.h deleted file mode 100644 index e20aaf4ef..000000000 --- a/src/lib_spark/spark/core/BoolName.h +++ /dev/null @@ -1,50 +0,0 @@ -#pragma once -#include - -namespace bts::core { - -class BoolName { - public: - explicit constexpr BoolName(bool value); - - [[nodiscard]] static constexpr const std::string &true_false(bool value); - [[nodiscard]] static constexpr const std::string &yes_no(bool value); - [[nodiscard]] static constexpr const std::string &y_n(bool value); - [[nodiscard]] static constexpr const std::string &on_off(bool value); - - private: - bool value_; - - struct Names { - static inline const std::string _TRUE = "true"; - static inline const std::string _FALSE = "false"; - static inline const std::string YES = "yes"; - static inline const std::string NO = "no"; - static inline const std::string Y = "y"; - static inline const std::string N = "n"; - static inline const std::string ON = "on"; - static inline const std::string OFF = "off"; - }; -}; - -////////////////////////////////////////////////// -// Definition -////////////////////////////////////////////////// - -constexpr const std::string &BoolName::true_false(bool value) { - return value ? Names::_TRUE : Names::_FALSE; -} - -constexpr const std::string &BoolName::yes_no(bool value) { - return value ? Names::YES : Names::NO; -} - -constexpr const std::string &BoolName::y_n(bool value) { - return value ? Names::Y : Names::N; -} - -constexpr const std::string &BoolName::on_off(bool value) { - return value ? Names::ON : Names::OFF; -} - -} // namespace bts::core diff --git a/src/lib_spark/spark/core/EnumMacros.h b/src/lib_spark/spark/core/EnumMacros.h deleted file mode 100644 index 55b47c0d7..000000000 --- a/src/lib_spark/spark/core/EnumMacros.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#include "system/enum_macros.h" diff --git a/src/lib_spark/spark/core/FMT.h b/src/lib_spark/spark/core/FMT.h deleted file mode 100644 index 1e15d3fbf..000000000 --- a/src/lib_spark/spark/core/FMT.h +++ /dev/null @@ -1,34 +0,0 @@ -#pragma once - -#include -#include -#ifndef _WIN32 -#include -#endif -#include - -#define FMT(template_str, ...) fmt::format(template_str, __VA_ARGS__) -#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); -} - -#ifndef _WIN32 -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)); -} -#endif - -} // namespace bts - -#ifndef _WIN32 -#define FMT_JOIN_FN(range, delimiter, fn) \ - bts::_fmt_join_fn(range, delimiter, fn) -#endif diff --git a/src/lib_spark/spark/core/FMT_IMPL.h b/src/lib_spark/spark/core/FMT_IMPL.h deleted file mode 100644 index f82a06095..000000000 --- a/src/lib_spark/spark/core/FMT_IMPL.h +++ /dev/null @@ -1,65 +0,0 @@ -#pragma once - -#include - -#define FMT_IMPL(Type, var_name, ...) \ - template <> \ - 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_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 { \ - constexpr auto parse(fmt::format_parse_context &ctx) \ - -> decltype(ctx.end()) { \ - return ctx.end(); \ - } \ - \ - template \ - auto format(const T &t, FormatContext &ctx) const \ - -> decltype(ctx.out()) { \ - std::stringstream ss; \ - ss << t; \ - return fmt::format_to(ctx.out(), "{}", ss.str()); \ - } \ - } - -#define FMT_IMPL_OSTREAM_T(T, ...) \ - struct fmt::formatter> { \ - constexpr auto parse(fmt::format_parse_context &ctx) \ - -> decltype(ctx.end()) { \ - return ctx.end(); \ - } \ - \ - template \ - auto format(const T<__VA_ARGS__> &t, FormatContext &ctx) const \ - -> decltype(ctx.out()) { \ - std::stringstream ss; \ - ss << t; \ - return fmt::format_to(ctx.out(), "{}", ss.str()); \ - } \ - } diff --git a/src/lib_spark/spark/core/TimeSpan.h b/src/lib_spark/spark/core/TimeSpan.h deleted file mode 100644 index d03787554..000000000 --- a/src/lib_spark/spark/core/TimeSpan.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#include "system/time_span.h" diff --git a/src/lib_spark/spark/core/TimeStamp.h b/src/lib_spark/spark/core/TimeStamp.h deleted file mode 100644 index c8c8dab59..000000000 --- a/src/lib_spark/spark/core/TimeStamp.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#include "system/time_stamp.h" diff --git a/src/lib_spark/spark/domain/Price.h b/src/lib_spark/spark/domain/Price.h deleted file mode 100644 index 5bcba0a26..000000000 --- a/src/lib_spark/spark/domain/Price.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#include "domain/price.h" diff --git a/src/lib_spark/spark/domain/SecurityMarketDataStatistics.h b/src/lib_spark/spark/domain/SecurityMarketDataStatistics.h index 9864d5523..f175c574a 100644 --- a/src/lib_spark/spark/domain/SecurityMarketDataStatistics.h +++ b/src/lib_spark/spark/domain/SecurityMarketDataStatistics.h @@ -3,10 +3,10 @@ #include "domain/price.h" #include "domain/quantity.h" #include "domain/security.h" -#include "spark/core/FMT_IMPL.h" -#include "spark/io/JsonReader.h" #include "spark/md/IntPrice.h" #include "spark/md/protos/co2.pb.h" +#include "system/FMT_IMPL.h" +#include "system/json/json_reader.h" #include #include diff --git a/src/lib_spark/spark/domain_model/Security.h b/src/lib_spark/spark/domain_model/Security.h index 148966778..769814543 100644 --- a/src/lib_spark/spark/domain_model/Security.h +++ b/src/lib_spark/spark/domain_model/Security.h @@ -1,12 +1,12 @@ #pragma once -#include "spark/core/FMT_IMPL.h" #include "spark/domain_model/Security.pb.h" #include "spark/domain_model/Side.h" #include "spark/domain_model/Venue.h" #include "spark/domain_model/common.h" #include "spark/utils/bts_assert.h" #include "spark/utils/datetime.h" +#include "system/FMT_IMPL.h" #include #include @@ -45,7 +45,8 @@ inline api::Side other_side(api::Side side) { return side; } } -template class TwoSided { +template +class TwoSided { public: TwoSided() : buy(), sell() {} @@ -89,7 +90,8 @@ inline bool is_worse(api::Side s, Price p1, Price p2) { return is_better(s, p2, p1); } -template void apply_to_both_sides(C c) { +template +void apply_to_both_sides(C c) { c(api::SIDE_BUY); c(api::SIDE_SELL); } @@ -163,8 +165,8 @@ inline Price encode_exchange_price(api::Security const &sec, Price in) { return in; } -inline double -raw_round_to_quote_price(double raw_price, double tick_size, api::Side side) { +inline double raw_round_to_quote_price( + double raw_price, double tick_size, api::Side side) { double factor = 1000000000; auto i_price = llround(factor * raw_price); auto i_tick_size = llround(tick_size * factor); @@ -207,8 +209,8 @@ inline double checked_round_to_quote_price( } } -inline Price -round_to_quote_price(api::Security const &sec, Price in, api::Side side) { +inline Price round_to_quote_price( + api::Security const &sec, Price in, api::Side side) { auto p = in.value(); bts_assert_d(!std::isnan(p)); if (p < -sec.contract_spec().price_break() || @@ -237,8 +239,8 @@ inline Price tick_size(api::Security const &sec) { // Looking to round md::IntPrice? Look in IntPrice.h // computes price_2 - price_1 in ticks -inline int -price_diff_to_ticks(double price_1, double price_2, double tick_size) { +inline int price_diff_to_ticks( + double price_1, double price_2, double tick_size) { return static_cast(std::round((price_2 - price_1) / tick_size)); } // returns the difference (in ticks) bw and order and a market. @@ -262,8 +264,8 @@ inline int order_diff_market( // simple double equality can not be used to compare prices. // this function deems 2 prices to be equal if they are within // 1 % of the tick size -inline bool -test_price_equality(double price_1, double price_2, double tick_size) { +inline bool test_price_equality( + double price_1, double price_2, double tick_size) { return std::fabs(price_2 - price_1) < 0.01 * tick_size; } inline bool gr_than_eq(double p1, double p2, double tick_size) { diff --git a/src/lib_spark/spark/domain_model/SecurityKey.h b/src/lib_spark/spark/domain_model/SecurityKey.h index 9fe72f889..981c5af78 100644 --- a/src/lib_spark/spark/domain_model/SecurityKey.h +++ b/src/lib_spark/spark/domain_model/SecurityKey.h @@ -1,6 +1,6 @@ #pragma once -#include "spark/core/FMT_IMPL.h" +#include "system/FMT_IMPL.h" #include "system/value_wrapper.h" #include diff --git a/src/lib_spark/spark/domain_model/Side.h b/src/lib_spark/spark/domain_model/Side.h index 7447c8a46..667cb8b26 100644 --- a/src/lib_spark/spark/domain_model/Side.h +++ b/src/lib_spark/spark/domain_model/Side.h @@ -1,10 +1,10 @@ #pragma once -#include "spark/core/EnumMacros.h" -#include "spark/core/FMT_IMPL.h" #include "spark/domain_model/Security.pb.h" -#include "spark/io/JsonReader.h" #include "spark/logging/logging.h" +#include "system/FMT_IMPL.h" +#include "system/enum_macros.h" +#include "system/json/json_reader.h" #include diff --git a/src/lib_spark/spark/domain_model/Venue.h b/src/lib_spark/spark/domain_model/Venue.h index 5311f38fb..be9d47a46 100644 --- a/src/lib_spark/spark/domain_model/Venue.h +++ b/src/lib_spark/spark/domain_model/Venue.h @@ -1,10 +1,10 @@ #pragma once -#include "spark/core/EnumMacros.h" -#include "spark/core/FMT_IMPL.h" #include "spark/domain_model/Security.pb.h" -#include "spark/io/JsonReader.h" #include "spark/logging/logging.h" +#include "system/FMT_IMPL.h" +#include "system/enum_macros.h" +#include "system/json/json_reader.h" #include diff --git a/src/lib_spark/spark/domain_model/common.h b/src/lib_spark/spark/domain_model/common.h index a5d92c2fb..0f1a1cc59 100644 --- a/src/lib_spark/spark/domain_model/common.h +++ b/src/lib_spark/spark/domain_model/common.h @@ -1,5 +1,9 @@ #pragma once +#include "spark/domain_model/SecurityKey.h" +#include "system/FMT_IMPL.h" +#include "system/value_wrapper.h" + #include #ifndef _WIN32 #include @@ -7,10 +11,6 @@ #include #include -#include "spark/core/FMT_IMPL.h" -#include "spark/domain_model/SecurityKey.h" -#include "system/value_wrapper.h" - namespace bts { struct CQuantity { double qty = 0; diff --git a/src/lib_spark/spark/domain_model/tests/domain_tests.cpp b/src/lib_spark/spark/domain_model/tests/domain_tests.cpp index f2214a787..d5afd5f65 100644 --- a/src/lib_spark/spark/domain_model/tests/domain_tests.cpp +++ b/src/lib_spark/spark/domain_model/tests/domain_tests.cpp @@ -1,13 +1,12 @@ - -#include "../Security.h" -#include "catch/catch.hpp" -#include "spark/core/TimeStamp.h" #include "spark/domain_model/Security.h" #include "spark/quickbus/rpc/RPCServiceName.h" #include "spark/utils/PBUtils.h" #include "spark/utils/datetime.h" +#include "system/time_stamp.h" + #include #include +#include #include namespace bts { diff --git a/src/lib_spark/spark/io/JsonDumper.h b/src/lib_spark/spark/io/JsonDumper.h deleted file mode 100644 index 0127813af..000000000 --- a/src/lib_spark/spark/io/JsonDumper.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#include "system/json/json_dumper.h" diff --git a/src/lib_spark/spark/io/JsonReader.h b/src/lib_spark/spark/io/JsonReader.h deleted file mode 100644 index 368d328c4..000000000 --- a/src/lib_spark/spark/io/JsonReader.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#include "system/json/json_reader.h" diff --git a/src/lib_spark/spark/io/JsonType.h b/src/lib_spark/spark/io/JsonType.h index 022c744ae..181ea7ca8 100644 --- a/src/lib_spark/spark/io/JsonType.h +++ b/src/lib_spark/spark/io/JsonType.h @@ -1,6 +1,8 @@ #pragma once #ifdef SPARK_ENABLE_CCAPI -#include "spark/core/EnumMacros.h" + +#include "system/enum_macros.h" + #include #include #include diff --git a/src/lib_spark/spark/io/http/HttpMethod.h b/src/lib_spark/spark/io/http/HttpMethod.h index c6d71e674..f5a3d7ff6 100644 --- a/src/lib_spark/spark/io/http/HttpMethod.h +++ b/src/lib_spark/spark/io/http/HttpMethod.h @@ -1,8 +1,8 @@ #pragma once #ifdef SPARK_ENABLE_CCAPI -#include "spark/core/EnumMacros.h" -#include "spark/core/FMT_IMPL.h" +#include "system/FMT_IMPL.h" +#include "system/enum_macros.h" #include #include diff --git a/src/lib_spark/spark/io/http/HttpProtocol.h b/src/lib_spark/spark/io/http/HttpProtocol.h index 814e55b86..5b3fccadb 100644 --- a/src/lib_spark/spark/io/http/HttpProtocol.h +++ b/src/lib_spark/spark/io/http/HttpProtocol.h @@ -3,9 +3,9 @@ #include "domain/protobufs/security_type.pb.h" #include "spark/algorithm/StringCaseConverter.h" -#include "spark/core/EnumMacros.h" -#include "spark/core/FMT_IMPL.h" #include "spark/domain_model/Security.pb.h" +#include "system/FMT_IMPL.h" +#include "system/enum_macros.h" #include #include diff --git a/src/lib_spark/spark/io/websocket/JsonRpcError.h b/src/lib_spark/spark/io/websocket/JsonRpcError.h index f8e6211ff..58cf3766f 100644 --- a/src/lib_spark/spark/io/websocket/JsonRpcError.h +++ b/src/lib_spark/spark/io/websocket/JsonRpcError.h @@ -1,6 +1,6 @@ #pragma once -#include "spark/core/FMT_IMPL.h" +#include "system/FMT_IMPL.h" #include #include diff --git a/src/lib_spark/spark/io/websocket/JsonRpcId.h b/src/lib_spark/spark/io/websocket/JsonRpcId.h index 51651d26d..24396d8cd 100644 --- a/src/lib_spark/spark/io/websocket/JsonRpcId.h +++ b/src/lib_spark/spark/io/websocket/JsonRpcId.h @@ -1,8 +1,8 @@ #pragma once -#include "spark/core/FMT.h" -#include "spark/core/FMT_IMPL.h" -#include "spark/core/TimeStamp.h" +#include "system/FMT.h" +#include "system/FMT_IMPL.h" +#include "system/time_stamp.h" #include #include diff --git a/src/lib_spark/spark/io/websocket/JsonRpcRequest.h b/src/lib_spark/spark/io/websocket/JsonRpcRequest.h index 9f27a8593..1b70f2b0f 100644 --- a/src/lib_spark/spark/io/websocket/JsonRpcRequest.h +++ b/src/lib_spark/spark/io/websocket/JsonRpcRequest.h @@ -1,8 +1,8 @@ #pragma once -#include "spark/core/FMT_IMPL.h" #include "spark/io/websocket/JsonRpcId.h" #include "spark/utils/bts_assert.h" +#include "system/FMT_IMPL.h" #include #include diff --git a/src/lib_spark/spark/io/websocket/JsonRpcResponse.h b/src/lib_spark/spark/io/websocket/JsonRpcResponse.h index 7c629f53e..b9ab29785 100644 --- a/src/lib_spark/spark/io/websocket/JsonRpcResponse.h +++ b/src/lib_spark/spark/io/websocket/JsonRpcResponse.h @@ -1,9 +1,9 @@ #pragma once -#include "spark/core/FMT_IMPL.h" #include "spark/io/websocket/JsonRpcError.h" #include "spark/io/websocket/JsonRpcId.h" #include "spark/utils/overloaded.h" +#include "system/FMT_IMPL.h" #include #include diff --git a/src/lib_spark/spark/io/websocket/JsonRpcRouter.h b/src/lib_spark/spark/io/websocket/JsonRpcRouter.h index 5366f1318..8990d841c 100644 --- a/src/lib_spark/spark/io/websocket/JsonRpcRouter.h +++ b/src/lib_spark/spark/io/websocket/JsonRpcRouter.h @@ -1,10 +1,10 @@ #pragma once -#include "spark/algorithm/TryCatch.h" #include "spark/io/websocket/IJsonRpcHandler.h" #include "spark/io/websocket/JsonRpcError.h" #include "spark/io/websocket/JsonRpcRequest.h" #include "spark/io/websocket/JsonRpcResponse.h" +#include "system/algorithm/try_catch.h" #include "system/delegate.h" #include diff --git a/src/lib_spark/spark/md/Diag/ShmDumper.cpp b/src/lib_spark/spark/md/Diag/ShmDumper.cpp index 2b19b876f..dec05313b 100644 --- a/src/lib_spark/spark/md/Diag/ShmDumper.cpp +++ b/src/lib_spark/spark/md/Diag/ShmDumper.cpp @@ -1,11 +1,10 @@ #ifndef NO_CPP0X #include "ShmDumper.h" - -#include "../Shm/MDStructure.h" -#include "spark/io/JsonDumper.h" #include "spark/logging/logging.h" +#include "spark/md/Shm/MDStructure.h" #include "spark/utils/SharedList.h" +#include "system/json/json_dumper.h" #include #include diff --git a/src/lib_spark/spark/md/GeneralMarketDataListener.cpp b/src/lib_spark/spark/md/GeneralMarketDataListener.cpp index e132e53af..a327a800c 100644 --- a/src/lib_spark/spark/md/GeneralMarketDataListener.cpp +++ b/src/lib_spark/spark/md/GeneralMarketDataListener.cpp @@ -16,7 +16,6 @@ #include "domain/spot_security.h" #include "domain/spread_security.h" #include "domain/trade_record.h" -#include "spark/core/TimeStamp.h" #include "spark/domain/DomainSecurityUtils.h" #include "spark/domain/SecurityMarketDataStatistics.h" #include "spark/domain_model/Security.pb.h" @@ -40,13 +39,13 @@ #include "spark/utils/TimeStamp.h" #include "spark/utils/bts_assert.h" #include "spark/utils/bts_fatal.h" -#include -#include +#include "system/time_stamp.h" #include #include #include #include +#include #include #include #include diff --git a/src/lib_spark/spark/md/MBOProcessor.h b/src/lib_spark/spark/md/MBOProcessor.h index bab713397..33d50f37b 100644 --- a/src/lib_spark/spark/md/MBOProcessor.h +++ b/src/lib_spark/spark/md/MBOProcessor.h @@ -2,13 +2,12 @@ #include "ExchangeOrderKey.h" #include "IntPrice.h" #include "MDProducerHandle.h" -#include "spark/core/FMT_IMPL.h" #include "spark/domain_model/Security.h" #include "spark/domain_model/SecurityKey.h" #include "spark/utils/TimeStamp.h" +#include "system/FMT_IMPL.h" #include - #include #include #include diff --git a/src/lib_spark/spark/md/Shm/FixedSecurity.h b/src/lib_spark/spark/md/Shm/FixedSecurity.h index d663de5db..7d35d8ac0 100644 --- a/src/lib_spark/spark/md/Shm/FixedSecurity.h +++ b/src/lib_spark/spark/md/Shm/FixedSecurity.h @@ -1,17 +1,15 @@ #pragma once -#include "../common.h" -#include "spark/core/FMT_IMPL.h" -#include "spark/core/TimeStamp.h" -#include "spark/io/JsonDumper.h" -#include "spark/io/JsonReader.h" -#include "system/value_wrapper.h" +#include "spark/domain_model/SecurityKey.h" +#include "spark/md/common.h" #include "spark/utils/bts_assert.h" #include "spark/utils/bts_export.h" #include "spark/utils/bts_no_copy.h" #include "spark/utils/warn_ctrl.h" -#include "spark/domain_model/SecurityKey.h" #include "system/bts_array_size.h" +#include "system/json/json_dumper.h" +#include "system/time_stamp.h" +#include "system/value_wrapper.h" #include #include diff --git a/src/lib_spark/spark/md/Shm/MDStructure.h b/src/lib_spark/spark/md/Shm/MDStructure.h index adaee5853..9b6ba3fa6 100644 --- a/src/lib_spark/spark/md/Shm/MDStructure.h +++ b/src/lib_spark/spark/md/Shm/MDStructure.h @@ -1,14 +1,15 @@ #pragma once -#include "../PriceSize.h" -#include "../common.h" + #include "FixedSecurity.h" #include "domain/protobufs/trading_status.pb.h" #include "spark/config/config.h" #include "spark/config/protos/market_data.pb.h" -#include "spark/core/BoolName.h" -#include "spark/core/TimeStamp.h" +#include "spark/md/PriceSize.h" +#include "spark/md/common.h" #include "spark/md/protos/co2.pb.h" #include "spark/utils/TimeStamp.h" +#include "system/bool_name.h" +#include "system/time_stamp.h" #include #include diff --git a/src/lib_spark/spark/md/SymbolLoader.h b/src/lib_spark/spark/md/SymbolLoader.h index c5e31365d..ba4ec5d2a 100644 --- a/src/lib_spark/spark/md/SymbolLoader.h +++ b/src/lib_spark/spark/md/SymbolLoader.h @@ -1,4 +1,5 @@ #pragma once + #include "UserSymbol.h" #include "common.h" #include "domain/security_criteria.h" @@ -6,7 +7,6 @@ #include "spark/config/config.h" #include "spark/config/protos/market_data.pb.h" #include "spark/config/protos/symbols.pb.h" -#include "spark/core/FMT.h" #include "spark/domain/DomainSecurityUtils.h" #include "spark/domain_model/Security.pb.h" @@ -53,7 +53,8 @@ class SymbolLoader { std::set &result); static bool parse_venue(const std::string &str, bts::md::Venue *venue); - static bool parse_venue(const std::string &str, domain::protobufs::Venue *venue); + static bool parse_venue( + const std::string &str, domain::protobufs::Venue *venue); }; ////////////////////////////////////////////////// diff --git a/src/lib_spark/spark/md/UserSymbol.h b/src/lib_spark/spark/md/UserSymbol.h index 35b77e7cc..27c1c182b 100644 --- a/src/lib_spark/spark/md/UserSymbol.h +++ b/src/lib_spark/spark/md/UserSymbol.h @@ -1,6 +1,8 @@ #pragma once + #include "common.h" -#include "spark/core/FMT_IMPL.h" +#include "system/FMT_IMPL.h" + #include #include diff --git a/src/lib_spark/spark/md/cme/CMEChannel.h b/src/lib_spark/spark/md/cme/CMEChannel.h index 4434eda0d..4bedc79df 100644 --- a/src/lib_spark/spark/md/cme/CMEChannel.h +++ b/src/lib_spark/spark/md/cme/CMEChannel.h @@ -1,8 +1,9 @@ #pragma once -#include "spark/core/FMT.h" -#include "spark/core/FMT_IMPL.h" + #include "spark/md/UserSymbol.h" #include "spark/md/cme/CMEConnection.h" +#include "system/FMT.h" +#include "system/FMT_IMPL.h" #include #include diff --git a/src/lib_spark/spark/md/cme/CMEConnection.h b/src/lib_spark/spark/md/cme/CMEConnection.h index f307d6611..3f6f5e978 100644 --- a/src/lib_spark/spark/md/cme/CMEConnection.h +++ b/src/lib_spark/spark/md/cme/CMEConnection.h @@ -1,5 +1,6 @@ #pragma once -#include "spark/core/FMT_IMPL.h" + +#include "system/FMT_IMPL.h" #include #include diff --git a/src/lib_spark/spark/md/cme/MDP3Utils.cpp b/src/lib_spark/spark/md/cme/MDP3Utils.cpp index d79693dac..a63378778 100644 --- a/src/lib_spark/spark/md/cme/MDP3Utils.cpp +++ b/src/lib_spark/spark/md/cme/MDP3Utils.cpp @@ -5,12 +5,12 @@ #include "spark/config/protos/deployment_type.pb.h" #include "spark/config/protos/market_data.pb.h" #include "spark/config/protos/system_config.pb.h" -#include "spark/core/FMT.h" #include "spark/logging/logging.h" #include "spark/md/SymbolLoader.h" #include "spark/utils/bts_chrono.h" #include "spark/utils/datetime.h" #include "spark/utils/download.h" +#include "system/FMT.h" #include #include @@ -120,8 +120,8 @@ SecurityType infer_security_type(const string &label) { const std::vector get_configured_cme_channels() { // Get all glbx symbols - const auto symbols = - SymbolLoader::load(SecurityCriteria::create({domain::protobufs::VENUE_GLBX})); + const auto symbols = SymbolLoader::load( + SecurityCriteria::create({domain::protobufs::VENUE_GLBX})); return parse_channels({symbols.begin(), symbols.end()}); } template diff --git a/src/lib_spark/spark/md/cme/MDP3Utils.h b/src/lib_spark/spark/md/cme/MDP3Utils.h index c5dee0889..6e1e241fe 100644 --- a/src/lib_spark/spark/md/cme/MDP3Utils.h +++ b/src/lib_spark/spark/md/cme/MDP3Utils.h @@ -1,9 +1,10 @@ #pragma once -#include "spark/core/FMT_IMPL.h" #include "spark/md/cme/CMEChannel.h" #include "spark/md/cme/CMEConnection.h" #include "spark/md/coconut2.h" +#include "system/FMT_IMPL.h" + #include #include #include diff --git a/src/lib_spark/spark/mercury/common/mercury_common.h b/src/lib_spark/spark/mercury/common/mercury_common.h index c99f99006..e0edfca83 100644 --- a/src/lib_spark/spark/mercury/common/mercury_common.h +++ b/src/lib_spark/spark/mercury/common/mercury_common.h @@ -1,8 +1,9 @@ #pragma once -#include "spark/core/FMT_IMPL.h" #include "spark/mercury/common/FatWrapper.h" +#include "system/FMT_IMPL.h" #include "system/value_wrapper.h" + #include #include #include diff --git a/src/lib_spark/spark/mercury/topics/Topic.h b/src/lib_spark/spark/mercury/topics/Topic.h index 32cca807e..f31b077f7 100644 --- a/src/lib_spark/spark/mercury/topics/Topic.h +++ b/src/lib_spark/spark/mercury/topics/Topic.h @@ -1,9 +1,9 @@ #pragma once -#include "spark/core/FMT_IMPL.h" #include "spark/mercury/events/Event.h" #include "spark/mercury/topics/ITopic.h" #include "spark/utils/type_name.h" +#include "system/FMT_IMPL.h" #include #include @@ -11,18 +11,23 @@ namespace bts { namespace mercury { -template using void_t = void; +template +using void_t = void; -template > struct has_tag : std::false_type {}; +template > +struct has_tag : std::false_type {}; template struct has_tag> : std::true_type {}; -template ::value> struct Topic2; +template ::value> +struct Topic2; -template ::value> class Topic; +template ::value> +class Topic; -template class Topic : public ITopic { +template +class Topic : public ITopic { public: using Tag = typename EV::Tag; @@ -41,7 +46,8 @@ template class Topic : public ITopic { Tag _tag; }; -template class Topic : public ITopic { +template +class Topic : public ITopic { public: SynopsisBuilderPtr make_synopsis_builder() const override { return std::make_shared(); diff --git a/src/lib_spark/spark/orderman/CancelOrderMsg.h b/src/lib_spark/spark/orderman/CancelOrderMsg.h index 3048316b9..db3009205 100644 --- a/src/lib_spark/spark/orderman/CancelOrderMsg.h +++ b/src/lib_spark/spark/orderman/CancelOrderMsg.h @@ -1,8 +1,8 @@ #pragma once #include "spark/api/services/OrderService.pb.h" -#include "spark/core/FMT_IMPL.h" #include "spark/orderman/orderman_utils/orderman_common.h" +#include "system/FMT_IMPL.h" #include diff --git a/src/lib_spark/spark/orderman/CancelReplaceOrderMsg.h b/src/lib_spark/spark/orderman/CancelReplaceOrderMsg.h index 7e30be412..cfbf3cf9f 100644 --- a/src/lib_spark/spark/orderman/CancelReplaceOrderMsg.h +++ b/src/lib_spark/spark/orderman/CancelReplaceOrderMsg.h @@ -1,8 +1,8 @@ #pragma once -#include "spark/core/FMT_IMPL.h" #include "spark/orderman/CreateOrderMsg.h" #include "spark/orderman/orderman_utils/orderman_common.h" +#include "system/FMT_IMPL.h" #include diff --git a/src/lib_spark/spark/orderman/CreateOrderMsg.h b/src/lib_spark/spark/orderman/CreateOrderMsg.h index ea451b2cd..7c3d23e71 100644 --- a/src/lib_spark/spark/orderman/CreateOrderMsg.h +++ b/src/lib_spark/spark/orderman/CreateOrderMsg.h @@ -1,10 +1,10 @@ #pragma once -#include "spark/core/FMT_IMPL.h" #include "spark/domain_model/Security.h" #include "spark/domain_model/common.h" #include "spark/orderman/orderman_utils/orderman_common.h" #include "spark/utils/PBUtils.h" +#include "system/FMT_IMPL.h" #include diff --git a/src/lib_spark/spark/orderman/RFQMsg.h b/src/lib_spark/spark/orderman/RFQMsg.h index 6f7362ad0..e7be780ba 100644 --- a/src/lib_spark/spark/orderman/RFQMsg.h +++ b/src/lib_spark/spark/orderman/RFQMsg.h @@ -1,10 +1,10 @@ #pragma once #include "spark/api/services/OrderService.pb.h" -#include "spark/core/FMT_IMPL.h" #include "spark/domain_model/Security.pb.h" #include "spark/orderman/events/RFQEvent.h" #include "spark/orderman/orderman_utils/orderman_common.h" +#include "system/FMT_IMPL.h" #include diff --git a/src/lib_spark/spark/orderman/ccapi/CCAPIDeribitHelpers.cpp b/src/lib_spark/spark/orderman/ccapi/CCAPIDeribitHelpers.cpp index afca04c6d..eb8655343 100644 --- a/src/lib_spark/spark/orderman/ccapi/CCAPIDeribitHelpers.cpp +++ b/src/lib_spark/spark/orderman/ccapi/CCAPIDeribitHelpers.cpp @@ -1,8 +1,8 @@ #include "CCAPIDeribitHelpers.h" #include "spark/api/services/OrderService.pb.h" #include "spark/domain_model/Security.pb.h" -#include "spark/io/JsonReader.h" #include "spark/orderman/ccapi/ICCAPIOrderMux.h" +#include "system/json/json_reader.h" #include #include diff --git a/src/lib_spark/spark/orderman/ccapi/CCAPIOrderCallbackMsgs.cpp b/src/lib_spark/spark/orderman/ccapi/CCAPIOrderCallbackMsgs.cpp index 7621350c3..70c60c512 100644 --- a/src/lib_spark/spark/orderman/ccapi/CCAPIOrderCallbackMsgs.cpp +++ b/src/lib_spark/spark/orderman/ccapi/CCAPIOrderCallbackMsgs.cpp @@ -1,6 +1,6 @@ #include "CCAPIOrderCallbackMsgs.h" -#include "spark/io/JsonReader.h" #include "spark/utils/bts_assert.h" +#include "system/json/json_reader.h" namespace bts::orderman { @@ -59,4 +59,4 @@ std::ostream &operator<<( return out; } -} // namespace bts::orderman \ No newline at end of file +} // namespace bts::orderman diff --git a/src/lib_spark/spark/orderman/ccapi/CCAPIOrderCallbackMsgs.h b/src/lib_spark/spark/orderman/ccapi/CCAPIOrderCallbackMsgs.h index d1d7e5253..97b89eca9 100644 --- a/src/lib_spark/spark/orderman/ccapi/CCAPIOrderCallbackMsgs.h +++ b/src/lib_spark/spark/orderman/ccapi/CCAPIOrderCallbackMsgs.h @@ -1,17 +1,17 @@ #pragma once -#include "ccapi_cpp/ccapi_message.h" -#include "ccapi_cpp/ccapi_session.h" #include "spark/api/services/OrderService.pb.h" #include "spark/domain_model/Security.pb.h" -#include "spark/io/JsonReader.h" #include "spark/logging/logging.h" #include "spark/orderman/orderman_utils/orderman_common.h" #include "spark/utils/PBUtils.h" #include "spark/utils/bts_assert.h" +#include "system/json/json_reader.h" + #include #include #include +#include #include #include #include @@ -261,4 +261,4 @@ void to_json(nlohmann::json &j, const DeribitOpenPosition &dop); std::ostream &operator<<( std::ostream &out, const DeribitOpenPosition &dob) noexcept; -} // namespace bts::orderman \ No newline at end of file +} // namespace bts::orderman diff --git a/src/lib_spark/spark/orderman/ccapi/CCAPIOrderState.h b/src/lib_spark/spark/orderman/ccapi/CCAPIOrderState.h index 41f5e33ed..e6bb1cfec 100644 --- a/src/lib_spark/spark/orderman/ccapi/CCAPIOrderState.h +++ b/src/lib_spark/spark/orderman/ccapi/CCAPIOrderState.h @@ -2,12 +2,12 @@ #include "CCAPIOrderCallbackMsgs.h" #include "domain/order_status.h" #include "spark/api/services/OrderService.pb.h" -#include "spark/core/FMT_IMPL.h" #include "spark/domain_model/Security.h" #include "spark/domain_model/Security.pb.h" #include "spark/domain_model/SecurityKey.h" #include "spark/orderman/orderman_utils/orderman_common.h" #include "spark/os/os.h" +#include "system/FMT_IMPL.h" #include #include diff --git a/src/lib_spark/spark/orderman/events/RFQEvent.h b/src/lib_spark/spark/orderman/events/RFQEvent.h index fc506577b..f1bf69142 100644 --- a/src/lib_spark/spark/orderman/events/RFQEvent.h +++ b/src/lib_spark/spark/orderman/events/RFQEvent.h @@ -1,10 +1,10 @@ #pragma once #include "spark/api/services/OrderService.pb.h" -#include "spark/core/FMT_IMPL.h" #include "spark/domain_model/Security.pb.h" #include "spark/mercury/events/Event.h" #include "spark/tracing/PerfLog.h" +#include "system/FMT_IMPL.h" #include #include diff --git a/src/lib_spark/spark/orderman/gateways/CCAPIExecutionGateway.cpp b/src/lib_spark/spark/orderman/gateways/CCAPIExecutionGateway.cpp index 37e63ed22..a7500a15e 100644 --- a/src/lib_spark/spark/orderman/gateways/CCAPIExecutionGateway.cpp +++ b/src/lib_spark/spark/orderman/gateways/CCAPIExecutionGateway.cpp @@ -2,7 +2,9 @@ #include "spark/api/service_helpers/AdminServiceUtils.h" #include "spark/api/services/AdminService.pb.h" #include "spark/api/services/OrderService.pb.h" -#include "spark/core/TimeStamp.h" +#include "spark/config/config.h" +#include "spark/config/protos/toggles.pb.h" +#include "spark/domain_model/Security.h" #include "spark/domain_model/Security.pb.h" #include "spark/domain_model/SecurityKey.h" #include "spark/domain_model/common.h" @@ -13,7 +15,9 @@ #include "spark/orderman/CreateOrderMsg.h" #include "spark/orderman/OrderMsg.h" #include "spark/orderman/RFQMsg.h" +#include "spark/orderman/ccapi/CCAPIConnectionConfig.h" #include "spark/orderman/ccapi/CCAPIDeribitOrderMux.h" +#include "spark/orderman/ccapi/CCAPIOrderState.h" #include "spark/orderman/ccapi/ICCAPIOrderMux.h" #include "spark/orderman/events/NewAdminDataEvent.h" #include "spark/orderman/events/NewExecutionReportEvent.h" @@ -24,22 +28,15 @@ #include "spark/orderman/orderman_utils/ExecutionReport.h" #include "spark/orderman/orderman_utils/orderman_common.h" #include "spark/os/os.h" +#include "spark/utils/PBUtils.h" +#include "spark/utils/Uuid.h" #include "spark/utils/bts_assert.h" #include "spark/utils/bts_chrono.h" #include "spark/utils/datetime.h" +#include "system/time_stamp.h" -#include "spark/api/service_helpers/AdminServiceUtils.h" -#include "spark/config/config.h" -#include "spark/config/protos/toggles.pb.h" -#include "spark/domain_model/Security.h" -#include "spark/orderman/ccapi/CCAPIOrderState.h" -#include "spark/orderman/ccapi/ICCAPIOrderMux.h" -#include "spark/utils/PBUtils.h" -#include "spark/utils/Uuid.h" #include #include -//#include -#include "spark/orderman/ccapi/CCAPIConnectionConfig.h" #include #include #include @@ -492,4 +489,4 @@ SingleOrderMux *CCAPIExecutionGateway::_find_mux_from_orderkey(OrderKey key) { return _find_mux(it->second.routing_record); } -} // namespace bts::orderman \ No newline at end of file +} // namespace bts::orderman diff --git a/src/lib_spark/spark/orderman/gateways/GLBXiLink3ExecutionGatewayState.h b/src/lib_spark/spark/orderman/gateways/GLBXiLink3ExecutionGatewayState.h index 7d237a49c..04c126501 100644 --- a/src/lib_spark/spark/orderman/gateways/GLBXiLink3ExecutionGatewayState.h +++ b/src/lib_spark/spark/orderman/gateways/GLBXiLink3ExecutionGatewayState.h @@ -1,8 +1,8 @@ #pragma once #ifdef SPARK_ENABLE_CCAPI -#include "spark/core/EnumMacros.h" -#include "spark/core/FMT_IMPL.h" +#include "system/FMT_IMPL.h" +#include "system/enum_macros.h" #include #include diff --git a/src/lib_spark/spark/orderman/gateways/sim/SimExecutionGateway.cpp b/src/lib_spark/spark/orderman/gateways/sim/SimExecutionGateway.cpp index 85f12c2e6..69cc4dd71 100644 --- a/src/lib_spark/spark/orderman/gateways/sim/SimExecutionGateway.cpp +++ b/src/lib_spark/spark/orderman/gateways/sim/SimExecutionGateway.cpp @@ -1,7 +1,6 @@ #include "SimExecutionGateway.h" #include "domain/protobufs/aggressor_side.pb.h" #include "spark/api/services/OrderService.pb.h" -#include "spark/core/TimeStamp.h" #include "spark/domain_model/Security.h" #include "spark/domain_model/Security.pb.h" #include "spark/domain_model/SecurityKey.h" @@ -25,6 +24,7 @@ #include "spark/utils/Uuid.h" #include "spark/utils/bts_assert.h" #include "spark/utils/thread_manager.h" +#include "system/time_stamp.h" #include #include @@ -223,8 +223,10 @@ struct SEGSecurityData { const CancelReplaceOrderMsg &cxlr_msg = std::get(msg); SEGOrderState *seg_os = find_order(cxlr_msg.create_fields.key); - if(seg_os == nullptr){ - LOG(OrderMan, Info, "SimExecutionGateway::apply_order_action tried updating unkown order"); + if (seg_os == nullptr) { + LOG(OrderMan, Info, + "SimExecutionGateway::apply_order_action tried updating unkown " + "order"); return {ActionResult::NoOp, nullptr}; } auto action_result = seg_os->apply_change(cxlr_msg); @@ -232,8 +234,10 @@ struct SEGSecurityData { } else if (std::holds_alternative(msg)) { const CancelOrderMsg &cxl_msg = std::get(msg); SEGOrderState *seg_os = find_order(cxl_msg.key); - if(seg_os == nullptr){ - LOG(OrderMan, Info, "SimExecutionGateway::apply_order_action tried canceling unkown order"); + if (seg_os == nullptr) { + LOG(OrderMan, Info, + "SimExecutionGateway::apply_order_action tried canceling " + "unkown order"); return {ActionResult::NoOp, nullptr}; } auto action_result = seg_os->apply_cxl(cxl_msg); diff --git a/src/lib_spark/spark/orderman/ilink3/IL3State.h b/src/lib_spark/spark/orderman/ilink3/IL3State.h index 680eb4172..e534d7d3d 100644 --- a/src/lib_spark/spark/orderman/ilink3/IL3State.h +++ b/src/lib_spark/spark/orderman/ilink3/IL3State.h @@ -1,8 +1,8 @@ #pragma once #ifdef SPARK_ENABLE_CCAPI -#include "spark/core/EnumMacros.h" -#include "spark/core/FMT_IMPL.h" +#include "system/FMT_IMPL.h" +#include "system/enum_macros.h" #include #include diff --git a/src/lib_spark/spark/orderman/orderman_utils/Book.h b/src/lib_spark/spark/orderman/orderman_utils/Book.h index 3871d813a..649d9cb19 100644 --- a/src/lib_spark/spark/orderman/orderman_utils/Book.h +++ b/src/lib_spark/spark/orderman/orderman_utils/Book.h @@ -1,7 +1,7 @@ #pragma once -#include "spark/core/FMT_IMPL.h" #include "spark/md/PriceSize.h" +#include "system/FMT_IMPL.h" #include 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 c295d4071..fc0d75eba 100644 --- a/src/lib_spark/spark/orderman/orderman_utils/orderman_common.h +++ b/src/lib_spark/spark/orderman/orderman_utils/orderman_common.h @@ -8,12 +8,12 @@ #include #include "spark/api/services/OrderService.pb.h" -#include "spark/core/FMT_IMPL.h" #include "spark/domain_model/common.h" -#include "system/value_wrapper.h" #include "spark/utils/bts_assert.h" #include "spark/utils/bts_chrono.h" #include "spark/utils/overloaded.h" +#include "system/FMT_IMPL.h" +#include "system/value_wrapper.h" namespace bts { namespace api { diff --git a/src/lib_spark/spark/orderman/orders/TriggerOrderCancelMode.h b/src/lib_spark/spark/orderman/orders/TriggerOrderCancelMode.h index 93c409172..2153eaa68 100644 --- a/src/lib_spark/spark/orderman/orders/TriggerOrderCancelMode.h +++ b/src/lib_spark/spark/orderman/orders/TriggerOrderCancelMode.h @@ -1,7 +1,7 @@ #pragma once -#include "spark/core/EnumMacros.h" -#include "spark/core/FMT_IMPL.h" +#include "system/FMT_IMPL.h" +#include "system/enum_macros.h" #include #include diff --git a/src/lib_spark/spark/orderman/orders/TriggerOrderState.h b/src/lib_spark/spark/orderman/orders/TriggerOrderState.h index d46d8e5f9..0f7358d80 100644 --- a/src/lib_spark/spark/orderman/orders/TriggerOrderState.h +++ b/src/lib_spark/spark/orderman/orders/TriggerOrderState.h @@ -1,7 +1,7 @@ #pragma once -#include "spark/core/EnumMacros.h" -#include "spark/core/FMT_IMPL.h" +#include "system/FMT_IMPL.h" +#include "system/enum_macros.h" #include #include diff --git a/src/lib_spark/spark/orderman/orders/algo/IAlgoOrder.h b/src/lib_spark/spark/orderman/orders/algo/IAlgoOrder.h index 70913084b..ccdbd0680 100644 --- a/src/lib_spark/spark/orderman/orders/algo/IAlgoOrder.h +++ b/src/lib_spark/spark/orderman/orders/algo/IAlgoOrder.h @@ -1,12 +1,12 @@ #pragma once #include "domain/protobufs/trading_status.pb.h" -#include "spark/core/FMT_IMPL.h" #include "spark/md/protos/co2.pb.h" #include "spark/orderman/calculations/ITheoCalculator.h" #include "spark/orderman/events/TickerUpdateEvent.h" #include "spark/orderman/orders/OrderOpResult.h" #include "spark/orderman/orders/algo/PositionUpdate.h" +#include "system/FMT_IMPL.h" #include @@ -41,13 +41,13 @@ class IAlgoOrder { // The child order specified by the order key has changed virtual void on_child_change( - OrderKey child_key, const ChildState& child_state); + OrderKey child_key, const ChildState &child_state); // The book for the specified security has changed - virtual void on_book(SecurityKey security_key, const Book& book); + virtual void on_book(SecurityKey security_key, const Book &book); // Trades stream for the specified security - virtual void on_ticker(SecurityKey security_key, const TradeVector& trades); + virtual void on_ticker(SecurityKey security_key, const TradeVector &trades); // The trading status for the specified security has changed virtual void on_status( @@ -57,7 +57,7 @@ class IAlgoOrder { virtual void on_settlement(SecurityKey security_key, Price price); // The current position for the security, account combination - virtual void on_position(const PositionUpdate& position); + virtual void on_position(const PositionUpdate &position); // A signal sent ahead of a book update, indicating that one or // more trades between the two price levels specified for a buy or @@ -70,7 +70,7 @@ class IAlgoOrder { uint num_price_levels); // The calculator has updated itself, theos need to be recomputed - virtual void on_theos(const analytics::ITheoCalculator* theo_calculator); + virtual void on_theos(const analytics::ITheoCalculator *theo_calculator); // A periodic timer has fired virtual void on_timer(); @@ -85,10 +85,10 @@ class IAlgoOrder { // so it can be used for any expensive initialization // operations. The implementation should return an error code if it // detects an invalid parameter in the algo definition. - virtual OrderOpResult do_before_launch(IBeforeLaunchAlgoServices&); + virtual OrderOpResult do_before_launch(IBeforeLaunchAlgoServices &); // Override this method to activate your algo - virtual void do_launch(IAlgoServices& services) = 0; + virtual void do_launch(IAlgoServices &services) = 0; // Override this method to activate your algo using an existing // working order as a child. Attached child orders are @@ -97,12 +97,12 @@ class IAlgoOrder { // from this call through IAlgoServices::update_fill_state() will // be included in the fills_at_attach_time count field. virtual void do_launch_attached( - IAlgoServices& services, OrderKey child_key, ChildState child_state); + IAlgoServices &services, OrderKey child_key, ChildState child_state); // Implement this method to respond to updates to your algo. The // implementation should validate the update and either apply it, // if valid or terminate with an error otherwise - virtual void do_update(api::orderman::Update const& update); + virtual void do_update(api::orderman::Update const &update); // Override this method to provide custom handling of a cancel // request. The default behaviour is to cancel both this order and @@ -132,13 +132,13 @@ constexpr std::string ChildStatus_Name(ChildStatus child_status) { } inline void IAlgoOrder::on_child_change( - OrderKey /*child_key*/, const ChildState& /*child_state*/) {} + OrderKey /*child_key*/, const ChildState & /*child_state*/) {} inline void IAlgoOrder::on_book( - SecurityKey /*security_key*/, const Book& /*book*/) {} + SecurityKey /*security_key*/, const Book & /*book*/) {} inline void IAlgoOrder::on_ticker( - SecurityKey /*security_key*/, const TradeVector& /*trades*/) {} + SecurityKey /*security_key*/, const TradeVector & /*trades*/) {} inline void IAlgoOrder::on_status( SecurityKey /*security_key*/, domain::protobufs::TradingStatus /*status*/) { @@ -147,7 +147,7 @@ inline void IAlgoOrder::on_status( inline void IAlgoOrder::on_settlement( SecurityKey /*security_key*/, Price /*price*/) {} -inline void IAlgoOrder::on_position(const PositionUpdate& /*position*/) {} +inline void IAlgoOrder::on_position(const PositionUpdate & /*position*/) {} inline void IAlgoOrder::on_trade_summary_signal( SecurityKey /*security_key*/, @@ -157,20 +157,20 @@ inline void IAlgoOrder::on_trade_summary_signal( uint /*num_price_levels*/) {} inline void IAlgoOrder::on_theos( - analytics::ITheoCalculator const* /*theo_calculator*/) {} + analytics::ITheoCalculator const * /*theo_calculator*/) {} inline void IAlgoOrder::on_timer() {} -inline OrderOpResult IAlgoOrder::do_before_launch(IBeforeLaunchAlgoServices&) { +inline OrderOpResult IAlgoOrder::do_before_launch(IBeforeLaunchAlgoServices &) { return {}; } inline void IAlgoOrder::do_launch_attached( - IAlgoServices& /*services*/, + IAlgoServices & /*services*/, OrderKey /*child_key*/, ChildState /*child_state*/) {} -inline void IAlgoOrder::do_update(api::orderman::Update const& /*update*/) {} +inline void IAlgoOrder::do_update(api::orderman::Update const & /*update*/) {} inline IAlgoOrder::OnCancelResponse IAlgoOrder::on_cancel() { return OnCancelResponse::HONOR; diff --git a/src/lib_spark/spark/quickbus/core/Quickbus.h b/src/lib_spark/spark/quickbus/core/Quickbus.h index a0969c4e1..79e1d0a6a 100644 --- a/src/lib_spark/spark/quickbus/core/Quickbus.h +++ b/src/lib_spark/spark/quickbus/core/Quickbus.h @@ -1,12 +1,12 @@ #pragma once -#include "spark/core/EnumMacros.h" #include "spark/quickbus/core/QuickbusThreadOptions.h" #include "spark/quickbus/core/Topic.h" #include "spark/quickbus/message_model/Update.h" #include "spark/quickbus/pubsub/TableEvent.h" #include "spark/quickbus/pubsub/TableFilter.h" #include "spark/utils/bts_export.h" +#include "system/enum_macros.h" #include diff --git a/src/lib_spark/spark/quickbus/core/QuickbusThreadOptions.h b/src/lib_spark/spark/quickbus/core/QuickbusThreadOptions.h index f144dd439..f805f5686 100644 --- a/src/lib_spark/spark/quickbus/core/QuickbusThreadOptions.h +++ b/src/lib_spark/spark/quickbus/core/QuickbusThreadOptions.h @@ -1,6 +1,8 @@ #pragma once -#include "spark/core/EnumMacros.h" -#include "spark/core/FMT_IMPL.h" + +#include "system/FMT_IMPL.h" +#include "system/enum_macros.h" + #include #include #include @@ -11,8 +13,7 @@ namespace bts::qbus { #define FOR_ALL_VALUES(per_value) \ per_value(QuickbusThreadOptions, OWN_THREAD) \ per_value(QuickbusThreadOptions, OUTSIDE_THREAD) \ - per_value(QuickbusThreadOptions, DEFERRED_START) \ -// clang-format on + per_value(QuickbusThreadOptions, DEFERRED_START) // clang-format on /** * @brief Thread options for Quickbus diff --git a/src/lib_spark/spark/win_cpps.txt b/src/lib_spark/spark/win_cpps.txt new file mode 100644 index 000000000..7006119ea --- /dev/null +++ b/src/lib_spark/spark/win_cpps.txt @@ -0,0 +1,122 @@ +./api/core/ApiClientInterop.cpp +./api/core/ApiServerInterop.cpp +./api/public/ApiServer.cpp +./api/public/ClientChannel.cpp +./api/public/QuickbusClientChannel.cpp +./api/public/ServerChannel.cpp +./api/public/ServiceContext.cpp +./api/test/ApiTests.cpp +./api/test/HelloServiceServer.cpp +./config/ConfigDownloader.cpp +./config/ConfigErrorCollector.cpp +./config/ConfigPropertyEvaluator.cpp +./config/ConfigQuerier.cpp +./config/ConfigValueQueue.cpp +./config/ConfigurationException.cpp +./config/ConfigurationState.cpp +./config/PreprocessInputStream.cpp +./config/config.cpp +./config/tests/HTTPServer.cpp +./config/tests/config_ref_tests.cpp +./config/tests/config_tests.cpp +./config/text_format/text_format.cpp +./core/TimeSpan.cpp +./core/TimeStamp.cpp +./domain/DomainSecurityUtils.cpp +./domain/SecurityCriteria.cpp +./domain/SecurityCriteriaClause.cpp +./domain_model/Security.cpp +./domain_model/SecurityTests.cpp +./domain_model/sod.cpp +./domain_model/tests/domain_tests.cpp +./expression/BooleanGrammar.cpp +./expression/ExpressionEvaluator.cpp +./expression/ParserExceptions.cpp +./expression/Value.cpp +./expression/tests/expression_parser_tests.cpp +./logging/LoggerHub.cpp +./logging/Sink.cpp +./logging/logging.cpp +./logging/tests/logging_tests.cpp +./md/Diag/MDPeriodicDumper.cpp +./md/Diag/ShmDumper.cpp +./md/MBOProcessor.cpp +./md/MBOServiceServer.cpp +./md/MDClient.cpp +./md/MDConsumer.cpp +./md/MDConsumerHandle.cpp +./md/MDConsumerInterop.cpp +./md/MDProducer.cpp +./md/MDProducerHandle.cpp +./md/MemorySegmentUtils.cpp +./md/PriceSize.cpp +./md/Product.cpp +./md/SecurityCache.cpp +./md/SecurityDB.cpp +./md/SecurityMapper.cpp +./md/SecurityMarketState.cpp +./md/SecurityOracle.cpp +./md/SecurityStore.cpp +./md/Shm/FixedSecurity.cpp +./md/ShmSegmentName.cpp +./md/SyntheticSecurityService.cpp +./md/cme/MDP3Utils.cpp +./md/common.cpp +./md/ice/ICEUtils.cpp +./md/relay/QueryServer.cpp +./md/relay/RelayClient.cpp +./md/relay/RelayRecorder.cpp +./md/service/MarketDataServiceServer.cpp +./md/test/Co2ManagedTestHelper.cpp +./md/test/Co2TestInstrument.cpp +./md/test/mbo_tests.cpp +./md/test/md2_tests.cpp +./md/test/md_test_utils.cpp +./md/test/synthetic_book_merge_tests.cpp +./os/os.cpp +./os/tests/os_tests.cpp +./quickbus/core/LocalNode.cpp +./quickbus/core/Quickbus.cpp +./quickbus/core/SubscriptionID.cpp +./quickbus/core/TableID.cpp +./quickbus/message_model/Update.cpp +./quickbus/message_model/merge_updates.cpp +./quickbus/network/QBConnection.cpp +./quickbus/network/QBConnectionManager.cpp +./quickbus/network/endpoint_description.cpp +./quickbus/pubsub/TablePublisher.cpp +./quickbus/pubsub/TableSubscriber.cpp +./quickbus/pubsub/tests/qb_pubsub_tests.cpp +./quickbus/routing/INode.cpp +./quickbus/routing/NodeID.cpp +./quickbus/routing/Router.cpp +./quickbus/rpc/RPCClient.cpp +./quickbus/rpc/RPCServer.cpp +./quickbus/rpc/RPCSessionID.cpp +./quickbus/rpc/rpc_utils.cpp +./quickbus/rpc/tests/qb_rpc_tests.cpp +./quickbus/tests/quickbus_tests.cpp +./testing/catch_test_runner.cpp +./utils/AuthSessionManager.cpp +./utils/AuthToken.cpp +./utils/Dispatcher.cpp +./utils/FileUtils.cpp +./utils/GrowableSPSCQueue.cpp +./utils/HTTPStream.cpp +./utils/MathUtils.cpp +./utils/PBUtils.cpp +./utils/Puid.cpp +./utils/SecureLogon.cpp +./utils/SharedMemory.cpp +./utils/Uuid.cpp +./utils/datetime.cpp +./utils/download.cpp +./utils/file_utils.cpp +./utils/init_spark_lib.cpp +./utils/is_unittest_environment.cpp +./utils/sftp.cpp +./utils/stats.cpp +./utils/tests/AuthTokenTests.cpp +./utils/tests/MathUtilsTests.cpp +./utils/tests/SingleWriterConcurrentVectorTests.cpp +./utils/thread_manager.cpp diff --git a/src/lib_spark/spark/io/JsonMacros.h b/src/lib_system/system/json/json_macros.h similarity index 100% rename from src/lib_spark/spark/io/JsonMacros.h rename to src/lib_system/system/json/json_macros.h