diff --git a/docker/linux b/docker/linux index d4a32d325..41523ccab 160000 --- a/docker/linux +++ b/docker/linux @@ -1 +1 @@ -Subproject commit d4a32d32592c688c3a1f042750fd3323bcdfd38a +Subproject commit 41523ccab74b95bb007d9b9330d52c0f9e12dd1e diff --git a/externals b/externals index 2ddd46715..50fc23d3c 160000 --- a/externals +++ b/externals @@ -1 +1 @@ -Subproject commit 2ddd4671513460faf006cd89a851937575cbc9c3 +Subproject commit 50fc23d3cef1156c8c93af919a51052da52cc697 diff --git a/src/server/sparkd/CMakeDeps.cmake b/src/server/sparkd/CMakeDeps.cmake index 51d1cf7ea..2273b9f4e 100644 --- a/src/server/sparkd/CMakeDeps.cmake +++ b/src/server/sparkd/CMakeDeps.cmake @@ -1 +1 @@ -set(sources ;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/Md.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/TestOrderman.cpp;event_grid/EventNode.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/Market.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/store_tests.cpp;main.cpp;md/platforms/celoxica/CXListener.cpp;md/platforms/celoxica/CXMain.cpp;md/platforms/celoxica/tests/cx_tests.cpp;md/platforms/mdp3_onixs/MDP3Listener.cpp;md/platforms/mdp3_onixs/MDP3Main.cpp;md/platforms/mdp3_onixs/MDP3Utils.cpp;md/platforms/mdp3_onixs/tests/mdp3_tests.cpp;md/run_md.cpp;orderman/components/FillRecorder.cpp;orderman/components/Gateway.cpp;orderman/components/MDSource.cpp;orderman/components/NativeOrderMan.cpp;orderman/components/OrderRecorder.cpp;orderman/components/SpreaderOrderMan.cpp;orderman/events/ExecutionReport.cpp;orderman/events/NativeOrderStateChange.cpp;orderman/events/SpreaderOrderStateChange.cpp;orderman/events/TimeChange.cpp;orderman/native_orders/NativeOrder.cpp;orderman/native_orders/NativeOrderBuilder.cpp;orderman/native_orders/NativeOrderFactory.cpp;orderman/persistence/FillDB.cpp;orderman/persistence/OrderDB.cpp;orderman/persistence/gen_order_id.cpp;orderman/service/OrderServiceServer.cpp;orderman/spreader_orders/SpreaderOrder.cpp;orderman/spreader_orders/SpreaderOrderBase.cpp;orderman/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForFirstConnStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/tests/spreader_order_tests.cpp;orderman/utils/fix_order_codec.cpp;orderman/utils/orderman_utils.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/tests/PersistenceServiceTests.cpp;risk_limits/IRiskLimitObserver.cpp;risk_limits/RiskLimitManager.cpp;risk_limits/RiskLimiter.cpp;risk_limits/SharedRiskLimiter.cpp;risk_limits/SymbolKey.cpp;risk_limits/tests/RiskLimitsTests.cpp;securities/SecurityDB.cpp;spreader/QuoteLegPriceQuantityState.cpp;spreader/SingleFillHedger.cpp;spreader/SingleLegQuoter.cpp;spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;testing/catch_test_runner.cpp;user/UserServiceServer.cpp) \ No newline at end of file +set(sources ;cmds/Benchmark.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/Md.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/TestOrderman.cpp;event_grid/EventNode.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/Market.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/store_tests.cpp;main.cpp;md/platforms/celoxica/CXListener.cpp;md/platforms/celoxica/CXMain.cpp;md/platforms/celoxica/tests/cx_tests.cpp;md/platforms/mdp3_onixs/MDP3Listener.cpp;md/platforms/mdp3_onixs/MDP3Main.cpp;md/platforms/mdp3_onixs/MDP3Utils.cpp;md/platforms/mdp3_onixs/tests/mdp3_tests.cpp;md/run_md.cpp;orderman/components/FillRecorder.cpp;orderman/components/Gateway.cpp;orderman/components/MDSource.cpp;orderman/components/NativeOrderMan.cpp;orderman/components/OrderRecorder.cpp;orderman/components/SpreaderOrderMan.cpp;orderman/events/ExecutionReport.cpp;orderman/events/NativeOrderStateChange.cpp;orderman/events/SpreaderOrderStateChange.cpp;orderman/events/TimeChange.cpp;orderman/native_orders/NativeOrder.cpp;orderman/native_orders/NativeOrderBuilder.cpp;orderman/native_orders/NativeOrderFactory.cpp;orderman/persistence/FillDB.cpp;orderman/persistence/OrderDB.cpp;orderman/persistence/gen_order_id.cpp;orderman/service/OrderServiceServer.cpp;orderman/spreader_orders/SpreaderOrder.cpp;orderman/spreader_orders/SpreaderOrderBase.cpp;orderman/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForFirstConnStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/tests/spreader_order_tests.cpp;orderman/utils/fix_order_codec.cpp;orderman/utils/orderman_utils.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/tests/PersistenceServiceTests.cpp;risk_limits/IRiskLimitObserver.cpp;risk_limits/RiskLimitManager.cpp;risk_limits/RiskLimiter.cpp;risk_limits/SharedRiskLimiter.cpp;risk_limits/SymbolKey.cpp;risk_limits/tests/RiskLimitsTests.cpp;securities/SecurityDB.cpp;spreader/QuoteLegPriceQuantityState.cpp;spreader/SingleFillHedger.cpp;spreader/SingleLegQuoter.cpp;spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForCancelAckFinalStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForCancelAckReturnStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;testing/catch_test_runner.cpp;user/UserServiceServer.cpp) \ No newline at end of file diff --git a/src/server/sparkd/CMakeLists.txt b/src/server/sparkd/CMakeLists.txt index 54f29873a..950a4ea89 100644 --- a/src/server/sparkd/CMakeLists.txt +++ b/src/server/sparkd/CMakeLists.txt @@ -34,6 +34,7 @@ target_link_libraries( sparkd pugixml onixs-cmemdh-all-4.3.0 quickfix + benchmark -static-libgcc -static-libstdc++ -pthread) diff --git a/src/server/sparkd/cmds/Benchmark.cpp b/src/server/sparkd/cmds/Benchmark.cpp new file mode 100644 index 000000000..ac0f3b3fa --- /dev/null +++ b/src/server/sparkd/cmds/Benchmark.cpp @@ -0,0 +1,49 @@ +#include "Benchmark.h" +#include "server/sparkd/cmds/CmdRegistry.h" +#include + +#include + +namespace bts { +namespace cmd { + +static void BM_StringCreation(benchmark::State& state) { + for (auto _ : state) { + std::string empty_string; + benchmark::DoNotOptimize(empty_string.size()); + } +} + +// Register the function as a benchmark +BENCHMARK(BM_StringCreation); + +// Define another benchmark +static void BM_StringCopy(benchmark::State& state) { + std::string x = "hello"; + for (auto _ : state) { + std::string copy(x); + benchmark::DoNotOptimize(copy.size()); + } +} +BENCHMARK(BM_StringCopy); + +int Benchmark::execute(std::vector const &args) +{ + bts_assert(args.size() < 100); + int argc = args.size(); + char *argv[100]; + for (size_t i = 0; i < args.size();i++) + argv[i] = (char*) args[i].c_str(); + + benchmark::Initialize(&argc, argv); + benchmark::RunSpecifiedBenchmarks(); + return 0; +} + +std::string Benchmark::help () +{ + return "Run micro-benchmarks"; +} + +}} + diff --git a/src/server/sparkd/cmds/Benchmark.h b/src/server/sparkd/cmds/Benchmark.h new file mode 100644 index 000000000..78b248bec --- /dev/null +++ b/src/server/sparkd/cmds/Benchmark.h @@ -0,0 +1,17 @@ +#pragma once + +#include "ICmd.h" + +namespace bts { +namespace cmd { + +class Benchmark : public ICmd +{ +public: + int execute(std::vector const &args); + std::string help (); +}; + +}} + + diff --git a/src/server/sparkd/cmds/CmdRegistry.cpp b/src/server/sparkd/cmds/CmdRegistry.cpp index e8999a371..2d3f748dc 100755 --- a/src/server/sparkd/cmds/CmdRegistry.cpp +++ b/src/server/sparkd/cmds/CmdRegistry.cpp @@ -13,7 +13,7 @@ namespace cmd { std::map> CmdRegistry::_cmds; -int CmdRegistry::dispatch (int argc, const char **argv) +int CmdRegistry::dispatch (int argc, char **argv) { if (argc < 2) return _cmds["help"]->execute (std::vector ()); diff --git a/src/server/sparkd/cmds/CmdRegistry.h b/src/server/sparkd/cmds/CmdRegistry.h index 9bff8ea27..bab3ea91c 100755 --- a/src/server/sparkd/cmds/CmdRegistry.h +++ b/src/server/sparkd/cmds/CmdRegistry.h @@ -23,7 +23,7 @@ public: _cmds[lname].reset (new CMD ()); } static std::vector cmds (); - static int dispatch (int argc, const char **argv) ; + static int dispatch (int argc, char **argv) ; static ICmd * retrieve (std::string const &name); private: diff --git a/src/server/sparkd/main.cpp b/src/server/sparkd/main.cpp index 5dd678220..dcee14437 100644 --- a/src/server/sparkd/main.cpp +++ b/src/server/sparkd/main.cpp @@ -1,48 +1,42 @@ +#include "lib/logging/logging.h" #include "lib/os/os.h" #include "lib/utils/init_spark_lib.h" -#include "lib/logging/logging.h" #include "server/sparkd/cmds/CmdRegistry.h" #define BEGIN_CMD -#define REGISTER(CMD) bts::cmd::CmdRegistry::register_cmd (#CMD) -#define END_CMD return bts::cmd::CmdRegistry::dispatch (argc,argv) - - +#define REGISTER(CMD) bts::cmd::CmdRegistry::register_cmd(#CMD) +#define END_CMD return bts::cmd::CmdRegistry::dispatch(argc, argv) // to add a command add the header here and the the REGISTER call below // don't touch this file except to add commands. -#include "server/sparkd/cmds/Test.h" -#include "server/sparkd/cmds/Run.h" -#include "server/sparkd/cmds/Help.h" -#include "server/sparkd/cmds/TestOrderman.h" -#include "server/sparkd/cmds/TestCeloxica.h" -#include "server/sparkd/cmds/Md.h" +#include "server/sparkd/cmds/Benchmark.h" #include "server/sparkd/cmds/ConfigCheck.h" +#include "server/sparkd/cmds/Help.h" +#include "server/sparkd/cmds/Md.h" +#include "server/sparkd/cmds/Run.h" #include "server/sparkd/cmds/RunSim.h" +#include "server/sparkd/cmds/Test.h" +#include "server/sparkd/cmds/TestCeloxica.h" +#include "server/sparkd/cmds/TestOrderman.h" -int main( int argc, const char*argv[] ) -{ - using namespace bts; - - os::set_thread_name("main"); - utils::init_spark_lib(); +int main(int argc, char **argv) { + using namespace bts; + os::set_thread_name("main"); + utils::init_spark_lib(); - BEGIN_CMD; - REGISTER (Test); - REGISTER (Help); - REGISTER (Run); - REGISTER (Md); - REGISTER (TestOrderman); - REGISTER (TestCeloxica); - REGISTER (ConfigCheck); - REGISTER (RunSim); - END_CMD; + BEGIN_CMD; + REGISTER(Test); + REGISTER(Help); + REGISTER(Run); + REGISTER(Md); + REGISTER(TestOrderman); + REGISTER(TestCeloxica); + REGISTER(ConfigCheck); + REGISTER(RunSim); + REGISTER(Benchmark); + END_CMD; - utils::finit_spark_lib(); - return 0; + utils::finit_spark_lib(); + return 0; } - - - - diff --git a/src/server/sparkd/orderman/components/NativeOrderMan.h b/src/server/sparkd/orderman/components/NativeOrderMan.h index 2e0f938d5..7bc5bb728 100644 --- a/src/server/sparkd/orderman/components/NativeOrderMan.h +++ b/src/server/sparkd/orderman/components/NativeOrderMan.h @@ -59,8 +59,8 @@ private: enum class State; struct PImpl; std::unique_ptr me; - const char* state_name(State new_state); - void transition(State new_state); + const char* state_name(State); + void transition(State); void pre_allocate_buffers(); jetfix::OutFIXPtr get_fix_bufer(); };