From b58be00de0e71265b8a0e1fbf358f5ddf9bb7c96 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Thu, 15 Aug 2024 20:58:00 +0000 Subject: [PATCH] refactor: Add lib_system proj for common utils Migrates the following: * Delegate.h * bts_array_size.h * string_utils.h Note: File names in the new lib are snake_case (this seems to be the standard naming convention for c++). --- CMakeLists.txt | 1 + .../md/binance/BinanceSecurityRequestor.h | 2 +- .../binance_us/BinanceUsSecurityRequestor.h | 2 +- .../BinanceUsdsFuturesSecurityRequestor.h | 2 +- .../sparkd/md/ccapi/CCApiMessageHandler.h | 2 +- src/app_sparkd/sparkd/md/ccapi/CCApiSession.h | 2 +- .../md/coinbase/CoinbaseSecurityRequestor.h | 2 +- .../sparkd/md/deribit/DeribitChannelDemuxer.h | 2 +- .../md/deribit/DeribitSecurityRequestor.h | 2 +- .../sparkd/md/ftx/FTXSecurityRequestor.h | 2 +- .../sparkd/md/okx/OkxChannelDemuxer.h | 2 +- .../cmake/GetLinuxServerLinkLibraries.cmake | 1 + .../spark/config/ConfigurationState.cpp | 13 ++- .../spark/io/websocket/JsonRpcHandler.h | 2 +- .../spark/io/websocket/JsonRpcRouter.h | 2 +- src/lib_spark/spark/md/IntPrice.h | 2 +- src/lib_spark/spark/md/PriceSize.h | 1 - src/lib_spark/spark/md/Shm/FixedSecurity.h | 2 +- src/lib_spark/spark/os/os.cpp | 2 +- src/lib_spark/spark/tracing/PerfLog.cpp | 2 +- src/lib_spark/spark/utils/SharedList.h | 2 +- src/lib_spark/spark/utils/Uuid.cpp | 3 +- src/lib_spark/spark/utils/Uuid.h | 2 +- src/lib_system/CMakeLists.txt | 6 + src/lib_system/Config.cmake.in | 5 + .../system}/bts_array_size.h | 0 .../system/delegate.h} | 0 src/lib_system/system/string_utils.h | 108 ++++++++++++++++++ 28 files changed, 151 insertions(+), 23 deletions(-) create mode 100644 src/lib_system/CMakeLists.txt create mode 100644 src/lib_system/Config.cmake.in rename src/{lib_spark/spark/utils => lib_system/system}/bts_array_size.h (100%) rename src/{lib_spark/spark/utils/Delegate.h => lib_system/system/delegate.h} (100%) create mode 100644 src/lib_system/system/string_utils.h diff --git a/CMakeLists.txt b/CMakeLists.txt index f23eaea50..2448ff042 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -104,6 +104,7 @@ else() # subdirs if (BUILD_SPARKD) + add_subdirectory(src/lib_system) add_subdirectory(src/app_sparkd) add_subdirectory(src/data_files) endif() diff --git a/src/app_sparkd/sparkd/md/binance/BinanceSecurityRequestor.h b/src/app_sparkd/sparkd/md/binance/BinanceSecurityRequestor.h index 3ca0a893b..745727089 100644 --- a/src/app_sparkd/sparkd/md/binance/BinanceSecurityRequestor.h +++ b/src/app_sparkd/sparkd/md/binance/BinanceSecurityRequestor.h @@ -1,6 +1,6 @@ #pragma once -#include "spark/utils/Delegate.h" +#include "system/delegate.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance_us/BinanceUsSecurityRequestor.h b/src/app_sparkd/sparkd/md/binance_us/BinanceUsSecurityRequestor.h index c33cf728b..ea7f15849 100644 --- a/src/app_sparkd/sparkd/md/binance_us/BinanceUsSecurityRequestor.h +++ b/src/app_sparkd/sparkd/md/binance_us/BinanceUsSecurityRequestor.h @@ -1,6 +1,6 @@ #pragma once -#include "spark/utils/Delegate.h" +#include "system/delegate.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSecurityRequestor.h b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSecurityRequestor.h index a7c450b75..27536073f 100644 --- a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSecurityRequestor.h +++ b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSecurityRequestor.h @@ -1,6 +1,6 @@ #pragma once -#include "spark/utils/Delegate.h" +#include "system/delegate.h" #include #include diff --git a/src/app_sparkd/sparkd/md/ccapi/CCApiMessageHandler.h b/src/app_sparkd/sparkd/md/ccapi/CCApiMessageHandler.h index 8427196d0..bde1d1a08 100644 --- a/src/app_sparkd/sparkd/md/ccapi/CCApiMessageHandler.h +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiMessageHandler.h @@ -2,7 +2,7 @@ #include "sparkd/md/ccapi/CCApiCorrelationID.h" #include "sparkd/md/ccapi/ICCApiMessageHandler.h" -#include "spark/utils/Delegate.h" +#include "system/delegate.h" #include #include diff --git a/src/app_sparkd/sparkd/md/ccapi/CCApiSession.h b/src/app_sparkd/sparkd/md/ccapi/CCApiSession.h index 4cca12e1f..d7403d61d 100644 --- a/src/app_sparkd/sparkd/md/ccapi/CCApiSession.h +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiSession.h @@ -1,8 +1,8 @@ #pragma once -#include "spark/utils/Delegate.h" #include "sparkd/md/ccapi/CCApiCorrelationID.h" #include "sparkd/md/ccapi/ICCApiMessageHandler.h" +#include "system/delegate.h" #include #include diff --git a/src/app_sparkd/sparkd/md/coinbase/CoinbaseSecurityRequestor.h b/src/app_sparkd/sparkd/md/coinbase/CoinbaseSecurityRequestor.h index 5376f206a..a9baec814 100644 --- a/src/app_sparkd/sparkd/md/coinbase/CoinbaseSecurityRequestor.h +++ b/src/app_sparkd/sparkd/md/coinbase/CoinbaseSecurityRequestor.h @@ -1,6 +1,6 @@ #pragma once -#include "spark/utils/Delegate.h" +#include "system/delegate.h" #include #include diff --git a/src/app_sparkd/sparkd/md/deribit/DeribitChannelDemuxer.h b/src/app_sparkd/sparkd/md/deribit/DeribitChannelDemuxer.h index 98251e62b..3f88340b8 100644 --- a/src/app_sparkd/sparkd/md/deribit/DeribitChannelDemuxer.h +++ b/src/app_sparkd/sparkd/md/deribit/DeribitChannelDemuxer.h @@ -1,7 +1,7 @@ #pragma once -#include "spark/utils/Delegate.h" #include "sparkd/md/ccapi/ICCApiMessageHandler.h" +#include "system/delegate.h" #include #include diff --git a/src/app_sparkd/sparkd/md/deribit/DeribitSecurityRequestor.h b/src/app_sparkd/sparkd/md/deribit/DeribitSecurityRequestor.h index a36c8f984..ceda211e3 100644 --- a/src/app_sparkd/sparkd/md/deribit/DeribitSecurityRequestor.h +++ b/src/app_sparkd/sparkd/md/deribit/DeribitSecurityRequestor.h @@ -1,6 +1,6 @@ #pragma once -#include "spark/utils/Delegate.h" +#include "system/delegate.h" #include #include diff --git a/src/app_sparkd/sparkd/md/ftx/FTXSecurityRequestor.h b/src/app_sparkd/sparkd/md/ftx/FTXSecurityRequestor.h index 148507bbe..950b0a090 100644 --- a/src/app_sparkd/sparkd/md/ftx/FTXSecurityRequestor.h +++ b/src/app_sparkd/sparkd/md/ftx/FTXSecurityRequestor.h @@ -1,6 +1,6 @@ #pragma once -#include "spark/utils/Delegate.h" +#include "system/delegate.h" #include #include diff --git a/src/app_sparkd/sparkd/md/okx/OkxChannelDemuxer.h b/src/app_sparkd/sparkd/md/okx/OkxChannelDemuxer.h index 052df0390..3152d484e 100644 --- a/src/app_sparkd/sparkd/md/okx/OkxChannelDemuxer.h +++ b/src/app_sparkd/sparkd/md/okx/OkxChannelDemuxer.h @@ -1,8 +1,8 @@ #pragma once -#include "spark/utils/Delegate.h" #include "sparkd/md/ccapi/CCApiCorrelationID.h" #include "sparkd/md/ccapi/ICCApiMessageHandler.h" +#include "system/delegate.h" #include diff --git a/src/lib_spark/cmake/GetLinuxServerLinkLibraries.cmake b/src/lib_spark/cmake/GetLinuxServerLinkLibraries.cmake index 84fee5adf..5cff8b3c5 100644 --- a/src/lib_spark/cmake/GetLinuxServerLinkLibraries.cmake +++ b/src/lib_spark/cmake/GetLinuxServerLinkLibraries.cmake @@ -1,5 +1,6 @@ function(get_link_libraries dest) set(${dest} + system protobuf double-conversion boost_system diff --git a/src/lib_spark/spark/config/ConfigurationState.cpp b/src/lib_spark/spark/config/ConfigurationState.cpp index 53b4c20b4..7a38c7c39 100644 --- a/src/lib_spark/spark/config/ConfigurationState.cpp +++ b/src/lib_spark/spark/config/ConfigurationState.cpp @@ -10,10 +10,10 @@ #include "spark/core/FMT.h" #include "spark/io/ProtoPrinter.h" #include "spark/os/os.h" -#include "spark/utils/bts_array_size.h" #include "spark/utils/bts_assert.h" #include "spark/utils/defer.h" #include "spark/utils/is_unittest_environment.h" +#include "system/bts_array_size.h" #include "spark/config/protos/system_config.pb.h" @@ -113,7 +113,7 @@ string ConfigurationState::settings_path() { void ConfigurationState::initialize_defaults(ConfigLog &log) { initialize_defaults( - log, {"lib/config/protos/", "lib/api/domain/", "lib/api/md/"}); + log, {"spark/config/protos/", "spark/api/domain/", "spark/api/md/"}); } void ConfigurationState::initialize_defaults( @@ -226,8 +226,15 @@ void ConfigurationState::initialize_builtins(ConfigLog *log) { // // Add the System value to the defaults + const proto::Descriptor *defaults_desc = _defaults->GetDescriptor(); + bts_assert_msg( + defaults_desc != nullptr, + "Failed to get descriptor for config defaults"); const proto::FieldDescriptor *field_desc = - _defaults->GetDescriptor()->FindFieldByName("SystemConfig"); + defaults_desc->FindFieldByName("SystemConfig"); + bts_assert_msg( + field_desc != nullptr, + "Failed to get descriptor for config defaults field SystemConfig"); const proto::Descriptor *message_desc = field_desc->message_type(); // Create a meta message diff --git a/src/lib_spark/spark/io/websocket/JsonRpcHandler.h b/src/lib_spark/spark/io/websocket/JsonRpcHandler.h index 642dc7f0a..7eb3a61a1 100644 --- a/src/lib_spark/spark/io/websocket/JsonRpcHandler.h +++ b/src/lib_spark/spark/io/websocket/JsonRpcHandler.h @@ -5,7 +5,7 @@ #include "spark/io/websocket/JsonRpcError.h" #include "spark/io/websocket/JsonRpcRequest.h" #include "spark/io/websocket/JsonRpcResponse.h" -#include "spark/utils/Delegate.h" +#include "system/delegate.h" #include #include diff --git a/src/lib_spark/spark/io/websocket/JsonRpcRouter.h b/src/lib_spark/spark/io/websocket/JsonRpcRouter.h index f580051d8..5366f1318 100644 --- a/src/lib_spark/spark/io/websocket/JsonRpcRouter.h +++ b/src/lib_spark/spark/io/websocket/JsonRpcRouter.h @@ -5,7 +5,7 @@ #include "spark/io/websocket/JsonRpcError.h" #include "spark/io/websocket/JsonRpcRequest.h" #include "spark/io/websocket/JsonRpcResponse.h" -#include "spark/utils/Delegate.h" +#include "system/delegate.h" #include #include diff --git a/src/lib_spark/spark/md/IntPrice.h b/src/lib_spark/spark/md/IntPrice.h index 242ed36e8..ecf4edfa1 100644 --- a/src/lib_spark/spark/md/IntPrice.h +++ b/src/lib_spark/spark/md/IntPrice.h @@ -1,7 +1,7 @@ #pragma once #include "spark/domain_model/Security.pb.h" -#include "spark/utils/bts_array_size.h" #include "spark/utils/bts_assert.h" +#include "system/bts_array_size.h" namespace bts { namespace md { diff --git a/src/lib_spark/spark/md/PriceSize.h b/src/lib_spark/spark/md/PriceSize.h index 6981862bc..c99d1d4e8 100644 --- a/src/lib_spark/spark/md/PriceSize.h +++ b/src/lib_spark/spark/md/PriceSize.h @@ -6,7 +6,6 @@ #include "spark/os/os.h" #include "spark/utils/Optimistic.h" -#include "spark/utils/bts_array_size.h" #include "spark/utils/bts_assert.h" #include "spark/utils/bts_no_copy.h" #include "spark/utils/warn_ctrl.h" diff --git a/src/lib_spark/spark/md/Shm/FixedSecurity.h b/src/lib_spark/spark/md/Shm/FixedSecurity.h index e49f41242..55f589dac 100644 --- a/src/lib_spark/spark/md/Shm/FixedSecurity.h +++ b/src/lib_spark/spark/md/Shm/FixedSecurity.h @@ -6,12 +6,12 @@ #include "spark/io/JsonDumper.h" #include "spark/io/JsonReader.h" #include "spark/utils/ValueWrapper.h" -#include "spark/utils/bts_array_size.h" #include "spark/utils/bts_assert.h" #include "spark/utils/bts_export.h" #include "spark/utils/bts_no_copy.h" #include "spark/utils/warn_ctrl.h" #include "spark/domain_model/SecurityKey.h" +#include "system/bts_array_size.h" #include #include diff --git a/src/lib_spark/spark/os/os.cpp b/src/lib_spark/spark/os/os.cpp index 8027e84e8..9cbee4fa9 100644 --- a/src/lib_spark/spark/os/os.cpp +++ b/src/lib_spark/spark/os/os.cpp @@ -2,10 +2,10 @@ #include "spark/config/config.h" #include "spark/config/protos/system_config.pb.h" #include "spark/os/app_data_dir.h" -#include "spark/utils/bts_array_size.h" #include "spark/utils/bts_assert.h" #include "spark/utils/bts_debugger.h" #include "spark/utils/helper_macros.h" +#include "system/bts_array_size.h" #include #include diff --git a/src/lib_spark/spark/tracing/PerfLog.cpp b/src/lib_spark/spark/tracing/PerfLog.cpp index 07947b3c8..3f6880866 100644 --- a/src/lib_spark/spark/tracing/PerfLog.cpp +++ b/src/lib_spark/spark/tracing/PerfLog.cpp @@ -3,10 +3,10 @@ #include "spark/config/protos/perflog_cfg.pb.h" #include "spark/config/protos/system_config.pb.h" #include "spark/persistence/persistence_utils.h" -#include "spark/utils/bts_array_size.h" #include "spark/utils/datetime.h" #include "spark/utils/stats.h" #include "spark/utils/thread_manager.h" +#include "system/bts_array_size.h" #include #include diff --git a/src/lib_spark/spark/utils/SharedList.h b/src/lib_spark/spark/utils/SharedList.h index 1a793a554..356cc8196 100644 --- a/src/lib_spark/spark/utils/SharedList.h +++ b/src/lib_spark/spark/utils/SharedList.h @@ -2,10 +2,10 @@ #include "spark/logging/logging.h" #include "spark/utils/SharedMemory.h" -#include "spark/utils/bts_array_size.h" #include "spark/utils/bts_assert.h" #include "spark/utils/bts_no_copy.h" #include "spark/utils/defer.h" +#include "system/bts_array_size.h" #include "spark/config/config.h" #include "spark/config/protos/system_config.pb.h" diff --git a/src/lib_spark/spark/utils/Uuid.cpp b/src/lib_spark/spark/utils/Uuid.cpp index b79bbf174..30f0b2cdc 100644 --- a/src/lib_spark/spark/utils/Uuid.cpp +++ b/src/lib_spark/spark/utils/Uuid.cpp @@ -1,8 +1,9 @@ #include "Uuid.h" -#include "bts_array_size.h" #include "bts_assert.h" #include "spark/os/os.h" +#include "system/bts_array_size.h" + #include #include #include diff --git a/src/lib_spark/spark/utils/Uuid.h b/src/lib_spark/spark/utils/Uuid.h index c77d8c4f8..45596dae8 100644 --- a/src/lib_spark/spark/utils/Uuid.h +++ b/src/lib_spark/spark/utils/Uuid.h @@ -1,7 +1,7 @@ #pragma once -#include "bts_array_size.h" #include "bts_export.h" +#include "system/bts_array_size.h" #include #include diff --git a/src/lib_system/CMakeLists.txt b/src/lib_system/CMakeLists.txt new file mode 100644 index 000000000..75049ab98 --- /dev/null +++ b/src/lib_system/CMakeLists.txt @@ -0,0 +1,6 @@ +cmake_minimum_required(VERSION 3.23) +project(system) +include(${CMAKE_SOURCE_DIR}/cmake/InstallBasic.cmake) + +add_library(${PROJECT_NAME} INTERFACE) +install_basic() diff --git a/src/lib_system/Config.cmake.in b/src/lib_system/Config.cmake.in new file mode 100644 index 000000000..8c9ad12aa --- /dev/null +++ b/src/lib_system/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/utils/bts_array_size.h b/src/lib_system/system/bts_array_size.h similarity index 100% rename from src/lib_spark/spark/utils/bts_array_size.h rename to src/lib_system/system/bts_array_size.h diff --git a/src/lib_spark/spark/utils/Delegate.h b/src/lib_system/system/delegate.h similarity index 100% rename from src/lib_spark/spark/utils/Delegate.h rename to src/lib_system/system/delegate.h diff --git a/src/lib_system/system/string_utils.h b/src/lib_system/system/string_utils.h new file mode 100644 index 000000000..033a7755c --- /dev/null +++ b/src/lib_system/system/string_utils.h @@ -0,0 +1,108 @@ +#pragma once + +#include +#include +#include + +namespace bts::system::string_utils { + +void snake_to_pascal_case(std::string &str); + +template +std::vector split(Range range, const std::string &delimiter); + +template +std::vector split( + Iterator first, Iterator last, const std::string &delimiter); + +template +void split( + Iterator first, + Iterator last, + const std::string &delimiter, + std::vector &parts); + +////////////////////////////////////////////////// +// Definition +////////////////////////////////////////////////// + +inline void snake_to_pascal_case(std::string &str) { + std::size_t n = 0; + // Remove leading '_' + while (!str.empty() && str[0] == '_') { + n++; + } + if (n > 0) { + str.erase(0, n); + } + std::size_t pos = 0; + // Remove middle '_' (word delimiter), capitalize first letter of words + for (n = 0; n < str.size();) { + str[n] = toupper(str[n]); + pos = ++n; + while (n < str.size() && str[n] == '_') { + n++; + } + if (n > pos) { + str.erase(pos, n - pos); + } + } + // Remove trailing '_' + while (!str.empty() && str.back() == '_') { + n++; + } + if (n > 0) { + str.erase(str.size() - n); + } +} + +template +std::vector split(Range range, const std::string &delimiter) { + std::vector parts; + split(range.begin(), range.end(), delimiter, parts); + return parts; +} + +template +std::vector split( + Iterator first, Iterator last, const std::string &delimiter) { + std::vector parts; + split(first, last, delimiter, parts); + return parts; +} + +template +void split( + Iterator first, + Iterator last, + const std::string &delimiter, + std::vector &parts) { + + auto cursor = first; + auto curr_end = first; + auto curr_start = first; + + auto find_delim = [&cursor, &delimiter, &last]() { + for (auto it = cursor; it != last; it++) { + if (*it == delimiter[0]) { + if (std::equal( + it + 1, it + delimiter.size(), delimiter.begin() + 1, + delimiter.end())) { + return it; + } + } + } + return last; + }; + + while ((curr_end = find_delim()) != last) { + parts.push_back(std::string(curr_start, curr_end)); + curr_start = curr_end + delimiter.size(); + cursor = curr_end + delimiter.size(); + } + if (cursor != last) { + parts.push_back(std::string(cursor, last)); + } +} + +} // namespace bts::system::string_utils