diff --git a/CMakeLists.txt b/CMakeLists.txt index c0db32cb0..5d6f33ebf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -107,6 +107,7 @@ else() add_subdirectory(src/lib_system) add_subdirectory(src/lib_domain) add_subdirectory(src/lib_python_md) + add_subdirectory(src/lib_logging) add_subdirectory(src/app_sparkd) add_subdirectory(src/data_files) endif() diff --git a/src/app_sparkd/sparkd/algo/AlgoDefinitionServiceServer.h b/src/app_sparkd/sparkd/algo/AlgoDefinitionServiceServer.h index 1b68d53c6..73543fa84 100644 --- a/src/app_sparkd/sparkd/algo/AlgoDefinitionServiceServer.h +++ b/src/app_sparkd/sparkd/algo/AlgoDefinitionServiceServer.h @@ -1,22 +1,22 @@ #pragma once +#include "logging/logging.h" #include "spark/api/public/ServiceContext.h" #include "spark/api/services/AlgoDefinitionService.server.pb.h" #include "spark/api/services/OrderService.client.pb.h" #include "spark/api/services/OrderService.pb.h" -#include "spark/logging/logging.h" #include "spark/persistence/IStore.h" #include "spark/persistence/SqliteStore.h" #include "spark/utils/PBUtils.h" #include "spark/utils/TimeStamp.h" #include "spark/utils/bts_assert.h" #include "spark/utils/bts_no_copy.h" -#include #include #include #include #include +#include #include #include #include @@ -69,4 +69,4 @@ class AlgoDefinitionServiceServer : public AlgoDefinitionServiceBase { } // namespace algo } // namespace orderman } // namespace api -} // namespace bts \ No newline at end of file +} // namespace bts diff --git a/src/app_sparkd/sparkd/analytics/AnalyticsServiceServer.cpp b/src/app_sparkd/sparkd/analytics/AnalyticsServiceServer.cpp index 434fffdfe..f26d6e0c6 100644 --- a/src/app_sparkd/sparkd/analytics/AnalyticsServiceServer.cpp +++ b/src/app_sparkd/sparkd/analytics/AnalyticsServiceServer.cpp @@ -1,8 +1,8 @@ #include "AnalyticsServiceServer.h" +#include "logging/logging.h" #include "spark/api/apicore.pb.h" #include "spark/api/services/AnalyticsService.pb.h" #include "spark/api/services/AnalyticsService.server.pb.h" -#include "spark/logging/logging.h" #include "spark/persistence/IStore.h" #include "spark/persistence/SqliteStore.h" #include "spark/utils/PBUtils.h" diff --git a/src/app_sparkd/sparkd/cmds/AdminReport.cpp b/src/app_sparkd/sparkd/cmds/AdminReport.cpp index dc8678d11..b5282c413 100644 --- a/src/app_sparkd/sparkd/cmds/AdminReport.cpp +++ b/src/app_sparkd/sparkd/cmds/AdminReport.cpp @@ -1,9 +1,9 @@ #include "AdminReport.h" +#include "logging/logging.h" +#include "logging/protobufs/logging.pb.h" #include "spark/api/public/ServiceContext.h" #include "spark/config/config.h" -#include "spark/config/protos/logging.pb.h" -#include "spark/logging/logging.h" #include "spark/quickbus/quickbus.h" #include "spark/api/service_helpers/AdminServiceUtils.h" @@ -17,9 +17,9 @@ namespace bts::cmds { void md_report() { - auto cfg = config::get(); + auto cfg = config::get(); cfg.mutable_console()->set_default_level("Fatal"); - log::configure_logging(cfg); + logging::configure_logging(cfg); std::map mic_map; mic_map[api::CMEMics::CME] = "XCME"; diff --git a/src/app_sparkd/sparkd/cmds/CMECert.cpp b/src/app_sparkd/sparkd/cmds/CMECert.cpp index 2fdec07dd..c959c5003 100644 --- a/src/app_sparkd/sparkd/cmds/CMECert.cpp +++ b/src/app_sparkd/sparkd/cmds/CMECert.cpp @@ -1,5 +1,5 @@ #include "CMECert.h" -#include "spark/logging/logging.h" +#include "logging/logging.h" #include "spark/orderman/ilink3/IL3Dispatcher.h" #include "spark/orderman/ilink3/IL3GW.h" #include "spark/orderman/ilink3/IL3Reactor.h" diff --git a/src/app_sparkd/sparkd/cmds/KeyCmd.cpp b/src/app_sparkd/sparkd/cmds/KeyCmd.cpp index 5ac7ed22c..226299dcf 100644 --- a/src/app_sparkd/sparkd/cmds/KeyCmd.cpp +++ b/src/app_sparkd/sparkd/cmds/KeyCmd.cpp @@ -1,8 +1,8 @@ #include "KeyCmd.h" +#include "logging/logging.h" #include "spark/config/config.h" #include "spark/config/protos/keycode.pb.h" -#include "spark/logging/logging.h" #include "spark/os/os.h" #include "spark/utils/AuthToken.h" #include "spark/utils/FileUtils.h" diff --git a/src/app_sparkd/sparkd/cmds/QuickTest.cpp b/src/app_sparkd/sparkd/cmds/QuickTest.cpp index 297b55e97..3dfec6d75 100644 --- a/src/app_sparkd/sparkd/cmds/QuickTest.cpp +++ b/src/app_sparkd/sparkd/cmds/QuickTest.cpp @@ -1,5 +1,5 @@ #include "QuickTest.h" -#include "spark/logging/logging.h" +#include "logging/logging.h" #include diff --git a/src/app_sparkd/sparkd/cmds/Run.cpp b/src/app_sparkd/sparkd/cmds/Run.cpp index 7ec9617b7..dce05b391 100644 --- a/src/app_sparkd/sparkd/cmds/Run.cpp +++ b/src/app_sparkd/sparkd/cmds/Run.cpp @@ -1,9 +1,9 @@ #include "Run.h" +#include "logging/logging.h" #include "spark/api/public/ServiceContext.h" #include "spark/config/config.h" #include "spark/config/protos/ports.pb.h" #include "spark/config/protos/quickbus_cfg.pb.h" -#include "spark/logging/logging.h" #include "spark/md/MBOProcessor.h" #include "spark/md/MBOServiceServer.h" #include "spark/md/MDClient.h" diff --git a/src/app_sparkd/sparkd/cmds/TestPythonMdProviderCmd.cpp b/src/app_sparkd/sparkd/cmds/TestPythonMdProviderCmd.cpp index 51395c885..e2255f789 100644 --- a/src/app_sparkd/sparkd/cmds/TestPythonMdProviderCmd.cpp +++ b/src/app_sparkd/sparkd/cmds/TestPythonMdProviderCmd.cpp @@ -1,7 +1,7 @@ #include "TestPythonMdProviderCmd.h" +#include "logging/logging.h" #include "python_md/md_sink_impl.h" #include "python_md/py_md_executor.h" -#include "spark/logging/logging.h" #include #include diff --git a/src/app_sparkd/sparkd/cmds/crypto/DeribitDemo.cpp b/src/app_sparkd/sparkd/cmds/crypto/DeribitDemo.cpp index bddc12bfa..7b1df69ec 100644 --- a/src/app_sparkd/sparkd/cmds/crypto/DeribitDemo.cpp +++ b/src/app_sparkd/sparkd/cmds/crypto/DeribitDemo.cpp @@ -1,5 +1,5 @@ #include "DeribitDemo.h" -#include "spark/logging/logging.h" +#include "logging/logging.h" #include "sparkd/cmds/crypto/DeribitDemoListener.h" #include diff --git a/src/app_sparkd/sparkd/cmds/crypto/DeribitDemoConfiguration.cpp b/src/app_sparkd/sparkd/cmds/crypto/DeribitDemoConfiguration.cpp index b31142c32..f9cf4f50a 100644 --- a/src/app_sparkd/sparkd/cmds/crypto/DeribitDemoConfiguration.cpp +++ b/src/app_sparkd/sparkd/cmds/crypto/DeribitDemoConfiguration.cpp @@ -1,6 +1,6 @@ #include "DeribitDemoConfiguration.h" #include "RapidJsonReader.h" -#include "spark/logging/logging.h" +#include "logging/logging.h" #include "rapidjson/istreamwrapper.h" #include #include diff --git a/src/app_sparkd/sparkd/cmds/crypto/LiveLadderDemoCmd.cpp b/src/app_sparkd/sparkd/cmds/crypto/LiveLadderDemoCmd.cpp index ab586f247..575f833b7 100644 --- a/src/app_sparkd/sparkd/cmds/crypto/LiveLadderDemoCmd.cpp +++ b/src/app_sparkd/sparkd/cmds/crypto/LiveLadderDemoCmd.cpp @@ -1,9 +1,9 @@ #ifdef SPARK_ENABLE_CCAPI #include "LiveLadderDemoCmd.h" #include "LiveLadderDemo.h" +#include "logging/logging.h" #include "spark/api/md/MarketDataConfig.pb.h" #include "spark/io/ProtoReader.h" -#include "spark/logging/logging.h" #include "sparkd/cmds/common/Validators.h" #include "sparkd/cmds/crypto/LiveLadderDemo.h" #include diff --git a/src/app_sparkd/sparkd/cmds/md/cmds/Cleanup.cpp b/src/app_sparkd/sparkd/cmds/md/cmds/Cleanup.cpp index 1f1d45ae0..e347fba51 100644 --- a/src/app_sparkd/sparkd/cmds/md/cmds/Cleanup.cpp +++ b/src/app_sparkd/sparkd/cmds/md/cmds/Cleanup.cpp @@ -1,7 +1,7 @@ #include "Cleanup.h" +#include "logging/logging.h" #include "spark/config/config.h" #include "spark/config/protos/market_data.pb.h" -#include "spark/logging/logging.h" #include "spark/md/ShmSegmentName.h" #include "spark/md/protos/co2.pb.h" #include diff --git a/src/app_sparkd/sparkd/cmds/md/cmds/Run.cpp b/src/app_sparkd/sparkd/cmds/md/cmds/Run.cpp index 87b719cdc..08f915e8b 100644 --- a/src/app_sparkd/sparkd/cmds/md/cmds/Run.cpp +++ b/src/app_sparkd/sparkd/cmds/md/cmds/Run.cpp @@ -1,8 +1,8 @@ #include "Run.h" #include "Cleanup.h" #include "domain/security_criteria.h" +#include "logging/logging.h" #include "spark/config/protos/market_data.pb.h" -#include "spark/logging/logging.h" #include "spark/md/SymbolLoader.h" #include "spark/md/UserSymbol.h" #include "spark/md/relay/RelayRecorder.h" diff --git a/src/app_sparkd/sparkd/exchange_sim/ExchangeSim.cpp b/src/app_sparkd/sparkd/exchange_sim/ExchangeSim.cpp index 1a5cac0a3..23176fc1b 100644 --- a/src/app_sparkd/sparkd/exchange_sim/ExchangeSim.cpp +++ b/src/app_sparkd/sparkd/exchange_sim/ExchangeSim.cpp @@ -10,11 +10,11 @@ #include #include +#include "logging/logging.h" #include "spark/config/config.h" #include "spark/config/protos/exchange_sim_cfg.pb.h" #include "spark/config/protos/ports.pb.h" #include "spark/domain_model/Security.pb.h" -#include "spark/logging/logging.h" #include "spark/md/PriceSize.h" #include "spark/os/os.h" #include "system/protobufs/system_config.pb.h" diff --git a/src/app_sparkd/sparkd/exchange_sim/ExchangeSimApplication.cpp b/src/app_sparkd/sparkd/exchange_sim/ExchangeSimApplication.cpp index a44b93fe9..e2f23dfb9 100644 --- a/src/app_sparkd/sparkd/exchange_sim/ExchangeSimApplication.cpp +++ b/src/app_sparkd/sparkd/exchange_sim/ExchangeSimApplication.cpp @@ -2,10 +2,10 @@ #include "spark/md/SecurityDB.h" #include "IDGenerator.h" +#include "logging/logging.h" #include "spark/config/config.h" #include "spark/config/protos/exchange_sim_cfg.pb.h" #include "spark/domain_model/Security.h" -#include "spark/logging/logging.h" #include "spark/md/MBOProcessor.h" #include "spark/md/MDProducer.h" #include "spark/md/Shm/FixedSecurity.h" diff --git a/src/app_sparkd/sparkd/execution/EMExecutionGateway.cpp b/src/app_sparkd/sparkd/execution/EMExecutionGateway.cpp index b72808f0f..d2abad2c7 100644 --- a/src/app_sparkd/sparkd/execution/EMExecutionGateway.cpp +++ b/src/app_sparkd/sparkd/execution/EMExecutionGateway.cpp @@ -1,11 +1,11 @@ #include "EMExecutionGateway.h" +#include "logging/logging.h" #include "spark/api/service_helpers/AdminServiceUtils.h" #include "spark/api/services/AdminService.pb.h" #include "spark/api/services/OrderService.pb.h" #include "spark/domain_model/Security.pb.h" #include "spark/domain_model/SecurityKey.h" #include "spark/domain_model/common.h" -#include "spark/logging/logging.h" #include "spark/md/SecurityOracle.h" #include "spark/orderman/CancelOrderMsg.h" #include "spark/orderman/CancelReplaceOrderMsg.h" diff --git a/src/app_sparkd/sparkd/http/ApiGateway.cpp b/src/app_sparkd/sparkd/http/ApiGateway.cpp index 85ba0384a..5a6878c84 100644 --- a/src/app_sparkd/sparkd/http/ApiGateway.cpp +++ b/src/app_sparkd/sparkd/http/ApiGateway.cpp @@ -1,10 +1,10 @@ #include "ApiGateway.h" +#include "logging/logging.h" #include "spark/api/core/ApiClientInterop.h" #include "spark/api/public/ApiUtils.h" #include "spark/api/services/AdminService.client.pb.h" #include "spark/api/services/AuthService.client.pb.h" -#include "spark/logging/logging.h" #include "spark/utils/bts_assert.h" #include #include diff --git a/src/app_sparkd/sparkd/http/MultipartFormDecoder.cpp b/src/app_sparkd/sparkd/http/MultipartFormDecoder.cpp index e71cd367a..6b4c5772c 100644 --- a/src/app_sparkd/sparkd/http/MultipartFormDecoder.cpp +++ b/src/app_sparkd/sparkd/http/MultipartFormDecoder.cpp @@ -1,5 +1,6 @@ #include "MultipartFormDecoder.h" -#include "spark/logging/logging.h" +#include "logging/logging.h" + #include #include diff --git a/src/app_sparkd/sparkd/http/WebServer.cpp b/src/app_sparkd/sparkd/http/WebServer.cpp index b478db41a..3adbd5ab3 100644 --- a/src/app_sparkd/sparkd/http/WebServer.cpp +++ b/src/app_sparkd/sparkd/http/WebServer.cpp @@ -3,9 +3,9 @@ #include "WebServer.h" #include "ApiGateway.h" #include "MultipartFormDecoder.h" +#include "logging/logging.h" #include "spark/api/apigateway.pb.h" #include "spark/api/core/ApiClientInterop.h" -#include "spark/logging/logging.h" #include "spark/os/os.h" #include "spark/tracing/PerfLog.h" #include "spark/utils/Dispatcher.h" diff --git a/src/app_sparkd/sparkd/md/MarketDataAuxiliaryServiceServer.cpp b/src/app_sparkd/sparkd/md/MarketDataAuxiliaryServiceServer.cpp index 4195ff672..965f0db89 100644 --- a/src/app_sparkd/sparkd/md/MarketDataAuxiliaryServiceServer.cpp +++ b/src/app_sparkd/sparkd/md/MarketDataAuxiliaryServiceServer.cpp @@ -1,11 +1,11 @@ #include "MarketDataAuxiliaryServiceServer.h" #include "VolumeAtPriceState.h" +#include "logging/logging.h" #include "spark/api/public/ServiceContext.h" #include "spark/api/services/MarketDataRelay.client.pb.h" #include "spark/api/services/MarketDataRelay.pb.h" #include "spark/config/config.h" #include "spark/config/protos/toggles.pb.h" -#include "spark/logging/logging.h" #include "spark/utils/Dispatcher.h" #include "spark/utils/PBUtils.h" #include "spark/utils/bts_chrono.h" diff --git a/src/app_sparkd/sparkd/md/MarketDataGateway.cpp b/src/app_sparkd/sparkd/md/MarketDataGateway.cpp index f1b7d0a9e..f963196f5 100644 --- a/src/app_sparkd/sparkd/md/MarketDataGateway.cpp +++ b/src/app_sparkd/sparkd/md/MarketDataGateway.cpp @@ -1,10 +1,10 @@ #include "MarketDataGateway.h" #include "domain/security_id.h" +#include "logging/logging.h" #include "spark/api/md/MarketDataConfig.pb.h" #include "spark/api/md/MarketDataConfigUtils.h" #include "spark/config/config.h" #include "spark/domain/DomainSecurityUtils.h" -#include "spark/logging/logging.h" #include "spark/md/GeneralMarketDataListener.h" #include "spark/md/GeneralSecurityIndex.h" #include "spark/md/IMarketDataListener.h" diff --git a/src/app_sparkd/sparkd/md/PyMarketDataSubscription.cpp b/src/app_sparkd/sparkd/md/PyMarketDataSubscription.cpp index 72c169774..95affd993 100644 --- a/src/app_sparkd/sparkd/md/PyMarketDataSubscription.cpp +++ b/src/app_sparkd/sparkd/md/PyMarketDataSubscription.cpp @@ -7,13 +7,13 @@ #include "domain/security_id.h" #include "domain/spot_security.h" #include "domain/trade_record.h" +#include "logging/logging.h" #include "python_md/md_sink.h" #include "python_md/py_book.h" #include "python_md/py_md_executor.h" #include "python_md/py_security.h" #include "python_md/py_security_list.h" #include "python_md/py_trade.h" -#include "spark/logging/logging.h" #include "spark/md/IMarketDataListener.h" #include "spark/os/os.h" #include "spark/persistence/IDGenerator.h" diff --git a/src/app_sparkd/sparkd/md/ReplayMarketDataSubscription.cpp b/src/app_sparkd/sparkd/md/ReplayMarketDataSubscription.cpp index 77ded9aa3..507f1363a 100644 --- a/src/app_sparkd/sparkd/md/ReplayMarketDataSubscription.cpp +++ b/src/app_sparkd/sparkd/md/ReplayMarketDataSubscription.cpp @@ -1,6 +1,6 @@ #include "ReplayMarketDataSubscription.h" +#include "logging/logging.h" #include "spark/api/md/MarketDataReplayConfig.pb.h" -#include "spark/logging/logging.h" #include "spark/md/GeneralMarketDataListener.h" #include "spark/md/IMarketDataListener.h" #include "spark/md/MDProducer.h" diff --git a/src/app_sparkd/sparkd/md/binance/BinanceLotSizeFilter.h b/src/app_sparkd/sparkd/md/binance/BinanceLotSizeFilter.h index f0cd4fc85..1e3f977e8 100644 --- a/src/app_sparkd/sparkd/md/binance/BinanceLotSizeFilter.h +++ b/src/app_sparkd/sparkd/md/binance/BinanceLotSizeFilter.h @@ -1,6 +1,6 @@ #pragma once -#include "spark/logging/logging.h" +#include "logging/logging.h" #include "sparkd/md/binance/BinanceFilterType.h" #include "system/json/json_reader.h" diff --git a/src/app_sparkd/sparkd/md/binance/BinanceSecurityRequestor.cpp b/src/app_sparkd/sparkd/md/binance/BinanceSecurityRequestor.cpp index 40e7e9bfd..e10232b0b 100644 --- a/src/app_sparkd/sparkd/md/binance/BinanceSecurityRequestor.cpp +++ b/src/app_sparkd/sparkd/md/binance/BinanceSecurityRequestor.cpp @@ -3,7 +3,7 @@ #include "domain/protobufs/venue.pb.h" #include "domain/security.h" #include "domain/security_criteria.h" -#include "spark/logging/logging.h" +#include "logging/logging.h" #include "spark/persistence/IDGenerator.h" #include "spark/utils/bts_fatal.h" #include "sparkd/md/binance/BinanceMessageType.h" diff --git a/src/app_sparkd/sparkd/md/binance/BinanceSpot.cpp b/src/app_sparkd/sparkd/md/binance/BinanceSpot.cpp index dce6dd4d3..f3a2b6e84 100644 --- a/src/app_sparkd/sparkd/md/binance/BinanceSpot.cpp +++ b/src/app_sparkd/sparkd/md/binance/BinanceSpot.cpp @@ -2,7 +2,7 @@ #include "domain/protobufs/venue.pb.h" #include "domain/quantity.h" #include "domain/security.h" -#include "spark/logging/logging.h" +#include "logging/logging.h" #include "system/json/json_reader.h" #include diff --git a/src/app_sparkd/sparkd/md/binance/BinanceSubscription.cpp b/src/app_sparkd/sparkd/md/binance/BinanceSubscription.cpp index 722db5f4d..f1f1944cc 100644 --- a/src/app_sparkd/sparkd/md/binance/BinanceSubscription.cpp +++ b/src/app_sparkd/sparkd/md/binance/BinanceSubscription.cpp @@ -2,10 +2,10 @@ #include "domain/protobufs/venue.pb.h" #include "domain/security.h" #include "domain/security_criteria.h" +#include "logging/logging.h" #include "spark/api/md/BinanceMarketDataConfig.pb.h" #include "spark/io/ProtoPrinter.h" #include "spark/io/QueryParams.h" -#include "spark/logging/logging.h" #include "spark/md/IMarketDataListener.h" #include "spark/persistence/IDGenerator.h" #include "sparkd/md/binance/BinanceMessageType.h" diff --git a/src/app_sparkd/sparkd/md/binance_us/BinanceUsSecurityRequestor.cpp b/src/app_sparkd/sparkd/md/binance_us/BinanceUsSecurityRequestor.cpp index e914fcf28..737c97983 100644 --- a/src/app_sparkd/sparkd/md/binance_us/BinanceUsSecurityRequestor.cpp +++ b/src/app_sparkd/sparkd/md/binance_us/BinanceUsSecurityRequestor.cpp @@ -3,7 +3,7 @@ #include "domain/protobufs/venue.pb.h" #include "domain/security.h" #include "domain/security_criteria.h" -#include "spark/logging/logging.h" +#include "logging/logging.h" #include "spark/persistence/IDGenerator.h" #include "sparkd/md/binance_us/BinanceUsMessageType.h" #include "sparkd/md/binance_us/BinanceUsSpot.h" diff --git a/src/app_sparkd/sparkd/md/binance_us/BinanceUsSubscription.cpp b/src/app_sparkd/sparkd/md/binance_us/BinanceUsSubscription.cpp index 3f7a2574d..5c1aba1ee 100644 --- a/src/app_sparkd/sparkd/md/binance_us/BinanceUsSubscription.cpp +++ b/src/app_sparkd/sparkd/md/binance_us/BinanceUsSubscription.cpp @@ -2,10 +2,10 @@ #include "domain/protobufs/venue.pb.h" #include "domain/security.h" #include "domain/security_criteria.h" +#include "logging/logging.h" #include "spark/api/md/BinanceUsMarketDataConfig.pb.h" #include "spark/io/ProtoPrinter.h" #include "spark/io/QueryParams.h" -#include "spark/logging/logging.h" #include "spark/md/IMarketDataListener.h" #include "spark/persistence/IDGenerator.h" #include "sparkd/md/binance/BinanceSpot.h" 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 289a513d4..09e6dbee4 100644 --- a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuture.cpp +++ b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuture.cpp @@ -2,7 +2,7 @@ #include "domain/price.h" #include "domain/quantity.h" #include "domain/security.h" -#include "spark/logging/logging.h" +#include "logging/logging.h" #include "system/json/json_dumper.h" #include "system/json/json_reader.h" 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 b53fe0a08..429a0b060 100644 --- a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSecurityRequestor.cpp +++ b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSecurityRequestor.cpp @@ -2,8 +2,8 @@ #include "domain/security.h" #include "domain/security_criteria.h" #include "domain/security_id.h" +#include "logging/logging.h" #include "spark/api/md/BinanceUsdsFuturesMarketDataConfig.pb.h" -#include "spark/logging/logging.h" #include "spark/persistence/IDGenerator.h" #include "spark/utils/bts_fatal.h" #include "sparkd/md/binance_usds_futures/BinanceUsdsFuture.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 b1e62c3b1..ced2b5951 100644 --- a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSubscription.cpp +++ b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSubscription.cpp @@ -3,10 +3,10 @@ #include "domain/security.h" #include "domain/security_criteria.h" #include "domain/security_id.h" +#include "logging/logging.h" #include "spark/api/md/BinanceUsdsFuturesMarketDataConfig.pb.h" #include "spark/io/ProtoPrinter.h" #include "spark/io/QueryParams.h" -#include "spark/logging/logging.h" #include "spark/md/IMarketDataListener.h" #include "spark/persistence/IDGenerator.h" #include "sparkd/md/binance_usds_futures/BinanceUsdsFuturesMessageType.h" diff --git a/src/app_sparkd/sparkd/md/ccapi/CCApiEventLogger.h b/src/app_sparkd/sparkd/md/ccapi/CCApiEventLogger.h index 2d514493f..d8afd09d2 100644 --- a/src/app_sparkd/sparkd/md/ccapi/CCApiEventLogger.h +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiEventLogger.h @@ -1,6 +1,6 @@ #pragma once -#include "spark/logging/logging.h" +#include "logging/logging.h" #include diff --git a/src/app_sparkd/sparkd/md/ccapi/CCApiMarketDataProvider.cpp b/src/app_sparkd/sparkd/md/ccapi/CCApiMarketDataProvider.cpp index dc271b1cd..746660f8e 100644 --- a/src/app_sparkd/sparkd/md/ccapi/CCApiMarketDataProvider.cpp +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiMarketDataProvider.cpp @@ -1,9 +1,9 @@ #include "CCApiMarketDataProvider.h" #include "domain/protobufs/venue.pb.h" +#include "logging/logging.h" #include "spark/api/md/MarketDataConfig.pb.h" #include "spark/config/config.h" #include "spark/io/ProtoPrinter.h" -#include "spark/logging/logging.h" #include "spark/md/GeneralMarketDataListener.h" #include "spark/md/GeneralSecurityIndex.h" #include "spark/md/MDProducer.h" diff --git a/src/app_sparkd/sparkd/md/ccapi/CCApiSession.cpp b/src/app_sparkd/sparkd/md/ccapi/CCApiSession.cpp index 25fb49b81..681f06723 100644 --- a/src/app_sparkd/sparkd/md/ccapi/CCApiSession.cpp +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiSession.cpp @@ -1,5 +1,5 @@ #include "CCApiSession.h" -#include "spark/logging/logging.h" +#include "logging/logging.h" #include "sparkd/md/ccapi/CCApiCorrelationID.h" #include "sparkd/md/ccapi/CCApiEventDemuxer.h" #include "sparkd/md/ccapi/ICCApiMessageHandler.h" diff --git a/src/app_sparkd/sparkd/md/ccapi/CCDemoListener.cpp b/src/app_sparkd/sparkd/md/ccapi/CCDemoListener.cpp index 5f3f07dcd..08632debd 100644 --- a/src/app_sparkd/sparkd/md/ccapi/CCDemoListener.cpp +++ b/src/app_sparkd/sparkd/md/ccapi/CCDemoListener.cpp @@ -1,5 +1,5 @@ #include "CCDemoListener.h" -#include "spark/logging/logging.h" +#include "logging/logging.h" #include "sparkd/md/MarketDataError.h" #include diff --git a/src/app_sparkd/sparkd/md/coinbase/CoinbaseSecurityRequestor.cpp b/src/app_sparkd/sparkd/md/coinbase/CoinbaseSecurityRequestor.cpp index c8400ca1c..eea8ab08d 100644 --- a/src/app_sparkd/sparkd/md/coinbase/CoinbaseSecurityRequestor.cpp +++ b/src/app_sparkd/sparkd/md/coinbase/CoinbaseSecurityRequestor.cpp @@ -3,7 +3,7 @@ #include "domain/protobufs/venue.pb.h" #include "domain/security.h" #include "domain/security_criteria.h" -#include "spark/logging/logging.h" +#include "logging/logging.h" #include "spark/persistence/IDGenerator.h" #include "sparkd/md/ccapi/CCApiCorrelationID.h" #include "sparkd/md/ccapi/CCApiMessageHandler.h" diff --git a/src/app_sparkd/sparkd/md/coinbase/CoinbaseSpot.cpp b/src/app_sparkd/sparkd/md/coinbase/CoinbaseSpot.cpp index b00b37b99..fdddbe813 100644 --- a/src/app_sparkd/sparkd/md/coinbase/CoinbaseSpot.cpp +++ b/src/app_sparkd/sparkd/md/coinbase/CoinbaseSpot.cpp @@ -2,7 +2,7 @@ #include "domain/protobufs/currency.pb.h" #include "domain/quantity.h" #include "domain/security.h" -#include "spark/logging/logging.h" +#include "logging/logging.h" #include "system/json/json_reader.h" #include diff --git a/src/app_sparkd/sparkd/md/deribit/DeribitDepthAdaptor.cpp b/src/app_sparkd/sparkd/md/deribit/DeribitDepthAdaptor.cpp index b05f8e4fe..78ffb4b98 100644 --- a/src/app_sparkd/sparkd/md/deribit/DeribitDepthAdaptor.cpp +++ b/src/app_sparkd/sparkd/md/deribit/DeribitDepthAdaptor.cpp @@ -2,7 +2,7 @@ #include "domain/book.h" #include "domain/book_level_comp.h" #include "domain/security_id.h" -#include "spark/logging/logging.h" +#include "logging/logging.h" #include "spark/md/IMarketDataListener.h" #include "spark/utils/bts_assert.h" diff --git a/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentStore.cpp b/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentStore.cpp index 9d0259780..218adf935 100644 --- a/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentStore.cpp +++ b/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentStore.cpp @@ -1,7 +1,7 @@ #include "DeribitInstrumentStore.h" #include "domain/protobufs/security_type.h" #include "domain/security.h" -#include "spark/logging/logging.h" +#include "logging/logging.h" #include "spark/persistence/IDGenerator.h" #include "spark/utils/bts_fatal.h" #include "sparkd/md/deribit/DeribitCombo.h" diff --git a/src/app_sparkd/sparkd/md/deribit/DeribitSecurityRequestor.cpp b/src/app_sparkd/sparkd/md/deribit/DeribitSecurityRequestor.cpp index 6353e9863..0fc20b6d7 100644 --- a/src/app_sparkd/sparkd/md/deribit/DeribitSecurityRequestor.cpp +++ b/src/app_sparkd/sparkd/md/deribit/DeribitSecurityRequestor.cpp @@ -60,10 +60,10 @@ #include "domain/protobufs/venue.pb.h" #include "domain/security.h" #include "domain/security_criteria.h" +#include "logging/logging.h" #include "spark/io/websocket/JsonRpcError.h" #include "spark/io/websocket/JsonRpcHandler.h" #include "spark/io/websocket/JsonRpcRequest.h" -#include "spark/logging/logging.h" #include "sparkd/md/ccapi/CCApiCorrelationID.h" #include "sparkd/md/ccapi/CCApiJsonRpcRequest.h" #include "sparkd/md/ccapi/CCApiJsonRpcRouter.h" diff --git a/src/app_sparkd/sparkd/md/deribit/DeribitSubscription.cpp b/src/app_sparkd/sparkd/md/deribit/DeribitSubscription.cpp index 2b0cf6ec0..b07b22274 100644 --- a/src/app_sparkd/sparkd/md/deribit/DeribitSubscription.cpp +++ b/src/app_sparkd/sparkd/md/deribit/DeribitSubscription.cpp @@ -2,12 +2,12 @@ #include "domain/protobufs/venue.pb.h" #include "domain/security.h" #include "domain/security_criteria.h" +#include "logging/logging.h" #include "spark/api/md/DeribitMarketDataConfig.pb.h" #include "spark/domain_model/Security.pb.h" #include "spark/io/ProtoPrinter.h" #include "spark/io/websocket/JsonRpcError.h" #include "spark/io/websocket/JsonRpcRequest.h" -#include "spark/logging/logging.h" #include "spark/md/IMarketDataListener.h" #include "spark/persistence/IDGenerator.h" #include "sparkd/md/ccapi/CCApiCorrelationID.h" diff --git a/src/app_sparkd/sparkd/md/ftx/FTXFuture.cpp b/src/app_sparkd/sparkd/md/ftx/FTXFuture.cpp index 8be83cddc..b7ada0a15 100644 --- a/src/app_sparkd/sparkd/md/ftx/FTXFuture.cpp +++ b/src/app_sparkd/sparkd/md/ftx/FTXFuture.cpp @@ -2,7 +2,7 @@ #include "domain/future_security.h" #include "domain/protobufs/venue.pb.h" #include "domain/security.h" -#include "spark/logging/logging.h" +#include "logging/logging.h" #include "system/json/json_reader.h" #include "system/table_formatter.h" diff --git a/src/app_sparkd/sparkd/md/ftx/FTXMarket.cpp b/src/app_sparkd/sparkd/md/ftx/FTXMarket.cpp index 875aff60b..8782e6951 100644 --- a/src/app_sparkd/sparkd/md/ftx/FTXMarket.cpp +++ b/src/app_sparkd/sparkd/md/ftx/FTXMarket.cpp @@ -1,7 +1,7 @@ #include "FTXMarket.h" #include "domain/protobufs/venue.pb.h" #include "domain/security.h" -#include "spark/logging/logging.h" +#include "logging/logging.h" #include "spark/utils/bts_fatal.h" #include "sparkd/md/ftx/FTXSecurityType.h" #include "system/json/json_reader.h" diff --git a/src/app_sparkd/sparkd/md/ftx/FTXSecurityRequestor.cpp b/src/app_sparkd/sparkd/md/ftx/FTXSecurityRequestor.cpp index ca1bba1c6..d3ab5ff30 100644 --- a/src/app_sparkd/sparkd/md/ftx/FTXSecurityRequestor.cpp +++ b/src/app_sparkd/sparkd/md/ftx/FTXSecurityRequestor.cpp @@ -3,7 +3,7 @@ #include "domain/protobufs/venue.pb.h" #include "domain/security.h" #include "domain/security_criteria.h" -#include "spark/logging/logging.h" +#include "logging/logging.h" #include "spark/persistence/IDGenerator.h" #include "sparkd/md/ccapi/CCApiCorrelationID.h" #include "sparkd/md/ccapi/CCApiMessageHandler.h" diff --git a/src/app_sparkd/sparkd/md/ftx/FTXSubscription.cpp b/src/app_sparkd/sparkd/md/ftx/FTXSubscription.cpp index 7812c63c9..7c942199e 100644 --- a/src/app_sparkd/sparkd/md/ftx/FTXSubscription.cpp +++ b/src/app_sparkd/sparkd/md/ftx/FTXSubscription.cpp @@ -2,9 +2,9 @@ #include "domain/protobufs/venue.pb.h" #include "domain/security.h" #include "domain/security_criteria.h" +#include "logging/logging.h" #include "spark/api/md/FTXMarketDataConfig.pb.h" #include "spark/io/ProtoPrinter.h" -#include "spark/logging/logging.h" #include "spark/md/IMarketDataListener.h" #include "spark/persistence/IDGenerator.h" #include "sparkd/md/ccapi/CCApiCorrelationID.h" diff --git a/src/app_sparkd/sparkd/md/glbx/OnixsGlbxSubscription.cpp b/src/app_sparkd/sparkd/md/glbx/OnixsGlbxSubscription.cpp index 71c29145d..6da82e596 100644 --- a/src/app_sparkd/sparkd/md/glbx/OnixsGlbxSubscription.cpp +++ b/src/app_sparkd/sparkd/md/glbx/OnixsGlbxSubscription.cpp @@ -1,8 +1,8 @@ #include "OnixsGlbxSubscription.h" +#include "logging/logging.h" #include "spark/api/md/MarketDataConfig.pb.h" #include "spark/api/md/MarketDataConfigUtils.h" #include "spark/config/config.h" -#include "spark/logging/logging.h" #include "spark/md/IMarketDataListener.h" #include "spark/md/MBOProcessor.h" #include "spark/md/SymbolLoader.h" diff --git a/src/app_sparkd/sparkd/md/okx/OkxDepthAdaptor.cpp b/src/app_sparkd/sparkd/md/okx/OkxDepthAdaptor.cpp index 13abe46ec..5c142e195 100644 --- a/src/app_sparkd/sparkd/md/okx/OkxDepthAdaptor.cpp +++ b/src/app_sparkd/sparkd/md/okx/OkxDepthAdaptor.cpp @@ -2,7 +2,7 @@ #include "domain/book.h" #include "domain/book_level_comp.h" #include "domain/security_id.h" -#include "spark/logging/logging.h" +#include "logging/logging.h" #include "spark/md/IMarketDataListener.h" #include "sparkd/md/ccapi/CCApiCorrelationID.h" #include "system/json/json_reader.h" diff --git a/src/app_sparkd/sparkd/md/okx/OkxInstrumentStore.cpp b/src/app_sparkd/sparkd/md/okx/OkxInstrumentStore.cpp index 35f0d3e97..ca073290e 100644 --- a/src/app_sparkd/sparkd/md/okx/OkxInstrumentStore.cpp +++ b/src/app_sparkd/sparkd/md/okx/OkxInstrumentStore.cpp @@ -1,7 +1,7 @@ #include "OkxInstrumentStore.h" #include "domain/protobufs/security_type.h" #include "domain/security.h" -#include "spark/logging/logging.h" +#include "logging/logging.h" #include "spark/persistence/IDGenerator.h" #include "spark/utils/bts_fatal.h" #include "sparkd/md/okx/OkxInstrument.h" diff --git a/src/app_sparkd/sparkd/md/okx/OkxSubscription.cpp b/src/app_sparkd/sparkd/md/okx/OkxSubscription.cpp index ab9b67d56..49b7eae59 100644 --- a/src/app_sparkd/sparkd/md/okx/OkxSubscription.cpp +++ b/src/app_sparkd/sparkd/md/okx/OkxSubscription.cpp @@ -2,9 +2,9 @@ #include "domain/protobufs/venue.pb.h" #include "domain/security.h" #include "domain/security_criteria.h" +#include "logging/logging.h" #include "spark/api/md/OkxMarketDataConfig.pb.h" #include "spark/io/ProtoPrinter.h" -#include "spark/logging/logging.h" #include "spark/md/IMarketDataListener.h" #include "spark/persistence/IDGenerator.h" #include "sparkd/md/ccapi/CCApiSession.h" diff --git a/src/app_sparkd/sparkd/md/platforms/emumba/EmMDListener.cpp b/src/app_sparkd/sparkd/md/platforms/emumba/EmMDListener.cpp index 7bb406271..38d0e695a 100644 --- a/src/app_sparkd/sparkd/md/platforms/emumba/EmMDListener.cpp +++ b/src/app_sparkd/sparkd/md/platforms/emumba/EmMDListener.cpp @@ -1,8 +1,8 @@ #include "EmMDListener.h" #include "domain/protobufs/trading_status.pb.h" +#include "logging/logging.h" #include "spark/api/services/ShellDiagnosticService.server.pb.h" #include "spark/domain_model/Security.pb.h" -#include "spark/logging/logging.h" #include "spark/md/GeneralSecurityIndex.h" #include "spark/md/IntPrice.h" #include "spark/md/MDProducer.h" diff --git a/src/app_sparkd/sparkd/md/platforms/emumba/EmumbaMain.cpp b/src/app_sparkd/sparkd/md/platforms/emumba/EmumbaMain.cpp index 4f9b5bd53..0e33660dd 100644 --- a/src/app_sparkd/sparkd/md/platforms/emumba/EmumbaMain.cpp +++ b/src/app_sparkd/sparkd/md/platforms/emumba/EmumbaMain.cpp @@ -1,8 +1,8 @@ #include "EmumbaMain.h" #include "EMTradingSession.h" #include "EmMDListener.h" +#include "logging/logging.h" #include "spark/config/config.h" -#include "spark/logging/logging.h" #include "spark/md/GeneralSecurityIndex.h" #include "spark/md/MDProducer.h" #include "spark/md/SecurityDB.h" diff --git a/src/app_sparkd/sparkd/md/platforms/emumba/IEMOrderMuxer.h b/src/app_sparkd/sparkd/md/platforms/emumba/IEMOrderMuxer.h index 4c0e9f272..d50005916 100644 --- a/src/app_sparkd/sparkd/md/platforms/emumba/IEMOrderMuxer.h +++ b/src/app_sparkd/sparkd/md/platforms/emumba/IEMOrderMuxer.h @@ -1,9 +1,11 @@ #pragma once + +#include "logging/logging.h" #include "spark/domain_model/Security.pb.h" -#include "spark/logging/logging.h" #include "spark/md/common.h" #include "spark/orderman/RFQMsg.h" #include "spark/os/os.h" + #include #include #include diff --git a/src/app_sparkd/sparkd/md/platforms/mdp3_onixs/MDP3Main.cpp b/src/app_sparkd/sparkd/md/platforms/mdp3_onixs/MDP3Main.cpp index e4d761e0d..ccf0f56d5 100644 --- a/src/app_sparkd/sparkd/md/platforms/mdp3_onixs/MDP3Main.cpp +++ b/src/app_sparkd/sparkd/md/platforms/mdp3_onixs/MDP3Main.cpp @@ -1,8 +1,8 @@ #include "MDP3Main.h" #include "domain/protobufs/trading_status.pb.h" +#include "logging/logging.h" #include "spark/config/config.h" -#include "spark/logging/logging.h" #include "spark/md/MBOProcessor.h" #include "spark/md/SecurityDB.h" #include "spark/md/cme/MDP3Utils.h" diff --git a/src/app_sparkd/sparkd/md/recording/MDRecorder.cpp b/src/app_sparkd/sparkd/md/recording/MDRecorder.cpp index a3b06e786..0f18a5d04 100644 --- a/src/app_sparkd/sparkd/md/recording/MDRecorder.cpp +++ b/src/app_sparkd/sparkd/md/recording/MDRecorder.cpp @@ -1,11 +1,11 @@ #include "MDRecorder.h" +#include "logging/logging.h" #include "spark/api/md/MarketDataConfig.pb.h" #include "spark/api/md/MarketDataConfigUtils.h" #include "spark/api/services/MarketDataRelay.client.pb.h" #include "spark/api/services/MarketDataRelay.pb.h" #include "spark/config/config.h" #include "spark/domain_model/Security.pb.h" -#include "spark/logging/logging.h" #include "spark/md/MDClient.h" #include "spark/md/MDConsumer.h" #include "spark/md/MDConsumerHandle.h" diff --git a/src/app_sparkd/sparkd/md/recording/MDReplayer.cpp b/src/app_sparkd/sparkd/md/recording/MDReplayer.cpp index d536a3105..df03c6481 100644 --- a/src/app_sparkd/sparkd/md/recording/MDReplayer.cpp +++ b/src/app_sparkd/sparkd/md/recording/MDReplayer.cpp @@ -8,9 +8,9 @@ #include "domain/security_market_data_statistics.h" #include "domain/side.h" #include "domain/trade_record.h" +#include "logging/logging.h" #include "spark/domain/DomainSecurityUtils.h" #include "spark/domain_model/Security.pb.h" -#include "spark/logging/logging.h" #include "spark/md/GeneralMarketDataListener.h" #include "spark/md/IMarketDataListener.h" #include "spark/md/MDProducer.h" diff --git a/src/app_sparkd/sparkd/position/MarginServiceCore.cpp b/src/app_sparkd/sparkd/position/MarginServiceCore.cpp index e83b2dd9c..23e87021c 100644 --- a/src/app_sparkd/sparkd/position/MarginServiceCore.cpp +++ b/src/app_sparkd/sparkd/position/MarginServiceCore.cpp @@ -1,10 +1,10 @@ #include "MarginServiceCore.h" #include "Position.h" +#include "logging/logging.h" #include "spark/api/services/AuthService.pb.h" #include "spark/config/config.h" #include "spark/config/protos/span.pb.h" -#include "spark/logging/logging.h" #include "spark/utils/Dispatcher.h" #include "spark/utils/Uuid.h" #include "spark/utils/bts_assert.h" diff --git a/src/app_sparkd/sparkd/position/MarginServiceServer.cpp b/src/app_sparkd/sparkd/position/MarginServiceServer.cpp index 15dd67135..bb77f2064 100644 --- a/src/app_sparkd/sparkd/position/MarginServiceServer.cpp +++ b/src/app_sparkd/sparkd/position/MarginServiceServer.cpp @@ -3,11 +3,11 @@ #include "Position.h" #include "PositionAggregator.h" +#include "logging/logging.h" #include "spark/api/service_helpers/AdminServiceUtils.h" #include "spark/config/config.h" #include "spark/config/protos/span.pb.h" #include "spark/domain_model/Security.h" -#include "spark/logging/logging.h" #include "spark/orderman/orderman_utils/orderman_utils.h" #include "spark/os/os.h" #include "spark/persistence/SqliteStore.h" diff --git a/src/app_sparkd/sparkd/position/PositionAggregator.cpp b/src/app_sparkd/sparkd/position/PositionAggregator.cpp index ec0a28c25..ac4a7c6c0 100644 --- a/src/app_sparkd/sparkd/position/PositionAggregator.cpp +++ b/src/app_sparkd/sparkd/position/PositionAggregator.cpp @@ -1,9 +1,8 @@ #include "PositionAggregator.h" #include "Position.h" - +#include "logging/logging.h" #include "spark/domain_model/Security.h" -#include "spark/logging/logging.h" #include "spark/md/MDClient.h" #include "spark/orderman/orderman_utils/orderman_utils.h" #include "spark/utils/Dispatcher.h" diff --git a/src/app_sparkd/sparkd/position/PositionMap.cpp b/src/app_sparkd/sparkd/position/PositionMap.cpp index b9b057096..eefee1ab6 100644 --- a/src/app_sparkd/sparkd/position/PositionMap.cpp +++ b/src/app_sparkd/sparkd/position/PositionMap.cpp @@ -1,11 +1,11 @@ #include "PositionMap.h" +#include "logging/logging.h" #include "spark/api/service_helpers/PositionUtilities.h" #include "spark/api/services/AdminService.client.pb.h" #include "spark/api/services/AdminService.pb.h" #include "spark/config/config.h" #include "spark/config/protos/toggles.pb.h" #include "spark/domain_model/Side.h" -#include "spark/logging/logging.h" #include "spark/orderman/actors/SODPosition.h" #include "spark/utils/PBUtils.h" #include "spark/utils/bts_assert.h" diff --git a/src/app_sparkd/sparkd/position/PositionServicePNLHelper.cpp b/src/app_sparkd/sparkd/position/PositionServicePNLHelper.cpp index ff5140805..f3432a7ac 100644 --- a/src/app_sparkd/sparkd/position/PositionServicePNLHelper.cpp +++ b/src/app_sparkd/sparkd/position/PositionServicePNLHelper.cpp @@ -1,10 +1,10 @@ #include "PositionServicePNLHelper.h" +#include "logging/logging.h" #include "spark/api/services/OrderService.client.pb.h" #include "spark/config/config.h" #include "spark/config/protos/cme_reference_data.pb.h" #include "spark/config/protos/toggles.pb.h" #include "spark/domain_model/Security.h" -#include "spark/logging/logging.h" #include "spark/md/MDClient.h" #include "spark/os/os.h" #include "spark/utils/PBUtils.h" diff --git a/src/app_sparkd/sparkd/position/PositionServiceServer.cpp b/src/app_sparkd/sparkd/position/PositionServiceServer.cpp index b71213e6e..3ed8a1138 100644 --- a/src/app_sparkd/sparkd/position/PositionServiceServer.cpp +++ b/src/app_sparkd/sparkd/position/PositionServiceServer.cpp @@ -1,6 +1,7 @@ #include "PositionServiceServer.h" #include "PositionMap.h" #include "PositionServicePNLHelper.h" +#include "logging/logging.h" #include "spark/api/public/ServiceContext.h" #include "spark/api/service_helpers/AdminServiceUtils.h" #include "spark/api/service_helpers/PositionUtilities.h" @@ -9,7 +10,6 @@ #include "spark/api/services/OrderService.client.pb.h" #include "spark/api/services/OrderService.pb.h" #include "spark/api/services/PositionService.pb.h" -#include "spark/logging/logging.h" #include "spark/orderman/actors/SODPosition.h" #include "spark/persistence/SqliteStore.h" #include "spark/utils/PBUtils.h" diff --git a/src/app_sparkd/sparkd/position/import/BasePositionServiceServer.cpp b/src/app_sparkd/sparkd/position/import/BasePositionServiceServer.cpp index d4d0342ae..679c90979 100644 --- a/src/app_sparkd/sparkd/position/import/BasePositionServiceServer.cpp +++ b/src/app_sparkd/sparkd/position/import/BasePositionServiceServer.cpp @@ -1,11 +1,11 @@ #include "BasePositionServiceServer.h" +#include "logging/logging.h" #include "spark/api/public/ServiceContext.h" #include "spark/api/services/AdminService.client.pb.h" #include "spark/api/services/PositionService.client.pb.h" #include "spark/config/config.h" #include "spark/config/protos/orders_fills_cleanup.pb.h" #include "spark/config/protos/position_cfg.pb.h" -#include "spark/logging/logging.h" #include "spark/utils/PBUtils.h" #include "spark/utils/bts_assert.h" #include "spark/utils/datetime.h" diff --git a/src/app_sparkd/sparkd/position/import/MoneyFileServiceServer.cpp b/src/app_sparkd/sparkd/position/import/MoneyFileServiceServer.cpp index 0dae1a34c..ed2bb4acd 100644 --- a/src/app_sparkd/sparkd/position/import/MoneyFileServiceServer.cpp +++ b/src/app_sparkd/sparkd/position/import/MoneyFileServiceServer.cpp @@ -1,4 +1,5 @@ #include "MoneyFileServiceServer.h" +#include "logging/logging.h" #include "spark/api/public/ServiceContext.h" #include "spark/api/service_helpers/AdminServiceUtils.h" #include "spark/api/services/AdminService.client.pb.h" @@ -6,7 +7,6 @@ #include "spark/config/config.h" #include "spark/config/protos/orders_fills_cleanup.pb.h" #include "spark/config/protos/position_cfg.pb.h" -#include "spark/logging/logging.h" #include "spark/utils/PBUtils.h" #include "spark/utils/bts_assert.h" #include "spark/utils/datetime.h" diff --git a/src/app_sparkd/sparkd/position/import/parsing/money_parser.cpp b/src/app_sparkd/sparkd/position/import/parsing/money_parser.cpp index 97dd20a21..fb88cc886 100644 --- a/src/app_sparkd/sparkd/position/import/parsing/money_parser.cpp +++ b/src/app_sparkd/sparkd/position/import/parsing/money_parser.cpp @@ -1,7 +1,8 @@ +#include "logging/logging.h" #include "sparkd/position/import/parsing/money_parser.h" #include "spark/api/service_helpers/AdminServiceUtils.h" -#include "spark/logging/logging.h" #include "sparkd/position/import/parsing/parser_common.h" + #include #include diff --git a/src/app_sparkd/sparkd/subprocess/SubProcessRunner.cpp b/src/app_sparkd/sparkd/subprocess/SubProcessRunner.cpp index 09bdde084..a906a4e19 100644 --- a/src/app_sparkd/sparkd/subprocess/SubProcessRunner.cpp +++ b/src/app_sparkd/sparkd/subprocess/SubProcessRunner.cpp @@ -1,7 +1,7 @@ #include "SubProcessRunner.h" +#include "logging/logging.h" #include "spark/config/config.h" #include "spark/config/protos/subprocess.pb.h" -#include "spark/logging/logging.h" // #include #include #include diff --git a/src/app_sparkd/sparkd/support/ErrorReportService.cpp b/src/app_sparkd/sparkd/support/ErrorReportService.cpp index f76071017..eba86a9a7 100644 --- a/src/app_sparkd/sparkd/support/ErrorReportService.cpp +++ b/src/app_sparkd/sparkd/support/ErrorReportService.cpp @@ -1,7 +1,7 @@ #include "ErrorReportService.h" +#include "logging/logging.h" #include "spark/config/config.h" -#include "spark/logging/logging.h" #include "spark/utils/bts_assert.h" #include "spark/utils/datetime.h" #include "system/protobufs/system_config.pb.h" diff --git a/src/app_sparkd/sparkd/user/AdminServiceDB.cpp b/src/app_sparkd/sparkd/user/AdminServiceDB.cpp index 147ab42f6..37bb3aa78 100644 --- a/src/app_sparkd/sparkd/user/AdminServiceDB.cpp +++ b/src/app_sparkd/sparkd/user/AdminServiceDB.cpp @@ -1,7 +1,6 @@ #include "sparkd/user/AdminServiceDB.h" - +#include "logging/logging.h" #include "spark/api/services/AdminService.server.pb.h" -#include "spark/logging/logging.h" #include "spark/persistence/SqliteStore.h" #include "spark/utils/helper_macros.h" diff --git a/src/app_sparkd/sparkd/user/AdminServiceServer.cpp b/src/app_sparkd/sparkd/user/AdminServiceServer.cpp index f555b3f0c..dc49ef699 100644 --- a/src/app_sparkd/sparkd/user/AdminServiceServer.cpp +++ b/src/app_sparkd/sparkd/user/AdminServiceServer.cpp @@ -1,7 +1,6 @@ #include "AdminServiceServer.h" - +#include "logging/logging.h" #include "spark/api/service_helpers/AdminServiceUtils.h" -#include "spark/logging/logging.h" #include "spark/orderman/orderman_utils/orderman_utils.h" #include "spark/persistence/SqliteStore.h" #include "spark/utils/AuthToken.h" diff --git a/src/app_sparkd/sparkd/user/AuthServiceServer.cpp b/src/app_sparkd/sparkd/user/AuthServiceServer.cpp index c0d1b1dd2..247a3e5ba 100644 --- a/src/app_sparkd/sparkd/user/AuthServiceServer.cpp +++ b/src/app_sparkd/sparkd/user/AuthServiceServer.cpp @@ -1,9 +1,8 @@ #include "AuthServiceServer.h" - +#include "logging/logging.h" #include "spark/api/service_helpers/AdminServiceUtils.h" #include "spark/api/services/AdminService.client.pb.h" #include "spark/api/services/AuthService.pb.h" -#include "spark/logging/logging.h" #include "spark/persistence/SqliteStore.h" #include "spark/utils/AuthToken.h" #include "spark/utils/PBUtils.h" diff --git a/src/lib_logging/CMakeLists.txt b/src/lib_logging/CMakeLists.txt new file mode 100644 index 000000000..6444eb663 --- /dev/null +++ b/src/lib_logging/CMakeLists.txt @@ -0,0 +1,62 @@ +cmake_minimum_required(VERSION 3.23) +project(logging) +include(GNUInstallDirs) +include(${CMAKE_SOURCE_DIR}/cmake/safe_dep_glob.cmake) +include(${CMAKE_SOURCE_DIR}/cmake/ProtobufGenerateCpp.cmake) + +# Sources +file( + GLOB_RECURSE ${PROJECT_NAME}_SOURCES + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + *.cpp +) + +# Proto sources +file( + GLOB_RECURSE ${PROJECT_NAME}_PROTO_SOURCES + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + *.proto +) + +update_deps_file("${${PROJECT_NAME}_PROTO_SOURCES};") + +# Generate proto cpp +message(STATUS "Generating proto cpp") +protobuf_generate_cpp( + CXX_SOURCES ${PROJECT_NAME}_CXX_PROTO_SOURCES + CXX_HEADERS ${PROJECT_NAME}_CXX_PROTO_HEADERS + CXX_OUT_DIR ${CMAKE_CURRENT_BINARY_DIR} + PROTO_INCLUDE_DIRS + ${EXTERNALS_INCLUDE} + ${CMAKE_CURRENT_SOURCE_DIR} + PROTO_SOURCES + ${${PROJECT_NAME}_PROTO_SOURCES} +) + +add_library(${PROJECT_NAME} SHARED ${${PROJECT_NAME}_CXX_PROTO_SOURCES} ${${PROJECT_NAME}_SOURCES}) + +target_include_directories( + ${PROJECT_NAME} PUBLIC + $ + $ + $ +) + +target_link_directories( + ${PROJECT_NAME} PUBLIC + $ + $ +) +target_link_libraries(${PROJECT_NAME} PUBLIC + system + protobuf + boost_system + boost_filesystem +) + +foreach(_hdr ${${PROJECT_NAME}_CXX_PROTO_HEADERS}) + file(RELATIVE_PATH _relative_path ${CMAKE_CURRENT_BINARY_DIR} ${_hdr}) + install(FILES ${_hdr} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${_relative_path}) +endforeach() +include(${CMAKE_SOURCE_DIR}/cmake/InstallBasic.cmake) +install_basic() diff --git a/src/lib_logging/Config.cmake.in b/src/lib_logging/Config.cmake.in new file mode 100644 index 000000000..8c9ad12aa --- /dev/null +++ b/src/lib_logging/Config.cmake.in @@ -0,0 +1,5 @@ +@PACKAGE_INIT@ + +include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") + +check_required_components(@PROJECT_NAME@) diff --git a/src/lib_spark/spark/logging/ccapi_logger.h b/src/lib_logging/logging/ccapi_logger.h similarity index 68% rename from src/lib_spark/spark/logging/ccapi_logger.h rename to src/lib_logging/logging/ccapi_logger.h index 49d78e239..4922a309f 100644 --- a/src/lib_spark/spark/logging/ccapi_logger.h +++ b/src/lib_logging/logging/ccapi_logger.h @@ -1,19 +1,8 @@ -#include "spark/logging/LoggerHub.h" -#include "spark/logging/logging.h" -#include "spark/utils/bts_assert.h" -#include "system/lock_guard.h" +#include "logging/logger_hub.h" +#include "logging/logging.h" -#include -#include -#include -#include -#include #include -#include #include -#include -#include -#include #include #include @@ -29,20 +18,23 @@ class CcapiLogger final : public Logger { const std::string &line_num, const std::string &msg) override { auto level = to_bts_level_(severity); - if (!bts::log::_thread_logger.logger->is_loggable(bts::log::md, level)) { + if (!bts::logging::_thread_logger.logger->is_loggable( + bts::logging::md, level)) { return; } // Add file name to cache to preserve it in memory until the log is // [asynchronously] committed const auto &cached_file_name = store_file_name_(file_name); - bts::log::_thread_logger.logger->enqueue( - bts::log::log_ts(), bts::log::md, level, cached_file_name.c_str(), - stoi(line_num), "{}", msg); + bts::logging::_thread_logger.logger->enqueue( + bts::logging::log_ts(), bts::logging::md, level, + cached_file_name.c_str(), stoi(line_num), "{}", msg); } - static bts::log::Level to_bts_level_(const std::string &ccapi_severity) { - bts_assert(!ccapi_severity.empty()); + static bts::logging::Level to_bts_level_(const std::string &ccapi_severity) { + if (ccapi_severity.empty()) { + return bts::Info; + } // TRACE and DEBUG translate to Diag; all other levels have identical // names in ccapi and spark if (ccapi_severity[0] == 'T' || ccapi_severity[0] == 'D') { @@ -60,7 +52,6 @@ class CcapiLogger final : public Logger { if (ccapi_severity[0] == 'F') { return bts::Fatal; } - bts_assert(false); return bts::Fatal; } @@ -78,7 +69,7 @@ class CcapiLogger final : public Logger { // size would be limited, but not without cost in additional overhead for // lookups. const std::string &store_file_name_(const std::string &file_name) { - LOCK_GUARD(instance_mx_); + std::lock_guard lock{instance_mx_}; return *file_name_store_.insert(file_name).first; } }; diff --git a/src/lib_spark/spark/logging/Common.h b/src/lib_logging/logging/common.h similarity index 90% rename from src/lib_spark/spark/logging/Common.h rename to src/lib_logging/logging/common.h index 8b69f5d80..c00314087 100644 --- a/src/lib_spark/spark/logging/Common.h +++ b/src/lib_logging/logging/common.h @@ -1,15 +1,12 @@ #pragma once -#include "spark/utils/windows_wrapper.h" - #include #include #include #include #include -namespace bts { -namespace log { +namespace bts::logging { struct Level { using Rep = uint8_t; @@ -45,5 +42,4 @@ inline uint64_t log_ts() { return result; } -} // namespace log -} // namespace bts +} // namespace bts::logging diff --git a/src/lib_spark/spark/logging/LogRec.h b/src/lib_logging/logging/log_rec.h similarity index 68% rename from src/lib_spark/spark/logging/LogRec.h rename to src/lib_logging/logging/log_rec.h index 751c90c9c..b91c287ed 100644 --- a/src/lib_spark/spark/logging/LogRec.h +++ b/src/lib_logging/logging/log_rec.h @@ -1,11 +1,10 @@ #pragma once -#include "Common.h" -#include "MsgPacking.h" -#include "spark/utils/warn_ctrl.h" +#include "logging/common.h" +#include "logging/msg_packing.h" +#include "system/warn_ctrl.h" -namespace bts { -namespace log { +namespace bts::logging { using ArgUnpacker = std::string (*)(ArgBuffer const &b, const char *msg_template); @@ -22,7 +21,7 @@ struct LogRec { ArgBuffer args; template - void pack_msg(const char *msg_t, Args &&... msg_args) { + void pack_msg(const char *msg_t, Args &&...msg_args) { msg_template = msg_t; unpacker = unpack_msg_args< @@ -34,9 +33,4 @@ struct LogRec { }; GCC_DIAG_RESTORE() -#ifndef _WIN32 -// static_assert(sizeof(LogRec) == 256, "LogRec should be 128 bytes"); -#endif - -} // namespace log -} // namespace bts +} // namespace bts::logging diff --git a/src/lib_spark/spark/logging/Logger.h b/src/lib_logging/logging/logger.h similarity index 89% rename from src/lib_spark/spark/logging/Logger.h rename to src/lib_logging/logging/logger.h index 1a92a67ca..0719de37d 100644 --- a/src/lib_spark/spark/logging/Logger.h +++ b/src/lib_logging/logging/logger.h @@ -1,16 +1,16 @@ #pragma once -#include "LogRec.h" -#include "MsgPacking.h" -#include "spark/os/os.h" +#include "logging/log_rec.h" +#include "logging/msg_packing.h" +#include "system/os.h" #include #include +#include #include #include -namespace bts { -namespace log { +namespace bts::logging { class Logger { public: @@ -39,13 +39,13 @@ class Logger { template bool enqueue( - uint64_t ts, + std::uint64_t ts, Subsystem subsystem, Level lv, const char *file, int line, const char *msg_template, - Args &&... msg_args) { + Args &&...msg_args) { assert(_active); lock(); if (_wcursor == _write_q->size()) @@ -65,19 +65,19 @@ class Logger { size_t aggregate_hash() { return 0; } template - size_t aggregate_hash(Arg1 &arg1, Args &&... args2) { + size_t aggregate_hash(Arg1 &arg1, Args &&...args2) { return std::hash()(arg1) + aggregate_hash(args2...); } template bool enqueue_once_maybe( - uint64_t ts, + std::uint64_t ts, Subsystem subsystem, Level lv, const char *file, int line, const char *msg_template, - Args &&... msg_args) { + Args &&...msg_args) { const size_t filter_size = 1024 * 8; // 1kb static std::vector s_bloom(filter_size); auto arg_hash = aggregate_hash(msg_args...); @@ -93,7 +93,8 @@ class Logger { return true; } - template void unqueue(S const &s) { + template + void unqueue(S const &s) { size_t logged_msg_count = 0; size_t dropped_msg_count = 0; bool active = true; @@ -121,8 +122,8 @@ class Logger { unlock(); } - void - update_queue_limits(size_t initial_queue_size, size_t max_queue_growth) { + void update_queue_limits( + size_t initial_queue_size, size_t max_queue_growth) { lock(); if (_wcursor == 0) { // we can only do this if the queue is empty because each log @@ -170,5 +171,5 @@ class Logger { size_t _max_queue_size; std::string _thread_name; }; -} // namespace log -} // namespace bts + +} // namespace bts::logging diff --git a/src/lib_spark/spark/logging/LoggerHub.cpp b/src/lib_logging/logging/logger_hub.cpp similarity index 90% rename from src/lib_spark/spark/logging/LoggerHub.cpp rename to src/lib_logging/logging/logger_hub.cpp index 1d9cb5b2f..9d9203bf2 100644 --- a/src/lib_spark/spark/logging/LoggerHub.cpp +++ b/src/lib_logging/logging/logger_hub.cpp @@ -1,21 +1,19 @@ -#include "LoggerHub.h" - -#include "Logger.h" -#include "spark/os/os.h" -#include "spark/utils/bts_assert.h" -#include "spark/utils/bts_chrono.h" -#include "spark/utils/thread_manager.h" +#include "logger_hub.h" +#include "logging/logger.h" +#include "system/bts_chrono.h" +#include "system/os.h" #include "system/protobufs/threads.pb.h" +#include "system/threading/thread_manager.h" #include #include #include #include -namespace bts { -namespace log { +namespace bts::logging { using bts::system::protobufs::ThreadGroupCfg; +using bts::system::threading::ThreadManager; std::atomic thread_idx; @@ -82,19 +80,24 @@ void LoggerHub::config(const LoggingConfig &cfg) { } void LoggerHub::start() { + std::lock_guard lock{me->lock}; + if (me->worker) { + // Already started + return; + } std::cout << "Starting LoggerHub '" << me->logger_name << "' on thread " << os::get_thread_name() << ":" << std::this_thread::get_id() << std::endl; - bts_assert(!me->worker); - me->worker = std::make_unique(threading::make_thread( - me->logger_name.c_str(), std::bind(&LoggerHub::do_work, this), - me->thread_cfg)); + me->worker = std::make_unique(ThreadManager::make_thread( + me->logger_name, std::bind(&LoggerHub::do_work, this), me->thread_cfg)); } LoggerHub::~LoggerHub() { + std::lock_guard lock{me->lock}; me->done = true; - if (me->worker) + if (me->worker) { me->worker->join(); + } } Logger &LoggerHub::make_logger() { @@ -206,5 +209,5 @@ void LoggerHub::update_logger_queue_limits() { l->update_queue_limits( me->logger_initial_queue_size, me->logger_max_queue_growth); } -} // namespace log -} // namespace bts + +} // namespace bts::logging diff --git a/src/lib_spark/spark/logging/LoggerHub.h b/src/lib_logging/logging/logger_hub.h similarity index 77% rename from src/lib_spark/spark/logging/LoggerHub.h rename to src/lib_logging/logging/logger_hub.h index a46fd257f..3738fe01c 100644 --- a/src/lib_spark/spark/logging/LoggerHub.h +++ b/src/lib_logging/logging/logger_hub.h @@ -1,13 +1,13 @@ #pragma once -#include "Common.h" -#include "LoggingConfig.h" -#include "Sink.h" +#include "logging/common.h" +#include "logging/logging_config.h" +#include "logging/sink.h" +#include #include -namespace bts { -namespace log { +namespace bts::logging { class Logger; struct LogRec; @@ -33,5 +33,4 @@ class LoggerHub { Filter get_base_filter() const; }; -} // namespace log -} // namespace bts +} // namespace bts::logging diff --git a/src/lib_spark/spark/logging/logging.cpp b/src/lib_logging/logging/logging.cpp similarity index 67% rename from src/lib_spark/spark/logging/logging.cpp rename to src/lib_logging/logging/logging.cpp index 30749aa48..73efe55b0 100644 --- a/src/lib_spark/spark/logging/logging.cpp +++ b/src/lib_logging/logging/logging.cpp @@ -1,16 +1,19 @@ #include "logging.h" -#include "LoggerHub.h" -#include "spark/config/config.h" -#include "spark/config/protos/deployment_type.pb.h" -#include "spark/config/protos/logging.pb.h" -#include "spark/os/os.h" -#include "spark/utils/Dispatcher.h" -#include "spark/utils/bts_assert.h" -#include "spark/utils/thread_manager.h" +#include "logging/logger_hub.h" +#include "logging/logging_config.h" +// #include "spark/config/config.h" +// #include "spark/config/protos/deployment_type.pb.h" +// #include "spark/config/protos/logging.pb.h" +#include "logging/protobufs/logging.h" +#include "logging/protobufs/logging.pb.h" +#include "system/facades/bts_assert.h" +#include "system/os.h" #include "system/protobufs/system_config.pb.h" #include "system/protobufs/threads.pb.h" +#include "system/threading/dispatcher.h" +#include "system/threading/thread_manager.h" #ifdef SPARK_ENABLE_CCAPI -#include "spark/logging/ccapi_logger.h" +#include "logging/ccapi_logger.h" #endif #include @@ -25,10 +28,12 @@ #include #include #include +#include -namespace bts { -namespace log { +namespace bts::logging { +using bts::logging::protobufs::Logging; +using bts::logging::protobufs::SinkConfig; using bts::system::protobufs::SystemConfig; using bts::system::protobufs::ThreadGroupCfg; using Path = boost::filesystem::path; @@ -46,13 +51,14 @@ typename M::const_iterator find_key( } Path log_path() { - return Path{config::get().data_path()} / - fmt::format("logging.{}/", os::get_application_name()); + return Path{"/home/bts/.local/share/bts/sparkd/data/logging.sparkd"}; + // return Path{config::get().data_path()} / + // fmt::format("logging.{}/", os::get_application_name()); } void start_default_logging_thread() { _default_logger_hub.start(); } -Filter get_filter(LoggingConfig &cfg, config::SinkConfig const &scfg) { +Filter get_filter(LoggingConfig &cfg, SinkConfig const &scfg) { Filter result; for (auto &l : result) l = Info; @@ -84,16 +90,15 @@ Filter get_filter(LoggingConfig &cfg, config::SinkConfig const &scfg) { return result; } -void configure_logging(LoggingConfig const &cfg) { +void configure_logging(const LoggingConfig &cfg) { _default_logger_hub.config(cfg); } -void configure_logging(bts::config::Logging const &cfg) { +void configure_logging(const Logging &cfg) { configure_logging(cfg, ThreadGroupCfg()); } -void configure_logging( - bts::config::Logging const &cfg, const ThreadGroupCfg &thread_cfg) { +void configure_logging(const Logging &cfg, const ThreadGroupCfg &thread_cfg) { LoggingConfig real_cfg; - real_cfg.deployment_type = config::get().type(); + // real_cfg.deployment_type = config::get().type(); real_cfg.logger_initial_queue_size = cfg.initial_queue_size(); real_cfg.logger_max_queue_growth = cfg.max_queue_growth(); @@ -102,18 +107,18 @@ void configure_logging( {Sys, "Sys"}}; real_cfg.subsystem_names = { - {log::Gen, "Gen"}, {log::Cfg, "Cfg"}, - {log::QBus, "QBus"}, {log::Log, "Log"}, - {log::Jetfix, "Jetfix"}, {log::md, "md"}, - {log::Api, "Api"}, {log::persist, "persist"}, - {log::User, "User"}, {log::OrderMan, "OrderMan"}, - {log::Assert, "Assert"}, {log::Engine, "Engine"}, - {log::Ui, "UI"}, {log::ExSim, "ExSim"}, - {log::Mercury, "Mercury"}, {log::Testing, "Testing"}, - {log::Latency, "Latency"}, {log::DataFlow, "DataFlow"}, - {log::Plugin, "Plugin"}, {log::Sdk, "Sdk"}, - {log::Http, "Http"}, {log::Spartan, "Spartan"}, - {log::iLink3, "iLink3"}, + {Gen, "Gen"}, {Cfg, "Cfg"}, + {QBus, "QBus"}, {Log, "Log"}, + {Jetfix, "Jetfix"}, {md, "md"}, + {Api, "Api"}, {persist, "persist"}, + {User, "User"}, {OrderMan, "OrderMan"}, + {Assert, "Assert"}, {Engine, "Engine"}, + {Ui, "UI"}, {ExSim, "ExSim"}, + {Mercury, "Mercury"}, {Testing, "Testing"}, + {Latency, "Latency"}, {DataFlow, "DataFlow"}, + {Plugin, "Plugin"}, {Sdk, "Sdk"}, + {Http, "Http"}, {Spartan, "Spartan"}, + {iLink3, "iLink3"}, }; real_cfg.sinks["console"] = std::make_pair( @@ -129,7 +134,7 @@ void configure_logging( Path log_cache_file_path() { return log_path() / "log_control"; } LoggingConfigPoller::LoggingConfigPoller( - bts::config::Logging const &cfg, const ThreadGroupCfg &thread_cfg) + const Logging &cfg, const ThreadGroupCfg &thread_cfg) : _poller( utils::Dispatcher::background(), 1000, [=, this]() { poll_once(); }), _last_ts(std::time(nullptr)), _log_cache_file(log_cache_file_path()), @@ -139,11 +144,13 @@ LoggingConfigPoller::LoggingConfigPoller( LoggingConfigPoller::LoggingConfigPoller() : LoggingConfigPoller( - config::get(), threading::get_thread_cfg("logger")) { -} + logging::protobufs::default_logging_config(), + system::threading::ThreadManager{ + system::threading::ThreadManager::default_thread_config()} + .get_thread_cfg("logger")) {} void LoggingConfigPoller::init( - bts::config::Logging const &cfg, const ThreadGroupCfg &thread_cfg) { + Logging const &cfg, const ThreadGroupCfg &thread_cfg) { auto parent = _log_cache_file.parent_path(); if (!boost::filesystem::is_directory(parent)) bts_assert(boost::filesystem::create_directories(parent)); @@ -164,7 +171,7 @@ void LoggingConfigPoller::poll_once() { if (current_ts != _last_ts) { _last_ts = current_ts; - bts::config::Logging cfg; + Logging cfg; std::ifstream fs(_log_cache_file.string()); google::protobuf::io::IstreamInputStream gs(&fs); if (google::protobuf::TextFormat::Parse(&gs, &cfg)) { @@ -181,7 +188,9 @@ LoggingConfigPoller::~LoggingConfigPoller() { _poller.stop(); } -namespace interop { +} // namespace bts::logging + +namespace bts::logging::interop { const char *intern(const char *str) { static std::mutex mutex; @@ -203,17 +212,15 @@ const char *intern(const char *str) { extern "C" BTS_EXPORT void Logger_log( int level, int subsystem, const char *message, const char *file, int line) { - if (bts::log::_thread_logger.logger != nullptr) { - bts::log::_thread_logger.logger->enqueue( - log::log_ts(), log::Subsystem{(uint8_t)subsystem}, - log::Level{(uint8_t)level}, intern(file), line, "{}", + if (bts::logging::_thread_logger.logger != nullptr) { + bts::logging::_thread_logger.logger->enqueue( + logging::log_ts(), logging::Subsystem{(uint8_t)subsystem}, + logging::Level{(uint8_t)level}, intern(file), line, "{}", std::string(message)); } } -} // namespace interop -} // namespace log -} // namespace bts +} // namespace bts::logging::interop #ifdef SPARK_ENABLE_CCAPI namespace ccapi { diff --git a/src/lib_logging/logging/logging.h b/src/lib_logging/logging/logging.h new file mode 100644 index 000000000..2f6ff05f2 --- /dev/null +++ b/src/lib_logging/logging/logging.h @@ -0,0 +1,129 @@ +#pragma once + +#include "logging/common.h" +#include "logging/logger.h" +#include "logging/logger_hub.h" +#include "logging/protobufs/logging.pb.h" +#include "system/bts_chrono.h" +#include "system/threading/dispatcher.h" + +#include +#include +#include + +namespace bts::system::protobufs { +class ThreadGroupCfg; +} + +namespace bts::config { +class Logging; +} // namespace bts::config + +namespace bts { + +// Please keep this list in sync with Log.cs +constexpr bts::logging::Level NoLog{0}; +constexpr bts::logging::Level Diag{NoLog.ordinal + 1}; +constexpr bts::logging::Level Info{Diag.ordinal + 1}; +constexpr bts::logging::Level Warn{Info.ordinal + 1}; +constexpr bts::logging::Level Error{Warn.ordinal + 1}; +constexpr bts::logging::Level Fatal{Error.ordinal + 1}; +constexpr bts::logging::Level Sys{logging::Level::Max - 1}; +} // namespace bts + +namespace bts::logging { +// Please keep this list in sync with Log.cs +constexpr logging::Subsystem Gen{0}; +constexpr logging::Subsystem Cfg{Gen.ordinal + 1}; +constexpr logging::Subsystem QBus{Cfg.ordinal + 1}; +constexpr logging::Subsystem Log{QBus.ordinal + 1}; +constexpr logging::Subsystem Jetfix{Log.ordinal + 1}; +constexpr logging::Subsystem md{Jetfix.ordinal + 1}; +constexpr logging::Subsystem Api{md.ordinal + 1}; +constexpr logging::Subsystem persist{Api.ordinal + 1}; +constexpr logging::Subsystem User{persist.ordinal + 1}; +constexpr logging::Subsystem OrderMan{User.ordinal + 1}; +constexpr logging::Subsystem Assert{OrderMan.ordinal + 1}; +constexpr logging::Subsystem Engine{Assert.ordinal + 1}; +constexpr logging::Subsystem Ui{Engine.ordinal + 1}; +constexpr logging::Subsystem ExSim{Ui.ordinal + 1}; +constexpr logging::Subsystem Mercury{ExSim.ordinal + 1}; +constexpr logging::Subsystem Testing{Mercury.ordinal + 1}; +constexpr logging::Subsystem Latency{Testing.ordinal + 1}; +constexpr logging::Subsystem DataFlow{Latency.ordinal + 1}; +constexpr logging::Subsystem Plugin{DataFlow.ordinal + 1}; +constexpr logging::Subsystem Sdk{Plugin.ordinal + 1}; +constexpr logging::Subsystem Http{Sdk.ordinal + 1}; +constexpr logging::Subsystem Spartan{Http.ordinal + 1}; +constexpr logging::Subsystem iLink3{Spartan.ordinal + 1}; + +} // namespace bts::logging + +namespace bts::logging { + +struct LoggerHandle { + LoggerHandle(LoggerHandle const &) = delete; + LoggerHandle &operator=(LoggerHandle const &) = delete; + + LoggerHandle() : logger(nullptr) {} + LoggerHandle(Logger &l) : logger(&l) {} + ~LoggerHandle() { + if (logger) + logger->mark_inactive(); + } + Logger *logger; +}; + +struct CharPtrWrapper { + const char *ptr; +}; + +inline std::ostream &operator<<(std::ostream &s, CharPtrWrapper const &ptr) { + s << ptr.ptr; + return s; +} + +extern thread_local LoggerHandle _thread_logger; +void configure_logging(LoggingConfig const &cfg); +void configure_logging( + const logging::protobufs::Logging &cfg, + const system::protobufs::ThreadGroupCfg &thread_cfg); +void configure_logging(const bts::logging::protobufs::Logging &cfg); +void start_default_logging_thread(); + +class LoggingConfigPoller { + public: + LoggingConfigPoller(); + LoggingConfigPoller( + const logging::protobufs::Logging &cfg, + const system::protobufs::ThreadGroupCfg &thread_cfg); + ~LoggingConfigPoller(); + + private: + void init( + const logging::protobufs::Logging &cfg, + const system::protobufs::ThreadGroupCfg &thread_cfg); + void poll_once(); + utils::DispatcherTimer _poller; + std::time_t _last_ts; + boost::filesystem::path _log_cache_file; + std::atomic _done; +}; + +boost::filesystem::path log_path(); + +#define LOG(subsystem, level, ...) \ + bts::logging::_thread_logger.logger->is_loggable( \ + bts::logging::subsystem, level) && \ + bts::logging::_thread_logger.logger->enqueue( \ + bts::logging::log_ts(), bts::logging::subsystem, level, __FILE__, \ + __LINE__, __VA_ARGS__) + +#define LOG_ONCE_MAYBE(subsystem, level, ...) \ + bts::logging::_thread_logger.logger->is_loggable( \ + bts::logging::subsystem, level) && \ + bts::logging::_thread_logger.logger->enqueue_once_maybe( \ + bts::logging::log_ts(), logging::subsystem, level, __FILE__, \ + __LINE__, __VA_ARGS__) + +} // namespace bts::logging diff --git a/src/lib_spark/spark/logging/LoggingConfig.h b/src/lib_logging/logging/logging_config.h similarity index 85% rename from src/lib_spark/spark/logging/LoggingConfig.h rename to src/lib_logging/logging/logging_config.h index 79319762e..50c13a5c0 100644 --- a/src/lib_spark/spark/logging/LoggingConfig.h +++ b/src/lib_logging/logging/logging_config.h @@ -1,14 +1,13 @@ #pragma once -#include "Common.h" -#include "Sink.h" +#include "logging/common.h" +#include "logging/sink.h" #include "system/protobufs/threads.pb.h" #include #include -namespace bts { -namespace log { +namespace bts::logging { struct LoggingConfig { LoggingConfig() @@ -25,5 +24,4 @@ struct LoggingConfig { system::protobufs::ThreadGroupCfg thread_cfg; }; -} // namespace log -} // namespace bts +} // namespace bts::logging diff --git a/src/lib_spark/spark/logging/MsgPacking.h b/src/lib_logging/logging/msg_packing.h similarity index 89% rename from src/lib_spark/spark/logging/MsgPacking.h rename to src/lib_logging/logging/msg_packing.h index ffeaa6e72..a6588be87 100644 --- a/src/lib_spark/spark/logging/MsgPacking.h +++ b/src/lib_logging/logging/msg_packing.h @@ -2,12 +2,10 @@ #include #include -#include #include #include -namespace bts { -namespace log { +namespace bts::logging { template std::string format_tuple( @@ -45,7 +43,10 @@ std::string unpack_msg_args( return result; } -template struct CheckPtr { const static auto value = true; }; +template +struct CheckPtr { + const static auto value = true; +}; template struct CheckPtr : public CheckPtr { @@ -53,7 +54,7 @@ struct CheckPtr : public CheckPtr { }; template -void pack_msg_args(std::array &buffer, Args &&... args) { +void pack_msg_args(std::array &buffer, Args &&...args) { using Store = std::tuple::type...>; static_assert( CheckPtr::type...>::value, @@ -66,5 +67,4 @@ void pack_msg_args(std::array &buffer, Args &&... args) { } } -} // namespace log -} // namespace bts +} // namespace bts::logging diff --git a/src/lib_logging/logging/protobufs/logging.h b/src/lib_logging/logging/protobufs/logging.h new file mode 100644 index 000000000..fc3a17003 --- /dev/null +++ b/src/lib_logging/logging/protobufs/logging.h @@ -0,0 +1,22 @@ +#pragma once + +#include "logging/protobufs/logging.pb.h" + +namespace bts::logging::protobufs { + +inline Logging default_logging_config() { + Logging rv; + *rv.mutable_console()->mutable_default_level() = "Info"; + *rv.mutable_syslog()->mutable_default_level() = "Info"; + *rv.mutable_file()->mutable_default_level() = "Info"; +#ifdef _WIN32 + rv.set_initial_queue_size(1024); + rv.set_max_queue_growth(100); +#else + rv.set_initial_queue_size(120001); + rv.set_max_queue_growth(4); +#endif + return rv; +} + +} // namespace bts::logging::protobufs diff --git a/src/lib_spark/spark/config/protos/logging.proto b/src/lib_logging/logging/protobufs/logging.proto similarity index 80% rename from src/lib_spark/spark/config/protos/logging.proto rename to src/lib_logging/logging/protobufs/logging.proto index 941dd1f8e..cf4273453 100644 --- a/src/lib_spark/spark/config/protos/logging.proto +++ b/src/lib_logging/logging/protobufs/logging.proto @@ -1,8 +1,8 @@ syntax = "proto3"; -package bts.config; +package bts.logging.protobufs; -option csharp_namespace = "bts.config"; +option csharp_namespace = "bts.logging.protobufs"; message SubsystemConfig { string name = 1; diff --git a/src/lib_spark/spark/logging/Sink.cpp b/src/lib_logging/logging/sink.cpp similarity index 84% rename from src/lib_spark/spark/logging/Sink.cpp rename to src/lib_logging/logging/sink.cpp index ffb4a0b5b..68721f7ce 100644 --- a/src/lib_spark/spark/logging/Sink.cpp +++ b/src/lib_logging/logging/sink.cpp @@ -1,24 +1,27 @@ -#include "Sink.h" +#include "sink.h" -#include "spark/logging/logging.h" -#include "spark/os/os.h" -#include "spark/utils/bts_assert.h" -#include "spark/utils/datetime.h" -#include "spark/utils/file_utils.h" +#include "logging/logging.h" +#include "system/facades/bts_assert.h" +#include "system/file_utils.h" +#include "system/os.h" +#include "system/time_stamp.h" +#include #include #include #include +#include #include #include #include +#include +#include #ifndef _WIN32 #include #endif -namespace bts { -namespace log { +namespace bts::logging { struct InitSysLog { InitSysLog() { @@ -30,7 +33,8 @@ struct InitSysLog { auto formatter(LoggingConfig const &cfg) { return [cfg](LogMsg const &m) { - auto iso_date = datetime::iso_date_time_string(datetime::local_now()); + auto now_us = boost::posix_time::microsec_clock::local_time(); + auto iso_date = boost::posix_time::to_iso_extended_string(now_us); iso_date[sizeof("YYYY-MM-DD") - 1] = ' '; #ifdef _WIN32 return fmt::format( @@ -57,7 +61,8 @@ auto formatter(LoggingConfig const &cfg) { Sink console_sink(LoggingConfig const &) { return [](LogMsg const &m) { - auto iso_date = datetime::iso_date_time_string(datetime::local_now()); + auto now_us = boost::posix_time::microsec_clock::local_time(); + auto iso_date = boost::posix_time::to_iso_extended_string(now_us); iso_date[sizeof("YYYY-MM-DD") - 1] = ' '; std::cout << fmt::format( "{}|{:<8}|{:<5}|{:<35}| {}", iso_date, m.subsystem_name, @@ -134,5 +139,4 @@ Sink null_sink() { return [](const LogMsg &) {}; } -} // namespace log -} // namespace bts +} // namespace bts::logging diff --git a/src/lib_spark/spark/logging/Sink.h b/src/lib_logging/logging/sink.h similarity index 83% rename from src/lib_spark/spark/logging/Sink.h rename to src/lib_logging/logging/sink.h index 29abe583f..b180fc0e8 100644 --- a/src/lib_spark/spark/logging/Sink.h +++ b/src/lib_logging/logging/sink.h @@ -1,14 +1,14 @@ #pragma once -#include "Common.h" -#include "spark/utils/warn_ctrl.h" +#include "logging/common.h" +#include "system/warn_ctrl.h" #include #include #include -namespace bts { -namespace log { +namespace bts::logging { + struct LoggingConfig; GCC_DIAG_OFF("-Weffc++") struct LogMsg { @@ -33,5 +33,5 @@ Sink console_sink(LoggingConfig const &cfg); Sink syslog_sink(LoggingConfig const &cfg); Sink file_sink(LoggingConfig const &cfg); Sink null_sink(); -} // namespace log -} // namespace bts + +} // namespace bts::logging diff --git a/src/lib_logging/logging/tests/logging_tests.cpp b/src/lib_logging/logging/tests/logging_tests.cpp new file mode 100644 index 000000000..de9901b22 --- /dev/null +++ b/src/lib_logging/logging/tests/logging_tests.cpp @@ -0,0 +1,82 @@ +// #include "catch/catch.hpp" +// // #include "spark/config/config.h" +// #include "logging/logging.h" +// #include "logging/protobufs/logging.h" +// #include "logging/protobufs/logging.pb.h" +// #include "system/bts_chrono.h" + +// #include +// #include + +// namespace bts { +// int logging_tests; + +// TEST_CASE("Logging Tests", "[logging] [benchmark]") { + +// auto sz = 1000000; +// log::Filter f; +// for (auto &l : f) +// l = Diag; +// log::LoggingConfig cfg; +// cfg.logger_initial_queue_size = sz * 10; +// cfg.sinks["null_sink"] = std::make_pair([](log::LogMsg const &) {}, f); +// log::configure_logging(cfg); +// LOG(Gen, Info, "Kicking things off"); + +// SECTION("timestamp_interpolation") { +// auto start = bts::Timer::now(); +// for (int i = 0; i < sz; i++) +// LOG(Gen, Info, "Hello World. It is now: {}", +// Timer::now().time_since_epoch()); +// auto stop = Timer::now(); +// LOG(Testing, Info, "Logging: ns/msg for log with timestamps: {} tt: {} ", +// bts::ns_diff(stop, start) / sz, bts::ns_diff(stop, start)); +// } + +// SECTION("int_interpolation") { +// auto start = bts::Timer::now(); +// for (int i = 0; i < sz; i++) +// LOG(Gen, Info, "Hello World. This is interpolating a number {0}", 12); +// auto stop = bts::Timer::now(); +// LOG(Testing, Info, +// "Logging: ns/msg for log with simple number interpolation: {} tt: " +// "{} ", +// bts::ns_diff(stop, start) / sz, bts::ns_diff(stop, start)); +// } + +// SECTION("large_string_interpolation") { +// std::array strs; +// int i = 0; +// strs[i++] = "aaaaaaaaaaaaaaaaa"; +// strs[i++] = "aaaaaaaaaaaaaaaaa"; +// strs[i++] = "aaaaaaaaaaaaaaaaa"; +// strs[i++] = "aaaaaaaaaaaaaaaaa"; +// strs[i++] = "aaaaaaaaaaaaaaaaa"; +// strs[i++] = "aaaaaaaaaaaaaaaaa"; +// strs[i++] = "aaaaaaaaaaaaaaaaa"; +// strs[i++] = "aaaaaaaaaaaaaaaaa"; + +// auto start = bts::Timer::now(); +// for (int i = 0; i < sz; i++) +// LOG(Gen, Info, "Hello World. This is interpolating a string ", +// strs[i & 0x00000007]); +// auto stop = bts::Timer::now(); +// LOG(Testing, Info, +// "Logging: ns/msg for log with large string interpolation: {} tt: {} ", +// bts::ns_diff(stop, start) / sz, bts::ns_diff(stop, start)); +// } + +// SECTION("log_skipping") { +// auto start = bts::Timer::now(); +// for (int i = 0; i < sz; i++) +// LOG(Gen, Diag, "Hello World. I am {} years old!", i); +// auto stop = bts::Timer::now(); +// LOG(Testing, Info, "Logging: ns/msg for log skipping: {} tt: {} ", +// bts::ns_diff(stop, start) / sz, bts::ns_diff(stop, start)); +// } +// auto cfg2 = logging::protobufs::default_logging_config(); +// cfg2.mutable_console()->set_default_level("Fatal"); +// log::configure_logging(cfg2); +// } + +// } // namespace bts diff --git a/src/lib_spark/cmake/GetLinuxServerLinkLibraries.cmake b/src/lib_spark/cmake/GetLinuxServerLinkLibraries.cmake index a160b614f..9dd48af26 100644 --- a/src/lib_spark/cmake/GetLinuxServerLinkLibraries.cmake +++ b/src/lib_spark/cmake/GetLinuxServerLinkLibraries.cmake @@ -3,6 +3,7 @@ function(get_link_libraries dest) system domain protobuf + logging double-conversion boost_system boost_thread diff --git a/src/lib_spark/spark/api/core/ApiClientInterop.cpp b/src/lib_spark/spark/api/core/ApiClientInterop.cpp index c91574a8d..5df76bab5 100644 --- a/src/lib_spark/spark/api/core/ApiClientInterop.cpp +++ b/src/lib_spark/spark/api/core/ApiClientInterop.cpp @@ -1,6 +1,6 @@ #include "ApiClientInterop.h" +#include "logging/logging.h" #include "spark/config/config.h" -#include "spark/logging/logging.h" #include "spark/quickbus/quickbus.h" #include "spark/utils/Dispatcher.h" #include "spark/utils/bts_assert.h" diff --git a/src/lib_spark/spark/api/core/ApiServerInterop.cpp b/src/lib_spark/spark/api/core/ApiServerInterop.cpp index 94331ea69..2e3d12ed4 100644 --- a/src/lib_spark/spark/api/core/ApiServerInterop.cpp +++ b/src/lib_spark/spark/api/core/ApiServerInterop.cpp @@ -1,5 +1,5 @@ #include "ApiServerInterop.h" -#include "spark/logging/logging.h" +#include "logging/logging.h" #include "spark/quickbus/quickbus.h" #include "spark/utils/bts_assert.h" diff --git a/src/lib_spark/spark/api/md/MarketDataConfigUtils.cpp b/src/lib_spark/spark/api/md/MarketDataConfigUtils.cpp index c2b10e2a7..b7ff20c5b 100644 --- a/src/lib_spark/spark/api/md/MarketDataConfigUtils.cpp +++ b/src/lib_spark/spark/api/md/MarketDataConfigUtils.cpp @@ -1,8 +1,8 @@ #if !defined(_WIN32) && defined(SPARK_ENABLE_CCAPI) #include "MarketDataConfigUtils.h" +#include "logging/logging.h" #include "spark/api/md/MarketDataConfig.pb.h" #include "spark/domain_model/Security.pb.h" -#include "spark/logging/logging.h" //#if !defined(_WIN32) && defined(SPARK_ENABLE_CCAPI) namespace bts::md { @@ -74,4 +74,4 @@ MarketDataConfigUtils::get_effective_recording_config( } } // namespace bts::md -#endif \ No newline at end of file +#endif diff --git a/src/lib_spark/spark/api/public/ClientChannel.h b/src/lib_spark/spark/api/public/ClientChannel.h index 844e54910..f0623f3f5 100644 --- a/src/lib_spark/spark/api/public/ClientChannel.h +++ b/src/lib_spark/spark/api/public/ClientChannel.h @@ -5,7 +5,7 @@ #include "RawUpdate.h" #include "Result.h" #include "ServiceContext.h" -#include "spark/logging/logging.h" +#include "logging/logging.h" #include #include diff --git a/src/lib_spark/spark/api/public/ServiceContext.cpp b/src/lib_spark/spark/api/public/ServiceContext.cpp index a95b5ded2..95c1dcd11 100644 --- a/src/lib_spark/spark/api/public/ServiceContext.cpp +++ b/src/lib_spark/spark/api/public/ServiceContext.cpp @@ -2,8 +2,9 @@ #include "ServiceContext.h" #include "ApiServer.h" #include "QuickbusClientChannel.h" +#include "logging/logging.h" #include "spark/api/services/AuthService.client.pb.h" -#include "spark/logging/logging.h" + #include namespace bts { diff --git a/src/lib_spark/spark/api/service_helpers/PositionUtilities.cpp b/src/lib_spark/spark/api/service_helpers/PositionUtilities.cpp index 6ca788b0a..c02f1bd26 100644 --- a/src/lib_spark/spark/api/service_helpers/PositionUtilities.cpp +++ b/src/lib_spark/spark/api/service_helpers/PositionUtilities.cpp @@ -1,8 +1,8 @@ #include "PositionUtilities.h" +#include "logging/logging.h" #include "spark/api/services/OrderService.client.pb.h" #include "spark/api/services/OrderService.pb.h" #include "spark/api/services/PositionService.server.pb.h" -#include "spark/logging/logging.h" namespace bts { namespace position { @@ -150,4 +150,4 @@ double PositionUtilities::compute_pnl_entry( } } // namespace position -} // namespace bts \ No newline at end of file +} // namespace bts diff --git a/src/lib_spark/spark/api/service_helpers/PositionUtilities.h b/src/lib_spark/spark/api/service_helpers/PositionUtilities.h index 29b406361..c5de9c36e 100644 --- a/src/lib_spark/spark/api/service_helpers/PositionUtilities.h +++ b/src/lib_spark/spark/api/service_helpers/PositionUtilities.h @@ -1,9 +1,9 @@ #pragma once +#include "logging/logging.h" #include "spark/api/services/OrderService.client.pb.h" #include "spark/api/services/OrderService.pb.h" #include "spark/api/services/PositionService.server.pb.h" -#include "spark/logging/logging.h" namespace bts { namespace position { @@ -56,4 +56,4 @@ class PositionUtilities { }; } // namespace position -} // namespace bts \ No newline at end of file +} // namespace bts diff --git a/src/lib_spark/spark/api/services/OrderService.h b/src/lib_spark/spark/api/services/OrderService.h index 697334c8b..cd4c2b821 100644 --- a/src/lib_spark/spark/api/services/OrderService.h +++ b/src/lib_spark/spark/api/services/OrderService.h @@ -1,7 +1,7 @@ #pragma once +#include "logging/logging.h" #include "spark/api/services/OrderService.pb.h" -#include "spark/logging/logging.h" #include "system/FMT_IMPL.h" #include "system/enum_macros.h" #include "system/json/json_reader.h" diff --git a/src/lib_spark/spark/config/ConfigLog.h b/src/lib_spark/spark/config/ConfigLog.h index 8e8a5cfb2..0579bb971 100644 --- a/src/lib_spark/spark/config/ConfigLog.h +++ b/src/lib_spark/spark/config/ConfigLog.h @@ -1,6 +1,6 @@ #pragma once -#include "spark/logging/logging.h" +#include "logging/logging.h" #include "spark/utils/bts_no_copy.h" #include @@ -23,17 +23,17 @@ class ConfigLog { void warning(const std::string &msg); bool enqueue( - bts::log::Level level, const char *file, int line, std::string msg); + bts::logging::Level level, const char *file, int line, std::string msg); template bool enqueue( - bts::log::Level level, + bts::logging::Level level, const char *file, int line, const char *msg_template, Args &&...msg_args); - bool is_loggable(bts::log::Level level) const; + bool is_loggable(bts::logging::Level level) const; bool print_errors() const; void set_print_errors(bool value); @@ -42,8 +42,8 @@ class ConfigLog { void start(); bool print_errors_; - log::LoggerHub logger_hub_; - log::Logger &logger_; + logging::LoggerHub logger_hub_; + logging::Logger &logger_; }; ////////////////////////////////////////////////// @@ -53,23 +53,23 @@ class ConfigLog { inline ConfigLog::ConfigLog() : print_errors_(true), logger_hub_("config_logger"), logger_(logger_hub_.make_logger()) { - log::LoggingConfig cfg; + logging::LoggingConfig cfg; cfg.level_names = {{Diag, "Diag"}, {Info, "Info"}, {Warn, "Warn"}, {Error, "Error"}, {Fatal, "Fatal"}, {Sys, "Sys"}}; - cfg.subsystem_names = {{log::Gen, "Gen"}, {log::Log, "Log"}}; + cfg.subsystem_names = {{logging::Gen, "Gen"}, {logging::Log, "Log"}}; cfg.logger_initial_queue_size = 10; - log::Filter f; + logging::Filter f; for (auto &l : f) { l = Warn; } cfg.deployment_type = "Config"; - f[log::Cfg.ordinal] = Warn; - cfg.sinks["console"] = std::make_pair(log::console_sink(cfg), f); - f[log::Cfg.ordinal] = Info; - cfg.sinks["syslog"] = std::make_pair(log::syslog_sink(cfg), f); + f[logging::Cfg.ordinal] = Warn; + cfg.sinks["console"] = std::make_pair(logging::console_sink(cfg), f); + f[logging::Cfg.ordinal] = Info; + cfg.sinks["syslog"] = std::make_pair(logging::syslog_sink(cfg), f); logger_hub_.config(cfg); start(); @@ -87,7 +87,7 @@ inline void ConfigLog::info(const std::string &msg) { return; } logger_.enqueue( - log::log_ts(), log::Cfg, Info, __FILE__, __LINE__, "{0}", msg); + logging::log_ts(), logging::Cfg, Info, __FILE__, __LINE__, "{0}", msg); } inline void ConfigLog::error(const std::string &msg) { @@ -95,7 +95,7 @@ inline void ConfigLog::error(const std::string &msg) { return; } logger_.enqueue( - log::log_ts(), log::Cfg, Error, __FILE__, __LINE__, "{0}", msg); + logging::log_ts(), logging::Cfg, Error, __FILE__, __LINE__, "{0}", msg); } inline void ConfigLog::warning(const std::string &msg) { @@ -103,21 +103,21 @@ inline void ConfigLog::warning(const std::string &msg) { return; } logger_.enqueue( - log::log_ts(), log::Cfg, Warn, __FILE__, __LINE__, "{0}", msg); + logging::log_ts(), logging::Cfg, Warn, __FILE__, __LINE__, "{0}", msg); } inline bool ConfigLog::enqueue( - bts::log::Level level, const char *file, int line, std::string msg) { + bts::logging::Level level, const char *file, int line, std::string msg) { return enqueue(level, file, line, "{}", std::move(msg)); } -inline bool ConfigLog::is_loggable(bts::log::Level level) const { - return print_errors_ && logger_.is_loggable(bts::log::Cfg, level); +inline bool ConfigLog::is_loggable(bts::logging::Level level) const { + return print_errors_ && logger_.is_loggable(bts::logging::Cfg, level); } template inline bool ConfigLog::enqueue( - bts::log::Level level, + bts::logging::Level level, const char *file, int line, const char *msg_template, @@ -126,7 +126,8 @@ inline bool ConfigLog::enqueue( return false; } return logger_.enqueue( - log::log_ts(), log::Cfg, level, file, line, msg_template, msg_args...); + logging::log_ts(), logging::Cfg, level, file, line, msg_template, + msg_args...); } } // namespace internal diff --git a/src/lib_spark/spark/domain_model/Side.h b/src/lib_spark/spark/domain_model/Side.h index 667cb8b26..52ba9936c 100644 --- a/src/lib_spark/spark/domain_model/Side.h +++ b/src/lib_spark/spark/domain_model/Side.h @@ -1,7 +1,7 @@ #pragma once +#include "logging/logging.h" #include "spark/domain_model/Security.pb.h" -#include "spark/logging/logging.h" #include "system/FMT_IMPL.h" #include "system/enum_macros.h" #include "system/json/json_reader.h" diff --git a/src/lib_spark/spark/domain_model/Venue.h b/src/lib_spark/spark/domain_model/Venue.h index be9d47a46..778aa15db 100644 --- a/src/lib_spark/spark/domain_model/Venue.h +++ b/src/lib_spark/spark/domain_model/Venue.h @@ -1,7 +1,7 @@ #pragma once +#include "logging/logging.h" #include "spark/domain_model/Security.pb.h" -#include "spark/logging/logging.h" #include "system/FMT_IMPL.h" #include "system/enum_macros.h" #include "system/json/json_reader.h" diff --git a/src/lib_spark/spark/io/http/HTTPClient.cpp b/src/lib_spark/spark/io/http/HTTPClient.cpp index ef0f069ae..7062888b6 100644 --- a/src/lib_spark/spark/io/http/HTTPClient.cpp +++ b/src/lib_spark/spark/io/http/HTTPClient.cpp @@ -1,8 +1,9 @@ #include "HTTPClient.h" #include "HTTPRequest.h" #include "HTTPResponse.h" +#include "logging/logging.h" #include "spark/io/URL.h" -#include "spark/logging/logging.h" + #include #include diff --git a/src/lib_spark/spark/io/websocket/WebsocketClient.cpp b/src/lib_spark/spark/io/websocket/WebsocketClient.cpp index a7cc6cae6..5099de097 100644 --- a/src/lib_spark/spark/io/websocket/WebsocketClient.cpp +++ b/src/lib_spark/spark/io/websocket/WebsocketClient.cpp @@ -3,7 +3,7 @@ #include "WebsocketClientConfiguration.h" #include "WebsocketError.h" #include "WebsocketMessage.h" -#include "spark/logging/logging.h" +#include "logging/logging.h" #include "spark/utils/bts_assert.h" #include #ifndef _WIN32 diff --git a/src/lib_spark/spark/io/websocket/WebsocketSSLClientInternal.cpp b/src/lib_spark/spark/io/websocket/WebsocketSSLClientInternal.cpp index 45c0f5c4f..fba62d811 100644 --- a/src/lib_spark/spark/io/websocket/WebsocketSSLClientInternal.cpp +++ b/src/lib_spark/spark/io/websocket/WebsocketSSLClientInternal.cpp @@ -1,7 +1,7 @@ #include "WebsocketSSLClientInternal.h" #include "WebsocketError.h" #include "WebsocketMessage.h" -#include "spark/logging/logging.h" +#include "logging/logging.h" #include "spark/utils/bts_assert.h" #include #ifndef _WIN32 diff --git a/src/lib_spark/spark/jetfix/connection/SocketConnection.cpp b/src/lib_spark/spark/jetfix/connection/SocketConnection.cpp index 1cdfbe74a..696e7471b 100644 --- a/src/lib_spark/spark/jetfix/connection/SocketConnection.cpp +++ b/src/lib_spark/spark/jetfix/connection/SocketConnection.cpp @@ -1,6 +1,6 @@ #include "SocketConnection.h" +#include "logging/logging.h" #include "spark/jetfix/store/session_name.h" -#include "spark/logging/logging.h" #include "spark/tracing/PerfLog.h" #include "spark/tracing/bts_trace.h" #include "spark/utils/TimeStamp.h" diff --git a/src/lib_spark/spark/jetfix/gateway/CoreGateway.cpp b/src/lib_spark/spark/jetfix/gateway/CoreGateway.cpp index 8c54b2e91..738ec7205 100644 --- a/src/lib_spark/spark/jetfix/gateway/CoreGateway.cpp +++ b/src/lib_spark/spark/jetfix/gateway/CoreGateway.cpp @@ -1,12 +1,12 @@ #include "CoreGateway.h" +#include "logging/logging.h" #include "spark/jetfix/common/OutFIX.h" #include "spark/jetfix/connection/AsyncReader.h" #include "spark/jetfix/connection/IConnection.h" #include "spark/jetfix/gateway/ICoreGatewayObserver.h" #include "spark/jetfix/gateway/Session.h" #include "spark/jetfix/store/IFIXStore.h" -#include "spark/logging/logging.h" #include "spark/orderman/orderman_utils/orderman_common.h" #include "spark/tracing/bts_trace.h" #include "spark/utils/TimeStamp.h" diff --git a/src/lib_spark/spark/jetfix/gateway/Session.cpp b/src/lib_spark/spark/jetfix/gateway/Session.cpp index f0b05b528..0b607488d 100644 --- a/src/lib_spark/spark/jetfix/gateway/Session.cpp +++ b/src/lib_spark/spark/jetfix/gateway/Session.cpp @@ -1,5 +1,5 @@ #include "Session.h" - +#include "logging/logging.h" #include "spark/config/config.h" #include "spark/domain_model/Security.pb.h" #include "spark/jetfix/codec/FIXEncodingStream.h" @@ -9,7 +9,6 @@ #include "spark/jetfix/connection/IConnection.h" #include "spark/jetfix/gateway/ICoreGatewayEventSink.h" #include "spark/jetfix/store/IFIXStore.h" -#include "spark/logging/logging.h" #include "spark/tracing/bts_trace.h" #include "spark/utils/SecureLogon.h" #include "spark/utils/TimeStamp.h" diff --git a/src/lib_spark/spark/jetfix/tests/jetfix_performance_tests.cpp b/src/lib_spark/spark/jetfix/tests/jetfix_performance_tests.cpp index a886bebb1..906f9abe1 100644 --- a/src/lib_spark/spark/jetfix/tests/jetfix_performance_tests.cpp +++ b/src/lib_spark/spark/jetfix/tests/jetfix_performance_tests.cpp @@ -1,5 +1,6 @@ #include "catch/catch.hpp" +#include "logging/logging.h" #include "spark/jetfix/codec/FIXFragment.h" #include "spark/jetfix/codec/FIXMsg.h" #include "spark/jetfix/codec/FIXParser.h" @@ -8,7 +9,6 @@ #include "spark/jetfix/codec/Group.h" #include "spark/jetfix/common/InMsgBuffer.h" #include "spark/jetfix/connection/IConnectionObserver.h" -#include "spark/logging/logging.h" #include "spark/utils/TimeStamp.h" namespace bts { diff --git a/src/lib_spark/spark/jetfix/tests/store_tests.cpp b/src/lib_spark/spark/jetfix/tests/store_tests.cpp index b612e893e..3a7a896e9 100644 --- a/src/lib_spark/spark/jetfix/tests/store_tests.cpp +++ b/src/lib_spark/spark/jetfix/tests/store_tests.cpp @@ -1,12 +1,12 @@ #include "catch/catch.hpp" +#include "logging/logging.h" #include "spark/jetfix/codec/FIXEncodingStream.h" #include "spark/jetfix/common/InMsgBuffer.h" #include "spark/jetfix/common/OutFIX.h" #include "spark/jetfix/common/OutFIXPtr.h" #include "spark/jetfix/store/FIXFileStore.h" #include "spark/jetfix/store/session_name.h" -#include "spark/logging/logging.h" #include "spark/utils/TempDir.h" #include "spark/utils/TimeStamp.h" #include "spark/utils/datetime.h" diff --git a/src/lib_spark/spark/logging/logging.h b/src/lib_spark/spark/logging/logging.h deleted file mode 100644 index 1fd7b4f6a..000000000 --- a/src/lib_spark/spark/logging/logging.h +++ /dev/null @@ -1,122 +0,0 @@ -#pragma once - -#include "Common.h" -#include "Logger.h" -#include "LoggerHub.h" -#include "spark/utils/Dispatcher.h" -#include "spark/utils/bts_chrono.h" - -#include -#include -#include - -namespace bts::system::protobufs { -class ThreadGroupCfg; -} - -namespace bts { -namespace config { -class Logging; -} // namespace config - -// Please keep this list in sync with Log.cs -constexpr log::Level NoLog{0}; -constexpr log::Level Diag{NoLog.ordinal + 1}; -constexpr log::Level Info{Diag.ordinal + 1}; -constexpr log::Level Warn{Info.ordinal + 1}; -constexpr log::Level Error{Warn.ordinal + 1}; -constexpr log::Level Fatal{Error.ordinal + 1}; -constexpr log::Level Sys{log::Level::Max - 1}; - -namespace log { - -// Please keep this list in sync with Log.cs -constexpr log::Subsystem Gen{0}; -constexpr log::Subsystem Cfg{Gen.ordinal + 1}; -constexpr log::Subsystem QBus{Cfg.ordinal + 1}; -constexpr log::Subsystem Log{QBus.ordinal + 1}; -constexpr log::Subsystem Jetfix{Log.ordinal + 1}; -constexpr log::Subsystem md{Jetfix.ordinal + 1}; -constexpr log::Subsystem Api{md.ordinal + 1}; -constexpr log::Subsystem persist{Api.ordinal + 1}; -constexpr log::Subsystem User{persist.ordinal + 1}; -constexpr log::Subsystem OrderMan{User.ordinal + 1}; -constexpr log::Subsystem Assert{OrderMan.ordinal + 1}; -constexpr log::Subsystem Engine{Assert.ordinal + 1}; -constexpr log::Subsystem Ui{Engine.ordinal + 1}; -constexpr log::Subsystem ExSim{Ui.ordinal + 1}; -constexpr log::Subsystem Mercury{ExSim.ordinal + 1}; -constexpr log::Subsystem Testing{Mercury.ordinal + 1}; -constexpr log::Subsystem Latency{Testing.ordinal + 1}; -constexpr log::Subsystem DataFlow{Latency.ordinal + 1}; -constexpr log::Subsystem Plugin{DataFlow.ordinal + 1}; -constexpr log::Subsystem Sdk{Plugin.ordinal + 1}; -constexpr log::Subsystem Http{Sdk.ordinal + 1}; -constexpr log::Subsystem Spartan{Http.ordinal + 1}; -constexpr log::Subsystem iLink3{Spartan.ordinal + 1}; - -struct LoggerHandle { - LoggerHandle(LoggerHandle const &) = delete; - LoggerHandle &operator=(LoggerHandle const &) = delete; - - LoggerHandle() : logger(nullptr) {} - LoggerHandle(Logger &l) : logger(&l) {} - ~LoggerHandle() { - if (logger) - logger->mark_inactive(); - } - Logger *logger; -}; - -struct CharPtrWrapper { - const char *ptr; -}; - -inline std::ostream &operator<<(std::ostream &s, CharPtrWrapper const &ptr) { - s << ptr.ptr; - return s; -} - -extern thread_local LoggerHandle _thread_logger; -void configure_logging(LoggingConfig const &cfg); -void configure_logging( - bts::config::Logging const &cfg, - const system::protobufs::ThreadGroupCfg &thread_cfg); -void configure_logging(bts::config::Logging const &cfg); -void start_default_logging_thread(); - -class LoggingConfigPoller { - public: - LoggingConfigPoller(); - LoggingConfigPoller( - bts::config::Logging const &cfg, - const system::protobufs::ThreadGroupCfg &thread_cfg); - ~LoggingConfigPoller(); - - private: - void init( - bts::config::Logging const &cfg, - const system::protobufs::ThreadGroupCfg &thread_cfg); - void poll_once(); - utils::DispatcherTimer _poller; - std::time_t _last_ts; - boost::filesystem::path _log_cache_file; - std::atomic _done; -}; - -boost::filesystem::path log_path(); - -#define LOG(subsystem, level, ...) \ - bts::log::_thread_logger.logger->is_loggable(bts::log::subsystem, level) && \ - bts::log::_thread_logger.logger->enqueue( \ - bts::log::log_ts(), bts::log::subsystem, level, __FILE__, __LINE__, \ - __VA_ARGS__) - -#define LOG_ONCE_MAYBE(subsystem, level, ...) \ - bts::log::_thread_logger.logger->is_loggable(bts::log::subsystem, level) && \ - bts::log::_thread_logger.logger->enqueue_once_maybe( \ - bts::log::log_ts(), log::subsystem, level, __FILE__, __LINE__, \ - __VA_ARGS__) - -} // namespace log -} // namespace bts diff --git a/src/lib_spark/spark/logging/tests/logging_tests.cpp b/src/lib_spark/spark/logging/tests/logging_tests.cpp deleted file mode 100644 index 49f80b556..000000000 --- a/src/lib_spark/spark/logging/tests/logging_tests.cpp +++ /dev/null @@ -1,81 +0,0 @@ -#include "catch/catch.hpp" -#include "spark/config/config.h" -#include "spark/config/protos/logging.pb.h" -#include "spark/logging/logging.h" -#include "spark/utils/bts_chrono.h" - -#include -#include - -namespace bts { -int logging_tests; - -TEST_CASE("Logging Tests", "[logging] [benchmark]") { - - auto sz = 1000000; - log::Filter f; - for (auto &l : f) - l = Diag; - log::LoggingConfig cfg; - cfg.logger_initial_queue_size = sz * 10; - cfg.sinks["null_sink"] = std::make_pair([](log::LogMsg const &) {}, f); - log::configure_logging(cfg); - LOG(Gen, Info, "Kicking things off"); - - SECTION("timestamp_interpolation") { - auto start = bts::Timer::now(); - for (int i = 0; i < sz; i++) - LOG(Gen, Info, "Hello World. It is now: {}", - Timer::now().time_since_epoch()); - auto stop = Timer::now(); - LOG(Testing, Info, "Logging: ns/msg for log with timestamps: {} tt: {} ", - bts::ns_diff(stop, start) / sz, bts::ns_diff(stop, start)); - } - - SECTION("int_interpolation") { - auto start = bts::Timer::now(); - for (int i = 0; i < sz; i++) - LOG(Gen, Info, "Hello World. This is interpolating a number {0}", 12); - auto stop = bts::Timer::now(); - LOG(Testing, Info, - "Logging: ns/msg for log with simple number interpolation: {} tt: " - "{} ", - bts::ns_diff(stop, start) / sz, bts::ns_diff(stop, start)); - } - - SECTION("large_string_interpolation") { - std::array strs; - int i = 0; - strs[i++] = "aaaaaaaaaaaaaaaaa"; - strs[i++] = "aaaaaaaaaaaaaaaaa"; - strs[i++] = "aaaaaaaaaaaaaaaaa"; - strs[i++] = "aaaaaaaaaaaaaaaaa"; - strs[i++] = "aaaaaaaaaaaaaaaaa"; - strs[i++] = "aaaaaaaaaaaaaaaaa"; - strs[i++] = "aaaaaaaaaaaaaaaaa"; - strs[i++] = "aaaaaaaaaaaaaaaaa"; - - auto start = bts::Timer::now(); - for (int i = 0; i < sz; i++) - LOG(Gen, Info, "Hello World. This is interpolating a string ", - strs[i & 0x00000007]); - auto stop = bts::Timer::now(); - LOG(Testing, Info, - "Logging: ns/msg for log with large string interpolation: {} tt: {} ", - bts::ns_diff(stop, start) / sz, bts::ns_diff(stop, start)); - } - - SECTION("log_skipping") { - auto start = bts::Timer::now(); - for (int i = 0; i < sz; i++) - LOG(Gen, Diag, "Hello World. I am {} years old!", i); - auto stop = bts::Timer::now(); - LOG(Testing, Info, "Logging: ns/msg for log skipping: {} tt: {} ", - bts::ns_diff(stop, start) / sz, bts::ns_diff(stop, start)); - } - auto cfg2 = config::get(); - cfg2.mutable_console()->set_default_level("Fatal"); - log::configure_logging(cfg2); -} - -} // namespace bts diff --git a/src/lib_spark/spark/md/Diag/ShmDumper.cpp b/src/lib_spark/spark/md/Diag/ShmDumper.cpp index dec05313b..d8471f2db 100644 --- a/src/lib_spark/spark/md/Diag/ShmDumper.cpp +++ b/src/lib_spark/spark/md/Diag/ShmDumper.cpp @@ -1,7 +1,7 @@ #ifndef NO_CPP0X #include "ShmDumper.h" -#include "spark/logging/logging.h" +#include "logging/logging.h" #include "spark/md/Shm/MDStructure.h" #include "spark/utils/SharedList.h" #include "system/json/json_dumper.h" diff --git a/src/lib_spark/spark/md/GeneralMarketDataListener.cpp b/src/lib_spark/spark/md/GeneralMarketDataListener.cpp index f34a52a9e..66bc22da8 100644 --- a/src/lib_spark/spark/md/GeneralMarketDataListener.cpp +++ b/src/lib_spark/spark/md/GeneralMarketDataListener.cpp @@ -17,9 +17,9 @@ #include "domain/spot_security.h" #include "domain/spread_security.h" #include "domain/trade_record.h" +#include "logging/logging.h" #include "spark/domain/DomainSecurityUtils.h" #include "spark/domain_model/Security.pb.h" -#include "spark/logging/logging.h" #include "spark/md/IntPrice.h" #include "spark/md/MDProducer.h" #include "spark/md/MDProducerHandle.h" diff --git a/src/lib_spark/spark/md/MDClient.cpp b/src/lib_spark/spark/md/MDClient.cpp index 403ac23e4..e1b146701 100644 --- a/src/lib_spark/spark/md/MDClient.cpp +++ b/src/lib_spark/spark/md/MDClient.cpp @@ -2,9 +2,10 @@ #include "MBOProcessor.h" #include "SecurityCache.h" #include "SecurityOracle.h" -#include "spark/logging/logging.h" +#include "logging/logging.h" #include "spark/md/SymbolLoader.h" #include "spark/utils/TimeStamp.h" + #include #include diff --git a/src/lib_spark/spark/md/MDConsumer.cpp b/src/lib_spark/spark/md/MDConsumer.cpp index f1f385476..7076f067a 100644 --- a/src/lib_spark/spark/md/MDConsumer.cpp +++ b/src/lib_spark/spark/md/MDConsumer.cpp @@ -3,10 +3,10 @@ #include "MBOProcessor.h" #include "MemorySegmentUtils.h" #include "SecurityCache.h" +#include "logging/logging.h" #include "spark/config/config.h" #include "spark/config/protos/market_data.pb.h" #include "spark/domain_model/Security.pb.h" -#include "spark/logging/logging.h" #include "spark/md/ShmSegmentName.h" #include "spark/md/SymbolLoader.h" #include "spark/utils/SharedList.h" diff --git a/src/lib_spark/spark/md/MDProducer.cpp b/src/lib_spark/spark/md/MDProducer.cpp index 014d5f166..e003c5dc7 100644 --- a/src/lib_spark/spark/md/MDProducer.cpp +++ b/src/lib_spark/spark/md/MDProducer.cpp @@ -3,13 +3,14 @@ #include "MemorySegmentUtils.h" #include "SecurityIDRecorder.h" #include "Shm/MDStructure.h" +#include "logging/logging.h" #include "spark/domain_model/Security.pb.h" -#include "spark/logging/logging.h" #include "spark/md/Diag/ShmDumper.h" #include "spark/md/ShmSegmentName.h" #include "spark/os/os.h" #include "spark/utils/SharedList.h" #include "spark/utils/WaitFreeQueue.h" + #include using namespace std; diff --git a/src/lib_spark/spark/md/MDProducerHandle.cpp b/src/lib_spark/spark/md/MDProducerHandle.cpp index 39623fffa..33f17d0f4 100644 --- a/src/lib_spark/spark/md/MDProducerHandle.cpp +++ b/src/lib_spark/spark/md/MDProducerHandle.cpp @@ -1,4 +1,4 @@ -#include "spark/logging/logging.h" +#include "logging/logging.h" #ifndef NO_CPP0X #include "MDProducerHandle.h" #include "common.h" diff --git a/src/lib_spark/spark/md/SecurityCache.cpp b/src/lib_spark/spark/md/SecurityCache.cpp index 56f757e85..d68b4c437 100644 --- a/src/lib_spark/spark/md/SecurityCache.cpp +++ b/src/lib_spark/spark/md/SecurityCache.cpp @@ -1,7 +1,7 @@ #include "SecurityCache.h" #include "SecurityDB.h" +#include "logging/logging.h" #include "spark/domain_model/Security.h" -#include "spark/logging/logging.h" #include "spark/utils/Dispatcher.h" #include "spark/utils/LockBox.h" diff --git a/src/lib_spark/spark/md/SecurityDB.cpp b/src/lib_spark/spark/md/SecurityDB.cpp index d95f569da..e57e047a7 100644 --- a/src/lib_spark/spark/md/SecurityDB.cpp +++ b/src/lib_spark/spark/md/SecurityDB.cpp @@ -1,5 +1,5 @@ #include "SecurityDB.h" -#include "spark/logging/logging.h" +#include "logging/logging.h" #ifndef _WIN32 #include diff --git a/src/lib_spark/spark/md/SecurityIDRecorder.cpp b/src/lib_spark/spark/md/SecurityIDRecorder.cpp index e5e5dc289..f950ae829 100644 --- a/src/lib_spark/spark/md/SecurityIDRecorder.cpp +++ b/src/lib_spark/spark/md/SecurityIDRecorder.cpp @@ -2,9 +2,10 @@ #ifndef _WIN32 #include "SecurityIDRecorder.h" +#include "logging/logging.h" #include "spark/config/config.h" -#include "spark/logging/logging.h" #include "spark/utils/Sqlite_utils.h" + #include #include diff --git a/src/lib_spark/spark/md/SecurityIndex.h b/src/lib_spark/spark/md/SecurityIndex.h index 55c1a712e..8ec0f96da 100644 --- a/src/lib_spark/spark/md/SecurityIndex.h +++ b/src/lib_spark/spark/md/SecurityIndex.h @@ -2,9 +2,10 @@ #include "MDProducerHandle.h" #include "common.h" -#include "spark/logging/logging.h" +#include "logging/logging.h" #include "spark/md/Shm/MDStructure.h" #include "spark/utils/bts_no_copy.h" + #include #include #include diff --git a/src/lib_spark/spark/md/SecurityOracle.cpp b/src/lib_spark/spark/md/SecurityOracle.cpp index 475a2e396..875ff5d45 100644 --- a/src/lib_spark/spark/md/SecurityOracle.cpp +++ b/src/lib_spark/spark/md/SecurityOracle.cpp @@ -1,6 +1,6 @@ #include "SecurityOracle.h" #include "MDClient.h" -#include "spark/logging/logging.h" +#include "logging/logging.h" #include "spark/utils/PBUtils.h" namespace bts { diff --git a/src/lib_spark/spark/md/cme/MDP3Utils.cpp b/src/lib_spark/spark/md/cme/MDP3Utils.cpp index cb87b5329..6b285801a 100644 --- a/src/lib_spark/spark/md/cme/MDP3Utils.cpp +++ b/src/lib_spark/spark/md/cme/MDP3Utils.cpp @@ -1,10 +1,10 @@ #ifndef _WIN32 #include "MDP3Utils.h" #include "domain/security_criteria.h" +#include "logging/logging.h" #include "spark/config/config.h" #include "spark/config/protos/deployment_type.pb.h" #include "spark/config/protos/market_data.pb.h" -#include "spark/logging/logging.h" #include "spark/md/SymbolLoader.h" #include "spark/utils/bts_chrono.h" #include "spark/utils/datetime.h" @@ -34,7 +34,7 @@ string data_path() { } const string config_path() { return data_path() + "config.xml"; } const string template_path() { return data_path() + "templates.xml"; } -const std::string log_path() { return log::log_path().string() + "/onix"; } +const std::string log_path() { return logging::log_path().string() + "/onix"; } bool check_file_exists_with_instructions( const string &filename, const string &url, bool log) { diff --git a/src/lib_spark/spark/md/ice/ICEUtils.cpp b/src/lib_spark/spark/md/ice/ICEUtils.cpp index 1758b7e86..8d142af84 100644 --- a/src/lib_spark/spark/md/ice/ICEUtils.cpp +++ b/src/lib_spark/spark/md/ice/ICEUtils.cpp @@ -2,8 +2,8 @@ #include "ICEUtils.h" #include "domain/security_criteria.h" +#include "logging/logging.h" #include "spark/config/config.h" -#include "spark/logging/logging.h" #include "spark/md/SymbolLoader.h" #include "spark/utils/bts_chrono.h" #include "spark/utils/datetime.h" @@ -70,7 +70,7 @@ const string ice_config_path() { } const std::string ice_log_path() { - return log::log_path().string() + "/onix_ice"; + return logging::log_path().string() + "/onix_ice"; } bool ice_check_file_exists_with_instructions( diff --git a/src/lib_spark/spark/md/relay/QueryServer.cpp b/src/lib_spark/spark/md/relay/QueryServer.cpp index 024aa68f8..c6b15443c 100644 --- a/src/lib_spark/spark/md/relay/QueryServer.cpp +++ b/src/lib_spark/spark/md/relay/QueryServer.cpp @@ -14,7 +14,7 @@ #include "../MDClient.h" #include "../MDConsumer.h" -#include "spark/logging/logging.h" +#include "logging/logging.h" #include "spark/api/apicore.pb.h" #include "spark/api/public/ServiceContext.h" diff --git a/src/lib_spark/spark/md/relay/RelayClient.cpp b/src/lib_spark/spark/md/relay/RelayClient.cpp index fc850a477..5b59b713b 100644 --- a/src/lib_spark/spark/md/relay/RelayClient.cpp +++ b/src/lib_spark/spark/md/relay/RelayClient.cpp @@ -3,8 +3,8 @@ #include "RelayRecorder.h" #include "../MDProducer.h" +#include "logging/logging.h" #include "spark/config/config.h" -#include "spark/logging/logging.h" #include "spark/md/SymbolLoader.h" #include "spark/utils/AuthToken.h" #include "spark/utils/TimeStamp.h" diff --git a/src/lib_spark/spark/md/relay/RelayRecorder.cpp b/src/lib_spark/spark/md/relay/RelayRecorder.cpp index 5529fb5ad..cccaf8236 100644 --- a/src/lib_spark/spark/md/relay/RelayRecorder.cpp +++ b/src/lib_spark/spark/md/relay/RelayRecorder.cpp @@ -1,8 +1,8 @@ #ifndef NO_CPP0X #include "RelayRecorder.h" +#include "logging/logging.h" #include "spark/config/config.h" -#include "spark/logging/logging.h" #include "spark/utils/HTTPStream.h" #include "spark/utils/bts_chrono.h" #include "spark/utils/datetime.h" diff --git a/src/lib_spark/spark/md/vendor/OnixsUtils.cpp b/src/lib_spark/spark/md/vendor/OnixsUtils.cpp index b3553cf3f..ef051feb5 100644 --- a/src/lib_spark/spark/md/vendor/OnixsUtils.cpp +++ b/src/lib_spark/spark/md/vendor/OnixsUtils.cpp @@ -1,8 +1,8 @@ #ifndef _WIN32 #include "OnixsUtils.h" +#include "logging/logging.h" #include "spark/config/config.h" #include "spark/config/protos/market_data.pb.h" -#include "spark/logging/logging.h" #include "system/protobufs/system_config.pb.h" #include diff --git a/src/lib_spark/spark/orderman/OrderRouter.cpp b/src/lib_spark/spark/orderman/OrderRouter.cpp index 76eae91e8..5f2503d9d 100644 --- a/src/lib_spark/spark/orderman/OrderRouter.cpp +++ b/src/lib_spark/spark/orderman/OrderRouter.cpp @@ -1,10 +1,10 @@ #include "OrderRouter.h" +#include "logging/logging.h" #include "spark/api/service_helpers/AdminServiceUtils.h" #include "spark/api/services/AdminService.server.pb.h" #include "spark/config/config.h" #include "spark/config/protos/jetfix.pb.h" #include "spark/domain_model/Security.pb.h" -#include "spark/logging/logging.h" #include "spark/utils/bts_assert.h" namespace bts { diff --git a/src/lib_spark/spark/orderman/OrderServiceServer.cpp b/src/lib_spark/spark/orderman/OrderServiceServer.cpp index 69756e981..12b376dab 100644 --- a/src/lib_spark/spark/orderman/OrderServiceServer.cpp +++ b/src/lib_spark/spark/orderman/OrderServiceServer.cpp @@ -1,4 +1,5 @@ #include "OrderServiceServer.h" +#include "logging/logging.h" #include "spark/api/public/ServiceContext.h" #include "spark/api/public/StatefulPublisher.h" #include "spark/api/services/AdminService.client.pb.h" @@ -10,7 +11,6 @@ #include "spark/config/protos/orderman_cfg.pb.h" #include "spark/domain_model/Security.pb.h" #include "spark/domain_model/common.h" -#include "spark/logging/logging.h" #include "spark/md/MDClient.h" #include "spark/md/MDConsumer.h" #include "spark/mercury/actors/Timer.h" diff --git a/src/lib_spark/spark/orderman/OrderServices.cpp b/src/lib_spark/spark/orderman/OrderServices.cpp index a462fd9f6..815056ea8 100644 --- a/src/lib_spark/spark/orderman/OrderServices.cpp +++ b/src/lib_spark/spark/orderman/OrderServices.cpp @@ -1,5 +1,5 @@ #include "OrderServices.h" -#include "spark/logging/logging.h" +#include "logging/logging.h" #include "spark/orderman/ChildOrder.h" namespace bts::orderman { diff --git a/src/lib_spark/spark/orderman/OrderServices.h b/src/lib_spark/spark/orderman/OrderServices.h index 1c30d36f2..97215034d 100644 --- a/src/lib_spark/spark/orderman/OrderServices.h +++ b/src/lib_spark/spark/orderman/OrderServices.h @@ -1,8 +1,8 @@ #pragma once +#include "logging/logging.h" #include "spark/api/services/OrderService.pb.h" #include "spark/jetfix/common/OutFIX.h" -#include "spark/logging/logging.h" #include "spark/mercury/actors/ContentSubscription.h" #include "spark/orderman/Governor.h" #include "spark/orderman/actors/order_manager/OrderManager.h" diff --git a/src/lib_spark/spark/orderman/actors/FillStore.cpp b/src/lib_spark/spark/orderman/actors/FillStore.cpp index b89e7f23c..56be7f75b 100644 --- a/src/lib_spark/spark/orderman/actors/FillStore.cpp +++ b/src/lib_spark/spark/orderman/actors/FillStore.cpp @@ -1,9 +1,9 @@ #include "FillStore.h" +#include "logging/logging.h" #include "spark/api/services/OrderService.pb.h" #include "spark/config/config.h" #include "spark/config/protos/toggles.pb.h" #include "spark/domain_model/Security.h" -#include "spark/logging/logging.h" #include "spark/mercury/events/Update.h" #include "spark/orderman/actors/SODPosition.h" #include "spark/orderman/events/ManuallyBustFillsEvent.h" diff --git a/src/lib_spark/spark/orderman/actors/MDSource.h b/src/lib_spark/spark/orderman/actors/MDSource.h index b1ca77d33..5e0735557 100644 --- a/src/lib_spark/spark/orderman/actors/MDSource.h +++ b/src/lib_spark/spark/orderman/actors/MDSource.h @@ -1,8 +1,8 @@ #pragma once #include "domain/protobufs/trading_status.pb.h" +#include "logging/logging.h" #include "spark/domain_model/Security.h" -#include "spark/logging/logging.h" #include "spark/md/IntPrice.h" #include "spark/md/MDConsumer.h" #include "spark/md/MDConsumerHandle.h" diff --git a/src/lib_spark/spark/orderman/actors/MDSupplementarySource.cpp b/src/lib_spark/spark/orderman/actors/MDSupplementarySource.cpp index 5c6ad9ace..7eea7d7b0 100644 --- a/src/lib_spark/spark/orderman/actors/MDSupplementarySource.cpp +++ b/src/lib_spark/spark/orderman/actors/MDSupplementarySource.cpp @@ -1,5 +1,5 @@ #include "MDSupplementarySource.h" -#include "spark/logging/logging.h" +#include "logging/logging.h" #include "spark/md/MDConsumer.h" #include "spark/md/MDConsumerHandle.h" #include "spark/orderman/events/SettlementRequestEvent.h" diff --git a/src/lib_spark/spark/orderman/actors/OrderStore.cpp b/src/lib_spark/spark/orderman/actors/OrderStore.cpp index 42a0d14b0..7b3fc5b3c 100644 --- a/src/lib_spark/spark/orderman/actors/OrderStore.cpp +++ b/src/lib_spark/spark/orderman/actors/OrderStore.cpp @@ -1,10 +1,10 @@ #include "OrderStore.h" +#include "logging/logging.h" #include "spark/api/services/OrderService.pb.h" #include "spark/config/config.h" #include "spark/config/protos/orders_fills_cleanup.pb.h" #include "spark/config/protos/toggles.pb.h" -#include "spark/logging/logging.h" #include "spark/orderman/actors/SODPosition.h" #include "spark/orderman/events/OrderDefinitionUpdateEvent.h" #include "spark/orderman/events/OrderStateUpdateEvent.h" diff --git a/src/lib_spark/spark/orderman/actors/SODPosition.cpp b/src/lib_spark/spark/orderman/actors/SODPosition.cpp index 728c696d0..d06ab317a 100644 --- a/src/lib_spark/spark/orderman/actors/SODPosition.cpp +++ b/src/lib_spark/spark/orderman/actors/SODPosition.cpp @@ -1,9 +1,9 @@ +#include "logging/logging.h" #include "spark/orderman/actors/SODPosition.h" #include "spark/api/service_helpers/AdminServiceUtils.h" #include "spark/config/config.h" #include "spark/config/protos/orders_fills_cleanup.pb.h" #include "spark/config/protos/toggles.pb.h" -#include "spark/logging/logging.h" #include "spark/utils/PBUtils.h" #include "spark/utils/bts_assert.h" #include diff --git a/src/lib_spark/spark/orderman/actors/ServiceBridge.cpp b/src/lib_spark/spark/orderman/actors/ServiceBridge.cpp index 5b1726e11..f82b8a85f 100644 --- a/src/lib_spark/spark/orderman/actors/ServiceBridge.cpp +++ b/src/lib_spark/spark/orderman/actors/ServiceBridge.cpp @@ -1,9 +1,9 @@ #include "ServiceBridge.h" +#include "logging/logging.h" #include "spark/api/public/ServiceContext.h" #include "spark/api/service_helpers/PositionUtilities.h" #include "spark/api/services/OrderService.pb.h" #include "spark/api/services/PositionService.pb.h" -#include "spark/logging/logging.h" #include "spark/mercury/broker/BrokerProxy.h" #include "spark/mercury/events/Stream.h" #include "spark/orderman/OrderRouter.h" diff --git a/src/lib_spark/spark/orderman/actors/order_manager/OrderManager.cpp b/src/lib_spark/spark/orderman/actors/order_manager/OrderManager.cpp index 0b89f5ad3..6fbff2a66 100644 --- a/src/lib_spark/spark/orderman/actors/order_manager/OrderManager.cpp +++ b/src/lib_spark/spark/orderman/actors/order_manager/OrderManager.cpp @@ -1,7 +1,7 @@ #include "OrderManager.h" +#include "logging/logging.h" #include "spark/jetfix/common/OutFIX.h" -#include "spark/logging/logging.h" #include "spark/mercury/events/TimerEvent.h" #include "spark/orderman/OrderServices.h" #include "spark/orderman/actors/order_manager/OrderServicesData.h" diff --git a/src/lib_spark/spark/orderman/actors/order_manager/OrderServicesData.h b/src/lib_spark/spark/orderman/actors/order_manager/OrderServicesData.h index 4c9952449..4b82611bf 100644 --- a/src/lib_spark/spark/orderman/actors/order_manager/OrderServicesData.h +++ b/src/lib_spark/spark/orderman/actors/order_manager/OrderServicesData.h @@ -1,5 +1,5 @@ #pragma once -#include "spark/logging/logging.h" +#include "logging/logging.h" #include "spark/md/SecurityOracle.h" #include "spark/mercury/actors/ContentSubscription.h" #include "spark/mercury/events/Stream.h" diff --git a/src/lib_spark/spark/orderman/actors/order_manager/SessionServices.h b/src/lib_spark/spark/orderman/actors/order_manager/SessionServices.h index 5eadfe708..ec8cf8630 100644 --- a/src/lib_spark/spark/orderman/actors/order_manager/SessionServices.h +++ b/src/lib_spark/spark/orderman/actors/order_manager/SessionServices.h @@ -1,8 +1,8 @@ #pragma once +#include "logging/logging.h" #include "spark/api/services/OrderService.pb.h" #include "spark/jetfix/common/OutFIX.h" -#include "spark/logging/logging.h" #include "spark/orderman/Governor.h" #include "spark/orderman/actors/order_manager/OrderManager.h" #include "spark/orderman/actors/order_manager/OrderServicesData.h" diff --git a/src/lib_spark/spark/orderman/calculations/TheoCalculator.cpp b/src/lib_spark/spark/orderman/calculations/TheoCalculator.cpp index beb4f0c64..78e2f0263 100644 --- a/src/lib_spark/spark/orderman/calculations/TheoCalculator.cpp +++ b/src/lib_spark/spark/orderman/calculations/TheoCalculator.cpp @@ -1,8 +1,9 @@ #include "TheoCalculator.h" +#include "logging/logging.h" #include "spark/api/services/OrderService.pb.h" -#include "spark/logging/logging.h" #include "spark/os/os.h" #include "spark/utils/bts_assert.h" + #include #include #include @@ -240,4 +241,4 @@ void TheoCalculator::set_data(const PrecomputedTheos &theos) { me->total_theo_data.set_data(theos); } -} // namespace bts::orderman::analytics \ No newline at end of file +} // namespace bts::orderman::analytics diff --git a/src/lib_spark/spark/orderman/ccapi/CCAPIDeribitOrderMux.cpp b/src/lib_spark/spark/orderman/ccapi/CCAPIDeribitOrderMux.cpp index d9a1a14bd..85b1da49b 100644 --- a/src/lib_spark/spark/orderman/ccapi/CCAPIDeribitOrderMux.cpp +++ b/src/lib_spark/spark/orderman/ccapi/CCAPIDeribitOrderMux.cpp @@ -2,10 +2,10 @@ #include "CCAPIOrderState.h" #include "CCAPISingleOrderManager.h" #include "ccapi_cpp/ccapi_session.h" +#include "logging/logging.h" #include "spark/api/services/OrderService.pb.h" #include "spark/domain_model/Security.pb.h" #include "spark/domain_model/SecurityKey.h" -#include "spark/logging/logging.h" #include "spark/md/SecurityOracle.h" #include "spark/orderman/CancelOrderMsg.h" #include "spark/orderman/CancelReplaceOrderMsg.h" @@ -953,4 +953,4 @@ void CCAPIDeribitOrderMux::_send_buffered_orders(uint32_t sec_id) { "n_buffered_orders: {}", me->buffered_creates.size()); } -} // 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 97b89eca9..9f8b4364c 100644 --- a/src/lib_spark/spark/orderman/ccapi/CCAPIOrderCallbackMsgs.h +++ b/src/lib_spark/spark/orderman/ccapi/CCAPIOrderCallbackMsgs.h @@ -1,8 +1,8 @@ #pragma once +#include "logging/logging.h" #include "spark/api/services/OrderService.pb.h" #include "spark/domain_model/Security.pb.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" diff --git a/src/lib_spark/spark/orderman/ccapi/CCAPISingleOrderManager.cpp b/src/lib_spark/spark/orderman/ccapi/CCAPISingleOrderManager.cpp index d4b01e5f6..d68e31802 100644 --- a/src/lib_spark/spark/orderman/ccapi/CCAPISingleOrderManager.cpp +++ b/src/lib_spark/spark/orderman/ccapi/CCAPISingleOrderManager.cpp @@ -1,13 +1,14 @@ #include "CCAPISingleOrderManager.h" #include "CCAPIOrderCallbackMsgs.h" #include "CCAPIOrderState.h" +#include "logging/logging.h" #include "spark/api/services/OrderService.pb.h" #include "spark/domain_model/Security.h" #include "spark/domain_model/Security.pb.h" -#include "spark/logging/logging.h" #include "spark/orderman/orderman_utils/orderman_common.h" #include "spark/os/os.h" #include "spark/utils/bts_assert.h" + #include #include #include diff --git a/src/lib_spark/spark/orderman/ccapi/ICCAPIOrderMux.h b/src/lib_spark/spark/orderman/ccapi/ICCAPIOrderMux.h index dac050225..8c1041ffa 100644 --- a/src/lib_spark/spark/orderman/ccapi/ICCAPIOrderMux.h +++ b/src/lib_spark/spark/orderman/ccapi/ICCAPIOrderMux.h @@ -1,9 +1,9 @@ #pragma once //#include "CCAPIOrderCallbackMsgs.h" //#include "CCAPIOrderState.h" +//#include "logging/logging.h" //#include "spark/api/services/OrderService.pb.h" //#include "spark/domain_model/Security.pb.h" -//#include "spark/logging/logging.h" //#include "spark/md/common.h" // #include "spark/orderman/CancelOrderMsg.h" // #include "spark/orderman/CancelReplaceOrderMsg.h" diff --git a/src/lib_spark/spark/orderman/events/GatewayStatusChangeEvent.h b/src/lib_spark/spark/orderman/events/GatewayStatusChangeEvent.h index e9e21b675..8d973ad43 100644 --- a/src/lib_spark/spark/orderman/events/GatewayStatusChangeEvent.h +++ b/src/lib_spark/spark/orderman/events/GatewayStatusChangeEvent.h @@ -1,8 +1,9 @@ #pragma once -#include "spark/logging/logging.h" +#include "logging/logging.h" #include "spark/mercury/synopsis/CacheLast.h" #include "spark/orderman/orderman_utils/orderman_common.h" + #include namespace bts { diff --git a/src/lib_spark/spark/orderman/events/OrderStateUpdateEvent.h b/src/lib_spark/spark/orderman/events/OrderStateUpdateEvent.h index 7aa6d535c..b08fc7e7b 100644 --- a/src/lib_spark/spark/orderman/events/OrderStateUpdateEvent.h +++ b/src/lib_spark/spark/orderman/events/OrderStateUpdateEvent.h @@ -1,7 +1,7 @@ #pragma once +#include "logging/logging.h" #include "spark/api/services/OrderService.pb.h" -#include "spark/logging/logging.h" #include "spark/mercury/events/Event.h" #include "spark/orderman/order_factory/OrderFactory.h" #include "spark/orderman/orderman_utils/orderman_common.h" diff --git a/src/lib_spark/spark/orderman/events/TheoEvent.h b/src/lib_spark/spark/orderman/events/TheoEvent.h index 66d968f83..725004d91 100644 --- a/src/lib_spark/spark/orderman/events/TheoEvent.h +++ b/src/lib_spark/spark/orderman/events/TheoEvent.h @@ -1,7 +1,7 @@ #pragma once +#include "logging/logging.h" #include "spark/api/services/OrderService.pb.h" -#include "spark/logging/logging.h" #include "spark/mercury/events/Event.h" #include "spark/orderman/calculations/ITheoCalculator.h" diff --git a/src/lib_spark/spark/orderman/gateways/CCAPIExecutionGateway.cpp b/src/lib_spark/spark/orderman/gateways/CCAPIExecutionGateway.cpp index a7500a15e..0d6abffb6 100644 --- a/src/lib_spark/spark/orderman/gateways/CCAPIExecutionGateway.cpp +++ b/src/lib_spark/spark/orderman/gateways/CCAPIExecutionGateway.cpp @@ -1,4 +1,5 @@ #include "CCAPIExecutionGateway.h" +#include "logging/logging.h" #include "spark/api/service_helpers/AdminServiceUtils.h" #include "spark/api/services/AdminService.pb.h" #include "spark/api/services/OrderService.pb.h" @@ -8,7 +9,6 @@ #include "spark/domain_model/Security.pb.h" #include "spark/domain_model/SecurityKey.h" #include "spark/domain_model/common.h" -#include "spark/logging/logging.h" #include "spark/md/SecurityOracle.h" #include "spark/orderman/CancelOrderMsg.h" #include "spark/orderman/CancelReplaceOrderMsg.h" diff --git a/src/lib_spark/spark/orderman/gateways/FakeExecutionGateway.cpp b/src/lib_spark/spark/orderman/gateways/FakeExecutionGateway.cpp index 4dabaad8b..7d5cd8293 100644 --- a/src/lib_spark/spark/orderman/gateways/FakeExecutionGateway.cpp +++ b/src/lib_spark/spark/orderman/gateways/FakeExecutionGateway.cpp @@ -1,9 +1,9 @@ #include "FakeExecutionGateway.h" +#include "logging/logging.h" #include "spark/api/services/AdminService.pb.h" #include "spark/api/services/OrderService.pb.h" #include "spark/domain_model/Security.pb.h" #include "spark/domain_model/common.h" -#include "spark/logging/logging.h" #include "spark/orderman/CancelOrderMsg.h" #include "spark/orderman/CancelReplaceOrderMsg.h" #include "spark/orderman/CreateOrderMsg.h" diff --git a/src/lib_spark/spark/orderman/gateways/GLBXExecutionGateway.cpp b/src/lib_spark/spark/orderman/gateways/GLBXExecutionGateway.cpp index 85e065f18..bf5f62281 100644 --- a/src/lib_spark/spark/orderman/gateways/GLBXExecutionGateway.cpp +++ b/src/lib_spark/spark/orderman/gateways/GLBXExecutionGateway.cpp @@ -1,8 +1,8 @@ #include "GLBXExecutionGateway.h" +#include "logging/logging.h" #include "spark/jetfix/codec/MessageDefinitions.h" #include "spark/jetfix/common/OutFIX.h" #include "spark/jetfix/gateway/JetFIXGateway.h" -#include "spark/logging/logging.h" #include "spark/md/SecurityOracle.h" #include "spark/orderman/events/CancelRejectEvent.h" #include "spark/orderman/events/GatewayStatusChangeEvent.h" diff --git a/src/lib_spark/spark/orderman/gateways/GLBXiLink3ExecutionGateway.cpp b/src/lib_spark/spark/orderman/gateways/GLBXiLink3ExecutionGateway.cpp index 60742264f..700ba149a 100644 --- a/src/lib_spark/spark/orderman/gateways/GLBXiLink3ExecutionGateway.cpp +++ b/src/lib_spark/spark/orderman/gateways/GLBXiLink3ExecutionGateway.cpp @@ -1,10 +1,10 @@ #include "GLBXiLink3ExecutionGateway.h" +#include "logging/logging.h" #include "spark/config/config.h" #include "spark/config/protos/orderman_cfg.pb.h" #include "spark/domain_model/Security.h" #include "spark/jetfix/common/OutFIX.h" #include "spark/jetfix/store/session_name.h" -#include "spark/logging/logging.h" #include "spark/orderman/events/NewSecuritiesEvent.h" #include "spark/orderman/gateways/GLBXExecutionGateway.h" #include "spark/orderman/ilink3/IL3GW.h" diff --git a/src/lib_spark/spark/orderman/gateways/ICEExecutionGateway.cpp b/src/lib_spark/spark/orderman/gateways/ICEExecutionGateway.cpp index 7f1e7995a..21a419b7b 100644 --- a/src/lib_spark/spark/orderman/gateways/ICEExecutionGateway.cpp +++ b/src/lib_spark/spark/orderman/gateways/ICEExecutionGateway.cpp @@ -1,10 +1,10 @@ #include "ICEExecutionGateway.h" +#include "logging/logging.h" #include "spark/api/services/AdminService.pb.h" #include "spark/jetfix/codec/MessageDefinitions.h" #include "spark/jetfix/codec/i32_toa.h" #include "spark/jetfix/common/OutFIX.h" #include "spark/jetfix/gateway/JetFIXGateway.h" -#include "spark/logging/logging.h" #include "spark/orderman/events/CancelRejectEvent.h" #include "spark/orderman/events/GatewayStatusChangeEvent.h" #include "spark/orderman/events/NewAdminDataEvent.h" diff --git a/src/lib_spark/spark/orderman/gateways/sim/SimExecutionGateway.cpp b/src/lib_spark/spark/orderman/gateways/sim/SimExecutionGateway.cpp index 69cc4dd71..53660cc2d 100644 --- a/src/lib_spark/spark/orderman/gateways/sim/SimExecutionGateway.cpp +++ b/src/lib_spark/spark/orderman/gateways/sim/SimExecutionGateway.cpp @@ -1,11 +1,11 @@ #include "SimExecutionGateway.h" #include "domain/protobufs/aggressor_side.pb.h" +#include "logging/logging.h" #include "spark/api/services/OrderService.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" -#include "spark/logging/logging.h" #include "spark/md/GeneralSecurityIndex.h" #include "spark/md/IntPrice.h" #include "spark/md/PriceSize.h" diff --git a/src/lib_spark/spark/orderman/gateways/sim/SimExecutionGatewayFactory.cpp b/src/lib_spark/spark/orderman/gateways/sim/SimExecutionGatewayFactory.cpp index be6974723..5f60982ea 100644 --- a/src/lib_spark/spark/orderman/gateways/sim/SimExecutionGatewayFactory.cpp +++ b/src/lib_spark/spark/orderman/gateways/sim/SimExecutionGatewayFactory.cpp @@ -1,7 +1,7 @@ #include "SimExecutionGatewayFactory.h" #include "SimExecutionGateway.h" +#include "logging/logging.h" #include "spark/domain_model/Security.pb.h" -#include "spark/logging/logging.h" #include "spark/md/common.h" #include "spark/utils/LockBox.h" #include "spark/utils/bts_assert.h" @@ -72,4 +72,4 @@ bool SimExecutionGatewayFactory::is_sim_execution_on(api::Venue venue) { return false; } -} // namespace bts::orderman \ No newline at end of file +} // namespace bts::orderman diff --git a/src/lib_spark/spark/orderman/gateways/sim/SimExecutionGatewayUniqueWrapper.cpp b/src/lib_spark/spark/orderman/gateways/sim/SimExecutionGatewayUniqueWrapper.cpp index 4ec310e5e..71a11e7b8 100644 --- a/src/lib_spark/spark/orderman/gateways/sim/SimExecutionGatewayUniqueWrapper.cpp +++ b/src/lib_spark/spark/orderman/gateways/sim/SimExecutionGatewayUniqueWrapper.cpp @@ -1,8 +1,9 @@ #include "SimExecutionGatewayUniqueWrapper.h" #include "SimExecutionGateway.h" #include "SimExecutionGatewayFactory.h" +#include "logging/logging.h" #include "spark/domain_model/Security.pb.h" -#include "spark/logging/logging.h" + #include #include #include @@ -93,4 +94,4 @@ SimExecutionGatewayUniqueWrapper::on_exchange_open_orders() { bts::api::Venue_Name(me->venue)); return me->gateway->on_exchange_open_orders(); } -} // namespace bts::orderman \ No newline at end of file +} // namespace bts::orderman diff --git a/src/lib_spark/spark/orderman/ilink3/IL3GW.cpp b/src/lib_spark/spark/orderman/ilink3/IL3GW.cpp index 43b58a283..84f5c7c37 100644 --- a/src/lib_spark/spark/orderman/ilink3/IL3GW.cpp +++ b/src/lib_spark/spark/orderman/ilink3/IL3GW.cpp @@ -3,7 +3,7 @@ #include "IL3GeneratedFull.h" #include "IL3MessageFramer.h" #include "ILink3Utils.h" -#include "spark/logging/logging.h" +#include "logging/logging.h" #include "spark/orderman/ilink3/generated/PartyDetailsDefinitionRequest518.h" #include "spark/orderman/orderman_utils/fix_order_codec.h" #include "spark/utils/SecureLogon.h" diff --git a/src/lib_spark/spark/orderman/ilink3/SessionStore.cpp b/src/lib_spark/spark/orderman/ilink3/SessionStore.cpp index 21761e552..e4be6c86c 100644 --- a/src/lib_spark/spark/orderman/ilink3/SessionStore.cpp +++ b/src/lib_spark/spark/orderman/ilink3/SessionStore.cpp @@ -1,6 +1,6 @@ #include "SessionStore.h" +#include "logging/logging.h" #include "spark/jetfix/store/session_name.h" -#include "spark/logging/logging.h" #include "spark/orderman/ilink3/IL3GW.h" #include "spark/orderman/ilink3/IL3SecDB.h" #include "spark/orderman/orderman_utils/ExecutionReport.h" diff --git a/src/lib_spark/spark/orderman/limiter/Limiter.cpp b/src/lib_spark/spark/orderman/limiter/Limiter.cpp index 24f459eae..558a547c4 100644 --- a/src/lib_spark/spark/orderman/limiter/Limiter.cpp +++ b/src/lib_spark/spark/orderman/limiter/Limiter.cpp @@ -1,11 +1,11 @@ #include "Limiter.h" #include "LimitStore.h" +#include "logging/logging.h" #include "spark/api/services/AdminService.server.pb.h" #include "spark/api/services/PositionService.server.pb.h" #include "spark/config/config.h" #include "spark/config/protos/toggles.pb.h" #include "spark/domain_model/Security.pb.h" -#include "spark/logging/logging.h" #include "spark/utils/PBUtils.h" namespace bts { diff --git a/src/lib_spark/spark/orderman/order_factory/OrderFactory.cpp b/src/lib_spark/spark/orderman/order_factory/OrderFactory.cpp index bbf47f7a6..8535c8c1a 100644 --- a/src/lib_spark/spark/orderman/order_factory/OrderFactory.cpp +++ b/src/lib_spark/spark/orderman/order_factory/OrderFactory.cpp @@ -1,7 +1,7 @@ #include "OrderFactory.h" +#include "logging/logging.h" #include "spark/api/services/OrderService.pb.h" #include "spark/domain_model/Security.pb.h" -#include "spark/logging/logging.h" #include "spark/orderman/orderman_utils/ExecutionReport.h" #include "spark/orderman/orders/EMNativeOrder.h" #include "spark/orderman/orders/PreActivationOrderServices.h" diff --git a/src/lib_spark/spark/orderman/orderman_utils/ExecutionReport.cpp b/src/lib_spark/spark/orderman/orderman_utils/ExecutionReport.cpp index b2718b34c..a345de43b 100644 --- a/src/lib_spark/spark/orderman/orderman_utils/ExecutionReport.cpp +++ b/src/lib_spark/spark/orderman/orderman_utils/ExecutionReport.cpp @@ -1,8 +1,9 @@ #include "ExecutionReport.h" +#include "logging/logging.h" #include "spark/api/services/OrderService.pb.h" #include "spark/domain_model/Security.pb.h" -#include "spark/logging/logging.h" #include "spark/orderman/orderman_utils/orderman_common.h" + #include namespace bts { @@ -32,4 +33,4 @@ std::string ExecutionReport::to_string() const { } } // namespace orderman -} // namespace bts \ No newline at end of file +} // namespace bts diff --git a/src/lib_spark/spark/orderman/orders/DynamicOrder.cpp b/src/lib_spark/spark/orderman/orders/DynamicOrder.cpp index f80332339..72377b12f 100644 --- a/src/lib_spark/spark/orderman/orders/DynamicOrder.cpp +++ b/src/lib_spark/spark/orderman/orders/DynamicOrder.cpp @@ -1,5 +1,5 @@ #include "DynamicOrder.h" -#include "spark/logging/logging.h" +#include "logging/logging.h" #include "spark/orderman/OrderServices.h" namespace bts { diff --git a/src/lib_spark/spark/orderman/orders/EMNativeOrder.cpp b/src/lib_spark/spark/orderman/orders/EMNativeOrder.cpp index 9350319e8..6d2c6a97c 100644 --- a/src/lib_spark/spark/orderman/orders/EMNativeOrder.cpp +++ b/src/lib_spark/spark/orderman/orders/EMNativeOrder.cpp @@ -1,5 +1,6 @@ #include "EMNativeOrder.h" #include "domain/order_status.h" +#include "logging/logging.h" #include "spark/api/services/OrderService.pb.h" #include "spark/config/config.h" #include "spark/config/protos/orderman_cfg.pb.h" @@ -8,7 +9,6 @@ #include "spark/domain_model/common.h" #include "spark/jetfix/codec/FIXFragment.h" #include "spark/jetfix/codec/FieldDefinitions.h" -#include "spark/logging/logging.h" #include "spark/orderman/CancelOrderMsg.h" #include "spark/orderman/CancelReplaceOrderMsg.h" #include "spark/orderman/CreateOrderMsg.h" @@ -403,7 +403,7 @@ void EMNativeOrder::transition( } void EMNativeOrder::transition( - log::Level level, + logging::Level level, api::orderman::OrderStatus new_status, std::string const &msg) { auto const &from = OrderStatus_Name(me->state.status()); @@ -487,8 +487,8 @@ void EMNativeOrder::report_state() { } OrderOpResult EMNativeOrder::_on_activate( - log::Level reject_level, - log::Level transition_level, + logging::Level reject_level, + logging::Level transition_level, Price p, Quantity q, bts::orderman::OrderServices & diff --git a/src/lib_spark/spark/orderman/orders/EMNativeOrder.h b/src/lib_spark/spark/orderman/orders/EMNativeOrder.h index f521196cf..e8985f046 100644 --- a/src/lib_spark/spark/orderman/orders/EMNativeOrder.h +++ b/src/lib_spark/spark/orderman/orders/EMNativeOrder.h @@ -49,7 +49,7 @@ class EMNativeOrder : public NativeOrderBase { private: void transition( - log::Level, + logging::Level, api::orderman::OrderStatus new_state, std::string const &msg); void transition( @@ -59,8 +59,8 @@ class EMNativeOrder : public NativeOrderBase { Quantity working_position(); void report_state(); OrderOpResult _on_activate( - log::Level reject_level, - log::Level transition_level, + logging::Level reject_level, + logging::Level transition_level, Price p, Quantity q, bts::orderman::OrderServices &services); diff --git a/src/lib_spark/spark/orderman/orders/GLBXNativeOrder.cpp b/src/lib_spark/spark/orderman/orders/GLBXNativeOrder.cpp index 191cb1ffb..2f5b29267 100644 --- a/src/lib_spark/spark/orderman/orders/GLBXNativeOrder.cpp +++ b/src/lib_spark/spark/orderman/orders/GLBXNativeOrder.cpp @@ -1,4 +1,5 @@ #include "GLBXNativeOrder.h" +#include "logging/logging.h" #include "spark/api/services/OrderService.pb.h" #include "spark/config/config.h" #include "spark/config/protos/orderman_cfg.pb.h" @@ -8,7 +9,6 @@ #include "spark/domain_model/common.h" #include "spark/jetfix/codec/FIXFragment.h" #include "spark/jetfix/codec/FieldDefinitions.h" -#include "spark/logging/logging.h" #include "spark/orderman/OrderRouter.h" #include "spark/orderman/OrderServices.h" #include "spark/orderman/gateways/sim/SimExecutionGatewayFactory.h" @@ -358,8 +358,8 @@ void GLBXNativeOrder::warm_up_activate( } OrderOpResult GLBXNativeOrder::_on_activate( - log::Level reject_level, - log::Level transition_level, + logging::Level reject_level, + logging::Level transition_level, Price p, Quantity q, bts::orderman::OrderServices &order_services) { @@ -1211,7 +1211,7 @@ void GLBXNativeOrder::transition( } void GLBXNativeOrder::transition( - log::Level level, + logging::Level level, api::orderman::OrderStatus new_status, std::string const &msg) { auto const &from = OrderStatus_Name(me->state.status()); diff --git a/src/lib_spark/spark/orderman/orders/GLBXNativeOrder.h b/src/lib_spark/spark/orderman/orders/GLBXNativeOrder.h index 99f112a02..af8b56ab2 100644 --- a/src/lib_spark/spark/orderman/orders/GLBXNativeOrder.h +++ b/src/lib_spark/spark/orderman/orders/GLBXNativeOrder.h @@ -50,15 +50,15 @@ class GLBXNativeOrder : public NativeOrderBase { void on_gateway_status(const GatewayStatusChangeEvent &); void report_state(); OrderOpResult _on_activate( - log::Level reject_level, - log::Level transition_level, + logging::Level reject_level, + logging::Level transition_level, Price p, Quantity q, bts::orderman::OrderServices &services); void add_exchange_order_id_to_fix(); void transition( - log::Level, + logging::Level, api::orderman::OrderStatus new_state, std::string const &msg); void transition( diff --git a/src/lib_spark/spark/orderman/orders/ICENativeOrder.cpp b/src/lib_spark/spark/orderman/orders/ICENativeOrder.cpp index 179eb69ff..85b25a4b5 100644 --- a/src/lib_spark/spark/orderman/orders/ICENativeOrder.cpp +++ b/src/lib_spark/spark/orderman/orders/ICENativeOrder.cpp @@ -1,9 +1,9 @@ #include "ICENativeOrder.h" +#include "logging/logging.h" #include "spark/api/services/OrderService.pb.h" #include "spark/domain_model/Security.h" #include "spark/jetfix/codec/FIXFragment.h" #include "spark/jetfix/codec/FieldDefinitions.h" -#include "spark/logging/logging.h" #include "spark/md/IntPrice.h" #include "spark/orderman/OrderRouter.h" #include "spark/orderman/OrderServices.h" @@ -343,8 +343,8 @@ void ICENativeOrder::warm_up_activate( } OrderOpResult ICENativeOrder::_on_activate( - log::Level reject_level, - log::Level transition_level, + logging::Level reject_level, + logging::Level transition_level, Price p, Quantity q, bts::orderman::OrderServices &services) { @@ -1271,7 +1271,7 @@ void ICENativeOrder::transition( } void ICENativeOrder::transition( - log::Level level, + logging::Level level, api::orderman::OrderStatus new_status, std::string const &msg) { const auto &from = OrderStatus_Name(me->state.status()); @@ -1356,8 +1356,8 @@ bool ICENativeOrder::terminal_state(api::orderman::OrderStatus status) const { return false; } -api::orderman::NativeOrderState & -ICENativeOrder::get_native_state(api::orderman::OrderState &st) { +api::orderman::NativeOrderState &ICENativeOrder::get_native_state( + api::orderman::OrderState &st) { switch (st.custom_case()) { case OrderState::kMarket: return *st.mutable_market()->mutable_native_state(); diff --git a/src/lib_spark/spark/orderman/orders/ICENativeOrder.h b/src/lib_spark/spark/orderman/orders/ICENativeOrder.h index 5460f47c5..7484fc822 100644 --- a/src/lib_spark/spark/orderman/orders/ICENativeOrder.h +++ b/src/lib_spark/spark/orderman/orders/ICENativeOrder.h @@ -51,8 +51,8 @@ class ICENativeOrder : public NativeOrderBase { void on_gateway_status(const GatewayStatusChangeEvent &); void report_state(); OrderOpResult _on_activate( - log::Level reject_level, - log::Level transition_level, + logging::Level reject_level, + logging::Level transition_level, Price p, Quantity q, bts::orderman::OrderServices &services); @@ -60,11 +60,11 @@ class ICENativeOrder : public NativeOrderBase { void add_exchange_order_id_to_fix(); void transition( - log::Level, + logging::Level, api::orderman::OrderStatus new_state, const std::string &msg); - void - transition(api::orderman::OrderStatus new_state, const std::string &msg); + void transition( + api::orderman::OrderStatus new_state, const std::string &msg); void transition(api::orderman::OrderStatus new_state); void transition_to_error( api::orderman::NativeOrderState::SubError sub_error, @@ -77,8 +77,8 @@ class ICENativeOrder : public NativeOrderBase { api::orderman::NativeOrderState &, const NewExecutionReportEvent &) const; bool terminal_state(api::orderman::OrderStatus status) const; - api::orderman::NativeOrderState & - get_native_state(api::orderman::OrderState &); + api::orderman::NativeOrderState &get_native_state( + api::orderman::OrderState &); int64_t get_new_clordid(); int64_t get_clordid(uint64_t); diff --git a/src/lib_spark/spark/orderman/orders/TriggerOrder.cpp b/src/lib_spark/spark/orderman/orders/TriggerOrder.cpp index 408669aa8..9ea71d0b4 100644 --- a/src/lib_spark/spark/orderman/orders/TriggerOrder.cpp +++ b/src/lib_spark/spark/orderman/orders/TriggerOrder.cpp @@ -1,7 +1,7 @@ #include "TriggerOrder.h" +#include "logging/logging.h" #include "spark/api/services/OrderService.h" #include "spark/domain_model/Security.h" -#include "spark/logging/logging.h" #include "spark/orderman/OrderBuilder.h" #include "spark/orderman/events/BookUpdateEvent.h" #include "spark/orderman/orders/PreActivationOrderServices.h" diff --git a/src/lib_spark/spark/orderman/orders/algo/AlgoWrapperOrder.cpp b/src/lib_spark/spark/orderman/orders/algo/AlgoWrapperOrder.cpp index 5181fee36..8e22429d4 100644 --- a/src/lib_spark/spark/orderman/orders/algo/AlgoWrapperOrder.cpp +++ b/src/lib_spark/spark/orderman/orders/algo/AlgoWrapperOrder.cpp @@ -1,6 +1,6 @@ +#include "logging/logging.h" #include "spark/orderman/orders/algo/AlgoWrapperOrder.h" #include "spark/domain_model/common.h" -#include "spark/logging/logging.h" #include "spark/orderman/ChildOrder.h" #include "spark/orderman/OrderBuilder.h" #include "spark/orderman/OrderServices.h" @@ -10,6 +10,7 @@ #include "spark/orderman/orders/algo/ChildTemplate.h" #include "spark/orderman/orders/algo/IAlgoOrder.h" #include "spark/utils/bts_assert.h" + #include #include #include diff --git a/src/lib_spark/spark/orderman/orders/algo/algo_orders/DormanAlgo.cpp b/src/lib_spark/spark/orderman/orders/algo/algo_orders/DormanAlgo.cpp index 10935b605..fbd8531cc 100644 --- a/src/lib_spark/spark/orderman/orders/algo/algo_orders/DormanAlgo.cpp +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/DormanAlgo.cpp @@ -1,7 +1,7 @@ #include "DormanAlgo.h" +#include "logging/logging.h" #include "spark/api/services/OrderService.pb.h" #include "spark/domain_model/Security.h" -#include "spark/logging/logging.h" #include "spark/orderman/order_factory/IOrderFactory.h" #include "spark/orderman/orderman_utils/Book.h" #include "spark/orderman/orderman_utils/orderman_utils.h" diff --git a/src/lib_spark/spark/orderman/orders/algo/algo_orders/IcebergAlgo.cpp b/src/lib_spark/spark/orderman/orders/algo/algo_orders/IcebergAlgo.cpp index 73ef49549..6b3c88d92 100644 --- a/src/lib_spark/spark/orderman/orders/algo/algo_orders/IcebergAlgo.cpp +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/IcebergAlgo.cpp @@ -1,8 +1,8 @@ +#include "logging/logging.h" #include "spark/orderman/orders/algo/algo_orders/IcebergAlgo.h" #include "spark/orderman/orders/algo/IAlgoServices.h" #include "spark/domain_model/Security.h" -#include "spark/logging/logging.h" #include "spark/orderman/order_factory/IOrderFactory.h" #include "spark/utils/PBUtils.h" #include "spark/utils/bts_chrono.h" diff --git a/src/lib_spark/spark/orderman/orders/algo/algo_orders/JoinAlgo.cpp b/src/lib_spark/spark/orderman/orders/algo/algo_orders/JoinAlgo.cpp index c772e1d18..5005e7f32 100644 --- a/src/lib_spark/spark/orderman/orders/algo/algo_orders/JoinAlgo.cpp +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/JoinAlgo.cpp @@ -1,5 +1,5 @@ +#include "logging/logging.h" #include "spark/orderman/orders/algo/algo_orders/JoinAlgo.h" -#include "spark/logging/logging.h" #include "spark/orderman/orders/algo/IAlgoServices.h" #include "spark/orderman/order_factory/IOrderFactory.h" diff --git a/src/lib_spark/spark/orderman/orders/algo/algo_orders/LimitCoverAlgo.cpp b/src/lib_spark/spark/orderman/orders/algo/algo_orders/LimitCoverAlgo.cpp index ed0556924..f374e9308 100644 --- a/src/lib_spark/spark/orderman/orders/algo/algo_orders/LimitCoverAlgo.cpp +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/LimitCoverAlgo.cpp @@ -124,7 +124,7 @@ struct LimitCoverAlgo::Summary { std::string transaction_id, std::string begin_tag = {}, SummaryType type = SummaryType::StatusChange, - log::Level level = DEFAULT_LOG_LEVEL) + logging::Level level = DEFAULT_LOG_LEVEL) : _owner(owner), _transaction_id(transaction_id), _original_status(owner->me->status), _type(type), _level(level) { if (_owner != nullptr && !_transaction_id.empty()) { @@ -166,7 +166,7 @@ struct LimitCoverAlgo::Summary { std::string _transaction_id; Status _original_status; SummaryType _type; - log::Level _level; + logging::Level _level; }; LimitCoverAlgo::LimitCoverAlgo() : me(new PImpl()) {} diff --git a/src/lib_spark/spark/orderman/orders/algo/algo_orders/QuotingAlgo.cpp b/src/lib_spark/spark/orderman/orders/algo/algo_orders/QuotingAlgo.cpp index a5cb3c592..c820be7ef 100644 --- a/src/lib_spark/spark/orderman/orders/algo/algo_orders/QuotingAlgo.cpp +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/QuotingAlgo.cpp @@ -1,10 +1,10 @@ +#include "logging/logging.h" #include "spark/orderman/orders/algo/algo_orders/QuotingAlgo.h" #include "spark/api/services/OrderService.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" -#include "spark/logging/logging.h" #include "spark/md/PriceSize.h" #include "spark/orderman/order_factory/IOrderFactory.h" #include "spark/orderman/orderman_utils/Book.h" diff --git a/src/lib_spark/spark/orderman/orders/algo/algo_orders/SplitterAlgo.cpp b/src/lib_spark/spark/orderman/orders/algo/algo_orders/SplitterAlgo.cpp index ea6647c51..aad58e6db 100644 --- a/src/lib_spark/spark/orderman/orders/algo/algo_orders/SplitterAlgo.cpp +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/SplitterAlgo.cpp @@ -1,7 +1,7 @@ #include "SplitterAlgo.h" +#include "logging/logging.h" #include "spark/api/services/OrderService.pb.h" #include "spark/domain_model/Security.h" -#include "spark/logging/logging.h" #include "spark/orderman/order_factory/IOrderFactory.h" #include "spark/orderman/orderman_utils/orderman_utils.h" #include "spark/orderman/orders/algo/IAlgoServices.h" diff --git a/src/lib_spark/spark/orderman/orders/algo/algo_orders/TaskingEyeAlgo.cpp b/src/lib_spark/spark/orderman/orders/algo/algo_orders/TaskingEyeAlgo.cpp index 24c1a109e..e94bbd1fd 100644 --- a/src/lib_spark/spark/orderman/orders/algo/algo_orders/TaskingEyeAlgo.cpp +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/TaskingEyeAlgo.cpp @@ -1,10 +1,10 @@ #include "TaskingEyeAlgo.h" +#include "logging/logging.h" #include "spark/api/services/OrderService.pb.h" #include "spark/domain_model/Security.pb.h" #include "spark/domain_model/SecurityKey.h" #include "spark/domain_model/common.h" -#include "spark/logging/logging.h" #include "spark/md/PriceSize.h" #include "spark/orderman/ChildOrder.h" #include "spark/orderman/OrderBuilder.h" diff --git a/src/lib_spark/spark/orderman/orders/algo/algo_orders/TopAlgo.cpp b/src/lib_spark/spark/orderman/orders/algo/algo_orders/TopAlgo.cpp index 8440ed278..7ba99dda1 100644 --- a/src/lib_spark/spark/orderman/orders/algo/algo_orders/TopAlgo.cpp +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/TopAlgo.cpp @@ -1,7 +1,7 @@ #include "spark/orderman/orders/algo/algo_orders/TopAlgo.h" +#include "logging/logging.h" #include "spark/domain_model/Security.h" -#include "spark/logging/logging.h" #include "spark/orderman/order_factory/IOrderFactory.h" #include "spark/orderman/orderman_utils/Book.h" #include "spark/orderman/orders/algo/IAlgoServices.h" diff --git a/src/lib_spark/spark/orderman/orders/algo/algo_orders/VolAlgo.cpp b/src/lib_spark/spark/orderman/orders/algo/algo_orders/VolAlgo.cpp index 52dddaf19..c9e965e72 100644 --- a/src/lib_spark/spark/orderman/orders/algo/algo_orders/VolAlgo.cpp +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/VolAlgo.cpp @@ -1,10 +1,10 @@ #include "VolAlgo.h" +#include "logging/logging.h" #include "spark/api/services/OrderService.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" -#include "spark/logging/logging.h" #include "spark/md/PriceSize.h" #include "spark/orderman/ChildOrder.h" #include "spark/orderman/OrderBuilder.h" diff --git a/src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp b/src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp index 801290821..39a4af9e2 100644 --- a/src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp @@ -1,8 +1,8 @@ #include "AlgoTestDriver.h" #include "catch/catch.hpp" #include "domain/protobufs/trading_status.pb.h" +#include "logging/logging.h" #include "spark/api/services/OrderService.pb.h" -#include "spark/logging/logging.h" #include "spark/md/relay/RelayRecorder.h" #include "spark/orderman/calculations/ITheoCalculator.h" #include "spark/orderman/orderman_utils/Book.h" diff --git a/src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/ExecutiontTesterAlgo.cpp b/src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/ExecutiontTesterAlgo.cpp index 2f7e41234..3f3f84583 100644 --- a/src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/ExecutiontTesterAlgo.cpp +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/ExecutiontTesterAlgo.cpp @@ -1,7 +1,7 @@ #include "ExecutionTesterAlgo.h" #include "domain/protobufs/trading_status.pb.h" +#include "logging/logging.h" #include "spark/domain_model/Security.h" -#include "spark/logging/logging.h" #include "spark/orderman/order_factory/IOrderFactory.h" #include "spark/orderman/orderman_utils/Book.h" #include "spark/orderman/orderman_utils/orderman_common.h" diff --git a/src/lib_spark/spark/orderman/orders/book_algos/BookOrderBase.h b/src/lib_spark/spark/orderman/orders/book_algos/BookOrderBase.h index 89783a1d1..18076cd94 100644 --- a/src/lib_spark/spark/orderman/orders/book_algos/BookOrderBase.h +++ b/src/lib_spark/spark/orderman/orders/book_algos/BookOrderBase.h @@ -1,7 +1,7 @@ #pragma once +#include "logging/logging.h" #include "spark/api/services/OrderService.server.pb.h" -#include "spark/logging/logging.h" #include "spark/md/PriceSize.h" #include "spark/orderman/orders/Order.h" diff --git a/src/lib_spark/spark/orderman/orders/queue_holder/QueueHolderOrder.cpp b/src/lib_spark/spark/orderman/orders/queue_holder/QueueHolderOrder.cpp index f72c0198f..24cdf744c 100644 --- a/src/lib_spark/spark/orderman/orders/queue_holder/QueueHolderOrder.cpp +++ b/src/lib_spark/spark/orderman/orders/queue_holder/QueueHolderOrder.cpp @@ -1,12 +1,13 @@ #include "QueueHolderOrder.h" +#include "logging/logging.h" #include "spark/api/services/OrderService.h" #include "spark/domain_model/Security.h" -#include "spark/logging/logging.h" #include "spark/orderman/OrderBuilder.h" #include "spark/orderman/events/BookUpdateEvent.h" #include "spark/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" #include "spark/os/os.h" #include "spark/utils/PBUtils.h" + #include #include diff --git a/src/lib_spark/spark/orderman/orders/queue_holder/state_workers/QHOEndStateWorker.cpp b/src/lib_spark/spark/orderman/orders/queue_holder/state_workers/QHOEndStateWorker.cpp index 1386f03ad..a226e0a10 100644 --- a/src/lib_spark/spark/orderman/orders/queue_holder/state_workers/QHOEndStateWorker.cpp +++ b/src/lib_spark/spark/orderman/orders/queue_holder/state_workers/QHOEndStateWorker.cpp @@ -1,12 +1,13 @@ +#include "logging/logging.h" #include "spark/orderman/orders/queue_holder/state_workers/QHOEndStateWorker.h" #include "spark/domain_model/Security.h" -#include "spark/logging/logging.h" #include "spark/orderman/OrderBuilder.h" #include "spark/orderman/events/BookUpdateEvent.h" #include "spark/orderman/orders/queue_holder/QueueHolderOrder.h" #include "spark/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" #include "spark/os/os.h" #include "spark/utils/PBUtils.h" + #include #include diff --git a/src/lib_spark/spark/orderman/orders/queue_holder/state_workers/QHOStartStateWorker.cpp b/src/lib_spark/spark/orderman/orders/queue_holder/state_workers/QHOStartStateWorker.cpp index 0122999bd..f2b4db26f 100644 --- a/src/lib_spark/spark/orderman/orders/queue_holder/state_workers/QHOStartStateWorker.cpp +++ b/src/lib_spark/spark/orderman/orders/queue_holder/state_workers/QHOStartStateWorker.cpp @@ -1,6 +1,6 @@ +#include "logging/logging.h" #include "spark/orderman/orders/queue_holder/state_workers/QHOStartStateWorker.h" #include "spark/domain_model/Security.h" -#include "spark/logging/logging.h" #include "spark/orderman/OrderBuilder.h" #include "spark/orderman/events/BookUpdateEvent.h" #include "spark/orderman/orders/PreActivationOrderServices.h" @@ -8,6 +8,7 @@ #include "spark/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" #include "spark/os/os.h" #include "spark/utils/PBUtils.h" + #include #include diff --git a/src/lib_spark/spark/orderman/orders/queue_holder/state_workers/QHOWaitingForAckStateWorker.cpp b/src/lib_spark/spark/orderman/orders/queue_holder/state_workers/QHOWaitingForAckStateWorker.cpp index ddcd77d7b..8b3a7b461 100644 --- a/src/lib_spark/spark/orderman/orders/queue_holder/state_workers/QHOWaitingForAckStateWorker.cpp +++ b/src/lib_spark/spark/orderman/orders/queue_holder/state_workers/QHOWaitingForAckStateWorker.cpp @@ -1,12 +1,13 @@ +#include "logging/logging.h" #include "spark/orderman/orders/queue_holder/state_workers/QHOWaitingForAckStateWorker.h" #include "spark/domain_model/Security.h" -#include "spark/logging/logging.h" #include "spark/orderman/OrderBuilder.h" #include "spark/orderman/events/BookUpdateEvent.h" #include "spark/orderman/orders/queue_holder/QueueHolderOrder.h" #include "spark/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" #include "spark/os/os.h" #include "spark/utils/PBUtils.h" + #include #include diff --git a/src/lib_spark/spark/orderman/orders/queue_holder/state_workers/QHOWaitingForCancelAllStateWorker.cpp b/src/lib_spark/spark/orderman/orders/queue_holder/state_workers/QHOWaitingForCancelAllStateWorker.cpp index 70756df74..c7bd4f7c0 100644 --- a/src/lib_spark/spark/orderman/orders/queue_holder/state_workers/QHOWaitingForCancelAllStateWorker.cpp +++ b/src/lib_spark/spark/orderman/orders/queue_holder/state_workers/QHOWaitingForCancelAllStateWorker.cpp @@ -1,6 +1,6 @@ +#include "logging/logging.h" #include "spark/orderman/orders/queue_holder/state_workers/QHOWaitingForCancelAllStateWorker.h" #include "spark/domain_model/Security.h" -#include "spark/logging/logging.h" #include "spark/orderman/OrderBuilder.h" #include "spark/orderman/events/BookUpdateEvent.h" #include "spark/orderman/orders/queue_holder/QueueHolderOrder.h" diff --git a/src/lib_spark/spark/orderman/orders/queue_holder/state_workers/QHOWorkingStateWorker.cpp b/src/lib_spark/spark/orderman/orders/queue_holder/state_workers/QHOWorkingStateWorker.cpp index ecabae4df..3e788fce9 100644 --- a/src/lib_spark/spark/orderman/orders/queue_holder/state_workers/QHOWorkingStateWorker.cpp +++ b/src/lib_spark/spark/orderman/orders/queue_holder/state_workers/QHOWorkingStateWorker.cpp @@ -1,12 +1,13 @@ +#include "logging/logging.h" #include "spark/orderman/orders/queue_holder/state_workers/QHOWorkingStateWorker.h" #include "spark/domain_model/Security.h" -#include "spark/logging/logging.h" #include "spark/orderman/OrderBuilder.h" #include "spark/orderman/events/BookUpdateEvent.h" #include "spark/orderman/orders/queue_holder/QueueHolderOrder.h" #include "spark/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" #include "spark/os/os.h" #include "spark/utils/PBUtils.h" + #include #include diff --git a/src/lib_spark/spark/orderman/orders/spreader_orders/SpreaderOrder.cpp b/src/lib_spark/spark/orderman/orders/spreader_orders/SpreaderOrder.cpp index 7d5462480..8b18bac32 100644 --- a/src/lib_spark/spark/orderman/orders/spreader_orders/SpreaderOrder.cpp +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/SpreaderOrder.cpp @@ -1,7 +1,7 @@ #include "SpreaderOrder.h" +#include "logging/logging.h" #include "spark/config/config.h" #include "spark/config/protos/spreader.pb.h" -#include "spark/logging/logging.h" #include "spark/orderman/events/SettlementUpdateEvent.h" #include "spark/orderman/orders/spreader_orders/spreader/LegPropertyData.h" #include "spark/orderman/orders/spreader_orders/spreader/NLegsHedgeRecompData.h" diff --git a/src/lib_spark/spark/orderman/orders/spreader_orders/SpreaderOrder.h b/src/lib_spark/spark/orderman/orders/spreader_orders/SpreaderOrder.h index d2e48d04c..b5f68ff63 100644 --- a/src/lib_spark/spark/orderman/orders/spreader_orders/SpreaderOrder.h +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/SpreaderOrder.h @@ -1,8 +1,8 @@ #pragma once +#include "logging/logging.h" #include "spark/api/services/OrderService.h" #include "spark/domain_model/Security.pb.h" -#include "spark/logging/logging.h" #include "spark/mercury/events/TimerEvent.h" #include "spark/orderman/events/BookUpdateEvent.h" #include "spark/orderman/events/OrderStateUpdateEvent.h" @@ -19,6 +19,7 @@ #include "spark/sparkproto/SparkProtos.pb.h" #include "spark/utils/bts_chrono.h" #include "spark/utils/is_unittest_environment.h" + #include namespace bts { diff --git a/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp index d2045bd82..21fe43fbc 100644 --- a/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp @@ -93,7 +93,7 @@ void SingleLegQuoter::one_time_activate(Price price, Quantity quantity) { } void SingleLegQuoter::update_order_status(const SpreaderChildOrderState &u) { bts_assert(_active_quoting); - log::Level llevel = _spreader.in_cache_warming_cycle() ? NoLog : Info; + logging::Level llevel = _spreader.in_cache_warming_cycle() ? NoLog : Info; LOG(OrderMan, llevel, "SingleLegQuoter::update_order_status " "spread_key:{} leg_idx:{} status:{}", diff --git a/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/SpreaderCacheWarmingState.h b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/SpreaderCacheWarmingState.h index 27b376ec3..ee8b413c0 100644 --- a/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/SpreaderCacheWarmingState.h +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/SpreaderCacheWarmingState.h @@ -1,5 +1,6 @@ #pragma once +#include "logging/logging.h" #include "spark/config/config.h" #include "spark/config/protos/spreader.pb.h" #include @@ -18,7 +19,7 @@ class CacheWarmingState { // and upper bound) const uint32_t fill_fire_period; bool in_cache_warming_cycle; - log::Level llevel; + logging::Level llevel; Quantity forced_fill_qty; double fill_mult = 1; bts::TimeStamp last_cache_warm_fill_ts; diff --git a/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/SpreaderFractionalQtyHelper.cpp b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/SpreaderFractionalQtyHelper.cpp index 5a07ea5a8..5542fc879 100644 --- a/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/SpreaderFractionalQtyHelper.cpp +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/SpreaderFractionalQtyHelper.cpp @@ -1,14 +1,15 @@ #include "SpreaderFractionalQtyHelper.h" +#include "logging/logging.h" #include "spark/domain_model/Security.pb.h" #include "spark/domain_model/SecurityKey.h" #include "spark/domain_model/common.h" -#include "spark/logging/logging.h" #include "spark/md/PriceSize.h" #include "spark/orderman/events/BookUpdateEvent.h" #include "spark/orderman/events/OrderStateUpdateEvent.h" #include "spark/orderman/orders/spreader_orders/spreader/LegPropertyData.h" #include "spark/utils/PBUtils.h" #include "spark/utils/bts_assert.h" + #include #include diff --git a/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/SpreaderLegData.h b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/SpreaderLegData.h index cd354ee41..805961a5d 100644 --- a/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/SpreaderLegData.h +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/SpreaderLegData.h @@ -3,7 +3,7 @@ #include "SingleFillHedger.h" #include "SingleLegQuoter.h" #include "SpreaderChildOrderState.h" -#include "spark/logging/logging.h" +#include "logging/logging.h" #include "spark/orderman/OrderBuilder.h" #include "spark/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.h" #include "spark/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.h" diff --git a/src/lib_spark/spark/orderman/tests/CCApiExecutionTests.cpp b/src/lib_spark/spark/orderman/tests/CCApiExecutionTests.cpp index 36b1c2c8c..f0119c523 100644 --- a/src/lib_spark/spark/orderman/tests/CCApiExecutionTests.cpp +++ b/src/lib_spark/spark/orderman/tests/CCApiExecutionTests.cpp @@ -1,12 +1,13 @@ #include "catch/catch.hpp" +#include "logging/logging.h" #include "spark/api/service_helpers/AdminServiceUtils.h" #include "spark/api/services/AdminService.server.pb.h" #include "spark/config/config.h" -#include "spark/logging/logging.h" #include "spark/utils/bts_assert.h" #include "spark/utils/bts_chrono.h" #include "spark/utils/helper_macros.h" + #include #include #include @@ -135,4 +136,4 @@ TEST_CASE("Simple", "[ccapi]") { } } -} // namespace bts::orderman \ No newline at end of file +} // namespace bts::orderman diff --git a/src/lib_spark/spark/persistence/IDGenerator.cpp b/src/lib_spark/spark/persistence/IDGenerator.cpp index 540510f25..03d3384b1 100644 --- a/src/lib_spark/spark/persistence/IDGenerator.cpp +++ b/src/lib_spark/spark/persistence/IDGenerator.cpp @@ -1,7 +1,8 @@ #include "IDGenerator.h" -#include "spark/logging/logging.h" +#include "logging/logging.h" #include "spark/persistence/SqliteStore.h" #include "spark/utils/bts_assert.h" + #include #include #include diff --git a/src/lib_spark/spark/persistence/PersistenceServiceServer.cpp b/src/lib_spark/spark/persistence/PersistenceServiceServer.cpp index b8b31b58e..6f6645d9d 100644 --- a/src/lib_spark/spark/persistence/PersistenceServiceServer.cpp +++ b/src/lib_spark/spark/persistence/PersistenceServiceServer.cpp @@ -1,7 +1,7 @@ #include "PersistenceServiceServer.h" #include "SqliteStore.h" -#include "spark/logging/logging.h" +#include "logging/logging.h" #include "spark/os/os.h" #include "spark/utils/bts_assert.h" #include "spark/utils/bts_no_copy.h" diff --git a/src/lib_spark/spark/persistence/SqliteStore.cpp b/src/lib_spark/spark/persistence/SqliteStore.cpp index 453290cd5..3cf485079 100644 --- a/src/lib_spark/spark/persistence/SqliteStore.cpp +++ b/src/lib_spark/spark/persistence/SqliteStore.cpp @@ -1,7 +1,7 @@ #include "SqliteStore.h" +#include "logging/logging.h" #include "spark/config/config.h" -#include "spark/logging/logging.h" #include "spark/os/os.h" #include "spark/persistence/persistence_utils.h" #include "spark/utils/Sqlite_utils.h" diff --git a/src/lib_spark/spark/plugin/SparkServices.cpp b/src/lib_spark/spark/plugin/SparkServices.cpp index 395d87fda..24aac8312 100644 --- a/src/lib_spark/spark/plugin/SparkServices.cpp +++ b/src/lib_spark/spark/plugin/SparkServices.cpp @@ -1,5 +1,5 @@ #include "SparkServices.h" -#include "spark/logging/logging.h" +#include "logging/logging.h" #include "spark/orderman/order_factory/DynamicOrderRegistry.h" namespace bts { diff --git a/src/lib_spark/spark/plugin/plugin.cpp b/src/lib_spark/spark/plugin/plugin.cpp index fddb4e127..1319ddbe6 100644 --- a/src/lib_spark/spark/plugin/plugin.cpp +++ b/src/lib_spark/spark/plugin/plugin.cpp @@ -1,6 +1,6 @@ +#include "logging/logging.h" #include "spark/config/config.h" #include "spark/config/protos/deployment_type.pb.h" -#include "spark/logging/logging.h" #include "spark/orderman/OrderBuilder.h" #include "spark/plugin/SparkServices.h" #include "spark/utils/PBUtils.h" diff --git a/src/lib_spark/spark/quickbus/core/LocalNode.cpp b/src/lib_spark/spark/quickbus/core/LocalNode.cpp index 1acd96ef7..e0ca1aa46 100644 --- a/src/lib_spark/spark/quickbus/core/LocalNode.cpp +++ b/src/lib_spark/spark/quickbus/core/LocalNode.cpp @@ -1,6 +1,6 @@ #include "LocalNode.h" -#include "spark/logging/logging.h" +#include "logging/logging.h" #include "spark/quickbus/core/Quickbus.h" #include "spark/quickbus/routing/NodeID.h" #include "spark/quickbus/routing/Router.h" diff --git a/src/lib_spark/spark/quickbus/core/Quickbus.cpp b/src/lib_spark/spark/quickbus/core/Quickbus.cpp index df476134c..d70fbe6fc 100644 --- a/src/lib_spark/spark/quickbus/core/Quickbus.cpp +++ b/src/lib_spark/spark/quickbus/core/Quickbus.cpp @@ -1,8 +1,8 @@ #include "Quickbus.h" +#include "logging/logging.h" #include "spark/config/config.h" #include "spark/config/protos/quickbus_cfg.pb.h" -#include "spark/logging/logging.h" #include "spark/os/os.h" #include "spark/quickbus/network/QBConnectionManager.h" #include "spark/quickbus/routing/Router.h" diff --git a/src/lib_spark/spark/quickbus/network/QBConnection.cpp b/src/lib_spark/spark/quickbus/network/QBConnection.cpp index cb24677e5..7f146ff8d 100644 --- a/src/lib_spark/spark/quickbus/network/QBConnection.cpp +++ b/src/lib_spark/spark/quickbus/network/QBConnection.cpp @@ -1,6 +1,6 @@ #include "QBConnection.h" -#include "spark/logging/logging.h" +#include "logging/logging.h" #include "spark/os/os.h" #include "spark/utils/PBUtils.h" #include "spark/utils/bts_assert.h" diff --git a/src/lib_spark/spark/quickbus/network/QBConnectionManager.cpp b/src/lib_spark/spark/quickbus/network/QBConnectionManager.cpp index 8c7074fe8..4b33cea57 100644 --- a/src/lib_spark/spark/quickbus/network/QBConnectionManager.cpp +++ b/src/lib_spark/spark/quickbus/network/QBConnectionManager.cpp @@ -1,6 +1,6 @@ #include "QBConnectionManager.h" -#include "spark/logging/logging.h" +#include "logging/logging.h" #include "spark/quickbus/network/QBConnection.h" #include "spark/quickbus/network/endpoint_description.h" #include "spark/quickbus/routing/Router.h" diff --git a/src/lib_spark/spark/quickbus/routing/Router.cpp b/src/lib_spark/spark/quickbus/routing/Router.cpp index 40705ba2a..698963859 100644 --- a/src/lib_spark/spark/quickbus/routing/Router.cpp +++ b/src/lib_spark/spark/quickbus/routing/Router.cpp @@ -1,6 +1,6 @@ #include "Router.h" -#include "spark/logging/logging.h" +#include "logging/logging.h" #include "spark/quickbus/core/Advertisement.h" #include "spark/quickbus/message_model/merge_updates.h" #include "spark/utils/PBUtils.h" diff --git a/src/lib_spark/spark/quickbus/rpc/RPCClient.cpp b/src/lib_spark/spark/quickbus/rpc/RPCClient.cpp index 7d8564464..b3289560a 100644 --- a/src/lib_spark/spark/quickbus/rpc/RPCClient.cpp +++ b/src/lib_spark/spark/quickbus/rpc/RPCClient.cpp @@ -1,6 +1,6 @@ #include "RPCClient.h" -#include "spark/logging/logging.h" +#include "logging/logging.h" #include "spark/quickbus/core/Advertisement.h" #include "spark/quickbus/core/LocalNode.h" #include "spark/quickbus/core/SubscriptionID.h" diff --git a/src/lib_spark/spark/quickbus/rpc/RPCServer.cpp b/src/lib_spark/spark/quickbus/rpc/RPCServer.cpp index 4b97c5d82..37dedc974 100644 --- a/src/lib_spark/spark/quickbus/rpc/RPCServer.cpp +++ b/src/lib_spark/spark/quickbus/rpc/RPCServer.cpp @@ -1,6 +1,6 @@ #include "RPCServer.h" -#include "spark/logging/logging.h" +#include "logging/logging.h" #include "spark/quickbus/core/Advertisement.h" #include "spark/quickbus/core/LocalNode.h" #include "spark/quickbus/rpc/RPCSessionID.h" diff --git a/src/lib_spark/spark/testing/catch_test_runner.cpp b/src/lib_spark/spark/testing/catch_test_runner.cpp index 4e7337f3c..db8b2ccdd 100644 --- a/src/lib_spark/spark/testing/catch_test_runner.cpp +++ b/src/lib_spark/spark/testing/catch_test_runner.cpp @@ -3,9 +3,9 @@ #include "catch/catch.hpp" +#include "logging/logging.h" +#include "logging/protobufs/logging.pb.h" #include "spark/config/config.h" -#include "spark/config/protos/logging.pb.h" -#include "spark/logging/logging.h" #include "spark/utils/bts_assert.h" #include "spark/utils/is_unittest_environment.h" @@ -21,9 +21,9 @@ int run_tests(int argc, char **argv) { int run_tests(std::vector const &args) { utils::internal::force_unittest_environment(); - auto cfg = config::get(); + auto cfg = config::get(); cfg.mutable_console()->set_default_level("Fatal"); - log::configure_logging(cfg); + logging::configure_logging(cfg); bts_assert(args.size() < 100); char const *argv[100]; diff --git a/src/lib_spark/spark/utils/AuthSessionManager.cpp b/src/lib_spark/spark/utils/AuthSessionManager.cpp index 7d781e964..f01a02ed1 100644 --- a/src/lib_spark/spark/utils/AuthSessionManager.cpp +++ b/src/lib_spark/spark/utils/AuthSessionManager.cpp @@ -9,10 +9,10 @@ #include "spark/utils/datetime.h" +#include "logging/logging.h" #include "spark/config/config.h" #include "spark/config/protos/keycode.pb.h" #include "spark/config/protos/ports.pb.h" -#include "spark/logging/logging.h" #include "spark/utils/bts_assert.h" #include "spark/utils/helper_macros.h" diff --git a/src/lib_spark/spark/utils/CallTimer.h b/src/lib_spark/spark/utils/CallTimer.h index 80b4f1f41..15198cbdc 100644 --- a/src/lib_spark/spark/utils/CallTimer.h +++ b/src/lib_spark/spark/utils/CallTimer.h @@ -3,7 +3,8 @@ #include "spark/utils/bts_no_copy.h" #include "datetime.h" -#include "spark/logging/logging.h" +#include "logging/logging.h" + #include #include diff --git a/src/lib_spark/spark/utils/Dispatcher.h b/src/lib_spark/spark/utils/Dispatcher.h index bd31f5081..752f8ac6a 100644 --- a/src/lib_spark/spark/utils/Dispatcher.h +++ b/src/lib_spark/spark/utils/Dispatcher.h @@ -1,121 +1,3 @@ #pragma once -#ifndef NO_CPP0X -#include "spark/utils/bts_export.h" -#include "spark/utils/bts_no_copy.h" - -#include -#include -#include -#include - -/* - * Dispatcher is a simple delegate based event queue built on boost::asio. - * - * Each dispatcher is owned by a single thread which is responsible for calling - * run() to dispatch events. The run call will not return until terminate() is - * called. It is safe to call terminate() from the same thread - * - * Sample use: - * Create a thread and get Dispatcher::current() for that thread. Pass that - * Dispatcher& to some other code. If that other code makes calls through the - * dispatcher post() (asyncronous) or invoke() (syncronous) the callback is - * guarunteed to happen on the Dispatcher's thread. - * - * - * Some use cases: - * 1) Short asyncronous work - * You can use Dispatcher::background() to get a handle to a common background - * thread (created on demand). This is useful for short tasks like asyncronous - * logging or timer events where you do not need to monopolize a thread of your - * own. You can also use post() with a delay to set up one time callbacks after - * a short time. Ex: Simple async logging #define ALOG(x) - * Dispatcher::background().post([=]() { LOG(Info, Something) << x; }); - * - * 2) Use a DispatcherTimer to drive a WorkScheduler without tying up a thread - * during the idle times. Ex: Dispatcher& d = Dispatcher::background(); - * WorkScheduler* s = new WorkScheduler(...); - * DispatcherTimer t(d, 100, [=]() { s->dispatch(); }); - * t.start(); - * - * Now the WorkScheduler will be invoked every 100ms but you are still free to - * use d.post([](){ ... }); to do asyncronous work between timer ticks. If your - * async task takes longer than the timer interval the timer callback will fire - * immediately when it is done. Simlilarly if the timer callback is still - * working when you call post() your call will be queued and fire when the timer - * routine finishes. - * - * 3) Controlling access to non-thread safe resources. - * If you have an object which is not thread safe you can give it a Dispatcher - * "owner". A thread can test object.owner().check_access() to see if it is the - * owning thread and if not serialize access by using - * object.owner().invoke([&](){ object.unsafe_method(); }; The unsafe_method - * might assert that access is only allowed from its owning thread. - * - */ - -namespace bts { -namespace utils { - -struct DispatcherImpl; -struct DispatcherTimerImpl; -class DispatcherTimer; - -typedef std::function Action; - -class BTS_EXPORT Dispatcher { - public: - Dispatcher(); - ~Dispatcher(); - - void run(size_t threads = 1); - void add_thread(); - bool check_access(); - void terminate(); - bool is_running(); - bool is_threadpool(); - - // Get/create the dispatcher for the current thread - static Dispatcher ¤t(); - // Get a default background thread to dispatch work to - static Dispatcher &background(); - // Create a new background dispatcher thread and return the dispatcher for it - static Dispatcher &get_named(const char *name); - static Dispatcher &create_new(const char *name); - - // Perform an action on the dispatcher thread. Block until the action is - // complete. - void invoke(Action action); - // Queue an action on the dispatcher thread and return immediately. - void post(Action &&action, int64_t delay_ms = 0); - void post_copy(Action action, int64_t delay_ms = 0); - - boost::asio::io_service *io_service(); - - private: - BTS_NO_COPY(Dispatcher); - friend struct DispatcherTimerImpl; - std::unique_ptr _me; -}; - -class BTS_EXPORT DispatcherTimer { - public: - DispatcherTimer(Dispatcher &dispatcher, int64_t time_ms, Action cb); - DispatcherTimer(DispatcherTimer &&other); - ~DispatcherTimer(); - void start(); - void stop(); - - bool running(); - void set_interval(int64_t time_ms); - void set_callback(Action cb); - - private: - BTS_NO_COPY(DispatcherTimer); - std::unique_ptr _me; -}; - -} // namespace utils -} // namespace bts - -#endif +#include "system/threading/dispatcher.h" diff --git a/src/lib_spark/spark/utils/HTTPStream.cpp b/src/lib_spark/spark/utils/HTTPStream.cpp index 26fa1e9ca..bbe3649e5 100644 --- a/src/lib_spark/spark/utils/HTTPStream.cpp +++ b/src/lib_spark/spark/utils/HTTPStream.cpp @@ -1,5 +1,5 @@ #include "HTTPStream.h" -#include "spark/logging/logging.h" +#include "logging/logging.h" #include "spark/utils/bts_assert.h" #include "spark/utils/defer.h" diff --git a/src/lib_spark/spark/utils/SharedList.h b/src/lib_spark/spark/utils/SharedList.h index 55ac26759..7e84f8f40 100644 --- a/src/lib_spark/spark/utils/SharedList.h +++ b/src/lib_spark/spark/utils/SharedList.h @@ -1,6 +1,6 @@ #pragma once -#include "spark/logging/logging.h" +#include "logging/logging.h" #include "spark/utils/SharedMemory.h" #include "spark/utils/bts_assert.h" #include "spark/utils/bts_no_copy.h" diff --git a/src/lib_spark/spark/utils/SharedMemory.cpp b/src/lib_spark/spark/utils/SharedMemory.cpp index be19bacf9..9231a2606 100644 --- a/src/lib_spark/spark/utils/SharedMemory.cpp +++ b/src/lib_spark/spark/utils/SharedMemory.cpp @@ -1,7 +1,7 @@ #ifndef NO_CPP0X #include "SharedMemory.h" -#include "spark/logging/logging.h" +#include "logging/logging.h" #include "spark/utils/bts_assert.h" #include diff --git a/src/lib_spark/spark/utils/bts_assert.h b/src/lib_spark/spark/utils/bts_assert.h index ee55fa82a..4d595c0eb 100644 --- a/src/lib_spark/spark/utils/bts_assert.h +++ b/src/lib_spark/spark/utils/bts_assert.h @@ -4,7 +4,7 @@ #include #include -#include "spark/logging/logging.h" +#include "logging/logging.h" #include "spark/utils/bts_debugger.h" #ifdef _WIN32 diff --git a/src/lib_spark/spark/utils/bts_chrono.h b/src/lib_spark/spark/utils/bts_chrono.h index afc75b070..c9364f57e 100644 --- a/src/lib_spark/spark/utils/bts_chrono.h +++ b/src/lib_spark/spark/utils/bts_chrono.h @@ -1,41 +1,3 @@ #pragma once -#include -#include -#include -#include -namespace bts { - -using Timer = std::chrono::system_clock; -using TimeStamp = Timer::time_point; -using Duration = Timer::duration; - -inline int64_t ns_diff(TimeStamp t1, TimeStamp t2) { - return std::chrono::duration_cast(t1 - t2).count(); -} - -inline int64_t us_diff(TimeStamp t1, TimeStamp t2) { - return std::chrono::duration_cast(t1 - t2) - .count(); -} - -inline int64_t ms_diff(TimeStamp t1, TimeStamp t2) { - return std::chrono::duration_cast(t1 - t2) - .count(); -} - -inline int64_t sec_diff(TimeStamp t1, TimeStamp t2) { - return std::chrono::duration_cast(t1 - t2).count(); -} - -template void sleep_for(T t) { std::this_thread::sleep_for(t); } -} // namespace bts - -inline std::ostream &operator<<(std::ostream &o, const bts::TimeStamp ts) { - using namespace std::chrono; - auto now_c = bts::Timer::system_clock::to_time_t(ts); - o << std::string(std::ctime(&now_c)); - return o; -} - -using namespace std::chrono_literals; +#include "system/bts_chrono.h" diff --git a/src/lib_spark/spark/utils/bts_fatal.h b/src/lib_spark/spark/utils/bts_fatal.h index c9153e3b0..95aef34aa 100644 --- a/src/lib_spark/spark/utils/bts_fatal.h +++ b/src/lib_spark/spark/utils/bts_fatal.h @@ -4,7 +4,7 @@ #include #include -#include "spark/logging/logging.h" +#include "logging/logging.h" #include "spark/utils/bts_assert.h" #include "spark/utils/bts_debugger.h" diff --git a/src/lib_spark/spark/utils/bts_no_copy.h b/src/lib_spark/spark/utils/bts_no_copy.h index d6a2bd589..4a311b665 100644 --- a/src/lib_spark/spark/utils/bts_no_copy.h +++ b/src/lib_spark/spark/utils/bts_no_copy.h @@ -1,9 +1,3 @@ -#ifndef bts_no_copy_H -#define bts_no_copy_H +#pragma once -#undef BTS_NO_COPY -#define BTS_NO_COPY(TYPE) \ - TYPE(const TYPE &); \ - TYPE &operator=(const TYPE &) - -#endif +#include "system/macros/bts_no_copy.h" diff --git a/src/lib_spark/spark/utils/crypto/PrivateKey.cpp b/src/lib_spark/spark/utils/crypto/PrivateKey.cpp index c1a5185f0..d124e05e0 100644 --- a/src/lib_spark/spark/utils/crypto/PrivateKey.cpp +++ b/src/lib_spark/spark/utils/crypto/PrivateKey.cpp @@ -4,9 +4,10 @@ #include "CryptoInit.h" #include "PublicKey.h" #include "iostreambio.h" -#include "spark/logging/logging.h" +#include "logging/logging.h" #include "spark/utils/bts_assert.h" #include "spark/utils/helper_macros.h" + #include #include @@ -294,4 +295,4 @@ void PrivateKey::write_stream( } // namespace crypto } // namespace bts -#endif \ No newline at end of file +#endif diff --git a/src/lib_spark/spark/utils/crypto/PublicKey.cpp b/src/lib_spark/spark/utils/crypto/PublicKey.cpp index bfa3e3e22..4ff6dddc4 100644 --- a/src/lib_spark/spark/utils/crypto/PublicKey.cpp +++ b/src/lib_spark/spark/utils/crypto/PublicKey.cpp @@ -1,12 +1,13 @@ #include "spark/utils/crypto/PrivateKey.h" #ifndef _WIN32 #include "PublicKey.h" +#include "logging/logging.h" #include "spark/config/protos/keycode.pb.h" -#include "spark/logging/logging.h" #include "spark/utils/FileUtils.h" #include "spark/utils/bts_assert.h" #include "spark/utils/crypto/iostreambio.h" #include "spark/utils/helper_macros.h" + #include namespace openssl { diff --git a/src/lib_spark/spark/utils/crypto/iostreambio.cpp b/src/lib_spark/spark/utils/crypto/iostreambio.cpp index ab6a5848f..5e3b5b69e 100644 --- a/src/lib_spark/spark/utils/crypto/iostreambio.cpp +++ b/src/lib_spark/spark/utils/crypto/iostreambio.cpp @@ -1,7 +1,7 @@ #ifndef _WIN32 #include "iostreambio.h" -#include "spark/logging/logging.h" +#include "logging/logging.h" #include "spark/utils/bts_assert.h" #include "spark/utils/helper_macros.h" @@ -205,4 +205,4 @@ static int bwrite(BIO *bio, const char *buf, int len) { } // namespace crypto } // namespace bts -#endif \ No newline at end of file +#endif diff --git a/src/lib_spark/spark/utils/defer.h b/src/lib_spark/spark/utils/defer.h index 38a09edc2..3c31ff134 100644 --- a/src/lib_spark/spark/utils/defer.h +++ b/src/lib_spark/spark/utils/defer.h @@ -1,33 +1,3 @@ #pragma once -#include "bts_no_copy.h" -#include - -namespace bts { -namespace utils { - -template class DeferredAction { - public: - explicit DeferredAction(T &t) : _action(std::addressof(t)) {} - - ~DeferredAction() { - if (_action) - (*_action)(); - } - - private: - BTS_NO_COPY(DeferredAction); - T *_action; -}; - -#define DEFER_CONCAT_IMPL(x, y) x##y -#define DEFER_CONCAT(x, y) DEFER_CONCAT_IMPL(x, y) -#define DEFER_UNIQUE(prefix) DEFER_CONCAT(prefix, __LINE__) - -#define DEFER(...) \ - auto DEFER_UNIQUE(__DEFER_PROC_) = [&]() { __VA_ARGS__; }; \ - bts::utils::DeferredAction \ - DEFER_UNIQUE(__DEFER_CONTAINER_)(DEFER_UNIQUE(__DEFER_PROC_)); - -} // namespace utils -} // namespace bts +#include "system/defer.h" diff --git a/src/lib_spark/spark/utils/download.cpp b/src/lib_spark/spark/utils/download.cpp index b388dc51d..9b281289c 100644 --- a/src/lib_spark/spark/utils/download.cpp +++ b/src/lib_spark/spark/utils/download.cpp @@ -1,5 +1,6 @@ #include "download.h" -#include "spark/logging/logging.h" +#include "logging/logging.h" + #include #include @@ -23,4 +24,4 @@ bool download_file(const char *url, const char *dest) { LOG(md, bts::Info, "download_file result: {}. url: {} dest: {}", false, std::string(url), std::string(dest)); return false; -} \ No newline at end of file +} diff --git a/src/lib_spark/spark/utils/file_utils.h b/src/lib_spark/spark/utils/file_utils.h index 19b890b5b..c0b598e00 100644 --- a/src/lib_spark/spark/utils/file_utils.h +++ b/src/lib_spark/spark/utils/file_utils.h @@ -1,10 +1,3 @@ #pragma once -#include - -namespace bts { -namespace utils { -std::string normalize_data_path(std::string const &input_path); -bool create_if_not_there(std::string const &path); -} // namespace utils -} // namespace bts +#include "system/file_utils.h" diff --git a/src/lib_spark/spark/utils/init_spark_lib.cpp b/src/lib_spark/spark/utils/init_spark_lib.cpp index 8d4cdefa9..44e8cdc1d 100644 --- a/src/lib_spark/spark/utils/init_spark_lib.cpp +++ b/src/lib_spark/spark/utils/init_spark_lib.cpp @@ -1,12 +1,12 @@ #include "init_spark_lib.h" -#include "spark/logging/logging.h" +#include "logging/logging.h" #include "spark/utils/bts_assert.h" #include "spark/utils/thread_manager.h" namespace bts { namespace utils { -static log::LoggingConfigPoller *poller = nullptr; +static logging::LoggingConfigPoller *poller = nullptr; void init_spark_lib() { // Write to stdout instead of normal log, because the logging system hasn't @@ -15,9 +15,9 @@ void init_spark_lib() { std::cout << "Configuring thread 'main'" << std::endl; threading::configure_current_thread("main"); std::cout << "Starting default logging thread" << std::endl; - log::start_default_logging_thread(); + logging::start_default_logging_thread(); std::cout << "Initializing LoggingConfigPoller" << std::endl; - poller = new log::LoggingConfigPoller(); + poller = new logging::LoggingConfigPoller(); } void finit_spark_lib() { diff --git a/src/lib_spark/spark/utils/sftp.cpp b/src/lib_spark/spark/utils/sftp.cpp index f2550ad9b..686e71b38 100644 --- a/src/lib_spark/spark/utils/sftp.cpp +++ b/src/lib_spark/spark/utils/sftp.cpp @@ -1,6 +1,6 @@ #ifndef _WIN32 +#include "logging/logging.h" #include "spark/utils/sftp.h" -#include "spark/logging/logging.h" #include "spark/utils/Dispatcher.h" #include "spark/utils/base64.hpp" #include "spark/utils/defer.h" diff --git a/src/lib_spark/spark/utils/type_name.h b/src/lib_spark/spark/utils/type_name.h index a11458784..1fb315d85 100644 --- a/src/lib_spark/spark/utils/type_name.h +++ b/src/lib_spark/spark/utils/type_name.h @@ -1,28 +1,3 @@ #pragma once -#ifdef __GNUC__ -#include -#endif - -namespace bts { -namespace utils { -template const char *type_name() { -#ifdef __GNUC__ - int status; - return abi::__cxa_demangle(typeid(T).name(), 0, 0, &status); -#else - return typeid(T).name(); -#endif -} - -inline const char *type_name(std::type_info const &ti) { -#ifdef __GNUC__ - int status; - return abi::__cxa_demangle(ti.name(), 0, 0, &status); -#else - return ti.name(); -#endif -} - -} // namespace utils -} // namespace bts +#include "system/type_name.h" diff --git a/src/lib_system/system/bts_chrono.h b/src/lib_system/system/bts_chrono.h new file mode 100644 index 000000000..afc75b070 --- /dev/null +++ b/src/lib_system/system/bts_chrono.h @@ -0,0 +1,41 @@ +#pragma once +#include +#include +#include +#include + +namespace bts { + +using Timer = std::chrono::system_clock; +using TimeStamp = Timer::time_point; +using Duration = Timer::duration; + +inline int64_t ns_diff(TimeStamp t1, TimeStamp t2) { + return std::chrono::duration_cast(t1 - t2).count(); +} + +inline int64_t us_diff(TimeStamp t1, TimeStamp t2) { + return std::chrono::duration_cast(t1 - t2) + .count(); +} + +inline int64_t ms_diff(TimeStamp t1, TimeStamp t2) { + return std::chrono::duration_cast(t1 - t2) + .count(); +} + +inline int64_t sec_diff(TimeStamp t1, TimeStamp t2) { + return std::chrono::duration_cast(t1 - t2).count(); +} + +template void sleep_for(T t) { std::this_thread::sleep_for(t); } +} // namespace bts + +inline std::ostream &operator<<(std::ostream &o, const bts::TimeStamp ts) { + using namespace std::chrono; + auto now_c = bts::Timer::system_clock::to_time_t(ts); + o << std::string(std::ctime(&now_c)); + return o; +} + +using namespace std::chrono_literals; diff --git a/src/lib_system/system/defer.h b/src/lib_system/system/defer.h new file mode 100644 index 000000000..bafb07454 --- /dev/null +++ b/src/lib_system/system/defer.h @@ -0,0 +1,34 @@ +#pragma once + +#include "system/macros/bts_no_copy.h" + +#include + +namespace bts { +namespace utils { + +template class DeferredAction { + public: + explicit DeferredAction(T &t) : _action(std::addressof(t)) {} + + ~DeferredAction() { + if (_action) + (*_action)(); + } + + private: + BTS_NO_COPY(DeferredAction); + T *_action; +}; + +#define DEFER_CONCAT_IMPL(x, y) x##y +#define DEFER_CONCAT(x, y) DEFER_CONCAT_IMPL(x, y) +#define DEFER_UNIQUE(prefix) DEFER_CONCAT(prefix, __LINE__) + +#define DEFER(...) \ + auto DEFER_UNIQUE(__DEFER_PROC_) = [&]() { __VA_ARGS__; }; \ + bts::utils::DeferredAction \ + DEFER_UNIQUE(__DEFER_CONTAINER_)(DEFER_UNIQUE(__DEFER_PROC_)); + +} // namespace utils +} // namespace bts diff --git a/src/lib_spark/spark/utils/file_utils.cpp b/src/lib_system/system/file_utils.cpp similarity index 92% rename from src/lib_spark/spark/utils/file_utils.cpp rename to src/lib_system/system/file_utils.cpp index 871125277..8694f0d65 100644 --- a/src/lib_spark/spark/utils/file_utils.cpp +++ b/src/lib_system/system/file_utils.cpp @@ -1,6 +1,6 @@ #include "file_utils.h" -#include "bts_assert.h" -#include "spark/os/os.h" +#include "system/facades/bts_assert.h" +#include "system/os.h" #include #include diff --git a/src/lib_system/system/file_utils.h b/src/lib_system/system/file_utils.h new file mode 100644 index 000000000..19b890b5b --- /dev/null +++ b/src/lib_system/system/file_utils.h @@ -0,0 +1,10 @@ +#pragma once + +#include + +namespace bts { +namespace utils { +std::string normalize_data_path(std::string const &input_path); +bool create_if_not_there(std::string const &path); +} // namespace utils +} // namespace bts diff --git a/src/lib_system/system/macros/bts_no_copy.h b/src/lib_system/system/macros/bts_no_copy.h new file mode 100644 index 000000000..d6a2bd589 --- /dev/null +++ b/src/lib_system/system/macros/bts_no_copy.h @@ -0,0 +1,9 @@ +#ifndef bts_no_copy_H +#define bts_no_copy_H + +#undef BTS_NO_COPY +#define BTS_NO_COPY(TYPE) \ + TYPE(const TYPE &); \ + TYPE &operator=(const TYPE &) + +#endif diff --git a/src/lib_spark/spark/utils/Dispatcher.cpp b/src/lib_system/system/threading/dispatcher.cpp similarity index 87% rename from src/lib_spark/spark/utils/Dispatcher.cpp rename to src/lib_system/system/threading/dispatcher.cpp index d3da31ec5..390a4baf7 100644 --- a/src/lib_spark/spark/utils/Dispatcher.cpp +++ b/src/lib_system/system/threading/dispatcher.cpp @@ -1,13 +1,13 @@ +#include "system/protobufs/threads.pb.h" #ifndef NO_CPP0X -#include "Dispatcher.h" -#include "../os/os.h" -#include "defer.h" -#include "spark/logging/logging.h" -#include "spark/utils/bts_assert.h" -#include "spark/utils/bts_chrono.h" -#include "spark/utils/thread_manager.h" -#include "spark/utils/type_name.h" +#include "dispatcher.h" +#include "system/bts_chrono.h" +#include "system/defer.h" +#include "system/facades/bts_assert.h" +#include "system/os.h" +#include "system/threading/thread_manager.h" +#include "system/type_name.h" #include #include @@ -25,19 +25,28 @@ using namespace boost::asio; namespace bts { namespace utils { +using bts::system::threading::ThreadManager; + struct DispatcherImpl { public: - DispatcherImpl() - : thread(std::this_thread::get_id()), service(), work(), is_pool(false) { + DispatcherImpl(std::shared_ptr thread_manager) + : thread_manager(std::move(thread_manager)), + thread(std::this_thread::get_id()), service(), work(), is_pool(false) { } + std::shared_ptr thread_manager; std::thread::id thread; io_service service; unique_ptr work; bool is_pool; }; -Dispatcher::Dispatcher() : _me(new DispatcherImpl()) { +Dispatcher::Dispatcher() + : Dispatcher(std::make_shared( + ThreadManager::default_thread_config())) {} + +Dispatcher::Dispatcher(std::shared_ptr thread_manager) + : _me(new DispatcherImpl(std::move(thread_manager))) { #ifdef _WIN32 _mm_mfence(); #else @@ -74,7 +83,7 @@ void Dispatcher::run(size_t threads) { void Dispatcher::add_thread() { _me->is_pool = true; - auto t = threading::make_thread( + auto t = _me->thread_manager->make_thread( "DispatcherPool", [=, this]() { _me->service.run(); }); t.detach(); } @@ -135,7 +144,8 @@ Dispatcher &Dispatcher::create_new(const char *name) { // Take the lock before starting the thread to ensure c.notify_all() cannot // happen before we wait on the condition unique_lock lock(m); - auto t = threading::make_thread(name, [&]() { + ThreadManager thread_man{ThreadManager::default_thread_config()}; + auto t = thread_man.make_thread(name, [&]() { Dispatcher &temp = current(); try { temp.post([&]() { diff --git a/src/lib_system/system/threading/dispatcher.h b/src/lib_system/system/threading/dispatcher.h new file mode 100644 index 000000000..1563384e6 --- /dev/null +++ b/src/lib_system/system/threading/dispatcher.h @@ -0,0 +1,125 @@ +#pragma once +#include "system/threading/thread_manager.h" +#ifndef NO_CPP0X + +#include "system/bts_export.h" +#include "system/macros/bts_no_copy.h" + +#include +#include +#include +#include + +/* + * Dispatcher is a simple delegate based event queue built on boost::asio. + * + * Each dispatcher is owned by a single thread which is responsible for calling + * run() to dispatch events. The run call will not return until terminate() is + * called. It is safe to call terminate() from the same thread + * + * Sample use: + * Create a thread and get Dispatcher::current() for that thread. Pass that + * Dispatcher& to some other code. If that other code makes calls through the + * dispatcher post() (asyncronous) or invoke() (syncronous) the callback is + * guarunteed to happen on the Dispatcher's thread. + * + * + * Some use cases: + * 1) Short asyncronous work + * You can use Dispatcher::background() to get a handle to a common background + * thread (created on demand). This is useful for short tasks like asyncronous + * logging or timer events where you do not need to monopolize a thread of your + * own. You can also use post() with a delay to set up one time callbacks after + * a short time. Ex: Simple async logging #define ALOG(x) + * Dispatcher::background().post([=]() { LOG(Info, Something) << x; }); + * + * 2) Use a DispatcherTimer to drive a WorkScheduler without tying up a thread + * during the idle times. Ex: Dispatcher& d = Dispatcher::background(); + * WorkScheduler* s = new WorkScheduler(...); + * DispatcherTimer t(d, 100, [=]() { s->dispatch(); }); + * t.start(); + * + * Now the WorkScheduler will be invoked every 100ms but you are still free to + * use d.post([](){ ... }); to do asyncronous work between timer ticks. If your + * async task takes longer than the timer interval the timer callback will fire + * immediately when it is done. Simlilarly if the timer callback is still + * working when you call post() your call will be queued and fire when the timer + * routine finishes. + * + * 3) Controlling access to non-thread safe resources. + * If you have an object which is not thread safe you can give it a Dispatcher + * "owner". A thread can test object.owner().check_access() to see if it is the + * owning thread and if not serialize access by using + * object.owner().invoke([&](){ object.unsafe_method(); }; The unsafe_method + * might assert that access is only allowed from its owning thread. + * + */ + +namespace bts { +namespace utils { + +struct DispatcherImpl; +struct DispatcherTimerImpl; +class DispatcherTimer; + +typedef std::function Action; + +class BTS_EXPORT Dispatcher { + public: + Dispatcher(); + explicit Dispatcher( + std::shared_ptr thread_manager); + + ~Dispatcher(); + + void run(size_t threads = 1); + void add_thread(); + bool check_access(); + void terminate(); + bool is_running(); + bool is_threadpool(); + + // Get/create the dispatcher for the current thread + static Dispatcher ¤t(); + // Get a default background thread to dispatch work to + static Dispatcher &background(); + // Create a new background dispatcher thread and return the dispatcher for it + static Dispatcher &get_named(const char *name); + static Dispatcher &create_new(const char *name); + + // Perform an action on the dispatcher thread. Block until the action is + // complete. + void invoke(Action action); + // Queue an action on the dispatcher thread and return immediately. + void post(Action &&action, int64_t delay_ms = 0); + void post_copy(Action action, int64_t delay_ms = 0); + + boost::asio::io_service *io_service(); + + private: + BTS_NO_COPY(Dispatcher); + friend struct DispatcherTimerImpl; + std::unique_ptr _me; +}; + +class BTS_EXPORT DispatcherTimer { + public: + DispatcherTimer(Dispatcher &dispatcher, int64_t time_ms, Action cb); + DispatcherTimer(DispatcherTimer &&other); + ~DispatcherTimer(); + void start(); + void stop(); + + bool running(); + void set_interval(int64_t time_ms); + void set_callback(Action cb); + + private: + BTS_NO_COPY(DispatcherTimer); + std::unique_ptr _me; +}; + +} // namespace utils +} // namespace bts + +#endif diff --git a/src/lib_system/system/type_name.h b/src/lib_system/system/type_name.h new file mode 100644 index 000000000..a11458784 --- /dev/null +++ b/src/lib_system/system/type_name.h @@ -0,0 +1,28 @@ +#pragma once + +#ifdef __GNUC__ +#include +#endif + +namespace bts { +namespace utils { +template const char *type_name() { +#ifdef __GNUC__ + int status; + return abi::__cxa_demangle(typeid(T).name(), 0, 0, &status); +#else + return typeid(T).name(); +#endif +} + +inline const char *type_name(std::type_info const &ti) { +#ifdef __GNUC__ + int status; + return abi::__cxa_demangle(ti.name(), 0, 0, &status); +#else + return ti.name(); +#endif +} + +} // namespace utils +} // namespace bts