From ef00559f1e6dc18753d648390d0592aca2e54504 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Sat, 24 Nov 2018 18:40:22 +0000 Subject: [PATCH 001/107] Removed unused OrderManager codes. --- src/lib/CMakeDeps.cmake | 2 +- src/lib/orderman/actors/order_manager/OrderManager.cpp | 5 ----- src/lib/orderman/actors/order_manager/OrderServices.h | 4 ---- src/lib/orderman/actors/order_manager/OrderServicesData.h | 4 ---- src/web/CMakeDeps.cmake | 2 +- 5 files changed, 2 insertions(+), 15 deletions(-) diff --git a/src/lib/CMakeDeps.cmake b/src/lib/CMakeDeps.cmake index 1552418c6..7e2ae126f 100644 --- a/src/lib/CMakeDeps.cmake +++ b/src/lib/CMakeDeps.cmake @@ -1 +1 @@ -set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/services/UserService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/Executor.conf;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/thread_manager.cpp) \ No newline at end of file +set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/services/UserService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/Executor.conf;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/PerfTraceLog.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/IcebergOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder (pp-6's conflicted copy 2018-11-23).cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/book_algos/BookAlgo (pp-6's conflicted copy 2018-11-23).cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/CoverOrder.cpp;orderman/orders/book_algos/JoinOrder.cpp;orderman/orders/book_algos/LeanOrder.cpp;orderman/orders/book_algos/OffsetOrder.cpp;orderman/orders/book_algos/TickOrder.cpp;orderman/orders/book_algos/TopOrder.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;orderman2/OrderManager2.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/thread_manager.cpp) \ No newline at end of file diff --git a/src/lib/orderman/actors/order_manager/OrderManager.cpp b/src/lib/orderman/actors/order_manager/OrderManager.cpp index fe06f382d..f20dfeffb 100644 --- a/src/lib/orderman/actors/order_manager/OrderManager.cpp +++ b/src/lib/orderman/actors/order_manager/OrderManager.cpp @@ -394,11 +394,6 @@ void OrderManager::init_order_services() { [this](auto const &ev) { this->on_new_fix_buffer(ev); }); // Outputs - me->services_data.activate_order_pub = make_stream(); - me->services_data.update_order_pub = make_stream(); - me->services_data.cancel_order_pub = make_stream(); - me->services_data.crack_order_pub = make_stream(); - me->services_data.create_order_req_pub = make_stream(); me->services_data.create_fix_req_pub = diff --git a/src/lib/orderman/actors/order_manager/OrderServices.h b/src/lib/orderman/actors/order_manager/OrderServices.h index ac5826b57..a586f2d7f 100644 --- a/src/lib/orderman/actors/order_manager/OrderServices.h +++ b/src/lib/orderman/actors/order_manager/OrderServices.h @@ -96,10 +96,6 @@ class OrderServices { bts_assert(false); } - void schedule_action(std::function const &action) { - _data.owner.schedule_action(action); - } - private: friend class OrderBuilder; IOrderFactory &order_factory() { return _data.order_factory; } diff --git a/src/lib/orderman/actors/order_manager/OrderServicesData.h b/src/lib/orderman/actors/order_manager/OrderServicesData.h index 4b0f86f0b..70ecd12e6 100644 --- a/src/lib/orderman/actors/order_manager/OrderServicesData.h +++ b/src/lib/orderman/actors/order_manager/OrderServicesData.h @@ -93,10 +93,6 @@ public: std::unique_ptr> order_creation_subs; - mercury::Stream activate_order_pub; - mercury::Stream update_order_pub; - mercury::Stream cancel_order_pub; - mercury::Stream crack_order_pub; mercury::Stream create_order_req_pub; mercury::Stream create_fix_req_pub; mercury::Stream md_request_pub; diff --git a/src/web/CMakeDeps.cmake b/src/web/CMakeDeps.cmake index 050dc8062..65f907171 100644 --- a/src/web/CMakeDeps.cmake +++ b/src/web/CMakeDeps.cmake @@ -1 +1 @@ -set(sources ../../externals/linux/include/google/protobuf/descriptor.proto;../../externals/linux/include/google/protobuf/timestamp.proto;../lib/api/apicore.proto;../lib/api/apigateway.proto;../lib/api/apioptions.proto;../lib/api/services/AdminService.proto;../lib/api/services/ApiUnitTestService.proto;../lib/api/services/ErrorReportService.proto;../lib/api/services/HelloService.proto;../lib/api/services/MarketDataAuxiliaryService.proto;../lib/api/services/MarketDataRelay.proto;../lib/api/services/OrderService.proto;../lib/api/services/OutOfProcessURLListener.proto;../lib/api/services/PersistenceService.proto;../lib/api/services/PositionService.proto;../lib/api/services/ShellDiagnosticService.proto;../lib/api/services/ShellLatencyService.proto;../lib/api/services/SyntheticSecurityService.proto;../lib/api/services/UserService.proto;../lib/domain_model/Security.proto;../lib/md/protos/co2.proto;../lib/sparkproto/SparkProtos.proto;api/build.sh;api/node_modules/cssstyle/scripts/run_tests.sh;api/node_modules/exit/test/fixtures/create-files.sh;api/node_modules/protobufjs/cli/node_modules/acorn-jsx/node_modules/acorn/bin/update_authors.sh;api/node_modules/watch/release.sh;api/quiet_build.sh;api/src/DynamicService.ts;api/src/ServiceContext.ts;api/src/bts_assert.ts;ui/src/Access.fs;ui/src/Accounts/ClipLimits.fs;ui/src/Accounts/ProductLimits.fs;ui/src/Accounts/SecurityLimits.fs;ui/src/Accounts/State.fs;ui/src/Accounts/Types.fs;ui/src/Accounts/View.fs;ui/src/App.fs;ui/src/Cmd.fs;ui/src/Controls/Button.fs;ui/src/Controls/DataGrid.fs;ui/src/Controls/Fields.fs;ui/src/Controls/Modal.fs;ui/src/Controls/ReactGrid.fs;ui/src/Controls/Table.fs;ui/src/Controls/nbsp.fs;ui/src/Global.fs;ui/src/Imports.fs;ui/src/Lens.fs;ui/src/Login/Login.fs;ui/src/Nav.fs;ui/src/State.fs;ui/src/Types.fs;ui/src/Users/State.fs;ui/src/Users/Types.fs;ui/src/Users/View.fs;ui/src/Util/EnumUtils.fs;ui/src/Util/JSMap.fs) \ No newline at end of file +set(sources ../../externals/linux/include/google/protobuf/descriptor.proto;../../externals/linux/include/google/protobuf/timestamp.proto;../lib/api/apicore.proto;../lib/api/apigateway.proto;../lib/api/apioptions.proto;../lib/api/services/AdminService.proto;../lib/api/services/ApiUnitTestService.proto;../lib/api/services/ErrorReportService.proto;../lib/api/services/HelloService.proto;../lib/api/services/MarketDataAuxiliaryService.proto;../lib/api/services/MarketDataRelay.proto;../lib/api/services/OrderService.proto;../lib/api/services/OutOfProcessURLListener.proto;../lib/api/services/PersistenceService.proto;../lib/api/services/PositionService.proto;../lib/api/services/ShellDiagnosticService.proto;../lib/api/services/ShellLatencyService.proto;../lib/api/services/SyntheticSecurityService.proto;../lib/api/services/UserService.proto;../lib/domain_model/Security.proto;../lib/md/protos/co2.proto;../lib/sparkproto/SparkProtos.proto;api/build.sh;api/node_modules/exit/test/fixtures/create-files.sh;api/node_modules/protobufjs/cli/node_modules/acorn-jsx/node_modules/acorn/bin/update_authors.sh;api/node_modules/watch/release.sh;api/quiet_build.sh;api/src/DynamicService.ts;api/src/ServiceContext.ts;api/src/bts_assert.ts;ui/src/Access.fs;ui/src/Accounts/ClipLimits.fs;ui/src/Accounts/ProductLimits.fs;ui/src/Accounts/SecurityLimits.fs;ui/src/Accounts/State.fs;ui/src/Accounts/Types.fs;ui/src/Accounts/View.fs;ui/src/App.fs;ui/src/Cmd.fs;ui/src/Controls/Button.fs;ui/src/Controls/DataGrid.fs;ui/src/Controls/Fields.fs;ui/src/Controls/Modal.fs;ui/src/Controls/ReactGrid.fs;ui/src/Controls/Table.fs;ui/src/Controls/nbsp.fs;ui/src/Global.fs;ui/src/Imports.fs;ui/src/Lens.fs;ui/src/Login/Login.fs;ui/src/Nav.fs;ui/src/State.fs;ui/src/Types.fs;ui/src/Users/State.fs;ui/src/Users/Types.fs;ui/src/Users/View.fs;ui/src/Util/EnumUtils.fs;ui/src/Util/JSMap.fs) \ No newline at end of file From 5e1fd41935eb58af2a2787c6ce1ef170bfb5eeb6 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Sat, 24 Nov 2018 20:26:39 +0000 Subject: [PATCH 002/107] Ran clang-format. --- src/lib/CMakeDeps.cmake | 2 +- src/lib/orderman/actors/AsyncFactory.cpp | 106 ++- src/lib/orderman/actors/FillStore.cpp | 15 +- .../orderman/actors/MDSupplementarySource.cpp | 67 +- src/lib/orderman/actors/SODPosition.cpp | 223 ++--- src/lib/orderman/actors/SecuritySrc.cpp | 25 +- src/lib/orderman/actors/ServiceBridge.cpp | 9 +- .../actors/order_manager/ChildOrder.h | 83 +- .../actors/order_manager/OrderBuilder.cpp | 4 +- .../actors/order_manager/OrderManager.cpp | 8 +- .../actors/order_manager/OrderServices.h | 5 +- .../order_manager/OrderServicesData.cpp | 13 +- src/lib/orderman/events/CancelRejectEvent.cpp | 5 +- .../events/NewExecutionReportEvent.cpp | 6 +- src/lib/orderman/limiter/LimitStore.cpp | 112 +-- src/lib/orderman/limiter/Limiter.cpp | 137 ++- src/lib/orderman/limiter/ProductLimitNode.cpp | 33 +- src/lib/orderman/limiter/ProductLimitTree.cpp | 40 +- .../orderman/limiter/SecurityLimitNode.cpp | 32 +- .../orderman/limiter/SecurityLimitTree.cpp | 38 +- .../orderman/limiter/tests/limit_tests.cpp | 215 +++-- .../order_factory/DynamicOrderRegistry.cpp | 1 - .../orderman/order_factory/OrderFactory.cpp | 4 +- src/lib/orderman/order_router/OrderRouter.cpp | 4 +- src/lib/orderman/orders/IcebergOrder.cpp | 4 +- src/lib/orderman/orders/NativeOrder.cpp | 15 +- src/lib/orderman/orders/Order.cpp | 3 +- src/lib/orderman/orders/TimeBoxOrder.cpp | 79 +- src/lib/orderman/orders/TriggerOrder.cpp | 779 +++++++++--------- .../orderman/orders/book_algos/BookAlgo.cpp | 324 ++++---- .../orderman/orders/book_algos/CoverOrder.cpp | 116 ++- .../orderman/orders/book_algos/JoinOrder.cpp | 148 ++-- .../orderman/orders/book_algos/LeanOrder.cpp | 279 +++---- .../orders/book_algos/OffsetOrder.cpp | 107 ++- .../orderman/orders/book_algos/TickOrder.cpp | 230 +++--- .../orderman/orders/book_algos/TopOrder.cpp | 177 ++-- .../orderman/server/OrderServiceServer.cpp | 21 +- src/lib/orderman/tests/fat_wrapper_tests.cpp | 35 +- 38 files changed, 1702 insertions(+), 1802 deletions(-) diff --git a/src/lib/CMakeDeps.cmake b/src/lib/CMakeDeps.cmake index 7e2ae126f..cd221187f 100644 --- a/src/lib/CMakeDeps.cmake +++ b/src/lib/CMakeDeps.cmake @@ -1 +1 @@ -set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/services/UserService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/Executor.conf;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/PerfTraceLog.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/IcebergOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder (pp-6's conflicted copy 2018-11-23).cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/book_algos/BookAlgo (pp-6's conflicted copy 2018-11-23).cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/CoverOrder.cpp;orderman/orders/book_algos/JoinOrder.cpp;orderman/orders/book_algos/LeanOrder.cpp;orderman/orders/book_algos/OffsetOrder.cpp;orderman/orders/book_algos/TickOrder.cpp;orderman/orders/book_algos/TopOrder.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;orderman2/OrderManager2.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/thread_manager.cpp) \ No newline at end of file +set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/services/UserService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/Executor.conf;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/PerfTraceLog.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/IcebergOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/CoverOrder.cpp;orderman/orders/book_algos/JoinOrder.cpp;orderman/orders/book_algos/LeanOrder.cpp;orderman/orders/book_algos/OffsetOrder.cpp;orderman/orders/book_algos/TickOrder.cpp;orderman/orders/book_algos/TopOrder.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;orderman2/OrderManager2.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/thread_manager.cpp) \ No newline at end of file diff --git a/src/lib/orderman/actors/AsyncFactory.cpp b/src/lib/orderman/actors/AsyncFactory.cpp index 6a9bdd497..91b76045e 100644 --- a/src/lib/orderman/actors/AsyncFactory.cpp +++ b/src/lib/orderman/actors/AsyncFactory.cpp @@ -1,29 +1,24 @@ #include "AsyncFactory.h" -#include "lib/orderman/events/CreateOrderRequestEvent.h" -#include "lib/orderman/events/CreateOrderReplyEvent.h" -#include "lib/orderman/events/CreateFIXBufferRequestEvent.h" -#include "lib/orderman/events/CreateFIXBufferReplyEvent.h" -#include "lib/orderman/order_factory/OrderFactory.h" -#include "lib/orderman/events/NewSecuritiesEvent.h" -#include "lib/jetfix/common/OutFIX.h" -#include "lib/orderman/securities/MapSecurityDB.h" #include "lib/config/protos/jetfix.pb.h" -#include "lib/orderman/order_router/OrderRouter.h" +#include "lib/jetfix/common/OutFIX.h" +#include "lib/orderman/events/CreateFIXBufferReplyEvent.h" +#include "lib/orderman/events/CreateFIXBufferRequestEvent.h" +#include "lib/orderman/events/CreateOrderReplyEvent.h" +#include "lib/orderman/events/CreateOrderRequestEvent.h" #include "lib/orderman/events/NewAdminDataEvent.h" +#include "lib/orderman/events/NewSecuritiesEvent.h" +#include "lib/orderman/order_factory/OrderFactory.h" +#include "lib/orderman/order_router/OrderRouter.h" +#include "lib/orderman/securities/MapSecurityDB.h" namespace bts { namespace orderman { -struct AsyncFactory::PImpl -{ - PImpl(DynamicOrderRegistry const&b) : - orders_stream(), - fix_buffer_stream(), - db(), - order_router(), - order_factory(db,order_router,b) - {} +struct AsyncFactory::PImpl { + PImpl(DynamicOrderRegistry const &b) + : orders_stream(), fix_buffer_stream(), db(), order_router(), + order_factory(db, order_router, b) {} mercury::Stream orders_stream; mercury::Stream fix_buffer_stream; @@ -32,48 +27,49 @@ struct AsyncFactory::PImpl OrderFactory order_factory; }; -AsyncFactory::AsyncFactory(DynamicOrderRegistry const&b) : me(new PImpl(b)) {} -AsyncFactory::~AsyncFactory () {} +AsyncFactory::AsyncFactory(DynamicOrderRegistry const &b) : me(new PImpl(b)) {} +AsyncFactory::~AsyncFactory() {} -void AsyncFactory::init() -{ +void AsyncFactory::init() { me->orders_stream = make_stream(); - me->fix_buffer_stream = make_stream (); + me->fix_buffer_stream = make_stream(); subscribe([this](auto const &u) { - if (u.events) - for (auto ev : *(u.events)) - me->order_router.update(*ev.admin_data); - }); + if (u.events) + for (auto ev : *(u.events)) + me->order_router.update(*ev.admin_data); + }); - subscribe([this] (auto const&u) { - if (u.events) - for (auto const &ev : *(u.events)) - me->db.securities[SecurityKey(ev.security->id())] = ev.security; - }); - - subscribe([this] (const auto &u) { - if (u.events) - for (auto const &ev : *u.events) { - std::vector response; - response.reserve(ev.n_orders); - while (response.size() < ev.n_orders) - response.push_back(&me->order_factory.create(ev.parent_key,*ev.def)); - this->publish(me->orders_stream,ev.request_id,std::move(response)); - } - }); + subscribe([this](auto const &u) { + if (u.events) + for (auto const &ev : *(u.events)) + me->db.securities[SecurityKey(ev.security->id())] = ev.security; + }); - subscribe([this] (const auto &u) { - if (u.events) - for (auto const &ev : *u.events) { - std::vector response; - response.reserve(ev.n_buffers); - while (response.size() < ev.n_buffers) - response.push_back(std::make_shared (*ev.cfg)); - this->publish(me->fix_buffer_stream,std::move(response),ev.cfg); - } - }); + subscribe([this](const auto &u) { + if (u.events) + for (auto const &ev : *u.events) { + std::vector response; + response.reserve(ev.n_orders); + while (response.size() < ev.n_orders) + response.push_back( + &me->order_factory.create(ev.parent_key, *ev.def)); + this->publish(me->orders_stream, ev.request_id, + std::move(response)); + } + }); + + subscribe([this](const auto &u) { + if (u.events) + for (auto const &ev : *u.events) { + std::vector response; + response.reserve(ev.n_buffers); + while (response.size() < ev.n_buffers) + response.push_back(std::make_shared(*ev.cfg)); + this->publish(me->fix_buffer_stream, std::move(response), ev.cfg); + } + }); } - -}} +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/actors/FillStore.cpp b/src/lib/orderman/actors/FillStore.cpp index fe368bb32..a7d2fab18 100644 --- a/src/lib/orderman/actors/FillStore.cpp +++ b/src/lib/orderman/actors/FillStore.cpp @@ -19,7 +19,7 @@ enum class FillStore::State { WAIT_SEC, READY }; struct FillStore::UnresolvedFills { std::vector fills; - api::Security const* security; + api::Security const *security; }; struct FillStore::PImpl { @@ -145,13 +145,13 @@ void FillStore::on_execution_report( fill.mutable_timestamp()->set_seconds(tv.tv_sec); fill.mutable_timestamp()->set_nanos(tv.tv_usec * 1000); - auto order_def = me->known_orders[er.order_key]; if (order_def) fill.set_account(order_def->account()); else - me->fills_with_unresolved_accounts[er.order_key].fills.push_back(fill); - + me->fills_with_unresolved_accounts[er.order_key] + .fills.push_back(fill); + auto fv = utils::pb::to_string(fill); me->store->insert(fills_ns, fk, fv); publish(me->fill_stream, fill, *er.security); @@ -167,7 +167,7 @@ void FillStore::on_execution_report( void FillStore::on_order_state_update( mercury::Update const &u) { if (u.events) - for (auto const &ev : *u.events) { + for (auto const &ev : *u.events) { me->known_orders[ev.key] = ev.definition; // see if we can resolve the accounts for any fills that we @@ -177,11 +177,12 @@ void FillStore::on_order_state_update( f.set_account(ev.definition->account()); auto fv = utils::pb::to_string(f); me->store->update(fills_ns, f.fill_key(), fv); - publish(me->fill_stream,f, *unresolved_fills.security); + publish(me->fill_stream, f, *unresolved_fills.security); } unresolved_fills.fills.clear(); // end fill resolution } } -}} // namespace orderman +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/actors/MDSupplementarySource.cpp b/src/lib/orderman/actors/MDSupplementarySource.cpp index a9630b987..ae41824b1 100644 --- a/src/lib/orderman/actors/MDSupplementarySource.cpp +++ b/src/lib/orderman/actors/MDSupplementarySource.cpp @@ -1,10 +1,9 @@ #include "MDSupplementarySource.h" +#include "lib/logging/logging.h" +#include "lib/md/MDConsumer.h" +#include "lib/md/MDConsumerHandle.h" #include "lib/orderman/events/SettlementRequestEvent.h" #include "lib/orderman/events/SettlementUpdateEvent.h" -#include "lib/logging/logging.h" -#include "lib/md/MDConsumerHandle.h" -#include "lib/md/MDConsumer.h" -#include "lib/md/MDConsumer.h" #include "lib/os/os.h" namespace bts { @@ -15,45 +14,36 @@ struct HandleRecord { md::IntPrice settlement_price; }; -struct MDSupplementarySource::PImpl -{ - PImpl(md::MDConsumer& md_consumer) - : - md_consumer(md_consumer), - handle_map(), - settlement_update(){ - } +struct MDSupplementarySource::PImpl { + PImpl(md::MDConsumer &md_consumer) + : md_consumer(md_consumer), handle_map(), settlement_update() {} md::MDConsumer md_consumer; // list of sec subscriptions vs their handles std::map handle_map; mercury::Stream settlement_update; }; -MDSupplementarySource::MDSupplementarySource(md::MDConsumer& md_consumer) -: -me(new PImpl(md_consumer)){ -} +MDSupplementarySource::MDSupplementarySource(md::MDConsumer &md_consumer) + : me(new PImpl(md_consumer)) {} -MDSupplementarySource::~MDSupplementarySource(){ -} +MDSupplementarySource::~MDSupplementarySource() {} -void MDSupplementarySource::init(){ - me->settlement_update=make_stream(); +void MDSupplementarySource::init() { + me->settlement_update = make_stream(); subscribe([this](auto const &update) { if (update.events) { for (auto const &ev : *update.events) { auto k = ev.security_key.value(); auto it = me->handle_map.find(k); - if(it ==me->handle_map.end()){ + if (it == me->handle_map.end()) { LOG(OrderMan, Info, "MDSupplementarySource::init key:{}", k); - me->handle_map[k]={me->md_consumer.get_handle(k),md::INT_NAN}; - } - else { + me->handle_map[k] = {me->md_consumer.get_handle(k), md::INT_NAN}; + } else { // late joiners auto const &hr = it->second; if (!hr.settlement_price.is_nan()) { - SettlementUpdateEvent ev(hr.settlement_price,SecurityKey(k)); - publish(me->settlement_update,ev); + SettlementUpdateEvent ev(hr.settlement_price, SecurityKey(k)); + publish(me->settlement_update, ev); } } } @@ -61,21 +51,22 @@ void MDSupplementarySource::init(){ }); } -void MDSupplementarySource::on_poll(){ - for(auto& kvp : me->handle_map){ - SecurityKey key(kvp.first); - HandleRecord& hr=kvp.second; +void MDSupplementarySource::on_poll() { + for (auto &kvp : me->handle_map) { + SecurityKey key(kvp.first); + HandleRecord &hr = kvp.second; auto settlement_price = hr.handle.settlement_price(); - if(!settlement_price.is_nan() && - settlement_price!=hr.settlement_price){ + if (!settlement_price.is_nan() && + settlement_price != hr.settlement_price) { LOG(OrderMan, Info, - "MDSupplementarySource::on_poll new settle key:{} price:{}", - key, hr.settlement_price.price()); - hr.settlement_price=settlement_price; - SettlementUpdateEvent ev(settlement_price,key); - publish(me->settlement_update,ev); + "MDSupplementarySource::on_poll new settle key:{} price:{}", key, + hr.settlement_price.price()); + hr.settlement_price = settlement_price; + SettlementUpdateEvent ev(settlement_price, key); + publish(me->settlement_update, ev); } } } -}} +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/actors/SODPosition.cpp b/src/lib/orderman/actors/SODPosition.cpp index e5a09e0ca..ee9515be7 100644 --- a/src/lib/orderman/actors/SODPosition.cpp +++ b/src/lib/orderman/actors/SODPosition.cpp @@ -1,134 +1,134 @@ #include "lib/orderman/actors/SODPosition.h" -#include "lib/logging/logging.h" -#include "lib/utils/bts_assert.h" -#include "lib/config/protos/toggles.pb.h" -#include "lib/config/protos/orders_fills_cleanup.pb.h" #include "lib/config/config.h" +#include "lib/config/protos/orders_fills_cleanup.pb.h" +#include "lib/config/protos/toggles.pb.h" +#include "lib/logging/logging.h" #include "lib/utils/PBUtils.h" -#include +#include "lib/utils/bts_assert.h" #include +#include -namespace bts{ -namespace orderman{ +namespace bts { +namespace orderman { SODPosition::SODPosition() -: -_enabled (config::get().enabled()), -_sod_time(_get_fills_sod_time()){ - LOG(persist, Info, "SODPosition enabled:{} sec:{}", - _enabled, _sod_time.tv_sec); + : _enabled(config::get().enabled()), + _sod_time(_get_fills_sod_time()) { + LOG(persist, Info, "SODPosition enabled:{} sec:{}", _enabled, + _sod_time.tv_sec); } // returns the timeval for today's hh,mm,ss // timeval is the microsecons from epoch) -timeval SODPosition::_to_timeval(uint16_t hh, uint16_t mm, uint16_t ss){ - bts_assert(hh<24); - bts_assert(mm<60); - bts_assert(ss<60); +timeval SODPosition::_to_timeval(uint16_t hh, uint16_t mm, uint16_t ss) { + bts_assert(hh < 24); + bts_assert(mm < 60); + bts_assert(ss < 60); time_t secs; - time (&secs); // seconds since epoch (utc) - struct tm* ptm = gmtime (&secs); - ptm->tm_hour=hh; - ptm->tm_min=mm; - ptm->tm_sec=ss; - ptm->tm_isdst=-1; - secs=mktime(ptm); + time(&secs); // seconds since epoch (utc) + struct tm *ptm = gmtime(&secs); + ptm->tm_hour = hh; + ptm->tm_min = mm; + ptm->tm_sec = ss; + ptm->tm_isdst = -1; + secs = mktime(ptm); timeval rv; - rv.tv_sec=secs; - rv.tv_usec=0; + rv.tv_sec = secs; + rv.tv_usec = 0; return rv; } -timeval SODPosition::_subtract_days(const timeval& tv, uint32_t n_days){ - uint32_t secs_in_day=86400*n_days; - timeval rv=tv; - rv.tv_sec=(rv.tv_sec > secs_in_day) ? rv.tv_sec-secs_in_day : 0; +timeval SODPosition::_subtract_days(const timeval &tv, uint32_t n_days) { + uint32_t secs_in_day = 86400 * n_days; + timeval rv = tv; + rv.tv_sec = (rv.tv_sec > secs_in_day) ? rv.tv_sec - secs_in_day : 0; return rv; } -timeval SODPosition::_get_fills_sod_time(){ - const auto& sod_time = config::get(); - timeval sod=_to_timeval(sod_time.sod_hh(),sod_time.sod_mm(),0); +timeval SODPosition::_get_fills_sod_time() { + const auto &sod_time = config::get(); + timeval sod = _to_timeval(sod_time.sod_hh(), sod_time.sod_mm(), 0); timeval now; gettimeofday(&now, NULL); // if the server started before the sod for today // we go back to yesterday - if(sod.tv_sec >= now.tv_sec) - sod=_subtract_days(sod); + if (sod.tv_sec >= now.tv_sec) + sod = _subtract_days(sod); return sod; } -timeval SODPosition::get_orders_start_time(){ - const auto& sod_time = config::get(); - timeval sod=_to_timeval(sod_time.sod_hh(),sod_time.sod_mm(),0); - const auto& orders_cleanup = config::get(); +timeval SODPosition::get_orders_start_time() { + const auto &sod_time = config::get(); + timeval sod = _to_timeval(sod_time.sod_hh(), sod_time.sod_mm(), 0); + const auto &orders_cleanup = config::get(); timeval now; gettimeofday(&now, NULL); // if the server started before the sod for today // we go back to yesterday - if(sod.tv_sec >= now.tv_sec) - sod=_subtract_days(sod); - sod=_subtract_days(sod,orders_cleanup.extra_days()); + if (sod.tv_sec >= now.tv_sec) + sod = _subtract_days(sod); + sod = _subtract_days(sod, orders_cleanup.extra_days()); return sod; } timeval SODPosition::get_order_cutoff_time( - const std::map& order_map){ - //returns true is t1 >= t2 - auto compare_ts = [&](google::protobuf::Timestamp t1, google::protobuf::Timestamp t2) -> bool - { + const std::map &order_map) { + // returns true is t1 >= t2 + auto compare_ts = [&](google::protobuf::Timestamp t1, + google::protobuf::Timestamp t2) -> bool { if (t1.seconds() > t2.seconds()) return true; else if (t1.seconds() < t2.seconds()) return false; else return t1.nanos() >= t2.nanos(); - }; + }; google::protobuf::Timestamp max_ts; max_ts.set_seconds(0); max_ts.set_nanos(0); - for (auto const &kvp : order_map){ + for (auto const &kvp : order_map) { OrderRecord trec; - if (utils::pb::from_string(kvp.second, &trec)){ - const auto& ts = trec.state().created(); - if(compare_ts(ts,max_ts)) + if (utils::pb::from_string(kvp.second, + &trec)) { + const auto &ts = trec.state().created(); + if (compare_ts(ts, max_ts)) (&max_ts)->CopyFrom(ts); - } - else + } else LOG(OrderMan, Error, "Could not recover order {} from storage. " "This should be investigated", kvp.first); } timeval rv; - rv.tv_sec=max_ts.seconds(); - rv.tv_usec=static_cast(max_ts.nanos())/1000; - const auto& orders_cleanup = config::get(); - return _subtract_days(rv,orders_cleanup.extra_days()); + rv.tv_sec = max_ts.seconds(); + rv.tv_usec = static_cast(max_ts.nanos()) / 1000; + const auto &orders_cleanup = config::get(); + return _subtract_days(rv, orders_cleanup.extra_days()); } -std::string SODPosition::_sod_fill_id(const Fill& fill,api::Side side){ - //sod:acct:long/short:sec +std::string SODPosition::_sod_fill_id(const Fill &fill, api::Side side) { + // sod:acct:long/short:sec std::ostringstream oss; - oss << "sod:" << fill.account() << (side==api::Side::SIDE_BUY ? ":L:" : ":S:") - << fill.security_key(); - return oss.str(); + oss << "sod:" << fill.account() + << (side == api::Side::SIDE_BUY ? ":L:" : ":S:") << fill.security_key(); + return oss.str(); } -void SODPosition::_merge_pos(Fill& pos, const Fill& fill){ - bts_assert(pos.security_key()==fill.security_key()); - bts_assert(pos.account()==fill.account()); - bts_assert(pos.side()==fill.side()); - double total_qty=pos.last_shares()+fill.last_shares(); - double avg_price=(pos.avg_price()*pos.last_shares()+ - fill.last_price()*fill.last_shares())/total_qty; +void SODPosition::_merge_pos(Fill &pos, const Fill &fill) { + bts_assert(pos.security_key() == fill.security_key()); + bts_assert(pos.account() == fill.account()); + bts_assert(pos.side() == fill.side()); + double total_qty = pos.last_shares() + fill.last_shares(); + double avg_price = (pos.avg_price() * pos.last_shares() + + fill.last_price() * fill.last_shares()) / + total_qty; pos.set_avg_price(avg_price); pos.set_last_price(avg_price); pos.set_last_shares(total_qty); } -void SODPosition::_zero_pos(Fill& pos, const Fill& fill, api::Side side){ +void SODPosition::_zero_pos(Fill &pos, const Fill &fill, api::Side side) { pos.set_security_key(fill.security_key()); pos.set_account(fill.account()); pos.set_side(side); @@ -136,60 +136,61 @@ void SODPosition::_zero_pos(Fill& pos, const Fill& fill, api::Side side){ pos.mutable_timestamp()->set_nanos(0); pos.set_fill_kind(Fill::FILL_KIND_SOD); pos.set_order_key(0); - pos.set_fill_key(_sod_fill_id(fill,side)); + pos.set_fill_key(_sod_fill_id(fill, side)); pos.set_last_shares(0); } -bool SODPosition::add_fill_to_sod_pos(const Fill& fill){ - if (_enabled && fill.timestamp().seconds() < _sod_time.tv_sec){ - uint32_t seckey=fill.security_key(); - const std::string& acct=fill.account(); - auto acct_it=_sod_map.find(acct); - if(acct_it==_sod_map.end()) - _sod_map[acct]=SecPosMap(); - acct_it=_sod_map.find(fill.account()); - bts_assert(acct_it!=_sod_map.end()); - SecPosMap& sec_map=acct_it->second; - auto sec_it=sec_map.find(seckey); - if(sec_it==sec_map.end()){ +bool SODPosition::add_fill_to_sod_pos(const Fill &fill) { + if (_enabled && fill.timestamp().seconds() < _sod_time.tv_sec) { + uint32_t seckey = fill.security_key(); + const std::string &acct = fill.account(); + auto acct_it = _sod_map.find(acct); + if (acct_it == _sod_map.end()) + _sod_map[acct] = SecPosMap(); + acct_it = _sod_map.find(fill.account()); + bts_assert(acct_it != _sod_map.end()); + SecPosMap &sec_map = acct_it->second; + auto sec_it = sec_map.find(seckey); + if (sec_it == sec_map.end()) { Fill long_pos, short_pos; - _zero_pos(long_pos,fill,api::Side::SIDE_BUY); - _zero_pos(short_pos,fill,api::Side::SIDE_SELL); - sec_map[seckey]=std::pair(long_pos,short_pos); + _zero_pos(long_pos, fill, api::Side::SIDE_BUY); + _zero_pos(short_pos, fill, api::Side::SIDE_SELL); + sec_map[seckey] = std::pair(long_pos, short_pos); } - sec_it=sec_map.find(seckey); - bts_assert(sec_it!=sec_map.end()); - std::pair& pos=sec_it->second; - if(fill.side()==api::Side::SIDE_BUY) - _merge_pos(pos.first,fill); + sec_it = sec_map.find(seckey); + bts_assert(sec_it != sec_map.end()); + std::pair &pos = sec_it->second; + if (fill.side() == api::Side::SIDE_BUY) + _merge_pos(pos.first, fill); else - _merge_pos(pos.second,fill); + _merge_pos(pos.second, fill); return true; - } - else + } else return false; } -void SODPosition::add_sod_pos_as_fill_events(std::vector& fe, - std::map sec_map){ - if(_enabled) - for (auto& acct_p : _sod_map){ - for(auto& sec_p : acct_p.second){ - Fill& long_pos=sec_p.second.first; - Fill& short_pos=sec_p.second.second; - bts_assert(long_pos.security_key()==short_pos.security_key()); - auto sec_it=sec_map.find(SecurityKey(long_pos.security_key())); - if(sec_it==sec_map.end()) +void SODPosition::add_sod_pos_as_fill_events( + std::vector &fe, + std::map sec_map) { + if (_enabled) + for (auto &acct_p : _sod_map) { + for (auto &sec_p : acct_p.second) { + Fill &long_pos = sec_p.second.first; + Fill &short_pos = sec_p.second.second; + bts_assert(long_pos.security_key() == short_pos.security_key()); + auto sec_it = sec_map.find(SecurityKey(long_pos.security_key())); + if (sec_it == sec_map.end()) LOG(persist, Error, - "Could not recover fill for key:{} from storage. " - "This should be investigated", - long_pos.security_key()); - else{ - fe.emplace_back(long_pos,*sec_it->second); - fe.emplace_back(short_pos,*sec_it->second); + "Could not recover fill for key:{} from storage. " + "This should be investigated", + long_pos.security_key()); + else { + fe.emplace_back(long_pos, *sec_it->second); + fe.emplace_back(short_pos, *sec_it->second); } } - } + } } -}} +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/actors/SecuritySrc.cpp b/src/lib/orderman/actors/SecuritySrc.cpp index 854ea8eba..8067ef85f 100644 --- a/src/lib/orderman/actors/SecuritySrc.cpp +++ b/src/lib/orderman/actors/SecuritySrc.cpp @@ -1,8 +1,8 @@ #include "SecuritySrc.h" #include "lib/md/MDConsumer.h" -#include "lib/utils/bts_chrono.h" #include "lib/mercury/events/TimerEvent.h" #include "lib/orderman/events/NewSecuritiesEvent.h" +#include "lib/utils/bts_chrono.h" #include @@ -10,7 +10,7 @@ namespace bts { namespace orderman { struct SecuritySrc::PImpl { - PImpl(md::MDConsumer& md) : last_scan(Timer::now()),md_consumer(md) {} + PImpl(md::MDConsumer &md) : last_scan(Timer::now()), md_consumer(md) {} TimeStamp last_scan; mercury::Stream new_securities_stream; std::vector to_publish; @@ -18,18 +18,19 @@ struct SecuritySrc::PImpl { std::vector> securities_keep_alive; }; -SecuritySrc::SecuritySrc(md::MDConsumer& md) : me(new PImpl(md)) {} +SecuritySrc::SecuritySrc(md::MDConsumer &md) : me(new PImpl(md)) {} SecuritySrc::~SecuritySrc() {} void SecuritySrc::init() { me->new_securities_stream = make_stream(); - me->md_consumer.on_security([this](api::Security const &s, md::MDConsumerHandle) { - auto sec = std::make_unique (s); - auto sec_ptr = sec.get(); - me->securities_keep_alive.push_back(std::move(sec)); - me->to_publish.push_back(sec_ptr); - }); - + me->md_consumer.on_security( + [this](api::Security const &s, md::MDConsumerHandle) { + auto sec = std::make_unique(s); + auto sec_ptr = sec.get(); + me->securities_keep_alive.push_back(std::move(sec)); + me->to_publish.push_back(sec_ptr); + }); + subscribe([this](auto) { this->on_scan_securities(); }); } @@ -47,5 +48,5 @@ void SecuritySrc::on_scan_securities() { } } } -} -} +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/actors/ServiceBridge.cpp b/src/lib/orderman/actors/ServiceBridge.cpp index f8d0cd3a7..b9c683150 100644 --- a/src/lib/orderman/actors/ServiceBridge.cpp +++ b/src/lib/orderman/actors/ServiceBridge.cpp @@ -25,7 +25,9 @@ namespace orderman { struct ServiceBridge::PImpl { PImpl(OnReady const &on_ready, OnOrders const &on_orders, - OnFills const &on_fills, DynamicOrderRegistry const &dyn_order_registry, mercury::BrokerProxy &service_call_marshaller) + OnFills const &on_fills, + DynamicOrderRegistry const &dyn_order_registry, + mercury::BrokerProxy &service_call_marshaller) : on_ready(on_ready), on_orders(on_orders), on_fills(on_fills), have_orders(false), have_securities(false), order_manager_ready(false), sec_db(), order_router(), @@ -55,8 +57,9 @@ struct ServiceBridge::PImpl { ServiceBridge::ServiceBridge(OnReady const &on_ready, OnOrders const &on_orders, OnFills const &on_fills, DynamicOrderRegistry const &dyn_order_registry, - mercury::BrokerProxy &service_call_marshaller) - : me(new PImpl(on_ready, on_orders, on_fills, dyn_order_registry, service_call_marshaller)) {} + mercury::BrokerProxy &service_call_marshaller) + : me(new PImpl(on_ready, on_orders, on_fills, dyn_order_registry, + service_call_marshaller)) {} ServiceBridge::~ServiceBridge() {} diff --git a/src/lib/orderman/actors/order_manager/ChildOrder.h b/src/lib/orderman/actors/order_manager/ChildOrder.h index 6a985aa4f..a2520b9f0 100644 --- a/src/lib/orderman/actors/order_manager/ChildOrder.h +++ b/src/lib/orderman/actors/order_manager/ChildOrder.h @@ -1,96 +1,77 @@ #pragma once -#include -#include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/orderman/actors/order_manager/OrderServices.h" +#include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/utils/bts_assert.h" +#include namespace bts { namespace orderman { -class ChildOrder{ -public: - ChildOrder () - : _order(nullptr), - _order_services(nullptr), - _active(false) - {} +class ChildOrder { + public: + ChildOrder() : _order(nullptr), _order_services(nullptr), _active(false) {} - ChildOrder (Order &o, OrderServices &services) - : _order(&o) , - _order_services(&services), - _active(false) - {} + ChildOrder(Order &o, OrderServices &services) + : _order(&o), _order_services(&services), _active(false) {} - ChildOrder (ChildOrder &&src) - { - operator=(std::move(src)); - } + ChildOrder(ChildOrder &&src) { operator=(std::move(src)); } - ChildOrder& operator=(ChildOrder &&src) - { + ChildOrder &operator=(ChildOrder &&src) { _order = src._order; _order_services = src._order_services; _active = src._active; - + src._order = nullptr; src._order_services = nullptr; src._active = false; return *this; } - OrderKey key() const - { + OrderKey key() const { bts_assert(_order); return _order->key(); } - bool is_active() const {return _active;} - - void activate(Price p, Quantity q, PerfTrace const &trace = PerfTrace()) - { + bool is_active() const { return _active; } + + void activate(Price p, Quantity q, PerfTrace const &trace = PerfTrace()) { bts_assert(_order); bts_assert(!_active); - _order_services->send_activate(*_order,p,q, trace); + _order_services->send_activate(*_order, p, q, trace); _active = true; } - void update(Price p, Quantity q) - { + void update(Price p, Quantity q) { PerfTrace trace; - update(p,q,trace); - } - - void update(Price p, Quantity q, PerfTrace &trace) - { - bts_assert(_order); - bts_assert(_active); - _order_services->send_update(_order->key(),p,q,trace); + update(p, q, trace); } - void crack(PerfTrace const &trace = PerfTrace()) - { + void update(Price p, Quantity q, PerfTrace &trace) { bts_assert(_order); bts_assert(_active); - _order_services->send_crack(_order->key(),trace); + _order_services->send_update(_order->key(), p, q, trace); } - void cancel(PerfTrace const &trace = PerfTrace()) - { + void crack(PerfTrace const &trace = PerfTrace()) { bts_assert(_order); bts_assert(_active); - _order_services->send_cancel(_order->key(),trace); + _order_services->send_crack(_order->key(), trace); } - -private: + + void cancel(PerfTrace const &trace = PerfTrace()) { + bts_assert(_order); + bts_assert(_active); + _order_services->send_cancel(_order->key(), trace); + } + + private: friend class OrderBuilder; - Order* _order; + Order *_order; OrderServices *_order_services; bool _active; }; - -}} - - +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/actors/order_manager/OrderBuilder.cpp b/src/lib/orderman/actors/order_manager/OrderBuilder.cpp index 1a19a6c56..1c2783534 100644 --- a/src/lib/orderman/actors/order_manager/OrderBuilder.cpp +++ b/src/lib/orderman/actors/order_manager/OrderBuilder.cpp @@ -4,5 +4,5 @@ namespace bts { namespace orderman { std::atomic OrderBuilder::_current_builder_id(0); - -}} +} +} // namespace bts diff --git a/src/lib/orderman/actors/order_manager/OrderManager.cpp b/src/lib/orderman/actors/order_manager/OrderManager.cpp index f20dfeffb..5b4653968 100644 --- a/src/lib/orderman/actors/order_manager/OrderManager.cpp +++ b/src/lib/orderman/actors/order_manager/OrderManager.cpp @@ -14,8 +14,8 @@ #include "lib/utils/inplace_function.h" #include -#include #include +#include namespace bts { namespace orderman { @@ -125,8 +125,10 @@ void OrderManager::on_fill_recovery( me->state = State::WAIT_ORDERS; for (auto const &ev : *(update.events)) { - auto trimmed_account_name = boost::algorithm::trim_copy(ev.fill.account()); - me->services_data.limiter.add(*ev.security, trimmed_account_name,ev.fill.side(), + auto trimmed_account_name = + boost::algorithm::trim_copy(ev.fill.account()); + me->services_data.limiter.add(*ev.security, trimmed_account_name, + ev.fill.side(), Quantity(ev.fill.last_shares())); } diff --git a/src/lib/orderman/actors/order_manager/OrderServices.h b/src/lib/orderman/actors/order_manager/OrderServices.h index a586f2d7f..63926fc7d 100644 --- a/src/lib/orderman/actors/order_manager/OrderServices.h +++ b/src/lib/orderman/actors/order_manager/OrderServices.h @@ -29,12 +29,13 @@ class SessionServices { return _session_data->cfg; } - void queue_fix(jetfix::MessageTypes mt, jetfix::FIXFragment const&f,PerfTrace const&trace) { + void queue_fix(jetfix::MessageTypes mt, jetfix::FIXFragment const &f, + PerfTrace const &trace) { auto &stream = _session_data->current_buffer->first_stream(); stream.new_msg(mt).append(f); _session_data->current_traces.push_back(trace); } - + bool is_gateway_connected() const { return _session_data->gw_connected; } Governor &governor() { return _session_data->governor; } diff --git a/src/lib/orderman/actors/order_manager/OrderServicesData.cpp b/src/lib/orderman/actors/order_manager/OrderServicesData.cpp index 15969fc0e..fa2fd39ca 100644 --- a/src/lib/orderman/actors/order_manager/OrderServicesData.cpp +++ b/src/lib/orderman/actors/order_manager/OrderServicesData.cpp @@ -5,15 +5,16 @@ namespace bts { namespace orderman { -OrderServicesData::OrderServicesData(OrderManager &owner,DynamicOrderRegistry const&b) - : owner(owner), order_router(), order_factory(sec_db, order_router,b), +OrderServicesData::OrderServicesData(OrderManager &owner, + DynamicOrderRegistry const &b) + : owner(owner), order_router(), order_factory(sec_db, order_router, b), last_timer_ev( Timer::now(), to(datetime::FIX_timestamp(datetime::now()))) { auto &all_connections = config::get().connection(); - for (auto const &c : all_connections) - sessions.push_back (std::make_unique(c)); -} -} + for (auto const &c : all_connections) + sessions.push_back(std::make_unique(c)); } +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/events/CancelRejectEvent.cpp b/src/lib/orderman/events/CancelRejectEvent.cpp index 10fcf5bfc..00f60fde9 100644 --- a/src/lib/orderman/events/CancelRejectEvent.cpp +++ b/src/lib/orderman/events/CancelRejectEvent.cpp @@ -1,6 +1,5 @@ #include "CancelRejectEvent.h" namespace bts { -namespace orderman { - -}} +namespace orderman {} +} // namespace bts diff --git a/src/lib/orderman/events/NewExecutionReportEvent.cpp b/src/lib/orderman/events/NewExecutionReportEvent.cpp index 54b32a164..ae949d917 100644 --- a/src/lib/orderman/events/NewExecutionReportEvent.cpp +++ b/src/lib/orderman/events/NewExecutionReportEvent.cpp @@ -1,7 +1,5 @@ #include "NewExecutionReportEvent.h" namespace bts { -namespace orderman { - - -}} +namespace orderman {} +} // namespace bts diff --git a/src/lib/orderman/limiter/LimitStore.cpp b/src/lib/orderman/limiter/LimitStore.cpp index ae8395f9f..e25807d7c 100644 --- a/src/lib/orderman/limiter/LimitStore.cpp +++ b/src/lib/orderman/limiter/LimitStore.cpp @@ -1,77 +1,91 @@ #include "LimitStore.h" -namespace bts{ -namespace orderman{ +namespace bts { +namespace orderman { -LimitStore::LimitStore(const bts::api::admin::AdminData& admin_data, - const std::map& sec_map) -: -_admin_data (bts::admin::AdminServiceUtils::sort_limits(admin_data)), -_account_map(bts::admin::AdminServiceUtils::accounts_map(_admin_data)) -{ - for(auto it=sec_map.begin(); it!=sec_map.end(); it++){ - const api::Security& security = *(it->second); +LimitStore::LimitStore(const bts::api::admin::AdminData &admin_data, + const std::map &sec_map) + : _admin_data(bts::admin::AdminServiceUtils::sort_limits(admin_data)), + _account_map(bts::admin::AdminServiceUtils::accounts_map(_admin_data)) { + for (auto it = sec_map.begin(); it != sec_map.end(); it++) { + const api::Security &security = *(it->second); _add_product_entry(security, _admin_data); - } - for(auto it=sec_map.begin(); it!=sec_map.end(); it++){ + } + for (auto it = sec_map.begin(); it != sec_map.end(); it++) { // pos limit - const api::Security& security = *(it->second); - ProductLimitTree* product_tree_ptr = _find_product_for_security (security); - bts_assert(product_tree_ptr!=nullptr); - _sec_map.insert(std::pair(security.id(),SecurityLimitTree(security, *product_tree_ptr, _admin_data, _zero_security_limit))); + const api::Security &security = *(it->second); + ProductLimitTree *product_tree_ptr = _find_product_for_security(security); + bts_assert(product_tree_ptr != nullptr); + _sec_map.insert(std::pair( + security.id(), SecurityLimitTree(security, *product_tree_ptr, + _admin_data, _zero_security_limit))); } _set_user_data(); } -void LimitStore::copy_positions_from(LimitStore& source){ +void LimitStore::copy_positions_from(LimitStore &source) { // copy securities - for (auto it=_sec_map.begin(); it!=_sec_map.end(); it++){ - SecurityLimitTree* source_security_limit_tree = source._find_security(it->first); - if(source_security_limit_tree != nullptr) + for (auto it = _sec_map.begin(); it != _sec_map.end(); it++) { + SecurityLimitTree *source_security_limit_tree = + source._find_security(it->first); + if (source_security_limit_tree != nullptr) it->second.copy_positions_from(*source_security_limit_tree); } } -void LimitStore::_add_product_entry(const api::Security& security, - const bts::api::admin::AdminData& admin_data){ - ProductLimitTree* product_tree_ptr = _find_product_for_security(security); - if (product_tree_ptr==nullptr){ +void LimitStore::_add_product_entry( + const api::Security &security, + const bts::api::admin::AdminData &admin_data) { + ProductLimitTree *product_tree_ptr = _find_product_for_security(security); + if (product_tree_ptr == nullptr) { api::Product product; - product.set_exchange(security.exchange()); product.set_type(bts::admin::AdminServiceUtils::security_type(security)); product.set_symbol(security.symbol()); - _prod_map.emplace_back(product, admin_data, _zero_product_limit); + product.set_exchange(security.exchange()); + product.set_type(bts::admin::AdminServiceUtils::security_type(security)); + product.set_symbol(security.symbol()); + _prod_map.emplace_back(product, admin_data, _zero_product_limit); } } -void LimitStore::_set_user_data (){ - for(const auto& user : _admin_data.users()){ - if (user.is_present()){ +void LimitStore::_set_user_data() { + for (const auto &user : _admin_data.users()) { + if (user.is_present()) { UserData user_data; user_data.user = &user; - bts::admin::AdminServiceUtils::find_user_trading_accounts(_admin_data, user.id(), user_data.accounts); - _user_data_map.insert(std::pair(user.id(), user_data)); + bts::admin::AdminServiceUtils::find_user_trading_accounts( + _admin_data, user.id(), user_data.accounts); + _user_data_map.insert( + std::pair(user.id(), user_data)); } - } -} -ProductLimitTree* LimitStore::_find_product_for_security(const api::Security& security){ - api::Product product; - product.set_exchange(security.exchange()); product.set_type(bts::admin::AdminServiceUtils::security_type(security)); product.set_symbol(security.symbol()); - return _find_product(product); } -ProductLimitTree* LimitStore::_find_product(const api::Product& product){ - for(ProductLimitTree& plt : _prod_map) - if(product.exchange() == plt.product().exchange() && product.type() == plt.product().type() && product.symbol() == plt.product().symbol()) +} +ProductLimitTree * +LimitStore::_find_product_for_security(const api::Security &security) { + api::Product product; + product.set_exchange(security.exchange()); + product.set_type(bts::admin::AdminServiceUtils::security_type(security)); + product.set_symbol(security.symbol()); + return _find_product(product); +} +ProductLimitTree *LimitStore::_find_product(const api::Product &product) { + for (ProductLimitTree &plt : _prod_map) + if (product.exchange() == plt.product().exchange() && + product.type() == plt.product().type() && + product.symbol() == plt.product().symbol()) return &plt; return nullptr; } -const SecurityLimitNode* LimitStore::test_only_func_find_security_node(AccountID account_id, - uint32_t security_id){ - const SecurityLimitTree* sec_data = _find_security(security_id); - if(sec_data != nullptr) +const SecurityLimitNode * +LimitStore::test_only_func_find_security_node(AccountID account_id, + uint32_t security_id) { + const SecurityLimitTree *sec_data = _find_security(security_id); + if (sec_data != nullptr) return sec_data->find_account(account_id.value()); return nullptr; } -const ProductLimitNode* LimitStore::test_only_func_find_product_node(AccountID account_id, - const api::Product& product){ - ProductLimitTree* prod_data = _find_product(product); - if(prod_data != nullptr) +const ProductLimitNode * +LimitStore::test_only_func_find_product_node(AccountID account_id, + const api::Product &product) { + ProductLimitTree *prod_data = _find_product(product); + if (prod_data != nullptr) return prod_data->find_account(account_id.value()); return nullptr; } -}} \ No newline at end of file +} // namespace orderman +} // namespace bts \ No newline at end of file diff --git a/src/lib/orderman/limiter/Limiter.cpp b/src/lib/orderman/limiter/Limiter.cpp index 713672a5d..bfa21a12c 100644 --- a/src/lib/orderman/limiter/Limiter.cpp +++ b/src/lib/orderman/limiter/Limiter.cpp @@ -1,144 +1,131 @@ #include "Limiter.h" #include "LimitStore.h" -#include "lib/domain_model/Security.pb.h" #include "lib/api/services/AdminService.server.pb.h" +#include "lib/domain_model/Security.pb.h" namespace bts { namespace orderman { struct Limiter::PImpl { - std::map sec_map; + std::map sec_map; std::unique_ptr limit_store; PImpl() - : - sec_map(), - limit_store(std::make_unique(bts::api::admin::AdminData(), - sec_map)) - { - } + : sec_map(), limit_store(std::make_unique( + bts::api::admin::AdminData(), sec_map)) {} }; Limiter::Limiter() : me(new PImpl()) {} Limiter::~Limiter() {} -void Limiter::update(api::admin::AdminData const& admin_data) { +void Limiter::update(api::admin::AdminData const &admin_data) { LOG(OrderMan, Info, "Limiter::update"); _reset(admin_data); } -void Limiter::add_securities(std::vector const& new_securities){ +void Limiter::add_securities( + std::vector const &new_securities) { LOG(OrderMan, Info, "Limiter::add_securities {} securities", - me->sec_map.size()); - for(const api::Security* s : new_securities) + me->sec_map.size()); + for (const api::Security *s : new_securities) _add_security(s); _reset(me->limit_store->admin_data()); } -void Limiter::add_security(api::Security const & security) { +void Limiter::add_security(api::Security const &security) { _add_security(&security); _reset(me->limit_store->admin_data()); } -void Limiter::add(api::Security const &security, - AccountID account_id, - api::Side side, - Quantity quantity){ +void Limiter::add(api::Security const &security, AccountID account_id, + api::Side side, Quantity quantity) { if (!_contains_security(&security)) add_security(security); - if (!me->limit_store->has_account(account_id)){ + if (!me->limit_store->has_account(account_id)) { // add a temporary account, so trades can go in there _add_account_and_reset(account_id); } me->limit_store->add_position(security, account_id, side, quantity); } -void Limiter::remove(api::Security const &security, - AccountID account_id, - api::Side side, - Quantity quantity) { +void Limiter::remove(api::Security const &security, AccountID account_id, + api::Side side, Quantity quantity) { if (!_contains_security(&security)) add_security(security); - if (!me->limit_store->has_account(account_id)){ + if (!me->limit_store->has_account(account_id)) { _add_account_and_reset(account_id); } me->limit_store->remove_position(security, account_id, side, quantity); } -void Limiter::add(const api::Security& security, - const std::string& account_name, - api::Side side, - Quantity quantity){ - const auto* acct_ptr= - bts::admin::AdminServiceUtils::find_account(me->limit_store->admin_data(), - account_name); - if(acct_ptr==nullptr) +void Limiter::add(const api::Security &security, + const std::string &account_name, api::Side side, + Quantity quantity) { + const auto *acct_ptr = bts::admin::AdminServiceUtils::find_account( + me->limit_store->admin_data(), account_name); + if (acct_ptr == nullptr) LOG(OrderMan, Error, "Limiter::add can not find account:{}", - account_name); + account_name); else - add(security,AccountID(acct_ptr->id()),side,quantity); + add(security, AccountID(acct_ptr->id()), side, quantity); } -void Limiter::remove(const api::Security& security, - const std::string& account_name, - api::Side side, - Quantity quantity){ - const auto* acct_ptr= - bts::admin::AdminServiceUtils::find_account(me->limit_store->admin_data(), - account_name); - if(acct_ptr==nullptr) +void Limiter::remove(const api::Security &security, + const std::string &account_name, api::Side side, + Quantity quantity) { + const auto *acct_ptr = bts::admin::AdminServiceUtils::find_account( + me->limit_store->admin_data(), account_name); + if (acct_ptr == nullptr) LOG(OrderMan, Error, "Limiter::remove can not find account:{}", - account_name); + account_name); else - remove(security,AccountID(acct_ptr->id()),side,quantity); + remove(security, AccountID(acct_ptr->id()), side, quantity); } Limiter::LimiterQueryResult Limiter::can_trade(UserID user_id, AccountID account_id) const { LimiterQueryResult rv = me->limit_store->can_trade(user_id, account_id); return rv; } -Limiter::LimiterQueryResult Limiter::can_send_new_order(AccountID account_id, - api::Security const & security, - api::Side side, - Quantity quantity) const { - LimiterQueryResult rv = me->limit_store->can_send_new_order(account_id, - security, - side, - quantity); - //rv.ok = true; +Limiter::LimiterQueryResult +Limiter::can_send_new_order(AccountID account_id, api::Security const &security, + api::Side side, Quantity quantity) const { + LimiterQueryResult rv = me->limit_store->can_send_new_order( + account_id, security, side, quantity); + // rv.ok = true; return rv; } -Limiter::LimiterQueryResult Limiter::can_update_order(AccountID account_id, - api::Security const & security, - api::Side side, - Quantity from, - Quantity to) const { +Limiter::LimiterQueryResult +Limiter::can_update_order(AccountID account_id, api::Security const &security, + api::Side side, Quantity from, Quantity to) const { LimiterQueryResult rv; - if (from == to) - rv.ok = true ; - else - rv = me->limit_store->can_update_order(account_id, security, side, from, to); + if (from == to) + rv.ok = true; + else + rv = me->limit_store->can_update_order(account_id, security, side, from, + to); return rv; } -void Limiter::_add_account_and_reset(AccountID account_id){ - bts::api::admin::AdminData admin_data_catchup = me->limit_store->admin_data(); - bts::api::admin::BTSAccount* new_account = admin_data_catchup.mutable_accounts()->Add(); +void Limiter::_add_account_and_reset(AccountID account_id) { + bts::api::admin::AdminData admin_data_catchup = + me->limit_store->admin_data(); + bts::api::admin::BTSAccount *new_account = + admin_data_catchup.mutable_accounts()->Add(); new_account->set_id(account_id.value()); new_account->set_is_active(true); update(admin_data_catchup); } -void Limiter::_reset (const bts::api::admin::AdminData& admin_data){ - LimitStore* new_store = new LimitStore(admin_data, me->sec_map); +void Limiter::_reset(const bts::api::admin::AdminData &admin_data) { + LimitStore *new_store = new LimitStore(admin_data, me->sec_map); new_store->copy_positions_from(*me->limit_store); me->limit_store.reset(new_store); } -void Limiter::_add_security (const api::Security* sec){ - if (!_contains_security(sec)){ - me->sec_map.insert(std::pair(sec->id(), sec)); +void Limiter::_add_security(const api::Security *sec) { + if (!_contains_security(sec)) { + me->sec_map.insert( + std::pair(sec->id(), sec)); if (sec->has_spread()) - for(const auto& leg : sec->spread().legs()) + for (const auto &leg : sec->spread().legs()) _add_security(&leg.security()); } } -bool Limiter::_contains_security (const api::Security* security){ +bool Limiter::_contains_security(const api::Security *security) { return me->sec_map.find(security->id()) != me->sec_map.end(); } -LimitStore& Limiter::limit_store(){ - return *me->limit_store; -} -}} +LimitStore &Limiter::limit_store() { return *me->limit_store; } +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/limiter/ProductLimitNode.cpp b/src/lib/orderman/limiter/ProductLimitNode.cpp index a6ee36784..5e78bed62 100644 --- a/src/lib/orderman/limiter/ProductLimitNode.cpp +++ b/src/lib/orderman/limiter/ProductLimitNode.cpp @@ -1,21 +1,18 @@ #include "ProductLimitNode.h" -namespace bts{ -namespace orderman{ - -ProductLimitNode::ProductLimitNode(uint32_t account_id, - uint32_t, // parent_account_id, - const bts::api::admin::AccountProductPositionLimitUnit& limit, - bool enforce_net) - : - _account_id(account_id), - //_parent_account_id(parent_account_id), - _limit(limit), - _enforce_net(enforce_net), - _long_pos_limit (limit.long_position_limit()), - _short_pos_limit (limit.short_position_limit()), - _long_pos(0), - _short_pos(0) - {} -}} +namespace bts { +namespace orderman { +ProductLimitNode::ProductLimitNode( + uint32_t account_id, + uint32_t, // parent_account_id, + const bts::api::admin::AccountProductPositionLimitUnit &limit, + bool enforce_net) + : _account_id(account_id), + //_parent_account_id(parent_account_id), + _limit(limit), _enforce_net(enforce_net), + _long_pos_limit(limit.long_position_limit()), + _short_pos_limit(limit.short_position_limit()), _long_pos(0), + _short_pos(0) {} +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/limiter/ProductLimitTree.cpp b/src/lib/orderman/limiter/ProductLimitTree.cpp index bab765af6..1df2aa4ea 100644 --- a/src/lib/orderman/limiter/ProductLimitTree.cpp +++ b/src/lib/orderman/limiter/ProductLimitTree.cpp @@ -1,23 +1,27 @@ #include "ProductLimitTree.h" -namespace bts{ -namespace orderman{ +namespace bts { +namespace orderman { -ProductLimitTree::ProductLimitTree(const api::Product& product, - const bts::api::admin::AdminData& admin_data, - const bts::api::admin::AccountProductPositionLimitUnit& zero_limit) -: -_product (product) -{ - for(const auto& account : admin_data.accounts()){ - bool enforce_net=true; // default is net - if(account.has_risk_limit_enforcement()) - enforce_net=account.risk_limit_enforcement().product_limit_in_net_terms(); - const bts::api::admin::AccountProductPositionLimitUnit* limit = bts::admin::AdminServiceUtils::find_account_product_position_limit(account, _product); - _tree.emplace_back(account.id(), - bts::admin::AdminServiceUtils::has_id(account.parent_account_id()) ? account.parent_account_id() : 0, - limit != nullptr ? *limit : zero_limit, - enforce_net); +ProductLimitTree::ProductLimitTree( + const api::Product &product, const bts::api::admin::AdminData &admin_data, + const bts::api::admin::AccountProductPositionLimitUnit &zero_limit) + : _product(product) { + for (const auto &account : admin_data.accounts()) { + bool enforce_net = true; // default is net + if (account.has_risk_limit_enforcement()) + enforce_net = + account.risk_limit_enforcement().product_limit_in_net_terms(); + const bts::api::admin::AccountProductPositionLimitUnit *limit = + bts::admin::AdminServiceUtils::find_account_product_position_limit( + account, _product); + _tree.emplace_back( + account.id(), + bts::admin::AdminServiceUtils::has_id(account.parent_account_id()) + ? account.parent_account_id() + : 0, + limit != nullptr ? *limit : zero_limit, enforce_net); } } -}} \ No newline at end of file +} // namespace orderman +} // namespace bts \ No newline at end of file diff --git a/src/lib/orderman/limiter/SecurityLimitNode.cpp b/src/lib/orderman/limiter/SecurityLimitNode.cpp index bc7e12298..9fbb209b0 100644 --- a/src/lib/orderman/limiter/SecurityLimitNode.cpp +++ b/src/lib/orderman/limiter/SecurityLimitNode.cpp @@ -3,22 +3,18 @@ namespace bts { namespace orderman { -SecurityLimitNode::SecurityLimitNode(uint32_t account_id, - uint32_t, // parent_account_id, - const bts::api::admin::AccountSecurityPositionLimitUnit& limit, - bool apply_sec_position_limits, - ProductLimitNode& product_node, - uint32_t clip_size) - : - _account_id(account_id), - //_parent_account_id(parent_account_id), - _limit(limit), - _long_pos_limit (limit.long_position_limit()), - _short_pos_limit (-1 * limit.short_position_limit()), - _apply_sec_position_limits (apply_sec_position_limits), - _product_node(product_node), - _clip_size(clip_size), - _net_pos(0) -{} +SecurityLimitNode::SecurityLimitNode( + uint32_t account_id, + uint32_t, // parent_account_id, + const bts::api::admin::AccountSecurityPositionLimitUnit &limit, + bool apply_sec_position_limits, ProductLimitNode &product_node, + uint32_t clip_size) + : _account_id(account_id), + //_parent_account_id(parent_account_id), + _limit(limit), _long_pos_limit(limit.long_position_limit()), + _short_pos_limit(-1 * limit.short_position_limit()), + _apply_sec_position_limits(apply_sec_position_limits), + _product_node(product_node), _clip_size(clip_size), _net_pos(0) {} -}} +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/limiter/SecurityLimitTree.cpp b/src/lib/orderman/limiter/SecurityLimitTree.cpp index 68c4cbd9d..a0a150961 100644 --- a/src/lib/orderman/limiter/SecurityLimitTree.cpp +++ b/src/lib/orderman/limiter/SecurityLimitTree.cpp @@ -1,20 +1,30 @@ #include "lib/orderman/limiter/SecurityLimitTree.h" -namespace bts{ -namespace orderman{ +namespace bts { +namespace orderman { -SecurityLimitTree::SecurityLimitTree(const api::Security& security, - ProductLimitTree& product_tree, - const bts::api::admin::AdminData& admin_data, - const bts::api::admin::AccountSecurityPositionLimitUnit& zero_limit) -{ - for(const auto& account : admin_data.accounts()){ - ProductLimitNode* product_node_ptr = product_tree.find_account(account.id()); +SecurityLimitTree::SecurityLimitTree( + const api::Security &security, ProductLimitTree &product_tree, + const bts::api::admin::AdminData &admin_data, + const bts::api::admin::AccountSecurityPositionLimitUnit &zero_limit) { + for (const auto &account : admin_data.accounts()) { + ProductLimitNode *product_node_ptr = + product_tree.find_account(account.id()); bts_assert(product_node_ptr != nullptr); - const bts::api::admin::AccountSecurityPositionLimitUnit* limit = bts::admin::AdminServiceUtils::find_account_security_position_limit(account, security); - uint32_t clip_size = bts::admin::AdminServiceUtils::find_account_security_clip_size(account, security); - _tree.emplace_back(account.id(), bts::admin::AdminServiceUtils::has_id(account.parent_account_id()) ? account.parent_account_id() : 0, - limit != nullptr ? *limit : zero_limit, limit != nullptr, *product_node_ptr, clip_size); + const bts::api::admin::AccountSecurityPositionLimitUnit *limit = + bts::admin::AdminServiceUtils::find_account_security_position_limit( + account, security); + uint32_t clip_size = + bts::admin::AdminServiceUtils::find_account_security_clip_size( + account, security); + _tree.emplace_back( + account.id(), + bts::admin::AdminServiceUtils::has_id(account.parent_account_id()) + ? account.parent_account_id() + : 0, + limit != nullptr ? *limit : zero_limit, limit != nullptr, + *product_node_ptr, clip_size); } } -}} +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/limiter/tests/limit_tests.cpp b/src/lib/orderman/limiter/tests/limit_tests.cpp index 394265d3f..a6b89a7f2 100644 --- a/src/lib/orderman/limiter/tests/limit_tests.cpp +++ b/src/lib/orderman/limiter/tests/limit_tests.cpp @@ -1,63 +1,71 @@ #include "catch/catch.hpp" -#include +#include "lib/api/service_helpers/AdminServiceUtils.h" +#include "lib/api/services/AdminService.server.pb.h" +#include "lib/config/config.h" +#include "lib/domain_model/Security.h" #include "lib/orderman/limiter/LimitStore.h" #include "lib/orderman/limiter/Limiter.h" -#include "lib/api/services/AdminService.server.pb.h" -#include "lib/api/service_helpers/AdminServiceUtils.h" -#include "lib/domain_model/Security.h" #include "lib/utils/bts_chrono.h" #include "lib/utils/helper_macros.h" -#include "lib/config/config.h" +#include -namespace bts{ -namespace orderman{ +namespace bts { +namespace orderman { -void add_account_prod_pos_limit(bts::api::admin::AdminData& admin_data, - const std::string& account_name, +void add_account_prod_pos_limit(bts::api::admin::AdminData &admin_data, + const std::string &account_name, api::Venue prod_exchange, api::SecurityType prod_type, - const std::string& prod_symbol, + const std::string &prod_symbol, uint32_t long_pos_limit, - uint32_t short_pos_limit){ - auto account_ptr = bts::admin::AdminServiceUtils::find_account(admin_data, account_name); - REQUIRE(account_ptr!=nullptr); + uint32_t short_pos_limit) { + auto account_ptr = + bts::admin::AdminServiceUtils::find_account(admin_data, account_name); + REQUIRE(account_ptr != nullptr); bts::api::admin::ProductScope prod_scope; prod_scope.set_exchange(prod_exchange); prod_scope.set_security_type(prod_type); - prod_scope.set_security_symbol(prod_symbol); - auto new_prod_pos_limit_ptr = account_ptr->mutable_product_position_limits()->Add(); + prod_scope.set_security_symbol(prod_symbol); + auto new_prod_pos_limit_ptr = + account_ptr->mutable_product_position_limits()->Add(); new_prod_pos_limit_ptr->mutable_product()->CopyFrom(prod_scope); new_prod_pos_limit_ptr->set_long_position_limit(long_pos_limit); new_prod_pos_limit_ptr->set_short_position_limit(short_pos_limit); } -void add_account_security_pos_limit(bts::api::admin::AdminData& admin_data, - const std::string& account_name, +void add_account_security_pos_limit(bts::api::admin::AdminData &admin_data, + const std::string &account_name, api::Venue sec_exchange, api::SecurityType sec_type, - const std::string& sec_symbol, - uint32_t sec_id, //0 for unset + const std::string &sec_symbol, + uint32_t sec_id, // 0 for unset uint32_t long_pos_limit, - uint32_t short_pos_limit){ - auto account_ptr = bts::admin::AdminServiceUtils::find_account(admin_data, account_name); - REQUIRE(account_ptr!=nullptr); + uint32_t short_pos_limit) { + auto account_ptr = + bts::admin::AdminServiceUtils::find_account(admin_data, account_name); + REQUIRE(account_ptr != nullptr); bts::api::admin::SecurityScope sec_scope; sec_scope.set_exchange(sec_exchange); sec_scope.set_security_type(sec_type); sec_scope.set_security_symbol(sec_symbol); - if(sec_id != 0) + if (sec_id != 0) sec_scope.set_security_id(sec_id); - auto new_sec_pos_limit_ptr = account_ptr->mutable_security_position_limits()->Add(); + auto new_sec_pos_limit_ptr = + account_ptr->mutable_security_position_limits()->Add(); new_sec_pos_limit_ptr->mutable_security()->CopyFrom(sec_scope); new_sec_pos_limit_ptr->set_long_position_limit(long_pos_limit); new_sec_pos_limit_ptr->set_short_position_limit(short_pos_limit); } -void add_account_sec_pos_limit(bts::api::admin::BTSAccount& account, - api::Venue exchange, api::SecurityType sec_type, const std::string& sec_symbol, uint32_t sec_id, bool sec_id_set, - uint32_t long_pos_limit, uint32_t short_pos_limit){ +void add_account_sec_pos_limit(bts::api::admin::BTSAccount &account, + api::Venue exchange, api::SecurityType sec_type, + const std::string &sec_symbol, uint32_t sec_id, + bool sec_id_set, uint32_t long_pos_limit, + uint32_t short_pos_limit) { bts::api::admin::SecurityScope scope; - scope.set_exchange(exchange); scope.set_security_type(sec_type); scope.set_security_symbol(sec_symbol); + scope.set_exchange(exchange); + scope.set_security_type(sec_type); + scope.set_security_symbol(sec_symbol); if (sec_id_set) scope.set_security_id(sec_id); auto new_limit = account.add_security_position_limits(); @@ -66,11 +74,14 @@ void add_account_sec_pos_limit(bts::api::admin::BTSAccount& account, new_limit->set_short_position_limit(short_pos_limit); } -void add_account_sec_clip_size(bts::api::admin::BTSAccount& account, - api::Venue exchange, api::SecurityType sec_type, const std::string& sec_symbol, uint32_t sec_id, bool sec_id_set, - uint32_t clip_size){ +void add_account_sec_clip_size(bts::api::admin::BTSAccount &account, + api::Venue exchange, api::SecurityType sec_type, + const std::string &sec_symbol, uint32_t sec_id, + bool sec_id_set, uint32_t clip_size) { bts::api::admin::SecurityScope scope; - scope.set_exchange(exchange); scope.set_security_type(sec_type); scope.set_security_symbol(sec_symbol); + scope.set_exchange(exchange); + scope.set_security_type(sec_type); + scope.set_security_symbol(sec_symbol); if (sec_id_set) scope.set_security_id(sec_id); auto new_limit = account.mutable_security_clip_limits()->add_limit(); @@ -78,69 +89,95 @@ void add_account_sec_clip_size(bts::api::admin::BTSAccount& account, new_limit->set_clip_size(clip_size); } -void fill_future_security (api::Security& sec, - uint32_t key, const std::string& symbol, api::Venue exchange, - uint32_t expiration_year, uint32_t expiration_month, uint32_t expiration_day, - double tick_size) -{ - sec.set_id (key); - sec.set_symbol (symbol); - sec.set_exchange (exchange); +void fill_future_security(api::Security &sec, uint32_t key, + const std::string &symbol, api::Venue exchange, + uint32_t expiration_year, uint32_t expiration_month, + uint32_t expiration_day, double tick_size) { + sec.set_id(key); + sec.set_symbol(symbol); + sec.set_exchange(exchange); api::FutureContract fc; fc.set_expiration_year(expiration_year); fc.set_expiration_month(expiration_month); fc.set_expiration_day(expiration_day); - sec.mutable_future()->MergeFrom (fc); + sec.mutable_future()->MergeFrom(fc); api::ContractSpecification c_spec; - c_spec.set_low_tick (tick_size); - c_spec.set_high_tick (tick_size); - sec.mutable_contract_spec()->MergeFrom (c_spec); + c_spec.set_low_tick(tick_size); + c_spec.set_high_tick(tick_size); + sec.mutable_contract_spec()->MergeFrom(c_spec); } -void verify_security_limit_data(SecurityLimitNode const* acc_sec_state, - uint32_t expected_long_limit, uint32_t expected_short_limit, - int expected_net_pos){ +void verify_security_limit_data(SecurityLimitNode const *acc_sec_state, + uint32_t expected_long_limit, + uint32_t expected_short_limit, + int expected_net_pos) { REQUIRE(acc_sec_state != nullptr); - REQUIRE(acc_sec_state->test_only_func_limit().long_position_limit() == expected_long_limit); - REQUIRE(acc_sec_state->test_only_func_limit().short_position_limit() == expected_short_limit); + REQUIRE(acc_sec_state->test_only_func_limit().long_position_limit() == + expected_long_limit); + REQUIRE(acc_sec_state->test_only_func_limit().short_position_limit() == + expected_short_limit); REQUIRE(acc_sec_state->net_pos() == expected_net_pos); } -void verify_product_limit_data(ProductLimitNode const* acc_prod_state, - uint32_t expected_long_limit, uint32_t expected_short_limit, - int expected_net_pos){ +void verify_product_limit_data(ProductLimitNode const *acc_prod_state, + uint32_t expected_long_limit, + uint32_t expected_short_limit, + int expected_net_pos) { REQUIRE(acc_prod_state != nullptr); - REQUIRE(acc_prod_state->test_only_func_limit().long_position_limit() == expected_long_limit); - REQUIRE(acc_prod_state->test_only_func_limit().short_position_limit() == expected_short_limit); + REQUIRE(acc_prod_state->test_only_func_limit().long_position_limit() == + expected_long_limit); + REQUIRE(acc_prod_state->test_only_func_limit().short_position_limit() == + expected_short_limit); REQUIRE(acc_prod_state->net_pos() == expected_net_pos); } - // (bts::api::admin::BTSAccount& account, -// api::Venue exchange, api::SecurityType sec_type, const std::string& sec_symbol, uint32_t sec_id, bool sec_id_set, -// uint32_t long_pos_limit, uint32_t short_pos_limit){ +// api::Venue exchange, api::SecurityType +// sec_type, const std::string& sec_symbol, +// uint32_t sec_id, bool sec_id_set, uint32_t +// long_pos_limit, uint32_t short_pos_limit){ -TEST_CASE ("Limit Rule Res", "[limiter]"){ +TEST_CASE("Limit Rule Res", "[limiter]") { api::Security sec_1, sec_2, sec_3; - fill_future_security(sec_1, 1000, std::string("ES"), api::Venue::VENUE_GLBX, 2020, 1, 1, 0.25); - fill_future_security(sec_2, 2000, std::string("SI"), api::Venue::VENUE_GLBX, 2021, 1, 1, 0.05); - fill_future_security(sec_3, 3000, std::string("SI"), api::Venue::VENUE_GLBX, 2022, 1, 1, 0.05); + fill_future_security(sec_1, 1000, std::string("ES"), api::Venue::VENUE_GLBX, + 2020, 1, 1, 0.25); + fill_future_security(sec_2, 2000, std::string("SI"), api::Venue::VENUE_GLBX, + 2021, 1, 1, 0.05); + fill_future_security(sec_3, 3000, std::string("SI"), api::Venue::VENUE_GLBX, + 2022, 1, 1, 0.05); // add multiple rules and check sorting bts::api::admin::AdminData admin_data; bts::api::admin::AdminServiceCreateAccountResult result; - bts::admin::AdminServiceUtils::create_account(admin_data, 0, "ACC A1", "desc", true, result); - auto account_ptr = bts::admin::AdminServiceUtils::find_account(admin_data, "ACC A1"); - add_account_sec_pos_limit(*account_ptr, api::Venue::VENUE_GLBX, api::SecurityType::SECURITYTYPE_FUTURE, "*", 0, false, 10, 21); - add_account_sec_pos_limit(*account_ptr, api::Venue::VENUE_GLBX, api::SecurityType::SECURITYTYPE_FUTURE, "ES", 1000, true, 1000, 2001); - add_account_sec_pos_limit(*account_ptr, api::Venue::VENUE_GLBX, api::SecurityType::SECURITYTYPE_FUTURE, "ES", 0, false, 100, 201); + bts::admin::AdminServiceUtils::create_account(admin_data, 0, "ACC A1", + "desc", true, result); + auto account_ptr = + bts::admin::AdminServiceUtils::find_account(admin_data, "ACC A1"); + add_account_sec_pos_limit(*account_ptr, api::Venue::VENUE_GLBX, + api::SecurityType::SECURITYTYPE_FUTURE, "*", 0, + false, 10, 21); + add_account_sec_pos_limit(*account_ptr, api::Venue::VENUE_GLBX, + api::SecurityType::SECURITYTYPE_FUTURE, "ES", 1000, + true, 1000, 2001); + add_account_sec_pos_limit(*account_ptr, api::Venue::VENUE_GLBX, + api::SecurityType::SECURITYTYPE_FUTURE, "ES", 0, + false, 100, 201); // add clip sizes - add_account_sec_clip_size(*account_ptr, api::Venue::VENUE_GLBX, api::SecurityType::SECURITYTYPE_FUTURE, "SI", 0, false, 11); - add_account_sec_clip_size(*account_ptr, api::Venue::VENUE_GLBX, api::SecurityType::SECURITYTYPE_FUTURE, "ES", sec_1.id(), true, 1001); - add_account_sec_clip_size(*account_ptr, api::Venue::VENUE_GLBX, api::SecurityType::SECURITYTYPE_FUTURE, "SI", sec_2.id(), true, 101); + add_account_sec_clip_size(*account_ptr, api::Venue::VENUE_GLBX, + api::SecurityType::SECURITYTYPE_FUTURE, "SI", 0, + false, 11); + add_account_sec_clip_size(*account_ptr, api::Venue::VENUE_GLBX, + api::SecurityType::SECURITYTYPE_FUTURE, "ES", + sec_1.id(), true, 1001); + add_account_sec_clip_size(*account_ptr, api::Venue::VENUE_GLBX, + api::SecurityType::SECURITYTYPE_FUTURE, "SI", + sec_2.id(), true, 101); // validate pos limits went in - REQUIRE(account_ptr->security_position_limits(0).long_position_limit() == 10); - REQUIRE(account_ptr->security_position_limits(1).long_position_limit() == 1000); - REQUIRE(account_ptr->security_position_limits(2).long_position_limit() == 100); + REQUIRE(account_ptr->security_position_limits(0).long_position_limit() == + 10); + REQUIRE(account_ptr->security_position_limits(1).long_position_limit() == + 1000); + REQUIRE(account_ptr->security_position_limits(2).long_position_limit() == + 100); // validate clip sizes went in REQUIRE(account_ptr->security_clip_limits().limit(0).clip_size() == 11); REQUIRE(account_ptr->security_clip_limits().limit(1).clip_size() == 1001); @@ -148,22 +185,36 @@ TEST_CASE ("Limit Rule Res", "[limiter]"){ // sort order bts::admin::AdminServiceUtils::sort_limits(*account_ptr); // validate pos limits order - REQUIRE(account_ptr->security_position_limits(0).long_position_limit() == 1000); - REQUIRE(account_ptr->security_position_limits(1).long_position_limit() == 100); - REQUIRE(account_ptr->security_position_limits(2).long_position_limit() == 10); + REQUIRE(account_ptr->security_position_limits(0).long_position_limit() == + 1000); + REQUIRE(account_ptr->security_position_limits(1).long_position_limit() == + 100); + REQUIRE(account_ptr->security_position_limits(2).long_position_limit() == + 10); // validate clip sizes order REQUIRE(account_ptr->security_clip_limits().limit(2).clip_size() == 11); - // resolve pos - auto sec_1_limit = bts::admin::AdminServiceUtils::find_account_security_position_limit (*account_ptr, sec_1); + // resolve pos + auto sec_1_limit = + bts::admin::AdminServiceUtils::find_account_security_position_limit( + *account_ptr, sec_1); REQUIRE(sec_1_limit->long_position_limit() == 1000); - auto sec_2_limit = bts::admin::AdminServiceUtils::find_account_security_position_limit (*account_ptr, sec_2); + auto sec_2_limit = + bts::admin::AdminServiceUtils::find_account_security_position_limit( + *account_ptr, sec_2); REQUIRE(sec_2_limit->long_position_limit() == 10); // resolve clip sizes - auto sec_1_clip = bts::admin::AdminServiceUtils::find_account_security_clip_size (*account_ptr, sec_1); + auto sec_1_clip = + bts::admin::AdminServiceUtils::find_account_security_clip_size( + *account_ptr, sec_1); REQUIRE(sec_1_clip == 1001); - auto sec_2_clip = bts::admin::AdminServiceUtils::find_account_security_clip_size (*account_ptr, sec_2); + auto sec_2_clip = + bts::admin::AdminServiceUtils::find_account_security_clip_size( + *account_ptr, sec_2); REQUIRE(sec_2_clip == 101); - auto sec_3_clip = bts::admin::AdminServiceUtils::find_account_security_clip_size (*account_ptr, sec_3); + auto sec_3_clip = + bts::admin::AdminServiceUtils::find_account_security_clip_size( + *account_ptr, sec_3); REQUIRE(sec_3_clip == 11); } -}} +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/order_factory/DynamicOrderRegistry.cpp b/src/lib/orderman/order_factory/DynamicOrderRegistry.cpp index 082b8ddab..a2fda91b4 100644 --- a/src/lib/orderman/order_factory/DynamicOrderRegistry.cpp +++ b/src/lib/orderman/order_factory/DynamicOrderRegistry.cpp @@ -40,6 +40,5 @@ DynamicOrderRegistry::get_all_dynamic_order_types() const { return result; } - } // namespace orderman } // namespace bts diff --git a/src/lib/orderman/order_factory/OrderFactory.cpp b/src/lib/orderman/order_factory/OrderFactory.cpp index 1207b7764..a5eb59f90 100644 --- a/src/lib/orderman/order_factory/OrderFactory.cpp +++ b/src/lib/orderman/order_factory/OrderFactory.cpp @@ -17,8 +17,8 @@ #include "lib/orderman/orders/book_algos/CoverOrder.h" #include "lib/orderman/orders/book_algos/JoinOrder.h" #include "lib/orderman/orders/book_algos/LeanOrder.h" -#include "lib/orderman/orders/book_algos/TickOrder.h" #include "lib/orderman/orders/book_algos/OffsetOrder.h" +#include "lib/orderman/orders/book_algos/TickOrder.h" #include "lib/orderman/orders/book_algos/TopOrder.h" #include "lib/orderman/orders/spreader_orders/SpreaderOrder.h" @@ -153,7 +153,7 @@ Order &OrderFactory::allocate(OrderKey k, OrderKey pk, break; case CustomOrderDefinition::kOffset: order_ptr.reset(new orderman::OffsetOrder()); - break; + break; case CustomOrderDefinition::kDynamic: { order_ptr = me->dynamic_order_registry.build( def.custom_def().dynamic().dynamic_order_type()); diff --git a/src/lib/orderman/order_router/OrderRouter.cpp b/src/lib/orderman/order_router/OrderRouter.cpp index a174047d5..24a710c5c 100644 --- a/src/lib/orderman/order_router/OrderRouter.cpp +++ b/src/lib/orderman/order_router/OrderRouter.cpp @@ -66,5 +66,5 @@ bool OrderRouter::is_valid_session(std::string const &session) const { } OrderRouter::~OrderRouter() {} -} -} +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/orders/IcebergOrder.cpp b/src/lib/orderman/orders/IcebergOrder.cpp index f533f50f3..ba29b275b 100644 --- a/src/lib/orderman/orders/IcebergOrder.cpp +++ b/src/lib/orderman/orders/IcebergOrder.cpp @@ -1,11 +1,11 @@ #include "IcebergOrder.h" +#include "lib/config/config.h" +#include "lib/config/protos/orderman_cfg.pb.h" #include "lib/logging/logging.h" #include "lib/mercury/events/TimerEvent.h" #include "lib/orderman/actors/order_manager/OrderBuilder.h" #include "lib/utils/PBUtils.h" #include "lib/utils/bts_chrono.h" -#include "lib/config/config.h" -#include "lib/config/protos/orderman_cfg.pb.h" #include diff --git a/src/lib/orderman/orders/NativeOrder.cpp b/src/lib/orderman/orders/NativeOrder.cpp index 8d8ab3757..6a09ed069 100644 --- a/src/lib/orderman/orders/NativeOrder.cpp +++ b/src/lib/orderman/orders/NativeOrder.cpp @@ -30,7 +30,7 @@ struct NativeOrder::PImpl { PImpl() : services(nullptr), session_services(), sec(nullptr), previous_position_contribution(0), definition(), state(), - price_encoding_precision(7),have_exchange_order_id(false) {} + price_encoding_precision(7), have_exchange_order_id(false) {} OrderServices *services; SessionServices *session_services; @@ -42,7 +42,7 @@ struct NativeOrder::PImpl { OrderState state; int price_encoding_precision; bool have_exchange_order_id; - + jetfix::FIXFragment update_encoding; jetfix::FIXFragment::Bookmark update_price_bm; jetfix::FIXFragment::Bookmark update_quantity_bm; @@ -275,13 +275,14 @@ NativeOrder::~NativeOrder() {} void NativeOrder::on_activate(Price p, Quantity q, bts::orderman::OrderServices &services, PerfTrace const &t) { - LOG(Latency,Info, "on_activate start {}", key().value()); + LOG(Latency, Info, "on_activate start {}", key().value()); auto trace = t; trace.order_key = key().value(); trace.order_update = utils::TimeStamp::now(); - - tracepoint(bts_trace, trace_order, (char *)"on_activate", 0, trace.md_sn, key().value()); + + tracepoint(bts_trace, trace_order, (char *)"on_activate", 0, trace.md_sn, + key().value()); bts_assert(!me->services); me->services = &services; @@ -395,8 +396,8 @@ void NativeOrder::on_activate(Price p, Quantity q, me->session_services->governor().record_sent(); me->state.set_status(ORDER_STATUS_PENDING_WORKING); - LOG(Latency,Diag, "on_activate done fix {} t: {}us", key().value(), - (utils::TimeStamp::now() - trace.order_update).microseconds()); + LOG(Latency, Diag, "on_activate done fix {} t: {}us", key().value(), + (utils::TimeStamp::now() - trace.order_update).microseconds()); LOG(OrderMan, Info, "Sent new order with key {} to gateway", key().value()); // early return so we skip the expensive report_state() call diff --git a/src/lib/orderman/orders/Order.cpp b/src/lib/orderman/orders/Order.cpp index f1f58725d..97c394c63 100644 --- a/src/lib/orderman/orders/Order.cpp +++ b/src/lib/orderman/orders/Order.cpp @@ -5,4 +5,5 @@ namespace orderman { Order::~Order() {} -}} +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/orders/TimeBoxOrder.cpp b/src/lib/orderman/orders/TimeBoxOrder.cpp index 542d86a06..b7d445aba 100644 --- a/src/lib/orderman/orders/TimeBoxOrder.cpp +++ b/src/lib/orderman/orders/TimeBoxOrder.cpp @@ -1,6 +1,6 @@ #include "TimeBoxOrder.h" -#include "lib/utils/PBUtils.h" #include "lib/orderman/actors/order_manager/OrderBuilder.h" +#include "lib/utils/PBUtils.h" #include namespace bts { @@ -38,7 +38,7 @@ void TimeBoxOrder::on_init_new(api::orderman::OrderDefinition const &def, me->start_time = timebox_def.start(); me->stop_time = timebox_def.stop(); me->child_state.set_status(ORDER_STATUS_INACTIVE); - + auto child_def = def; *child_def.mutable_custom_def() = timebox_def.child(); if (me->start_time.seconds() > utils::pb::pb_now().seconds() && @@ -84,11 +84,12 @@ void TimeBoxOrder::on_init_recovered(api::orderman::OrderRecord const &rec, } } -void TimeBoxOrder::on_activate(Price p, Quantity q, OrderServices &services,PerfTrace const&) { +void TimeBoxOrder::on_activate(Price p, Quantity q, OrderServices &services, + PerfTrace const &) { bts_assert(!me->services); me->services = &services; me->child_builder.activate(services); - + switch (me->state.status()) { case ORDER_STATUS_INACTIVE: @@ -113,7 +114,7 @@ void TimeBoxOrder::on_activate(Price p, Quantity q, OrderServices &services,Perf // state) case ORDER_STATUS_WORKING: case ORDER_STATUS_PENDING_WORKING: - case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_DISCONNECTED: case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: bts_assert(false); @@ -122,7 +123,7 @@ void TimeBoxOrder::on_activate(Price p, Quantity q, OrderServices &services,Perf report_state(); } -void TimeBoxOrder::on_update(Price p, Quantity q,PerfTrace const&) { +void TimeBoxOrder::on_update(Price p, Quantity q, PerfTrace const &) { LOG(OrderMan, Info, "Updating TimeBox Order {}", key().value()); switch (me->state.status()) { @@ -140,7 +141,7 @@ void TimeBoxOrder::on_update(Price p, Quantity q,PerfTrace const&) { // we launched our child, everything is nominal me->state.set_price(p.value()); me->state.set_quantity(q.value()); - me->child.update(p,q); + me->child.update(p, q); break; case ORDER_STATUS_PENDING_WORKING: @@ -151,7 +152,7 @@ void TimeBoxOrder::on_update(Price p, Quantity q,PerfTrace const&) { // if the child was in any of these states we couldn't be // in the working state - case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_DISCONNECTED: case ORDER_STATUS_ERROR: case ORDER_STATUS_REJECTED_BY_SPARK: case ORDER_STATUS_COMPLETED: @@ -182,9 +183,9 @@ void TimeBoxOrder::on_update(Price p, Quantity q,PerfTrace const&) { report_state(); } -void TimeBoxOrder::on_crack(PerfTrace const&) {} +void TimeBoxOrder::on_crack(PerfTrace const &) {} -void TimeBoxOrder::on_cancel(PerfTrace const&) { +void TimeBoxOrder::on_cancel(PerfTrace const &) { LOG(OrderMan, Info, "Canceling TimeBox Order {}", key().value()); switch (me->state.status()) { @@ -210,7 +211,7 @@ void TimeBoxOrder::on_cancel(PerfTrace const&) { break; // child cannot be in any of these if we are in the working state - case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_DISCONNECTED: case ORDER_STATUS_ERROR: case ORDER_STATUS_REJECTED_BY_SPARK: case ORDER_STATUS_COMPLETED: @@ -263,7 +264,7 @@ void TimeBoxOrder::on_time_change() { case ORDER_STATUS_INACTIVE: { // we haven't yet launched the child, check the time and // launch it if appropriate - if ( now >= me->start_time.seconds() && now < me->stop_time.seconds()) { + if (now >= me->start_time.seconds() && now < me->stop_time.seconds()) { LOG(OrderMan, Info, "TimeBox order {} launching child {}", key().value(), me->child.key().value()); me->child.activate(Price(me->state.price()), @@ -285,12 +286,12 @@ void TimeBoxOrder::on_time_change() { report_state(); } break; - + case ORDER_STATUS_PENDING_WORKING: break; // child cannot be in any of these states if we are in the working state - case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_DISCONNECTED: case ORDER_STATUS_ERROR: case ORDER_STATUS_REJECTED_BY_SPARK: case ORDER_STATUS_COMPLETED: @@ -318,34 +319,33 @@ void TimeBoxOrder::on_time_change() { } } -void TimeBoxOrder::on_child_order_update(OrderStateUpdateEvent const&ev) -{ +void TimeBoxOrder::on_child_order_update(OrderStateUpdateEvent const &ev) { me->child_state = ev.rebuild_state(); switch (me->state.status()) { case ORDER_STATUS_WORKING: switch (ev.status) { - case ORDER_STATUS_WORKING: - case ORDER_STATUS_PENDING_WORKING: - // nothing to do but report new state - break; - case ORDER_STATUS_COMPLETED: - transition(ORDER_STATUS_COMPLETED); - break; + case ORDER_STATUS_WORKING: + case ORDER_STATUS_PENDING_WORKING: + // nothing to do but report new state + break; + case ORDER_STATUS_COMPLETED: + transition(ORDER_STATUS_COMPLETED); + break; - case ORDER_STATUS_DISCONNECTED: - case ORDER_STATUS_REJECTED_BY_SPARK: - case ORDER_STATUS_CANCELED: - case ORDER_STATUS_ERROR: - transition(ORDER_STATUS_ERROR, "Unexpected child order state"); - break; + case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_REJECTED_BY_SPARK: + case ORDER_STATUS_CANCELED: + case ORDER_STATUS_ERROR: + transition(ORDER_STATUS_ERROR, "Unexpected child order state"); + break; - case ORDER_STATUS_INACTIVE: - case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: - case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: - bts_assert(false); - break; + case ORDER_STATUS_INACTIVE: + case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: + case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: + bts_assert(false); + break; } break; @@ -368,12 +368,11 @@ void TimeBoxOrder::on_child_order_update(OrderStateUpdateEvent const&ev) void TimeBoxOrder::report_state() { auto merged_state = me->state; - merged_state.set_filled_quantity (me->child_state.filled_quantity()); - merged_state.set_last_price ( me->child_state.last_price()); - merged_state.set_avg_price ( me->child_state.avg_price()); + merged_state.set_filled_quantity(me->child_state.filled_quantity()); + merged_state.set_last_price(me->child_state.last_price()); + merged_state.set_avg_price(me->child_state.avg_price()); me->services->report_state(merged_state); } -} -} - +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/orders/TriggerOrder.cpp b/src/lib/orderman/orders/TriggerOrder.cpp index f84235f59..999da3b90 100644 --- a/src/lib/orderman/orders/TriggerOrder.cpp +++ b/src/lib/orderman/orders/TriggerOrder.cpp @@ -1,16 +1,16 @@ #include "TriggerOrder.h" +#include "lib/domain_model/Security.h" #include "lib/logging/logging.h" -#include "lib/utils/PBUtils.h" #include "lib/orderman/actors/order_manager/OrderBuilder.h" #include "lib/orderman/events/BookUpdateEvent.h" #include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" -#include "lib/domain_model/Security.h" #include "lib/os/os.h" +#include "lib/utils/PBUtils.h" #include #include -namespace bts{ -namespace orderman{ +namespace bts { +namespace orderman { struct TriggerOrder::PImpl { OrderServices *services; @@ -42,496 +42,491 @@ struct TriggerOrder::PImpl { bool is_succ_inited; bts::TimeStamp child_order_time; PImpl() - : - services(nullptr), - order_def(), - timeout_exit(false), - timeout_msecs(std::numeric_limits::max()), - price_cond_exit(false), - state(), - child_state(), - child_order(), - order_placed(false), - book(), - cancel_mode(CancelMode::none), - market_observed_once(false), - is_recovered(false), - is_succ_inited(false){ - } + : services(nullptr), order_def(), timeout_exit(false), + timeout_msecs(std::numeric_limits::max()), + price_cond_exit(false), state(), child_state(), child_order(), + order_placed(false), book(), cancel_mode(CancelMode::none), + market_observed_once(false), is_recovered(false), + is_succ_inited(false) {} }; -TriggerOrder::TriggerOrder() -: -_state(State::START), -me(new PImpl()){ -} -TriggerOrder::~TriggerOrder(){ -} -const api::orderman::OrderDefinition& TriggerOrder::definition() const{ +TriggerOrder::TriggerOrder() : _state(State::START), me(new PImpl()) {} +TriggerOrder::~TriggerOrder() {} +const api::orderman::OrderDefinition &TriggerOrder::definition() const { return me->order_def; } -void TriggerOrder::on_init_new(const api::orderman::OrderDefinition& order_def, - const PreActivationOrderServices& pre_os){ - LOG(OrderMan, Info, "TriggerOrder::on_init_new key:{} state:{}", - key(),_state); - switch (_state){ - case State::START: - me->is_succ_inited=_on_init_new(order_def,pre_os); - break; - case State::WAITING_FOR_TRIGGER: - case State::WAITING_FOR_FIRST_ACK: - case State::STEADY: - case State::END: - std::ostringstream oss; - oss << "TriggerOrder::on_init_new key:" << key() << "state:" << _state; - bts_assert_msg(false, oss.str()); - break; +void TriggerOrder::on_init_new(const api::orderman::OrderDefinition &order_def, + const PreActivationOrderServices &pre_os) { + LOG(OrderMan, Info, "TriggerOrder::on_init_new key:{} state:{}", key(), + _state); + switch (_state) { + case State::START: + me->is_succ_inited = _on_init_new(order_def, pre_os); + break; + case State::WAITING_FOR_TRIGGER: + case State::WAITING_FOR_FIRST_ACK: + case State::STEADY: + case State::END: + std::ostringstream oss; + oss << "TriggerOrder::on_init_new key:" << key() << "state:" << _state; + bts_assert_msg(false, oss.str()); + break; } } -void TriggerOrder::on_init_recovered(const api::orderman::OrderRecord& rec, - const PreActivationOrderServices& pre_os){ - LOG(OrderMan, Info, "TriggerOrder::on_init_recovered key:{} state:{}", - key(),_state); - switch (_state){ - case State::START: - me->is_succ_inited=_on_init_new(rec.def(),pre_os); - // get the state from what was recovered (we will only use - // it for reporting) - me->state=rec.state(); - // if it was not in a terminal state, we will call it cancelled - if (!SpreaderUtils::order_in_terminal_state(me->state.status())) - me->state.set_status(api::orderman::OrderStatus::ORDER_STATUS_CANCELED); - me->is_recovered=true; - break; - case State::WAITING_FOR_TRIGGER: - case State::WAITING_FOR_FIRST_ACK: - case State::STEADY: - case State::END: - std::ostringstream oss; - oss << "TriggerOrder::on_init_recovered key:" << key() << "state:" << _state; - bts_assert_msg(false, oss.str()); - break; +void TriggerOrder::on_init_recovered(const api::orderman::OrderRecord &rec, + const PreActivationOrderServices &pre_os) { + LOG(OrderMan, Info, "TriggerOrder::on_init_recovered key:{} state:{}", key(), + _state); + switch (_state) { + case State::START: + me->is_succ_inited = _on_init_new(rec.def(), pre_os); + // get the state from what was recovered (we will only use + // it for reporting) + me->state = rec.state(); + // if it was not in a terminal state, we will call it cancelled + if (!SpreaderUtils::order_in_terminal_state(me->state.status())) + me->state.set_status( + api::orderman::OrderStatus::ORDER_STATUS_CANCELED); + me->is_recovered = true; + break; + case State::WAITING_FOR_TRIGGER: + case State::WAITING_FOR_FIRST_ACK: + case State::STEADY: + case State::END: + std::ostringstream oss; + oss << "TriggerOrder::on_init_recovered key:" << key() + << "state:" << _state; + bts_assert_msg(false, oss.str()); + break; } } -void TriggerOrder::on_activate(Price price, - Quantity qty, - OrderServices& services, - PerfTrace const&){ - LOG(OrderMan, Info, "TriggerOrder::on_activate key:{} state:{} price:{} qty:{}", - key(),_state, price, qty); - switch (_state){ - case State::START: - me->services=&services; - me->state.set_price(price.value()); - me->state.set_quantity(qty.value()); - if(me->is_recovered || !me->is_succ_inited) - _switch_state(State::END); - else{ - me->order_builder.activate(services); - me->child_order=me->order_builder.build(); - services.child_updates.sub(key(), - [this](const OrderStateUpdateEvent& os) - { this->_on_child_order_update (os);}); - services.book_updates.sub(SecurityKey(me->order_def.security_key()), - [this](const BookUpdateEvent& bk_event) - { this->_on_book_update (bk_event);}); - services.time_change.sub([this](const bts::mercury::TimerEvent& te) - {_on_time(te);}); - _switch_state(State::WAITING_FOR_TRIGGER); - } - break; - case State::WAITING_FOR_TRIGGER: - case State::WAITING_FOR_FIRST_ACK: - case State::STEADY: - case State::END:{ - std::ostringstream oss; - oss << "TriggerOrder::on_activate key:" << key() << "state:" << _state; - bts_assert_msg(false,oss.str()); - break; +void TriggerOrder::on_activate(Price price, Quantity qty, + OrderServices &services, PerfTrace const &) { + LOG(OrderMan, Info, + "TriggerOrder::on_activate key:{} state:{} price:{} qty:{}", key(), + _state, price, qty); + switch (_state) { + case State::START: + me->services = &services; + me->state.set_price(price.value()); + me->state.set_quantity(qty.value()); + if (me->is_recovered || !me->is_succ_inited) + _switch_state(State::END); + else { + me->order_builder.activate(services); + me->child_order = me->order_builder.build(); + services.child_updates.sub(key(), + [this](const OrderStateUpdateEvent &os) { + this->_on_child_order_update(os); + }); + services.book_updates.sub(SecurityKey(me->order_def.security_key()), + [this](const BookUpdateEvent &bk_event) { + this->_on_book_update(bk_event); + }); + services.time_change.sub( + [this](const bts::mercury::TimerEvent &te) { _on_time(te); }); + _switch_state(State::WAITING_FOR_TRIGGER); } + break; + case State::WAITING_FOR_TRIGGER: + case State::WAITING_FOR_FIRST_ACK: + case State::STEADY: + case State::END: { + std::ostringstream oss; + oss << "TriggerOrder::on_activate key:" << key() << "state:" << _state; + bts_assert_msg(false, oss.str()); + break; + } } } // order price, qty change -void TriggerOrder::on_update(Price price, - Quantity qty, - PerfTrace const&){ - LOG(OrderMan, Info, "TriggerOrder::on_update key:{} state:{} price:{} qty:{}", - key(),_state, price, qty); - switch (_state){ - case State::START: - me->state.set_price(price.value()); - me->state.set_quantity(qty.value()); - // cant report because does not have order_services yet - break; - case State::WAITING_FOR_TRIGGER: - me->state.set_price(price.value()); - me->state.set_quantity(qty.value()); - _report_state(); - _analyze_trigger_and_shoot(); - break; - case State::WAITING_FOR_FIRST_ACK: - case State::STEADY: - me->state.set_last_msg("Trigger order can not be modified after the trigger has been hit"); - _report_state(); - break; - case State::END: - break; +void TriggerOrder::on_update(Price price, Quantity qty, PerfTrace const &) { + LOG(OrderMan, Info, + "TriggerOrder::on_update key:{} state:{} price:{} qty:{}", key(), _state, + price, qty); + switch (_state) { + case State::START: + me->state.set_price(price.value()); + me->state.set_quantity(qty.value()); + // cant report because does not have order_services yet + break; + case State::WAITING_FOR_TRIGGER: + me->state.set_price(price.value()); + me->state.set_quantity(qty.value()); + _report_state(); + _analyze_trigger_and_shoot(); + break; + case State::WAITING_FOR_FIRST_ACK: + case State::STEADY: + me->state.set_last_msg( + "Trigger order can not be modified after the trigger has been hit"); + _report_state(); + break; + case State::END: + break; } } -void TriggerOrder::on_crack(PerfTrace const&){ +void TriggerOrder::on_crack(PerfTrace const &) { // not supported } -void TriggerOrder::on_cancel(PerfTrace const&){ - LOG(OrderMan, Info, "TriggerOrder::on_cancel key:{} state:{}", - key(),_state); - me->cancel_mode=CancelMode::external; - switch (_state){ - case State::START: - _switch_state(State::END); - break; - case State::WAITING_FOR_TRIGGER: - _switch_state(State::END); - break; - case State::WAITING_FOR_FIRST_ACK: - // we dont have a WAITING_FOR_ACK_CANCELLED - // (like the Quoter), so this message is - // rejected and reported - me->state.set_last_msg("Order is in flight"); - _report_state(); - break; - case State::STEADY: - _cancel_order(CancelMode::external); - break; - case State::END: - break; +void TriggerOrder::on_cancel(PerfTrace const &) { + LOG(OrderMan, Info, "TriggerOrder::on_cancel key:{} state:{}", key(), + _state); + me->cancel_mode = CancelMode::external; + switch (_state) { + case State::START: + _switch_state(State::END); + break; + case State::WAITING_FOR_TRIGGER: + _switch_state(State::END); + break; + case State::WAITING_FOR_FIRST_ACK: + // we dont have a WAITING_FOR_ACK_CANCELLED + // (like the Quoter), so this message is + // rejected and reported + me->state.set_last_msg("Order is in flight"); + _report_state(); + break; + case State::STEADY: + _cancel_order(CancelMode::external); + break; + case State::END: + break; } } -void TriggerOrder::_on_book_update(const BookUpdateEvent& b_event){ - switch (_state){ - case State::START: - break; - case State::WAITING_FOR_TRIGGER: - if(b_event.key().value()==me->order_def.security_key()){ - me->book=b_event.book; - _observe_market_once(); - _analyze_trigger_and_shoot(); +void TriggerOrder::_on_book_update(const BookUpdateEvent &b_event) { + switch (_state) { + case State::START: + break; + case State::WAITING_FOR_TRIGGER: + if (b_event.key().value() == me->order_def.security_key()) { + me->book = b_event.book; + _observe_market_once(); + _analyze_trigger_and_shoot(); + } + break; + case State::WAITING_FOR_FIRST_ACK: + break; + case State::STEADY: + if (b_event.key().value() == me->order_def.security_key()) { + if (me->price_cond_exit) { + me->book = b_event.book; + _analyze_trigger_and_cancel(); } - break; - case State::WAITING_FOR_FIRST_ACK: - break; - case State::STEADY: - if(b_event.key().value()==me->order_def.security_key()){ - if(me->price_cond_exit){ - me->book=b_event.book; - _analyze_trigger_and_cancel(); - } - } - case State::END: - break; + } + case State::END: + break; } } -void TriggerOrder::_on_child_order_update(const OrderStateUpdateEvent& o_ev){ - if(o_ev.key==me->child_order.key()){ +void TriggerOrder::_on_child_order_update(const OrderStateUpdateEvent &o_ev) { + if (o_ev.key == me->child_order.key()) { auto ev_state = o_ev.rebuild_state(); - me->child_state=ev_state; - switch (_state){ - case State::START: - case State::WAITING_FOR_TRIGGER: - bts_assert(false); - break; - case State::WAITING_FOR_FIRST_ACK: - if(SpreaderUtils::order_acknowledged(o_ev.status)){ - if(SpreaderUtils::order_in_terminal_state(o_ev.status)) - _switch_state(State::END); - else - _switch_state(State::STEADY); - } - break; - case State::STEADY: - if(SpreaderUtils::order_in_terminal_state(ev_state.status())) + me->child_state = ev_state; + switch (_state) { + case State::START: + case State::WAITING_FOR_TRIGGER: + bts_assert(false); + break; + case State::WAITING_FOR_FIRST_ACK: + if (SpreaderUtils::order_acknowledged(o_ev.status)) { + if (SpreaderUtils::order_in_terminal_state(o_ev.status)) _switch_state(State::END); - break; - case State::END: - break; + else + _switch_state(State::STEADY); + } + break; + case State::STEADY: + if (SpreaderUtils::order_in_terminal_state(ev_state.status())) + _switch_state(State::END); + break; + case State::END: + break; } _report_state(); } } -void TriggerOrder::_on_time(const bts::mercury::TimerEvent&){ - switch (_state){ - case State::START: - case State::WAITING_FOR_TRIGGER: - case State::WAITING_FOR_FIRST_ACK: - break; - case State::STEADY:{ - if(me->timeout_exit) - _analyze_trigger_and_cancel(); - break; - } - case State::END: - break; +void TriggerOrder::_on_time(const bts::mercury::TimerEvent &) { + switch (_state) { + case State::START: + case State::WAITING_FOR_TRIGGER: + case State::WAITING_FOR_FIRST_ACK: + break; + case State::STEADY: { + if (me->timeout_exit) + _analyze_trigger_and_cancel(); + break; + } + case State::END: + break; } } -bool TriggerOrder::_on_init_new(const api::orderman::OrderDefinition& order_def, - const PreActivationOrderServices& pre_os){ - me->order_def=order_def; - if (!me->order_def.has_custom_def() || !me->order_def.custom_def().has_trigger()){ - LOG(OrderMan, Error, "TriggerOrder::_on_init_new key:{} state:{} " - "OrderDefinition does not have TriggerOrderDefinition", - key(),_state); +bool TriggerOrder::_on_init_new(const api::orderman::OrderDefinition &order_def, + const PreActivationOrderServices &pre_os) { + me->order_def = order_def; + if (!me->order_def.has_custom_def() || + !me->order_def.custom_def().has_trigger()) { + LOG(OrderMan, Error, + "TriggerOrder::_on_init_new key:{} state:{} " + "OrderDefinition does not have TriggerOrderDefinition", + key(), _state); me->state.set_last_msg("Trigger Order not properly formed"); return false; } - if (pre_os.sec_db.resolve(SecurityKey(order_def.security_key()))==nullptr){ - LOG(OrderMan, Error, "TriggerOrder::_on_init_new key:{} state:{} " - "Could not resolve sec_key:{}", - key(),_state, order_def.security_key()); + if (pre_os.sec_db.resolve(SecurityKey(order_def.security_key())) == + nullptr) { + LOG(OrderMan, Error, + "TriggerOrder::_on_init_new key:{} state:{} " + "Could not resolve sec_key:{}", + key(), _state, order_def.security_key()); me->state.set_last_msg("Could not resolve Trigger Order security"); return false; - } - const auto& trigger_order_def=order_def.custom_def().trigger(); - if(pre_os.sec_db.resolve(SecurityKey(trigger_order_def.trigger_action().security_id())) == nullptr){ - LOG(OrderMan, Error, "TriggerOrder::_on_init_new key:{} state:{} " - "Could not resolve child key sec_key:{}", - key(),_state, trigger_order_def.trigger_action().security_id()); + } + const auto &trigger_order_def = order_def.custom_def().trigger(); + if (pre_os.sec_db.resolve(SecurityKey( + trigger_order_def.trigger_action().security_id())) == nullptr) { + LOG(OrderMan, Error, + "TriggerOrder::_on_init_new key:{} state:{} " + "Could not resolve child key sec_key:{}", + key(), _state, trigger_order_def.trigger_action().security_id()); me->state.set_last_msg("Could not resolve Trigger Order child security"); return false; } if (!trigger_order_def.trigger_action().has_payup() && - bts::os::is_nan(trigger_order_def.trigger_action().price())){ - LOG(OrderMan, Error, "TriggerOrder::_on_init_new key:{} state:{} " - "illegal child order price", - key(),_state); + bts::os::is_nan(trigger_order_def.trigger_action().price())) { + LOG(OrderMan, Error, + "TriggerOrder::_on_init_new key:{} state:{} " + "illegal child order price", + key(), _state); me->state.set_last_msg("Illegal Child Order price"); return false; } me->timeout_exit = trigger_order_def.has_exit_condition() && - trigger_order_def.exit_condition().timeout_enabled(); - me->timeout_msecs = trigger_order_def.has_exit_condition() ? - 1000.0*trigger_order_def.exit_condition().timeout_seconds () : - std::numeric_limits::max(); - me->price_cond_exit = trigger_order_def.has_exit_condition() && - trigger_order_def.exit_condition().conditional_cancel(); + trigger_order_def.exit_condition().timeout_enabled(); + me->timeout_msecs = + trigger_order_def.has_exit_condition() + ? 1000.0 * trigger_order_def.exit_condition().timeout_seconds() + : std::numeric_limits::max(); + me->price_cond_exit = + trigger_order_def.has_exit_condition() && + trigger_order_def.exit_condition().conditional_cancel(); api::orderman::OrderDefinition child_order_def = order_def; - child_order_def.set_security_key(trigger_order_def.trigger_action().security_id()); + child_order_def.set_security_key( + trigger_order_def.trigger_action().security_id()); child_order_def.mutable_custom_def()->CopyFrom(trigger_order_def.child()); - me->order_builder=OrderBuilder(key(),child_order_def,pre_os); - const auto* sec_ptr = pre_os.sec_db.resolve(SecurityKey(order_def.security_key())); - me->tick_size=std::min(sec_ptr->contract_spec().low_tick(), - sec_ptr->contract_spec().high_tick()); - LOG(OrderMan, Info, "TriggerOrder::_on_init_new key:{} state:{} " - "trigger_price_type:{} child_order_price:{}", - key(),_state, - trigger_order_def.trigger_condition().price_type(), - trigger_order_def.trigger_action().price()); + me->order_builder = OrderBuilder(key(), child_order_def, pre_os); + const auto *sec_ptr = + pre_os.sec_db.resolve(SecurityKey(order_def.security_key())); + me->tick_size = std::min(sec_ptr->contract_spec().low_tick(), + sec_ptr->contract_spec().high_tick()); + LOG(OrderMan, Info, + "TriggerOrder::_on_init_new key:{} state:{} " + "trigger_price_type:{} child_order_price:{}", + key(), _state, trigger_order_def.trigger_condition().price_type(), + trigger_order_def.trigger_action().price()); return true; } -void TriggerOrder::_report_state(){ - if(_activated()){ +void TriggerOrder::_report_state() { + if (_activated()) { _compute_state(); me->services->report_state(me->state); } } -void TriggerOrder::_switch_state(State new_state){ - switch(new_state){ - case State::START: - break; - case State::WAITING_FOR_TRIGGER: - bts_assert(_state==State::START); - break; - case State::WAITING_FOR_FIRST_ACK: - bts_assert(_state==State::WAITING_FOR_TRIGGER); - break; - case State::STEADY: - bts_assert(_state==State::WAITING_FOR_FIRST_ACK); - break; - case State::END: - bts_assert(_state!=State::END); - break; +void TriggerOrder::_switch_state(State new_state) { + switch (new_state) { + case State::START: + break; + case State::WAITING_FOR_TRIGGER: + bts_assert(_state == State::START); + break; + case State::WAITING_FOR_FIRST_ACK: + bts_assert(_state == State::WAITING_FOR_TRIGGER); + break; + case State::STEADY: + bts_assert(_state == State::WAITING_FOR_FIRST_ACK); + break; + case State::END: + bts_assert(_state != State::END); + break; } - LOG(OrderMan, Info, "TriggerOrder::_report_state key:{} {}->{}", - key(), - _state,new_state); - _state=new_state; + LOG(OrderMan, Info, "TriggerOrder::_report_state key:{} {}->{}", key(), + _state, new_state); + _state = new_state; _report_state(); } -void TriggerOrder::_analyze_trigger_and_shoot(){ - if(me->market_observed_once){ - double trigger_price=_trigger_price(); - const md::PriceSize* obs_md=_observed_market(); - if (_trigger_met(obs_md,trigger_price, - me->tick_size,me->trigger_above_market)){ - me->child_order_time=bts::Timer::now(); - me->order_placed=true; - LOG(OrderMan, Info, "TriggerOrder::_analyze_trigger_and_shoot" - "key:{} state:{} " - "trigger_above_md:{} trigger_price:{} md:{} " - "order_price:{} order_qty:{}", - key(),_state, - me->trigger_above_market,trigger_price, - obs_md->price(), - _child_order_price(), - me->state.quantity()); +void TriggerOrder::_analyze_trigger_and_shoot() { + if (me->market_observed_once) { + double trigger_price = _trigger_price(); + const md::PriceSize *obs_md = _observed_market(); + if (_trigger_met(obs_md, trigger_price, me->tick_size, + me->trigger_above_market)) { + me->child_order_time = bts::Timer::now(); + me->order_placed = true; + LOG(OrderMan, Info, + "TriggerOrder::_analyze_trigger_and_shoot" + "key:{} state:{} " + "trigger_above_md:{} trigger_price:{} md:{} " + "order_price:{} order_qty:{}", + key(), _state, me->trigger_above_market, trigger_price, + obs_md->price(), _child_order_price(), me->state.quantity()); me->child_order.activate(Price(_child_order_price()), Quantity(me->state.quantity())); _switch_state(State::WAITING_FOR_FIRST_ACK); } } } -void TriggerOrder::_analyze_trigger_and_cancel(){ - if(me->timeout_exit){ - int64_t time_diff = ms_diff (bts::Timer::now(), me->child_order_time); - if(time_diff > me->timeout_msecs){ - LOG(OrderMan, Info, "TriggerOrder::_analyze_trigger_and_cancel " - "key:{} state:{} msecs:{} " - "time out, cancelling order", - key(),_state, time_diff); +void TriggerOrder::_analyze_trigger_and_cancel() { + if (me->timeout_exit) { + int64_t time_diff = ms_diff(bts::Timer::now(), me->child_order_time); + if (time_diff > me->timeout_msecs) { + LOG(OrderMan, Info, + "TriggerOrder::_analyze_trigger_and_cancel " + "key:{} state:{} msecs:{} " + "time out, cancelling order", + key(), _state, time_diff); _cancel_order(CancelMode::trigger); return; } } - if(me->price_cond_exit){ - double trigger_price=_trigger_price(); - const md::PriceSize* obs_md=_observed_market(); - if (!_trigger_met(obs_md,trigger_price, - me->tick_size,me->trigger_above_market)){ - LOG(OrderMan, Info, "TriggerOrder::_analyze_trigger_and_cancel" - "key:{} state:{} " - "price condition untrue, cancelling order" - "trigger_above_md:{} trigger_price:{} md:{} ", - key(),_state, - me->trigger_above_market,trigger_price, - obs_md->price()); + if (me->price_cond_exit) { + double trigger_price = _trigger_price(); + const md::PriceSize *obs_md = _observed_market(); + if (!_trigger_met(obs_md, trigger_price, me->tick_size, + me->trigger_above_market)) { + LOG(OrderMan, Info, + "TriggerOrder::_analyze_trigger_and_cancel" + "key:{} state:{} " + "price condition untrue, cancelling order" + "trigger_above_md:{} trigger_price:{} md:{} ", + key(), _state, me->trigger_above_market, trigger_price, + obs_md->price()); _cancel_order(CancelMode::trigger); - return; + return; } } } -api::orderman::OrderStatus TriggerOrder::_status() const{ - switch(_state){ - // will only be called once the order - // has been activated - case State::START: - case State::WAITING_FOR_TRIGGER: - case State::WAITING_FOR_FIRST_ACK: - case State::STEADY: - return api::orderman::OrderStatus::ORDER_STATUS_WORKING; - case State::END: - if(!me->is_succ_inited) - return api::orderman::OrderStatus::ORDER_STATUS_ERROR; - else{ - if(me->order_placed){ - if (!SpreaderUtils::order_in_terminal_state(me->child_state.status())) - return api::orderman::OrderStatus::ORDER_STATUS_WORKING; - else{ - if (SpreaderUtils::order_in_error_state(me->child_state.status())) - return api::orderman::OrderStatus::ORDER_STATUS_ERROR; - else if (SpreaderUtils::order_in_completed_state(me->child_state.status())) +api::orderman::OrderStatus TriggerOrder::_status() const { + switch (_state) { + // will only be called once the order + // has been activated + case State::START: + case State::WAITING_FOR_TRIGGER: + case State::WAITING_FOR_FIRST_ACK: + case State::STEADY: + return api::orderman::OrderStatus::ORDER_STATUS_WORKING; + case State::END: + if (!me->is_succ_inited) + return api::orderman::OrderStatus::ORDER_STATUS_ERROR; + else { + if (me->order_placed) { + if (!SpreaderUtils::order_in_terminal_state( + me->child_state.status())) + return api::orderman::OrderStatus::ORDER_STATUS_WORKING; + else { + if (SpreaderUtils::order_in_error_state( + me->child_state.status())) + return api::orderman::OrderStatus::ORDER_STATUS_ERROR; + else if (SpreaderUtils::order_in_completed_state( + me->child_state.status())) + return api::orderman::OrderStatus::ORDER_STATUS_COMPLETED; + else if (SpreaderUtils::order_in_cancelled_state( + me->child_state.status())) { + switch (me->cancel_mode) { + case CancelMode::none: // this means an unscolicted child cxl + case CancelMode::external: + return api::orderman::OrderStatus::ORDER_STATUS_CANCELED; + case CancelMode::trigger: return api::orderman::OrderStatus::ORDER_STATUS_COMPLETED; - else if (SpreaderUtils::order_in_cancelled_state(me->child_state.status())){ - switch (me->cancel_mode){ - case CancelMode::none: //this means an unscolicted child cxl - case CancelMode::external: - return api::orderman::OrderStatus::ORDER_STATUS_CANCELED; - case CancelMode::trigger: - return api::orderman::OrderStatus::ORDER_STATUS_COMPLETED; - } } } } - else - return api::orderman::OrderStatus::ORDER_STATUS_CANCELED; - } + } else + return api::orderman::OrderStatus::ORDER_STATUS_CANCELED; + } } bts_assert(false); return api::orderman::OrderStatus::ORDER_STATUS_INACTIVE; } -void TriggerOrder::_compute_state(){ - if (!me->is_recovered){ +void TriggerOrder::_compute_state() { + if (!me->is_recovered) { me->state.set_status(_status()); me->state.set_filled_quantity(me->child_state.filled_quantity()); me->state.set_last_price(me->child_state.last_price()); me->state.set_avg_price(me->child_state.avg_price()); - if(_state==State::STEADY) + if (_state == State::STEADY) me->state.set_display_status(bts::api::orderman::OrderState::HIDDEN); else me->state.set_display_status(bts::api::orderman::OrderState::VISIBLE); - } } -void TriggerOrder::_observe_market_once(){ - if(!me->market_observed_once){ - const md::PriceSize* obs_md=_observed_market(); - if(obs_md != nullptr && obs_md->size()>0){ - me->market_observed_once=true; - me->trigger_above_market=_trigger_price()>=obs_md->price(); - LOG(OrderMan, Info, "TriggerOrder::_observe_market_once " - "key:{} state:{} " - "md_p:{} md_q:{} trigger_above_md:{}", - key(),_state, - obs_md->price(), obs_md->size(), - me->trigger_above_market); +void TriggerOrder::_observe_market_once() { + if (!me->market_observed_once) { + const md::PriceSize *obs_md = _observed_market(); + if (obs_md != nullptr && obs_md->size() > 0) { + me->market_observed_once = true; + me->trigger_above_market = _trigger_price() >= obs_md->price(); + LOG(OrderMan, Info, + "TriggerOrder::_observe_market_once " + "key:{} state:{} " + "md_p:{} md_q:{} trigger_above_md:{}", + key(), _state, obs_md->price(), obs_md->size(), + me->trigger_above_market); } } } -const md::PriceSize* TriggerOrder::_observed_market() const{ - if(me->order_def.custom_def().trigger().trigger_condition().price_type()== - api::orderman::TriggerPriceType::BID){ - const auto& rv=me->book.bid()[0]; - return &rv; - } - else if (me->order_def.custom_def().trigger().trigger_condition().price_type()== - api::orderman::TriggerPriceType::ASK){ - const auto& rv=me->book.ask()[0]; +const md::PriceSize *TriggerOrder::_observed_market() const { + if (me->order_def.custom_def().trigger().trigger_condition().price_type() == + api::orderman::TriggerPriceType::BID) { + const auto &rv = me->book.bid()[0]; return &rv; - } - else{ + } else if (me->order_def.custom_def() + .trigger() + .trigger_condition() + .price_type() == api::orderman::TriggerPriceType::ASK) { + const auto &rv = me->book.ask()[0]; + return &rv; + } else { bts_assert(false); return nullptr; } } -double TriggerOrder::_trigger_price() const{ - return me->state.price(); -} -double TriggerOrder::_child_order_price() const{ - const auto& trigger_action= - me->order_def.custom_def().trigger().trigger_action(); - double rv=bts::os::nan(); - if(trigger_action.has_payup()){ - double offset=trigger_action.payup().payup_ticks()*me->tick_size; - if(me->order_def.side()==api::Side::SIDE_BUY) - rv=_trigger_price()+offset; +double TriggerOrder::_trigger_price() const { return me->state.price(); } +double TriggerOrder::_child_order_price() const { + const auto &trigger_action = + me->order_def.custom_def().trigger().trigger_action(); + double rv = bts::os::nan(); + if (trigger_action.has_payup()) { + double offset = trigger_action.payup().payup_ticks() * me->tick_size; + if (me->order_def.side() == api::Side::SIDE_BUY) + rv = _trigger_price() + offset; else - rv=_trigger_price()-offset; - } - else - rv=trigger_action.price(); - rv = bts::securities::raw_round_to_quote_price (rv, me->tick_size, - me->order_def.side()); + rv = _trigger_price() - offset; + } else + rv = trigger_action.price(); + rv = bts::securities::raw_round_to_quote_price(rv, me->tick_size, + me->order_def.side()); return rv; } -void TriggerOrder::_cancel_order(CancelMode cancel_mode){ - me->cancel_mode=cancel_mode; +void TriggerOrder::_cancel_order(CancelMode cancel_mode) { + me->cancel_mode = cancel_mode; me->child_order.cancel(); LOG(OrderMan, Info, "TriggerOrder::_cancel_order key:{} state:{} mode:{}", - key(),_state,cancel_mode); + key(), _state, cancel_mode); _switch_state(State::END); } -bool TriggerOrder::_activated() const{ - return me->services!=nullptr; +bool TriggerOrder::_activated() const { return me->services != nullptr; } +bool TriggerOrder::_gr_than_eq(double p1, double p2, double tick_size) { + return bts::securities::test_price_equality(p1, p2, tick_size) || p1 >= p2; } -bool TriggerOrder::_gr_than_eq(double p1, double p2, double tick_size){ - return bts::securities::test_price_equality(p1,p2,tick_size) || p1>=p2; -} -bool TriggerOrder::_trigger_met(const md::PriceSize* obs_md, - double trpr, - double tick_size, - bool trigger_above_md){ +bool TriggerOrder::_trigger_met(const md::PriceSize *obs_md, double trpr, + double tick_size, bool trigger_above_md) { if (obs_md != nullptr) - return (trigger_above_md && _gr_than_eq(obs_md->price(),trpr, tick_size)) || - (!trigger_above_md && _gr_than_eq(trpr,obs_md->price(),tick_size)); + return (trigger_above_md && + _gr_than_eq(obs_md->price(), trpr, tick_size)) || + (!trigger_above_md && + _gr_than_eq(trpr, obs_md->price(), tick_size)); return false; } -}} +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/orders/book_algos/BookAlgo.cpp b/src/lib/orderman/orders/book_algos/BookAlgo.cpp index 5e3ea18ae..3a4468a50 100644 --- a/src/lib/orderman/orders/book_algos/BookAlgo.cpp +++ b/src/lib/orderman/orders/book_algos/BookAlgo.cpp @@ -1,7 +1,7 @@ #include "BookAlgo.h" +#include "lib/orderman/actors/order_manager/OrderBuilder.h" #include "lib/utils/PBUtils.h" #include "lib/utils/helper_macros.h" -#include "lib/orderman/actors/order_manager/OrderBuilder.h" #include namespace bts { @@ -9,148 +9,113 @@ namespace orderman { using namespace api::orderman; -struct BookAlgo::PImpl -{ - PImpl() : services(nullptr), fake_detached_child(false), - supports_hedge(false), has_activated_child(false) - { - } - - OrderServices* services; - +struct BookAlgo::PImpl { + PImpl() + : services(nullptr), fake_detached_child(false), supports_hedge(false), + has_activated_child(false) {} + + OrderServices *services; + api::orderman::OrderDefinition def; api::orderman::OrderState state; - + OrderBuilder child_builder; - ChildOrder child; - api::orderman::OrderState child_state; + ChildOrder child; + api::orderman::OrderState child_state; bool fake_detached_child; - - bool supports_hedge; - OrderBuilder hedge_builder; + + bool supports_hedge; + OrderBuilder hedge_builder; std::vector hedges; - using HedgeStateMap = boost::container::flat_map; + using HedgeStateMap = + boost::container::flat_map; HedgeStateMap hedges_state; - + double tick_size; bool has_activated_child; }; -BookAlgo::BookAlgo() : me(new PImpl()) -{ -} +BookAlgo::BookAlgo() : me(new PImpl()) {} BookAlgo::~BookAlgo() {} - - -const api::orderman::OrderDefinition& BookAlgo::definition() const -{ +const api::orderman::OrderDefinition &BookAlgo::definition() const { return me->def; } -const api::orderman::OrderState& BookAlgo::this_state() const -{ +const api::orderman::OrderState &BookAlgo::this_state() const { return me->state; } - -void BookAlgo::set_price(double p) -{ - me->state.set_price(p); -} - -void BookAlgo::set_quantity(uint32_t s) -{ - me->state.set_quantity(s); -} -const api::orderman::OrderState& BookAlgo::child_state() const -{ +void BookAlgo::set_price(double p) { me->state.set_price(p); } + +void BookAlgo::set_quantity(uint32_t s) { me->state.set_quantity(s); } + +const api::orderman::OrderState &BookAlgo::child_state() const { return me->child_state; } - -void BookAlgo::set_child_price(double p) -{ - me->child_state.set_price(p); -} -void BookAlgo::set_child_quantity(uint32_t s) -{ +void BookAlgo::set_child_price(double p) { me->child_state.set_price(p); } + +void BookAlgo::set_child_quantity(uint32_t s) { me->child_state.set_quantity(s); } -void BookAlgo::activate_child(Price p, Quantity q) -{ - //per Pedro, activating the child is not a synchronous calls, and he asserts that this is done only once - if(!me->has_activated_child) - { +void BookAlgo::activate_child(Price p, Quantity q) { + // per Pedro, activating the child is not a synchronous calls, and he asserts + // that this is done only once + if (!me->has_activated_child) { me->child.activate(p, q); me->has_activated_child = true; } -} - -void BookAlgo::update_child(Price p, Quantity q) -{ - me->child.update(p, q); -} +} -void BookAlgo::cancel_child() -{ - me->child.cancel(); -} +void BookAlgo::update_child(Price p, Quantity q) { me->child.update(p, q); } -void BookAlgo::build_and_send_hedge(Price p, Quantity q) -{ - auto hedge = me->hedge_builder.build(); +void BookAlgo::cancel_child() { me->child.cancel(); } + +void BookAlgo::build_and_send_hedge(Price p, Quantity q) { + auto hedge = me->hedge_builder.build(); me->hedges.push_back(std::move(hedge)); - me->hedges.back().activate(p, q); + me->hedges.back().activate(p, q); } -double BookAlgo::tick_size() const -{ - return me->tick_size; -} +double BookAlgo::tick_size() const { return me->tick_size; } -void BookAlgo::on_init_new(const api::orderman::OrderDefinition& def, - const PreActivationOrderServices &services) -{ +void BookAlgo::on_init_new(const api::orderman::OrderDefinition &def, + const PreActivationOrderServices &services) { me->services = nullptr; me->def = def; - - me->child_state.set_status(ORDER_STATUS_INACTIVE); + + me->child_state.set_status(ORDER_STATUS_INACTIVE); OrderDefinition child_def = def; setup_child(def, services, me->child_state, &child_def); me->child_builder = OrderBuilder(key(), child_def, services, 1); - - OrderDefinition hedge_def = def; + + OrderDefinition hedge_def = def; me->supports_hedge = setup_hedge(def, services, &hedge_def); - if(me->supports_hedge) - me->hedge_builder = OrderBuilder(key(), hedge_def, services, 4); - - const bts::api::Security* sec = services.sec_db.resolve(SecurityKey(def.security_key())); - if(sec) - { + if (me->supports_hedge) + me->hedge_builder = OrderBuilder(key(), hedge_def, services, 4); + + const bts::api::Security *sec = + services.sec_db.resolve(SecurityKey(def.security_key())); + if (sec) { me->tick_size = sec->contract_spec().low_tick(); transition(ORDER_STATUS_INACTIVE); - } - else - { + } else { auto msg = fmt::format("Unknown security: {}", def.security_key()); me->state.set_last_msg(msg); - transition(ORDER_STATUS_REJECTED_BY_SPARK, msg); + transition(ORDER_STATUS_REJECTED_BY_SPARK, msg); } } -void BookAlgo::on_init_recovered(const api::orderman::OrderRecord& rec, - const PreActivationOrderServices &) -{ +void BookAlgo::on_init_recovered(const api::orderman::OrderRecord &rec, + const PreActivationOrderServices &) { auto const &def = rec.def(); me->def = def; me->state = rec.state(); - switch (me->state.status()) - { - case ORDER_STATUS_WORKING: - { + switch (me->state.status()) { + case ORDER_STATUS_WORKING: { auto msg = "System restarted with active BookAlgo"; me->state.set_last_msg(msg); transition(ORDER_STATUS_ERROR, msg); @@ -174,24 +139,24 @@ void BookAlgo::on_init_recovered(const api::orderman::OrderRecord& rec, } } -void BookAlgo::on_activate(Price p, Quantity q, OrderServices& services,PerfTrace const&) -{ +void BookAlgo::on_activate(Price p, Quantity q, OrderServices &services, + PerfTrace const &) { bts_assert(!me->services); me->services = &services; - switch (this_state().status()) - { + switch (this_state().status()) { case ORDER_STATUS_INACTIVE: - me->child_builder.activate(services); - if(me->supports_hedge) + me->child_builder.activate(services); + if (me->supports_hedge) me->hedge_builder.activate(services); - + me->child = me->child_builder.build(); set_price(p.value()); set_quantity(q.value()); - services.child_updates.sub(key(), - [this](auto const &os) { this->on_child_order_update(os); }); - services.book_updates.sub(SecurityKey(me->def.security_key()), - [this](auto const &b) { this->on_book_update(b); }); + services.child_updates.sub( + key(), [this](auto const &os) { this->on_child_order_update(os); }); + services.book_updates.sub( + SecurityKey(me->def.security_key()), + [this](auto const &b) { this->on_book_update(b); }); transition(ORDER_STATUS_WORKING); break; @@ -207,7 +172,7 @@ void BookAlgo::on_activate(Price p, Quantity q, OrderServices& services,PerfTrac // state) case ORDER_STATUS_WORKING: case ORDER_STATUS_PENDING_WORKING: - case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_DISCONNECTED: case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: bts_assert(false); @@ -216,14 +181,11 @@ void BookAlgo::on_activate(Price p, Quantity q, OrderServices& services,PerfTrac report_state(); } -void BookAlgo::on_update(Price p, Quantity q,PerfTrace const&) -{ +void BookAlgo::on_update(Price p, Quantity q, PerfTrace const &) { LOG(OrderMan, Info, "Updating BookAlgo {}", key().value()); - switch (this_state().status()) - { + switch (this_state().status()) { case ORDER_STATUS_WORKING: - switch (child_state().status()) - { + switch (child_state().status()) { case ORDER_STATUS_INACTIVE: set_price(p.value()); set_quantity(q.value()); @@ -231,8 +193,8 @@ void BookAlgo::on_update(Price p, Quantity q,PerfTrace const&) case ORDER_STATUS_WORKING: set_price(p.value()); set_quantity(q.value()); - if(!me->fake_detached_child) - me->child.update(p,q); + if (!me->fake_detached_child) + me->child.update(p, q); break; case ORDER_STATUS_PENDING_WORKING: // we launched our child but we are not yet able @@ -242,7 +204,7 @@ void BookAlgo::on_update(Price p, Quantity q,PerfTrace const&) // if the child was in any of these states we couldn't be // in the working state - case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_DISCONNECTED: case ORDER_STATUS_ERROR: case ORDER_STATUS_REJECTED_BY_SPARK: case ORDER_STATUS_COMPLETED: @@ -273,25 +235,22 @@ void BookAlgo::on_update(Price p, Quantity q,PerfTrace const&) report_state(); } -void BookAlgo::on_crack(PerfTrace const&) {} +void BookAlgo::on_crack(PerfTrace const &) {} -void BookAlgo::on_cancel(PerfTrace const&) -{ +void BookAlgo::on_cancel(PerfTrace const &) { LOG(OrderMan, Info, "Canceling BookAlgo Order {}", key().value()); - switch (this_state().status()) - { + switch (this_state().status()) { case ORDER_STATUS_WORKING: - switch (child_state().status()) - { + switch (child_state().status()) { case ORDER_STATUS_INACTIVE: transition(ORDER_STATUS_CANCELED); break; case ORDER_STATUS_WORKING: - if(!me->fake_detached_child) + if (!me->fake_detached_child) me->child.cancel(); - for(auto& i : me->hedges) - i.crack(); + for (auto &i : me->hedges) + i.crack(); transition(ORDER_STATUS_CANCELED); break; case ORDER_STATUS_PENDING_WORKING: @@ -300,7 +259,7 @@ void BookAlgo::on_cancel(PerfTrace const&) break; // child cannot be in any of these if we are in the working state - case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_DISCONNECTED: case ORDER_STATUS_ERROR: case ORDER_STATUS_REJECTED_BY_SPARK: case ORDER_STATUS_COMPLETED: @@ -330,53 +289,50 @@ void BookAlgo::on_cancel(PerfTrace const&) report_state(); } -void BookAlgo::transition(api::orderman::OrderStatus new_status, std::string msg) -{ +void BookAlgo::transition(api::orderman::OrderStatus new_status, + std::string msg) { auto const &from = OrderStatus_Name(me->state.status()); auto const &to = OrderStatus_Name(new_status); - LOG(OrderMan, Info, "Transitioning BookAlgo {} from {} to {}. Msg: {}", key().value(), from, to, msg); + LOG(OrderMan, Info, "Transitioning BookAlgo {} from {} to {}. Msg: {}", + key().value(), from, to, msg); me->state.set_status(new_status); } -void BookAlgo::on_child_order_update(const OrderStateUpdateEvent& ev) -{ - if(me->fake_detached_child) - return; - if(ev.key != me->child.key()) +void BookAlgo::on_child_order_update(const OrderStateUpdateEvent &ev) { + if (me->fake_detached_child) + return; + if (ev.key != me->child.key()) me->hedges_state[ev.key] = ev.rebuild_state(); - else - { + else { api::orderman::OrderState orig_state = child_state(); me->child_state = ev.rebuild_state(); - switch (this_state().status()) - { + switch (this_state().status()) { case ORDER_STATUS_WORKING: - switch (ev.status) - { - case ORDER_STATUS_PENDING_WORKING: - break; - case ORDER_STATUS_WORKING: - if(me->supports_hedge) - send_hedge_if_new_fills(orig_state, ev); - break; - case ORDER_STATUS_COMPLETED: - transition(ORDER_STATUS_COMPLETED); - if(me->supports_hedge) - send_hedge_if_new_fills(orig_state, ev); - break; + switch (ev.status) { + case ORDER_STATUS_PENDING_WORKING: + break; + case ORDER_STATUS_WORKING: + if (me->supports_hedge) + send_hedge_if_new_fills(orig_state, ev); + break; + case ORDER_STATUS_COMPLETED: + transition(ORDER_STATUS_COMPLETED); + if (me->supports_hedge) + send_hedge_if_new_fills(orig_state, ev); + break; - case ORDER_STATUS_DISCONNECTED: - case ORDER_STATUS_REJECTED_BY_SPARK: - case ORDER_STATUS_CANCELED: - case ORDER_STATUS_ERROR: - transition(ORDER_STATUS_ERROR, "Unexpected child order state"); - break; + case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_REJECTED_BY_SPARK: + case ORDER_STATUS_CANCELED: + case ORDER_STATUS_ERROR: + transition(ORDER_STATUS_ERROR, "Unexpected child order state"); + break; - case ORDER_STATUS_INACTIVE: - case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: - case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: - bts_assert(false); - break; + case ORDER_STATUS_INACTIVE: + case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: + case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: + bts_assert(false); + break; } break; @@ -398,52 +354,56 @@ void BookAlgo::on_child_order_update(const OrderStateUpdateEvent& ev) report_state(); } -void BookAlgo::report_state() -{ +void BookAlgo::report_state() { auto merged_state = me->state; merged_state.set_filled_quantity(child_state().filled_quantity()); merged_state.set_last_price(child_state().last_price()); merged_state.set_avg_price(child_state().avg_price()); - merged_state.set_display_status(bts::api::orderman::OrderState_DisplayStatus::OrderState_DisplayStatus_HIDDEN); + merged_state.set_display_status( + bts::api::orderman::OrderState_DisplayStatus:: + OrderState_DisplayStatus_HIDDEN); me->services->report_state(merged_state); } -void BookAlgo::payup(const md::PriceSize& opposite, const bts::orderman::BookUpdateEvent&, uint32_t cross_ticks) -{ +void BookAlgo::payup(const md::PriceSize &opposite, + const bts::orderman::BookUpdateEvent &, + uint32_t cross_ticks) { double new_price = opposite.price() + me->tick_size * cross_ticks; me->child.update(Price(new_price), Quantity(this_state().quantity())); report_state(); } -void BookAlgo::paydown(const md::PriceSize& opposite, const bts::orderman::BookUpdateEvent&, uint32_t cross_ticks) -{ +void BookAlgo::paydown(const md::PriceSize &opposite, + const bts::orderman::BookUpdateEvent &, + uint32_t cross_ticks) { double new_price = opposite.price() - me->tick_size * cross_ticks; me->child.update(Price(new_price), Quantity(this_state().quantity())); report_state(); } -void BookAlgo::detach(bts::api::orderman::OrderStatus status_after_detach) -{ +void BookAlgo::detach(bts::api::orderman::OrderStatus status_after_detach) { me->fake_detached_child = true; me->child.crack(); transition(status_after_detach); report_state(); } -void BookAlgo::on_book_update(const bts::orderman::BookUpdateEvent&) {} +void BookAlgo::on_book_update(const bts::orderman::BookUpdateEvent &) {} -bool BookAlgo::setup_hedge(const api::orderman::OrderDefinition&, const PreActivationOrderServices&, api::orderman::OrderDefinition*) -{ - return false; +bool BookAlgo::setup_hedge(const api::orderman::OrderDefinition &, + const PreActivationOrderServices &, + api::orderman::OrderDefinition *) { + return false; } -void BookAlgo::send_hedge_if_new_fills(const api::orderman::OrderState& orig_state, const OrderStateUpdateEvent& new_state) -{ - UNUSED(orig_state);UNUSED(new_state); - // uint32_t qty = new_state.state.filled_quantity() - orig_state.filled_quantity(); - // UNUSED(qty); -} - -} +void BookAlgo::send_hedge_if_new_fills( + const api::orderman::OrderState &orig_state, + const OrderStateUpdateEvent &new_state) { + UNUSED(orig_state); + UNUSED(new_state); + // uint32_t qty = new_state.state.filled_quantity() - + // orig_state.filled_quantity(); UNUSED(qty); } +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/orders/book_algos/CoverOrder.cpp b/src/lib/orderman/orders/book_algos/CoverOrder.cpp index de1f773be..2805859e4 100644 --- a/src/lib/orderman/orders/book_algos/CoverOrder.cpp +++ b/src/lib/orderman/orders/book_algos/CoverOrder.cpp @@ -10,94 +10,87 @@ namespace orderman { using namespace api::orderman; -struct CoverOrder::PImpl -{ +struct CoverOrder::PImpl { PImpl() {} - - int hedge_ticks; - OrderDefinition hedge_def; -}; + int hedge_ticks; + OrderDefinition hedge_def; +}; CoverOrder::CoverOrder() : me(new PImpl()) {} CoverOrder::~CoverOrder() {} -void CoverOrder::setup_child(const api::orderman::OrderDefinition& this_def, const PreActivationOrderServices&, - api::orderman::OrderState& initial_state, api::orderman::OrderDefinition* out_child) -{ +void CoverOrder::setup_child(const api::orderman::OrderDefinition &this_def, + const PreActivationOrderServices &, + api::orderman::OrderState &initial_state, + api::orderman::OrderDefinition *out_child) { initial_state.mutable_cover(); - auto const &cover_def = this_def.custom_def().cover(); + auto const &cover_def = this_def.custom_def().cover(); *out_child->mutable_custom_def() = cover_def.child(); - - me->hedge_ticks = cover_def.hedge_ticks(); + + me->hedge_ticks = cover_def.hedge_ticks(); } -bool CoverOrder::setup_hedge(const api::orderman::OrderDefinition& this_def, const PreActivationOrderServices&, - api::orderman::OrderDefinition* out_hedge) -{ +bool CoverOrder::setup_hedge(const api::orderman::OrderDefinition &this_def, + const PreActivationOrderServices &, + api::orderman::OrderDefinition *out_hedge) { auto const &cover_def = this_def.custom_def().cover(); - if(cover_def.has_hedge()) - { - *out_hedge->mutable_custom_def() = cover_def.hedge(); - if(definition().side() == api::SIDE_BUY) + if (cover_def.has_hedge()) { + *out_hedge->mutable_custom_def() = cover_def.hedge(); + if (definition().side() == api::SIDE_BUY) out_hedge->set_side(api::SIDE_SELL); else out_hedge->set_side(api::SIDE_BUY); return true; - } - else + } else return false; } -void CoverOrder::send_hedge_if_new_fills(const api::orderman::OrderState& orig_state, const OrderStateUpdateEvent& new_state) -{ +void CoverOrder::send_hedge_if_new_fills( + const api::orderman::OrderState &orig_state, + const OrderStateUpdateEvent &new_state) { uint32_t qty = new_state.filled_quantity - orig_state.filled_quantity(); - if(qty > 0) - { + if (qty > 0) { double prx = new_state.last_price; - if(definition().side() == api::SIDE_BUY) //if this is a buy, I'm going to sell my hedge, nticks higher than the fill price + if (definition().side() == + api::SIDE_BUY) // if this is a buy, I'm going to sell my hedge, nticks + // higher than the fill price prx = prx + tick_size() * me->hedge_ticks; else prx = prx - tick_size() * me->hedge_ticks; - + build_and_send_hedge(Price(prx), Quantity(qty)); } } -void CoverOrder::on_book_update(const bts::orderman::BookUpdateEvent& ) -{ - switch (this_state().status()) - { +void CoverOrder::on_book_update(const bts::orderman::BookUpdateEvent &) { + switch (this_state().status()) { case ORDER_STATUS_WORKING: - switch (child_state().status()) - { - case ORDER_STATUS_INACTIVE: - { - activate_child(Price(this_state().price()), Quantity(this_state().quantity())); - transition(ORDER_STATUS_WORKING); - report_state(); - } - break; - case ORDER_STATUS_WORKING: - { - } - break; - - case ORDER_STATUS_PENDING_WORKING: - break; + switch (child_state().status()) { + case ORDER_STATUS_INACTIVE: { + activate_child(Price(this_state().price()), + Quantity(this_state().quantity())); + transition(ORDER_STATUS_WORKING); + report_state(); + } break; + case ORDER_STATUS_WORKING: { + } break; - // child cannot be in any of these states if we are in the working state - case ORDER_STATUS_DISCONNECTED: - case ORDER_STATUS_ERROR: - case ORDER_STATUS_REJECTED_BY_SPARK: - case ORDER_STATUS_COMPLETED: - case ORDER_STATUS_CANCELED: - case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: - case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: - bts_assert(false); - break; - } + case ORDER_STATUS_PENDING_WORKING: + break; + + // child cannot be in any of these states if we are in the working state + case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_ERROR: + case ORDER_STATUS_REJECTED_BY_SPARK: + case ORDER_STATUS_COMPLETED: + case ORDER_STATUS_CANCELED: + case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: + case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: + bts_assert(false); + break; + } break; case ORDER_STATUS_COMPLETED: @@ -113,9 +106,8 @@ void CoverOrder::on_book_update(const bts::orderman::BookUpdateEvent& ) case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: bts_assert(false); break; - } -} - -} + } } +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/orders/book_algos/JoinOrder.cpp b/src/lib/orderman/orders/book_algos/JoinOrder.cpp index 46db1509c..1bf352523 100644 --- a/src/lib/orderman/orders/book_algos/JoinOrder.cpp +++ b/src/lib/orderman/orders/book_algos/JoinOrder.cpp @@ -10,101 +10,90 @@ namespace orderman { using namespace api::orderman; -struct JoinOrder::PImpl -{ +struct JoinOrder::PImpl { PImpl() {} - - spark::QuantityMeasure join_threshold; - - md::PriceSize opposite_at_inception; + + spark::QuantityMeasure join_threshold; + + md::PriceSize opposite_at_inception; bool did_join; }; - JoinOrder::JoinOrder() : me(new PImpl()) {} JoinOrder::~JoinOrder() {} -void JoinOrder::setup_child(const api::orderman::OrderDefinition& this_def, const PreActivationOrderServices&, - api::orderman::OrderState& initial_state, api::orderman::OrderDefinition* out_child) -{ +void JoinOrder::setup_child(const api::orderman::OrderDefinition &this_def, + const PreActivationOrderServices &, + api::orderman::OrderState &initial_state, + api::orderman::OrderDefinition *out_child) { initial_state.mutable_join(); - auto const &join_def = this_def.custom_def().join(); + auto const &join_def = this_def.custom_def().join(); *out_child->mutable_custom_def() = join_def.child(); - + me->join_threshold = join_def.join_threshold(); me->did_join = false; } -void JoinOrder::on_book_update(const bts::orderman::BookUpdateEvent& book) -{ - switch (this_state().status()) - { +void JoinOrder::on_book_update(const bts::orderman::BookUpdateEvent &book) { + switch (this_state().status()) { case ORDER_STATUS_WORKING: - switch (child_state().status()) - { - case ORDER_STATUS_INACTIVE: - { - if(definition().side() == api::SIDE_BUY) - { - me->opposite_at_inception = book.book.side(api::Side::SIDE_SELL)[0]; - activate_child(Price(this_state().price()), Quantity(this_state().quantity())); - transition(ORDER_STATUS_WORKING); - } - else - { - me->opposite_at_inception = book.book.side(api::Side::SIDE_BUY)[0]; - activate_child(Price(this_state().price()), Quantity(this_state().quantity())); - transition(ORDER_STATUS_WORKING); - } - report_state(); + switch (child_state().status()) { + case ORDER_STATUS_INACTIVE: { + if (definition().side() == api::SIDE_BUY) { + me->opposite_at_inception = book.book.side(api::Side::SIDE_SELL)[0]; + activate_child(Price(this_state().price()), + Quantity(this_state().quantity())); + transition(ORDER_STATUS_WORKING); + } else { + me->opposite_at_inception = book.book.side(api::Side::SIDE_BUY)[0]; + activate_child(Price(this_state().price()), + Quantity(this_state().quantity())); + transition(ORDER_STATUS_WORKING); } - break; - case ORDER_STATUS_WORKING: - { - Quantity thresh = SpreaderUtils::_quantity_threshold(me->join_threshold, Quantity(this_state().quantity())); - if(definition().side() == api::SIDE_BUY) - { - const auto& same = book.book.side(api::Side::SIDE_BUY)[0]; - if(me->opposite_at_inception.price() > same.price()) - {} - //we join exactly once, but we can't detach because we have to hang around and look for hedges - else if(!me->did_join && same.size() >= thresh.value()) - { - me->did_join = true; - update_child(Price(same.price()), Quantity(this_state().quantity())); - report_state(); - } + report_state(); + } break; + case ORDER_STATUS_WORKING: { + Quantity thresh = SpreaderUtils::_quantity_threshold( + me->join_threshold, Quantity(this_state().quantity())); + if (definition().side() == api::SIDE_BUY) { + const auto &same = book.book.side(api::Side::SIDE_BUY)[0]; + if (me->opposite_at_inception.price() > same.price()) { } - else - { - const auto& same = book.book.side(api::Side::SIDE_SELL)[0]; - if(me->opposite_at_inception.price() < same.price()) - {} - else if(!me->did_join && same.size() >= thresh.value()) - { - me->did_join = true; - update_child(Price(same.price()), Quantity(this_state().quantity())); - report_state(); - } + // we join exactly once, but we can't detach because we have to hang + // around and look for hedges + else if (!me->did_join && same.size() >= thresh.value()) { + me->did_join = true; + update_child(Price(same.price()), + Quantity(this_state().quantity())); + report_state(); } - } - break; - - case ORDER_STATUS_PENDING_WORKING: - break; + } else { + const auto &same = book.book.side(api::Side::SIDE_SELL)[0]; + if (me->opposite_at_inception.price() < same.price()) { + } else if (!me->did_join && same.size() >= thresh.value()) { + me->did_join = true; + update_child(Price(same.price()), + Quantity(this_state().quantity())); + report_state(); + } + } + } break; - // child cannot be in any of these states if we are in the working state - case ORDER_STATUS_DISCONNECTED: - case ORDER_STATUS_ERROR: - case ORDER_STATUS_REJECTED_BY_SPARK: - case ORDER_STATUS_COMPLETED: - case ORDER_STATUS_CANCELED: - case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: - case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: - bts_assert(false); - break; - } + case ORDER_STATUS_PENDING_WORKING: + break; + + // child cannot be in any of these states if we are in the working state + case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_ERROR: + case ORDER_STATUS_REJECTED_BY_SPARK: + case ORDER_STATUS_COMPLETED: + case ORDER_STATUS_CANCELED: + case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: + case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: + bts_assert(false); + break; + } break; case ORDER_STATUS_COMPLETED: @@ -120,9 +109,8 @@ void JoinOrder::on_book_update(const bts::orderman::BookUpdateEvent& book) case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: bts_assert(false); break; - } -} - -} + } } +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/orders/book_algos/LeanOrder.cpp b/src/lib/orderman/orders/book_algos/LeanOrder.cpp index 8d1213311..f538a8b2e 100644 --- a/src/lib/orderman/orders/book_algos/LeanOrder.cpp +++ b/src/lib/orderman/orders/book_algos/LeanOrder.cpp @@ -10,184 +10,170 @@ namespace orderman { using namespace api::orderman; -struct LeanOrder::PImpl -{ - PImpl() : cross_threshold(), max_chase_ticks(0), trade_toward_behavior(LeanOrderDefinition_OnToward_NO_CHANGE), opposite_at_inception(), num_chases(0) - {} - - spark::QuantityMeasure cross_threshold; - uint32_t max_chase_ticks; +struct LeanOrder::PImpl { + PImpl() + : cross_threshold(), max_chase_ticks(0), + trade_toward_behavior(LeanOrderDefinition_OnToward_NO_CHANGE), + opposite_at_inception(), num_chases(0) {} + + spark::QuantityMeasure cross_threshold; + uint32_t max_chase_ticks; LeanOrderDefinition_OnToward trade_toward_behavior; - - md::PriceSize opposite_at_inception; + + md::PriceSize opposite_at_inception; uint32_t num_chases; }; - LeanOrder::LeanOrder() : me(new PImpl()) {} LeanOrder::~LeanOrder() {} -void LeanOrder::setup_child(const api::orderman::OrderDefinition& this_def, const PreActivationOrderServices&, - api::orderman::OrderState& initial_state, api::orderman::OrderDefinition* out_child) -{ +void LeanOrder::setup_child(const api::orderman::OrderDefinition &this_def, + const PreActivationOrderServices &, + api::orderman::OrderState &initial_state, + api::orderman::OrderDefinition *out_child) { initial_state.mutable_lean(); - auto const &lean_def = this_def.custom_def().lean(); + auto const &lean_def = this_def.custom_def().lean(); *out_child->mutable_custom_def() = lean_def.child(); - + me->cross_threshold = lean_def.cross_threshold(); - me->max_chase_ticks = lean_def.max_chase_ticks(); - me->trade_toward_behavior = lean_def.trade_toward_behavior(); + me->max_chase_ticks = lean_def.max_chase_ticks(); + me->trade_toward_behavior = lean_def.trade_toward_behavior(); } -void LeanOrder::payup(const md::PriceSize&, const bts::orderman::BookUpdateEvent& book, uint32_t cross_ticks /*= 0*/) -{ - double new_price = me->opposite_at_inception.price() + tick_size() * cross_ticks; - double limit = me->opposite_at_inception.price() + tick_size() * me->max_chase_ticks; - if(new_price <= limit) +void LeanOrder::payup(const md::PriceSize &, + const bts::orderman::BookUpdateEvent &book, + uint32_t cross_ticks /*= 0*/) { + double new_price = + me->opposite_at_inception.price() + tick_size() * cross_ticks; + double limit = + me->opposite_at_inception.price() + tick_size() * me->max_chase_ticks; + if (new_price <= limit) update_child(Price(new_price), Quantity(this_state().quantity())); - else - { - update_child(Price(limit), Quantity(this_state().quantity())); + else { + update_child(Price(limit), Quantity(this_state().quantity())); detach(); return; - } - - const bts::orderman::BookSide& sellbook = book.book.side(api::Side::SIDE_SELL); - for(const auto& i : sellbook) - { + } + + const bts::orderman::BookSide &sellbook = + book.book.side(api::Side::SIDE_SELL); + for (const auto &i : sellbook) { me->opposite_at_inception = i; - if(me->opposite_at_inception.price() > new_price) + if (me->opposite_at_inception.price() > new_price) break; - } - if(me->opposite_at_inception.price() <= new_price) - detach(); - me->num_chases += cross_ticks+1; - if(me->num_chases >= me->max_chase_ticks) - detach(); + } + if (me->opposite_at_inception.price() <= new_price) + detach(); + me->num_chases += cross_ticks + 1; + if (me->num_chases >= me->max_chase_ticks) + detach(); report_state(); } -void LeanOrder::paydown(const md::PriceSize&, const bts::orderman::BookUpdateEvent& book, uint32_t cross_ticks /*= 0*/) -{ - double new_price = me->opposite_at_inception.price() - tick_size() * cross_ticks; - double limit = me->opposite_at_inception.price() - tick_size() * me->max_chase_ticks; - if(new_price >= limit) +void LeanOrder::paydown(const md::PriceSize &, + const bts::orderman::BookUpdateEvent &book, + uint32_t cross_ticks /*= 0*/) { + double new_price = + me->opposite_at_inception.price() - tick_size() * cross_ticks; + double limit = + me->opposite_at_inception.price() - tick_size() * me->max_chase_ticks; + if (new_price >= limit) update_child(Price(new_price), Quantity(this_state().quantity())); - else - { - update_child(Price(limit), Quantity(this_state().quantity())); + else { + update_child(Price(limit), Quantity(this_state().quantity())); detach(); return; - } - - const bts::orderman::BookSide& buybook = book.book.side(api::Side::SIDE_BUY); - for(const auto& i : buybook) - { + } + + const bts::orderman::BookSide &buybook = book.book.side(api::Side::SIDE_BUY); + for (const auto &i : buybook) { me->opposite_at_inception = i; - if(me->opposite_at_inception.price() < new_price) + if (me->opposite_at_inception.price() < new_price) break; - } - if(me->opposite_at_inception.price() >= new_price) - detach(); - me->num_chases += cross_ticks+1; - if(me->num_chases >= me->max_chase_ticks) - detach(); + } + if (me->opposite_at_inception.price() >= new_price) + detach(); + me->num_chases += cross_ticks + 1; + if (me->num_chases >= me->max_chase_ticks) + detach(); report_state(); } -void LeanOrder::choose_trade_toward_behavior(const md::PriceSize& opposite) -{ - switch (me->trade_toward_behavior) - { - case LeanOrderDefinition_OnToward_CANCEL: - { - cancel_child(); - transition(ORDER_STATUS_CANCELED); - report_state(); - } +void LeanOrder::choose_trade_toward_behavior(const md::PriceSize &opposite) { + switch (me->trade_toward_behavior) { + case LeanOrderDefinition_OnToward_CANCEL: { + cancel_child(); + transition(ORDER_STATUS_CANCELED); + report_state(); + } break; + case LeanOrderDefinition_OnToward_DETACH: { + detach(); + } break; + case LeanOrderDefinition_OnToward_REPRICE: { + me->opposite_at_inception = opposite; + } break; + case LeanOrderDefinition_OnToward_NO_CHANGE: + default: break; - case LeanOrderDefinition_OnToward_DETACH: - { - detach(); - } - break; - case LeanOrderDefinition_OnToward_REPRICE: - { - me->opposite_at_inception = opposite; - } - break; - case LeanOrderDefinition_OnToward_NO_CHANGE: - default: - break; - } + } } -void LeanOrder::on_book_update(const bts::orderman::BookUpdateEvent& book) -{ - switch (this_state().status()) - { +void LeanOrder::on_book_update(const bts::orderman::BookUpdateEvent &book) { + switch (this_state().status()) { case ORDER_STATUS_WORKING: - switch (child_state().status()) - { - case ORDER_STATUS_INACTIVE: - { - if(definition().side() == api::SIDE_BUY) - me->opposite_at_inception = book.book.side(api::Side::SIDE_SELL)[0]; - else - me->opposite_at_inception = book.book.side(api::Side::SIDE_BUY)[0]; - - activate_child(Price(this_state().price()), Quantity(this_state().quantity())); - transition(ORDER_STATUS_WORKING); - report_state(); - } - break; - case ORDER_STATUS_WORKING: - { - Quantity thresh = SpreaderUtils::_quantity_threshold(me->cross_threshold, Quantity(this_state().quantity())); - if(definition().side() == api::SIDE_BUY) - { - const auto& opposite = book.book.side(api::Side::SIDE_SELL)[0]; - if(opposite.price() < me->opposite_at_inception.price()) - choose_trade_toward_behavior(opposite); - else if(opposite.price() > me->opposite_at_inception.price()) - payup(opposite, book); //you missed, payup/join - else - { - if(opposite.size() <= thresh.value()) - payup(opposite, book); - } - } - else - { - const auto& opposite = book.book.side(api::Side::SIDE_BUY)[0]; - if(opposite.price() > me->opposite_at_inception.price()) - choose_trade_toward_behavior(opposite); - else if(opposite.price() < me->opposite_at_inception.price()) - paydown(opposite, book); - else - { - if(opposite.size() <= thresh.value()) - paydown(opposite, book); - } - } - } - break; - - case ORDER_STATUS_PENDING_WORKING: - break; + switch (child_state().status()) { + case ORDER_STATUS_INACTIVE: { + if (definition().side() == api::SIDE_BUY) + me->opposite_at_inception = book.book.side(api::Side::SIDE_SELL)[0]; + else + me->opposite_at_inception = book.book.side(api::Side::SIDE_BUY)[0]; - // child cannot be in any of these states if we are in the working state - case ORDER_STATUS_DISCONNECTED: - case ORDER_STATUS_ERROR: - case ORDER_STATUS_REJECTED_BY_SPARK: - case ORDER_STATUS_COMPLETED: - case ORDER_STATUS_CANCELED: - case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: - case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: - bts_assert(false); - break; + activate_child(Price(this_state().price()), + Quantity(this_state().quantity())); + transition(ORDER_STATUS_WORKING); + report_state(); + } break; + case ORDER_STATUS_WORKING: { + Quantity thresh = SpreaderUtils::_quantity_threshold( + me->cross_threshold, Quantity(this_state().quantity())); + if (definition().side() == api::SIDE_BUY) { + const auto &opposite = book.book.side(api::Side::SIDE_SELL)[0]; + if (opposite.price() < me->opposite_at_inception.price()) + choose_trade_toward_behavior(opposite); + else if (opposite.price() > me->opposite_at_inception.price()) + payup(opposite, book); // you missed, payup/join + else { + if (opposite.size() <= thresh.value()) + payup(opposite, book); + } + } else { + const auto &opposite = book.book.side(api::Side::SIDE_BUY)[0]; + if (opposite.price() > me->opposite_at_inception.price()) + choose_trade_toward_behavior(opposite); + else if (opposite.price() < me->opposite_at_inception.price()) + paydown(opposite, book); + else { + if (opposite.size() <= thresh.value()) + paydown(opposite, book); + } } + } break; + + case ORDER_STATUS_PENDING_WORKING: + break; + + // child cannot be in any of these states if we are in the working state + case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_ERROR: + case ORDER_STATUS_REJECTED_BY_SPARK: + case ORDER_STATUS_COMPLETED: + case ORDER_STATUS_CANCELED: + case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: + case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: + bts_assert(false); + break; + } break; case ORDER_STATUS_COMPLETED: @@ -203,9 +189,8 @@ void LeanOrder::on_book_update(const bts::orderman::BookUpdateEvent& book) case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: bts_assert(false); break; - } -} - -} + } } +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/orders/book_algos/OffsetOrder.cpp b/src/lib/orderman/orders/book_algos/OffsetOrder.cpp index fad23cc55..973d1c0ce 100644 --- a/src/lib/orderman/orders/book_algos/OffsetOrder.cpp +++ b/src/lib/orderman/orders/book_algos/OffsetOrder.cpp @@ -10,75 +10,65 @@ namespace orderman { using namespace api::orderman; -struct OffsetOrder::PImpl -{ +struct OffsetOrder::PImpl { PImpl() {} - - uint32_t tick_offset_on_deploy; -}; + uint32_t tick_offset_on_deploy; +}; OffsetOrder::OffsetOrder() : me(new PImpl()) {} OffsetOrder::~OffsetOrder() {} -void OffsetOrder::setup_child(const api::orderman::OrderDefinition& this_def, const PreActivationOrderServices&, - api::orderman::OrderState& initial_state, api::orderman::OrderDefinition* out_child) -{ +void OffsetOrder::setup_child(const api::orderman::OrderDefinition &this_def, + const PreActivationOrderServices &, + api::orderman::OrderState &initial_state, + api::orderman::OrderDefinition *out_child) { initial_state.mutable_tick(); - auto const &offset_def = this_def.custom_def().offset(); + auto const &offset_def = this_def.custom_def().offset(); *out_child->mutable_custom_def() = offset_def.child(); - - me->tick_offset_on_deploy = offset_def.tick_offset_on_deploy(); + + me->tick_offset_on_deploy = offset_def.tick_offset_on_deploy(); } - -void OffsetOrder::on_book_update(const bts::orderman::BookUpdateEvent& book) -{ - switch (this_state().status()) - { +void OffsetOrder::on_book_update(const bts::orderman::BookUpdateEvent &book) { + switch (this_state().status()) { case ORDER_STATUS_WORKING: - switch (child_state().status()) - { - case ORDER_STATUS_INACTIVE: - { - if(definition().side() == api::SIDE_BUY) - { - const auto& same = book.book.side(api::Side::SIDE_BUY)[0]; - double price = same.price() - tick_size() * me->tick_offset_on_deploy; - activate_child(Price(price), Quantity(this_state().quantity())); - transition(ORDER_STATUS_WORKING); - } - else - { - const auto& same = book.book.side(api::Side::SIDE_SELL)[0]; - double price = same.price() + tick_size() * me->tick_offset_on_deploy; - activate_child(Price(price), Quantity(this_state().quantity())); - transition(ORDER_STATUS_WORKING); - } - report_state(); + switch (child_state().status()) { + case ORDER_STATUS_INACTIVE: { + if (definition().side() == api::SIDE_BUY) { + const auto &same = book.book.side(api::Side::SIDE_BUY)[0]; + double price = + same.price() - tick_size() * me->tick_offset_on_deploy; + activate_child(Price(price), Quantity(this_state().quantity())); + transition(ORDER_STATUS_WORKING); + } else { + const auto &same = book.book.side(api::Side::SIDE_SELL)[0]; + double price = + same.price() + tick_size() * me->tick_offset_on_deploy; + activate_child(Price(price), Quantity(this_state().quantity())); + transition(ORDER_STATUS_WORKING); } - break; - case ORDER_STATUS_WORKING: - { - detach(); - } - break; - - case ORDER_STATUS_PENDING_WORKING: - break; + report_state(); + } break; + case ORDER_STATUS_WORKING: { + detach(); + } break; - // child cannot be in any of these states if we are in the working state - case ORDER_STATUS_DISCONNECTED: - case ORDER_STATUS_ERROR: - case ORDER_STATUS_REJECTED_BY_SPARK: - case ORDER_STATUS_COMPLETED: - case ORDER_STATUS_CANCELED: - case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: - case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: - bts_assert(false); - break; - } + case ORDER_STATUS_PENDING_WORKING: + break; + + // child cannot be in any of these states if we are in the working state + case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_ERROR: + case ORDER_STATUS_REJECTED_BY_SPARK: + case ORDER_STATUS_COMPLETED: + case ORDER_STATUS_CANCELED: + case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: + case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: + bts_assert(false); + break; + } break; case ORDER_STATUS_COMPLETED: @@ -94,9 +84,8 @@ void OffsetOrder::on_book_update(const bts::orderman::BookUpdateEvent& book) case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: bts_assert(false); break; - } -} - -} + } } +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/orders/book_algos/TickOrder.cpp b/src/lib/orderman/orders/book_algos/TickOrder.cpp index 105d74084..d05404458 100644 --- a/src/lib/orderman/orders/book_algos/TickOrder.cpp +++ b/src/lib/orderman/orders/book_algos/TickOrder.cpp @@ -10,165 +10,146 @@ namespace orderman { using namespace api::orderman; -struct TickOrder::PImpl -{ +struct TickOrder::PImpl { PImpl() {} - - uint32_t tick_offset_on_deploy; - spark::QuantityMeasure cross_threshold; - uint32_t cross_ticks; - uint32_t max_chase_ticks; - bool detach_on_toward; - - md::PriceSize opposite_at_inception; -}; + uint32_t tick_offset_on_deploy; + spark::QuantityMeasure cross_threshold; + uint32_t cross_ticks; + uint32_t max_chase_ticks; + bool detach_on_toward; + + md::PriceSize opposite_at_inception; +}; TickOrder::TickOrder() : me(new PImpl()) {} TickOrder::~TickOrder() {} -void TickOrder::setup_child(const api::orderman::OrderDefinition& this_def, const PreActivationOrderServices&, - api::orderman::OrderState& initial_state, api::orderman::OrderDefinition* out_child) -{ +void TickOrder::setup_child(const api::orderman::OrderDefinition &this_def, + const PreActivationOrderServices &, + api::orderman::OrderState &initial_state, + api::orderman::OrderDefinition *out_child) { initial_state.mutable_tick(); - auto const &tick_def = this_def.custom_def().tick(); + auto const &tick_def = this_def.custom_def().tick(); *out_child->mutable_custom_def() = tick_def.child(); - - me->tick_offset_on_deploy = tick_def.tick_offset_on_deploy(); + + me->tick_offset_on_deploy = tick_def.tick_offset_on_deploy(); me->cross_threshold = tick_def.cross_threshold(); me->cross_ticks = tick_def.cross_ticks(); - me->max_chase_ticks = tick_def.max_chase_ticks(); + me->max_chase_ticks = tick_def.max_chase_ticks(); me->cross_threshold = tick_def.cross_threshold(); - me->detach_on_toward = tick_def.detach_on_toward(); + me->detach_on_toward = tick_def.detach_on_toward(); } -void TickOrder::payup(const md::PriceSize& opposite, const bts::orderman::BookUpdateEvent&, uint32_t cross_ticks) -{ +void TickOrder::payup(const md::PriceSize &opposite, + const bts::orderman::BookUpdateEvent &, + uint32_t cross_ticks) { double new_price = opposite.price() + tick_size() * cross_ticks; - double limit = me->opposite_at_inception.price() + tick_size() * me->max_chase_ticks; - if(new_price <= limit) + double limit = + me->opposite_at_inception.price() + tick_size() * me->max_chase_ticks; + if (new_price <= limit) update_child(Price(new_price), Quantity(this_state().quantity())); - else - { + else { update_child(Price(limit), Quantity(this_state().quantity())); detach(); } report_state(); } -void TickOrder::paydown(const md::PriceSize& opposite, const bts::orderman::BookUpdateEvent&, uint32_t cross_ticks) -{ +void TickOrder::paydown(const md::PriceSize &opposite, + const bts::orderman::BookUpdateEvent &, + uint32_t cross_ticks) { double new_price = opposite.price() - tick_size() * cross_ticks; - double limit = me->opposite_at_inception.price() - tick_size() * me->max_chase_ticks; - if(new_price >= limit) + double limit = + me->opposite_at_inception.price() - tick_size() * me->max_chase_ticks; + if (new_price >= limit) update_child(Price(new_price), Quantity(this_state().quantity())); - else - { - update_child(Price(limit), Quantity(this_state().quantity())); + else { + update_child(Price(limit), Quantity(this_state().quantity())); detach(); } report_state(); } -void TickOrder::on_book_update(const bts::orderman::BookUpdateEvent& book) -{ - switch (this_state().status()) - { +void TickOrder::on_book_update(const bts::orderman::BookUpdateEvent &book) { + switch (this_state().status()) { case ORDER_STATUS_WORKING: - switch (child_state().status()) - { - case ORDER_STATUS_INACTIVE: - { - if(definition().side() == api::SIDE_BUY) - { - me->opposite_at_inception = book.book.side(api::Side::SIDE_SELL)[0]; - if(me->tick_offset_on_deploy > 0) - { - double price = me->opposite_at_inception.price() - tick_size() * me->tick_offset_on_deploy; - activate_child(Price(price), Quantity(this_state().quantity())); - transition(ORDER_STATUS_WORKING); - } - else - { - activate_child(Price(this_state().price()), Quantity(this_state().quantity())); - transition(ORDER_STATUS_WORKING); - } + switch (child_state().status()) { + case ORDER_STATUS_INACTIVE: { + if (definition().side() == api::SIDE_BUY) { + me->opposite_at_inception = book.book.side(api::Side::SIDE_SELL)[0]; + if (me->tick_offset_on_deploy > 0) { + double price = me->opposite_at_inception.price() - + tick_size() * me->tick_offset_on_deploy; + activate_child(Price(price), Quantity(this_state().quantity())); + transition(ORDER_STATUS_WORKING); + } else { + activate_child(Price(this_state().price()), + Quantity(this_state().quantity())); + transition(ORDER_STATUS_WORKING); } - else - { - me->opposite_at_inception = book.book.side(api::Side::SIDE_BUY)[0]; - if(me->tick_offset_on_deploy > 0) - { - double price = me->opposite_at_inception.price() + tick_size() * me->tick_offset_on_deploy; - activate_child(Price(price), Quantity(this_state().quantity())); - transition(ORDER_STATUS_WORKING); - } - else - { - activate_child(Price(this_state().price()), Quantity(this_state().quantity())); - transition(ORDER_STATUS_WORKING); - } + } else { + me->opposite_at_inception = book.book.side(api::Side::SIDE_BUY)[0]; + if (me->tick_offset_on_deploy > 0) { + double price = me->opposite_at_inception.price() + + tick_size() * me->tick_offset_on_deploy; + activate_child(Price(price), Quantity(this_state().quantity())); + transition(ORDER_STATUS_WORKING); + } else { + activate_child(Price(this_state().price()), + Quantity(this_state().quantity())); + transition(ORDER_STATUS_WORKING); } - report_state(); } - break; - case ORDER_STATUS_WORKING: - { - Quantity thresh = SpreaderUtils::_quantity_threshold(me->cross_threshold, Quantity(this_state().quantity())); - if(definition().side() == api::SIDE_BUY) - { - const auto& opposite = book.book.side(api::Side::SIDE_SELL)[0]; - if(opposite.price() < me->opposite_at_inception.price()) - { - if(me->detach_on_toward) - detach(); - else - me->opposite_at_inception = opposite; - } - else if(opposite.price() > me->opposite_at_inception.price()) + report_state(); + } break; + case ORDER_STATUS_WORKING: { + Quantity thresh = SpreaderUtils::_quantity_threshold( + me->cross_threshold, Quantity(this_state().quantity())); + if (definition().side() == api::SIDE_BUY) { + const auto &opposite = book.book.side(api::Side::SIDE_SELL)[0]; + if (opposite.price() < me->opposite_at_inception.price()) { + if (me->detach_on_toward) + detach(); + else + me->opposite_at_inception = opposite; + } else if (opposite.price() > me->opposite_at_inception.price()) + payup(opposite, book, me->cross_ticks); + else { + if (opposite.size() <= thresh.value()) payup(opposite, book, me->cross_ticks); - else - { - if(opposite.size() <= thresh.value()) - payup(opposite, book, me->cross_ticks); - } } - else - { - const auto& opposite = book.book.side(api::Side::SIDE_BUY)[0]; - if(opposite.price() > me->opposite_at_inception.price()) - { - if(me->detach_on_toward) - detach(); - else - me->opposite_at_inception = opposite; - } - else if(opposite.price() < me->opposite_at_inception.price()) + } else { + const auto &opposite = book.book.side(api::Side::SIDE_BUY)[0]; + if (opposite.price() > me->opposite_at_inception.price()) { + if (me->detach_on_toward) + detach(); + else + me->opposite_at_inception = opposite; + } else if (opposite.price() < me->opposite_at_inception.price()) + paydown(opposite, book, me->cross_ticks); + else { + if (opposite.size() <= thresh.value()) paydown(opposite, book, me->cross_ticks); - else - { - if(opposite.size() <= thresh.value()) - paydown(opposite, book, me->cross_ticks); - } } - } - break; - - case ORDER_STATUS_PENDING_WORKING: - break; - - // child cannot be in any of these states if we are in the working state - case ORDER_STATUS_DISCONNECTED: - case ORDER_STATUS_ERROR: - case ORDER_STATUS_REJECTED_BY_SPARK: - case ORDER_STATUS_COMPLETED: - case ORDER_STATUS_CANCELED: - case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: - case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: - bts_assert(false); - break; } + } break; + + case ORDER_STATUS_PENDING_WORKING: + break; + + // child cannot be in any of these states if we are in the working state + case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_ERROR: + case ORDER_STATUS_REJECTED_BY_SPARK: + case ORDER_STATUS_COMPLETED: + case ORDER_STATUS_CANCELED: + case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: + case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: + bts_assert(false); + break; + } break; case ORDER_STATUS_COMPLETED: @@ -184,9 +165,8 @@ void TickOrder::on_book_update(const bts::orderman::BookUpdateEvent& book) case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: bts_assert(false); break; - } -} - -} + } } +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/orders/book_algos/TopOrder.cpp b/src/lib/orderman/orders/book_algos/TopOrder.cpp index 1feb1e6cf..8fded05b5 100644 --- a/src/lib/orderman/orders/book_algos/TopOrder.cpp +++ b/src/lib/orderman/orders/book_algos/TopOrder.cpp @@ -1,8 +1,8 @@ #include "TopOrder.h" +#include "lib/domain_model/Security.h" #include "lib/orderman/actors/order_manager/OrderBuilder.h" #include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" -#include "lib/domain_model/Security.h" #include "lib/utils/PBUtils.h" #include @@ -11,118 +11,102 @@ namespace orderman { using namespace api::orderman; -struct TopOrder::PImpl -{ +struct TopOrder::PImpl { PImpl() {} - - uint32_t watch_level_tick_offset; - spark::QuantityMeasure top_threshold; -}; + uint32_t watch_level_tick_offset; + spark::QuantityMeasure top_threshold; +}; TopOrder::TopOrder() : me(new PImpl()) {} TopOrder::~TopOrder() {} -void TopOrder::setup_child(const api::orderman::OrderDefinition& this_def, const PreActivationOrderServices&, - api::orderman::OrderState& initial_state, api::orderman::OrderDefinition* out_child) -{ +void TopOrder::setup_child(const api::orderman::OrderDefinition &this_def, + const PreActivationOrderServices &, + api::orderman::OrderState &initial_state, + api::orderman::OrderDefinition *out_child) { initial_state.mutable_top(); auto const &top_def = this_def.custom_def().top(); *out_child->mutable_custom_def() = top_def.child(); - + me->watch_level_tick_offset = top_def.watch_level_tick_offset(); me->top_threshold = top_def.top_threshold(); } - -void TopOrder::on_book_update(const bts::orderman::BookUpdateEvent& book) -{ - switch (this_state().status()) - { +void TopOrder::on_book_update(const bts::orderman::BookUpdateEvent &book) { + switch (this_state().status()) { case ORDER_STATUS_WORKING: - switch (child_state().status()) - { - case ORDER_STATUS_INACTIVE: - { - Quantity thresh = SpreaderUtils::_quantity_threshold(me->top_threshold, Quantity(this_state().quantity())); - if(definition().side() == api::SIDE_BUY) - { - const auto& same = book.book.side(api::Side::SIDE_BUY)[0]; - if(securities::test_price_equality(this_state().price(), same.price(), tick_size())) - { - if(same.size() <= thresh.value()) - { - transition(ORDER_STATUS_CANCELED); - report_state(); - return; - } + switch (child_state().status()) { + case ORDER_STATUS_INACTIVE: { + Quantity thresh = SpreaderUtils::_quantity_threshold( + me->top_threshold, Quantity(this_state().quantity())); + if (definition().side() == api::SIDE_BUY) { + const auto &same = book.book.side(api::Side::SIDE_BUY)[0]; + if (securities::test_price_equality(this_state().price(), + same.price(), tick_size())) { + if (same.size() <= thresh.value()) { + transition(ORDER_STATUS_CANCELED); + report_state(); + return; } } - else - { - const auto& same = book.book.side(api::Side::SIDE_SELL)[0]; - if(securities::test_price_equality(this_state().price(), same.price(), tick_size())) - { - if(same.size() <= thresh.value()) - { - transition(ORDER_STATUS_CANCELED); - report_state(); - return; - } - } - } - activate_child(Price(this_state().price()), Quantity(this_state().quantity())); - transition(ORDER_STATUS_WORKING); - report_state(); - } - break; - case ORDER_STATUS_WORKING: - { - Quantity thresh = SpreaderUtils::_quantity_threshold(me->top_threshold, Quantity(this_state().quantity())); - if(definition().side() == api::SIDE_BUY) - { - const auto& same = book.book.side(api::Side::SIDE_BUY)[0]; - if(securities::test_price_equality(this_state().price(), same.price(), tick_size())) - { - if(same.size() <= thresh.value()) - { - cancel_child(); - transition(ORDER_STATUS_CANCELED); - report_state(); - } + } else { + const auto &same = book.book.side(api::Side::SIDE_SELL)[0]; + if (securities::test_price_equality(this_state().price(), + same.price(), tick_size())) { + if (same.size() <= thresh.value()) { + transition(ORDER_STATUS_CANCELED); + report_state(); + return; } } - else - { - const auto& same = book.book.side(api::Side::SIDE_SELL)[0]; - if(securities::test_price_equality(this_state().price(), same.price(), tick_size())) - { - if(same.size() <= thresh.value()) - { - cancel_child(); - transition(ORDER_STATUS_CANCELED); - report_state(); - } - } - } - } - break; - - case ORDER_STATUS_PENDING_WORKING: - break; - - // child cannot be in any of these states if we are in the working state - case ORDER_STATUS_DISCONNECTED: - case ORDER_STATUS_ERROR: - case ORDER_STATUS_REJECTED_BY_SPARK: - case ORDER_STATUS_COMPLETED: - case ORDER_STATUS_CANCELED: - case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: - case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: - bts_assert(false); - break; } + activate_child(Price(this_state().price()), + Quantity(this_state().quantity())); + transition(ORDER_STATUS_WORKING); + report_state(); + } break; + case ORDER_STATUS_WORKING: { + Quantity thresh = SpreaderUtils::_quantity_threshold( + me->top_threshold, Quantity(this_state().quantity())); + if (definition().side() == api::SIDE_BUY) { + const auto &same = book.book.side(api::Side::SIDE_BUY)[0]; + if (securities::test_price_equality(this_state().price(), + same.price(), tick_size())) { + if (same.size() <= thresh.value()) { + cancel_child(); + transition(ORDER_STATUS_CANCELED); + report_state(); + } + } + } else { + const auto &same = book.book.side(api::Side::SIDE_SELL)[0]; + if (securities::test_price_equality(this_state().price(), + same.price(), tick_size())) { + if (same.size() <= thresh.value()) { + cancel_child(); + transition(ORDER_STATUS_CANCELED); + report_state(); + } + } + } + } break; + + case ORDER_STATUS_PENDING_WORKING: + break; + + // child cannot be in any of these states if we are in the working state + case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_ERROR: + case ORDER_STATUS_REJECTED_BY_SPARK: + case ORDER_STATUS_COMPLETED: + case ORDER_STATUS_CANCELED: + case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: + case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: + bts_assert(false); + break; + } break; case ORDER_STATUS_COMPLETED: @@ -138,9 +122,8 @@ void TopOrder::on_book_update(const bts::orderman::BookUpdateEvent& book) case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: bts_assert(false); break; - } -} - -} + } } +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/server/OrderServiceServer.cpp b/src/lib/orderman/server/OrderServiceServer.cpp index 9eb1abb06..7763f4a8b 100644 --- a/src/lib/orderman/server/OrderServiceServer.cpp +++ b/src/lib/orderman/server/OrderServiceServer.cpp @@ -18,12 +18,12 @@ #include "lib/orderman/actors/ServiceBridge.h" #include "lib/orderman/actors/order_manager/OrderManager.h" #include "lib/orderman/order_factory/DynamicOrderRegistry.h" -#include "lib/utils/bts_chrono.h" -#include "lib/plugin/plugin.h" #include "lib/plugin/SparkServices.h" +#include "lib/plugin/plugin.h" +#include "lib/utils/bts_chrono.h" #include "lib/utils/thread_manager.h" #include "lib/utils/type_name.h" - + #include namespace bts { @@ -90,8 +90,7 @@ ActorThread *find_thread_for_actor( struct OrderServiceServer::PImpl { PImpl(bts::api::ServiceContext &ctx, std::shared_ptr &ss, - DynamicOrderRegistry const &d, - metrics::MetricsContainer &stats) + DynamicOrderRegistry const &d, metrics::MetricsContainer &stats) : service_bridge(), service_ready(false), known_orders(), known_fills(), publish_orders(), publish_fills(), admin_service(ctx.locate()), md_consumer(ss), @@ -116,10 +115,10 @@ struct OrderServiceServer::PImpl { OrderServiceServer::OrderServiceServer( bts::api::ServiceContext &ctx, std::shared_ptr &ss, - DynamicOrderRegistry const&d, - metrics::MetricsContainer &stats, PerfTraceLog &log) - : api::orderman::OrderServiceBase(ctx), me(new PImpl(ctx, ss, d,stats)) { - + DynamicOrderRegistry const &d, metrics::MetricsContainer &stats, + PerfTraceLog &log) + : api::orderman::OrderServiceBase(ctx), me(new PImpl(ctx, ss, d, stats)) { + me->publish_orders = make_orders_publisher(); me->publish_fills = make_fills_publisher(); @@ -214,9 +213,7 @@ OrderServiceServer::OrderServiceServer( [this, &ctx](auto const &fill) { ctx.post([this, fill] { this->on_fills(fill); }); }, - me->dyn_order_registry, - thread->executor.make_proxy()); - + me->dyn_order_registry, thread->executor.make_proxy()); thread->executor.activate(me->service_bridge); diff --git a/src/lib/orderman/tests/fat_wrapper_tests.cpp b/src/lib/orderman/tests/fat_wrapper_tests.cpp index 0472ca363..b3a45dc12 100644 --- a/src/lib/orderman/tests/fat_wrapper_tests.cpp +++ b/src/lib/orderman/tests/fat_wrapper_tests.cpp @@ -6,16 +6,14 @@ namespace mercury { struct A { std::string s; - bool operator==(const A&src) const {return src.s == s;} + bool operator==(const A &src) const { return src.s == s; } }; -TEST_CASE ("FatWrapperTests" , "[mercury]") -{ +TEST_CASE("FatWrapperTests", "[mercury]") { - SECTION("fat_wrapper_works_small") - { - mercury::FatWrapper <128> fw; - A a {"hello"}; + SECTION("fat_wrapper_works_small") { + mercury::FatWrapper<128> fw; + A a{"hello"}; fw.wrap(a); REQUIRE(a == fw.unwrap()); @@ -23,14 +21,13 @@ TEST_CASE ("FatWrapperTests" , "[mercury]") fw2 = fw; REQUIRE(a == fw2.unwrap()); - auto fw3 (fw); + auto fw3(fw); REQUIRE(a == fw3.unwrap()); } - SECTION("fat_wrapper_works_big") - { - mercury::FatWrapper <32> fw; - A a {"hello"}; + SECTION("fat_wrapper_works_big") { + mercury::FatWrapper<32> fw; + A a{"hello"}; fw.wrap(a); REQUIRE(a == fw.unwrap()); @@ -38,16 +35,16 @@ TEST_CASE ("FatWrapperTests" , "[mercury]") fw2 = fw; REQUIRE(a == fw2.unwrap()); - auto fw3 (fw); + auto fw3(fw); REQUIRE(a == fw3.unwrap()); } - SECTION("empty_can_be_copied") - { - mercury::FatWrapper <64> fw; - mercury::FatWrapper <64> fw2; - fw2=fw; + SECTION("empty_can_be_copied") { + mercury::FatWrapper<64> fw; + mercury::FatWrapper<64> fw2; + fw2 = fw; } } -}} +} // namespace mercury +} // namespace bts From 5dfca666658c3430d745ed79923d69d784799848 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Sat, 24 Nov 2018 21:53:22 +0000 Subject: [PATCH 003/107] Refactored OM to allow speed up. --- .../actors/order_manager/OrderServices.h | 83 +++++++++++++++---- src/lib/orderman/orders/IcebergOrder.cpp | 6 +- src/lib/orderman/orders/NativeOrder.cpp | 24 +++--- src/lib/orderman/orders/TimeBoxOrder.cpp | 6 +- src/lib/orderman/orders/TriggerOrder.cpp | 12 +-- .../orderman/orders/book_algos/BookAlgo.cpp | 6 +- .../SpreaderStartStateWorker.cpp | 16 ++-- src/web/CMakeDeps.cmake | 2 +- 8 files changed, 103 insertions(+), 52 deletions(-) diff --git a/src/lib/orderman/actors/order_manager/OrderServices.h b/src/lib/orderman/actors/order_manager/OrderServices.h index 63926fc7d..b70d5af47 100644 --- a/src/lib/orderman/actors/order_manager/OrderServices.h +++ b/src/lib/orderman/actors/order_manager/OrderServices.h @@ -18,9 +18,9 @@ class SessionServices { public: SessionServices(SessionServicesData &session_data) - : exe_reports(*session_data.exe_report_subs), - cancel_rejects(*session_data.cancel_reject_subs), - gateway_status(*session_data.gateway_status_subs), + : _exe_reports(*session_data.exe_report_subs), + _cancel_rejects(*session_data.cancel_reject_subs), + _gateway_status(*session_data.gateway_status_subs), _session_data(&session_data) {} std::string const &session_name() const { return _session_data->session; } @@ -39,30 +39,47 @@ class SessionServices { bool is_gateway_connected() const { return _session_data->gw_connected; } Governor &governor() { return _session_data->governor; } - EventStream exe_reports; - EventStream cancel_rejects; - EventStream gateway_status; + // Subscriptionsd + using ExeReportSubID = EventStream::SubID; + using CancelRejectSubID = EventStream::SubID; + using GatewayStatusChangeSubID = EventStream::SubID; + template + ExeReportSubID subscribe_to_exe_report(OrderKey k, CB &&cb) { + return _exe_reports.sub(k, std::forward(cb)); + } + void unsubscribe(ExeReportSubID sid) { _exe_reports.unsub(sid); } + + template + CancelRejectSubID subscribe_to_cancel_reject(OrderKey k, CB &&cb) { + return _cancel_rejects.sub(k,std::forward(cb)); + } + void unsubscribe(CancelRejectSubID sid) { _cancel_rejects.unsub(sid); } + + template + GatewayStatusChangeSubID subscribe_to_gateway_status(CB &&cb) { + return _gateway_status.sub(std::forward(cb)); + } + void unsubscribe(GatewayStatusChangeSubID sid) { _gateway_status.unsub(sid); } private: + EventStream _exe_reports; + EventStream _cancel_rejects; + EventStream _gateway_status; SessionServicesData *_session_data; }; class OrderServices { public: OrderServices(Order &owner, OrderServicesData &data) - : book_updates(*data.md_subs), settlement_updates(*data.settlement_subs), - child_updates(*data.child_order_subs), time_change(*data.time_subs), + : _child_updates(*data.child_order_subs), _book_updates(*data.md_subs), + _settlement_updates(*data.settlement_subs), + _time_change(*data.time_subs), order_creations(*data.order_creation_subs), _owner(owner), _data(data), _sessions() { for (auto &sd : data.sessions) _sessions.push_back(std::make_unique(*sd)); } - EventStream book_updates; - EventStream settlement_updates; - EventStream child_updates; - EventStream time_change; - securities::ISecurityDB &sec_db() { return _data.sec_db; } mercury::TimeStampStr const &get_time_str() const { @@ -82,9 +99,10 @@ class OrderServices { "Order {} transitioned to a terminal state. Canceling all " "subscriptions", _owner.key().value()); - book_updates.unsub_all(); - child_updates.unsub_all(); - time_change.unsub_all(); + _book_updates.unsub_all(); + _child_updates.unsub_all(); + _time_change.unsub_all(); + _settlement_updates.unsub_all(); } } @@ -97,7 +115,40 @@ class OrderServices { bts_assert(false); } + // Subscriptions ------------------------------ + using BookSubID = EventStream::SubID; + using SettlementSubID = EventStream::SubID; + using TimerSubID = EventStream::SubID; + using ChildStateSubID = EventStream::SubID; + + template BookSubID subscribe_to_book(SecurityKey k, CB &&cb) { + return _book_updates.sub(k, std::forward(cb)); + } + void unsubscribe(BookSubID sid) { _book_updates.unsub(sid); } + + template + SettlementSubID subscribe_to_settlements(SecurityKey k, CB &&cb) { + return _settlement_updates.sub(k, std::forward(cb)); + } + void unsubscribe(SettlementSubID sid) { _settlement_updates.unsub(sid); } + + template TimerSubID subscribe_to_time(CB &&cb) { + return _time_change.sub(std::forward(cb)); + } + void unsubscribe(TimerSubID sid) { _time_change.unsub(sid); } + + template ChildStateSubID subscribe_to_child_updates(CB &&cb) { + return _child_updates.sub(_owner.key(), std::forward(cb)); + } + void unsubscribe(ChildStateSubID sid) { _child_updates.unsub(sid); } + // End Subscriptions ------------------------------ + private: + EventStream _child_updates; + EventStream _book_updates; + EventStream _settlement_updates; + EventStream _time_change; + friend class OrderBuilder; IOrderFactory &order_factory() { return _data.order_factory; } diff --git a/src/lib/orderman/orders/IcebergOrder.cpp b/src/lib/orderman/orders/IcebergOrder.cpp index ba29b275b..dc82c7b52 100644 --- a/src/lib/orderman/orders/IcebergOrder.cpp +++ b/src/lib/orderman/orders/IcebergOrder.cpp @@ -114,10 +114,10 @@ void IcebergOrder::on_activate(Price p, Quantity q, OrderServices &services, me->state.set_price(p.value()); me->state.set_quantity(q.value()); if (me->pause_between_orders) - services.time_change.sub( + services.subscribe_to_time( [this](auto const &time) { this->on_time(time); }); - services.child_updates.sub( - key(), [this](auto const &os) { this->on_child_order_update(os); }); + services.subscribe_to_child_updates( + [this](auto const &os) { this->on_child_order_update(os); }); transition(ORDER_STATUS_WORKING); me->working_sub_status = WorkingSubStatus::WORKING; send_next_child_order(); diff --git a/src/lib/orderman/orders/NativeOrder.cpp b/src/lib/orderman/orders/NativeOrder.cpp index 6a09ed069..acb980068 100644 --- a/src/lib/orderman/orders/NativeOrder.cpp +++ b/src/lib/orderman/orders/NativeOrder.cpp @@ -359,11 +359,11 @@ void NativeOrder::on_activate(Price p, Quantity q, // if we are here we are good. // subscribe to usefull events - me->session_services->exe_reports.sub( + me->session_services->subscribe_to_exe_report( key(), [this](auto const &r) { this->on_exe_report(r); }); - me->session_services->cancel_rejects.sub( + me->session_services->subscribe_to_cancel_reject( key(), [this](auto const &cr) { this->on_cancel_reject(cr); }); - me->session_services->gateway_status.sub( + me->session_services->subscribe_to_gateway_status( [this](auto const &gw) { this->on_gateway_status(gw); }); // send out order @@ -408,11 +408,11 @@ void NativeOrder::on_activate(Price p, Quantity q, case ORDER_STATUS_WORKING: me->session_services = &me->services->get_session_services( get_native_state(me->state).routing_record().session()); - me->session_services->exe_reports.sub( + me->session_services->subscribe_to_exe_report( key(), [this](auto const &r) { this->on_exe_report(r); }); - me->session_services->cancel_rejects.sub( + me->session_services->subscribe_to_cancel_reject( key(), [this](auto const &cr) { this->on_cancel_reject(cr); }); - me->session_services->gateway_status.sub( + me->session_services->subscribe_to_gateway_status( [this](auto const &gw) { this->on_gateway_status(gw); }); if (!me->session_services->is_gateway_connected()) @@ -422,11 +422,11 @@ void NativeOrder::on_activate(Price p, Quantity q, case ORDER_STATUS_DISCONNECTED: me->session_services = &me->services->get_session_services( get_native_state(me->state).routing_record().session()); - me->session_services->exe_reports.sub( + me->session_services->subscribe_to_exe_report( key(), [this](auto const &r) { this->on_exe_report(r); }); - me->session_services->cancel_rejects.sub( + me->session_services->subscribe_to_cancel_reject( key(), [this](auto const &cr) { this->on_cancel_reject(cr); }); - me->session_services->gateway_status.sub( + me->session_services->subscribe_to_gateway_status( [this](auto const &gw) { this->on_gateway_status(gw); }); if (me->session_services->is_gateway_connected()) @@ -436,11 +436,11 @@ void NativeOrder::on_activate(Price p, Quantity q, case ORDER_STATUS_PENDING_WORKING: me->session_services = &me->services->get_session_services( get_native_state(me->state).routing_record().session()); - me->session_services->exe_reports.sub( + me->session_services->subscribe_to_exe_report( key(), [this](auto const &r) { this->on_exe_report(r); }); - me->session_services->cancel_rejects.sub( + me->session_services->subscribe_to_cancel_reject( key(), [this](auto const &cr) { this->on_cancel_reject(cr); }); - me->session_services->gateway_status.sub( + me->session_services->subscribe_to_gateway_status( [this](auto const &gw) { this->on_gateway_status(gw); }); break; diff --git a/src/lib/orderman/orders/TimeBoxOrder.cpp b/src/lib/orderman/orders/TimeBoxOrder.cpp index b7d445aba..1a3dfa6cb 100644 --- a/src/lib/orderman/orders/TimeBoxOrder.cpp +++ b/src/lib/orderman/orders/TimeBoxOrder.cpp @@ -96,9 +96,9 @@ void TimeBoxOrder::on_activate(Price p, Quantity q, OrderServices &services, me->child = me->child_builder.build(); me->state.set_price(p.value()); me->state.set_quantity(q.value()); - services.child_updates.sub( - key(), [this](auto const &os) { this->on_child_order_update(os); }); - services.time_change.sub([this](auto) { this->on_time_change(); }); + services.subscribe_to_child_updates( + [this](auto const &os) { this->on_child_order_update(os); }); + services.subscribe_to_time([this](auto) { this->on_time_change(); }); transition(ORDER_STATUS_WORKING); break; diff --git a/src/lib/orderman/orders/TriggerOrder.cpp b/src/lib/orderman/orders/TriggerOrder.cpp index 999da3b90..7b9bdda84 100644 --- a/src/lib/orderman/orders/TriggerOrder.cpp +++ b/src/lib/orderman/orders/TriggerOrder.cpp @@ -115,15 +115,15 @@ void TriggerOrder::on_activate(Price price, Quantity qty, else { me->order_builder.activate(services); me->child_order = me->order_builder.build(); - services.child_updates.sub(key(), + services.subscribe_to_child_updates( [this](const OrderStateUpdateEvent &os) { this->_on_child_order_update(os); }); - services.book_updates.sub(SecurityKey(me->order_def.security_key()), - [this](const BookUpdateEvent &bk_event) { - this->_on_book_update(bk_event); - }); - services.time_change.sub( + services.subscribe_to_book(SecurityKey(me->order_def.security_key()), + [this](const BookUpdateEvent &bk_event) { + this->_on_book_update(bk_event); + }); + services.subscribe_to_time( [this](const bts::mercury::TimerEvent &te) { _on_time(te); }); _switch_state(State::WAITING_FOR_TRIGGER); } diff --git a/src/lib/orderman/orders/book_algos/BookAlgo.cpp b/src/lib/orderman/orders/book_algos/BookAlgo.cpp index 3a4468a50..6cad96f9c 100644 --- a/src/lib/orderman/orders/book_algos/BookAlgo.cpp +++ b/src/lib/orderman/orders/book_algos/BookAlgo.cpp @@ -152,9 +152,9 @@ void BookAlgo::on_activate(Price p, Quantity q, OrderServices &services, me->child = me->child_builder.build(); set_price(p.value()); set_quantity(q.value()); - services.child_updates.sub( - key(), [this](auto const &os) { this->on_child_order_update(os); }); - services.book_updates.sub( + services.subscribe_to_child_updates( + [this](auto const &os) { this->on_child_order_update(os); }); + services.subscribe_to_book( SecurityKey(me->def.security_key()), [this](auto const &b) { this->on_book_update(b); }); transition(ORDER_STATUS_WORKING); diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp index 2d7169017..7035bb815 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp @@ -89,21 +89,21 @@ void SpreaderStartStateWorker::on_activate(Price price, { // 4. sub to child orders order // (could have hidden that inside SpreaderOrderServices by exposing events) - order_services.order_services().child_updates.sub(_spreader->key(), [this](const bts::orderman::OrderStateUpdateEvent& os) { _spreader->_on_child_order_update (os);}); + order_services.order_services().subscribe_to_child_updates([this](const bts::orderman::OrderStateUpdateEvent& os) { _spreader->_on_child_order_update (os);}); // 5. sub to market data for (size_t l_idx = 0; l_idx < _spreader->_bookkeeping_data().n_legs(); l_idx++) { const LegPropertyData& leg_prop = _spreader->_bookkeeping_data().get_leg_data(l_idx).leg_property_data(); LOG(OrderMan, Info, "SpreaderStartStateWorker::on_activate subbing to book sec_key: {}", leg_prop.security_key()); - order_services.order_services().book_updates.sub(leg_prop.leg_security_key(), - [this](const BookUpdateEvent& bk_event) - {_spreader->_on_book_update (bk_event);}); - order_services.order_services().settlement_updates.sub(leg_prop.leg_security_key(), - [this](const SettlementUpdateEvent& s_event) - {_spreader->_on_settlement_update (s_event);}); + order_services.order_services().subscribe_to_book(leg_prop.leg_security_key(), + [this](const BookUpdateEvent& bk_event) + {_spreader->_on_book_update (bk_event);}); + order_services.order_services().subscribe_to_settlements(leg_prop.leg_security_key(), + [this](const SettlementUpdateEvent& s_event) + {_spreader->_on_settlement_update (s_event);}); } // 6. sub to time - order_services.order_services().time_change.sub([this](const bts::mercury::TimerEvent& t_event){_spreader->_on_time(t_event);}); + order_services.order_services().subscribe_to_time([this](const bts::mercury::TimerEvent& t_event){_spreader->_on_time(t_event);}); } // quoters are init'ed in the next state _spreader->_transform_to_WAITING_FOR_INITIAL_DATA(); diff --git a/src/web/CMakeDeps.cmake b/src/web/CMakeDeps.cmake index 65f907171..050dc8062 100644 --- a/src/web/CMakeDeps.cmake +++ b/src/web/CMakeDeps.cmake @@ -1 +1 @@ -set(sources ../../externals/linux/include/google/protobuf/descriptor.proto;../../externals/linux/include/google/protobuf/timestamp.proto;../lib/api/apicore.proto;../lib/api/apigateway.proto;../lib/api/apioptions.proto;../lib/api/services/AdminService.proto;../lib/api/services/ApiUnitTestService.proto;../lib/api/services/ErrorReportService.proto;../lib/api/services/HelloService.proto;../lib/api/services/MarketDataAuxiliaryService.proto;../lib/api/services/MarketDataRelay.proto;../lib/api/services/OrderService.proto;../lib/api/services/OutOfProcessURLListener.proto;../lib/api/services/PersistenceService.proto;../lib/api/services/PositionService.proto;../lib/api/services/ShellDiagnosticService.proto;../lib/api/services/ShellLatencyService.proto;../lib/api/services/SyntheticSecurityService.proto;../lib/api/services/UserService.proto;../lib/domain_model/Security.proto;../lib/md/protos/co2.proto;../lib/sparkproto/SparkProtos.proto;api/build.sh;api/node_modules/exit/test/fixtures/create-files.sh;api/node_modules/protobufjs/cli/node_modules/acorn-jsx/node_modules/acorn/bin/update_authors.sh;api/node_modules/watch/release.sh;api/quiet_build.sh;api/src/DynamicService.ts;api/src/ServiceContext.ts;api/src/bts_assert.ts;ui/src/Access.fs;ui/src/Accounts/ClipLimits.fs;ui/src/Accounts/ProductLimits.fs;ui/src/Accounts/SecurityLimits.fs;ui/src/Accounts/State.fs;ui/src/Accounts/Types.fs;ui/src/Accounts/View.fs;ui/src/App.fs;ui/src/Cmd.fs;ui/src/Controls/Button.fs;ui/src/Controls/DataGrid.fs;ui/src/Controls/Fields.fs;ui/src/Controls/Modal.fs;ui/src/Controls/ReactGrid.fs;ui/src/Controls/Table.fs;ui/src/Controls/nbsp.fs;ui/src/Global.fs;ui/src/Imports.fs;ui/src/Lens.fs;ui/src/Login/Login.fs;ui/src/Nav.fs;ui/src/State.fs;ui/src/Types.fs;ui/src/Users/State.fs;ui/src/Users/Types.fs;ui/src/Users/View.fs;ui/src/Util/EnumUtils.fs;ui/src/Util/JSMap.fs) \ No newline at end of file +set(sources ../../externals/linux/include/google/protobuf/descriptor.proto;../../externals/linux/include/google/protobuf/timestamp.proto;../lib/api/apicore.proto;../lib/api/apigateway.proto;../lib/api/apioptions.proto;../lib/api/services/AdminService.proto;../lib/api/services/ApiUnitTestService.proto;../lib/api/services/ErrorReportService.proto;../lib/api/services/HelloService.proto;../lib/api/services/MarketDataAuxiliaryService.proto;../lib/api/services/MarketDataRelay.proto;../lib/api/services/OrderService.proto;../lib/api/services/OutOfProcessURLListener.proto;../lib/api/services/PersistenceService.proto;../lib/api/services/PositionService.proto;../lib/api/services/ShellDiagnosticService.proto;../lib/api/services/ShellLatencyService.proto;../lib/api/services/SyntheticSecurityService.proto;../lib/api/services/UserService.proto;../lib/domain_model/Security.proto;../lib/md/protos/co2.proto;../lib/sparkproto/SparkProtos.proto;api/build.sh;api/node_modules/cssstyle/scripts/run_tests.sh;api/node_modules/exit/test/fixtures/create-files.sh;api/node_modules/protobufjs/cli/node_modules/acorn-jsx/node_modules/acorn/bin/update_authors.sh;api/node_modules/watch/release.sh;api/quiet_build.sh;api/src/DynamicService.ts;api/src/ServiceContext.ts;api/src/bts_assert.ts;ui/src/Access.fs;ui/src/Accounts/ClipLimits.fs;ui/src/Accounts/ProductLimits.fs;ui/src/Accounts/SecurityLimits.fs;ui/src/Accounts/State.fs;ui/src/Accounts/Types.fs;ui/src/Accounts/View.fs;ui/src/App.fs;ui/src/Cmd.fs;ui/src/Controls/Button.fs;ui/src/Controls/DataGrid.fs;ui/src/Controls/Fields.fs;ui/src/Controls/Modal.fs;ui/src/Controls/ReactGrid.fs;ui/src/Controls/Table.fs;ui/src/Controls/nbsp.fs;ui/src/Global.fs;ui/src/Imports.fs;ui/src/Lens.fs;ui/src/Login/Login.fs;ui/src/Nav.fs;ui/src/State.fs;ui/src/Types.fs;ui/src/Users/State.fs;ui/src/Users/Types.fs;ui/src/Users/View.fs;ui/src/Util/EnumUtils.fs;ui/src/Util/JSMap.fs) \ No newline at end of file From 70bcf3ff0d3be78c415d9c2230d73c4ae8f5bdbf Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Sat, 24 Nov 2018 21:53:22 +0000 Subject: [PATCH 004/107] Refactored OM to allow speed up. --- src/lib/mercury/actors/ContentSubscription.h | 9 +- .../actors/order_manager/OrderBuilder.h | 111 ++++++++--------- .../actors/order_manager/OrderServices.h | 112 ++++++++++++++---- src/lib/orderman/orders/IcebergOrder.cpp | 6 +- src/lib/orderman/orders/NativeOrder.cpp | 24 ++-- src/lib/orderman/orders/TimeBoxOrder.cpp | 6 +- src/lib/orderman/orders/TriggerOrder.cpp | 12 +- .../orderman/orders/book_algos/BookAlgo.cpp | 6 +- .../SpreaderStartStateWorker.cpp | 16 +-- src/web/CMakeDeps.cmake | 2 +- 10 files changed, 186 insertions(+), 118 deletions(-) diff --git a/src/lib/mercury/actors/ContentSubscription.h b/src/lib/mercury/actors/ContentSubscription.h index bc549e4c7..b7803d0fc 100644 --- a/src/lib/mercury/actors/ContentSubscription.h +++ b/src/lib/mercury/actors/ContentSubscription.h @@ -29,6 +29,9 @@ template class ContentSubscription { using Key = decltype((*((KE *)nullptr))(*((EV *)nullptr))); using CB = std::function; struct SubID { + SubID() : k(), sid(0) {} + SubID(Key k, uint32_t sid) : k(k), sid(sid) {} + Key k; uint32_t sid; bool operator==(SubID const &rhs) const { @@ -39,7 +42,7 @@ template class ContentSubscription { ContentSubscription(Actor &actor) : _actor(&actor), _sub(_actor->subscribe( [this](auto const &u) { this->on_update(u); })), - _my_subs(), _dispatching(false), _current_sub_id(0), + _my_subs(), _dispatching(false), _current_sub_id(1), _pre_sub([](auto) {}) {} ContentSubscription(Actor &actor, std::function const &pscb) @@ -52,7 +55,7 @@ template class ContentSubscription { : _actor(&actor), _sub(_actor->subscribe( tag, [this](auto const &u) { this->on_update(u); })), - _my_subs(), _dispatching(false), _current_sub_id(0), + _my_subs(), _dispatching(false), _current_sub_id(1), _pre_sub([](auto) {}) {} template @@ -61,7 +64,7 @@ template class ContentSubscription { : _actor(&actor), _sub(_actor->subscribe( tag, [this](auto const &u) { this->on_update(u); })), - _my_subs(), _dispatching(false), _current_sub_id(0), + _my_subs(), _dispatching(false), _current_sub_id(1), _pre_sub(pscb) {} template SubID sub(Key k, CBT const &cb) { diff --git a/src/lib/orderman/actors/order_manager/OrderBuilder.h b/src/lib/orderman/actors/order_manager/OrderBuilder.h index fcc43c062..1a446d59e 100644 --- a/src/lib/orderman/actors/order_manager/OrderBuilder.h +++ b/src/lib/orderman/actors/order_manager/OrderBuilder.h @@ -1,93 +1,85 @@ #pragma once -#include -#include -#include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/api/services/OrderService.pb.h" -#include "lib/orderman/orders/PreActivationOrderServices.h" -#include "lib/orderman/actors/order_manager/OrderServices.h" #include "lib/logging/logging.h" #include "lib/orderman/actors/order_manager/ChildOrder.h" +#include "lib/orderman/actors/order_manager/OrderServices.h" +#include "lib/orderman/orderman_utils/orderman_common.h" +#include "lib/orderman/orders/PreActivationOrderServices.h" +#include +#include namespace bts { namespace orderman { -class OrderBuilder -{ -public: +class OrderBuilder { + public: OrderBuilder() - : _parent_key(null_order_key()), - _definition(), - _reserve_sz(0), - _order_stash(), - _builder_id(), - _order_services(nullptr) - {} + : _parent_key(null_order_key()), _definition(), _reserve_sz(0), + _order_stash(), _builder_id(), _order_services(nullptr) {} - OrderBuilder(OrderBuilder&&src) {operator=(std::move(src));} + OrderBuilder(OrderBuilder &&src) { operator=(std::move(src)); } + + OrderBuilder(OrderKey parent_key, api::orderman::OrderDefinition const &def, + PreActivationOrderServices const &srv, size_t reserve_sz = 1) + : _parent_key(parent_key), _definition(def), _reserve_sz(reserve_sz), + _order_stash(), _builder_id(++_current_builder_id), + _order_services(nullptr) - OrderBuilder(OrderKey parent_key, - api::orderman::OrderDefinition const&def, - PreActivationOrderServices const &srv, - size_t reserve_sz = 1) - : _parent_key(parent_key), - _definition(def) , - _reserve_sz(reserve_sz), - _order_stash(), - _builder_id(++_current_builder_id), - _order_services(nullptr) - { bts_assert(parent_key != null_order_key()); while (_order_stash.size() != reserve_sz) - _order_stash.push_back(&srv.order_factory.create(parent_key,_definition)); + _order_stash.push_back( + &srv.order_factory.create(parent_key, _definition)); } - void activate(OrderServices &order_services) - { + void activate(OrderServices &order_services) { bts_assert(!_order_services); _order_services = &order_services; - _order_services->order_creations.sub(_builder_id,[this] (auto const&order_ev) { - _order_stash.insert(_order_stash.end(),order_ev.orders.begin(),order_ev.orders.end()); - }); + _order_services->subscribe_to_order_creation_reply( + _builder_id, [this](auto const &order_ev) { + _order_stash.insert(_order_stash.end(), order_ev.orders.begin(), + order_ev.orders.end()); + }); } - - ChildOrder build() - { - bts_assert_msg(_order_services,"OrderBuilder::activate() must be called before orders can be built"); + + ChildOrder build() { + bts_assert_msg( + _order_services, + "OrderBuilder::activate() must be called before orders can be built"); ChildOrder result; if (_order_stash.size()) { - result = ChildOrder( *_order_stash.back(), - *_order_services); + result = ChildOrder(*_order_stash.back(), *_order_services); _order_stash.pop_back(); - } - else { - LOG(OrderMan,Warn, - "Ran out of pre-allocated child orders for order {}. Will allocate directly. " - "This will have an impact on performance", _parent_key); - result = ChildOrder (_order_services->order_factory().create(_parent_key,_definition), - *_order_services); + } else { + LOG(OrderMan, Warn, + "Ran out of pre-allocated child orders for order {}. Will " + "allocate directly. " + "This will have an impact on performance", + _parent_key); + result = ChildOrder( + _order_services->order_factory().create(_parent_key, _definition), + *_order_services); } if (_reserve_sz > _order_stash.size()) { auto need = _reserve_sz - _order_stash.size(); - _order_services->send_order_create_req(_builder_id,_parent_key,_definition,need); + _order_services->send_order_create_req(_builder_id, _parent_key, + _definition, need); } return result; } - - OrderBuilder& operator=(OrderBuilder &&src) - { + + OrderBuilder &operator=(OrderBuilder &&src) { move_here(src); return *this; } -private: - void move_here(OrderBuilder &src) - { + private: + void move_here(OrderBuilder &src) { bts_assert(!_order_services); _parent_key = src._parent_key; - _definition= src._definition; + _definition = src._definition; _reserve_sz = src._reserve_sz; _order_stash = src._order_stash; _builder_id = src._builder_id; @@ -96,15 +88,16 @@ private: src._order_services = nullptr; bts_assert(_parent_key != null_order_key()); } - + OrderKey _parent_key; api::orderman::OrderDefinition _definition; size_t _reserve_sz; - std::vector _order_stash; - size_t _builder_id ; + std::vector _order_stash; + size_t _builder_id; OrderServices *_order_services; - + static std::atomic _current_builder_id; }; -}} +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/actors/order_manager/OrderServices.h b/src/lib/orderman/actors/order_manager/OrderServices.h index 63926fc7d..55ad80e06 100644 --- a/src/lib/orderman/actors/order_manager/OrderServices.h +++ b/src/lib/orderman/actors/order_manager/OrderServices.h @@ -18,10 +18,10 @@ class SessionServices { public: SessionServices(SessionServicesData &session_data) - : exe_reports(*session_data.exe_report_subs), - cancel_rejects(*session_data.cancel_reject_subs), - gateway_status(*session_data.gateway_status_subs), - _session_data(&session_data) {} + : _exe_reports(*session_data.exe_report_subs), + _cancel_rejects(*session_data.cancel_reject_subs), + _gateway_status(*session_data.gateway_status_subs), + _session_data(&session_data), _gateway_status_sub() {} std::string const &session_name() const { return _session_data->session; } @@ -39,30 +39,54 @@ class SessionServices { bool is_gateway_connected() const { return _session_data->gw_connected; } Governor &governor() { return _session_data->governor; } - EventStream exe_reports; - EventStream cancel_rejects; - EventStream gateway_status; + // Subscriptions + using ExeReportSubID = EventStream::SubID; + using CancelRejectSubID = EventStream::SubID; + + template + ExeReportSubID subscribe_to_exe_report(OrderKey k, CB &&cb) { + return _exe_reports.sub(k, std::forward(cb)); + } + void unsubscribe_from_exe_report(ExeReportSubID sid) { + _exe_reports.unsub(sid); + } + + template + CancelRejectSubID subscribe_to_cancel_reject(OrderKey k, CB &&cb) { + return _cancel_rejects.sub(k, std::forward(cb)); + } + void unsubscribe_from_cancel_reject(CancelRejectSubID sid) { + _cancel_rejects.unsub(sid); + } + + template void subscribe_to_gateway_status(CB &&cb) { + _gateway_status_sub = _gateway_status.sub(std::forward(cb)); + } + void unsubscribe_from_gateway_status() { + _gateway_status.unsub(_gateway_status_sub); + } private: + EventStream _exe_reports; + EventStream _cancel_rejects; + EventStream _gateway_status; SessionServicesData *_session_data; + EventStream::SubID + _gateway_status_sub; }; class OrderServices { public: OrderServices(Order &owner, OrderServicesData &data) - : book_updates(*data.md_subs), settlement_updates(*data.settlement_subs), - child_updates(*data.child_order_subs), time_change(*data.time_subs), - order_creations(*data.order_creation_subs), _owner(owner), _data(data), - _sessions() { + : _owner(owner), _data(data), _child_updates(*data.child_order_subs), + _book_updates(*data.md_subs), + _settlement_updates(*data.settlement_subs), + _time_change(*data.time_subs), _sessions(), _child_updates_sub(), + _time_change_sub(), _create_order_reply(*data.order_creation_subs) { for (auto &sd : data.sessions) _sessions.push_back(std::make_unique(*sd)); } - EventStream book_updates; - EventStream settlement_updates; - EventStream child_updates; - EventStream time_change; - securities::ISecurityDB &sec_db() { return _data.sec_db; } mercury::TimeStampStr const &get_time_str() const { @@ -82,9 +106,10 @@ class OrderServices { "Order {} transitioned to a terminal state. Canceling all " "subscriptions", _owner.key().value()); - book_updates.unsub_all(); - child_updates.unsub_all(); - time_change.unsub_all(); + _book_updates.unsub_all(); + _child_updates.unsub_all(); + _time_change.unsub_all(); + _settlement_updates.unsub_all(); } } @@ -97,11 +122,51 @@ class OrderServices { bts_assert(false); } + // Subscriptions ------------------------------ + using BookSubID = EventStream::SubID; + template BookSubID subscribe_to_book(SecurityKey k, CB &&cb) { + return _book_updates.sub(k, std::forward(cb)); + } + void unsubscribe_from_book(BookSubID sid) { _book_updates.unsub(sid); } + + using SettlementSubID = EventStream::SubID; + template + SettlementSubID subscribe_to_settlements(SecurityKey k, CB &&cb) { + return _settlement_updates.sub(k, std::forward(cb)); + } + void unsubscribe_from_settlements(SettlementSubID sid) { + _settlement_updates.unsub(sid); + } + + template void subscribe_to_time(CB &&cb) { + _time_change_sub = _time_change.sub(std::forward(cb)); + } + void unsubscribe_from_time() { _time_change.unsub(_time_change_sub); } + + template void subscribe_to_child_updates(CB &&cb) { + _child_updates_sub = + _child_updates.sub(_owner.key(), std::forward(cb)); + } + void unsubscribe_from_child_updates() { + _child_updates.unsub(_child_updates_sub); + } + // End Subscriptions ------------------------------ + private: friend class OrderBuilder; IOrderFactory &order_factory() { return _data.order_factory; } - EventStream order_creations; + using CreateOrderReplySubID = EventStream::SubID; + + template + CreateOrderReplySubID subscribe_to_order_creation_reply(size_t req_id, + CB &&cb) { + return _create_order_reply.sub(req_id, std::forward(cb)); + } + void unsubscribe_from_order_creation_reply(CreateOrderReplySubID sid) { + _create_order_reply.unsub(sid); + } + void send_order_create_req(size_t builder_id, OrderKey pk, api::orderman::OrderDefinition const &def, size_t n_orders) { @@ -141,7 +206,14 @@ class OrderServices { Order &_owner; OrderServicesData &_data; + EventStream _child_updates; + EventStream _book_updates; + EventStream _settlement_updates; + EventStream _time_change; std::vector> _sessions; + EventStream::SubID _child_updates_sub; + EventStream::SubID _time_change_sub; + EventStream _create_order_reply; }; } // namespace orderman } // namespace bts diff --git a/src/lib/orderman/orders/IcebergOrder.cpp b/src/lib/orderman/orders/IcebergOrder.cpp index ba29b275b..dc82c7b52 100644 --- a/src/lib/orderman/orders/IcebergOrder.cpp +++ b/src/lib/orderman/orders/IcebergOrder.cpp @@ -114,10 +114,10 @@ void IcebergOrder::on_activate(Price p, Quantity q, OrderServices &services, me->state.set_price(p.value()); me->state.set_quantity(q.value()); if (me->pause_between_orders) - services.time_change.sub( + services.subscribe_to_time( [this](auto const &time) { this->on_time(time); }); - services.child_updates.sub( - key(), [this](auto const &os) { this->on_child_order_update(os); }); + services.subscribe_to_child_updates( + [this](auto const &os) { this->on_child_order_update(os); }); transition(ORDER_STATUS_WORKING); me->working_sub_status = WorkingSubStatus::WORKING; send_next_child_order(); diff --git a/src/lib/orderman/orders/NativeOrder.cpp b/src/lib/orderman/orders/NativeOrder.cpp index 6a09ed069..acb980068 100644 --- a/src/lib/orderman/orders/NativeOrder.cpp +++ b/src/lib/orderman/orders/NativeOrder.cpp @@ -359,11 +359,11 @@ void NativeOrder::on_activate(Price p, Quantity q, // if we are here we are good. // subscribe to usefull events - me->session_services->exe_reports.sub( + me->session_services->subscribe_to_exe_report( key(), [this](auto const &r) { this->on_exe_report(r); }); - me->session_services->cancel_rejects.sub( + me->session_services->subscribe_to_cancel_reject( key(), [this](auto const &cr) { this->on_cancel_reject(cr); }); - me->session_services->gateway_status.sub( + me->session_services->subscribe_to_gateway_status( [this](auto const &gw) { this->on_gateway_status(gw); }); // send out order @@ -408,11 +408,11 @@ void NativeOrder::on_activate(Price p, Quantity q, case ORDER_STATUS_WORKING: me->session_services = &me->services->get_session_services( get_native_state(me->state).routing_record().session()); - me->session_services->exe_reports.sub( + me->session_services->subscribe_to_exe_report( key(), [this](auto const &r) { this->on_exe_report(r); }); - me->session_services->cancel_rejects.sub( + me->session_services->subscribe_to_cancel_reject( key(), [this](auto const &cr) { this->on_cancel_reject(cr); }); - me->session_services->gateway_status.sub( + me->session_services->subscribe_to_gateway_status( [this](auto const &gw) { this->on_gateway_status(gw); }); if (!me->session_services->is_gateway_connected()) @@ -422,11 +422,11 @@ void NativeOrder::on_activate(Price p, Quantity q, case ORDER_STATUS_DISCONNECTED: me->session_services = &me->services->get_session_services( get_native_state(me->state).routing_record().session()); - me->session_services->exe_reports.sub( + me->session_services->subscribe_to_exe_report( key(), [this](auto const &r) { this->on_exe_report(r); }); - me->session_services->cancel_rejects.sub( + me->session_services->subscribe_to_cancel_reject( key(), [this](auto const &cr) { this->on_cancel_reject(cr); }); - me->session_services->gateway_status.sub( + me->session_services->subscribe_to_gateway_status( [this](auto const &gw) { this->on_gateway_status(gw); }); if (me->session_services->is_gateway_connected()) @@ -436,11 +436,11 @@ void NativeOrder::on_activate(Price p, Quantity q, case ORDER_STATUS_PENDING_WORKING: me->session_services = &me->services->get_session_services( get_native_state(me->state).routing_record().session()); - me->session_services->exe_reports.sub( + me->session_services->subscribe_to_exe_report( key(), [this](auto const &r) { this->on_exe_report(r); }); - me->session_services->cancel_rejects.sub( + me->session_services->subscribe_to_cancel_reject( key(), [this](auto const &cr) { this->on_cancel_reject(cr); }); - me->session_services->gateway_status.sub( + me->session_services->subscribe_to_gateway_status( [this](auto const &gw) { this->on_gateway_status(gw); }); break; diff --git a/src/lib/orderman/orders/TimeBoxOrder.cpp b/src/lib/orderman/orders/TimeBoxOrder.cpp index b7d445aba..1a3dfa6cb 100644 --- a/src/lib/orderman/orders/TimeBoxOrder.cpp +++ b/src/lib/orderman/orders/TimeBoxOrder.cpp @@ -96,9 +96,9 @@ void TimeBoxOrder::on_activate(Price p, Quantity q, OrderServices &services, me->child = me->child_builder.build(); me->state.set_price(p.value()); me->state.set_quantity(q.value()); - services.child_updates.sub( - key(), [this](auto const &os) { this->on_child_order_update(os); }); - services.time_change.sub([this](auto) { this->on_time_change(); }); + services.subscribe_to_child_updates( + [this](auto const &os) { this->on_child_order_update(os); }); + services.subscribe_to_time([this](auto) { this->on_time_change(); }); transition(ORDER_STATUS_WORKING); break; diff --git a/src/lib/orderman/orders/TriggerOrder.cpp b/src/lib/orderman/orders/TriggerOrder.cpp index 999da3b90..7b9bdda84 100644 --- a/src/lib/orderman/orders/TriggerOrder.cpp +++ b/src/lib/orderman/orders/TriggerOrder.cpp @@ -115,15 +115,15 @@ void TriggerOrder::on_activate(Price price, Quantity qty, else { me->order_builder.activate(services); me->child_order = me->order_builder.build(); - services.child_updates.sub(key(), + services.subscribe_to_child_updates( [this](const OrderStateUpdateEvent &os) { this->_on_child_order_update(os); }); - services.book_updates.sub(SecurityKey(me->order_def.security_key()), - [this](const BookUpdateEvent &bk_event) { - this->_on_book_update(bk_event); - }); - services.time_change.sub( + services.subscribe_to_book(SecurityKey(me->order_def.security_key()), + [this](const BookUpdateEvent &bk_event) { + this->_on_book_update(bk_event); + }); + services.subscribe_to_time( [this](const bts::mercury::TimerEvent &te) { _on_time(te); }); _switch_state(State::WAITING_FOR_TRIGGER); } diff --git a/src/lib/orderman/orders/book_algos/BookAlgo.cpp b/src/lib/orderman/orders/book_algos/BookAlgo.cpp index 3a4468a50..6cad96f9c 100644 --- a/src/lib/orderman/orders/book_algos/BookAlgo.cpp +++ b/src/lib/orderman/orders/book_algos/BookAlgo.cpp @@ -152,9 +152,9 @@ void BookAlgo::on_activate(Price p, Quantity q, OrderServices &services, me->child = me->child_builder.build(); set_price(p.value()); set_quantity(q.value()); - services.child_updates.sub( - key(), [this](auto const &os) { this->on_child_order_update(os); }); - services.book_updates.sub( + services.subscribe_to_child_updates( + [this](auto const &os) { this->on_child_order_update(os); }); + services.subscribe_to_book( SecurityKey(me->def.security_key()), [this](auto const &b) { this->on_book_update(b); }); transition(ORDER_STATUS_WORKING); diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp index 2d7169017..7035bb815 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp @@ -89,21 +89,21 @@ void SpreaderStartStateWorker::on_activate(Price price, { // 4. sub to child orders order // (could have hidden that inside SpreaderOrderServices by exposing events) - order_services.order_services().child_updates.sub(_spreader->key(), [this](const bts::orderman::OrderStateUpdateEvent& os) { _spreader->_on_child_order_update (os);}); + order_services.order_services().subscribe_to_child_updates([this](const bts::orderman::OrderStateUpdateEvent& os) { _spreader->_on_child_order_update (os);}); // 5. sub to market data for (size_t l_idx = 0; l_idx < _spreader->_bookkeeping_data().n_legs(); l_idx++) { const LegPropertyData& leg_prop = _spreader->_bookkeeping_data().get_leg_data(l_idx).leg_property_data(); LOG(OrderMan, Info, "SpreaderStartStateWorker::on_activate subbing to book sec_key: {}", leg_prop.security_key()); - order_services.order_services().book_updates.sub(leg_prop.leg_security_key(), - [this](const BookUpdateEvent& bk_event) - {_spreader->_on_book_update (bk_event);}); - order_services.order_services().settlement_updates.sub(leg_prop.leg_security_key(), - [this](const SettlementUpdateEvent& s_event) - {_spreader->_on_settlement_update (s_event);}); + order_services.order_services().subscribe_to_book(leg_prop.leg_security_key(), + [this](const BookUpdateEvent& bk_event) + {_spreader->_on_book_update (bk_event);}); + order_services.order_services().subscribe_to_settlements(leg_prop.leg_security_key(), + [this](const SettlementUpdateEvent& s_event) + {_spreader->_on_settlement_update (s_event);}); } // 6. sub to time - order_services.order_services().time_change.sub([this](const bts::mercury::TimerEvent& t_event){_spreader->_on_time(t_event);}); + order_services.order_services().subscribe_to_time([this](const bts::mercury::TimerEvent& t_event){_spreader->_on_time(t_event);}); } // quoters are init'ed in the next state _spreader->_transform_to_WAITING_FOR_INITIAL_DATA(); diff --git a/src/web/CMakeDeps.cmake b/src/web/CMakeDeps.cmake index 65f907171..050dc8062 100644 --- a/src/web/CMakeDeps.cmake +++ b/src/web/CMakeDeps.cmake @@ -1 +1 @@ -set(sources ../../externals/linux/include/google/protobuf/descriptor.proto;../../externals/linux/include/google/protobuf/timestamp.proto;../lib/api/apicore.proto;../lib/api/apigateway.proto;../lib/api/apioptions.proto;../lib/api/services/AdminService.proto;../lib/api/services/ApiUnitTestService.proto;../lib/api/services/ErrorReportService.proto;../lib/api/services/HelloService.proto;../lib/api/services/MarketDataAuxiliaryService.proto;../lib/api/services/MarketDataRelay.proto;../lib/api/services/OrderService.proto;../lib/api/services/OutOfProcessURLListener.proto;../lib/api/services/PersistenceService.proto;../lib/api/services/PositionService.proto;../lib/api/services/ShellDiagnosticService.proto;../lib/api/services/ShellLatencyService.proto;../lib/api/services/SyntheticSecurityService.proto;../lib/api/services/UserService.proto;../lib/domain_model/Security.proto;../lib/md/protos/co2.proto;../lib/sparkproto/SparkProtos.proto;api/build.sh;api/node_modules/exit/test/fixtures/create-files.sh;api/node_modules/protobufjs/cli/node_modules/acorn-jsx/node_modules/acorn/bin/update_authors.sh;api/node_modules/watch/release.sh;api/quiet_build.sh;api/src/DynamicService.ts;api/src/ServiceContext.ts;api/src/bts_assert.ts;ui/src/Access.fs;ui/src/Accounts/ClipLimits.fs;ui/src/Accounts/ProductLimits.fs;ui/src/Accounts/SecurityLimits.fs;ui/src/Accounts/State.fs;ui/src/Accounts/Types.fs;ui/src/Accounts/View.fs;ui/src/App.fs;ui/src/Cmd.fs;ui/src/Controls/Button.fs;ui/src/Controls/DataGrid.fs;ui/src/Controls/Fields.fs;ui/src/Controls/Modal.fs;ui/src/Controls/ReactGrid.fs;ui/src/Controls/Table.fs;ui/src/Controls/nbsp.fs;ui/src/Global.fs;ui/src/Imports.fs;ui/src/Lens.fs;ui/src/Login/Login.fs;ui/src/Nav.fs;ui/src/State.fs;ui/src/Types.fs;ui/src/Users/State.fs;ui/src/Users/Types.fs;ui/src/Users/View.fs;ui/src/Util/EnumUtils.fs;ui/src/Util/JSMap.fs) \ No newline at end of file +set(sources ../../externals/linux/include/google/protobuf/descriptor.proto;../../externals/linux/include/google/protobuf/timestamp.proto;../lib/api/apicore.proto;../lib/api/apigateway.proto;../lib/api/apioptions.proto;../lib/api/services/AdminService.proto;../lib/api/services/ApiUnitTestService.proto;../lib/api/services/ErrorReportService.proto;../lib/api/services/HelloService.proto;../lib/api/services/MarketDataAuxiliaryService.proto;../lib/api/services/MarketDataRelay.proto;../lib/api/services/OrderService.proto;../lib/api/services/OutOfProcessURLListener.proto;../lib/api/services/PersistenceService.proto;../lib/api/services/PositionService.proto;../lib/api/services/ShellDiagnosticService.proto;../lib/api/services/ShellLatencyService.proto;../lib/api/services/SyntheticSecurityService.proto;../lib/api/services/UserService.proto;../lib/domain_model/Security.proto;../lib/md/protos/co2.proto;../lib/sparkproto/SparkProtos.proto;api/build.sh;api/node_modules/cssstyle/scripts/run_tests.sh;api/node_modules/exit/test/fixtures/create-files.sh;api/node_modules/protobufjs/cli/node_modules/acorn-jsx/node_modules/acorn/bin/update_authors.sh;api/node_modules/watch/release.sh;api/quiet_build.sh;api/src/DynamicService.ts;api/src/ServiceContext.ts;api/src/bts_assert.ts;ui/src/Access.fs;ui/src/Accounts/ClipLimits.fs;ui/src/Accounts/ProductLimits.fs;ui/src/Accounts/SecurityLimits.fs;ui/src/Accounts/State.fs;ui/src/Accounts/Types.fs;ui/src/Accounts/View.fs;ui/src/App.fs;ui/src/Cmd.fs;ui/src/Controls/Button.fs;ui/src/Controls/DataGrid.fs;ui/src/Controls/Fields.fs;ui/src/Controls/Modal.fs;ui/src/Controls/ReactGrid.fs;ui/src/Controls/Table.fs;ui/src/Controls/nbsp.fs;ui/src/Global.fs;ui/src/Imports.fs;ui/src/Lens.fs;ui/src/Login/Login.fs;ui/src/Nav.fs;ui/src/State.fs;ui/src/Types.fs;ui/src/Users/State.fs;ui/src/Users/Types.fs;ui/src/Users/View.fs;ui/src/Util/EnumUtils.fs;ui/src/Util/JSMap.fs) \ No newline at end of file From 308c5e5579bcd84545cc5e0b7e171e5aa744ad98 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Wed, 28 Nov 2018 14:21:50 +0000 Subject: [PATCH 005/107] Added some experimental stuff. --- src/lib/orderman2/IOrderManagerObserver.h | 28 --------- src/lib/orderman2/OrderManager2.cpp | 7 --- src/lib/orderman2/OrderManager2.h | 37 ------------ src/lib/orderman2/orders/NativeOrder.cpp | 2 + src/lib/orderman2/orders/NativeOrder.h | 57 ++++++++++++++++++ src/lib/orderman2/orders/Order.cpp | 2 + src/lib/orderman2/orders/Order.h | 70 +++++++++++++++++++++++ 7 files changed, 131 insertions(+), 72 deletions(-) delete mode 100644 src/lib/orderman2/IOrderManagerObserver.h delete mode 100644 src/lib/orderman2/OrderManager2.cpp delete mode 100644 src/lib/orderman2/OrderManager2.h create mode 100644 src/lib/orderman2/orders/NativeOrder.cpp create mode 100644 src/lib/orderman2/orders/NativeOrder.h create mode 100644 src/lib/orderman2/orders/Order.cpp create mode 100644 src/lib/orderman2/orders/Order.h diff --git a/src/lib/orderman2/IOrderManagerObserver.h b/src/lib/orderman2/IOrderManagerObserver.h deleted file mode 100644 index f5596b663..000000000 --- a/src/lib/orderman2/IOrderManagerObserver.h +++ /dev/null @@ -1,28 +0,0 @@ -#pragma once - -#include "lib/config/protos/jetfix.pb.h" -#include "lib/domain_model/SecurityKey.h" -#include "orderman_utils/orderman_utils.h" - -namespace bts { -namespace api { -namespace orderman { -class OrderDefinition; -} -} // namespace api -namespace orderman2 { - -class OrderState; - -class IOrderManagerObserver { - public: - void subscribe_book(SecurityKey, void *sub); - void request_new_fill_buffers(config::JetFIX::Connection const &, - size_t n_buffers, void *sub); - void request_new_orders(api::orderman::OrderDefinition const &, - OrderKey parent_key, size_t n_orders, void *sub); - void send_fix(size_t gw_idx, jetfix::OutFIXPtr const &); -}; - -} // namespace orderman2 -} // namespace bts diff --git a/src/lib/orderman2/OrderManager2.cpp b/src/lib/orderman2/OrderManager2.cpp deleted file mode 100644 index 44949ac83..000000000 --- a/src/lib/orderman2/OrderManager2.cpp +++ /dev/null @@ -1,7 +0,0 @@ -#include "OrderManager2.h" -#include "IOrderManagerObserver.h" - -namespace bts { -namespace orderman2 { - -}} diff --git a/src/lib/orderman2/OrderManager2.h b/src/lib/orderman2/OrderManager2.h deleted file mode 100644 index 1f761b75b..000000000 --- a/src/lib/orderman2/OrderManager2.h +++ /dev/null @@ -1,37 +0,0 @@ -#pragma once - -#include "orderman_utils/orderman_utils.h" -#include "orderman_utils/Book.h" -#include "lib/jetfix/common/OutFIXPtr.h" - -#include - -namespace bts { -namespace api { class Security;} -namespace orderman2 { - -class Order; -class IOrderManagerObserver; -class ExecutionReport; - -class OrderManager { - OrderManager(); - - void init(IOrderManagerObserver &observer); - - void on_activate(Order &, Price , Quantity); - void on_update(Order&, Price , Quantity); - void on_cancel(Order&); - void on_book_update(Book const&b,void*sub); - void on_execution_report(ExecutionReport &); - - void on_securities(std::vector const&); - void on_new_fill_buffers(std::vector const&,void*sub); - void on_new_orders(std::vector const&,void*sub); - -private: - struct PImpl; - std::unique_ptr me; -}; - -}} diff --git a/src/lib/orderman2/orders/NativeOrder.cpp b/src/lib/orderman2/orders/NativeOrder.cpp new file mode 100644 index 000000000..96e505504 --- /dev/null +++ b/src/lib/orderman2/orders/NativeOrder.cpp @@ -0,0 +1,2 @@ +#include "NativeOrder.h" + diff --git a/src/lib/orderman2/orders/NativeOrder.h b/src/lib/orderman2/orders/NativeOrder.h new file mode 100644 index 000000000..3e03df4de --- /dev/null +++ b/src/lib/orderman2/orders/NativeOrder.h @@ -0,0 +1,57 @@ +#pragma once +#include "Order.h" + + +namespace bts { +namespace orderman { + + +struct PermissionQueryResult { + bool can_send; + std::string error_msg; +}; + +struct RouteQueryResult { + bool has_route; + std::string error_msg; + api::orderman::RoutingRecord routing_record; +}; + +class NativeOrder2 : public Order2 { +public: + virtual void on_execution_report(std::string const &, OrderKey, + ExecutionReport const &){}; + virtual void on_cancel_reject(std::string const &, OrderKey, + std::string const & /*msg*/){}; + virtual void on_gateway_status(std::string const &, bool /*is_connected*/){}; + + void subscribe_execution_report(std::string const &gw, OrderKey k); + void unsubscribe_execution_report(std::string const &gw, OrderKey k); + void subscribe_cancel_reject(std::string const &gw, OrderKey k); + void unsubscribe_cancel_reject(std::string const &gw, OrderKey k); + void subscribe_gateway_status(std::string const &); + void unsubscribe_gateway_status(std::string const &); + + RouteQueryResult get_route(AccountID, UserID, api::Security const &); + PermissionRec + get_permission_record(api::orderman::RoutingRecord const &routing, AccountID, + UserID, api::Security const &, api::Side); + + PermissionQueryResult can_send_new_order(PermissionRec const &, Quantity, + Price); + + PermissionQueryResult can_update_order(PermissionRec const &, Quantity from, + Quantity to, Price p); + + bool is_route_connected(api::orderman::RoutingRecord const &); + void send_fix(api::orderman::RoutingRecord const &rr, + jetfix::MessageTypes mt, jetfix::FIXFragment const &f); + + TimeStamp time() const; + mercury::TimeStampStr time_str() const; + private: + struct PImpl; + std::unique_ptr me; +}; + +}} diff --git a/src/lib/orderman2/orders/Order.cpp b/src/lib/orderman2/orders/Order.cpp new file mode 100644 index 000000000..a14ec8bed --- /dev/null +++ b/src/lib/orderman2/orders/Order.cpp @@ -0,0 +1,2 @@ +#include "Order.h" + diff --git a/src/lib/orderman2/orders/Order.h b/src/lib/orderman2/orders/Order.h new file mode 100644 index 000000000..24c10b533 --- /dev/null +++ b/src/lib/orderman2/orders/Order.h @@ -0,0 +1,70 @@ +#pragma once + +#include "lib/api/services/OrderService.pb.h" +#include "lib/domain_model/common.h" +#include "lib/jetfix/common/OutFIX.h" +#include "lib/mercury/common/mercury_common.h" +#include "lib/orderman/orderman_utils/Book.h" +#include "lib/orderman/orderman_utils/ExecutionReport.h" +#include "lib/orderman/orderman_utils/orderman_common.h" + +#include + +namespace bts { +namespace api { +namespace orderman { +class OrderDefinition; +class OrderRecord; +} // namespace orderman +} // namespace api +} // namespace bts + +namespace bts { +namespace orderman { + +struct ChildOrderDescriptor {}; +struct ChildOrder {}; + +class PermissionRec {}; + +class Order2 { + public: + virtual ~Order2(); + + virtual void on_init_new(api::orderman::OrderDefinition const &) = 0; + virtual void on_init_recovered(api::orderman::OrderRecord const &) = 0; + + virtual void on_activate(Price, Quantity) = 0; + virtual void on_update(Price, Quantity) = 0; + virtual void on_cancel() = 0; + virtual void on_child_order_update(OrderKey, api::orderman::OrderState const &){}; + virtual void on_book(SecurityKey, Book const &) {} + virtual void on_settlement(SecurityKey, Book const &) {} + virtual void on_time(TimeStamp const &) {} + + void subscribe_child_updates(OrderKey child); + void unsubscribe_child_updates(OrderKey child); + void subscribe_book(SecurityKey); + void unsubscribe_book(SecurityKey); + void subscribe_settlement(SecurityKey); + void unsubscribe_settlement(SecurityKey); + void subscribe_time(); + void unsubscribe_time(); + + api::Security const *resolve_security(SecurityKey const &k) const; + void report_state(const api::orderman::OrderState &state); + + ChildOrderDescriptor const & + make_child_order_descriptor(api::orderman::OrderDefinition const &, + size_t hint = 1); + ChildOrder make_child_order(ChildOrderDescriptor const &desc); + void send_child(ChildOrder ch, Price, Quantity); + void update_child(ChildOrder ch, Price, Quantity); + void cancel_child(ChildOrder ch); + + private: + struct PImpl; + std::unique_ptr me; +}; +} // namespace orderman +} // namespace bts From a5c0c95e4e7b2a051df5e5bf01a1280861e1ee4c Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Wed, 28 Nov 2018 18:32:15 +0000 Subject: [PATCH 006/107] Reduced allocations when creating a new order. --- src/lib/CMakeDeps.cmake | 2 +- .../actors/order_manager/OrderManager.cpp | 30 +++-- .../actors/order_manager/OrderServices.h | 111 ++++++++++++++---- src/lib/orderman/orderman_utils/EventStream.h | 27 ++++- 4 files changed, 126 insertions(+), 44 deletions(-) diff --git a/src/lib/CMakeDeps.cmake b/src/lib/CMakeDeps.cmake index cd221187f..6211e72d2 100644 --- a/src/lib/CMakeDeps.cmake +++ b/src/lib/CMakeDeps.cmake @@ -1 +1 @@ -set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/services/UserService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/Executor.conf;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/PerfTraceLog.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/IcebergOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/CoverOrder.cpp;orderman/orders/book_algos/JoinOrder.cpp;orderman/orders/book_algos/LeanOrder.cpp;orderman/orders/book_algos/OffsetOrder.cpp;orderman/orders/book_algos/TickOrder.cpp;orderman/orders/book_algos/TopOrder.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;orderman2/OrderManager2.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/thread_manager.cpp) \ No newline at end of file +set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/services/UserService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/Executor.conf;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/PerfTraceLog.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/IcebergOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/CoverOrder.cpp;orderman/orders/book_algos/JoinOrder.cpp;orderman/orders/book_algos/LeanOrder.cpp;orderman/orders/book_algos/OffsetOrder.cpp;orderman/orders/book_algos/TickOrder.cpp;orderman/orders/book_algos/TopOrder.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;orderman2/orders/NativeOrder.cpp;orderman2/orders/Order.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/thread_manager.cpp) \ No newline at end of file diff --git a/src/lib/orderman/actors/order_manager/OrderManager.cpp b/src/lib/orderman/actors/order_manager/OrderManager.cpp index 5b4653968..ff60eb58e 100644 --- a/src/lib/orderman/actors/order_manager/OrderManager.cpp +++ b/src/lib/orderman/actors/order_manager/OrderManager.cpp @@ -32,14 +32,14 @@ enum class OrderManager::State { struct OrderManager::OrderInfo { OrderInfo(Order &o, OrderServicesData &data) - : order(&o), order_services(std::make_unique(o, data)) {} + : order(&o), order_services(o, data) {} OrderInfo() = default; OrderInfo(OrderInfo &&src) = default; OrderInfo &operator=(OrderInfo &&src) = default; Order *order; - std::unique_ptr order_services; + OrderServices order_services; }; struct OrderManager::PImpl { @@ -161,11 +161,11 @@ void OrderManager::on_order_recovery( auto &order = me->services_data.order_factory.recover(ev.order_record); auto const &ostate = ev.order_record.state(); - OrderInfo oi{order, me->services_data}; - auto serv_ptr = oi.order_services.get(); - me->orders[order.key()] = std::move(oi); + auto r = me->orders.emplace(order.key(), OrderInfo {order, me->services_data}); + bts_assert(r.second); + auto &oi = r.first->second; order.on_activate(Price(ostate.price()), - Quantity(ostate.quantity()), *serv_ptr, + Quantity(ostate.quantity()), oi.order_services, PerfTrace()); } @@ -196,11 +196,11 @@ void OrderManager::on_execution_report( auto order = &me->services_data.order_factory.recreate_from_exe_report( *report.data); - OrderInfo oi{*order, me->services_data}; - auto serv_ptr = oi.order_services.get(); - me->orders[order->key()] = std::move(oi); + auto r = me->orders.emplace(order->key(), OrderInfo {*order, me->services_data}); + bts_assert(r.second); + auto &oi = r.first->second; order->on_activate(report.data->price, report.data->quantity, - *serv_ptr, PerfTrace()); + oi.order_services, PerfTrace()); } } } @@ -218,12 +218,10 @@ void OrderManager::on_activate_order( void OrderManager::handle_order_event(ActivateOrderEvent const &ev) { auto order = ev.order; - auto k = order->key(); - bts_assert(me->orders.find(k) == me->orders.end()); - OrderInfo oi{*order, me->services_data}; - auto serv_ptr = oi.order_services.get(); - me->orders[k] = std::move(oi); - order->on_activate(ev.price, ev.quantity, *serv_ptr, ev.trace); + auto r = me->orders.emplace(order->key(), OrderInfo {*order, me->services_data}); + bts_assert(r.second); + auto &oi = r.first->second; + order->on_activate(ev.price, ev.quantity, oi.order_services, ev.trace); } void OrderManager::on_update_order(const mercury::Update &m) { diff --git a/src/lib/orderman/actors/order_manager/OrderServices.h b/src/lib/orderman/actors/order_manager/OrderServices.h index 55ad80e06..797419985 100644 --- a/src/lib/orderman/actors/order_manager/OrderServices.h +++ b/src/lib/orderman/actors/order_manager/OrderServices.h @@ -8,6 +8,7 @@ #include "lib/orderman/governor/Governor.h" #include "lib/orderman/orderman_utils/EventStream.h" #include "lib/orderman/orders/Order.h" +#include #include @@ -17,12 +18,41 @@ namespace orderman { class SessionServices { public: + SessionServices(SessionServices &&ss) + { + operator=(std::move(ss)); + } + + SessionServices(SessionServices const &ss) + { + operator=(ss); + } + SessionServices(SessionServicesData &session_data) : _exe_reports(*session_data.exe_report_subs), _cancel_rejects(*session_data.cancel_reject_subs), _gateway_status(*session_data.gateway_status_subs), _session_data(&session_data), _gateway_status_sub() {} + SessionServices& operator=(SessionServices&&src) { + _exe_reports = std::move(src._exe_reports); + _cancel_rejects = std::move(src._cancel_rejects); + _gateway_status = std::move(src._gateway_status); + _session_data = src._session_data; + src._session_data = nullptr; + _gateway_status_sub = src._gateway_status_sub; + return *this; + } + + SessionServices& operator=(SessionServices const&src) { + _exe_reports = src._exe_reports; + _cancel_rejects = src._cancel_rejects; + _gateway_status = src._gateway_status; + _session_data = src._session_data; + _gateway_status_sub = src._gateway_status_sub; + return *this; + } + std::string const &session_name() const { return _session_data->session; } config::JetFIX::Connection const &session_cfg() const { @@ -77,35 +107,54 @@ class SessionServices { class OrderServices { public: + OrderServices(OrderServices &&src) { operator=(std::move(src)); } + OrderServices(Order &owner, OrderServicesData &data) - : _owner(owner), _data(data), _child_updates(*data.child_order_subs), - _book_updates(*data.md_subs), + : _busy(false), _pending_calls(), _owner(&owner), _data(&data), + _child_updates(*data.child_order_subs), _book_updates(*data.md_subs), _settlement_updates(*data.settlement_subs), _time_change(*data.time_subs), _sessions(), _child_updates_sub(), _time_change_sub(), _create_order_reply(*data.order_creation_subs) { + for (auto &sd : data.sessions) - _sessions.push_back(std::make_unique(*sd)); + _sessions.emplace_back(*sd); } - securities::ISecurityDB &sec_db() { return _data.sec_db; } + OrderServices &operator=(OrderServices &&src) { + _busy = src._busy; + _pending_calls = src._pending_calls; + _owner = src._owner; + _data = src._data; + src._data = nullptr; + _child_updates = std::move(src._child_updates); + _book_updates = std::move(src._book_updates); + _settlement_updates = std::move(src._settlement_updates); + _time_change = std::move(src._time_change); + _sessions = src._sessions; + _child_updates_sub = src._child_updates_sub; + _time_change_sub = src._time_change_sub; + _create_order_reply = std::move(src._create_order_reply); + + return *this; + } + + securities::ISecurityDB &sec_db() { return _data->sec_db; } mercury::TimeStampStr const &get_time_str() const { - return _data.last_timer_ev.ts_str; + return _data->last_timer_ev.ts_str; } - TimeStamp const &get_time() const { return _data.last_timer_ev.ts; } - void report_state(const api::orderman::OrderState &state, PerfTrace const &trace = PerfTrace()) { - _data.owner.publish(_data.report_order_state_pub, _owner.key(), - _owner.parent_key(), _owner.definition(), state, - trace); + _data->owner.publish(_data->report_order_state_pub, _owner->key(), + _owner->parent_key(), _owner->definition(), state, + trace); if (orderman::in_terminal_state(state.status())) { LOG(OrderMan, Info, "Order {} transitioned to a terminal state. Canceling all " "subscriptions", - _owner.key().value()); + _owner->key().value()); _book_updates.unsub_all(); _child_updates.unsub_all(); _time_change.unsub_all(); @@ -113,12 +162,12 @@ class OrderServices { } } - Limiter &limiter() { return _data.limiter; } + Limiter &limiter() { return _data->limiter; } SessionServices &get_session_services(std::string const &for_session) { for (auto &s : _sessions) - if (s->session_name() == for_session) - return *s; + if (s.session_name() == for_session) + return s; bts_assert(false); } @@ -145,7 +194,7 @@ class OrderServices { template void subscribe_to_child_updates(CB &&cb) { _child_updates_sub = - _child_updates.sub(_owner.key(), std::forward(cb)); + _child_updates.sub(_owner->key(), std::forward(cb)); } void unsubscribe_from_child_updates() { _child_updates.unsub(_child_updates_sub); @@ -154,7 +203,23 @@ class OrderServices { private: friend class OrderBuilder; - IOrderFactory &order_factory() { return _data.order_factory; } + + template void on_inter_order_call(C const &c) { + if (_busy) + _pending_calls.emplace_back(c); + else { + _busy = true; + c(*this); + for (size_t i = 0; i < _pending_calls.size(); i++) { + auto c = _pending_calls[i]; + c(*this); + } + _pending_calls.clear(); + _busy = false; + } + } + + IOrderFactory &order_factory() { return _data->order_factory; } using CreateOrderReplySubID = EventStream::SubID; @@ -170,14 +235,14 @@ class OrderServices { void send_order_create_req(size_t builder_id, OrderKey pk, api::orderman::OrderDefinition const &def, size_t n_orders) { - _data.owner.publish(_data.create_order_req_pub, builder_id, pk, def, - n_orders); + _data->owner.publish(_data->create_order_req_pub, builder_id, pk, def, + n_orders); } friend class ChildOrder; template void queue_order_op(const OP &op) { - _data.owner.queue_order_event(op); + _data->owner.queue_order_event(op); } void send_activate(Order &o, Price p, Quantity q, PerfTrace const &trace) { queue_order_op(ActivateOrderEvent{o, p, q, trace}); @@ -204,13 +269,15 @@ class OrderServices { queue_order_op(CancelOrderEvent{k, PerfTrace()}); } - Order &_owner; - OrderServicesData &_data; + bool _busy; + boost::container::small_vector,10> _pending_calls; + Order *_owner; + OrderServicesData *_data; EventStream _child_updates; EventStream _book_updates; EventStream _settlement_updates; EventStream _time_change; - std::vector> _sessions; + boost::container::small_vector _sessions; EventStream::SubID _child_updates_sub; EventStream::SubID _time_change_sub; EventStream _create_order_reply; diff --git a/src/lib/orderman/orderman_utils/EventStream.h b/src/lib/orderman/orderman_utils/EventStream.h index c4a191ab7..22e971a60 100644 --- a/src/lib/orderman/orderman_utils/EventStream.h +++ b/src/lib/orderman/orderman_utils/EventStream.h @@ -13,27 +13,44 @@ struct EventStream using CS = mercury::ContentSubscription; using SubID = typename CS::SubID; - EventStream (CS&cs) : cs (cs) {} + EventStream () : cs (nullptr) {} + EventStream (CS&cs) : cs (&cs) {} template SubID sub(typename CS::Key k, CB&&cb) { - auto s = cs.sub(k,std::forward (cb)); + auto s = cs->sub(k,std::forward (cb)); active_subs.push_back(s); return s; } template SubID sub(CB&&cb) { - auto s = cs.sub(std::forward (cb)); + auto s = cs->sub(std::forward (cb)); active_subs.push_back(s); return s; } + EventStream& operator=(EventStream &&src) + { + cs = src.cs; + src.cs = nullptr; + active_subs = src.active_subs; + src.active_subs.clear(); + return *this; + } + + EventStream& operator=(EventStream const &src) + { + cs = src.cs; + active_subs = src.active_subs; + return *this; + } + void unsub(SubID sid) { auto it = std::find(active_subs.begin(), active_subs.end(),sid); if (it != active_subs.end()) { active_subs.erase(it); - cs.unsub(sid); + cs->unsub(sid); } } @@ -46,7 +63,7 @@ struct EventStream } private: - CS &cs; + CS *cs; boost::container::small_vector active_subs; }; From d6c1285ada2b0d86abd6858df25d8bfc9d29285a Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Thu, 29 Nov 2018 14:55:09 -0500 Subject: [PATCH 007/107] SPARK-1901 Rename UserService->AuthService --- src/client/spark/Daemons/ShellServices.cs | 2 +- .../spark/core/Settings/UserPersistFactory.cs | 4 ++-- .../spark/view/Shell/Login/LoginModel.cs | 8 +++---- .../Shell/Workspaces/SettingsManagerTool.cs | 2 +- src/client/spark_api/api/ServiceContext.cs | 23 ++++++++++++++++--- src/client/spark_api/md/Authenticator.cs | 2 +- .../extensions/OrderService_Excel.cs | 2 +- src/client/spark_sdk/samples/OrderSample.cs | 2 +- src/client/sparkcmd/Cmd/ServiceTestCommand.cs | 2 +- src/lib/CMakeDeps.cmake | 2 +- .../{UserService.proto => AuthService.proto} | 2 +- src/lib/utils/AuthToken.cpp | 1 + src/lib/utils/AuthToken.h | 2 +- src/server/sparkd/cmds/Run.cpp | 4 ++-- src/server/sparkd/cmds/Web.cpp | 4 ++-- src/server/sparkd/http/ApiGateway.cpp | 6 ++--- .../sparkd/position/MarginServiceCore.cpp | 2 +- .../sparkd/position/tests/PositionTests.cpp | 3 +-- ...erviceServer.cpp => AuthServiceServer.cpp} | 14 +++++------ ...serServiceServer.h => AuthServiceServer.h} | 10 ++++---- 20 files changed, 57 insertions(+), 40 deletions(-) rename src/lib/api/services/{UserService.proto => AuthService.proto} (98%) rename src/server/sparkd/user/{UserServiceServer.cpp => AuthServiceServer.cpp} (86%) rename src/server/sparkd/user/{UserServiceServer.h => AuthServiceServer.h} (70%) diff --git a/src/client/spark/Daemons/ShellServices.cs b/src/client/spark/Daemons/ShellServices.cs index a57ac2547..23ab2c1ca 100644 --- a/src/client/spark/Daemons/ShellServices.cs +++ b/src/client/spark/Daemons/ShellServices.cs @@ -16,7 +16,7 @@ namespace Spark { public static ServiceContext context { get; } = new ServiceContext(); [Export] - public UserService user_service => context.locate(); + public AuthService user_service => context.locate(); [Export("settings")] public PersistenceService settings_service => context.locate("settings"); diff --git a/src/client/spark/core/Settings/UserPersistFactory.cs b/src/client/spark/core/Settings/UserPersistFactory.cs index 3c1b8db02..e6a211e95 100644 --- a/src/client/spark/core/Settings/UserPersistFactory.cs +++ b/src/client/spark/core/Settings/UserPersistFactory.cs @@ -22,12 +22,12 @@ namespace mbts.ui.settings readonly PersistenceService _persist; [ImportingConstructor] - public UISettingsFactory(UserService login, [Import("settings")] PersistenceService persist) { + public UISettingsFactory(AuthService login, [Import("settings")] PersistenceService persist) { _persist = persist; _users = get_users(login); } - async Task get_users(UserService login) { + async Task get_users(AuthService login) { var users = await login.get_users_async(null); if (users.success) return users.value.Users.ToArray(); else return new User[0]; diff --git a/src/client/spark/view/Shell/Login/LoginModel.cs b/src/client/spark/view/Shell/Login/LoginModel.cs index 1845850f0..21c29733e 100644 --- a/src/client/spark/view/Shell/Login/LoginModel.cs +++ b/src/client/spark/view/Shell/Login/LoginModel.cs @@ -25,7 +25,7 @@ namespace mbts.ui.shell internal class LoginContainer { [ImportingConstructor] - public LoginContainer(UserService user, [Import("settings")] PersistenceService persist) { + public LoginContainer(AuthService user, [Import("settings")] PersistenceService persist) { var model = LoginModel.instance; model.provide_services(user, persist); // await_login pumps the dispatcher but doesn't allow control to return to MEF until the username and workspace are available @@ -70,7 +70,7 @@ namespace mbts.ui.shell private string _workspace; private PreloginWorkspaceEnumerator _enum_workspace; - UserService _logon; + AuthService _logon; DispatcherFrame _frame = new DispatcherFrame(); private LoginModel() { @@ -168,10 +168,10 @@ namespace mbts.ui.shell #region provide hub - public void provide_services(UserService u, PersistenceService p) { + public void provide_services(AuthService u, PersistenceService p) { _hub_src.TrySetResult((u,p)); } - private TaskCompletionSource<(UserService, PersistenceService)> _hub_src = new TaskCompletionSource<(UserService, PersistenceService)>(); + private TaskCompletionSource<(AuthService, PersistenceService)> _hub_src = new TaskCompletionSource<(AuthService, PersistenceService)>(); #endregion #region Dispose diff --git a/src/client/spark/view/Shell/Workspaces/SettingsManagerTool.cs b/src/client/spark/view/Shell/Workspaces/SettingsManagerTool.cs index cddfa7c5e..d25162176 100644 --- a/src/client/spark/view/Shell/Workspaces/SettingsManagerTool.cs +++ b/src/client/spark/view/Shell/Workspaces/SettingsManagerTool.cs @@ -11,7 +11,7 @@ namespace bts.settings { public class SettingsManagerTool { public static void run() { var sc = new ServiceContext(); - var users = sc.locate(); + var users = sc.locate(); var persist = sc.locate("settings"); var user_list = users.get_users(new GetUsersRequest()); var user_names = user_list.Users.Select(u => u.Login); diff --git a/src/client/spark_api/api/ServiceContext.cs b/src/client/spark_api/api/ServiceContext.cs index 9fb48cccd..3226e6189 100644 --- a/src/client/spark_api/api/ServiceContext.cs +++ b/src/client/spark_api/api/ServiceContext.cs @@ -4,12 +4,13 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Reflection; +using bts.api.user; -namespace bts.api.core -{ +namespace bts.api.core { public class ServiceContext : IDisposable { IntPtr _qbus; + public ServiceContext() { _qbus = ApiNativeMethods.api_create_quickbus(null, 0); } @@ -22,7 +23,6 @@ namespace bts.api.core Type[] arg_types = new[] { typeof(ClientChannel) }; ConstructorInfo ctor = typeof(T).GetConstructors(BindingFlags.NonPublic | BindingFlags.Instance).First(ci => ci.GetParameters().SingleOrDefault()?.ParameterType == typeof(ClientChannel)); return (T)ctor.Invoke(new object[] { channel }); - //return (T)Activator.CreateInstance(typeof(T), channel); } internal ServerChannel publish(T service, string service_type, string qualifier) where T : IApiServer { @@ -31,6 +31,23 @@ namespace bts.api.core return ch; } + public AuthToken token { get; private set; } + + public async Task login(string username, string password) { + var auth_service = locate(); + var result = await auth_service.authenticate_login_async(new AuthenticateLoginRequest() { + Login = username, + Password = password + }); + if (result.success) { + token = result.value.Token; + // todo + // ApiNativeMethods.set_token(...) + return true; + } + return false; + } + #region IDisposable Support protected virtual void Dispose(bool disposing) { diff --git a/src/client/spark_api/md/Authenticator.cs b/src/client/spark_api/md/Authenticator.cs index 34aca3bfc..26798e94c 100644 --- a/src/client/spark_api/md/Authenticator.cs +++ b/src/client/spark_api/md/Authenticator.cs @@ -7,7 +7,7 @@ namespace bts.api { public class Authenticator { - readonly static Lazy _auth = new Lazy(() => Locator.locate(), true); + readonly static Lazy _auth = new Lazy(() => Locator.locate(), true); user.AuthToken _token = null; public Authenticator() { } diff --git a/src/client/spark_excel/extensions/OrderService_Excel.cs b/src/client/spark_excel/extensions/OrderService_Excel.cs index e081916aa..853d3227d 100644 --- a/src/client/spark_excel/extensions/OrderService_Excel.cs +++ b/src/client/spark_excel/extensions/OrderService_Excel.cs @@ -17,7 +17,7 @@ namespace bts.api.orderman { public partial class OrderService_Excel { - readonly static Lazy _users = new Lazy(() => Locator.locate(), true); + readonly static Lazy _users = new Lazy(() => Locator.locate(), true); readonly static Lazy _admin = new Lazy(() => Locator.locate(), true); [ExcelFunction(Category = "BTS", Description = "Get All Accessible Accounts")] diff --git a/src/client/spark_sdk/samples/OrderSample.cs b/src/client/spark_sdk/samples/OrderSample.cs index 251b9a192..186041c1a 100644 --- a/src/client/spark_sdk/samples/OrderSample.cs +++ b/src/client/spark_sdk/samples/OrderSample.cs @@ -27,7 +27,7 @@ namespace bts.sdk } readonly static Lazy _orders = new Lazy(() => Locator.locate(), true); - readonly static Lazy _users = new Lazy(() => Locator.locate(), true); + readonly static Lazy _users = new Lazy(() => Locator.locate(), true); readonly static Lazy _admin = new Lazy(() => Locator.locate(), true); void print_update(T update) diff --git a/src/client/sparkcmd/Cmd/ServiceTestCommand.cs b/src/client/sparkcmd/Cmd/ServiceTestCommand.cs index dfad6cc5d..3e9ff00c5 100644 --- a/src/client/sparkcmd/Cmd/ServiceTestCommand.cs +++ b/src/client/sparkcmd/Cmd/ServiceTestCommand.cs @@ -82,7 +82,7 @@ namespace bts { private static void user_test() { var ctx = new ServiceContext(); - var s = ctx.locate(); + var s = ctx.locate(); var r = new api.user.GetUsersRequest(); var resp = s.get_users(r); Console.WriteLine("{0}", resp); diff --git a/src/lib/CMakeDeps.cmake b/src/lib/CMakeDeps.cmake index 1552418c6..d022f9964 100644 --- a/src/lib/CMakeDeps.cmake +++ b/src/lib/CMakeDeps.cmake @@ -1 +1 @@ -set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/services/UserService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/Executor.conf;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/thread_manager.cpp) \ No newline at end of file +set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/Executor.conf;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/thread_manager.cpp) \ No newline at end of file diff --git a/src/lib/api/services/UserService.proto b/src/lib/api/services/AuthService.proto similarity index 98% rename from src/lib/api/services/UserService.proto rename to src/lib/api/services/AuthService.proto index f6a59ecb4..2b5c38e36 100644 --- a/src/lib/api/services/UserService.proto +++ b/src/lib/api/services/AuthService.proto @@ -52,7 +52,7 @@ message AuthenticateLoginResponse { message AuthenticateTokenRequest {AuthToken token = 1;} message AuthenticateTokenResponse {bool is_valid = 1; string reason = 2; User user = 3;} -service UserService { +service AuthService { option (bts.api.service_description) = "Provides a management interface to the system user list"; rpc authenticate_login(AuthenticateLoginRequest) returns (AuthenticateLoginResponse) diff --git a/src/lib/utils/AuthToken.cpp b/src/lib/utils/AuthToken.cpp index 5a10fa63c..671e604de 100644 --- a/src/lib/utils/AuthToken.cpp +++ b/src/lib/utils/AuthToken.cpp @@ -8,6 +8,7 @@ namespace api { namespace auth { #ifndef _WIN32 + user::AuthToken generate_token(const admin::BTSUser& user) { api::user::TokenPayload payload; payload.set_date(datetime::ll_now()); diff --git a/src/lib/utils/AuthToken.h b/src/lib/utils/AuthToken.h index fb4966120..fe0569073 100644 --- a/src/lib/utils/AuthToken.h +++ b/src/lib/utils/AuthToken.h @@ -1,5 +1,5 @@ #pragma once -#include "lib/api/services/UserService.pb.h" +#include "lib/api/services/AuthService.pb.h" #include "lib/api/services/AdminService.client.pb.h" #include diff --git a/src/server/sparkd/cmds/Run.cpp b/src/server/sparkd/cmds/Run.cpp index 516980043..b7fbb47eb 100644 --- a/src/server/sparkd/cmds/Run.cpp +++ b/src/server/sparkd/cmds/Run.cpp @@ -25,7 +25,7 @@ #include "server/sparkd/support/ShellLatencyServer.h" #include "server/sparkd/user/AdminServiceServer.h" #include "server/sparkd/md/MarketDataAuxiliaryServiceServer.h" -#include "server/sparkd/user/UserServiceServer.h" +#include "server/sparkd/user/AuthServiceServer.h" #include "lib/orderman/order_factory/DynamicOrderRegistry.h" #include "lib/plugin/SparkServices.h" #include "lib/plugin/plugin.h" @@ -54,7 +54,7 @@ int Run::execute(std::vector const &) { http::SparkWebServer webserver(sc, stats, perf_log,ports.config_port()); persistence::PersistenceServiceServer settings_saver(sc, "settings"); - user::UserServiceServer login_server(sc); + user::AuthServiceServer login_server(sc); md::run_market_datapublishers(); std::shared_ptr synthetic_service = std::make_shared(sc); diff --git a/src/server/sparkd/cmds/Web.cpp b/src/server/sparkd/cmds/Web.cpp index 09bda5c6e..aac651dc0 100644 --- a/src/server/sparkd/cmds/Web.cpp +++ b/src/server/sparkd/cmds/Web.cpp @@ -12,7 +12,7 @@ #include "lib/md/relay/QueryServer.h" #include "lib/md/SyntheticSecurityService.h" #include "server/sparkd/user/AdminServiceServer.h" -#include "server/sparkd/user/UserServiceServer.h" +#include "server/sparkd/user/AuthServiceServer.h" #include "server/sparkd/md/run_md.h" #include "lib/orderman/orderman_utils/PerfTraceLog.h" @@ -34,7 +34,7 @@ int Web::execute(const std::vector& args) { PerfTraceLog perf_log; http::SparkWebServer webserver(sc, stats, perf_log,ports.config_port()); - user::UserServiceServer login_server(sc); + user::AuthServiceServer login_server(sc); if (std::find(args.begin(), args.end(), "-md") != args.end()) { md::run_market_datapublishers(); } diff --git a/src/server/sparkd/http/ApiGateway.cpp b/src/server/sparkd/http/ApiGateway.cpp index ec889dc80..a08d0dc8c 100644 --- a/src/server/sparkd/http/ApiGateway.cpp +++ b/src/server/sparkd/http/ApiGateway.cpp @@ -3,7 +3,7 @@ #include "lib/logging/logging.h" #include "lib/api/public/ApiUtils.h" #include "lib/api/core/ApiClientInterop.h" -#include "lib/api/services/UserService.client.pb.h" +#include "lib/api/services/AuthService.client.pb.h" #include "lib/api/services/AdminService.client.pb.h" #include "lib/utils/bts_assert.h" #include @@ -19,7 +19,7 @@ namespace http { struct ApiGatewayImpl { std::mutex _m; const api::ServiceContext& _sc; - api::user::UserService _logon; + api::user::AuthService _logon; std::unordered_map _apiclient; std::vector _subscriptions; @@ -28,7 +28,7 @@ struct ApiGatewayImpl { ApiGatewayImpl(const api::ServiceContext& ctx) : _m(), _sc(ctx), - _logon(ctx.locate()), + _logon(ctx.locate()), _apiclient(), _subscriptions() { } diff --git a/src/server/sparkd/position/MarginServiceCore.cpp b/src/server/sparkd/position/MarginServiceCore.cpp index 9b4868f16..3bc45e612 100644 --- a/src/server/sparkd/position/MarginServiceCore.cpp +++ b/src/server/sparkd/position/MarginServiceCore.cpp @@ -6,7 +6,7 @@ #include "IMarginObserver.h" #include "lib/config/config.h" -#include "lib/api/services/UserService.pb.h" +#include "lib/api/services/AuthService.pb.h" #include "lib/utils/bts_assert.h" #include "lib/utils/Uuid.h" #include "lib/utils/bts_chrono.h" diff --git a/src/server/sparkd/position/tests/PositionTests.cpp b/src/server/sparkd/position/tests/PositionTests.cpp index b24dbe509..62c93aec6 100644 --- a/src/server/sparkd/position/tests/PositionTests.cpp +++ b/src/server/sparkd/position/tests/PositionTests.cpp @@ -7,11 +7,10 @@ #include "../IMarginObserver.h" #include "lib/orderman/orderman_utils/orderman_common.h" -#include "server/sparkd/user/UserServiceServer.h" #include "lib/config/config.h" #include "lib/api/public/ServiceContext.h" -#include "lib/api/services/UserService.client.pb.h" +#include "lib/api/services/AuthService.client.pb.h" #include "lib/domain_model/Security.pb.h" #include "lib/utils/helper_macros.h" diff --git a/src/server/sparkd/user/UserServiceServer.cpp b/src/server/sparkd/user/AuthServiceServer.cpp similarity index 86% rename from src/server/sparkd/user/UserServiceServer.cpp rename to src/server/sparkd/user/AuthServiceServer.cpp index e1ffb1857..a481852c3 100644 --- a/src/server/sparkd/user/UserServiceServer.cpp +++ b/src/server/sparkd/user/AuthServiceServer.cpp @@ -1,8 +1,8 @@ -#include "UserServiceServer.h" +#include "AuthServiceServer.h" #include "lib/persistence/SqliteStore.h" #include "lib/logging/logging.h" -#include "lib/api/services/UserService.pb.h" +#include "lib/api/services/AuthService.pb.h" #include "lib/api/services/AdminService.client.pb.h" #include "lib/utils/PBUtils.h" #include "lib/utils/AuthToken.h" @@ -19,7 +19,7 @@ namespace user { const api::VoidMessage vod; -struct UserServiceServer::PImpl +struct AuthServiceServer::PImpl { api::admin::AdminService admin; @@ -27,13 +27,13 @@ struct UserServiceServer::PImpl admin(context.locate()) { } }; -UserServiceServer::UserServiceServer (bts::api::ServiceContext& context) : UserServiceBase(context), me (new PImpl(context)) { +AuthServiceServer::AuthServiceServer (bts::api::ServiceContext& context) : AuthServiceBase(context), me (new PImpl(context)) { LOG(User,Warn,"Starting user service"); } -UserServiceServer::~UserServiceServer () {} +AuthServiceServer::~AuthServiceServer () {} -void UserServiceServer::get_users(const api::user::GetUsersRequest& , +void AuthServiceServer::get_users(const api::user::GetUsersRequest& , const std::function& respond) { me->admin.get_admin_data(vod, [respond](const api::Result& admin_data) { @@ -54,7 +54,7 @@ void UserServiceServer::get_users(const api::user::GetUsersRequest& , }); } -void UserServiceServer::authenticate_login(const api::user::AuthenticateLoginRequest& req, +void AuthServiceServer::authenticate_login(const api::user::AuthenticateLoginRequest& req, const std::function& respond) { me->admin.get_admin_data(vod, [=](const api::Result& admin_data) { diff --git a/src/server/sparkd/user/UserServiceServer.h b/src/server/sparkd/user/AuthServiceServer.h similarity index 70% rename from src/server/sparkd/user/UserServiceServer.h rename to src/server/sparkd/user/AuthServiceServer.h index 431f6bf27..91df48a8e 100644 --- a/src/server/sparkd/user/UserServiceServer.h +++ b/src/server/sparkd/user/AuthServiceServer.h @@ -1,7 +1,7 @@ #pragma once #include -#include "lib/api/services/UserService.server.pb.h" +#include "lib/api/services/AuthService.server.pb.h" #include "lib/api/services/AdminService.pb.h" #include "lib/utils/bts_no_copy.h" @@ -9,12 +9,12 @@ namespace bts { namespace user { -class UserServiceServer : public api::user::UserServiceBase +class AuthServiceServer : public api::user::AuthServiceBase { public: - BTS_NO_COPY(UserServiceServer); - UserServiceServer (bts::api::ServiceContext& context); - ~UserServiceServer(); + BTS_NO_COPY(AuthServiceServer); + AuthServiceServer (bts::api::ServiceContext& context); + ~AuthServiceServer(); void get_users(const api::user::GetUsersRequest& , const std::function& ) override; void authenticate_login(const api::user::AuthenticateLoginRequest& , From fc5e4039b2e6a9209098906a16ca098cd9105c09 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Thu, 29 Nov 2018 14:59:43 -0500 Subject: [PATCH 008/107] SPARK-1907 .value() on failed result should be null instead of an exception that nobody will remember to catch --- src/client/spark_api/api/Result.cs | 7 ++++++- src/lib/api/public/Result.h | 7 +------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/client/spark_api/api/Result.cs b/src/client/spark_api/api/Result.cs index 5a473c0e0..52084ac4c 100644 --- a/src/client/spark_api/api/Result.cs +++ b/src/client/spark_api/api/Result.cs @@ -37,7 +37,12 @@ namespace bts.api.core public T value { get { if (success) return _result; - else throw new ApiException(error_message); + else { + if (typeof(T).IsValueType) { throw new ApiException(error_message); } + else { + return default(T);// always null + } + } } } public bool success { get { return _code == ApiError.Success; } } diff --git a/src/lib/api/public/Result.h b/src/lib/api/public/Result.h index de3625775..c63401f89 100644 --- a/src/lib/api/public/Result.h +++ b/src/lib/api/public/Result.h @@ -57,7 +57,7 @@ public: std::shared_ptr result() const { if (success()) return _t; - else throw ApiException(std::string(error_message())); + else return nullptr; } bool success() const { return _code == ApiError::SUCCESS; } @@ -66,13 +66,8 @@ public: const char* error_message() const { return error_string(_code); } ~Result() {} - - // Is not a type?? - // typedef std::function)> OnResponse; }; -//template -//using OnResponse = std::function)>; }}//namespace From e8f797739c1ac9a6f18d2dc1adc770068024284d Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Thu, 29 Nov 2018 20:29:49 +0000 Subject: [PATCH 009/107] Internalized inter order communication in OrderManager. For speed and control over event priority. --- src/lib/mercury/actors/Actor.h | 10 ++ .../actors/order_manager/ChildOrder.h | 33 ++-- .../actors/order_manager/OrderManager.cpp | 156 +++++++----------- .../actors/order_manager/OrderManager.h | 51 +++--- .../actors/order_manager/OrderServices.h | 144 +++++++--------- .../actors/order_manager/OrderServicesData.h | 4 - src/lib/orderman/orderman_utils/EventStream.h | 6 + src/lib/orderman/orders/IcebergOrder.cpp | 2 +- src/lib/orderman/orders/Order.cpp | 16 ++ src/lib/orderman/orders/Order.h | 6 + 10 files changed, 201 insertions(+), 227 deletions(-) diff --git a/src/lib/mercury/actors/Actor.h b/src/lib/mercury/actors/Actor.h index 2ca4e9416..61e67cec1 100644 --- a/src/lib/mercury/actors/Actor.h +++ b/src/lib/mercury/actors/Actor.h @@ -37,6 +37,10 @@ class Actor { // Implement if you need special cleanup at actor destruction time virtual void finit(){}; + // Implement this if you want to be called before/after an event is dispatched + virtual void before_event() {} + virtual void after_event() {} + // subscribe to events using a specific tag template SubHandle subscribe(typename EV::Tag const &tag, CB const &cb) { @@ -67,10 +71,12 @@ class Actor { tracepoint(bts_trace, trace_event, utils::type_name(typeid(*this)), utils::type_name(), _broker_id, sid.value(), 0); + before_event(); if (payload) cb(UpdateType{sid, type, &(payload->unwrap())}); else cb(UpdateType{sid, type, nullptr}); + after_event(); }; auto result = _subscribe(filter, handler); @@ -107,10 +113,12 @@ class Actor { tracepoint(bts_trace, trace_event, utils::type_name(typeid(*this)), utils::type_name(), _broker_id, sid.value(), 0); + before_event(); if (payload) cb(UpdateType{sid, type, &(payload->unwrap())}); else cb(UpdateType{sid, type, nullptr}); + after_event(); }; auto result = _subscribe(filter, handler); @@ -146,10 +154,12 @@ class Actor { tracepoint(bts_trace, trace_event, utils::type_name(typeid(*this)), utils::type_name(), _broker_id, sid.value(), 0); + before_event(); if (payload) cb(UpdateType{sid, type, &(payload->unwrap())}); else cb(UpdateType{sid, type, nullptr}); + after_event(); }; auto result = _subscribe(filter, handler); diff --git a/src/lib/orderman/actors/order_manager/ChildOrder.h b/src/lib/orderman/actors/order_manager/ChildOrder.h index a2520b9f0..c9d1e014a 100644 --- a/src/lib/orderman/actors/order_manager/ChildOrder.h +++ b/src/lib/orderman/actors/order_manager/ChildOrder.h @@ -10,26 +10,30 @@ namespace orderman { class ChildOrder { public: - ChildOrder() : _order(nullptr), _order_services(nullptr), _active(false) {} + ChildOrder() + : _order(nullptr), _parent_order_services(nullptr), _active(false) {} ChildOrder(Order &o, OrderServices &services) - : _order(&o), _order_services(&services), _active(false) {} + : _order(&o), _parent_order_services(&services), + _child_order_services(nullptr), _active(false) {} ChildOrder(ChildOrder &&src) { operator=(std::move(src)); } ChildOrder &operator=(ChildOrder &&src) { _order = src._order; - _order_services = src._order_services; + _parent_order_services = src._parent_order_services; + _child_order_services = src._child_order_services; _active = src._active; src._order = nullptr; - src._order_services = nullptr; + src._parent_order_services = nullptr; + src._child_order_services = nullptr; src._active = false; return *this; } OrderKey key() const { - bts_assert(_order); + bts_assert_d(_order); return _order->key(); } @@ -39,37 +43,34 @@ class ChildOrder { bts_assert(_order); bts_assert(!_active); - _order_services->send_activate(*_order, p, q, trace); + _child_order_services = + &_parent_order_services->activate_child(*_order, p, q, trace); _active = true; } - void update(Price p, Quantity q) { - PerfTrace trace; - update(p, q, trace); - } - - void update(Price p, Quantity q, PerfTrace &trace) { + void update(Price p, Quantity q, PerfTrace const &trace = PerfTrace()) { bts_assert(_order); bts_assert(_active); - _order_services->send_update(_order->key(), p, q, trace); + _child_order_services->update(p, q, trace); } void crack(PerfTrace const &trace = PerfTrace()) { bts_assert(_order); bts_assert(_active); - _order_services->send_crack(_order->key(), trace); + _child_order_services->crack(trace); } void cancel(PerfTrace const &trace = PerfTrace()) { bts_assert(_order); bts_assert(_active); - _order_services->send_cancel(_order->key(), trace); + _child_order_services->cancel(trace); } private: friend class OrderBuilder; Order *_order; - OrderServices *_order_services; + OrderServices *_parent_order_services; + OrderServices *_child_order_services; bool _active; }; diff --git a/src/lib/orderman/actors/order_manager/OrderManager.cpp b/src/lib/orderman/actors/order_manager/OrderManager.cpp index ff60eb58e..d58317078 100644 --- a/src/lib/orderman/actors/order_manager/OrderManager.cpp +++ b/src/lib/orderman/actors/order_manager/OrderManager.cpp @@ -30,29 +30,12 @@ enum class OrderManager::State { READY }; -struct OrderManager::OrderInfo { - OrderInfo(Order &o, OrderServicesData &data) - : order(&o), order_services(o, data) {} - - OrderInfo() = default; - OrderInfo(OrderInfo &&src) = default; - OrderInfo &operator=(OrderInfo &&src) = default; - - Order *order; - OrderServices order_services; -}; - struct OrderManager::PImpl { PImpl(OrderManager &owner, DynamicOrderRegistry const &b) - : state(State::WAIT_ADMIN), services_data(owner, b) { - pending_order_events.reserve(1000); - } + : state(State::WAIT_ADMIN), services_data(owner, b) {} State state; - std::unordered_map orders; - - std::vector pending_order_events; - + std::unordered_map orders; mercury::Actor::SubHandle stored_order_sub; mercury::Actor::SubHandle stored_fills_sub; OrderServicesData services_data; @@ -160,12 +143,13 @@ void OrderManager::on_order_recovery( for (auto const &ev : *(update.events)) { auto &order = me->services_data.order_factory.recover(ev.order_record); - auto const &ostate = ev.order_record.state(); - auto r = me->orders.emplace(order.key(), OrderInfo {order, me->services_data}); + order.init_order_services(me->services_data); + + auto r = me->orders.emplace(order.key(), &order); bts_assert(r.second); - auto &oi = r.first->second; + auto const &ostate = ev.order_record.state(); order.on_activate(Price(ostate.price()), - Quantity(ostate.quantity()), oi.order_services, + Quantity(ostate.quantity()), *order._services, PerfTrace()); } @@ -196,89 +180,73 @@ void OrderManager::on_execution_report( auto order = &me->services_data.order_factory.recreate_from_exe_report( *report.data); - auto r = me->orders.emplace(order->key(), OrderInfo {*order, me->services_data}); + order->init_order_services(me->services_data); + auto r = me->orders.emplace(order->key(), order); bts_assert(r.second); - auto &oi = r.first->second; order->on_activate(report.data->price, report.data->quantity, - oi.order_services, PerfTrace()); + *order->_services, PerfTrace()); } } } -void OrderManager::queue_order_event(PendingOrderEvent const &event_handler) { - me->pending_order_events.push_back(event_handler); -} - void OrderManager::on_activate_order( const mercury::Update &m) { if (m.events) - for (auto const &ev : *m.events) - queue_order_event(ev); -} - -void OrderManager::handle_order_event(ActivateOrderEvent const &ev) { - auto order = ev.order; - auto r = me->orders.emplace(order->key(), OrderInfo {*order, me->services_data}); - bts_assert(r.second); - auto &oi = r.first->second; - order->on_activate(ev.price, ev.quantity, oi.order_services, ev.trace); + for (auto const &ev : *m.events) { + auto order = ev.order; + order->init_order_services(me->services_data); + auto r = me->orders.emplace(order->key(), order); + bts_assert(r.second); + order->on_activate(ev.price, ev.quantity, *order->_services, ev.trace); + } } void OrderManager::on_update_order(const mercury::Update &m) { if (m.events) - for (auto const &ev : *m.events) - queue_order_event(ev); -} - -void OrderManager::handle_order_event(UpdateOrderEvent const &ev) { - auto k = ev.key(); - auto it = me->orders.find(k); - if (it != me->orders.end()) - it->second.order->on_update(ev.price, ev.quantity, ev.trace); - else { - LOG(OrderMan, Error, - "Received an update request for an unknown order {}. " - "This should not happen and likely indicates a serious bug. ", - ev.key().value()); - } + for (auto const &ev : *m.events) { + auto k = ev.key(); + auto it = me->orders.find(k); + if (it != me->orders.end()) + it->second->on_update(ev.price, ev.quantity, ev.trace); + else { + LOG(OrderMan, Error, + "Received an update request for an unknown order {}. " + "This should not happen and likely indicates a serious bug. ", + ev.key().value()); + } + } } void OrderManager::on_cancel_order(const mercury::Update &m) { if (m.events) - for (auto const &ev : *m.events) - queue_order_event(ev); -} - -void OrderManager::handle_order_event(CancelOrderEvent const &ev) { - auto k = ev.key(); - auto it = me->orders.find(k); - if (it != me->orders.end()) - it->second.order->on_cancel(ev.trace); - else { - LOG(OrderMan, Error, - "Received a cancel request for an unknown order {}. " - "This should not happen and likely indicates a serious bug. ", - ev.key().value()); - } + for (auto const &ev : *m.events) { + auto k = ev.key(); + auto it = me->orders.find(k); + if (it != me->orders.end()) + it->second->on_cancel(ev.trace); + else { + LOG(OrderMan, Error, + "Received a cancel request for an unknown order {}. " + "This should not happen and likely indicates a serious bug. ", + ev.key().value()); + } + } } void OrderManager::on_crack_order(const mercury::Update &m) { if (m.events) - for (auto const &ev : *m.events) - queue_order_event(ev); -} - -void OrderManager::handle_order_event(CrackOrderEvent const &ev) { - auto k = ev.key(); - auto it = me->orders.find(k); - if (it != me->orders.end()) - it->second.order->on_crack(ev.trace); - else { - LOG(OrderMan, Error, - "Received a crack request for an unknown order {}. " - "This should not happen and likely indicates a serious bug. ", - ev.key().value()); - } + for (auto const &ev : *m.events) { + auto k = ev.key(); + auto it = me->orders.find(k); + if (it != me->orders.end()) + it->second->on_crack(ev.trace); + else { + LOG(OrderMan, Error, + "Received a crack request for an unknown order {}. " + "This should not happen and likely indicates a serious bug. ", + ev.key().value()); + } + } } void OrderManager::on_gateway_state( @@ -290,6 +258,16 @@ void OrderManager::on_gateway_state( } } +OrderServices &OrderManager::activate_child(OrderServices &parent, Order &order, + Price p, Quantity q, + PerfTrace const &trace) { + order.init_order_services(me->services_data, parent); + auto r = me->orders.emplace(order.key(), &order); + bts_assert(r.second); + order.on_activate(p, q, *order._services, trace); + return *order._services; +} + void OrderManager::on_new_fix_buffer( const mercury::Update &m) { if (m.events) @@ -405,9 +383,6 @@ void OrderManager::init_order_services() { make_stream(); me->pub_ready = make_stream(); - me->services_data.child_order_subs = - std::make_unique>( - *this); // md subs are peculiar in that we try to make them on demand, so // we publish an event announcing the subscription std::function on_md_sub = [this](SecurityKey k) { @@ -427,11 +402,8 @@ void OrderManager::init_order_services() { std::make_unique>(*this); } -void OrderManager::on_poll() { +void OrderManager::after_event() { if (me->state == State::READY) { - for (size_t i = 0; i < me->pending_order_events.size(); i++) - me->pending_order_events[i](*this); - me->pending_order_events.clear(); for (auto &osd : me->services_data.sessions) { auto &fix_stream = osd->current_buffer->first_stream(); if (fix_stream.n_msgs()) { diff --git a/src/lib/orderman/actors/order_manager/OrderManager.h b/src/lib/orderman/actors/order_manager/OrderManager.h index 3b6d403a9..6b7977787 100644 --- a/src/lib/orderman/actors/order_manager/OrderManager.h +++ b/src/lib/orderman/actors/order_manager/OrderManager.h @@ -3,12 +3,11 @@ #include "lib/config/protos/jetfix.pb.h" #include "lib/jetfix/common/OutFIXPtr.h" #include "lib/mercury/actors/Actor.h" -#include "lib/mercury/actors/IPollableActor.h" -#include "lib/utils/inplace_function.h" #include "lib/orderman/events/ActivateOrderEvent.h" -#include "lib/orderman/events/UpdateOrderEvent.h" #include "lib/orderman/events/CancelOrderEvent.h" #include "lib/orderman/events/CrackOrderEvent.h" +#include "lib/orderman/events/UpdateOrderEvent.h" +#include "lib/utils/inplace_function.h" #include @@ -26,13 +25,14 @@ class CancelOrderEvent; class CrackOrderEvent; class StoredOrderEvent; class StoredFillEvent; +class OrderServices; class CreateFIXBufferReplyEvent; class GatewayStatusChangeEvent; class NewAdminDataEvent; struct SessionServicesData; class DynamicOrderRegistry; -} -} +} // namespace orderman +} // namespace bts namespace bts { namespace orderman { @@ -50,7 +50,7 @@ namespace orderman { // - timer updates // - order state changes // - order update/cancel/crack events -// +// // // Additionally handles order maintenance events: // - create @@ -58,16 +58,16 @@ namespace orderman { // - crack // - update -class OrderManager : public mercury::Actor, - public mercury::IPollableActor -{ +class OrderManager : public mercury::Actor { public: - OrderManager(DynamicOrderRegistry const&dyn_order_builder); + OrderManager(DynamicOrderRegistry const &dyn_order_builder); ~OrderManager(); void init() override; private: friend class OrderServices; + + // external events void on_securities(const mercury::Update &); void on_fill_recovery(const mercury::Update &); void on_order_recovery(const mercury::Update &); @@ -80,34 +80,21 @@ class OrderManager : public mercury::Actor, void on_gateway_state(const mercury::Update &); void on_timer(const mercury::Update &); void on_admin_data(const mercury::Update &); + // end external events void init_order_services(); - void on_poll() override; - - using PendingOrderEvent = stdext::inplace_function< - void(OrderManager &), - std::max({128ul, sizeof(ActivateOrderEvent), sizeof(UpdateOrderEvent), - sizeof(CancelOrderEvent), sizeof(CrackOrderEvent)})>; - - template - void queue_order_event(EV const&ev) { - queue_order_event(PendingOrderEvent( [ev] (auto &om) { - om.handle_order_event(ev); - })); - } - void queue_order_event(PendingOrderEvent const&ev); - void handle_order_event(ActivateOrderEvent const &); - void handle_order_event(UpdateOrderEvent const &); - void handle_order_event(CancelOrderEvent const &); - void handle_order_event(CrackOrderEvent const&); void reload_fix_buffer(SessionServicesData &dt); - - std::vector &free_buffers(std::string const&); + + void after_event() override; + OrderServices &activate_child(OrderServices &parent, Order &, Price, + Quantity, PerfTrace const &); + + std::vector &free_buffers(std::string const &); enum class State; struct OrderInfo; struct PImpl; std::unique_ptr me; }; -} -} +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/actors/order_manager/OrderServices.h b/src/lib/orderman/actors/order_manager/OrderServices.h index 797419985..f2ac59b02 100644 --- a/src/lib/orderman/actors/order_manager/OrderServices.h +++ b/src/lib/orderman/actors/order_manager/OrderServices.h @@ -18,23 +18,17 @@ namespace orderman { class SessionServices { public: - SessionServices(SessionServices &&ss) - { - operator=(std::move(ss)); - } + SessionServices(SessionServices &&ss) { operator=(std::move(ss)); } + + SessionServices(SessionServices const &ss) { operator=(ss); } - SessionServices(SessionServices const &ss) - { - operator=(ss); - } - SessionServices(SessionServicesData &session_data) : _exe_reports(*session_data.exe_report_subs), _cancel_rejects(*session_data.cancel_reject_subs), _gateway_status(*session_data.gateway_status_subs), _session_data(&session_data), _gateway_status_sub() {} - SessionServices& operator=(SessionServices&&src) { + SessionServices &operator=(SessionServices &&src) { _exe_reports = std::move(src._exe_reports); _cancel_rejects = std::move(src._cancel_rejects); _gateway_status = std::move(src._gateway_status); @@ -43,8 +37,8 @@ class SessionServices { _gateway_status_sub = src._gateway_status_sub; return *this; } - - SessionServices& operator=(SessionServices const&src) { + + SessionServices &operator=(SessionServices const &src) { _exe_reports = src._exe_reports; _cancel_rejects = src._cancel_rejects; _gateway_status = src._gateway_status; @@ -52,7 +46,7 @@ class SessionServices { _gateway_status_sub = src._gateway_status_sub; return *this; } - + std::string const &session_name() const { return _session_data->session; } config::JetFIX::Connection const &session_cfg() const { @@ -107,35 +101,25 @@ class SessionServices { class OrderServices { public: - OrderServices(OrderServices &&src) { operator=(std::move(src)); } + OrderServices(Order &owner) + : _busy(false), _pending_calls(), _owner(&owner), _data(), + _parent(nullptr), _child_update_cb([](auto const &) {}), + _book_updates(), _settlement_updates(), _time_change(), _sessions(), + _create_order_reply() {} - OrderServices(Order &owner, OrderServicesData &data) - : _busy(false), _pending_calls(), _owner(&owner), _data(&data), - _child_updates(*data.child_order_subs), _book_updates(*data.md_subs), - _settlement_updates(*data.settlement_subs), - _time_change(*data.time_subs), _sessions(), _child_updates_sub(), - _time_change_sub(), _create_order_reply(*data.order_creation_subs) { - - for (auto &sd : data.sessions) - _sessions.emplace_back(*sd); + void init(OrderServicesData &data, OrderServices &parent) { + _parent = &parent; + init(data); } - OrderServices &operator=(OrderServices &&src) { - _busy = src._busy; - _pending_calls = src._pending_calls; - _owner = src._owner; - _data = src._data; - src._data = nullptr; - _child_updates = std::move(src._child_updates); - _book_updates = std::move(src._book_updates); - _settlement_updates = std::move(src._settlement_updates); - _time_change = std::move(src._time_change); - _sessions = src._sessions; - _child_updates_sub = src._child_updates_sub; - _time_change_sub = src._time_change_sub; - _create_order_reply = std::move(src._create_order_reply); - - return *this; + void init(OrderServicesData &data) { + _data = &data; + _book_updates.init(*data.md_subs); + _settlement_updates.init(*data.settlement_subs); + _time_change.init(*data.time_subs); + for (auto &sd : data.sessions) + _sessions.emplace_back(*sd); + _create_order_reply.init(*data.order_creation_subs); } securities::ISecurityDB &sec_db() { return _data->sec_db; } @@ -147,19 +131,25 @@ class OrderServices { void report_state(const api::orderman::OrderState &state, PerfTrace const &trace = PerfTrace()) { - _data->owner.publish(_data->report_order_state_pub, _owner->key(), - _owner->parent_key(), _owner->definition(), state, - trace); - if (orderman::in_terminal_state(state.status())) { - LOG(OrderMan, Info, - "Order {} transitioned to a terminal state. Canceling all " - "subscriptions", - _owner->key().value()); - _book_updates.unsub_all(); - _child_updates.unsub_all(); - _time_change.unsub_all(); - _settlement_updates.unsub_all(); - } + OrderStateUpdateEvent ev(_owner->key(), _owner->parent_key(), + _owner->definition(), state, trace); + + on_inter_order_call([ev](OrderServices &self) { + self._data->owner.publish(self._data->report_order_state_pub, ev); + if (orderman::in_terminal_state(ev.status)) { + LOG(OrderMan, Info, + "Order {} transitioned to a terminal state. Canceling all " + "subscriptions", + self._owner->key().value()); + self.unsubscribe_from_child_updates(); + self._book_updates.unsub_all(); + self._settlement_updates.unsub_all(); + self._time_change.unsub_all(); + self._create_order_reply.unsub_all(); + } + if (self._parent) + self._parent->_child_update_cb(ev); + }); } Limiter &limiter() { return _data->limiter; } @@ -193,11 +183,10 @@ class OrderServices { void unsubscribe_from_time() { _time_change.unsub(_time_change_sub); } template void subscribe_to_child_updates(CB &&cb) { - _child_updates_sub = - _child_updates.sub(_owner->key(), std::forward(cb)); + _child_update_cb = cb; } void unsubscribe_from_child_updates() { - _child_updates.unsub(_child_updates_sub); + _child_update_cb = [](auto const &) {}; } // End Subscriptions ------------------------------ @@ -241,44 +230,35 @@ class OrderServices { friend class ChildOrder; - template void queue_order_op(const OP &op) { - _data->owner.queue_order_event(op); + OrderServices &activate_child(Order &o, Price p, Quantity q, + PerfTrace const &trace) { + return _data->owner.activate_child(*this, o, p, q, trace); } - void send_activate(Order &o, Price p, Quantity q, PerfTrace const &trace) { - queue_order_op(ActivateOrderEvent{o, p, q, trace}); + void update(Price p, Quantity q, PerfTrace const &trace) { + on_inter_order_call([p, q, trace](OrderServices &self) { + self._owner->on_update(p, q, trace); + }); } - void send_activate(Order &o, Price p, Quantity q) { - queue_order_op(ActivateOrderEvent{o, p, q, PerfTrace()}); + void crack(PerfTrace const &trace) { + on_inter_order_call( + [trace](OrderServices &self) { self._owner->on_crack(trace); }); } - void send_update(OrderKey k, Price p, Quantity q, PerfTrace const &trace) { - queue_order_op(UpdateOrderEvent{k, p, q, trace}); - } - void send_update(OrderKey k, Price p, Quantity q) { - queue_order_op(UpdateOrderEvent{k, p, q, PerfTrace()}); - } - void send_crack(OrderKey k, PerfTrace const &trace) { - queue_order_op(CrackOrderEvent{k, trace}); - } - void send_crack(OrderKey k) { - queue_order_op(CrackOrderEvent{k, PerfTrace()}); - } - void send_cancel(OrderKey k, PerfTrace const &trace) { - queue_order_op(CancelOrderEvent{k, trace}); - } - void send_cancel(OrderKey k) { - queue_order_op(CancelOrderEvent{k, PerfTrace()}); + void cancel(PerfTrace const &trace) { + on_inter_order_call( + [trace](OrderServices &self) { self._owner->on_cancel(trace); }); } bool _busy; - boost::container::small_vector,10> _pending_calls; + boost::container::small_vector, 10> + _pending_calls; Order *_owner; OrderServicesData *_data; - EventStream _child_updates; + OrderServices *_parent; + std::function _child_update_cb; EventStream _book_updates; EventStream _settlement_updates; EventStream _time_change; - boost::container::small_vector _sessions; - EventStream::SubID _child_updates_sub; + boost::container::small_vector _sessions; EventStream::SubID _time_change_sub; EventStream _create_order_reply; }; diff --git a/src/lib/orderman/actors/order_manager/OrderServicesData.h b/src/lib/orderman/actors/order_manager/OrderServicesData.h index 70ecd12e6..13a4d36b8 100644 --- a/src/lib/orderman/actors/order_manager/OrderServicesData.h +++ b/src/lib/orderman/actors/order_manager/OrderServicesData.h @@ -83,10 +83,6 @@ public: std::unique_ptr> md_subs; std::unique_ptr> settlement_subs; - std::unique_ptr< - mercury::ContentSubscription> - child_order_subs; - std::unique_ptr< mercury::ContentSubscription> time_subs; diff --git a/src/lib/orderman/orderman_utils/EventStream.h b/src/lib/orderman/orderman_utils/EventStream.h index 22e971a60..481c9791c 100644 --- a/src/lib/orderman/orderman_utils/EventStream.h +++ b/src/lib/orderman/orderman_utils/EventStream.h @@ -16,6 +16,12 @@ struct EventStream EventStream () : cs (nullptr) {} EventStream (CS&cs) : cs (&cs) {} + void init(CS&csub) + { + bts_assert(!cs); + cs = ⫏ + } + template SubID sub(typename CS::Key k, CB&&cb) { auto s = cs->sub(k,std::forward (cb)); diff --git a/src/lib/orderman/orders/IcebergOrder.cpp b/src/lib/orderman/orders/IcebergOrder.cpp index dc82c7b52..4c26b07f9 100644 --- a/src/lib/orderman/orders/IcebergOrder.cpp +++ b/src/lib/orderman/orders/IcebergOrder.cpp @@ -255,7 +255,7 @@ void IcebergOrder::send_next_child_order() { key().value(), me->child.order.key().value(), to_send, me->state.price(), me->state.filled_quantity(), me->state.quantity()); - me->child.order.activate(Price(me->state.price()), Quantity(to_send)); + me->child.order.activate(Price(me->state.price()), Quantity(to_send), PerfTrace()); } void IcebergOrder::on_child_order_update(OrderStateUpdateEvent const &ev) { diff --git a/src/lib/orderman/orders/Order.cpp b/src/lib/orderman/orders/Order.cpp index 97c394c63..a25ba3779 100644 --- a/src/lib/orderman/orders/Order.cpp +++ b/src/lib/orderman/orders/Order.cpp @@ -1,8 +1,24 @@ #include "Order.h" +#include "lib/orderman/actors/order_manager/OrderServices.h" namespace bts { namespace orderman { +Order::Order() +{ + _services = std::make_unique(*this); +} + +void Order::init_order_services(OrderServicesData &osd) +{ + _services->init(osd); +} + +void Order::init_order_services(OrderServicesData &osd,OrderServices &parent) +{ + _services->init(osd,parent); +} + Order::~Order() {} } // namespace orderman diff --git a/src/lib/orderman/orders/Order.h b/src/lib/orderman/orders/Order.h index ee56707d1..4a4606e22 100644 --- a/src/lib/orderman/orders/Order.h +++ b/src/lib/orderman/orders/Order.h @@ -10,6 +10,7 @@ class ISecurityDB; } namespace orderman { class IOrderFactory; +class OrderServicesData; } namespace api { namespace orderman { @@ -29,6 +30,7 @@ class OrderServices; class Order { public: + Order(); virtual ~Order(); OrderKey key() const { return _key; } @@ -53,7 +55,11 @@ class Order { private: OrderKey _key; OrderKey _parent_key; + std::unique_ptr _services; + void init_order_services(OrderServicesData &); + void init_order_services(OrderServicesData &,OrderServices &parent); friend class OrderFactory; + friend class OrderManager; }; } } From c6b494db16be16eac57460e4ed84cbb7c6135576 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Thu, 29 Nov 2018 16:34:33 -0500 Subject: [PATCH 010/107] Move AuthToken type to apicore --- src/client/spark/view/Shell/Login/LoginModel.cs | 1 + src/client/spark_api/md/Authenticator.cs | 6 +++--- src/client/spark_api/md/MarketDataClient.cs | 8 ++++---- src/lib/api/apicore.proto | 5 +++++ src/lib/api/services/AuthService.proto | 13 +++++-------- src/lib/utils/AuthToken.cpp | 17 ++++++++++------- src/lib/utils/AuthToken.h | 4 ++-- 7 files changed, 30 insertions(+), 24 deletions(-) diff --git a/src/client/spark/view/Shell/Login/LoginModel.cs b/src/client/spark/view/Shell/Login/LoginModel.cs index 21c29733e..3df06a379 100644 --- a/src/client/spark/view/Shell/Login/LoginModel.cs +++ b/src/client/spark/view/Shell/Login/LoginModel.cs @@ -13,6 +13,7 @@ using mbts.config; using mbts.ui.native; using mbts.utils; using bts.co2; +using bts.api; using bts.api.user; using bts.api.persistence; using bts; diff --git a/src/client/spark_api/md/Authenticator.cs b/src/client/spark_api/md/Authenticator.cs index 26798e94c..001defa86 100644 --- a/src/client/spark_api/md/Authenticator.cs +++ b/src/client/spark_api/md/Authenticator.cs @@ -8,11 +8,11 @@ namespace bts.api public class Authenticator { readonly static Lazy _auth = new Lazy(() => Locator.locate(), true); - user.AuthToken _token = null; + AuthToken _token = null; public Authenticator() { } - public user.AuthToken last_token => _token; - public async Task login(string login, string password) + public AuthToken last_token => _token; + public async Task login(string login, string password) { var res = await _auth.Value.authenticate_login_async(new user.AuthenticateLoginRequest { Login = login, Password = password }); if (res.success) diff --git a/src/client/spark_api/md/MarketDataClient.cs b/src/client/spark_api/md/MarketDataClient.cs index 9f06f6aeb..2512c2b72 100644 --- a/src/client/spark_api/md/MarketDataClient.cs +++ b/src/client/spark_api/md/MarketDataClient.cs @@ -45,7 +45,7 @@ namespace bts.api.md } public static IEnumerable cached_exchanges => _venue_cache.Keys; - public static bool create_or_get(api.Venue exchange, out MarketDataClient md, user.AuthToken token = null) + public static bool create_or_get(api.Venue exchange, out MarketDataClient md, AuthToken token = null) { if (!_venue_cache.TryGetValue(exchange, out md)) { @@ -55,18 +55,18 @@ namespace bts.api.md return false; } - public MarketDataClient(bts.api.Venue exchange = Venue.Unset, user.AuthToken token = null) + public MarketDataClient(bts.api.Venue exchange = Venue.Unset, AuthToken token = null) { _venue = exchange; _subscription = load_request(exchange, token); } - public void set_auth_token(user.AuthToken toke) + public void set_auth_token(AuthToken toke) { _subscription.Token = toke?.Token ?? string.Empty; } - MDRequest load_request(bts.api.Venue exchange, user.AuthToken token) + MDRequest load_request(bts.api.Venue exchange, AuthToken token) { var req = new MDRequest() { Token = token?.Token ?? string.Empty } ; var prods = _all_products.Where(x=>x.Exchange == exchange || exchange == bts.api.Venue.Unset); diff --git a/src/lib/api/apicore.proto b/src/lib/api/apicore.proto index 8c156ab18..b694f0f10 100644 --- a/src/lib/api/apicore.proto +++ b/src/lib/api/apicore.proto @@ -12,9 +12,14 @@ message PingPong { // RequestHeader // T Request +message AuthToken { + string token = 1; +} + message RequestHeader { int32 request_id = 1; int32 method = 2; + AuthToken token = 3; } enum ApiError { diff --git a/src/lib/api/services/AuthService.proto b/src/lib/api/services/AuthService.proto index 2b5c38e36..174ef7dff 100644 --- a/src/lib/api/services/AuthService.proto +++ b/src/lib/api/services/AuthService.proto @@ -1,6 +1,7 @@ syntax="proto3"; package bts.api.user; option csharp_namespace="bts.api.user"; +import "lib/api/apicore.proto"; import "lib/api/apioptions.proto"; message OperatorID { string tag50 = 10; } @@ -25,10 +26,6 @@ message User { repeated Entitlement entitlements = 200; } -message AuthToken { - string token = 1; -} - message TokenPayload { uint32 date = 1; uint32 id = 2; @@ -37,19 +34,19 @@ message TokenPayload { message GetUsersRequest {} message GetUsersResponse { repeated User users = 1; string error = 2; } -message AddOrUpdateUserRequest {AuthToken token = 1; User user = 2;} -message RemoveUserRequest {AuthToken token = 1; string login = 2;} +message AddOrUpdateUserRequest { api.AuthToken token = 1; User user = 2;} +message RemoveUserRequest {api.AuthToken token = 1; string login = 2;} message UserOperationResponse { bool is_valid = 1; string reason = 2;} message AuthenticateLoginRequest {string login = 1; string password = 2;} message AuthenticateLoginResponse { bool is_valid = 1; string reason = 2; - AuthToken token = 3; + api.AuthToken token = 3; uint32 user_id = 4; bool can_create = 5; } -message AuthenticateTokenRequest {AuthToken token = 1;} +message AuthenticateTokenRequest {api.AuthToken token = 1;} message AuthenticateTokenResponse {bool is_valid = 1; string reason = 2; User user = 3;} service AuthService { diff --git a/src/lib/utils/AuthToken.cpp b/src/lib/utils/AuthToken.cpp index 671e604de..69537bfca 100644 --- a/src/lib/utils/AuthToken.cpp +++ b/src/lib/utils/AuthToken.cpp @@ -1,5 +1,6 @@ #include "AuthToken.h" #include "lib/utils/base64.hpp" +#include "lib/utils/bts_assert.h" #include "datetime.h" #include "base64.hpp" @@ -9,30 +10,32 @@ namespace auth { #ifndef _WIN32 -user::AuthToken generate_token(const admin::BTSUser& user) { +AuthToken generate_token(const admin::BTSUser& user) { api::user::TokenPayload payload; payload.set_date(datetime::ll_now()); payload.set_id(user.id()); - if(user.name() == "bts") + if(user.name() == "bts") { payload.set_wheel(true); + } auto token = websocketpp::base64_encode(payload.SerializeAsString()); - user::AuthToken result; + bts_assert_d(token.size() < 255-8); + AuthToken result; result.set_token(token); return result; } -user::AuthToken generate_wheel_token() { +AuthToken generate_wheel_token() { api::user::TokenPayload payload; payload.set_date(datetime::ll_now()); payload.set_id(99999); payload.set_wheel(true); auto token = websocketpp::base64_encode(payload.SerializeAsString()); - user::AuthToken result; + AuthToken result; result.set_token(token); return result; } #else -user::AuthToken generate_wheel_token() { - return user::AuthToken(); +AuthToken generate_wheel_token() { + return AuthToken(); } #endif diff --git a/src/lib/utils/AuthToken.h b/src/lib/utils/AuthToken.h index fe0569073..d9043939a 100644 --- a/src/lib/utils/AuthToken.h +++ b/src/lib/utils/AuthToken.h @@ -7,8 +7,8 @@ namespace bts { namespace api { namespace auth { -user::AuthToken generate_token(const admin::BTSUser&); -user::AuthToken generate_wheel_token(); +AuthToken generate_token(const admin::BTSUser&); +AuthToken generate_wheel_token(); bool decode_token(const std::string& token, user::TokenPayload* payload); }}} From d3043e9a199dc2cc850656eac96d29d2e0d9fd2a Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Thu, 29 Nov 2018 23:35:34 +0000 Subject: [PATCH 011/107] Internalized ExecutionGateway inside OrderManager. --- src/lib/orderman/actors/ExecutionGateway.cpp | 75 ++++++++----------- src/lib/orderman/actors/ExecutionGateway.h | 55 ++++++++------ src/lib/orderman/actors/ServiceBridge.h | 4 +- .../actors/order_manager/OrderManager.cpp | 55 ++++++++++---- .../actors/order_manager/OrderManager.h | 9 ++- .../actors/order_manager/OrderServices.h | 4 +- .../order_manager/OrderServicesData.cpp | 6 +- .../actors/order_manager/OrderServicesData.h | 44 +++++------ src/lib/orderman/events/OutFIXMsgEvent.h | 32 -------- .../orderman/server/OrderServiceServer.cpp | 19 ++--- 10 files changed, 143 insertions(+), 160 deletions(-) delete mode 100644 src/lib/orderman/events/OutFIXMsgEvent.h diff --git a/src/lib/orderman/actors/ExecutionGateway.cpp b/src/lib/orderman/actors/ExecutionGateway.cpp index fbc4c53f0..28c59e426 100644 --- a/src/lib/orderman/actors/ExecutionGateway.cpp +++ b/src/lib/orderman/actors/ExecutionGateway.cpp @@ -26,8 +26,7 @@ using JFGw = struct ExecutionGateway::PImpl { PImpl(config::JetFIX::Connection const &cfg, PerfTraceLog &log) : gw(cfg, log), exe_report_pool(), state(State::WAITING_FOR_SECURITIES), - securities(), securities_by_descriptor(), exe_report_stream(), - gw_status_change_stream(), cancel_reject_stream(), gw_name(cfg.name()), + securities(), securities_by_descriptor(), gw_name(cfg.name()), cfg(cfg) {} JFGw gw; @@ -36,25 +35,19 @@ struct ExecutionGateway::PImpl { std::unordered_map securities; std::unordered_map securities_by_descriptor; - mercury::Stream exe_report_stream; - mercury::Stream gw_status_change_stream; - mercury::Stream cancel_reject_stream; GatewayName gw_name; config::JetFIX::Connection cfg; + OnExeReport on_exe_report; + OnGwStatusChange on_gw_status_change; + OnCancelReject on_cancel_reject; }; ExecutionGateway::ExecutionGateway(config::JetFIX::Connection const &cfg, PerfTraceLog &log) - : me(new PImpl(cfg, log)) {} -ExecutionGateway::~ExecutionGateway() {} - -void ExecutionGateway::init() { + : me(new PImpl(cfg, log)) { me->state = State::WAITING_FOR_SECURITIES; - subscribe( - [this](auto const &sec_update) { this->on_securities(sec_update); }); - subscribe( - me->gw_name, [this](auto const &fix) { this->on_outgoing_fix(fix); }); } +ExecutionGateway::~ExecutionGateway() {} void ExecutionGateway::on_securities( const mercury::Update &update) { @@ -96,24 +89,22 @@ void ExecutionGateway::on_securities( me->gw.on() = [this](auto const &m) { this->on_session_reject(m); }; - - // stream of execution reports - me->exe_report_stream = - make_stream(me->gw_name); - - // stream for gateway status - me->gw_status_change_stream = - make_stream(me->gw_name); - - // stream for cancel rejects - me->cancel_reject_stream = make_stream(me->gw_name); - - // start the gateway - me->gw.start(); } } } +void ExecutionGateway::start() { me->gw.start(); } + +OnExeReport &ExecutionGateway::on_exe_report() { return me->on_exe_report; } + +OnGwStatusChange &ExecutionGateway::on_gw_status_change() { + return me->on_gw_status_change; +} + +OnCancelReject &ExecutionGateway::on_cancel_reject() { + return me->on_cancel_reject; +} + void ExecutionGateway::on_exe_report( const jetfix::fix::ExecutionReportMsg &msg) { auto start = Timer::now(); @@ -260,7 +251,7 @@ void ExecutionGateway::on_exe_report( data->msg = text_msg; auto trace = msg.trace(); trace.exe_gw = utils::TimeStamp::now(); - publish(me->exe_report_stream, data, trace); + me->on_exe_report(*data, trace); LOG(Latency, Info, "Finished handling of execution report for order {}. {}ns", ok.value(), ns_diff(Timer::now(), start)); @@ -279,7 +270,7 @@ void ExecutionGateway::on_cancel_reject( else if (msg.has()) reject_msg = fmt::format("Order cancel was rejected with error code {}", msg.get()); - publish(me->cancel_reject_stream, ok, reject_msg); + me->on_cancel_reject(ok, reject_msg); } void ExecutionGateway::on_connection_status_change(bool is_connected) { @@ -287,8 +278,7 @@ void ExecutionGateway::on_connection_status_change(bool is_connected) { me->gw_name.value(), is_connected ? std::string("connected") : std::string("disconnected")); - publish(me->gw_status_change_stream, - GatewayStatusChangeEvent(me->gw_name, is_connected)); + me->on_gw_status_change(is_connected); } void ExecutionGateway::on_business_reject( @@ -308,21 +298,16 @@ void ExecutionGateway::on_session_reject(jetfix::fix::RejectMsg const &m) { m.has() ? m.get() : std::string("Unknown")); } -void ExecutionGateway::on_poll() { me->gw.dispatch_events(); } +void ExecutionGateway::dispatch_incoming_fix_messages() { + me->gw.dispatch_events(); +} -void ExecutionGateway::on_outgoing_fix( - mercury::Update const &msg) { - if (msg.events) - for (auto const &ev : *(msg.events)) { - LOG(Latency, Info, "on_outgoing_fix sn: {} ok: {}", ev.trace.md_sn, - ev.trace.order_key); - tracepoint(bts_trace, trace_order, (char *)"on_outgoing_fix", 0, - ev.trace.md_sn, 0); - auto trace = ev.trace; - trace.exe_gw = utils::TimeStamp::now(); - me->gw.send(trace, ev.msg); - me->gw.dispatch_events(); - } +void ExecutionGateway::send_fix(jetfix::OutFIXPtr const &fix, + PerfTrace &trace) { + LOG(Latency, Info, "on_outgoing_fix sn: {} ok: {}", trace.md_sn, trace.order_key); + trace.exe_gw = utils::TimeStamp::now(); + me->gw.send(trace,fix); + me->gw.dispatch_events(); } } // namespace orderman diff --git a/src/lib/orderman/actors/ExecutionGateway.h b/src/lib/orderman/actors/ExecutionGateway.h index 001773fac..0e028105b 100644 --- a/src/lib/orderman/actors/ExecutionGateway.h +++ b/src/lib/orderman/actors/ExecutionGateway.h @@ -1,44 +1,51 @@ #pragma once -#include #include "lib/config/protos/jetfix.pb.h" -#include "lib/mercury/actors/Actor.h" #include "lib/jetfix/codec/MessageDefinitions.h" +#include "lib/jetfix/common/OutFIXPtr.h" #include "lib/mercury/events/Update.h" -#include "lib/orderman/events/OutFIXMsgEvent.h" -#include "lib/mercury/actors/IPollableActor.h" -#include "lib/mercury/actors/PingPong.h" +#include "lib/orderman/orderman_utils/orderman_common.h" + +#include namespace bts { class PerfTraceLog; -namespace mercury { class PollEvent;} namespace orderman { class NewSecuritiesEvent; +class ExecutionReport; + +using OnExeReport = + std::function; +using OnGwStatusChange = std::function; +using OnCancelReject = std::function; // fix execution gateway for a single FIX session -class ExecutionGateway : public mercury::Actor, - public mercury::IPollableActor -{ -public: - ExecutionGateway(config::JetFIX::Connection const&, PerfTraceLog& ); +class ExecutionGateway { + public: + ExecutionGateway(config::JetFIX::Connection const &, PerfTraceLog &); ~ExecutionGateway(); - void init() override; -private: - enum class State {WAITING_FOR_SECURITIES,READY}; + void start(); + void dispatch_incoming_fix_messages(); + void on_securities(const mercury::Update &); + void send_fix(jetfix::OutFIXPtr const &fix, PerfTrace &trace); + + OnExeReport& on_exe_report(); + OnGwStatusChange& on_gw_status_change(); + OnCancelReject &on_cancel_reject(); + + private: + enum class State { WAITING_FOR_SECURITIES, READY }; struct PImpl; std::unique_ptr me; - void on_poll() override; - - void on_securities(const mercury::Update &); - void on_exe_report(jetfix::fix::ExecutionReportMsg const&); - void on_cancel_reject(jetfix::fix::CancelRejectMsg const&); + // fix gateway events + void on_exe_report(jetfix::fix::ExecutionReportMsg const &); + void on_cancel_reject(jetfix::fix::CancelRejectMsg const &); void on_connection_status_change(bool connected); - void on_business_reject(jetfix::fix::BusinessMessageRejectMsg const&); - void on_session_reject(jetfix::fix::RejectMsg const&); - void on_outgoing_fix(const mercury::Update &); + void on_business_reject(jetfix::fix::BusinessMessageRejectMsg const &); + void on_session_reject(jetfix::fix::RejectMsg const &); }; -}} - +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/actors/ServiceBridge.h b/src/lib/orderman/actors/ServiceBridge.h index 440b6e0fd..f78f0a6c6 100644 --- a/src/lib/orderman/actors/ServiceBridge.h +++ b/src/lib/orderman/actors/ServiceBridge.h @@ -49,7 +49,9 @@ class ServiceBridge : public mercury::Actor { std::function const &)>; ServiceBridge(OnReady const &, OnOrders const &, OnFills const &, - DynamicOrderRegistry const &, mercury::BrokerProxy &service_call_marshaller); + DynamicOrderRegistry const &, + + mercury::BrokerProxy &service_call_marshaller); void init() override; ~ServiceBridge(); diff --git a/src/lib/orderman/actors/order_manager/OrderManager.cpp b/src/lib/orderman/actors/order_manager/OrderManager.cpp index d58317078..2d0dacddb 100644 --- a/src/lib/orderman/actors/order_manager/OrderManager.cpp +++ b/src/lib/orderman/actors/order_manager/OrderManager.cpp @@ -31,8 +31,8 @@ enum class OrderManager::State { }; struct OrderManager::PImpl { - PImpl(OrderManager &owner, DynamicOrderRegistry const &b) - : state(State::WAIT_ADMIN), services_data(owner, b) {} + PImpl(OrderManager &owner, DynamicOrderRegistry const &b, PerfTraceLog &l) + : state(State::WAIT_ADMIN), services_data(owner, b, l) {} State state; std::unordered_map orders; @@ -42,8 +42,8 @@ struct OrderManager::PImpl { mercury::Stream pub_ready; }; -OrderManager::OrderManager(DynamicOrderRegistry const &b) - : me(new PImpl(*this, b)) {} +OrderManager::OrderManager(DynamicOrderRegistry const &b, PerfTraceLog &l) + : me(new PImpl(*this, b, l)) {} OrderManager::~OrderManager() {} void OrderManager::init() { @@ -73,6 +73,11 @@ void OrderManager::on_admin_data(const mercury::Update &m) { void OrderManager::on_securities( const mercury::Update &update) { + + // forward to execution gateways + for (auto &osd : me->services_data.sessions) + osd->gw.on_securities(update); + if (update.events) { // update our security db and accumulate for the sake of the limiter @@ -348,8 +353,24 @@ void OrderManager::init_order_services() { s->gateway_status_subs = std::make_unique< ContentSubscription>(*this, gw_name); - // FIX output - s->out_fix_pub = make_stream(gw_name); + // publishers for execution reports, gateway status and cancel + // reject evets + auto s_ptr = s.get(); + s->exe_report_pub = make_stream(gw_name); + s->gw.on_exe_report() = [s_ptr,this] (auto const &er, auto const &t) { + publish(s_ptr->exe_report_pub, &er,t); + }; + s->gw_status_change_pub = make_stream(gw_name); + s->gw.on_gw_status_change() = [s_ptr,this,gw_name] (bool b) { + publish(s_ptr->gw_status_change_pub, gw_name,b); + }; + s->cancel_reject_pub = make_stream(gw_name); + s->gw.on_cancel_reject() = [s_ptr,this] (auto const &k,auto const&msg) { + publish(s_ptr->cancel_reject_pub, k,msg); + }; + // handlers are ready so we can start processing fix events + s->gw.start(); + reload_fix_buffer(*s); } @@ -380,7 +401,7 @@ void OrderManager::init_order_services() { me->services_data.settlement_request_pub = make_stream(); me->services_data.report_order_state_pub = - make_stream(); + make_stream(); me->pub_ready = make_stream(); // md subs are peculiar in that we try to make them on demand, so @@ -408,26 +429,30 @@ void OrderManager::after_event() { auto &fix_stream = osd->current_buffer->first_stream(); if (fix_stream.n_msgs()) { fix_stream.close(); - publish(osd->out_fix_pub, osd->current_buffer, osd->current_traces); - osd->current_traces.clear(); + osd->gw.send_fix(osd->current_buffer, osd->current_trace); reload_fix_buffer(*osd); } } } } -void OrderManager::reload_fix_buffer(SessionServicesData &dt) { - if (dt.free_buffers.size()) { - dt.current_buffer = dt.free_buffers.back(); - dt.free_buffers.pop_back(); +void OrderManager::reload_fix_buffer(SessionServicesData &osd) { + if (osd.free_buffers.size()) { + osd.current_buffer = osd.free_buffers.back(); + osd.free_buffers.pop_back(); } else { LOG(OrderMan, Warn, "Ran out of fix buffers in {}. Will allocate directly. " "This will have an impact on performance", - dt.cfg.name()); - dt.current_buffer = std::make_shared(dt.cfg); + osd.cfg.name()); + osd.current_buffer = std::make_shared(osd.cfg); } } +void OrderManager::on_poll() { + for (auto &osd : me->services_data.sessions) + osd->gw.dispatch_incoming_fix_messages(); +} + } // namespace orderman } // namespace bts diff --git a/src/lib/orderman/actors/order_manager/OrderManager.h b/src/lib/orderman/actors/order_manager/OrderManager.h index 6b7977787..c827c2141 100644 --- a/src/lib/orderman/actors/order_manager/OrderManager.h +++ b/src/lib/orderman/actors/order_manager/OrderManager.h @@ -3,6 +3,7 @@ #include "lib/config/protos/jetfix.pb.h" #include "lib/jetfix/common/OutFIXPtr.h" #include "lib/mercury/actors/Actor.h" +#include "lib/mercury/actors/IPollableActor.h" #include "lib/orderman/events/ActivateOrderEvent.h" #include "lib/orderman/events/CancelOrderEvent.h" #include "lib/orderman/events/CrackOrderEvent.h" @@ -13,6 +14,7 @@ // fwd namespace bts { +class PerfTraceLog; namespace mercury { class TimerEvent; } @@ -49,8 +51,6 @@ namespace orderman { // - security creation events // - timer updates // - order state changes -// - order update/cancel/crack events -// // // Additionally handles order maintenance events: // - create @@ -58,9 +58,9 @@ namespace orderman { // - crack // - update -class OrderManager : public mercury::Actor { +class OrderManager : public mercury::Actor, public mercury::IPollableActor { public: - OrderManager(DynamicOrderRegistry const &dyn_order_builder); + OrderManager(DynamicOrderRegistry const &dyn_order_builder, PerfTraceLog &); ~OrderManager(); void init() override; @@ -80,6 +80,7 @@ class OrderManager : public mercury::Actor { void on_gateway_state(const mercury::Update &); void on_timer(const mercury::Update &); void on_admin_data(const mercury::Update &); + void on_poll() override; // end external events void init_order_services(); diff --git a/src/lib/orderman/actors/order_manager/OrderServices.h b/src/lib/orderman/actors/order_manager/OrderServices.h index f2ac59b02..cd8555787 100644 --- a/src/lib/orderman/actors/order_manager/OrderServices.h +++ b/src/lib/orderman/actors/order_manager/OrderServices.h @@ -57,7 +57,9 @@ class SessionServices { PerfTrace const &trace) { auto &stream = _session_data->current_buffer->first_stream(); stream.new_msg(mt).append(f); - _session_data->current_traces.push_back(trace); + + if (stream.n_msgs() == 1) + _session_data->current_trace = trace; } bool is_gateway_connected() const { return _session_data->gw_connected; } diff --git a/src/lib/orderman/actors/order_manager/OrderServicesData.cpp b/src/lib/orderman/actors/order_manager/OrderServicesData.cpp index fa2fd39ca..9bdd18f49 100644 --- a/src/lib/orderman/actors/order_manager/OrderServicesData.cpp +++ b/src/lib/orderman/actors/order_manager/OrderServicesData.cpp @@ -6,7 +6,8 @@ namespace bts { namespace orderman { OrderServicesData::OrderServicesData(OrderManager &owner, - DynamicOrderRegistry const &b) + DynamicOrderRegistry const &b, + PerfTraceLog &l) : owner(owner), order_router(), order_factory(sec_db, order_router, b), last_timer_ev( Timer::now(), @@ -14,7 +15,8 @@ OrderServicesData::OrderServicesData(OrderManager &owner, auto &all_connections = config::get().connection(); for (auto const &c : all_connections) - sessions.push_back(std::make_unique(c)); + sessions.push_back(std::make_unique( + c, l)); } } // namespace orderman } // namespace bts diff --git a/src/lib/orderman/actors/order_manager/OrderServicesData.h b/src/lib/orderman/actors/order_manager/OrderServicesData.h index 13a4d36b8..bfd155164 100644 --- a/src/lib/orderman/actors/order_manager/OrderServicesData.h +++ b/src/lib/orderman/actors/order_manager/OrderServicesData.h @@ -7,11 +7,10 @@ #include "lib/orderman/order_factory/OrderFactory.h" #include "lib/orderman/securities/MapSecurityDB.h" -#include "lib/utils/datetime.h" #include "lib/mercury/events/TimerEvent.h" +#include "lib/orderman/actors/ExecutionGateway.h" #include "lib/orderman/events/ActivateOrderEvent.h" #include "lib/orderman/events/BookUpdateEvent.h" -#include "lib/orderman/events/SettlementUpdateEvent.h" #include "lib/orderman/events/CancelOrderEvent.h" #include "lib/orderman/events/CancelRejectEvent.h" #include "lib/orderman/events/CrackOrderEvent.h" @@ -21,15 +20,16 @@ #include "lib/orderman/events/CreateOrderRequestEvent.h" #include "lib/orderman/events/GatewayStatusChangeEvent.h" #include "lib/orderman/events/MDRequestEvent.h" -#include "lib/orderman/events/SettlementRequestEvent.h" #include "lib/orderman/events/NewExecutionReportEvent.h" #include "lib/orderman/events/NewSecuritiesEvent.h" #include "lib/orderman/events/OrderStateUpdateEvent.h" -#include "lib/orderman/events/OutFIXMsgEvent.h" +#include "lib/orderman/events/SettlementRequestEvent.h" +#include "lib/orderman/events/SettlementUpdateEvent.h" #include "lib/orderman/events/UpdateOrderEvent.h" +#include "lib/orderman/governor/Governor.h" #include "lib/orderman/limiter/Limiter.h" #include "lib/orderman/order_router/OrderRouter.h" -#include "lib/orderman/governor/Governor.h" +#include "lib/utils/datetime.h" #include @@ -44,19 +44,13 @@ struct ParentKey { }; struct SessionServicesData { - SessionServicesData(config::JetFIX::Connection const&cfg) - : session(cfg.name()), - gw_connected(false), - cfg(cfg), - governor(cfg.max_order_msgs_per_window(), - cfg.window_duration_msecs()) - { - current_traces.reserve(1000); - } + SessionServicesData(config::JetFIX::Connection const &cfg, PerfTraceLog &log) + : session(cfg.name()), gw_connected(false), cfg(cfg), + governor(cfg.max_order_msgs_per_window(), cfg.window_duration_msecs()), + gw(cfg, log) {} std::string session; std::vector free_buffers; - mercury::Stream out_fix_pub; bool gw_connected; config::JetFIX::Connection cfg; std::unique_ptr> @@ -69,20 +63,26 @@ struct SessionServicesData { Governor governor; jetfix::OutFIXPtr current_buffer; - std::vector current_traces; + PerfTrace current_trace; + ExecutionGateway gw; + mercury::Stream exe_report_pub; + mercury::Stream gw_status_change_pub; + mercury::Stream cancel_reject_pub; }; class OrderServicesData { -public: - OrderServicesData(OrderManager &owner,DynamicOrderRegistry const&b); + public: + OrderServicesData(OrderManager &owner, DynamicOrderRegistry const &b, + PerfTraceLog &l); OrderManager &owner; securities::MapSecurityDB sec_db; OrderRouter order_router; Limiter limiter; OrderFactory order_factory; - + std::unique_ptr> md_subs; - std::unique_ptr> settlement_subs; + std::unique_ptr> + settlement_subs; std::unique_ptr< mercury::ContentSubscription> time_subs; @@ -105,5 +105,5 @@ public: bts_assert(false); } }; -} -} +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/events/OutFIXMsgEvent.h b/src/lib/orderman/events/OutFIXMsgEvent.h deleted file mode 100644 index 5b0556fba..000000000 --- a/src/lib/orderman/events/OutFIXMsgEvent.h +++ /dev/null @@ -1,32 +0,0 @@ -#pragma once -#include "lib/jetfix/common/OutFIXPtr.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/mercury/events/Event.h" -#include "lib/mercury/synopsis/CacheAll.h" - - -namespace bts { -namespace orderman { - -class OutFIXMsgEvent : public mercury::Event { -public: - using Tag = GatewayName; - - // there is no need to store synopsis for this event because no one - // should be sending fix events (OutFIXMsgEvent) until they receive - // an event from the FIX gateway regarding the status of the FIX - // connection. Receipt of this connection event guarantees to - // potential publishers of OutFIXMsgEvent that the gateway is - // already subscribed to OutFIXMsgEvent and so no events will be - // missed. - using SynopsisPolicy = mercury::NoSynopsis; - - OutFIXMsgEvent (jetfix::OutFIXPtr const&fix,std::vector const&traces) : - msg(fix),trace(traces[0]) - {} - - jetfix::OutFIXPtr msg; - PerfTrace trace; -}; - -}} diff --git a/src/lib/orderman/server/OrderServiceServer.cpp b/src/lib/orderman/server/OrderServiceServer.cpp index 7763f4a8b..4348f0887 100644 --- a/src/lib/orderman/server/OrderServiceServer.cpp +++ b/src/lib/orderman/server/OrderServiceServer.cpp @@ -9,7 +9,6 @@ #include "lib/mercury/executor/Executor.h" #include "lib/metrics/metrics.h" #include "lib/orderman/actors/AsyncFactory.h" -#include "lib/orderman/actors/ExecutionGateway.h" #include "lib/orderman/actors/FillStore.h" #include "lib/orderman/actors/MDSource.h" #include "lib/orderman/actors/MDSupplementarySource.h" @@ -90,11 +89,11 @@ ActorThread *find_thread_for_actor( struct OrderServiceServer::PImpl { PImpl(bts::api::ServiceContext &ctx, std::shared_ptr &ss, - DynamicOrderRegistry const &d, metrics::MetricsContainer &stats) + DynamicOrderRegistry const &d, metrics::MetricsContainer &stats, PerfTraceLog &log) : service_bridge(), service_ready(false), known_orders(), known_fills(), publish_orders(), publish_fills(), admin_service(ctx.locate()), md_consumer(ss), - stats(stats), dyn_order_registry(d) {} + stats(stats), dyn_order_registry(d),log(log) {} ServiceBridge *service_bridge; @@ -110,6 +109,7 @@ struct OrderServiceServer::PImpl { bts::md::MDConsumer md_consumer; metrics::MetricsContainer &stats; DynamicOrderRegistry const &dyn_order_registry; + PerfTraceLog &log; }; OrderServiceServer::OrderServiceServer( @@ -117,7 +117,7 @@ OrderServiceServer::OrderServiceServer( std::shared_ptr &ss, DynamicOrderRegistry const &d, metrics::MetricsContainer &stats, PerfTraceLog &log) - : api::orderman::OrderServiceBase(ctx), me(new PImpl(ctx, ss, d, stats)) { + : api::orderman::OrderServiceBase(ctx), me(new PImpl(ctx, ss, d, stats,log)) { me->publish_orders = make_orders_publisher(); me->publish_fills = make_fills_publisher(); @@ -144,16 +144,7 @@ OrderServiceServer::OrderServiceServer( bts_assert_msg(thread, "Could not find a configured thread for OrderManager. See " "the OrdermanCfg key"); - thread->executor.spawn(d); - - // ExecutionGateway's - thread = find_thread_for_actor("ExecutionGateway", me->actor_threads); - bts_assert_msg(thread, - "Could not find a configured thread for ExecutionGateway " - "instances. See the OrdermanCfg key"); - auto &all_connections = config::get().connection(); - for (auto const &c : all_connections) - thread->executor.spawn(c, log); + thread->executor.spawn(d,me->log); // Timer thread = find_thread_for_actor("Timer", me->actor_threads); From 3bbef9f3281fa359ff4fa5ffa6768c22980bd4b7 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Fri, 30 Nov 2018 11:22:31 -0500 Subject: [PATCH 012/107] SPARK-1905 Attach token to api header C# --- src/client/spark_api/api/Channels/QuickBusClientChannel.cs | 1 + src/client/spark_api/api/ClientChannel.cs | 2 +- src/client/spark_api/api/ServiceContext.cs | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/client/spark_api/api/Channels/QuickBusClientChannel.cs b/src/client/spark_api/api/Channels/QuickBusClientChannel.cs index 6cf3ecb6b..cc94e35f6 100644 --- a/src/client/spark_api/api/Channels/QuickBusClientChannel.cs +++ b/src/client/spark_api/api/Channels/QuickBusClientChannel.cs @@ -35,6 +35,7 @@ namespace bts.api.core { var header = new RequestHeader() { Method = method_id, RequestId = id, + Token = _context.token }; var buffer = header.serialize(request); var tcs = new TaskCompletionSource>(); diff --git a/src/client/spark_api/api/ClientChannel.cs b/src/client/spark_api/api/ClientChannel.cs index bd91eab03..324e3c366 100644 --- a/src/client/spark_api/api/ClientChannel.cs +++ b/src/client/spark_api/api/ClientChannel.cs @@ -5,7 +5,7 @@ using System.Threading.Tasks; namespace bts.api.core { internal abstract class ClientChannel : IDisposable { - readonly ServiceContext _context; + protected readonly ServiceContext _context; public ClientChannel(ServiceContext context) { _context = context; diff --git a/src/client/spark_api/api/ServiceContext.cs b/src/client/spark_api/api/ServiceContext.cs index 3226e6189..3f2ce048e 100644 --- a/src/client/spark_api/api/ServiceContext.cs +++ b/src/client/spark_api/api/ServiceContext.cs @@ -32,6 +32,7 @@ namespace bts.api.core { } public AuthToken token { get; private set; } + public string user { get; private set; } public async Task login(string username, string password) { var auth_service = locate(); @@ -41,8 +42,7 @@ namespace bts.api.core { }); if (result.success) { token = result.value.Token; - // todo - // ApiNativeMethods.set_token(...) + user = username; return true; } return false; From f4ee9434cc01316101e65268d0df92f7804a97a6 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Fri, 30 Nov 2018 11:24:03 -0500 Subject: [PATCH 013/107] Rename Result.result to Result.value() to match c# --- src/lib/api/public/Result.h | 2 +- src/lib/api/test/HelloServiceServer.cpp | 2 +- src/lib/md/relay/RelayClient.cpp | 4 +- .../tests/PersistenceServiceTests.cpp | 46 +++++++++---------- src/server/sparkd/cmds/AdminReport.cpp | 2 +- src/server/sparkd/http/ApiGateway.cpp | 10 ++-- .../md/MarketDataAuxiliaryServiceServer.cpp | 4 +- src/server/sparkd/user/AuthServiceServer.cpp | 4 +- 8 files changed, 37 insertions(+), 37 deletions(-) diff --git a/src/lib/api/public/Result.h b/src/lib/api/public/Result.h index c63401f89..22b868434 100644 --- a/src/lib/api/public/Result.h +++ b/src/lib/api/public/Result.h @@ -55,7 +55,7 @@ public: {} #endif - std::shared_ptr result() const { + std::shared_ptr value() const { if (success()) return _t; else return nullptr; } diff --git a/src/lib/api/test/HelloServiceServer.cpp b/src/lib/api/test/HelloServiceServer.cpp index dab250104..539fdd1cb 100644 --- a/src/lib/api/test/HelloServiceServer.cpp +++ b/src/lib/api/test/HelloServiceServer.cpp @@ -44,7 +44,7 @@ void HelloServiceServer::yell_hello(const HelloRequest & request, const std::fun _shouter.upper(sr, [=](Result response) { if (response.success()) { HelloResponse hr; - hr.set_message(response.result()->msg()); + hr.set_message(response.value()->msg()); int rmid = _id; publish(hr.message(), &rmid); reply(hr); diff --git a/src/lib/md/relay/RelayClient.cpp b/src/lib/md/relay/RelayClient.cpp index d63356f3e..cd3b696a4 100644 --- a/src/lib/md/relay/RelayClient.cpp +++ b/src/lib/md/relay/RelayClient.cpp @@ -259,7 +259,7 @@ public: if (result.success()) { // Write data to shared mem bool has_new_security = false; - _writer.write(*result.result(), &has_new_security); + _writer.write(*result.value(), &has_new_security); // If the reply included and we have a consumer have it scan them if (has_new_security && _pconsumer) { scan_securities_thread().post([=]() { @@ -269,7 +269,7 @@ public: } // Update reply timetamps for (auto& req : *_request.mutable_channels()) { - for (auto& reply : result.result()->channels()) { + for (auto& reply : result.value()->channels()) { if (req.type() == reply.channel().type() && req.exchange() == reply.channel().exchange() && req.symbol() == reply.channel().symbol()) { diff --git a/src/lib/persistence/tests/PersistenceServiceTests.cpp b/src/lib/persistence/tests/PersistenceServiceTests.cpp index 384769a7d..bec842d3a 100644 --- a/src/lib/persistence/tests/PersistenceServiceTests.cpp +++ b/src/lib/persistence/tests/PersistenceServiceTests.cpp @@ -95,7 +95,7 @@ TEST_CASE ("PersistenceService Service API", "[persistence]") req.set_ns("my_ns"); auto resp = cli.retrieve_all(req,5000); REQUIRE(resp.success()); - REQUIRE(resp.result()->result() == RetrieveResponse::NO_SUCH_NS); + REQUIRE(resp.value()->result() == RetrieveResponse::NO_SUCH_NS); } SECTION("store_works") @@ -113,16 +113,16 @@ TEST_CASE ("PersistenceService Service API", "[persistence]") auto resp = cli.store(req,5000); REQUIRE(resp.success()); - REQUIRE(resp.result()->result() == StoreResponse::OK); + REQUIRE(resp.value()->result() == StoreResponse::OK); RetrieveAllRequest req2; req2.set_ns("my_ns1"); auto resp2 = cli.retrieve_all(req2,5000); REQUIRE(resp2.success()); - REQUIRE(resp2.result()->result() == RetrieveResponse::OK); - REQUIRE(resp2.result()->record_size() == 2); - REQUIRE(resp2.result()->record(0).key() == "1"); - REQUIRE(resp2.result()->record(0).value() == "a"); + REQUIRE(resp2.value()->result() == RetrieveResponse::OK); + REQUIRE(resp2.value()->record_size() == 2); + REQUIRE(resp2.value()->record(0).key() == "1"); + REQUIRE(resp2.value()->record(0).value() == "a"); } SECTION("retrieve_works") @@ -144,7 +144,7 @@ TEST_CASE ("PersistenceService Service API", "[persistence]") auto resp = cli.store(req,5000); REQUIRE(resp.success()); - REQUIRE(resp.result()->result() == StoreResponse::OK); + REQUIRE(resp.value()->result() == StoreResponse::OK); RetrieveRequest req2; req2.set_ns("my_ns1"); @@ -152,10 +152,10 @@ TEST_CASE ("PersistenceService Service API", "[persistence]") auto resp2 = cli.retrieve(req2,5000); REQUIRE(resp2.success()); - REQUIRE(resp2.result()->result() == RetrieveResponse::OK); - REQUIRE(resp2.result()->record_size() == 1); - REQUIRE(resp2.result()->record(0).key() == "2"); - REQUIRE(resp2.result()->record(0).value() == "b"); + REQUIRE(resp2.value()->result() == RetrieveResponse::OK); + REQUIRE(resp2.value()->record_size() == 1); + REQUIRE(resp2.value()->record(0).key() == "2"); + REQUIRE(resp2.value()->record(0).value() == "b"); } SECTION("remove_works") @@ -173,7 +173,7 @@ TEST_CASE ("PersistenceService Service API", "[persistence]") auto resp = cli.store(req,5000); REQUIRE(resp.success()); - REQUIRE(resp.result()->result() == StoreResponse::OK); + REQUIRE(resp.value()->result() == StoreResponse::OK); RemoveRequest req2; req2.set_ns("my_ns1"); @@ -181,16 +181,16 @@ TEST_CASE ("PersistenceService Service API", "[persistence]") auto resp2 = cli.remove(req2,5000); REQUIRE(resp2.success()); - REQUIRE(resp2.result()->result() == RemoveResponse::OK); + REQUIRE(resp2.value()->result() == RemoveResponse::OK); RetrieveAllRequest req3; req3.set_ns("my_ns1"); auto resp3 = cli.retrieve_all(req3,5000); REQUIRE(resp3.success()); - REQUIRE(resp3.result()->result() == RetrieveResponse::OK); - REQUIRE(resp3.result()->record_size() == 1); - REQUIRE(resp3.result()->record(0).key() == "1"); - REQUIRE(resp3.result()->record(0).value() == "a"); + REQUIRE(resp3.value()->result() == RetrieveResponse::OK); + REQUIRE(resp3.value()->record_size() == 1); + REQUIRE(resp3.value()->record(0).key() == "1"); + REQUIRE(resp3.value()->record(0).value() == "a"); } SECTION("remove_all_works") @@ -203,7 +203,7 @@ TEST_CASE ("PersistenceService Service API", "[persistence]") auto resp = cli.store(req,5000); REQUIRE(resp.success()); - REQUIRE(resp.result()->result() == StoreResponse::OK); + REQUIRE(resp.value()->result() == StoreResponse::OK); req.set_ns("my_ns2"); rec = req.add_record(); @@ -212,21 +212,21 @@ TEST_CASE ("PersistenceService Service API", "[persistence]") resp = cli.store(req,5000); REQUIRE(resp.success()); - REQUIRE(resp.result()->result() == StoreResponse::OK); + REQUIRE(resp.value()->result() == StoreResponse::OK); RemoveAllRequest req2; req2.set_ns("my_ns1"); auto resp2 = cli.remove_all(req2,5000); REQUIRE(resp2.success()); - REQUIRE(resp2.result()->result() == RemoveResponse::OK); + REQUIRE(resp2.value()->result() == RemoveResponse::OK); RetrieveAllRequest req3; req3.set_ns("my_ns1"); auto resp3 = cli.retrieve_all(req3,5000); REQUIRE(resp3.success()); - REQUIRE(resp3.result()->result() == RetrieveResponse::OK); - REQUIRE(resp3.result()->record_size() == 0); + REQUIRE(resp3.value()->result() == RetrieveResponse::OK); + REQUIRE(resp3.value()->record_size() == 0); } SECTION("streaming_works") @@ -239,7 +239,7 @@ TEST_CASE ("PersistenceService Service API", "[persistence]") auto resp = cli.store(req,5000); REQUIRE(resp.success()); - REQUIRE(resp.result()->result() == StoreResponse::OK); + REQUIRE(resp.value()->result() == StoreResponse::OK); std::promise p; auto f = p.get_future(); diff --git a/src/server/sparkd/cmds/AdminReport.cpp b/src/server/sparkd/cmds/AdminReport.cpp index 59866b223..92312f83a 100644 --- a/src/server/sparkd/cmds/AdminReport.cpp +++ b/src/server/sparkd/cmds/AdminReport.cpp @@ -52,7 +52,7 @@ int AdminReport::md_report() auto res = admin.get_admin_data(api::VoidMessage()); if(res.success()) { - const api::admin::AdminData& data = *res.result(); + const api::admin::AdminData& data = *res.value(); std::cout << "User,Fullname,Company,Exchange,MIC,Display,Pro/NonPro" << std::endl; for(const auto& u : data.users()) { diff --git a/src/server/sparkd/http/ApiGateway.cpp b/src/server/sparkd/http/ApiGateway.cpp index a08d0dc8c..a1ebf346f 100644 --- a/src/server/sparkd/http/ApiGateway.cpp +++ b/src/server/sparkd/http/ApiGateway.cpp @@ -43,13 +43,13 @@ struct ApiGatewayImpl { GatewayResponse resp; resp.mutable_logon()->set_is_valid(false); if (logon_response) { - if (logon_response.result()->is_valid()) { + if (logon_response.value()->is_valid()) { resp.mutable_logon()->set_is_valid(true); - resp.mutable_logon()->set_token(logon_response.result()->token().token()); - resp.mutable_logon()->set_can_create(logon_response.result()->can_create()); + resp.mutable_logon()->set_token(logon_response.value()->token().token()); + resp.mutable_logon()->set_can_create(logon_response.value()->can_create()); } else { - resp.mutable_logon()->set_reason(logon_response.result()->reason()); + resp.mutable_logon()->set_reason(logon_response.value()->reason()); } } else { @@ -153,7 +153,7 @@ std::string get_server_info(const api::ServiceContext& ctx) { if (response.success()) { ss << " \"users\": [" << endl; bool first = true; - for (const auto& user : response.result()->users()) { + for (const auto& user : response.value()->users()) { if (user.is_present()) { ss << " "; if (first) { first = false; } diff --git a/src/server/sparkd/md/MarketDataAuxiliaryServiceServer.cpp b/src/server/sparkd/md/MarketDataAuxiliaryServiceServer.cpp index 17886e386..611dbb259 100644 --- a/src/server/sparkd/md/MarketDataAuxiliaryServiceServer.cpp +++ b/src/server/sparkd/md/MarketDataAuxiliaryServiceServer.cpp @@ -56,8 +56,8 @@ void MarketDataAuxiliaryServiceServer::_poll_md(){ me->relay_service.requestmd(me->state.md_req(), [this](const bts::api::Result& md_reply) { - if(md_reply.result()!=nullptr) - _scan_trades(*md_reply.result()); + if(md_reply) + _scan_trades(*md_reply.value()); me->context.post([this](){_poll_md();},me->poll_period_ms); }); } diff --git a/src/server/sparkd/user/AuthServiceServer.cpp b/src/server/sparkd/user/AuthServiceServer.cpp index a481852c3..8be24cf67 100644 --- a/src/server/sparkd/user/AuthServiceServer.cpp +++ b/src/server/sparkd/user/AuthServiceServer.cpp @@ -39,7 +39,7 @@ void AuthServiceServer::get_users(const api::user::GetUsersRequest& , me->admin.get_admin_data(vod, [respond](const api::Result& admin_data) { api::user::GetUsersResponse resp; if (admin_data.success()) { - for (const auto& inuser : admin_data.result()->users()) { + for (const auto& inuser : admin_data.value()->users()) { if (inuser.is_present()) { api::user::User& outuser = *resp.add_users(); outuser.set_login(inuser.name()); @@ -61,7 +61,7 @@ void AuthServiceServer::authenticate_login(const api::user::AuthenticateLoginReq api::user::AuthenticateLoginResponse resp; resp.set_is_valid(false); if (admin_data.success()) { - for (const auto& user : admin_data.result()->users()) { + for (const auto& user : admin_data.value()->users()) { if (user.name() == req.login() && user.password() == req.password() && user.is_present()) { resp.set_is_valid(user.is_active()); if(!resp.is_valid()) From e1568c1e6760bee0ddcb2ec0f1235256167d254f Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Fri, 30 Nov 2018 11:24:58 -0500 Subject: [PATCH 014/107] SPARK-1905 Attach token to api request header (c++) --- src/lib/api/public/ClientChannel.cpp | 2 +- src/lib/api/public/ClientChannel.h | 7 +-- src/lib/api/public/QuickbusClientChannel.cpp | 3 +- src/lib/api/public/QuickbusClientChannel.h | 3 +- src/lib/api/public/ServiceContext.cpp | 51 +++++++++++++++---- src/lib/api/public/ServiceContext.h | 15 ++++-- .../templates/cpp/server.pb.cc | 1 + src/lib/orderman/actors/ServiceBridge.cpp | 1 + 8 files changed, 62 insertions(+), 21 deletions(-) diff --git a/src/lib/api/public/ClientChannel.cpp b/src/lib/api/public/ClientChannel.cpp index 3d6f581c2..f89d33d8a 100644 --- a/src/lib/api/public/ClientChannel.cpp +++ b/src/lib/api/public/ClientChannel.cpp @@ -3,7 +3,7 @@ namespace bts { namespace api { -ClientChannel::ClientChannel() : _id(1) +ClientChannel::ClientChannel(const ServiceContext& ctx) : _id(1), _context(ctx) { } diff --git a/src/lib/api/public/ClientChannel.h b/src/lib/api/public/ClientChannel.h index a29e54a18..17782f46d 100644 --- a/src/lib/api/public/ClientChannel.h +++ b/src/lib/api/public/ClientChannel.h @@ -4,7 +4,7 @@ #include "Result.h" #include "ApiException.h" #include "RawUpdate.h" -//#include "Update.h" +#include "ServiceContext.h" #include #include #include @@ -12,12 +12,12 @@ namespace bts { namespace api { - class ClientChannel { int _id; + ServiceContext _context; public: - ClientChannel(); + ClientChannel(const ServiceContext&); virtual ~ClientChannel(); template @@ -25,6 +25,7 @@ public: RequestHeader header; header.set_method(method_id); header.set_request_id(++_id); + header.mutable_token()->set_token(_context.token().token()); int header_size = header.ByteSize()+1; assert(header_size < 128); diff --git a/src/lib/api/public/QuickbusClientChannel.cpp b/src/lib/api/public/QuickbusClientChannel.cpp index d6d970138..3713bcbf1 100644 --- a/src/lib/api/public/QuickbusClientChannel.cpp +++ b/src/lib/api/public/QuickbusClientChannel.cpp @@ -4,7 +4,8 @@ namespace bts { namespace api { -QuickbusClientChannel::QuickbusClientChannel(Quickbus& bus, const char* type_name, const char* service_qualifier) : +QuickbusClientChannel::QuickbusClientChannel(Quickbus& bus, const ServiceContext& context, const char* type_name, const char* service_qualifier) : + ClientChannel(context), _pclient(api_client_create(&bus, type_name, service_qualifier)) { } diff --git a/src/lib/api/public/QuickbusClientChannel.h b/src/lib/api/public/QuickbusClientChannel.h index 41f221a51..ab973a9ee 100644 --- a/src/lib/api/public/QuickbusClientChannel.h +++ b/src/lib/api/public/QuickbusClientChannel.h @@ -6,12 +6,13 @@ namespace bts { namespace api { +class ServiceContext; class QuickbusClientChannel : public ClientChannel { ApiClient* _pclient; public: - QuickbusClientChannel(Quickbus&, const char* type_name, const char* service_qualifier); + QuickbusClientChannel(Quickbus&, const ServiceContext&, const char* type_name, const char* service_qualifier); ~QuickbusClientChannel(); private: diff --git a/src/lib/api/public/ServiceContext.cpp b/src/lib/api/public/ServiceContext.cpp index 3422640b7..3fafa77f0 100644 --- a/src/lib/api/public/ServiceContext.cpp +++ b/src/lib/api/public/ServiceContext.cpp @@ -3,34 +3,65 @@ #include "QuickbusClientChannel.h" #include "ApiServer.h" #include "lib/logging/logging.h" +#include "lib/api/services/AuthService.client.pb.h" namespace bts { namespace api { +struct ServiceContextImpl { + ServiceContextImpl(Quickbus* maybe_bus): + _qbus(maybe_bus ? *maybe_bus : *api_create_quickbus(nullptr, 0)), + _owns_qb(maybe_bus == nullptr), + _token(), + _user() + {} + ~ServiceContextImpl() { + if (_owns_qb) { + api_destroy_quickbus(&_qbus); + } + } + Quickbus& _qbus; + bool _owns_qb; + AuthToken _token; + std::string _user; +}; + ServiceContext::ServiceContext(Quickbus* maybe_bus) : - _qbus(maybe_bus ? *maybe_bus : *api_create_quickbus(nullptr, 0)), - _owns_qb(maybe_bus == nullptr) + _self(std::make_shared(maybe_bus)) { } -ServiceContext::~ServiceContext() { - if (_owns_qb) { - api_destroy_quickbus(&_qbus); - } -} +ServiceContext::~ServiceContext() {} std::unique_ptr ServiceContext::create_channel(const char * type_name, const char * service_qualifier) const { LOG(Api,Info,"Locate Service: {}{}",std::string(type_name) ,std::string(service_qualifier)); - return std::unique_ptr(new QuickbusClientChannel(_qbus, type_name, service_qualifier)); + return std::unique_ptr(new QuickbusClientChannel(_self->_qbus, *this, type_name, service_qualifier)); } ServerChannel ServiceContext::publish(ApiServer& service, const std::string& service_type, const std::string& qualifier) const { - return ServerChannel(_qbus, service_type, qualifier, service); + return ServerChannel(_self->_qbus, service_type, qualifier, service); +} + +bool ServiceContext::login(const std::string& username, const std::string& password) { + auto auth = locate(); + user::AuthenticateLoginRequest request; + request.set_login(username); + request.set_password(password); + auto result = auth.authenticate_login(request); + if (result.success()) { + _self->_token = result.value()->token(); //.CopyFrom(result.value()->token()); + _self->_user = username; + } + return false; } void ServiceContext::post(const Action& action, uint64_t delay) { - api_post(_qbus, action, delay); + api_post(_self->_qbus, action, delay); } +Quickbus& ServiceContext::bus() const { return _self->_qbus; } +const AuthToken ServiceContext::token() const { return _self->_token; } +const std::string& ServiceContext::user() const { return _self->_user; } + }}//namespace #endif diff --git a/src/lib/api/public/ServiceContext.h b/src/lib/api/public/ServiceContext.h index c42515ab8..e434affe1 100644 --- a/src/lib/api/public/ServiceContext.h +++ b/src/lib/api/public/ServiceContext.h @@ -5,7 +5,6 @@ // client #include "../core/ApiClientInterop.h" #include "../core/ApiServerInterop.h" -#include "ClientChannel.h" // server #include "ServerChannel.h" @@ -16,13 +15,16 @@ namespace bts { namespace api { +class ClientChannel; +struct ServiceContextImpl; + class BTS_EXPORT ServiceContext { - Quickbus& _qbus; - bool _owns_qb; + std::shared_ptr _self; public: ServiceContext(Quickbus* maybe_bus=nullptr); + // ServiceContext(ServiceContext& other) = default; ~ServiceContext(); template @@ -30,11 +32,14 @@ public: return T(create_channel(T::name(), qualifier)); } + Quickbus& bus() const; + const AuthToken token() const; + const std::string& user() const; + bool login(const std::string& username, const std::string& password); + typedef std::function Action; void post(const Action&, uint64_t delayms=0); - Quickbus& bus() const { return _qbus; } - private: friend class ApiServer; std::unique_ptr create_channel(const char*, const char*) const; diff --git a/src/lib/api/service_compiler/templates/cpp/server.pb.cc b/src/lib/api/service_compiler/templates/cpp/server.pb.cc index 133d58bec..24bf9ed70 100644 --- a/src/lib/api/service_compiler/templates/cpp/server.pb.cc +++ b/src/lib/api/service_compiler/templates/cpp/server.pb.cc @@ -4,6 +4,7 @@ #include "lib/api/public/ApiUtils.h" #include "lib/api/core/ApiServerInterop.h" #include +#include {{ns-open package}} {{#each service}} diff --git a/src/lib/orderman/actors/ServiceBridge.cpp b/src/lib/orderman/actors/ServiceBridge.cpp index f8d0cd3a7..9c9501f16 100644 --- a/src/lib/orderman/actors/ServiceBridge.cpp +++ b/src/lib/orderman/actors/ServiceBridge.cpp @@ -19,6 +19,7 @@ #include "lib/api/services/OrderService.pb.h" #include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/orderman/orders/Order.h" +#include namespace bts { namespace orderman { From 860132469f20c2f5b19ac83b4c55035edb7ab2c9 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Fri, 30 Nov 2018 13:37:37 -0500 Subject: [PATCH 015/107] Add AuthenticatedServiceBase base class to opt in to service authentication --- .../templates/cpp/server.pb.cc | 22 ++++++------- .../templates/cpp/server.pb.h | 32 ++++++++++++++++--- 2 files changed, 39 insertions(+), 15 deletions(-) diff --git a/src/lib/api/service_compiler/templates/cpp/server.pb.cc b/src/lib/api/service_compiler/templates/cpp/server.pb.cc index 24bf9ed70..50b1e464a 100644 --- a/src/lib/api/service_compiler/templates/cpp/server.pb.cc +++ b/src/lib/api/service_compiler/templates/cpp/server.pb.cc @@ -20,13 +20,13 @@ const {{key_type.cpptype}}& {{name}}_key(const {{output_type_cpp}}& row) { {{/if}} {{/if}}{{/each}} -{{name}}Base::{{name}}Base(bts::api::ServiceContext& context, const std::string& qualifier) : +Authenticated{{name}}Base::Authenticated{{name}}Base(bts::api::ServiceContext& context, const std::string& qualifier) : bts::api::ApiServer(context, "{{name}}", qualifier) {} -const char* {{name}}Base::name() const { return "{{name}}"; }; +const char* Authenticated{{name}}Base::name() const { return "{{name}}"; }; -void {{name}}Base::dispatch(const bts::api::RequestHeader& header, google::protobuf::io::ZeroCopyInputStream& stream, OnResponse on_response) { +void Authenticated{{name}}Base::dispatch(const bts::api::RequestHeader& header, google::protobuf::io::ZeroCopyInputStream& stream, OnResponse on_response) { switch((ServiceMethods)header.method()) { case SYS_PING: { bts::api::PingPong pp; @@ -39,7 +39,7 @@ void {{name}}Base::dispatch(const bts::api::RequestHeader& header, google::proto {{input_type_cpp}} msg; if (msg.ParsePartialFromZeroCopyStream(&stream)) { auto id = header.request_id(); - {{name}}(msg, [this,id,on_response](const {{output_type_cpp}}& result) { + {{name}}(header.has_token() ? &header.token() : nullptr, msg, [this,id,on_response](const {{output_type_cpp}}& result) { respond(id, result, on_response); }); } @@ -59,19 +59,19 @@ void {{name}}Base::dispatch(const bts::api::RequestHeader& header, google::proto {{#each method}}{{#if server_streaming}} -{{../name}}Base::{{cap name}}Publisher {{../name}}Base::make_{{name}}_publisher(std::string const&qualifier) const { +{{../name}}Base::{{cap name}}Publisher Authenticated{{../name}}Base::make_{{name}}_publisher(std::string const&qualifier) const { bts::api::TableHandle handle = _channel.create_table(std::string("{{name}}/") + qualifier); return make_{{name}}_publisher(handle); } -{{../name}}Base::{{cap name}}Publisher {{../name}}Base::make_{{name}}_publisher(const {{input_type_cpp}}& qualifier) const { +{{../name}}Base::{{cap name}}Publisher Authenticated{{../name}}Base::make_{{name}}_publisher(const {{input_type_cpp}}& qualifier) const { bts::api::TableHandle handle = _channel.create_table(format_qualifier("{{name}}", qualifier)); return make_{{name}}_publisher(handle); } -{{../name}}Base::{{cap name}}Publisher {{../name}}Base::make_{{name}}_publisher() const { +{{../name}}Base::{{cap name}}Publisher Authenticated{{../name}}Base::make_{{name}}_publisher() const { bts::api::TableHandle handle = _channel.create_table("{{name}}"); return make_{{name}}_publisher(handle); } -{{../name}}Base::{{cap name}}Publisher {{../name}}Base::make_{{name}}_publisher(bts::api::TableHandle handle) const { +{{../name}}Base::{{cap name}}Publisher Authenticated{{../name}}Base::make_{{name}}_publisher(bts::api::TableHandle handle) const { {{#unless key_type.natural_key}} std::unordered_map<{{key_type.cpptype}}, int> _map; int _next_id; @@ -166,14 +166,14 @@ void {{name}}Base::dispatch(const bts::api::RequestHeader& header, google::proto }; } -{{../name}}Base::{{cap name}}StatefulPublisher {{../name}}Base::make_{{name}}_stateful_publisher() const { +{{../name}}Base::{{cap name}}StatefulPublisher Authenticated{{../name}}Base::make_{{name}}_stateful_publisher() const { return bts::api::StatefulPublisher<{{output_type_cpp}},{{key_type.cpptype}}>(make_{{name}}_publisher(), {{name}}_key); } -{{../name}}Base::{{cap name}}StatefulPublisher {{../name}}Base::make_{{name}}_stateful_publisher(const std::string& qualifier) const { +{{../name}}Base::{{cap name}}StatefulPublisher Authenticated{{../name}}Base::make_{{name}}_stateful_publisher(const std::string& qualifier) const { return bts::api::StatefulPublisher<{{output_type_cpp}},{{key_type.cpptype}}>(make_{{name}}_publisher(qualifier), {{name}}_key); } -{{../name}}Base::{{cap name}}StatefulPublisher {{../name}}Base::make_{{name}}_stateful_publisher(const {{input_type_cpp}}& qualifier) const { +{{../name}}Base::{{cap name}}StatefulPublisher Authenticated{{../name}}Base::make_{{name}}_stateful_publisher(const {{input_type_cpp}}& qualifier) const { return bts::api::StatefulPublisher<{{output_type_cpp}},{{key_type.cpptype}}>(make_{{name}}_publisher(qualifier), {{name}}_key); } diff --git a/src/lib/api/service_compiler/templates/cpp/server.pb.h b/src/lib/api/service_compiler/templates/cpp/server.pb.h index e01679f19..6c6c45c43 100644 --- a/src/lib/api/service_compiler/templates/cpp/server.pb.h +++ b/src/lib/api/service_compiler/templates/cpp/server.pb.h @@ -10,6 +10,7 @@ namespace bts { namespace api { class ServiceContext; + class AuthToken; }} {{ns-open package}} @@ -20,7 +21,7 @@ class {{name}};{{/each}} {{#each service}} // {{comment}} -class {{name}}Base : public bts::api::ApiServer { +class Authenticated{{name}}Base : public bts::api::ApiServer { public: {{#each method}} {{#if server_streaming}} @@ -30,7 +31,7 @@ public: {{/each}} protected: - {{name}}Base(bts::api::ServiceContext& context, const std::string& qualifier=""); + Authenticated{{name}}Base(bts::api::ServiceContext& context, const std::string& qualifier=""); const char* name() const override; @@ -46,6 +47,7 @@ protected: {{else}} // {{comment}} virtual void {{name}}( + const api::AuthToken* token, const {{input_type_cpp}}& request, const api::Response<{{output_type_cpp}}>& reply) = 0; {{/if}} @@ -58,11 +60,33 @@ protected: {{/each}} }; -private: - void dispatch(const bts::api::RequestHeader&, google::protobuf::io::ZeroCopyInputStream&, OnResponse) override; {{#each method}}{{#if server_streaming}} {{cap name}}Publisher make_{{name}}_publisher(bts::api::TableHandle) const; {{/if}}{{/each}} + +private: + void dispatch(const bts::api::RequestHeader&, google::protobuf::io::ZeroCopyInputStream&, OnResponse) override; +}; + +// {{comment}} +class {{name}}Base : public Authenticated{{name}}Base { +protected: + {{name}}Base(bts::api::ServiceContext& context, const std::string& qualifier="") : Authenticated{{name}}Base(context, qualifier) {} +public: + {{#each method}} + {{#unless server_streaming}} + void {{name}}( + const api::AuthToken*, + const {{input_type_cpp}}& request, + const api::Response<{{output_type_cpp}}>& reply) override { + {{name}}(request, reply); + } + // {{comment}} + virtual void {{name}}( + const {{input_type_cpp}}& request, + const api::Response<{{output_type_cpp}}>& reply) = 0; + {{/unless}} + {{/each}} }; {{/each}} From 895bf3be6a8c5d93afb1c9576052eb2dcb1eb15f Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Fri, 30 Nov 2018 14:08:44 -0500 Subject: [PATCH 016/107] Add AuthenticatedServiceBase class C# --- .../templates/c#/server.pb.cs | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/src/lib/api/service_compiler/templates/c#/server.pb.cs b/src/lib/api/service_compiler/templates/c#/server.pb.cs index 0cb348228..7668b9390 100644 --- a/src/lib/api/service_compiler/templates/c#/server.pb.cs +++ b/src/lib/api/service_compiler/templates/c#/server.pb.cs @@ -14,9 +14,9 @@ namespace {{package}} {{#each service}} // {{comment}} -internal abstract class {{name}}Base : ApiServer, IDisposable { +internal abstract class Authenticated{{name}}Base : ApiServer, IDisposable { readonly ServerChannel _channel; - public {{name}}Base(ServiceContext context, string qualifier="") { + public Authenticated{{name}}Base(ServiceContext context, string qualifier="") { _channel = context.publish(this, "{{name}}", qualifier); } @@ -131,7 +131,7 @@ internal abstract class {{name}}Base : ApiServer, IDisposable { } {{else}} //{{comment}} - public abstract Task<{{output_type_full}}> {{name}}({{input_type_full}} request); + public abstract Task<{{output_type_full}}> {{name}}(bts.api.AuthToken token, {{input_type_full}} request); {{/if}} {{/each}} @@ -153,7 +153,7 @@ internal abstract class {{name}}Base : ApiServer, IDisposable { {{#unless server_streaming}} case ServiceMethods.{{upper name}}: { var msg = {{input_type_full}}.Parser.ParseFrom(request_stream); - var result = {{name}}(msg); + var result = {{name}}(header.Token, msg); var id = header.RequestId; result.ContinueWith(t => respond(id, t, on_response)); break; @@ -170,6 +170,20 @@ internal abstract class {{name}}Base : ApiServer, IDisposable { } } +// {{comment}} +internal abstract class {{name}}Base : Authenticated{{name}}Base , IDisposable { + public {{name}}Base(ServiceContext context, string qualifier="") : base(context, qualifier) { } + {{#each method}} + {{#unless server_streaming}} + public override Task<{{output_type_full}}> {{name}}(bts.api.AuthToken token, {{input_type_full}} request) { + return {{name}}(request); + } + // {{comment}} + public abstract Task<{{output_type_full}}> {{name}}({{input_type_full}} request); + {{/unless}} + {{/each}} +} + {{/each}} } #endregion From d68156f214fe27db748942f43dd9b44745693b30 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Fri, 30 Nov 2018 15:56:49 -0500 Subject: [PATCH 017/107] Remove api stream "structured qualifiers". Nobody uses this feature and it is very fragile --- .../spark/core/ShellInterface/UISettings.cs | 2 +- src/client/spark_api/api/ApiServer.cs | 9 ------- src/client/spark_test/api/ApiTests.cs | 27 ------------------- .../templates/c#/client.pb.cs | 8 +++--- .../templates/c#/server.pb.cs | 4 +-- .../templates/cpp/client.pb.cc | 5 ---- .../templates/cpp/client.pb.h | 2 +- 7 files changed, 8 insertions(+), 49 deletions(-) diff --git a/src/client/spark/core/ShellInterface/UISettings.cs b/src/client/spark/core/ShellInterface/UISettings.cs index 58e0cd849..2b454f848 100644 --- a/src/client/spark/core/ShellInterface/UISettings.cs +++ b/src/client/spark/core/ShellInterface/UISettings.cs @@ -120,7 +120,7 @@ namespace mbts.persist public IObservable>> subscribe(string ns, string pattern) { var re = new Regex(pattern); return _persist - .subscribe_ns(new NamespaceSubArgs() { Ns = uns(ns) }) + .subscribe_ns(uns(ns)) .Select(update => update.added .Where(item => re.IsMatch(item.Key)) diff --git a/src/client/spark_api/api/ApiServer.cs b/src/client/spark_api/api/ApiServer.cs index fa431657e..6e7f08c95 100644 --- a/src/client/spark_api/api/ApiServer.cs +++ b/src/client/spark_api/api/ApiServer.cs @@ -17,15 +17,6 @@ namespace bts.api.core internal abstract class ApiServer : IApiServer { - static JsonFormatter _formatter = new JsonFormatter(new JsonFormatter.Settings(true)); - static Regex _fmt_cleanup = new Regex(@"[\s_+]", RegexOptions.Compiled | RegexOptions.Multiline); - public static string format_qualifier(string method, T arg) where T : IMessage { - if (arg != null) { - string arg_fmt = _fmt_cleanup.Replace(_formatter.Format(arg), ""); - return method + arg_fmt; - } - return method; - } public abstract void dispatch(RequestHeader header, Stream request, Action on_response); protected void respond(int request_id, Task task, Action on_response) where T : IMessage, IImmutableMessage { diff --git a/src/client/spark_test/api/ApiTests.cs b/src/client/spark_test/api/ApiTests.cs index d1682bdb7..7f346c1da 100644 --- a/src/client/spark_test/api/ApiTests.cs +++ b/src/client/spark_test/api/ApiTests.cs @@ -34,25 +34,6 @@ namespace mbts.api.Test { Disposable.dispose(ref _context); } - [Test,Ignore("Timeout")] - public void test_format_qualifier() { - var simple = new QualifierArgument() { Simple = new SimpleQualifier() { Symbol = "ES" } }; - var s1 = _mtest.format_qualifier(simple); - var s2 = _ntest.format_qualifier(simple); - Assert.AreEqual(s1.Str, s2.Str); - - var complex = new ComplexQualifier() { - Name = "name", - }; - complex.Probability.AddRange(new[] { 1.0, 2.0 }); - complex.Symbols.Add(simple.Simple); - complex.Symbols.Add(new SimpleQualifier() { Symbol = "$50\"+" }); - var carg = new QualifierArgument() { Complex = complex }; - var c1 = _mtest.format_qualifier(carg); - var c2 = _ntest.format_qualifier(carg); - Assert.AreEqual(c1.Str, c2.Str); - - } [Test, Ignore("Times out")] public void test_empty_reply_is_not_null() { foreach (var svc in test_services()) { @@ -129,14 +110,6 @@ namespace mbts.api.Test { public override Task format_qualifier(QualifierArgument request) { UnitTestResult result = new UnitTestResult(); - switch (request.QualifierCase) { - case QualifierArgument.QualifierOneofCase.Simple: - result.Str = format_qualifier("format_qualifier", request.Simple); - break; - case QualifierArgument.QualifierOneofCase.Complex: - result.Str = format_qualifier("format_qualifier", request.Complex); - break; - } return Task.FromResult(result); } diff --git a/src/lib/api/service_compiler/templates/c#/client.pb.cs b/src/lib/api/service_compiler/templates/c#/client.pb.cs index cb683b463..5e96dd8a4 100644 --- a/src/lib/api/service_compiler/templates/c#/client.pb.cs +++ b/src/lib/api/service_compiler/templates/c#/client.pb.cs @@ -19,11 +19,11 @@ public sealed class {{name}} : IApiClient, IDisposable { {{#each method}} {{#if server_streaming}} // {{comment}} - public IObservable> subscribe_{{name}}({{input_type_full}} qualifier=null) { - return _channel.subscribe<{{output_type_full}}, {{output_type_full}}>(ApiServer.format_qualifier("{{name}}",qualifier), {{output_type_full}}.Parser, a=>a).reconstitute(key); + public IObservable> subscribe_{{name}}(string qualifier=null) { + return _channel.subscribe<{{output_type_full}}, {{output_type_full}}>(qualifier, {{output_type_full}}.Parser, a=>a).reconstitute(key); } - public IObservable> subscribei_{{name}}({{input_type_full}} qualifier=null) { - return _channel.subscribe<{{output_type_full}}, {{output_type_full}}Immutable>(ApiServer.format_qualifier("{{name}}",qualifier), {{output_type_full}}.Parser, a=>({{output_type_full}}Immutable)a).reconstitute(key); + public IObservable> subscribei_{{name}}(string qualifier=null) { + return _channel.subscribe<{{output_type_full}}, {{output_type_full}}Immutable>(qualifier, {{output_type_full}}.Parser, a=>({{output_type_full}}Immutable)a).reconstitute(key); } private static {{key_type.cstype}} key({{output_type_full}} row) { return row.{{camel key_field}}; diff --git a/src/lib/api/service_compiler/templates/c#/server.pb.cs b/src/lib/api/service_compiler/templates/c#/server.pb.cs index 7668b9390..86f853fb3 100644 --- a/src/lib/api/service_compiler/templates/c#/server.pb.cs +++ b/src/lib/api/service_compiler/templates/c#/server.pb.cs @@ -122,8 +122,8 @@ internal abstract class Authenticated{{name}}Base : ApiServer, IDisposable { } //{{comment}} - protected {{cap name}}Publisher make_{{name}}_publisher({{input_type_full}} qualifier=null) { - IntPtr table = _channel.create_table(format_qualifier("{{name}}", qualifier)); + protected {{cap name}}Publisher make_{{name}}_publisher(string qualifier=null) { + IntPtr table = _channel.create_table(qualifier); return new {{cap name}}Publisher(table); } protected static {{key_type.cstype}} {{name}}_key({{output_type_full}} row) { diff --git a/src/lib/api/service_compiler/templates/cpp/client.pb.cc b/src/lib/api/service_compiler/templates/cpp/client.pb.cc index eb882a1ee..1bdc3dc9e 100644 --- a/src/lib/api/service_compiler/templates/cpp/client.pb.cc +++ b/src/lib/api/service_compiler/templates/cpp/client.pb.cc @@ -16,11 +16,6 @@ using namespace rxcpp::operators; {{#each method}} {{#if server_streaming}} - rxcpp::observable<{{cap name}}Update> {{../name}}::subscribe_{{name}}(const {{input_type_cpp}}& qualifier) { - return - _pchannel->subscribe<{{output_type_cpp}}>(format_qualifier("{{name}}", qualifier)) - | (bts::api::reconstitute,const {{key_type.cpptype}}, {{../name}}>()); - } rxcpp::observable<{{cap name}}Update> {{../name}}::subscribe_{{name}}(std::string const&qualifier) { return _pchannel->subscribe<{{output_type_cpp}}>(std::string("{{name}}/") + qualifier) diff --git a/src/lib/api/service_compiler/templates/cpp/client.pb.h b/src/lib/api/service_compiler/templates/cpp/client.pb.h index 27dbbf615..836e8db84 100644 --- a/src/lib/api/service_compiler/templates/cpp/client.pb.h +++ b/src/lib/api/service_compiler/templates/cpp/client.pb.h @@ -47,7 +47,7 @@ class BTS_EXPORT {{name}} { {{#each method}} {{#if server_streaming}} // {{comment}} - rxcpp::observable<{{cap name}}Update> subscribe_{{name}}(const {{input_type_cpp}}& qualifier); + // rxcpp::observable<{{cap name}}Update> subscribe_{{name}}(const {{input_type_cpp}}& qualifier); // {{comment}} rxcpp::observable<{{cap name}}Update> subscribe_{{name}}(std::string const&); // {{comment}} From 86199755f50194bf33f488b5f46f1e0141409069 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Fri, 30 Nov 2018 17:05:37 -0500 Subject: [PATCH 018/107] SPARK-1906 Stream Auth : C# Client --- .../api/Channels/QuickBusClientChannel.cs | 114 ++++++++++-------- src/client/spark_api/api/ClientChannel.cs | 2 +- src/client/sparkcmd/Cmd/ServiceTestCommand.cs | 10 +- src/lib/api/apicore.proto | 6 + .../templates/c#/client.pb.cs | 34 +++--- 5 files changed, 94 insertions(+), 72 deletions(-) diff --git a/src/client/spark_api/api/Channels/QuickBusClientChannel.cs b/src/client/spark_api/api/Channels/QuickBusClientChannel.cs index cc94e35f6..d0d03a36e 100644 --- a/src/client/spark_api/api/Channels/QuickBusClientChannel.cs +++ b/src/client/spark_api/api/Channels/QuickBusClientChannel.cs @@ -57,60 +57,70 @@ namespace bts.api.core { return tcs.Task; } - public unsafe override IObservable> subscribe(string method_and_qualifier, MessageParser parser, Func converter) { - var result = Observable.Create>(observer => { - bool first_update = true; - // Memory optimization. There is only one update per subscription. - RawUpdate the_update = new RawUpdate(); - ApiNativeMethods.raw_subscription_callback cb = (event_type, changes, change_count, unused) => { - the_update.Clear(); - try { - if (event_type == ApiNativeMethods.EventType.TABLE_UPDATED) { - foreach (var change in changes) { - switch (change.type) { - case ApiNativeMethods.ChangeType.REMOVE: - the_update.removed_keys.Add(change.key); - break; - case ApiNativeMethods.ChangeType.REPLACE: - the_update.changed_items.Add(converter(parser.ParseFrom(new UnmanagedMemoryStream(change.buffer, change.buffer_len)))); - the_update.changed_keys.Add(change.key); - break; - case ApiNativeMethods.ChangeType.CREATE: - the_update.added_items.Add(converter(parser.ParseFrom(new UnmanagedMemoryStream(change.buffer, change.buffer_len)))); - the_update.added_keys.Add(change.key); - break; - } - } - observer.OnNext(the_update); - } - else if (event_type == ApiNativeMethods.EventType.TABLE_CREATED) { - if (!first_update) { - observer.OnNext(the_update.MarkAsReset()); - } - first_update = false; - } - } - catch (Exception e) { - ApiNativeMethods.api_client_log_error($"Exception in subscription callback for sub: '{method_and_qualifier}' \n--\n '{e}'"); - // Sleep to let the log message get asyncronously written to disk - Thread.Sleep(100); - Environment.Exit(-1); - } - }; - var subscription = ApiNativeMethods.api_client_subscribe(_client, method_and_qualifier, cb, IntPtr.Zero); - return FinalizeableAnonymousDisposable.Create((disposing) => { - ApiNativeMethods.api_client_unsubscribe(_client, subscription); - subscription = IntPtr.Zero; - GC.KeepAlive(cb); - cb = null; - // Cannot (ever) call logging from the finalizer thread - // if (!disposing) { - // ApiNativeMethods.api_client_log_error($"Subscription has been terminated because the returned IDisposable has been finalized. Subscription: {method_and_qualifier}"); - // } - }); + public override IObservable> subscribe(int method_id, string method_and_qualifier, MessageParser parser, Func converter) { + var result = Observable.Create>(async observer => { + var response = await send(method_id, new StreamRequest() { Token = _context.token }); + if (!response.success) { + observer.OnError(new ApiException(response.error_message)); + return Disposable.Empty; + } + else if (!response.value.Authorized) { + observer.OnError(new UnauthorizedAccessException()); + return Disposable.Empty; + } + return SubscribeNative(method_and_qualifier, parser, converter, observer); }); return result; - } + } + + private unsafe IDisposable SubscribeNative(string method_and_qualifier, MessageParser parser, Func converter, IObserver> observer) where TParse : IMessage { + bool first_update = true; + // Memory optimization. There is only one update per subscription. + RawUpdate the_update = new RawUpdate(); + ApiNativeMethods.raw_subscription_callback cb = (event_type, changes, change_count, unused) => { + the_update.Clear(); + try { + if (event_type == ApiNativeMethods.EventType.TABLE_UPDATED) { + foreach (var change in changes) { + switch (change.type) { + case ApiNativeMethods.ChangeType.REMOVE: + the_update.removed_keys.Add(change.key); + break; + case ApiNativeMethods.ChangeType.REPLACE: + the_update.changed_items.Add(converter(parser.ParseFrom(new UnmanagedMemoryStream(change.buffer, change.buffer_len)))); + the_update.changed_keys.Add(change.key); + break; + case ApiNativeMethods.ChangeType.CREATE: + the_update.added_items.Add(converter(parser.ParseFrom(new UnmanagedMemoryStream(change.buffer, change.buffer_len)))); + the_update.added_keys.Add(change.key); + break; + } + } + observer.OnNext(the_update); + } + else if (event_type == ApiNativeMethods.EventType.TABLE_CREATED) { + if (!first_update) { + observer.OnNext(the_update.MarkAsReset()); + } + first_update = false; + } + } + catch (Exception e) { + ApiNativeMethods.api_client_log_error($"Exception in subscription callback for sub: '{method_and_qualifier}' \n--\n '{e}'"); + // Sleep to let the log message get asyncronously written to disk + Thread.Sleep(100); + Environment.Exit(-1); + } + }; + var subscription = ApiNativeMethods.api_client_subscribe(_client, method_and_qualifier, cb, IntPtr.Zero); + return FinalizeableAnonymousDisposable.Create((disposing) => { + ApiNativeMethods.api_client_unsubscribe(_client, subscription); + subscription = IntPtr.Zero; + GC.KeepAlive(cb); + cb = null; + }); + } + private class FinalizeableAnonymousDisposable : IDisposable { private Action _action; public FinalizeableAnonymousDisposable(Action dispose) { diff --git a/src/client/spark_api/api/ClientChannel.cs b/src/client/spark_api/api/ClientChannel.cs index 324e3c366..8ca3a7bbc 100644 --- a/src/client/spark_api/api/ClientChannel.cs +++ b/src/client/spark_api/api/ClientChannel.cs @@ -13,7 +13,7 @@ namespace bts.api.core { public abstract void Dispose(); public abstract Task> send(int method_id, Request request) where Request: IImmutableMessage where Response : class,IMessage,new(); - public abstract IObservable> subscribe(string method_and_qualifier, MessageParser parser, Func converter=null) + public abstract IObservable> subscribe(int method_id, string method_and_qualifier, MessageParser parser, Func converter=null) where TParse : IMessage; public abstract bool is_sync_call_ok(); diff --git a/src/client/sparkcmd/Cmd/ServiceTestCommand.cs b/src/client/sparkcmd/Cmd/ServiceTestCommand.cs index 3e9ff00c5..8682986b4 100644 --- a/src/client/sparkcmd/Cmd/ServiceTestCommand.cs +++ b/src/client/sparkcmd/Cmd/ServiceTestCommand.cs @@ -3,6 +3,7 @@ using bts.api.core; using bts.api.synthetic; using ManyConsole; using System; +using System.Threading; namespace bts { public class ServiceTest : ConsoleCommand { @@ -92,8 +93,13 @@ namespace bts { var ctx = new ServiceContext(); var s = ctx.locate(); - var resp = s.get_admin_data(new VoidMessage()); - Console.WriteLine("{0}", resp); + var d = s.subscribei_admin_data().Subscribe(Console.WriteLine); + //var resp = s.get_admin_data(new VoidMessage()); + //Console.WriteLine("{0}", resp); + + while (true) { + Thread.Sleep(100); + } } } } diff --git a/src/lib/api/apicore.proto b/src/lib/api/apicore.proto index b694f0f10..7573e0d99 100644 --- a/src/lib/api/apicore.proto +++ b/src/lib/api/apicore.proto @@ -37,6 +37,12 @@ message ResponseHeader { ApiError code = 2; } +message StreamRequest { + AuthToken token = 1; +} +message StreamResponse { + bool authorized = 1; +} // Some Useful buffers for use as arguments/returns diff --git a/src/lib/api/service_compiler/templates/c#/client.pb.cs b/src/lib/api/service_compiler/templates/c#/client.pb.cs index 5e96dd8a4..1e050b244 100644 --- a/src/lib/api/service_compiler/templates/c#/client.pb.cs +++ b/src/lib/api/service_compiler/templates/c#/client.pb.cs @@ -18,24 +18,24 @@ public sealed class {{name}} : IApiClient, IDisposable { {{#each method}} {{#if server_streaming}} - // {{comment}} - public IObservable> subscribe_{{name}}(string qualifier=null) { - return _channel.subscribe<{{output_type_full}}, {{output_type_full}}>(qualifier, {{output_type_full}}.Parser, a=>a).reconstitute(key); - } - public IObservable> subscribei_{{name}}(string qualifier=null) { - return _channel.subscribe<{{output_type_full}}, {{output_type_full}}Immutable>(qualifier, {{output_type_full}}.Parser, a=>({{output_type_full}}Immutable)a).reconstitute(key); - } - private static {{key_type.cstype}} key({{output_type_full}} row) { - return row.{{camel key_field}}; - } - {{#if key_type.ismessage}} - private static {{key_type.cstype}} key({{output_type_full}}Immutable row) { - return row.{{camel key_field}}.CloneToMutable(); - } - {{else}} - private static {{key_type.cstype}} key({{output_type_full}}Immutable row) { - return row.{{camel key_field}}; + // {{comment}} + public IObservable> subscribe_{{name}}(string qualifier=null) { + return _channel.subscribe<{{output_type_full}}, {{output_type_full}}>({{@index}}, qualifier, {{output_type_full}}.Parser, a=>a).reconstitute(key); } + public IObservable> subscribei_{{name}}(string qualifier=null) { + return _channel.subscribe<{{output_type_full}}, {{output_type_full}}Immutable>({{@index}}, qualifier, {{output_type_full}}.Parser, a=>({{output_type_full}}Immutable)a).reconstitute(key); + } + private static {{key_type.cstype}} key({{output_type_full}} row) { + return row.{{camel key_field}}; + } + {{#if key_type.ismessage}} + private static {{key_type.cstype}} key({{output_type_full}}Immutable row) { + return row.{{camel key_field}}.CloneToMutable(); + } + {{else}} + private static {{key_type.cstype}} key({{output_type_full}}Immutable row) { + return row.{{camel key_field}}; + } {{/if}} {{else}} // {{comment}} From d652646e9341be06bf942db03c96e4b50f2287c4 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Fri, 30 Nov 2018 17:22:42 -0500 Subject: [PATCH 019/107] SPARK-1906 Stream Auth : C# Server --- .../api/Channels/QuickBusClientChannel.cs | 104 +++++++++--------- src/lib/api/apicore.proto | 5 +- .../templates/c#/server.pb.cs | 14 ++- 3 files changed, 64 insertions(+), 59 deletions(-) diff --git a/src/client/spark_api/api/Channels/QuickBusClientChannel.cs b/src/client/spark_api/api/Channels/QuickBusClientChannel.cs index d0d03a36e..658f4a965 100644 --- a/src/client/spark_api/api/Channels/QuickBusClientChannel.cs +++ b/src/client/spark_api/api/Channels/QuickBusClientChannel.cs @@ -59,7 +59,7 @@ namespace bts.api.core { public override IObservable> subscribe(int method_id, string method_and_qualifier, MessageParser parser, Func converter) { var result = Observable.Create>(async observer => { - var response = await send(method_id, new StreamRequest() { Token = _context.token }); + var response = await send(method_id, null); if (!response.success) { observer.OnError(new ApiException(response.error_message)); return Disposable.Empty; @@ -67,60 +67,60 @@ namespace bts.api.core { else if (!response.value.Authorized) { observer.OnError(new UnauthorizedAccessException()); return Disposable.Empty; - } + } return SubscribeNative(method_and_qualifier, parser, converter, observer); }); return result; - } - - private unsafe IDisposable SubscribeNative(string method_and_qualifier, MessageParser parser, Func converter, IObserver> observer) where TParse : IMessage { - bool first_update = true; - // Memory optimization. There is only one update per subscription. - RawUpdate the_update = new RawUpdate(); - ApiNativeMethods.raw_subscription_callback cb = (event_type, changes, change_count, unused) => { - the_update.Clear(); - try { - if (event_type == ApiNativeMethods.EventType.TABLE_UPDATED) { - foreach (var change in changes) { - switch (change.type) { - case ApiNativeMethods.ChangeType.REMOVE: - the_update.removed_keys.Add(change.key); - break; - case ApiNativeMethods.ChangeType.REPLACE: - the_update.changed_items.Add(converter(parser.ParseFrom(new UnmanagedMemoryStream(change.buffer, change.buffer_len)))); - the_update.changed_keys.Add(change.key); - break; - case ApiNativeMethods.ChangeType.CREATE: - the_update.added_items.Add(converter(parser.ParseFrom(new UnmanagedMemoryStream(change.buffer, change.buffer_len)))); - the_update.added_keys.Add(change.key); - break; - } - } - observer.OnNext(the_update); - } - else if (event_type == ApiNativeMethods.EventType.TABLE_CREATED) { - if (!first_update) { - observer.OnNext(the_update.MarkAsReset()); - } - first_update = false; - } - } - catch (Exception e) { - ApiNativeMethods.api_client_log_error($"Exception in subscription callback for sub: '{method_and_qualifier}' \n--\n '{e}'"); - // Sleep to let the log message get asyncronously written to disk - Thread.Sleep(100); - Environment.Exit(-1); - } - }; - var subscription = ApiNativeMethods.api_client_subscribe(_client, method_and_qualifier, cb, IntPtr.Zero); - return FinalizeableAnonymousDisposable.Create((disposing) => { - ApiNativeMethods.api_client_unsubscribe(_client, subscription); - subscription = IntPtr.Zero; - GC.KeepAlive(cb); - cb = null; - }); - } - + } + + private unsafe IDisposable SubscribeNative(string method_and_qualifier, MessageParser parser, Func converter, IObserver> observer) where TParse : IMessage { + bool first_update = true; + // Memory optimization. There is only one update per subscription. + RawUpdate the_update = new RawUpdate(); + ApiNativeMethods.raw_subscription_callback cb = (event_type, changes, change_count, unused) => { + the_update.Clear(); + try { + if (event_type == ApiNativeMethods.EventType.TABLE_UPDATED) { + foreach (var change in changes) { + switch (change.type) { + case ApiNativeMethods.ChangeType.REMOVE: + the_update.removed_keys.Add(change.key); + break; + case ApiNativeMethods.ChangeType.REPLACE: + the_update.changed_items.Add(converter(parser.ParseFrom(new UnmanagedMemoryStream(change.buffer, change.buffer_len)))); + the_update.changed_keys.Add(change.key); + break; + case ApiNativeMethods.ChangeType.CREATE: + the_update.added_items.Add(converter(parser.ParseFrom(new UnmanagedMemoryStream(change.buffer, change.buffer_len)))); + the_update.added_keys.Add(change.key); + break; + } + } + observer.OnNext(the_update); + } + else if (event_type == ApiNativeMethods.EventType.TABLE_CREATED) { + if (!first_update) { + observer.OnNext(the_update.MarkAsReset()); + } + first_update = false; + } + } + catch (Exception e) { + ApiNativeMethods.api_client_log_error($"Exception in subscription callback for sub: '{method_and_qualifier}' \n--\n '{e}'"); + // Sleep to let the log message get asyncronously written to disk + Thread.Sleep(100); + Environment.Exit(-1); + } + }; + var subscription = ApiNativeMethods.api_client_subscribe(_client, method_and_qualifier, cb, IntPtr.Zero); + return FinalizeableAnonymousDisposable.Create((disposing) => { + ApiNativeMethods.api_client_unsubscribe(_client, subscription); + subscription = IntPtr.Zero; + GC.KeepAlive(cb); + cb = null; + }); + } + private class FinalizeableAnonymousDisposable : IDisposable { private Action _action; public FinalizeableAnonymousDisposable(Action dispose) { diff --git a/src/lib/api/apicore.proto b/src/lib/api/apicore.proto index 7573e0d99..8166a63a6 100644 --- a/src/lib/api/apicore.proto +++ b/src/lib/api/apicore.proto @@ -37,10 +37,7 @@ message ResponseHeader { ApiError code = 2; } -message StreamRequest { - AuthToken token = 1; -} -message StreamResponse { +message StreamAccessResponse { bool authorized = 1; } diff --git a/src/lib/api/service_compiler/templates/c#/server.pb.cs b/src/lib/api/service_compiler/templates/c#/server.pb.cs index 86f853fb3..a82e337eb 100644 --- a/src/lib/api/service_compiler/templates/c#/server.pb.cs +++ b/src/lib/api/service_compiler/templates/c#/server.pb.cs @@ -129,6 +129,12 @@ internal abstract class Authenticated{{name}}Base : ApiServer, IDisposable { protected static {{key_type.cstype}} {{name}}_key({{output_type_full}} row) { return row.{{camel key_field}}; } + + public virtual Task allow_{{name}}(bts.api.AuthToken token) { + var r = new StreamAccessResponse() { Authorized = true }; + return Task.FromResult(r); + } + {{else}} //{{comment}} public abstract Task<{{output_type_full}}> {{name}}(bts.api.AuthToken token, {{input_type_full}} request); @@ -150,15 +156,17 @@ internal abstract class Authenticated{{name}}Base : ApiServer, IDisposable { break; } {{#each method}} - {{#unless server_streaming}} case ServiceMethods.{{upper name}}: { + {{#if server_streaming}} + var result = allow_{{name}}(header.Token); + {{else}} var msg = {{input_type_full}}.Parser.ParseFrom(request_stream); var result = {{name}}(header.Token, msg); + {{/if}} var id = header.RequestId; result.ContinueWith(t => respond(id, t, on_response)); break; - } - {{/unless}} + } {{/each}} default: var buffer = new ResponseHeader(){ From 955b9d1fecdc95119e4b146ad67d5f60cd6f20f0 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Fri, 30 Nov 2018 17:32:54 -0500 Subject: [PATCH 020/107] SPARK-1901 Additional expunging of structured qualifier --- src/client/spark_test/api/ApiTests.cs | 5 ----- src/lib/api/public/ApiUtils.h | 17 ----------------- src/lib/api/services/ApiUnitTestService.proto | 1 - src/lib/api/test/ApiTests.cpp | 19 ------------------- 4 files changed, 42 deletions(-) diff --git a/src/client/spark_test/api/ApiTests.cs b/src/client/spark_test/api/ApiTests.cs index 7f346c1da..69b63f8f0 100644 --- a/src/client/spark_test/api/ApiTests.cs +++ b/src/client/spark_test/api/ApiTests.cs @@ -108,11 +108,6 @@ namespace mbts.api.Test { public ApiTestServiceServer(ServiceContext context) : base(context, "c#") { _context = context; } - public override Task format_qualifier(QualifierArgument request) { - UnitTestResult result = new UnitTestResult(); - return Task.FromResult(result); - } - public override Task run_hello_service(EmptyRequest request) { stop_hello_service(null); _hello = new HelloServiceServer(_context); diff --git a/src/lib/api/public/ApiUtils.h b/src/lib/api/public/ApiUtils.h index 4634b102c..18cc96fd6 100644 --- a/src/lib/api/public/ApiUtils.h +++ b/src/lib/api/public/ApiUtils.h @@ -18,22 +18,5 @@ namespace api { else return ""; } - template - const std::string format_qualifier(const char* type_name, const T& t) { - google::protobuf::util::JsonPrintOptions options; - options.add_whitespace = false; - options.always_print_primitive_fields = true; - std::string result; - auto status = google::protobuf::util::MessageToJsonString(t, &result, options); - assert(status.ok()); - result.erase( std::remove_if(result.begin(), result.end(), [](char c) { - return - c == '+' || - c == '_'; - }), result.end()); - return type_name + result; - } - - }}//namespace diff --git a/src/lib/api/services/ApiUnitTestService.proto b/src/lib/api/services/ApiUnitTestService.proto index a5e56e044..6b8f3b63b 100644 --- a/src/lib/api/services/ApiUnitTestService.proto +++ b/src/lib/api/services/ApiUnitTestService.proto @@ -31,7 +31,6 @@ message QualifierArgument { } service ApiTestService { - rpc format_qualifier(QualifierArgument) returns (UnitTestResult); rpc test_empty_reply(EmptyRequest) returns (UnitTestResult); diff --git a/src/lib/api/test/ApiTests.cpp b/src/lib/api/test/ApiTests.cpp index b17fecfc1..8779490ab 100644 --- a/src/lib/api/test/ApiTests.cpp +++ b/src/lib/api/test/ApiTests.cpp @@ -25,25 +25,6 @@ namespace test { _hello(), _shout() {} - // Inherited via ApiTestServiceBase - virtual void format_qualifier(const QualifierArgument & request, const std::function& reply) override { - UnitTestResult result; - switch (request.qualifier_case()) { - case QualifierArgument::kSimple: - result.set_str( - bts::api::format_qualifier("format_qualifier", request.simple())); - break; - case QualifierArgument::kComplex: - result.set_str( - bts::api::format_qualifier("format_qualifier", request.complex())); - break; - default: - result.set_str("Unknown qualifier test case"); - break; - } - reply(result); - } - // Inherited via ApiTestServiceBase virtual void test_empty_reply(const EmptyRequest&, const std::function& reply) override { UnitTestResult result; From 112a5703e0b37d75cb52a65d5d25d5096950ff51 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Mon, 3 Dec 2018 17:35:01 -0500 Subject: [PATCH 021/107] SPARK-1906 Stream Auth : C++ Server --- .../templates/cpp/server.pb.cc | 24 ++++++++++++------- .../templates/cpp/server.pb.h | 6 +++-- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/lib/api/service_compiler/templates/cpp/server.pb.cc b/src/lib/api/service_compiler/templates/cpp/server.pb.cc index 50b1e464a..96a73b400 100644 --- a/src/lib/api/service_compiler/templates/cpp/server.pb.cc +++ b/src/lib/api/service_compiler/templates/cpp/server.pb.cc @@ -34,8 +34,14 @@ void Authenticated{{name}}Base::dispatch(const bts::api::RequestHeader& header, respond(header.request_id(), pp, on_response); } } break; - {{#each method}} {{#unless server_streaming}} + {{#each method}} case {{upper name}}: { + {{#if server_streaming}} + auto id = header.request_id(); + allow_{{name}}(header.has_token() ? &header.token() : nullptr, [this,id,on_response](const bts::api::StreamAccessResponse& result) { + respond(id,result,on_response); + }); + {{else}} {{input_type_cpp}} msg; if (msg.ParsePartialFromZeroCopyStream(&stream)) { auto id = header.request_id(); @@ -43,8 +49,9 @@ void Authenticated{{name}}Base::dispatch(const bts::api::RequestHeader& header, respond(id, result, on_response); }); } + {{/if}} } break; - {{/unless}}{{/each}} + {{/each}} default: { bts::api::ResponseHeader response; response.set_request_id(header.request_id()); @@ -63,10 +70,6 @@ void Authenticated{{name}}Base::dispatch(const bts::api::RequestHeader& header, bts::api::TableHandle handle = _channel.create_table(std::string("{{name}}/") + qualifier); return make_{{name}}_publisher(handle); } -{{../name}}Base::{{cap name}}Publisher Authenticated{{../name}}Base::make_{{name}}_publisher(const {{input_type_cpp}}& qualifier) const { - bts::api::TableHandle handle = _channel.create_table(format_qualifier("{{name}}", qualifier)); - return make_{{name}}_publisher(handle); -} {{../name}}Base::{{cap name}}Publisher Authenticated{{../name}}Base::make_{{name}}_publisher() const { bts::api::TableHandle handle = _channel.create_table("{{name}}"); return make_{{name}}_publisher(handle); @@ -173,10 +176,13 @@ void Authenticated{{name}}Base::dispatch(const bts::api::RequestHeader& header, {{../name}}Base::{{cap name}}StatefulPublisher Authenticated{{../name}}Base::make_{{name}}_stateful_publisher(const std::string& qualifier) const { return bts::api::StatefulPublisher<{{output_type_cpp}},{{key_type.cpptype}}>(make_{{name}}_publisher(qualifier), {{name}}_key); } -{{../name}}Base::{{cap name}}StatefulPublisher Authenticated{{../name}}Base::make_{{name}}_stateful_publisher(const {{input_type_cpp}}& qualifier) const { - return bts::api::StatefulPublisher<{{output_type_cpp}},{{key_type.cpptype}}>(make_{{name}}_publisher(qualifier), {{name}}_key); -} +void Authenticated{{../name}}Base::allow_{{name}}(const bts::api::AuthToken* token, const api::Response& reply) { + (void)token; + bts::api::StreamAccessResponse r; + r.set_authorized(true); + reply(r); +} {{/if}} {{/each}} diff --git a/src/lib/api/service_compiler/templates/cpp/server.pb.h b/src/lib/api/service_compiler/templates/cpp/server.pb.h index 6c6c45c43..df5750064 100644 --- a/src/lib/api/service_compiler/templates/cpp/server.pb.h +++ b/src/lib/api/service_compiler/templates/cpp/server.pb.h @@ -39,12 +39,14 @@ protected: {{#if server_streaming}} {{cap name}}Publisher make_{{name}}_publisher() const; {{cap name}}Publisher make_{{name}}_publisher(const std::string &) const; - {{cap name}}Publisher make_{{name}}_publisher(const {{input_type_cpp}}& qualifier) const; {{cap name}}StatefulPublisher make_{{name}}_stateful_publisher() const; {{cap name}}StatefulPublisher make_{{name}}_stateful_publisher(const std::string& qualifier) const; - {{cap name}}StatefulPublisher make_{{name}}_stateful_publisher(const {{input_type_cpp}}& qualifier) const; + + virtual void allow_{{name}}(const bts::api::AuthToken*, const api::Response& reply); + {{else}} + // {{comment}} virtual void {{name}}( const api::AuthToken* token, From 05d0eee8c76219d50b562c21c065af220ffddd5a Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Tue, 4 Dec 2018 14:45:08 -0600 Subject: [PATCH 022/107] MV filters - reevaluate fitler when data changes --- .../Market/MarketView/MarketViewRow.cs | 31 ++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs b/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs index 8c604dca4..73a84082c 100644 --- a/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs +++ b/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs @@ -266,7 +266,36 @@ namespace mbts.spark { _working_best_ask.on_next_distinct(_order_summarizer.best_working_ask, ref dirty); _inside_bids.on_next_distinct(_order_summarizer.best_working_bid >= bid_price, ref dirty); _inside_asks.on_next_distinct(_order_summarizer.best_working_ask <= ask_price, ref dirty); - RaisePropertyChanged(nameof(working_bids_text), nameof(working_asks_text)); + + // Here we need to RaisePropertyChanged for the non-Property<> cols that are bound to a filter + // (Property implements INotifyPropretyChanged, so this is taken for us autmagically) + // This is so that when the data changes behind the filter, the filter runs again for evaulation + // on whether to show or hide the row + RaisePropertyChanged( + nameof(security), + nameof(volume), + // last price is a Property<> + nameof(last_size), + nameof(position), + nameof(working_bid_volume), + nameof(bid_implied_size), + nameof(bid_direct_size), + nameof(bid_merged_size), + // bid price is a Property<> + // ask price is a Property<> + nameof(ask_merged_size), + nameof(ask_direct_size), + nameof(ask_implied_size), + nameof(working_ask_volume), + // setlltement is a Property<> + // change is a Property<> + // low is a Property<> + // high is a Property<> + nameof(security_key), + + nameof(working_bids_text), + nameof(working_asks_text) + ); } #endregion From 41d662b3bafc65e312ede76338cd670904007664 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Tue, 4 Dec 2018 16:30:06 -0500 Subject: [PATCH 023/107] Improving trace logs --- src/lib/CMakeDeps.cmake | 2 +- src/lib/jetfix/codec/FIXMsg.h | 8 +-- src/lib/jetfix/common/InMsgBuffer.h | 8 +-- src/lib/jetfix/connection/AsyncReader.cpp | 14 +++- src/lib/jetfix/connection/AsyncReader.h | 2 + src/lib/jetfix/connection/IConnection.h | 4 +- .../jetfix/connection/SocketConnection.cpp | 66 ++----------------- src/lib/jetfix/connection/SocketConnection.h | 8 +-- src/lib/jetfix/gateway/CoreGateway.cpp | 58 ++++++++-------- src/lib/jetfix/gateway/CoreGateway.h | 6 +- src/lib/jetfix/gateway/JetFIXGateway.h | 15 +++-- src/lib/jetfix/gateway/Session.cpp | 9 ++- src/lib/jetfix/gateway/Session.h | 5 +- src/lib/jetfix/tests/async_reader_tests.cpp | 8 ++- src/lib/mercury/actors/ContentSubscription.h | 3 +- src/lib/orderman/actors/ExecutionGateway.cpp | 21 +++--- src/lib/orderman/actors/ExecutionGateway.h | 8 +-- src/lib/orderman/actors/MDSource.h | 16 ++--- src/lib/orderman/actors/ServiceBridge.cpp | 3 +- .../actors/order_manager/ChildOrder.h | 8 +-- .../actors/order_manager/OrderManager.cpp | 10 +-- .../actors/order_manager/OrderManager.h | 6 +- .../actors/order_manager/OrderServices.h | 19 ++++-- .../order_manager/OrderServicesData.cpp | 8 +-- .../actors/order_manager/OrderServicesData.h | 10 +-- src/lib/orderman/events/ActivateOrderEvent.h | 5 +- src/lib/orderman/events/BookUpdateEvent.h | 5 +- src/lib/orderman/events/CancelOrderEvent.h | 5 +- src/lib/orderman/events/CrackOrderEvent.h | 5 +- .../orderman/events/NewExecutionReportEvent.h | 6 +- .../orderman/events/OrderStateUpdateEvent.h | 9 +-- src/lib/orderman/events/UpdateOrderEvent.h | 5 +- src/lib/orderman/orders/DynamicOrder.cpp | 8 +-- src/lib/orderman/orders/DynamicOrder.h | 8 +-- src/lib/orderman/orders/IcebergOrder.cpp | 10 +-- src/lib/orderman/orders/IcebergOrder.h | 8 +-- src/lib/orderman/orders/NativeOrder.cpp | 32 ++++----- src/lib/orderman/orders/NativeOrder.h | 12 ++-- src/lib/orderman/orders/Order.h | 9 +-- src/lib/orderman/orders/TimeBoxOrder.cpp | 8 +-- src/lib/orderman/orders/TimeBoxOrder.h | 8 +-- src/lib/orderman/orders/TriggerOrder.cpp | 8 +-- src/lib/orderman/orders/TriggerOrder.h | 8 +-- .../orderman/orders/book_algos/BookAlgo.cpp | 8 +-- src/lib/orderman/orders/book_algos/BookAlgo.h | 8 +-- .../spreader_orders/ISpreaderStateWorker.h | 4 +- .../orders/spreader_orders/SpreaderOrder.cpp | 17 +++-- .../orders/spreader_orders/SpreaderOrder.h | 14 ++-- .../spreader/SingleFillHedger.cpp | 4 +- .../spreader/SingleFillHedger.h | 6 +- .../spreader/SingleLegQuoter.cpp | 2 +- .../spreader/SingleLegQuoter.h | 6 +- .../spreader/SpreaderBookkeepingData.cpp | 4 +- .../spreader/SpreaderBookkeepingData.h | 2 +- .../spreader/SpreaderChildOrderState.h | 9 ++- .../spreader/hedger/IHedgerStateWorker.h | 3 +- .../hedger_states/HedgerEndStateWorker.cpp | 2 +- .../hedger_states/HedgerEndStateWorker.h | 2 +- .../hedger_states/HedgerStartStateWorker.cpp | 2 +- .../hedger_states/HedgerStartStateWorker.h | 2 +- .../HedgerWaitingForCancelAckStateWorker.cpp | 2 +- .../HedgerWaitingForCancelAckStateWorker.h | 2 +- ...WaitingForFirstAckCancelledStateWorker.cpp | 2 +- ...erWaitingForFirstAckCancelledStateWorker.h | 2 +- .../HedgerWaitingForFirstAckStateWorker.cpp | 2 +- .../HedgerWaitingForFirstAckStateWorker.h | 2 +- .../HedgerWorkingStateWorker.cpp | 2 +- .../hedger_states/HedgerWorkingStateWorker.h | 2 +- .../spreader/quoter/IQuoterStateWorker.h | 2 +- .../quoter_states/QuoterEndStateWorker.cpp | 2 +- .../quoter_states/QuoterEndStateWorker.h | 2 +- .../quoter_states/QuoterStartStateWorker.cpp | 2 +- .../quoter_states/QuoterStartStateWorker.h | 2 +- .../QuoterWaitingForCancelAckStateWorker.cpp | 2 +- .../QuoterWaitingForCancelAckStateWorker.h | 2 +- ...uoterWaitingForFirstAckCancelledWorker.cpp | 2 +- .../QuoterWaitingForFirstAckCancelledWorker.h | 2 +- .../QuoterWaitingForFirstAckWorker.cpp | 2 +- .../QuoterWaitingForFirstAckWorker.h | 2 +- .../QuoterWaitingForIOCWorker.cpp | 2 +- .../quoter_states/QuoterWaitingForIOCWorker.h | 2 +- .../QuoterWaitingForSizeStateWorker.cpp | 6 +- .../QuoterWaitingForSizeStateWorker.h | 4 +- .../QuoterWorkingStateWorker.cpp | 8 +-- .../quoter_states/QuoterWorkingStateWorker.h | 6 +- .../SpreaderEndStateWorker.cpp | 4 +- .../spreader_states/SpreaderEndStateWorker.h | 4 +- .../SpreaderStartStateWorker.cpp | 4 +- .../SpreaderStartStateWorker.h | 4 +- ...SpreaderWaitingForCancelAllStateWorker.cpp | 4 +- .../SpreaderWaitingForCancelAllStateWorker.h | 4 +- ...readerWaitingForInitialDataStateWorker.cpp | 4 +- ...SpreaderWaitingForInitialDataStateWorker.h | 6 +- .../SpreaderWorkingStateWorker.cpp | 4 +- .../SpreaderWorkingStateWorker.h | 4 +- .../spreader_orders/tests/spreader_tests.cpp | 60 ++++++++--------- .../spreader_orders/tests/tests_common.h | 8 +-- .../orderman/server/OrderServiceServer.cpp | 6 +- src/lib/orderman/server/OrderServiceServer.h | 4 +- src/server/sparkd/cmds/Benchmark.cpp | 8 +++ src/server/sparkd/cmds/QuickTest.cpp | 22 ++----- src/server/sparkd/cmds/Run.cpp | 29 ++++---- src/server/sparkd/cmds/Web.cpp | 4 +- src/server/sparkd/http/WebServer.cpp | 14 ++-- src/server/sparkd/http/WebServer.h | 4 +- 105 files changed, 402 insertions(+), 444 deletions(-) diff --git a/src/lib/CMakeDeps.cmake b/src/lib/CMakeDeps.cmake index 6211e72d2..06d5cbeda 100644 --- a/src/lib/CMakeDeps.cmake +++ b/src/lib/CMakeDeps.cmake @@ -1 +1 @@ -set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/services/UserService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/Executor.conf;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/PerfTraceLog.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/IcebergOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/CoverOrder.cpp;orderman/orders/book_algos/JoinOrder.cpp;orderman/orders/book_algos/LeanOrder.cpp;orderman/orders/book_algos/OffsetOrder.cpp;orderman/orders/book_algos/TickOrder.cpp;orderman/orders/book_algos/TopOrder.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;orderman2/orders/NativeOrder.cpp;orderman2/orders/Order.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/thread_manager.cpp) \ No newline at end of file +set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/services/UserService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/Executor.conf;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/PerfTraceLog.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/IcebergOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/CoverOrder.cpp;orderman/orders/book_algos/JoinOrder.cpp;orderman/orders/book_algos/LeanOrder.cpp;orderman/orders/book_algos/OffsetOrder.cpp;orderman/orders/book_algos/TickOrder.cpp;orderman/orders/book_algos/TopOrder.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;orderman2/orders/NativeOrder.cpp;orderman2/orders/Order.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;tracing/PerfLog.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/thread_manager.cpp) \ No newline at end of file diff --git a/src/lib/jetfix/codec/FIXMsg.h b/src/lib/jetfix/codec/FIXMsg.h index 1d587802c..519946cbc 100644 --- a/src/lib/jetfix/codec/FIXMsg.h +++ b/src/lib/jetfix/codec/FIXMsg.h @@ -11,7 +11,7 @@ #include "lib/jetfix/codec/IFIXMsg.h" #include "lib/jetfix/common/InMsgBuffer.h" #include "lib/utils/meta_programming.h" -#include "lib/orderman/orderman_utils/PerfTrace.h" +#include "lib/tracing/PerfLog.h" namespace bts { namespace jetfix { @@ -73,8 +73,8 @@ public: } } - void set_trace (PerfTrace const&trace) {_trace = trace;} - PerfTrace const&trace() const {return _trace;} + void set_trace (trace::CorID const&trace) {_trace = trace;} + trace::CorID const&trace() const {return _trace;} private: typedef std::tuple FieldTuple; @@ -103,7 +103,7 @@ private: FieldTuple _fields; std::bitset::value> _has_value; std::vector> _field_idx; - PerfTrace _trace; + trace::CorID _trace; }; diff --git a/src/lib/jetfix/common/InMsgBuffer.h b/src/lib/jetfix/common/InMsgBuffer.h index f01426120..bd1c76f9f 100644 --- a/src/lib/jetfix/common/InMsgBuffer.h +++ b/src/lib/jetfix/common/InMsgBuffer.h @@ -6,7 +6,7 @@ #include #include "lib/utils/bts_assert.h" #include "lib/jetfix/codec/MessageTypes.h" -#include "lib/orderman/orderman_utils/PerfTrace.h" +#include "lib/tracing/PerfLog.h" namespace bts { namespace jetfix { @@ -114,16 +114,16 @@ public: std::string get_test_req_id () const {return get_string_field ("\001112=",sizeof("\001112=")-1);} - PerfTrace const&trace() const {return _trace;} + trace::CorID const&trace() const {return _trace;} - void set_trace(PerfTrace const&t) {_trace = t;} + void set_trace(trace::CorID const&t) {_trace = t;} private: const char *_data; size_t _size; MessageTypes _type; std::shared_ptr _buffer; - PerfTrace _trace; + trace::CorID _trace; MessageTypes get_type () const { diff --git a/src/lib/jetfix/connection/AsyncReader.cpp b/src/lib/jetfix/connection/AsyncReader.cpp index 4c513f5a5..93129e2d0 100644 --- a/src/lib/jetfix/connection/AsyncReader.cpp +++ b/src/lib/jetfix/connection/AsyncReader.cpp @@ -72,6 +72,7 @@ struct AsyncReader::PImpl PImpl(IConnection &connection, std::string const&connection_name, ICoreGatewayEventSink &sink, + trace::PerfLog &l, size_t buffer_sz, size_t high_water_mark) : @@ -81,6 +82,7 @@ struct AsyncReader::PImpl write_cursor (0), reader_thread (), sink (sink), + perf_log(l), high_water_mark (high_water_mark), connection_name(connection_name) {} @@ -98,6 +100,8 @@ struct AsyncReader::PImpl std::thread reader_thread; // an observer that will process the messages we frame ICoreGatewayEventSink &sink; + // For performance analysis + trace::PerfLog &perf_log; // a position in the current buffer that if reached signals the // need to increase the buffer size uint32_t high_water_mark; @@ -107,8 +111,9 @@ struct AsyncReader::PImpl AsyncReader::AsyncReader (IConnection &connection, std::string const&connection_name, ICoreGatewayEventSink &sink, + trace::PerfLog &log, size_t buffer_sz, size_t high_water_mark): - me (new PImpl(connection,connection_name,sink,buffer_sz,high_water_mark)) + me (new PImpl(connection,connection_name,sink,log,buffer_sz,high_water_mark)) {} void AsyncReader::start () @@ -137,8 +142,9 @@ void AsyncReader::dispatch () for (;;) { // read as many bytes as we have buffer space for auto read_count = me->connection.read (cursor (),free_bytes ()); - PerfTrace trace; - trace.fix_socket_r = utils::TimeStamp::now(); + auto read_time = utils::TimeStamp::now(); + trace::CorID trace; + trace.channel = "fix"; // signal a disconnect if the connection broke if (read_count <= 0) { @@ -162,6 +168,8 @@ void AsyncReader::dispatch () me->first_pending_msg += first_unprocessed_offset; for (auto &msg : framed_msgs) { + trace.sn = msg.get_seq_num(); + me->perf_log.log(trace,read_time,"fix_socket_r"); msg.set_trace(trace); LOG(Latency, Diag, "perf_event AsyncReader.on_fix"); tracepoint(bts_trace, trace_order, (char *)"AsyncReader.on_fix", 0, diff --git a/src/lib/jetfix/connection/AsyncReader.h b/src/lib/jetfix/connection/AsyncReader.h index 85063d1c7..5ef506a28 100644 --- a/src/lib/jetfix/connection/AsyncReader.h +++ b/src/lib/jetfix/connection/AsyncReader.h @@ -3,6 +3,7 @@ #include namespace bts { +namespace trace {class PerfLog;} namespace jetfix { class IConnection; @@ -16,6 +17,7 @@ public: AsyncReader(IConnection &connection, std::string const&connection_name, ICoreGatewayEventSink &sink, + trace::PerfLog &l, size_t buffer_sz, // initial buffer size to use size_t high_water_mark); // when do we allocate a new buffer void start (); diff --git a/src/lib/jetfix/connection/IConnection.h b/src/lib/jetfix/connection/IConnection.h index 3673788b9..ab8b9b214 100644 --- a/src/lib/jetfix/connection/IConnection.h +++ b/src/lib/jetfix/connection/IConnection.h @@ -1,9 +1,9 @@ #pragma once #include -#include "lib/orderman/orderman_utils/PerfTrace.h" namespace bts { +namespace trace {struct CorID;} namespace jetfix { class IConnection @@ -14,7 +14,7 @@ public: virtual bool connect () = 0; virtual void shutdown () = 0; virtual int read (char* to_buffer,size_t read_count) = 0; - virtual int write (WriteVec const&vec,size_t vec_size,PerfTrace const&trace) = 0; + virtual int write (WriteVec const&vec,size_t vec_size,trace::CorID trace) = 0; virtual ~IConnection() {}; }; diff --git a/src/lib/jetfix/connection/SocketConnection.cpp b/src/lib/jetfix/connection/SocketConnection.cpp index 10fd1907f..a3b390a45 100644 --- a/src/lib/jetfix/connection/SocketConnection.cpp +++ b/src/lib/jetfix/connection/SocketConnection.cpp @@ -1,11 +1,11 @@ #include "SocketConnection.h" #include "lib/jetfix/store/session_name.h" #include "lib/logging/logging.h" -#include "lib/orderman/orderman_utils/PerfTraceLog.h" #include "lib/tracing/bts_trace.h" #include "lib/utils/TimeStamp.h" #include "lib/utils/bts_assert.h" #include "lib/utils/helper_macros.h" +#include "lib/tracing/PerfLog.h" #include #include @@ -19,7 +19,7 @@ namespace bts { namespace jetfix { SocketConnection::SocketConnection(bts::config::JetFIX::Connection const &cfg, - PerfTraceLog &perf_log) + trace::PerfLog &perf_log) : _fd(-1), _cfg(cfg), _log(cfg.log_fix_stream()), _in_log(), _out_log(), _perf_log(perf_log) { if (_log) { @@ -98,7 +98,7 @@ int SocketConnection::read(char *to_buffer, size_t read_count) { } int SocketConnection::write(WriteVec const &vec, size_t vec_size, - PerfTrace const &trace) { + trace::CorID trace) { bts_assert(_fd >= 0); struct iovec iv[MaxWriteVecSz]; @@ -107,65 +107,9 @@ int SocketConnection::write(WriteVec const &vec, size_t vec_size, iv[i].iov_len = vec[i].second; } - auto trace_cpy = trace; - trace_cpy.fix_socket_w = utils::TimeStamp::now(); - - utils::TimeStamp::Interval s2s; - if (trace.md.to_uint64()) { - s2s = (trace_cpy.fix_socket_w - trace_cpy.md); - tracepoint(bts_trace, trace_order, - (char *)"SocketConnection.tick_to_order.pre_write", 0, - trace.md_sn, s2s.microseconds()); - } else { - s2s = (trace_cpy.fix_socket_w - trace_cpy.fix_socket_r); - tracepoint(bts_trace, trace_order, - (char *)"SocketConnection.fill_to_order.pre_write", 0, - trace.md_sn, s2s.microseconds()); - } - - LOG(Latency, Diag, "perf_event before_socket_write"); + _perf_log.log(trace,"before_fix_socket_w"); auto result = ::writev(_fd, iv, (int)vec_size); - - if (trace.md.to_uint64()) { - LOG(Latency, Info, - "perf_event:tick_to_order s2s_us:{} do_work_begin:{} fix_socket_r:{} " - "md:{} " - "md_src:{} spreader_on_book:{} spreader_modify_order:{} " - "spreader_on_child_order_update:{} " - "order_update:{} exe_gw:{} fix_socket_w:{} md_sn:{} order_key:{} " - "send_fix_buffer:{}", - s2s.microseconds(), trace_cpy.do_work_begin.to_uint64(), - trace_cpy.fix_socket_r.to_uint64(), trace_cpy.md.to_uint64(), - trace_cpy.md_src.to_uint64(), trace_cpy.spreader_on_book.to_uint64(), - trace_cpy.spreader_modify_order.to_uint64(), - trace_cpy.spreader_on_child_order_update.to_uint64(), - trace_cpy.order_update.to_uint64(), trace_cpy.exe_gw.to_uint64(), - trace_cpy.fix_socket_w.to_uint64(), trace_cpy.md_sn, - trace_cpy.order_key, trace.send_fix_buffer.to_uint64()); - _perf_log.log(trace_cpy); - } - - if (trace.fix_socket_r.to_uint64()) { - LOG(Latency, Info, - "perf_event:fill_to_order s2s_us:{} do_work_begin:{} fix_socket_r:{} " - "md:{} md_src:{} " - "spreader_on_book:{} spreader_modify_order:{} " - "spreader_on_child_order_update:{} " - "order_update:{} exe_gw:{} fix_socket_w:{} md_sn:{} order_key:{} " - "send_fix_buffer:{} ", - s2s.microseconds(), trace_cpy.do_work_begin.to_uint64(), - trace_cpy.fix_socket_r.to_uint64(), trace_cpy.md.to_uint64(), - trace_cpy.md_src.to_uint64(), trace_cpy.spreader_on_book.to_uint64(), - trace_cpy.spreader_modify_order.to_uint64(), - trace_cpy.spreader_on_child_order_update.to_uint64(), - trace_cpy.order_update.to_uint64(), trace_cpy.exe_gw.to_uint64(), - trace_cpy.fix_socket_w.to_uint64(), trace_cpy.md_sn, trace_cpy.order_key, - trace_cpy.send_fix_buffer.to_uint64()); - _perf_log.log(trace_cpy); - } - - tracepoint(bts_trace, trace_order, (char *)"SocketConnection.post_write", 0, - trace.md_sn, 0); + _perf_log.log(trace,"after_fix_socket_w"); if (_log && result > 0) { for (size_t i = 0; i < vec_size; i++) diff --git a/src/lib/jetfix/connection/SocketConnection.h b/src/lib/jetfix/connection/SocketConnection.h index 6246d3e5f..ebdf75828 100644 --- a/src/lib/jetfix/connection/SocketConnection.h +++ b/src/lib/jetfix/connection/SocketConnection.h @@ -7,19 +7,19 @@ #include "lib/metrics/metrics.h" namespace bts { -class PerfTraceLog; +namespace trace {class PerfLog;struct CorID;} namespace jetfix { class SocketConnection : public IConnection { public: - SocketConnection(bts::config::JetFIX::Connection const &cfgl,PerfTraceLog &log); + SocketConnection(bts::config::JetFIX::Connection const &cfgl,trace::PerfLog &log); ~SocketConnection(); bool connect () override; void shutdown () override; int read (char* to_buffer,size_t read_count) override; - int write (WriteVec const&vec,size_t vec_size,const PerfTrace &trace) override; + int write (WriteVec const&vec,size_t vec_size,trace::CorID ) override; private: int _fd; @@ -27,7 +27,7 @@ private: bool _log; std::ofstream _in_log; std::ofstream _out_log; - PerfTraceLog &_perf_log; + trace::PerfLog &_perf_log; }; }} diff --git a/src/lib/jetfix/gateway/CoreGateway.cpp b/src/lib/jetfix/gateway/CoreGateway.cpp index 1f062ea2f..67c54111f 100644 --- a/src/lib/jetfix/gateway/CoreGateway.cpp +++ b/src/lib/jetfix/gateway/CoreGateway.cpp @@ -1,26 +1,26 @@ #include "CoreGateway.h" -#include "lib/logging/logging.h" -#include "lib/utils/TimeStamp.h" -#include "lib/utils/bts_chrono.h" -#include "lib/utils/datetime.h" #include "lib/jetfix/common/OutFIX.h" #include "lib/jetfix/connection/AsyncReader.h" #include "lib/jetfix/connection/IConnection.h" #include "lib/jetfix/gateway/ICoreGatewayObserver.h" #include "lib/jetfix/gateway/Session.h" #include "lib/jetfix/store/IFIXStore.h" +#include "lib/logging/logging.h" #include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/tracing/bts_trace.h" -#include +#include "lib/utils/TimeStamp.h" +#include "lib/utils/bts_chrono.h" +#include "lib/utils/datetime.h" #include "lib/utils/thread_manager.h" +#include #include #include #include #include -#include #include +#include namespace bts { namespace jetfix { @@ -50,22 +50,17 @@ struct CoreGateway::EventData { : handler(src.handler), out_msgs(src.out_msgs), in_msg(src.in_msg), trace(src.trace), ts(src.ts) {} - EventData() - : handler(), out_msgs(), in_msg(), trace(), - ts() {} + EventData() : handler(), out_msgs(), in_msg(), trace(), ts() {} EventData(Handler handler) : handler(handler), out_msgs(), in_msg(), trace(), ts() {} - EventData(Handler handler, PerfTrace const &trace, - OutFIXPtr const &out_msgs) + EventData(Handler handler, trace::CorID const &trace, OutFIXPtr const &out_msgs) : handler(handler), out_msgs(out_msgs), in_msg(), trace(trace), ts() {} EventData(Handler handler, InMsgBuffer const &in_msg) - : handler(handler), out_msgs(), in_msg(in_msg), - trace(), ts() {} + : handler(handler), out_msgs(), in_msg(in_msg), trace(), ts() {} EventData(Handler handler, std::shared_ptr const &ts) - : handler(handler), out_msgs(), in_msg(), - trace(), ts(ts) {} + : handler(handler), out_msgs(), in_msg(), trace(), ts(ts) {} EventData &operator=(EventData &src) { handler = src.handler; @@ -87,19 +82,19 @@ struct CoreGateway::EventData { Handler handler; OutFIXPtr out_msgs; InMsgBuffer in_msg; - PerfTrace trace; + trace::CorID trace; std::shared_ptr ts; }; struct CoreGateway::PImpl { PImpl(config::JetFIX::Connection const &cfg, ICoreGatewayObserver &observer, ConnectionFactory const &conn_factory, - StoreFactory const &store_factory) + StoreFactory const &store_factory, trace::PerfLog &l) : cfg(cfg), observer(observer), make_connection(conn_factory), make_store(store_factory), state(State::OFF), start_of_pause(), session_info(), event_queue(), timer_thread(), destroy(false), is_on(false), has_replayed(false), send_batch(), recv_batch(), - connection_attempts(0) { + connection_attempts(0), perf_log(l) { send_batch.reserve(1024); recv_batch.reserve(1024); } @@ -112,7 +107,7 @@ struct CoreGateway::PImpl { State state; datetime::PTime start_of_pause; std::unique_ptr session_info; - tbb::concurrent_queue event_queue; + tbb::concurrent_queue event_queue; std::thread timer_thread; std::atomic destroy; bool is_on; @@ -120,18 +115,21 @@ struct CoreGateway::PImpl { std::vector send_batch; std::vector recv_batch; uint32_t connection_attempts; + trace::PerfLog &perf_log; }; std::thread CoreGateway::make_timer_thread() { - auto thread_name = fmt::format ("jf_tmr_{}", me->cfg.name()); - return threading::make_thread(thread_name, std::bind(&CoreGateway::call_time, this)); + auto thread_name = fmt::format("jf_tmr_{}", me->cfg.name()); + return threading::make_thread(thread_name, + std::bind(&CoreGateway::call_time, this)); } CoreGateway::CoreGateway(config::JetFIX::Connection const &cfg, ICoreGatewayObserver &observer, ConnectionFactory const &conn_factory, - StoreFactory const &store_factory) - : me(new PImpl(cfg, observer, conn_factory, store_factory)) { + StoreFactory const &store_factory, + trace::PerfLog &perf_trace) + : me(new PImpl(cfg, observer, conn_factory, store_factory, perf_trace)) { me->timer_thread = make_timer_thread(); } @@ -145,8 +143,7 @@ CoreGateway::~CoreGateway() { me->timer_thread.join(); } -void CoreGateway::send(PerfTrace const &trace, OutFIXPtr const &fix) { - tracepoint(bts_trace, trace_order, (char *)"CoreGateway.send", 0, trace.md_sn,0); +void CoreGateway::send(OutFIXPtr const &fix, trace::CorID trace) { me->event_queue.push(EventData(&CoreGateway::sync_send, trace, fix)); } @@ -262,7 +259,7 @@ void CoreGateway::sync_stop(EventData const &) { void CoreGateway::sync_send(EventData const &ev) { tracepoint(bts_trace, trace_order, (char *)"CoreGateway.sync_send", 0, - ev.trace.md_sn,0); + ev.trace.md_sn, 0); switch (me->state) { case State::OFF: bts_assert(false); @@ -273,7 +270,7 @@ void CoreGateway::sync_send(EventData const &ev) { case State::WSESSION_TERMINATE: break; case State::READY: - me->session_info->session->send(ev.trace, ev.out_msgs); + me->session_info->session->send(ev.out_msgs,ev.trace); break; default: bts_assert(false); @@ -477,7 +474,8 @@ void CoreGateway::sync_time(EventData const &ev) { []() { return utils::TimeStamp::now(); })); me->session_info->reader.reset(new AsyncReader( *me->session_info->connection, me->cfg.name(), *this, - me->cfg.msg_buffer_sz(), me->cfg.msg_high_water_mark())); + me->perf_log, me->cfg.msg_buffer_sz(), + me->cfg.msg_high_water_mark())); me->session_info->reader->start(); me->session_info->session->start(); transition(State::CONNECTING); @@ -573,5 +571,5 @@ const char *CoreGateway::state_name(State st) { bts_assert(false); } } -} -} +} // namespace jetfix +} // namespace bts diff --git a/src/lib/jetfix/gateway/CoreGateway.h b/src/lib/jetfix/gateway/CoreGateway.h index dba302441..fcba9510b 100644 --- a/src/lib/jetfix/gateway/CoreGateway.h +++ b/src/lib/jetfix/gateway/CoreGateway.h @@ -10,6 +10,7 @@ #include "lib/config/protos/jetfix.pb.h" namespace bts { +namespace trace {class PerfLog;} namespace jetfix { class ICoreGatewayObserver; class IConnection; @@ -25,12 +26,13 @@ public: CoreGateway(config::JetFIX::Connection const &cfg, ICoreGatewayObserver &observer, ConnectionFactory const &conn_factory, - StoreFactory const &store_factory); + StoreFactory const &store_factory, + trace::PerfLog &); ~CoreGateway(); void start (); void stop (); - void send (PerfTrace const&, OutFIXPtr const &msgs); + void send (OutFIXPtr const &msgs, trace::CorID trace); void dispatch_events (); // for certification use only diff --git a/src/lib/jetfix/gateway/JetFIXGateway.h b/src/lib/jetfix/gateway/JetFIXGateway.h index 6578bb8fd..6454aab8f 100644 --- a/src/lib/jetfix/gateway/JetFIXGateway.h +++ b/src/lib/jetfix/gateway/JetFIXGateway.h @@ -8,11 +8,12 @@ #include "lib/jetfix/store/FIXFileStore.h" #include "lib/utils/meta_programming.h" #include "lib/orderman/orderman_utils/orderman_common.h" +#include "lib/tracing/PerfLog.h" #include "lib/config/protos/jetfix.pb.h" namespace bts { -class PerfTraceLog; +namespace trace {class PerfLog;} namespace jetfix { // A parsing layer over CoreGateway @@ -20,7 +21,7 @@ template class JetFIXGateway : ICoreGatewayObserver { public: - JetFIXGateway(config::JetFIX::Connection const &cfg, PerfTraceLog &log) + JetFIXGateway(config::JetFIX::Connection const &cfg, trace::PerfLog &log) : _core (cfg,*this, @@ -28,13 +29,16 @@ public: {return new SocketConnection (cfg,log);}, [] (config::JetFIX::Connection const &cfg) - { return new FIXFileStore (cfg);}), + { return new FIXFileStore (cfg);}, + + log), _dispatchers (), _dispatcher_idx (), _on_ready ([](){}), _on_disconnect ([](){}), _on_begin_replay ([](){}), - _on_end_replay ([](){}) + _on_end_replay ([](){}), + _perf_log(log) { std::vector disp_vec; meta::collect_tuple_items (_dispatchers,&disp_vec); @@ -45,7 +49,7 @@ public: void start () {_core.start ();} void stop () {_core.stop ();} - void send (PerfTrace const &trace, OutFIXPtr const &msgs) {_core.send (trace,msgs);} + void send (OutFIXPtr const &msgs,trace::CorID trace ) {_core.send (msgs,trace);} void dispatch_events () {_core.dispatch_events ();} @@ -123,6 +127,7 @@ private: std::function _on_disconnect; std::function _on_begin_replay; std::function _on_end_replay; + trace::PerfLog &_perf_log; }; }} diff --git a/src/lib/jetfix/gateway/Session.cpp b/src/lib/jetfix/gateway/Session.cpp index 232469c06..05609d611 100644 --- a/src/lib/jetfix/gateway/Session.cpp +++ b/src/lib/jetfix/gateway/Session.cpp @@ -106,8 +106,7 @@ void Session::start() { *me->current_time, me->cfg)); } -void Session::send(PerfTrace const &trace, OutFIXPtr const &msgs) { - tracepoint(bts_trace, trace_order, (char *)"Session.send", 0, trace.md_sn, 0); +void Session::send(OutFIXPtr const &msgs,trace::CorID trace) { switch (me->state) { case State::READY: case State::CERT_MODE: @@ -547,10 +546,10 @@ void Session::buffer_or_deliver(InMsgBuffer const &msg) { } void Session::internal_send(OutFIXPtr const &msgs) { - internal_send(PerfTrace(), msgs); + internal_send(trace::CorID {},msgs); } -void Session::internal_send(PerfTrace const &trace, OutFIXPtr const &msgs) { +void Session::internal_send(trace::CorID trace, OutFIXPtr const &msgs) { IConnection::WriteVec data_vec; bts_assert(msgs->fix.size() < IConnection::MaxWriteVecSz); @@ -681,7 +680,7 @@ void Session::send_seq_reset(uint32_t sn, uint32_t new_sn) { IConnection::WriteVec data_vec; data_vec[0].first = stream.data(); data_vec[0].second = stream.size(); - if (me->connection.write(data_vec, 1, PerfTrace()) < 0) { + if (me->connection.write(data_vec, 1, trace::CorID()) < 0) { terminate_session(JetFIXError::CONNECTION_ERROR); return; } else { diff --git a/src/lib/jetfix/gateway/Session.h b/src/lib/jetfix/gateway/Session.h index 86ac8472d..3808a78d1 100644 --- a/src/lib/jetfix/gateway/Session.h +++ b/src/lib/jetfix/gateway/Session.h @@ -8,6 +8,7 @@ #include "lib/utils/datetime.h" #include "lib/jetfix/common/OutFIXPtr.h" #include "lib/orderman/orderman_utils/orderman_common.h" +#include "lib/tracing/PerfLog.h" #include "lib/config/protos/jetfix.pb.h" @@ -31,7 +32,7 @@ public: ~Session(); void start (); - void send (PerfTrace const &, OutFIXPtr const&); + void send (OutFIXPtr const&, trace::CorID); void receive (InMsgBuffer const&); void shutdown (); void time (std::shared_ptr const&time_str); @@ -59,7 +60,7 @@ private: void buffer (InMsgBuffer const &msg); void buffer_or_deliver (InMsgBuffer const&msg); - void internal_send (PerfTrace const&, OutFIXPtr const&); + void internal_send (trace::CorID , OutFIXPtr const&); void internal_send (OutFIXPtr const&); void logout (JetFIXError::Code reason); void logout (JetFIXError::Code reason,std::string const &extra_info); diff --git a/src/lib/jetfix/tests/async_reader_tests.cpp b/src/lib/jetfix/tests/async_reader_tests.cpp index 362bb0211..d75fff0f2 100644 --- a/src/lib/jetfix/tests/async_reader_tests.cpp +++ b/src/lib/jetfix/tests/async_reader_tests.cpp @@ -111,7 +111,7 @@ struct Connection : public IConnection return str.gcount (); } - int write (WriteVec const&,size_t, PerfTrace const&) + int write (WriteVec const&,size_t, trace::CorID ) {return -1;} std::istream &str; @@ -119,6 +119,8 @@ struct Connection : public IConnection TEST_CASE ("JetFIX AsyncReaderTests", "[jetfix]") { + trace::PerfLog l; + SECTION ("jeftix_smoke") { std::stringstream str; @@ -128,7 +130,7 @@ TEST_CASE ("JetFIX AsyncReaderTests", "[jetfix]") MyGWObserver ob; { - AsyncReader r (c,"test",ob,10,5); + AsyncReader r (c,"test",ob,l,10,5); r.start (); } @@ -144,7 +146,7 @@ TEST_CASE ("JetFIX AsyncReaderTests", "[jetfix]") MyGWObserver ob; { - AsyncReader r (c,"test",ob,10,5); + AsyncReader r (c,"test",ob,l,10,5); r.start (); } REQUIRE (ob.got_eof); diff --git a/src/lib/mercury/actors/ContentSubscription.h b/src/lib/mercury/actors/ContentSubscription.h index b7803d0fc..92a6cccf5 100644 --- a/src/lib/mercury/actors/ContentSubscription.h +++ b/src/lib/mercury/actors/ContentSubscription.h @@ -4,6 +4,7 @@ #include #include #include +#include #include "lib/utils/bts_assert.h" @@ -100,7 +101,7 @@ template class ContentSubscription { CB cb; }; - using SubList = std::vector; + using SubList = boost::container::small_vector; using Subscriptions = std::unordered_map; Actor *_actor; diff --git a/src/lib/orderman/actors/ExecutionGateway.cpp b/src/lib/orderman/actors/ExecutionGateway.cpp index 28c59e426..334f484ed 100644 --- a/src/lib/orderman/actors/ExecutionGateway.cpp +++ b/src/lib/orderman/actors/ExecutionGateway.cpp @@ -24,10 +24,10 @@ using JFGw = fix::RejectMsg, fix::CancelRejectMsg>; struct ExecutionGateway::PImpl { - PImpl(config::JetFIX::Connection const &cfg, PerfTraceLog &log) - : gw(cfg, log), exe_report_pool(), state(State::WAITING_FOR_SECURITIES), + PImpl(config::JetFIX::Connection const &cfg, trace::PerfLog &l) + : gw(cfg, l), exe_report_pool(), state(State::WAITING_FOR_SECURITIES), securities(), securities_by_descriptor(), gw_name(cfg.name()), - cfg(cfg) {} + cfg(cfg), perf_log(l) {} JFGw gw; boost::object_pool exe_report_pool; @@ -40,10 +40,11 @@ struct ExecutionGateway::PImpl { OnExeReport on_exe_report; OnGwStatusChange on_gw_status_change; OnCancelReject on_cancel_reject; + trace::PerfLog &perf_log; }; ExecutionGateway::ExecutionGateway(config::JetFIX::Connection const &cfg, - PerfTraceLog &log) + trace::PerfLog &log) : me(new PImpl(cfg, log)) { me->state = State::WAITING_FOR_SECURITIES; } @@ -249,9 +250,8 @@ void ExecutionGateway::on_exe_report( str_to(msg.get(), &data->transact_time); data->cfg = &me->cfg; data->msg = text_msg; - auto trace = msg.trace(); - trace.exe_gw = utils::TimeStamp::now(); - me->on_exe_report(*data, trace); + me->perf_log.log(msg.trace(),"exe_gw"); + me->on_exe_report(*data, msg.trace()); LOG(Latency, Info, "Finished handling of execution report for order {}. {}ns", ok.value(), ns_diff(Timer::now(), start)); @@ -303,10 +303,9 @@ void ExecutionGateway::dispatch_incoming_fix_messages() { } void ExecutionGateway::send_fix(jetfix::OutFIXPtr const &fix, - PerfTrace &trace) { - LOG(Latency, Info, "on_outgoing_fix sn: {} ok: {}", trace.md_sn, trace.order_key); - trace.exe_gw = utils::TimeStamp::now(); - me->gw.send(trace,fix); + trace::CorID trace) { + me->perf_log.log(trace,"exe_gw"); + me->gw.send(fix,trace); me->gw.dispatch_events(); } diff --git a/src/lib/orderman/actors/ExecutionGateway.h b/src/lib/orderman/actors/ExecutionGateway.h index 0e028105b..b94d56afa 100644 --- a/src/lib/orderman/actors/ExecutionGateway.h +++ b/src/lib/orderman/actors/ExecutionGateway.h @@ -9,26 +9,26 @@ #include namespace bts { -class PerfTraceLog; +namespace trace {struct CorID;class PerfLog;} namespace orderman { class NewSecuritiesEvent; class ExecutionReport; using OnExeReport = - std::function; + std::function; using OnGwStatusChange = std::function; using OnCancelReject = std::function; // fix execution gateway for a single FIX session class ExecutionGateway { public: - ExecutionGateway(config::JetFIX::Connection const &, PerfTraceLog &); + ExecutionGateway(config::JetFIX::Connection const &, trace::PerfLog &); ~ExecutionGateway(); void start(); void dispatch_incoming_fix_messages(); void on_securities(const mercury::Update &); - void send_fix(jetfix::OutFIXPtr const &fix, PerfTrace &trace); + void send_fix(jetfix::OutFIXPtr const &fix, trace::CorID trace); OnExeReport& on_exe_report(); OnGwStatusChange& on_gw_status_change(); diff --git a/src/lib/orderman/actors/MDSource.h b/src/lib/orderman/actors/MDSource.h index 5a8e506e4..83f58a387 100644 --- a/src/lib/orderman/actors/MDSource.h +++ b/src/lib/orderman/actors/MDSource.h @@ -10,6 +10,7 @@ #include "lib/orderman/events/MDRequestEvent.h" #include "lib/tracing/bts_trace.h" #include "lib/utils/TimeStamp.h" +#include "lib/tracing/PerfLog.h" namespace bts { namespace orderman { @@ -21,8 +22,8 @@ namespace orderman { class MDSource : public mercury::Actor, public mercury::IPollableActor { public: - MDSource(md::MDConsumer &consumer, metrics::MetricsContainer &stats) - : _handles(), _md_consumer(consumer), _book_update(), _stats(stats), _loop_timer() {} + MDSource(md::MDConsumer &consumer, metrics::MetricsContainer &stats, trace::PerfLog &log) + : _handles(), _md_consumer(consumer), _book_update(), _perf_log(log),_stats(stats), _loop_timer() {} void init() override { LOG(OrderMan, Warn, "Starting MDSource actor"); bts_assert_msg(_md_consumer.all_heartbeats_ok(), "Marketdata heartbeats are bad. MDConsumer will not recover from this condition. Please run 'sparkd md cleanup' and restart sparkd"); @@ -77,21 +78,15 @@ class MDSource : public mercury::Actor, public mercury::IPollableActor { void on_poll() override { Book book; - PerfTrace trace; auto start = utils::TimeStamp::now(); - trace.do_work_begin = start; - for (auto &h : _handles) { auto &handle = h.handle; if (handle.get_book(h.last, std::tuple_size(), &book.bid()[0], &book.ask()[0]) == md::HandleReadResult::SUCCESS) { book._security_key = SecurityKey(handle.key()); - trace.md_src = utils::TimeStamp::now(); - trace.md_sn = trace.md_src.to_uint64(); - trace.md = h.last; - - tracepoint(bts_trace, trace_order, "MDSource", 0, trace.md_sn, 0); + trace::CorID trace {"md",handle.sequence()}; + _perf_log.log(trace,h.last,"md",handle.key()); publish(_book_update, book, trace); } } @@ -107,6 +102,7 @@ class MDSource : public mercury::Actor, public mercury::IPollableActor { std::vector _handles; md::MDConsumer _md_consumer; mercury::Stream _book_update; + trace::PerfLog &_perf_log; metrics::MetricsContainer &_stats; std::shared_ptr> _loop_timer; }; diff --git a/src/lib/orderman/actors/ServiceBridge.cpp b/src/lib/orderman/actors/ServiceBridge.cpp index b9c683150..de8f85dd6 100644 --- a/src/lib/orderman/actors/ServiceBridge.cpp +++ b/src/lib/orderman/actors/ServiceBridge.cpp @@ -15,6 +15,7 @@ #include "lib/orderman/order_router/OrderRouter.h" #include "lib/orderman/securities/MapSecurityDB.h" #include "lib/utils/PBUtils.h" +#include "lib/tracing/PerfLog.h" #include "lib/api/services/OrderService.pb.h" #include "lib/orderman/orderman_utils/orderman_common.h" @@ -150,7 +151,7 @@ ServiceBridge::create_order(api::orderman::Create const &c) { me->order_factory.create(null_order_key(), c.new_order()); me->known_orders.insert(order.key()); publish(me->activate_order_pub, order, Price(c.price()), - Quantity(c.quantity()), PerfTrace()); + Quantity(c.quantity()), trace::CorID()); r.set_order_key(order.key().value()); r.set_error_code(api::orderman::ORDER_ERROR_OK); } else diff --git a/src/lib/orderman/actors/order_manager/ChildOrder.h b/src/lib/orderman/actors/order_manager/ChildOrder.h index c9d1e014a..ed506a3d2 100644 --- a/src/lib/orderman/actors/order_manager/ChildOrder.h +++ b/src/lib/orderman/actors/order_manager/ChildOrder.h @@ -39,7 +39,7 @@ class ChildOrder { bool is_active() const { return _active; } - void activate(Price p, Quantity q, PerfTrace const &trace = PerfTrace()) { + void activate(Price p, Quantity q, trace::CorID const &trace = trace::CorID()) { bts_assert(_order); bts_assert(!_active); @@ -48,19 +48,19 @@ class ChildOrder { _active = true; } - void update(Price p, Quantity q, PerfTrace const &trace = PerfTrace()) { + void update(Price p, Quantity q, trace::CorID const &trace = trace::CorID()) { bts_assert(_order); bts_assert(_active); _child_order_services->update(p, q, trace); } - void crack(PerfTrace const &trace = PerfTrace()) { + void crack(trace::CorID const &trace = trace::CorID()) { bts_assert(_order); bts_assert(_active); _child_order_services->crack(trace); } - void cancel(PerfTrace const &trace = PerfTrace()) { + void cancel(trace::CorID const &trace = trace::CorID()) { bts_assert(_order); bts_assert(_active); _child_order_services->cancel(trace); diff --git a/src/lib/orderman/actors/order_manager/OrderManager.cpp b/src/lib/orderman/actors/order_manager/OrderManager.cpp index 2d0dacddb..d65304712 100644 --- a/src/lib/orderman/actors/order_manager/OrderManager.cpp +++ b/src/lib/orderman/actors/order_manager/OrderManager.cpp @@ -31,7 +31,7 @@ enum class OrderManager::State { }; struct OrderManager::PImpl { - PImpl(OrderManager &owner, DynamicOrderRegistry const &b, PerfTraceLog &l) + PImpl(OrderManager &owner, DynamicOrderRegistry const &b, trace::PerfLog &l) : state(State::WAIT_ADMIN), services_data(owner, b, l) {} State state; @@ -42,7 +42,7 @@ struct OrderManager::PImpl { mercury::Stream pub_ready; }; -OrderManager::OrderManager(DynamicOrderRegistry const &b, PerfTraceLog &l) +OrderManager::OrderManager(DynamicOrderRegistry const &b, trace::PerfLog &l) : me(new PImpl(*this, b, l)) {} OrderManager::~OrderManager() {} @@ -155,7 +155,7 @@ void OrderManager::on_order_recovery( auto const &ostate = ev.order_record.state(); order.on_activate(Price(ostate.price()), Quantity(ostate.quantity()), *order._services, - PerfTrace()); + trace::CorID()); } // signal that we are ready @@ -189,7 +189,7 @@ void OrderManager::on_execution_report( auto r = me->orders.emplace(order->key(), order); bts_assert(r.second); order->on_activate(report.data->price, report.data->quantity, - *order->_services, PerfTrace()); + *order->_services, trace::CorID()); } } } @@ -265,7 +265,7 @@ void OrderManager::on_gateway_state( OrderServices &OrderManager::activate_child(OrderServices &parent, Order &order, Price p, Quantity q, - PerfTrace const &trace) { + trace::CorID const &trace) { order.init_order_services(me->services_data, parent); auto r = me->orders.emplace(order.key(), &order); bts_assert(r.second); diff --git a/src/lib/orderman/actors/order_manager/OrderManager.h b/src/lib/orderman/actors/order_manager/OrderManager.h index c827c2141..a8ec11582 100644 --- a/src/lib/orderman/actors/order_manager/OrderManager.h +++ b/src/lib/orderman/actors/order_manager/OrderManager.h @@ -14,7 +14,7 @@ // fwd namespace bts { -class PerfTraceLog; +namespace trace {class PerfLog;} namespace mercury { class TimerEvent; } @@ -60,7 +60,7 @@ namespace orderman { class OrderManager : public mercury::Actor, public mercury::IPollableActor { public: - OrderManager(DynamicOrderRegistry const &dyn_order_builder, PerfTraceLog &); + OrderManager(DynamicOrderRegistry const &dyn_order_builder, trace::PerfLog &); ~OrderManager(); void init() override; @@ -89,7 +89,7 @@ class OrderManager : public mercury::Actor, public mercury::IPollableActor { void after_event() override; OrderServices &activate_child(OrderServices &parent, Order &, Price, - Quantity, PerfTrace const &); + Quantity, trace::CorID const &); std::vector &free_buffers(std::string const &); enum class State; diff --git a/src/lib/orderman/actors/order_manager/OrderServices.h b/src/lib/orderman/actors/order_manager/OrderServices.h index cd8555787..d80f5c274 100644 --- a/src/lib/orderman/actors/order_manager/OrderServices.h +++ b/src/lib/orderman/actors/order_manager/OrderServices.h @@ -8,6 +8,7 @@ #include "lib/orderman/governor/Governor.h" #include "lib/orderman/orderman_utils/EventStream.h" #include "lib/orderman/orders/Order.h" +#include "lib/tracing/PerfLog.h" #include #include @@ -54,7 +55,7 @@ class SessionServices { } void queue_fix(jetfix::MessageTypes mt, jetfix::FIXFragment const &f, - PerfTrace const &trace) { + trace::CorID const &trace) { auto &stream = _session_data->current_buffer->first_stream(); stream.new_msg(mt).append(f); @@ -130,8 +131,14 @@ class OrderServices { return _data->last_timer_ev.ts_str; } + void log(trace::CorID cid, const char *entry_kind, uint32_t uint32_1 = 0, + uint32_t uint32_2 = 0, const char *txt_1 = "", + uint64_t uint64_1 = 0) { + _data->log.log(cid,entry_kind,uint32_1,uint32_2,txt_1,uint64_1); + } + void report_state(const api::orderman::OrderState &state, - PerfTrace const &trace = PerfTrace()) { + trace::CorID const &trace = trace::CorID()) { OrderStateUpdateEvent ev(_owner->key(), _owner->parent_key(), _owner->definition(), state, trace); @@ -233,19 +240,19 @@ class OrderServices { friend class ChildOrder; OrderServices &activate_child(Order &o, Price p, Quantity q, - PerfTrace const &trace) { + trace::CorID const &trace) { return _data->owner.activate_child(*this, o, p, q, trace); } - void update(Price p, Quantity q, PerfTrace const &trace) { + void update(Price p, Quantity q, trace::CorID const &trace) { on_inter_order_call([p, q, trace](OrderServices &self) { self._owner->on_update(p, q, trace); }); } - void crack(PerfTrace const &trace) { + void crack(trace::CorID const &trace) { on_inter_order_call( [trace](OrderServices &self) { self._owner->on_crack(trace); }); } - void cancel(PerfTrace const &trace) { + void cancel(trace::CorID const &trace) { on_inter_order_call( [trace](OrderServices &self) { self._owner->on_cancel(trace); }); } diff --git a/src/lib/orderman/actors/order_manager/OrderServicesData.cpp b/src/lib/orderman/actors/order_manager/OrderServicesData.cpp index 9bdd18f49..5b19f6e44 100644 --- a/src/lib/orderman/actors/order_manager/OrderServicesData.cpp +++ b/src/lib/orderman/actors/order_manager/OrderServicesData.cpp @@ -7,16 +7,16 @@ namespace orderman { OrderServicesData::OrderServicesData(OrderManager &owner, DynamicOrderRegistry const &b, - PerfTraceLog &l) - : owner(owner), order_router(), order_factory(sec_db, order_router, b), + trace::PerfLog &l) + : owner(owner), log(l), order_router(), + order_factory(sec_db, order_router, b), last_timer_ev( Timer::now(), to(datetime::FIX_timestamp(datetime::now()))) { auto &all_connections = config::get().connection(); for (auto const &c : all_connections) - sessions.push_back(std::make_unique( - c, l)); + sessions.push_back(std::make_unique(c, l)); } } // namespace orderman } // namespace bts diff --git a/src/lib/orderman/actors/order_manager/OrderServicesData.h b/src/lib/orderman/actors/order_manager/OrderServicesData.h index bfd155164..06fe8bca2 100644 --- a/src/lib/orderman/actors/order_manager/OrderServicesData.h +++ b/src/lib/orderman/actors/order_manager/OrderServicesData.h @@ -44,7 +44,7 @@ struct ParentKey { }; struct SessionServicesData { - SessionServicesData(config::JetFIX::Connection const &cfg, PerfTraceLog &log) + SessionServicesData(config::JetFIX::Connection const &cfg, trace::PerfLog &log) : session(cfg.name()), gw_connected(false), cfg(cfg), governor(cfg.max_order_msgs_per_window(), cfg.window_duration_msecs()), gw(cfg, log) {} @@ -63,7 +63,7 @@ struct SessionServicesData { Governor governor; jetfix::OutFIXPtr current_buffer; - PerfTrace current_trace; + trace::CorID current_trace; ExecutionGateway gw; mercury::Stream exe_report_pub; mercury::Stream gw_status_change_pub; @@ -72,14 +72,16 @@ struct SessionServicesData { class OrderServicesData { public: + OrderServicesData(OrderManager &owner, DynamicOrderRegistry const &b, - PerfTraceLog &l); + trace::PerfLog &l); + OrderManager &owner; + trace::PerfLog &log; securities::MapSecurityDB sec_db; OrderRouter order_router; Limiter limiter; OrderFactory order_factory; - std::unique_ptr> md_subs; std::unique_ptr> settlement_subs; diff --git a/src/lib/orderman/events/ActivateOrderEvent.h b/src/lib/orderman/events/ActivateOrderEvent.h index 874b79f99..91f0f5f46 100644 --- a/src/lib/orderman/events/ActivateOrderEvent.h +++ b/src/lib/orderman/events/ActivateOrderEvent.h @@ -4,6 +4,7 @@ #include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/mercury/events/Event.h" +#include "lib/tracing/PerfLog.h" namespace bts { namespace orderman { @@ -18,14 +19,14 @@ public: order (&o),price(p),quantity(q), trace() {} - ActivateOrderEvent (Order &o,Price p, Quantity q,PerfTrace trace) : + ActivateOrderEvent (Order &o,Price p, Quantity q,trace::CorID trace) : order (&o),price(p),quantity(q), trace(trace) {} Order* order; Price price; Quantity quantity; - PerfTrace trace; + trace::CorID trace; }; }} diff --git a/src/lib/orderman/events/BookUpdateEvent.h b/src/lib/orderman/events/BookUpdateEvent.h index cd2fe6aa1..bf71357a8 100644 --- a/src/lib/orderman/events/BookUpdateEvent.h +++ b/src/lib/orderman/events/BookUpdateEvent.h @@ -5,6 +5,7 @@ #include "lib/mercury/events/Event.h" #include "lib/orderman/orderman_utils/Book.h" #include "lib/orderman/orderman_utils/orderman_common.h" +#include "lib/tracing/PerfLog.h" namespace bts { namespace orderman { @@ -13,10 +14,10 @@ class BookUpdateEvent : public mercury::Event { public: using SynopsisPolicy = mercury::NoSynopsis; Book book; - PerfTrace trace; + trace::CorID trace; SecurityKey key() const { return book.security_key(); } - BookUpdateEvent(const Book &b, PerfTrace const &trace) + BookUpdateEvent(const Book &b, trace::CorID const &trace) : book(b), trace(trace) {} }; } diff --git a/src/lib/orderman/events/CancelOrderEvent.h b/src/lib/orderman/events/CancelOrderEvent.h index 9593dcd3c..cdc2fa563 100644 --- a/src/lib/orderman/events/CancelOrderEvent.h +++ b/src/lib/orderman/events/CancelOrderEvent.h @@ -4,6 +4,7 @@ #include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/mercury/events/Event.h" +#include "lib/tracing/PerfLog.h" namespace bts { namespace orderman { @@ -14,12 +15,12 @@ public: using SynopsisPolicy = mercury::NoSynopsis; CancelOrderEvent (OrderKey k) : k (k), trace() {} - CancelOrderEvent (OrderKey k,PerfTrace const&trace) : k (k), trace(trace) {} + CancelOrderEvent (OrderKey k,trace::CorID const&trace) : k (k), trace(trace) {} // used by ContentSubscription OrderKey key() const {return k;} OrderKey k; - PerfTrace trace; + trace::CorID trace; }; }} diff --git a/src/lib/orderman/events/CrackOrderEvent.h b/src/lib/orderman/events/CrackOrderEvent.h index 833df23ba..115826241 100644 --- a/src/lib/orderman/events/CrackOrderEvent.h +++ b/src/lib/orderman/events/CrackOrderEvent.h @@ -4,6 +4,7 @@ #include "lib/mercury/events/Event.h" #include "lib/orderman/orderman_utils/orderman_common.h" +#include "lib/tracing/PerfLog.h" namespace bts { namespace orderman { @@ -15,13 +16,13 @@ class CrackOrderEvent : public mercury::Event { CrackOrderEvent(OrderKey k) : k(k), trace() {} - CrackOrderEvent(OrderKey k, PerfTrace const &trace) + CrackOrderEvent(OrderKey k, trace::CorID const &trace) : k(k), trace(trace) {} // used by ContentSubscription OrderKey key() const { return k; } OrderKey k; - PerfTrace trace; + trace::CorID trace; }; } } diff --git a/src/lib/orderman/events/NewExecutionReportEvent.h b/src/lib/orderman/events/NewExecutionReportEvent.h index c1971d4ce..87fb02224 100644 --- a/src/lib/orderman/events/NewExecutionReportEvent.h +++ b/src/lib/orderman/events/NewExecutionReportEvent.h @@ -7,6 +7,8 @@ #include "lib/mercury/synopsis/CacheAll.h" #include "lib/orderman/orderman_utils/ExecutionReport.h" #include "lib/orderman/orderman_utils/orderman_common.h" +#include "lib/tracing/PerfLog.h" + #include #include @@ -19,10 +21,10 @@ class NewExecutionReportEvent : public mercury::Event { using Tag = GatewayName; using SynopsisPolicy = mercury::CacheAll; ExecutionReport const *data; - PerfTrace trace; + trace::CorID trace; // used by ContentSubscription OrderKey key() const { return data->order_key; } - NewExecutionReportEvent(const ExecutionReport *dt, PerfTrace const &trace) + NewExecutionReportEvent(const ExecutionReport *dt, trace::CorID const &trace) : data(dt), trace(trace){}; }; diff --git a/src/lib/orderman/events/OrderStateUpdateEvent.h b/src/lib/orderman/events/OrderStateUpdateEvent.h index 5e888040c..1083866ba 100644 --- a/src/lib/orderman/events/OrderStateUpdateEvent.h +++ b/src/lib/orderman/events/OrderStateUpdateEvent.h @@ -2,9 +2,10 @@ #include "lib/mercury/events/Event.h" #include "lib/orderman/orderman_utils/PerfTrace.h" -#include - #include "lib/api/services/OrderService.pb.h" +#include "lib/tracing/PerfLog.h" + +#include namespace bts { namespace orderman { @@ -15,7 +16,7 @@ class OrderStateUpdateEvent : public mercury::Event { OrderStateUpdateEvent(OrderKey key, OrderKey parent_key, api::orderman::OrderDefinition const &def, api::orderman::OrderState const &state, - PerfTrace const &trace = PerfTrace()) + trace::CorID const &trace = trace::CorID()) : key(key), parent_key(parent_key), trace(trace), definition(&def) { status = state.status(); @@ -51,7 +52,7 @@ class OrderStateUpdateEvent : public mercury::Event { double avg_price; std::string last_msg; - PerfTrace trace; + trace::CorID trace; api::orderman::OrderState::CustomCase custom; // native order state diff --git a/src/lib/orderman/events/UpdateOrderEvent.h b/src/lib/orderman/events/UpdateOrderEvent.h index 80c0f3c54..c514c9649 100644 --- a/src/lib/orderman/events/UpdateOrderEvent.h +++ b/src/lib/orderman/events/UpdateOrderEvent.h @@ -4,6 +4,7 @@ #include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/mercury/events/Event.h" +#include "lib/tracing/PerfLog.h" namespace bts { namespace orderman { @@ -17,7 +18,7 @@ public: k(k), price(p), quantity(q), trace() {} - UpdateOrderEvent (OrderKey k, Price p, Quantity q,PerfTrace const&trace) : + UpdateOrderEvent (OrderKey k, Price p, Quantity q,trace::CorID const&trace) : k(k), price(p), quantity(q), trace(trace) {} @@ -27,7 +28,7 @@ public: OrderKey k; Price price; Quantity quantity; - PerfTrace trace; + trace::CorID trace; }; }} diff --git a/src/lib/orderman/orders/DynamicOrder.cpp b/src/lib/orderman/orders/DynamicOrder.cpp index 3326b62e0..df6670c3f 100644 --- a/src/lib/orderman/orders/DynamicOrder.cpp +++ b/src/lib/orderman/orders/DynamicOrder.cpp @@ -49,13 +49,13 @@ void DynamicOrder::on_init_recovered(api::orderman::OrderRecord const &rec, } void DynamicOrder::on_activate(Price, Quantity, OrderServices &services, - PerfTrace const &) { + trace::CorID const &) { services.report_state(me->state); } -void DynamicOrder::on_update(Price, Quantity, PerfTrace const &) {} -void DynamicOrder::on_crack(PerfTrace const &) {} -void DynamicOrder::on_cancel(PerfTrace const &) {} +void DynamicOrder::on_update(Price, Quantity, trace::CorID const &) {} +void DynamicOrder::on_crack(trace::CorID const &) {} +void DynamicOrder::on_cancel(trace::CorID const &) {} } // namespace orderman } // namespace bts diff --git a/src/lib/orderman/orders/DynamicOrder.h b/src/lib/orderman/orders/DynamicOrder.h index 5318649bf..d346b6b5c 100644 --- a/src/lib/orderman/orders/DynamicOrder.h +++ b/src/lib/orderman/orders/DynamicOrder.h @@ -19,10 +19,10 @@ public: const PreActivationOrderServices&) override; void on_init_recovered(api::orderman::OrderRecord const&, const PreActivationOrderServices &) override; - void on_activate(Price,Quantity,OrderServices &, PerfTrace const&) override ; - void on_update(Price , Quantity,PerfTrace const&) override ; - void on_crack(PerfTrace const&) override ; - void on_cancel(PerfTrace const&) override ; + void on_activate(Price,Quantity,OrderServices &, trace::CorID const&) override ; + void on_update(Price , Quantity,trace::CorID const&) override ; + void on_crack(trace::CorID const&) override ; + void on_cancel(trace::CorID const&) override ; private: struct PImpl; diff --git a/src/lib/orderman/orders/IcebergOrder.cpp b/src/lib/orderman/orders/IcebergOrder.cpp index 4c26b07f9..df72b6911 100644 --- a/src/lib/orderman/orders/IcebergOrder.cpp +++ b/src/lib/orderman/orders/IcebergOrder.cpp @@ -104,7 +104,7 @@ void IcebergOrder::on_init_recovered(api::orderman::OrderRecord const &rec, } void IcebergOrder::on_activate(Price p, Quantity q, OrderServices &services, - PerfTrace const &) { + trace::CorID const &) { bts_assert(!me->services); me->services = &services; me->child_builder.activate(services); @@ -145,7 +145,7 @@ void IcebergOrder::on_activate(Price p, Quantity q, OrderServices &services, report_state(); } -void IcebergOrder::on_update(Price p, Quantity q, PerfTrace const &) { +void IcebergOrder::on_update(Price p, Quantity q, trace::CorID const &) { switch (me->state.status()) { case ORDER_STATUS_WORKING: case ORDER_STATUS_PENDING_WORKING: @@ -171,9 +171,9 @@ void IcebergOrder::on_update(Price p, Quantity q, PerfTrace const &) { report_state(); } -void IcebergOrder::on_crack(PerfTrace const &) {} +void IcebergOrder::on_crack(trace::CorID const &) {} -void IcebergOrder::on_cancel(PerfTrace const &) { +void IcebergOrder::on_cancel(trace::CorID const &) { switch (me->state.status()) { case ORDER_STATUS_WORKING: LOG(OrderMan, Info, "Canceling Iceberg Order {}", key().value()); @@ -255,7 +255,7 @@ void IcebergOrder::send_next_child_order() { key().value(), me->child.order.key().value(), to_send, me->state.price(), me->state.filled_quantity(), me->state.quantity()); - me->child.order.activate(Price(me->state.price()), Quantity(to_send), PerfTrace()); + me->child.order.activate(Price(me->state.price()), Quantity(to_send), trace::CorID()); } void IcebergOrder::on_child_order_update(OrderStateUpdateEvent const &ev) { diff --git a/src/lib/orderman/orders/IcebergOrder.h b/src/lib/orderman/orders/IcebergOrder.h index a7442b923..c0b3f8ceb 100644 --- a/src/lib/orderman/orders/IcebergOrder.h +++ b/src/lib/orderman/orders/IcebergOrder.h @@ -20,10 +20,10 @@ public: const PreActivationOrderServices&) override; void on_init_recovered(api::orderman::OrderRecord const&, const PreActivationOrderServices &) override; - void on_activate(Price,Quantity,OrderServices &, PerfTrace const&) override ; - void on_update(Price , Quantity,PerfTrace const&) override ; - void on_crack(PerfTrace const&) override ; - void on_cancel(PerfTrace const&) override ; + void on_activate(Price,Quantity,OrderServices &, trace::CorID const&) override ; + void on_update(Price , Quantity,trace::CorID const&) override ; + void on_crack(trace::CorID const&) override ; + void on_cancel(trace::CorID const&) override ; private: void report_state(); diff --git a/src/lib/orderman/orders/NativeOrder.cpp b/src/lib/orderman/orders/NativeOrder.cpp index acb980068..78e4a1c26 100644 --- a/src/lib/orderman/orders/NativeOrder.cpp +++ b/src/lib/orderman/orders/NativeOrder.cpp @@ -274,15 +274,9 @@ NativeOrder::~NativeOrder() {} void NativeOrder::on_activate(Price p, Quantity q, bts::orderman::OrderServices &services, - PerfTrace const &t) { - LOG(Latency, Info, "on_activate start {}", key().value()); - - auto trace = t; - trace.order_key = key().value(); - trace.order_update = utils::TimeStamp::now(); - - tracepoint(bts_trace, trace_order, (char *)"on_activate", 0, trace.md_sn, - key().value()); + trace::CorID const &trace) { + services.log(trace,"on_activate_start",key().value()); + bts_assert(!me->services); me->services = &services; @@ -390,14 +384,13 @@ void NativeOrder::on_activate(Price p, Quantity q, auto const &ts = services.get_time_str(); me->create_transact_time_bm = encoding.overwrite( me->create_transact_time_bm, &ts.value()[0], ts.value().size()); - trace.send_fix_buffer = utils::TimeStamp::now(); + services.log(trace,"send_fix_buffer",key().value()); me->session_services->queue_fix(jetfix::MessageTypes::NewOrderSingle, me->create_encoding, trace); me->session_services->governor().record_sent(); me->state.set_status(ORDER_STATUS_PENDING_WORKING); - LOG(Latency, Diag, "on_activate done fix {} t: {}us", key().value(), - (utils::TimeStamp::now() - trace.order_update).microseconds()); + services.log(trace,"on_activate_done",key().value()); LOG(OrderMan, Info, "Sent new order with key {} to gateway", key().value()); // early return so we skip the expensive report_state() call @@ -458,12 +451,9 @@ void NativeOrder::on_activate(Price p, Quantity q, report_state(); } -void NativeOrder::on_update(Price p, Quantity q, PerfTrace const &t) { - auto trace = t; - trace.order_update = utils::TimeStamp::now(); - trace.order_key = key().value(); - tracepoint(bts_trace, trace_order, (char *)"on_update.begin", 0, trace.md_sn, - trace.order_key); +void NativeOrder::on_update(Price p, Quantity q, trace::CorID const &trace) { + + me->services->log(trace,"order_update",key().value()); switch (me->state.status()) { @@ -564,9 +554,9 @@ void NativeOrder::on_update(Price p, Quantity q, PerfTrace const &t) { report_state(); } -void NativeOrder::on_crack(PerfTrace const &) {} +void NativeOrder::on_crack(trace::CorID const &) {} -void NativeOrder::on_cancel(PerfTrace const &trace) { +void NativeOrder::on_cancel(trace::CorID const &trace) { switch (me->state.status()) { case ORDER_STATUS_WORKING: { @@ -818,7 +808,7 @@ void NativeOrder::update_working_position() { key().value(), me->definition.security_key()); } -void NativeOrder::report_state(PerfTrace const &trace) { +void NativeOrder::report_state(trace::CorID const &trace) { update_working_position(); me->services->report_state(me->state, trace); } diff --git a/src/lib/orderman/orders/NativeOrder.h b/src/lib/orderman/orders/NativeOrder.h index d1b52279c..88c040a58 100644 --- a/src/lib/orderman/orders/NativeOrder.h +++ b/src/lib/orderman/orders/NativeOrder.h @@ -3,7 +3,7 @@ #include #include "lib/orderman/orders/Order.h" #include "lib/api/services/OrderService.pb.h" -#include "lib/orderman/orderman_utils/PerfTrace.h" +#include "lib/tracing/PerfLog.h" namespace bts { namespace orderman { @@ -24,10 +24,10 @@ public: const PreActivationOrderServices&) override; void on_init_recovered(api::orderman::OrderRecord const&, const PreActivationOrderServices &) override; - void on_activate(Price,Quantity,OrderServices &, PerfTrace const&) override ; - void on_update(Price , Quantity,PerfTrace const&) override ; - void on_crack(PerfTrace const&) override ; - void on_cancel(PerfTrace const&) override ; + void on_activate(Price,Quantity,OrderServices &, trace::CorID const&) override ; + void on_update(Price , Quantity,trace::CorID const&) override ; + void on_crack(trace::CorID const&) override ; + void on_cancel(trace::CorID const&) override ; void on_init_from_exe_report(ExecutionReport const&,const PreActivationOrderServices &); private: @@ -36,7 +36,7 @@ private: void on_exe_report(const NewExecutionReportEvent &); void on_cancel_reject(const CancelRejectEvent&); void on_gateway_status(const GatewayStatusChangeEvent&); - void report_state(PerfTrace const&trace = PerfTrace()); + void report_state(trace::CorID const&trace = trace::CorID()); void init_fix(); void add_exchange_order_id_to_fix(); diff --git a/src/lib/orderman/orders/Order.h b/src/lib/orderman/orders/Order.h index 4a4606e22..eebcea1bf 100644 --- a/src/lib/orderman/orders/Order.h +++ b/src/lib/orderman/orders/Order.h @@ -5,6 +5,7 @@ // fwd namespace bts { +namespace trace {struct CorID;} namespace securities { class ISecurityDB; } @@ -45,12 +46,12 @@ class Order { const PreActivationOrderServices &) = 0; // activation - cannot be slow - virtual void on_activate(Price, Quantity, OrderServices &, PerfTrace const&) = 0; + virtual void on_activate(Price, Quantity, OrderServices &, trace::CorID const&) = 0; // order is running, maintenance - virtual void on_update(Price, Quantity, PerfTrace const&) = 0; - virtual void on_crack(PerfTrace const&) = 0; - virtual void on_cancel(PerfTrace const&) = 0; + virtual void on_update(Price, Quantity, trace::CorID const&) = 0; + virtual void on_crack(trace::CorID const&) = 0; + virtual void on_cancel(trace::CorID const&) = 0; private: OrderKey _key; diff --git a/src/lib/orderman/orders/TimeBoxOrder.cpp b/src/lib/orderman/orders/TimeBoxOrder.cpp index 1a3dfa6cb..8ad686489 100644 --- a/src/lib/orderman/orders/TimeBoxOrder.cpp +++ b/src/lib/orderman/orders/TimeBoxOrder.cpp @@ -85,7 +85,7 @@ void TimeBoxOrder::on_init_recovered(api::orderman::OrderRecord const &rec, } void TimeBoxOrder::on_activate(Price p, Quantity q, OrderServices &services, - PerfTrace const &) { + trace::CorID const &) { bts_assert(!me->services); me->services = &services; me->child_builder.activate(services); @@ -123,7 +123,7 @@ void TimeBoxOrder::on_activate(Price p, Quantity q, OrderServices &services, report_state(); } -void TimeBoxOrder::on_update(Price p, Quantity q, PerfTrace const &) { +void TimeBoxOrder::on_update(Price p, Quantity q, trace::CorID const &) { LOG(OrderMan, Info, "Updating TimeBox Order {}", key().value()); switch (me->state.status()) { @@ -183,9 +183,9 @@ void TimeBoxOrder::on_update(Price p, Quantity q, PerfTrace const &) { report_state(); } -void TimeBoxOrder::on_crack(PerfTrace const &) {} +void TimeBoxOrder::on_crack(trace::CorID const &) {} -void TimeBoxOrder::on_cancel(PerfTrace const &) { +void TimeBoxOrder::on_cancel(trace::CorID const &) { LOG(OrderMan, Info, "Canceling TimeBox Order {}", key().value()); switch (me->state.status()) { diff --git a/src/lib/orderman/orders/TimeBoxOrder.h b/src/lib/orderman/orders/TimeBoxOrder.h index 3a403ee38..9475a5a37 100644 --- a/src/lib/orderman/orders/TimeBoxOrder.h +++ b/src/lib/orderman/orders/TimeBoxOrder.h @@ -19,10 +19,10 @@ public: const PreActivationOrderServices&) override; void on_init_recovered(api::orderman::OrderRecord const&, const PreActivationOrderServices &) override; - void on_activate(Price,Quantity,OrderServices &, PerfTrace const&) override ; - void on_update(Price , Quantity,PerfTrace const&) override ; - void on_crack(PerfTrace const&) override ; - void on_cancel(PerfTrace const&) override ; + void on_activate(Price,Quantity,OrderServices &, trace::CorID const&) override ; + void on_update(Price , Quantity,trace::CorID const&) override ; + void on_crack(trace::CorID const&) override ; + void on_cancel(trace::CorID const&) override ; private: void report_state(); diff --git a/src/lib/orderman/orders/TriggerOrder.cpp b/src/lib/orderman/orders/TriggerOrder.cpp index 7b9bdda84..5b8f2cc5f 100644 --- a/src/lib/orderman/orders/TriggerOrder.cpp +++ b/src/lib/orderman/orders/TriggerOrder.cpp @@ -101,7 +101,7 @@ void TriggerOrder::on_init_recovered(const api::orderman::OrderRecord &rec, } } void TriggerOrder::on_activate(Price price, Quantity qty, - OrderServices &services, PerfTrace const &) { + OrderServices &services, trace::CorID const &) { LOG(OrderMan, Info, "TriggerOrder::on_activate key:{} state:{} price:{} qty:{}", key(), _state, price, qty); @@ -140,7 +140,7 @@ void TriggerOrder::on_activate(Price price, Quantity qty, } } // order price, qty change -void TriggerOrder::on_update(Price price, Quantity qty, PerfTrace const &) { +void TriggerOrder::on_update(Price price, Quantity qty, trace::CorID const &) { LOG(OrderMan, Info, "TriggerOrder::on_update key:{} state:{} price:{} qty:{}", key(), _state, price, qty); @@ -166,10 +166,10 @@ void TriggerOrder::on_update(Price price, Quantity qty, PerfTrace const &) { break; } } -void TriggerOrder::on_crack(PerfTrace const &) { +void TriggerOrder::on_crack(trace::CorID const &) { // not supported } -void TriggerOrder::on_cancel(PerfTrace const &) { +void TriggerOrder::on_cancel(trace::CorID const &) { LOG(OrderMan, Info, "TriggerOrder::on_cancel key:{} state:{}", key(), _state); me->cancel_mode = CancelMode::external; diff --git a/src/lib/orderman/orders/TriggerOrder.h b/src/lib/orderman/orders/TriggerOrder.h index f79013ef6..a62c82cba 100644 --- a/src/lib/orderman/orders/TriggerOrder.h +++ b/src/lib/orderman/orders/TriggerOrder.h @@ -56,10 +56,10 @@ public: const PreActivationOrderServices &) override; void on_activate(Price, Quantity, OrderServices&, - PerfTrace const&) override ; - void on_update(Price, Quantity, PerfTrace const&) override; - void on_crack(PerfTrace const&) override; - void on_cancel(PerfTrace const&) override; + trace::CorID const&) override ; + void on_update(Price, Quantity, trace::CorID const&) override; + void on_crack(trace::CorID const&) override; + void on_cancel(trace::CorID const&) override; private: // callbacks from book and child order udpates void _on_book_update(const BookUpdateEvent&); diff --git a/src/lib/orderman/orders/book_algos/BookAlgo.cpp b/src/lib/orderman/orders/book_algos/BookAlgo.cpp index 6cad96f9c..5298aa9d0 100644 --- a/src/lib/orderman/orders/book_algos/BookAlgo.cpp +++ b/src/lib/orderman/orders/book_algos/BookAlgo.cpp @@ -140,7 +140,7 @@ void BookAlgo::on_init_recovered(const api::orderman::OrderRecord &rec, } void BookAlgo::on_activate(Price p, Quantity q, OrderServices &services, - PerfTrace const &) { + trace::CorID const &) { bts_assert(!me->services); me->services = &services; switch (this_state().status()) { @@ -181,7 +181,7 @@ void BookAlgo::on_activate(Price p, Quantity q, OrderServices &services, report_state(); } -void BookAlgo::on_update(Price p, Quantity q, PerfTrace const &) { +void BookAlgo::on_update(Price p, Quantity q, trace::CorID const &) { LOG(OrderMan, Info, "Updating BookAlgo {}", key().value()); switch (this_state().status()) { case ORDER_STATUS_WORKING: @@ -235,9 +235,9 @@ void BookAlgo::on_update(Price p, Quantity q, PerfTrace const &) { report_state(); } -void BookAlgo::on_crack(PerfTrace const &) {} +void BookAlgo::on_crack(trace::CorID const &) {} -void BookAlgo::on_cancel(PerfTrace const &) { +void BookAlgo::on_cancel(trace::CorID const &) { LOG(OrderMan, Info, "Canceling BookAlgo Order {}", key().value()); switch (this_state().status()) { diff --git a/src/lib/orderman/orders/book_algos/BookAlgo.h b/src/lib/orderman/orders/book_algos/BookAlgo.h index 7c01878a0..689bb1da0 100644 --- a/src/lib/orderman/orders/book_algos/BookAlgo.h +++ b/src/lib/orderman/orders/book_algos/BookAlgo.h @@ -24,10 +24,10 @@ public: const PreActivationOrderServices&) override; void on_init_recovered(const api::orderman::OrderRecord&, const PreActivationOrderServices &) override; - void on_activate(Price,Quantity,OrderServices &, PerfTrace const&) override ; - void on_update(Price , Quantity,PerfTrace const&) override ; - void on_crack(PerfTrace const&) override ; - void on_cancel(PerfTrace const&) override ; + void on_activate(Price,Quantity,OrderServices &, trace::CorID const&) override ; + void on_update(Price , Quantity,trace::CorID const&) override ; + void on_crack(trace::CorID const&) override ; + void on_cancel(trace::CorID const&) override ; protected: virtual void setup_child(const api::orderman::OrderDefinition& parent, const PreActivationOrderServices&, diff --git a/src/lib/orderman/orders/spreader_orders/ISpreaderStateWorker.h b/src/lib/orderman/orders/spreader_orders/ISpreaderStateWorker.h index c5519bddb..f4ef18dca 100644 --- a/src/lib/orderman/orders/spreader_orders/ISpreaderStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/ISpreaderStateWorker.h @@ -34,7 +34,7 @@ public: // 5. called when the user cancels an order virtual void on_cancel() = 0; // 6. on market data update (support late joiners) - virtual void on_book(const Book&,PerfTrace &) = 0; + virtual void on_book(const Book&,trace::CorID &) = 0; // 15. settlement price update virtual void on_settlement_price(const SettlementUpdateEvent&) = 0; // 7. time event called by the infrastructure @@ -43,7 +43,7 @@ public: virtual void on_quoter_order_error(SpreaderLegData& leg_data) = 0; // 9. on a quoter order fill virtual void on_quoter_order_fill(SpreaderLegData& leg_data, - PerfTrace &) = 0; + trace::CorID &) = 0; // 10. on a quoter status update without a fill virtual void on_quoter_order_status_update(SpreaderLegData& leg_data) = 0; // 11. when a hedger order ack from the exchange has an error diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp index cccba1190..8b5131a7e 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp @@ -54,26 +54,26 @@ void SpreaderOrder::on_init_recovered(const bts::api::orderman::OrderRecord& ord _report_state(); } void SpreaderOrder::on_activate(Price price, Quantity quantity, - OrderServices& services, const PerfTrace&){ + OrderServices& services, const trace::CorID&){ if (!_active) return; SpreaderOrderServices spreader_order_services (&services); _on_activate(price, quantity, spreader_order_services); _report_state(); } -void SpreaderOrder::on_update(Price price, Quantity quantity,PerfTrace const&){ +void SpreaderOrder::on_update(Price price, Quantity quantity,trace::CorID const&){ if (!_active) return; LOG(OrderMan, Info, "SpreaderOrder.on_update key:{} price:{} quantity:{}", key().value(), price.value(), quantity.value()); _state_worker->on_update(price, quantity); _report_state(); } -void SpreaderOrder::on_cancel(PerfTrace const&){ +void SpreaderOrder::on_cancel(trace::CorID const&){ if (!_active) return; LOG(OrderMan, Info, "SpreaderOrder.on_cancel key:{}", key().value()); _state_worker->on_cancel(); _report_state(); } -void SpreaderOrder::on_crack(PerfTrace const&){ +void SpreaderOrder::on_crack(trace::CorID const&){ if (!_active) return; LOG(OrderMan, Info, "SpreaderOrder.on_crack key: {}", key().value()); _state_worker->on_crack(); @@ -100,10 +100,9 @@ void SpreaderOrder::_on_time(const bts::mercury::TimerEvent& t_event){ } void SpreaderOrder::_on_book_update(const BookUpdateEvent& book_event){ if (!_active) return; - tracepoint (bts_trace,trace_order,(char*) "_on_book_update", key().value(),book_event.trace.md_sn,0); - auto trace = book_event.trace; - trace.spreader_on_book = utils::TimeStamp::now(); - _state_worker->on_book (book_event.book,trace); + + _order_services->order_services().log(book_event.trace,"spreader_on_book", key().value()); + _state_worker->on_book (book_event.book,book_event.trace); } void SpreaderOrder::_on_settlement_update(const SettlementUpdateEvent& settlement_event){ @@ -315,7 +314,7 @@ bool SpreaderOrder::_quoters_can_accept_modification (){ void SpreaderOrder::_send_hedge(size_t hedge_leg_index, Price hedge_price, Quantity hedge_qty, - const PerfTrace &trace){ + const trace::CorID &trace){ LOG(OrderMan, Info, "SpreaderOrder::_send_hedge key:{} hedge_leg_index:{} " "hedge_price:{} hedge_qty:{} cid:{}", key(), hedge_leg_index, hedge_price, hedge_qty, trace.md_sn); diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h index 9b377d948..f97a8e68c 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h @@ -99,15 +99,15 @@ public: const PreActivationOrderServices&) override; // this is in the critical path, orders can be submitted now // (this is only called once and after the on_init_new) - void on_activate(Price, Quantity, OrderServices&,PerfTrace const&) override; + void on_activate(Price, Quantity, OrderServices&,trace::CorID const&) override; // called when the user (or a higher level order) // updates the order's price or quantity - void on_update(Price, Quantity,PerfTrace const&) override; + void on_update(Price, Quantity,trace::CorID const&) override; // called when the user (or higher level order) cancels an order - void on_cancel(PerfTrace const&) override; + void on_cancel(trace::CorID const&) override; // crack means to let the lower level orders lose from the higher // level order and cancel the higher level order - void on_crack(PerfTrace const&) override; + void on_crack(trace::CorID const&) override; // ISpreaderManager //////////////////// //////////////////////////////////////// public: @@ -178,7 +178,7 @@ private: void _send_hedge(size_t hedge_leg_index, Price hedge_price, Quantity hedge_qty, - PerfTrace const&); + trace::CorID const&); void _compute_hedge_price_quantity(size_t filled_leg_index, Price filled_price, double filled_quantity, @@ -251,7 +251,7 @@ public: SpreaderBookkeepingData& test_only_func_spreader_full_data () {return _bookkeeping_data();} int64_t test_cancel_timeout () {return _cancel_timeout;} void test_only_on_book_update(const bts::orderman::BookUpdateEvent& b) {_on_book_update(b);} - void test_only_on_book_update(const bts::orderman::Book& b, PerfTrace const&trace) {_on_book_update(bts::orderman::BookUpdateEvent(b, trace));} + void test_only_on_book_update(const bts::orderman::Book& b, trace::CorID const&trace) {_on_book_update(bts::orderman::BookUpdateEvent(b, trace));} void test_only_on_child_order_update (bts::orderman::OrderKey order_key, bts::api::orderman::OrderStatus status, Quantity total_filled_qty, Price avg_price) { bts::api::orderman::OrderDefinition order_def; @@ -260,7 +260,7 @@ public: order_state.set_status(status); order_state.set_filled_quantity(total_filled_qty.value()); order_state.set_last_price(avg_price.value()); - OrderStateUpdateEvent ord_ev (order_key, OrderKey(0), order_def, order_state,PerfTrace()); + OrderStateUpdateEvent ord_ev (order_key, OrderKey(0), order_def, order_state,trace::CorID()); _on_child_order_update (ord_ev); } void test_only_on_init_new(const bts::api::orderman::OrderDefinition& order_def, const SpreaderPreActivationOrderServices& pao_services) {_on_init_new(order_def, pao_services);} diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp index 5025a4c2d..2060e02fd 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp @@ -14,7 +14,7 @@ SingleFillHedger::SingleFillHedger(ISpreaderManager& spreader_manager, ChildOrder& child_order, bts::Price hedge_price, bts::Quantity hedge_quantity, - PerfTrace const &fill_trace, + trace::CorID const &fill_trace, bool is_live) : _spreader(spreader_manager), @@ -94,7 +94,7 @@ void SingleFillHedger::on_order_update(const SpreaderChildOrderState& u){ u.last_update_filled_quantity()); _worker->on_order_update (u); } -void SingleFillHedger::on_book(const bts::orderman::Book& book,PerfTrace &trace){ +void SingleFillHedger::on_book(const bts::orderman::Book& book,trace::CorID &trace){ _worker->on_book (book,trace); } void SingleFillHedger::cancel_hedge(){ diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h index 9b9fa926c..1e3bf495c 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h @@ -30,7 +30,7 @@ private: const LegPropertyData& _leg_property_data; SpreaderChildOrderState _child_order_state; HedgePriceQuantityState _price_quantity_state; - PerfTrace _fill_trace; + trace::CorID _fill_trace; IHedgerStateWorker* _worker; HedgerStartStateWorker _start_state_worker; HedgerWaitingForFirstAckStateWorker _waiting_for_first_ack_state_worker; @@ -71,7 +71,7 @@ public: ChildOrder& child_order, bts::Price hedge_price, bts::Quantity hedge_quantity, - PerfTrace const &trace, + trace::CorID const &trace, bool is_live); SingleFillHedger() = delete; SingleFillHedger (const SingleFillHedger&) = delete; @@ -88,7 +88,7 @@ public: void on_order_update(const SpreaderChildOrderState& order_update_message); //c. called when the market data associated // with this security is changed - void on_book(const bts::orderman::Book& book,PerfTrace &); + void on_book(const bts::orderman::Book& book,trace::CorID &); //d. called when the hedge order is cancelled, either // manually or automatically void cancel_hedge(); diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp index 573b1dbf8..b48208383 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp @@ -101,7 +101,7 @@ void SingleLegQuoter::update_order_status(const SpreaderChildOrderState& u){ } } void SingleLegQuoter::on_book(size_t leg_index, - const bts::orderman::Book& book,PerfTrace &trace){ + const bts::orderman::Book& book,trace::CorID &trace){ if (_active_quoting) _worker->on_book (leg_index, book,trace); } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h index c55968042..5139254d9 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h @@ -101,7 +101,7 @@ public: //c. called when the market data associated // with this security is changed void on_book(size_t leg_index, - const bts::orderman::Book&,PerfTrace &); + const bts::orderman::Book&,trace::CorID &); //d. called when the order is cancelled, either // manually or automatically void cancel_order(); @@ -171,13 +171,13 @@ private: } void _place_order (Price price, Quantity quantity, - const PerfTrace &trace) { + const trace::CorID &trace) { _child_order_state.place_order(price, quantity, _spreader.current_time(), trace); } - void _modify_order (Price price, Quantity quantity, PerfTrace &trace) { + void _modify_order (Price price, Quantity quantity, trace::CorID &trace) { _child_order_state.modify_order(price, quantity, trace); } void _cancel_order () {_child_order_state.cancel_order();} diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp index 2e8064684..7a3c8d5b5 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp @@ -84,10 +84,10 @@ SingleFillHedger& SpreaderBookkeepingData::add_new_hedger(ISpreaderManager& spre size_t leg_index, bts::Price hedge_price, bts::Quantity hedge_quantity, - const PerfTrace &trace){ + const trace::CorID &trace){ LOG(OrderMan, Info, "SpreaderBookkeepingData::add_new_hedger " "leg_index:{} price:{} quantity:{} cid:{}", - leg_index, hedge_price, hedge_quantity,trace.md_sn); + leg_index, hedge_price, hedge_quantity,trace.sn); bts_assert(leg_index < _n_legs); SpreaderLegData& leg_data = _leg_data[leg_index]; std::vector& leg_hedgers = _hedgers[leg_index]; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h index 77998a4f1..0d1b4832f 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h @@ -108,7 +108,7 @@ public: size_t leg_index, bts::Price hedge_price, bts::Quantity hedge_quantity, - PerfTrace const &); + trace::CorID const &); // finds the spreader fill, price (ie averages it out, using // the size and price ratio, across all legs) void total_fills (Quantity& out_quantity, Price& out_price) const; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h index aa42e7b85..1f8f9c875 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h @@ -130,7 +130,7 @@ public: void place_order(Price price, Quantity quantity, bts::TimeStamp curr_time, - const PerfTrace& trace){ + const trace::CorID& trace){ _out_price = price; _out_quantity = quantity; _order_place_time=curr_time; @@ -140,15 +140,15 @@ public: "key:{} is_quoting:{} sec_key:{} live:{} " "price:{} qty:{} cid:{}", order_key(), _is_quoting, _sec_key, - _is_live, price, quantity, trace.md_sn); + _is_live, price, quantity, trace.sn); if (_is_live) _child_order.activate(price, quantity, trace); } void modify_order(Price price, Quantity quantity){ - PerfTrace dont_care; + trace::CorID dont_care; modify_order(price,quantity,dont_care); } - void modify_order(Price price, Quantity quantity, PerfTrace &trace){ + void modify_order(Price price, Quantity quantity, trace::CorID &trace){ _out_price = price; _out_quantity = quantity; _n_modify_orders++; @@ -158,7 +158,6 @@ public: order_key(), _is_quoting, _sec_key, _is_live, price, quantity, _n_modify_orders); if (_is_live) { - trace.spreader_modify_order = utils::TimeStamp::now(); _child_order.update(price, quantity, trace); } } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/IHedgerStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/IHedgerStateWorker.h index 186c8d074..ff966a518 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/IHedgerStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/IHedgerStateWorker.h @@ -5,6 +5,7 @@ #include "lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerState.h" namespace bts { +namespace trace {struct CorID;} namespace orderman {class Book;} namespace orderman { class SpreaderChildOrderState; @@ -24,7 +25,7 @@ public: virtual void on_order_update (const SpreaderChildOrderState& order_update) = 0; // called only when the security that the hedger is working on // has a market data update - virtual void on_book (const bts::orderman::Book& book,PerfTrace &) = 0; + virtual void on_book (const bts::orderman::Book& book,trace::CorID &) = 0; // when the spreader wants the hedger to cancel its order virtual void cancel() = 0; // on terminate, the hedger should simply go to its end state diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp index ac6a92a71..61ce32ef4 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp @@ -9,7 +9,7 @@ void HedgerEndStateWorker::init(){ } void HedgerEndStateWorker::on_order_update(const SpreaderChildOrderState&){ } -void HedgerEndStateWorker::on_book(const bts::orderman::Book&,PerfTrace &){ +void HedgerEndStateWorker::on_book(const bts::orderman::Book&,trace::CorID &){ } void HedgerEndStateWorker::cancel(){ } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.h index 1ab5917b5..549d67306 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.h @@ -17,7 +17,7 @@ public: const std::string state_text () const override {return "END";} void init () override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (const bts::orderman::Book& book,PerfTrace &) override; + void on_book (const bts::orderman::Book& book,trace::CorID &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp index b23d78c92..1ed919153 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp @@ -18,7 +18,7 @@ void HedgerStartStateWorker::init(){ void HedgerStartStateWorker::on_order_update(const SpreaderChildOrderState&){ bts_assert_msg (false, "HedgerStartStateWorker::on_order_update illegal operation"); } -void HedgerStartStateWorker::on_book(const bts::orderman::Book&,PerfTrace &){ +void HedgerStartStateWorker::on_book(const bts::orderman::Book&,trace::CorID &){ // market data will not be sent until out of start. bts_assert_msg (false, "HedgerStartStateWorker::on_book illegal operation"); } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.h index 37c9c79ef..12757001b 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.h @@ -21,7 +21,7 @@ public: const std::string state_text () const override {return "START";} void init () override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (const bts::orderman::Book& book,PerfTrace &) override; + void on_book (const bts::orderman::Book& book,trace::CorID &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp index 92bc38267..c31a3a112 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp @@ -17,7 +17,7 @@ void HedgerWaitingForCancelAckStateWorker::on_order_update(const SpreaderChildOr _hedger->transform_to_END (); } } -void HedgerWaitingForCancelAckStateWorker::on_book(const bts::orderman::Book&,PerfTrace &){ +void HedgerWaitingForCancelAckStateWorker::on_book(const bts::orderman::Book&,trace::CorID &){ } void HedgerWaitingForCancelAckStateWorker::cancel(){ } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.h index 6a7800ec5..d2be51786 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.h @@ -21,7 +21,7 @@ public: const std::string state_text () const override {return "WAITING_FOR_CANCEL_ACK";} void init () override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (const bts::orderman::Book& book,PerfTrace &) override; + void on_book (const bts::orderman::Book& book,trace::CorID &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp index e8b5bf049..084b8c3de 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp @@ -23,7 +23,7 @@ void HedgerWaitingForFirstAckCancelledStateWorker::on_order_update(const Spreade _hedger->transform_to_WAITING_FOR_CANCEL_ACK (); } } -void HedgerWaitingForFirstAckCancelledStateWorker::on_book(const bts::orderman::Book&,PerfTrace &){ +void HedgerWaitingForFirstAckCancelledStateWorker::on_book(const bts::orderman::Book&,trace::CorID &){ } void HedgerWaitingForFirstAckCancelledStateWorker::cancel(){ } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.h index 21f542f5b..97383f885 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.h @@ -21,7 +21,7 @@ public: const std::string state_text () const override {return "WAITING_FOR_FIRST_ACK_CANCELLED";} void init () override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (const bts::orderman::Book& book,PerfTrace &) override; + void on_book (const bts::orderman::Book& book,trace::CorID &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp index 8e5a7e396..cb99478c4 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp @@ -18,7 +18,7 @@ void HedgerWaitingForFirstAckStateWorker::on_order_update(const SpreaderChildOrd // this means the first ack _hedger->transform_to_WORKING (); } -void HedgerWaitingForFirstAckStateWorker::on_book(const bts::orderman::Book&,PerfTrace &){ +void HedgerWaitingForFirstAckStateWorker::on_book(const bts::orderman::Book&,trace::CorID &){ } void HedgerWaitingForFirstAckStateWorker::cancel(){ _hedger->transform_to_WAITING_FOR_FIRST_ACK_CANCELLED (); diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.h index 900e6b4ed..b1ca9c5f0 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.h @@ -21,7 +21,7 @@ public: const std::string state_text () const override {return "WAITING_FOR_FIRST_ACK";} void init () override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (const bts::orderman::Book& book,PerfTrace &) override; + void on_book (const bts::orderman::Book& book,trace::CorID &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp index 019b87e21..aebb18a6a 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp @@ -20,7 +20,7 @@ void HedgerWorkingStateWorker::on_order_update(const SpreaderChildOrderState& or _hedger->transform_to_END (); } } -void HedgerWorkingStateWorker::on_book(const bts::orderman::Book&,PerfTrace &){ +void HedgerWorkingStateWorker::on_book(const bts::orderman::Book&,trace::CorID &){ double new_price; if (SpreaderUtils::post_hedge_market_based_price_action (_hedger->_price_quantity_state.out_price().value(), _hedger->_price_quantity_state.out_quantity().value(), diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.h index be0201d94..1e23979ff 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.h @@ -24,7 +24,7 @@ public: const std::string state_text () const override {return "WORKING";} void init () override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (const bts::orderman::Book& book,PerfTrace &) override; + void on_book (const bts::orderman::Book& book,trace::CorID &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/IQuoterStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/IQuoterStateWorker.h index 909239e1b..a83697af0 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/IQuoterStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/IQuoterStateWorker.h @@ -26,7 +26,7 @@ public: virtual void on_order_update (const SpreaderChildOrderState& order_update) = 0; // called when any of the legs in the spread has a book update //virtual void on_book (TickToTradeCorID corid, size_t leg_id, const Book& book) = 0; - virtual void on_book (size_t, const bts::orderman::Book&,PerfTrace &) = 0; + virtual void on_book (size_t, const bts::orderman::Book&,trace::CorID &) = 0; // when the spreader wants the quoter to cancel its order virtual void cancel() = 0; // on terminate, the quoter should simply go to its end state diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp index d73bfc9b4..24c417c8f 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp @@ -29,7 +29,7 @@ void QuoterEndStateWorker::one_time_activate (Price, Quantity){ void QuoterEndStateWorker::on_order_update (const SpreaderChildOrderState&) {} void QuoterEndStateWorker::on_book (size_t, - const bts::orderman::Book&,PerfTrace &) + const bts::orderman::Book&,trace::CorID &) {} void QuoterEndStateWorker::cancel() {} diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.h index c8342757a..2a52ee1a6 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.h @@ -25,7 +25,7 @@ public: virtual void on_transition () override; void one_time_activate (Price, Quantity) override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (size_t leg_id, const bts::orderman::Book& book,PerfTrace &) override; + void on_book (size_t leg_id, const bts::orderman::Book& book,trace::CorID &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp& ts) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp index 754a3aa47..38d3b9dea 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp @@ -24,7 +24,7 @@ void QuoterStartStateWorker::on_order_update (const SpreaderChildOrderState&){ bts_assert_msg (false, "QuoterStartStateWorker::on_order_update is an illegal operation, nothing can happen before one_time_activate"); } void QuoterStartStateWorker::on_book (size_t, - const bts::orderman::Book&,PerfTrace &){ + const bts::orderman::Book&,trace::CorID &){ } void QuoterStartStateWorker::cancel(){ // since no order has been sent for this leg, diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.h index 05e9f74d2..dae5ada02 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.h @@ -23,7 +23,7 @@ public: virtual void on_transition () override {} void one_time_activate (Price, Quantity) override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (size_t leg_id, const bts::orderman::Book& book,PerfTrace &) override; + void on_book (size_t leg_id, const bts::orderman::Book& book,trace::CorID &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp& ts) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp index bbef8d47c..bf493f55f 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp @@ -21,7 +21,7 @@ void QuoterWaitingForCancelAckStateWorker::on_order_update (const SpreaderChildO } void QuoterWaitingForCancelAckStateWorker::on_book (size_t, const bts::orderman::Book&, - PerfTrace &){ + trace::CorID &){ } void QuoterWaitingForCancelAckStateWorker::cancel(){ } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.h index bd8a4be24..9ef9d2409 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.h @@ -24,7 +24,7 @@ public: virtual void on_transition () override {} void one_time_activate (Price, Quantity) override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (size_t leg_id, const bts::orderman::Book& book,PerfTrace &) override; + void on_book (size_t leg_id, const bts::orderman::Book& book,trace::CorID &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp& ts) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp index dac791970..b674b1d3b 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp @@ -25,7 +25,7 @@ void QuoterWaitingForFirstAckCancelledWorker::on_order_update (const SpreaderChi _quoter->_transform_to_WAITING_FOR_CANCEL_ACK (); } } -void QuoterWaitingForFirstAckCancelledWorker::on_book (size_t , const bts::orderman::Book& ,PerfTrace &) { +void QuoterWaitingForFirstAckCancelledWorker::on_book (size_t , const bts::orderman::Book& ,trace::CorID &) { } void QuoterWaitingForFirstAckCancelledWorker::cancel(){ } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.h index 60db96ace..085e9b919 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.h @@ -30,7 +30,7 @@ public: virtual void on_transition () override {} void one_time_activate (Price, Quantity) override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (size_t leg_id, const bts::orderman::Book& book,PerfTrace &) override; + void on_book (size_t leg_id, const bts::orderman::Book& book,trace::CorID &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp& ts) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp index c68d7db84..cd5e845b2 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp @@ -22,7 +22,7 @@ void QuoterWaitingForFirstAckWorker::on_order_update (const SpreaderChildOrderSt _quoter->_transform_to_WORKING (); } void QuoterWaitingForFirstAckWorker::on_book (size_t, - const bts::orderman::Book&,PerfTrace &){ + const bts::orderman::Book&,trace::CorID &){ _analyze_and_act(); } void QuoterWaitingForFirstAckWorker::cancel(){ diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.h index ded3b991b..d4c8d0ed0 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.h @@ -28,7 +28,7 @@ public: virtual void on_transition () override {} void one_time_activate (Price, Quantity) override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (size_t leg_id, const bts::orderman::Book& book,PerfTrace & ) override; + void on_book (size_t leg_id, const bts::orderman::Book& book,trace::CorID & ) override; void cancel() override; void terminate() override; void on_time(const TimeStamp& ts) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp index a4a17678f..588761444 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp @@ -24,7 +24,7 @@ void QuoterWaitingForIOCWorker::on_order_update (const SpreaderChildOrderState& } } void QuoterWaitingForIOCWorker::on_book (size_t, - const bts::orderman::Book&,PerfTrace &){ + const bts::orderman::Book&,trace::CorID &){ } void QuoterWaitingForIOCWorker::cancel(){ _quoter->_transform_to_WAITING_FOR_FIRST_ACK_CANCELLED (); diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.h index 48bf749eb..69ba40109 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.h @@ -31,7 +31,7 @@ public: void one_time_activate (Price, Quantity) override; void on_order_update (const SpreaderChildOrderState& order_update) override; void on_book (size_t leg_id, - const bts::orderman::Book& book,PerfTrace &) override; + const bts::orderman::Book& book,trace::CorID &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp& ts) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp index d5e90f133..6cefbfcf3 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp @@ -20,7 +20,7 @@ void QuoterWaitingForSizeStateWorker::on_order_update (const SpreaderChildOrderS "is an illegal operation"); } void QuoterWaitingForSizeStateWorker::on_book (size_t, - const Book&,PerfTrace &trace){ + const Book&,trace::CorID &trace){ _longpath_analyze_and_act (trace); } void QuoterWaitingForSizeStateWorker::cancel(){ @@ -45,10 +45,10 @@ void QuoterWaitingForSizeStateWorker::update_spreader_order (Price price, _longpath_analyze_and_act (); } void QuoterWaitingForSizeStateWorker::_longpath_analyze_and_act(){ - PerfTrace trace; + trace::CorID trace; _longpath_analyze_and_act(trace); } -void QuoterWaitingForSizeStateWorker::_longpath_analyze_and_act(PerfTrace &trace){ +void QuoterWaitingForSizeStateWorker::_longpath_analyze_and_act(trace::CorID &trace){ if (_quoter->_price_quantity_state.target_reached()){ LOG(OrderMan, Info, "QuoterWaitingForSizeStateWorker key:{} " "target reached, transforming to end", diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.h index 830e61557..5cbad6abf 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.h @@ -30,7 +30,7 @@ public: virtual void on_transition () override {} void one_time_activate (Price, Quantity) override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (size_t leg_id, const bts::orderman::Book& book,PerfTrace &) override; + void on_book (size_t leg_id, const bts::orderman::Book& book,trace::CorID &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp& ts) override; @@ -41,6 +41,6 @@ private: // if it has. otherwise computes the price, qty and if // its valid, places an order goes to waiting_for_first_ack void _longpath_analyze_and_act (); - void _longpath_analyze_and_act (PerfTrace &); + void _longpath_analyze_and_act (trace::CorID &); }; }} diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp index 8fcf93397..0c505d9b6 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp @@ -31,7 +31,7 @@ void QuoterWorkingStateWorker::on_order_update (const SpreaderChildOrderState& u } void QuoterWorkingStateWorker::on_book (size_t, const bts::orderman::Book&, - PerfTrace &trace){ + trace::CorID &trace){ _longpath_analyze_and_act (trace); } void QuoterWorkingStateWorker::cancel(){ @@ -55,10 +55,10 @@ void QuoterWorkingStateWorker::update_spreader_order (Price price, } void QuoterWorkingStateWorker::_longpath_analyze_and_act () { - PerfTrace trace; + trace::CorID trace; _longpath_analyze_and_act(trace); } -void QuoterWorkingStateWorker::_longpath_analyze_and_act (PerfTrace &trace) +void QuoterWorkingStateWorker::_longpath_analyze_and_act (trace::CorID &trace) { if (_quoter->_price_quantity_state.target_reached()){ // this could happen if @@ -94,7 +94,7 @@ void QuoterWorkingStateWorker::_longpath_analyze_and_act (PerfTrace &trace) } } } -void QuoterWorkingStateWorker::_modify_order (Price price, Quantity quantity,PerfTrace &trace ){ +void QuoterWorkingStateWorker::_modify_order (Price price, Quantity quantity,trace::CorID &trace ){ bool same_price_qty = _quoter->_price_quantity_state.out_quantity() == quantity && bts::securities::test_price_equality(_quoter->_price_quantity_state.out_price().value(), price.value(), _quoter->_this_leg_data.tick_size()); diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.h index a0568256f..e7f5ee612 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.h @@ -23,7 +23,7 @@ public: virtual void on_transition () override; void one_time_activate (Price, Quantity) override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (size_t leg_id, const bts::orderman::Book& book,PerfTrace &) override; + void on_book (size_t leg_id, const bts::orderman::Book& book,trace::CorID &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp& ts) override; @@ -34,8 +34,8 @@ private: // i. if target reached => cxl order and go to waiting_for_cancel_ack_final // ii. if computed_qty = 0 => cxl order and go to waiting_for_cancel_ack_continue // iii. if reprice (ie qty changed or price changed beyond the threshold) => requote - void _longpath_analyze_and_act (PerfTrace &); + void _longpath_analyze_and_act (trace::CorID &); void _longpath_analyze_and_act (); - void _modify_order (Price price, Quantity quantity,PerfTrace &); + void _modify_order (Price price, Quantity quantity,trace::CorID &); }; }} diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp index 2dcd517cb..4c74d2bf0 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp @@ -34,7 +34,7 @@ void SpreaderEndStateWorker::on_update(Price, Quantity){ } void SpreaderEndStateWorker::on_cancel(){ } -void SpreaderEndStateWorker::on_book(const Book&,PerfTrace&){ +void SpreaderEndStateWorker::on_book(const Book&,trace::CorID&){ } void SpreaderEndStateWorker::on_settlement_price(const SettlementUpdateEvent&){ } @@ -43,7 +43,7 @@ void SpreaderEndStateWorker::on_time(const TimeStamp&){ void SpreaderEndStateWorker::on_quoter_order_error(SpreaderLegData&){ } void SpreaderEndStateWorker::on_quoter_order_fill(SpreaderLegData&, - PerfTrace&){ + trace::CorID&){ } void SpreaderEndStateWorker::on_quoter_order_status_update(SpreaderLegData&){ } diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.h index 2c19c9bcd..69bee63ed 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.h @@ -20,12 +20,12 @@ public: void on_activate(Price, Quantity, SpreaderOrderServices&) override; void on_update(Price, Quantity) override; void on_cancel() override; - void on_book(const Book&,PerfTrace&) override; + void on_book(const Book&,trace::CorID&) override; void on_settlement_price(const SettlementUpdateEvent&) override; void on_time(const TimeStamp&) override; void on_quoter_order_error(SpreaderLegData& leg_data) override; void on_quoter_order_fill(SpreaderLegData& leg_data, - PerfTrace&) override; + trace::CorID&) override; void on_quoter_order_status_update(SpreaderLegData& leg_data) override; void on_hedger_order_error(SingleFillHedger&) override; void on_hedger_order_update(SingleFillHedger&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp index 7035bb815..522f8dcdd 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp @@ -117,7 +117,7 @@ void SpreaderStartStateWorker::on_cancel(){ // and hence it goes directly to END _spreader->_transform_to_END(); } -void SpreaderStartStateWorker::on_book(const bts::orderman::Book&,PerfTrace &){ +void SpreaderStartStateWorker::on_book(const bts::orderman::Book&,trace::CorID &){ bts_assert_msg (false, "SpreaderStartStateWorker::on_book is an illegal operation"); } void SpreaderStartStateWorker::on_settlement_price(const SettlementUpdateEvent&){ @@ -131,7 +131,7 @@ void SpreaderStartStateWorker::on_quoter_order_error(SpreaderLegData&){ bts_assert_msg (false, "SpreaderStartStateWorker::on_quoter_order_error is an illegal operation"); } void SpreaderStartStateWorker::on_quoter_order_fill(SpreaderLegData&, - PerfTrace&){ + trace::CorID&){ bts_assert_msg (false, "SpreaderStartStateWorker::on_quoter_order_fill is an illegal operation"); } void SpreaderStartStateWorker::on_quoter_order_status_update(SpreaderLegData&){ diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.h index fe2f863ac..b14d8e08f 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.h @@ -25,12 +25,12 @@ public: SpreaderOrderServices&) override; void on_update(Price, Quantity) override; void on_cancel() override; - void on_book(const Book&,PerfTrace &) override; + void on_book(const Book&,trace::CorID &) override; void on_time(const TimeStamp&) override; void on_settlement_price(const SettlementUpdateEvent&) override; void on_quoter_order_error(SpreaderLegData& leg_data) override; void on_quoter_order_fill(SpreaderLegData& leg_data, - PerfTrace &) override; + trace::CorID &) override; void on_quoter_order_status_update(SpreaderLegData& leg_data) override; void on_hedger_order_error(SingleFillHedger&) override; void on_hedger_order_update(SingleFillHedger&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp index dbc6b2955..36669f38e 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp @@ -33,7 +33,7 @@ void SpreaderWaitingForCancelAllStateWorker::on_update(Price, } void SpreaderWaitingForCancelAllStateWorker::on_cancel(){ } -void SpreaderWaitingForCancelAllStateWorker::on_book(const Book&,PerfTrace &){ +void SpreaderWaitingForCancelAllStateWorker::on_book(const Book&,trace::CorID &){ } void SpreaderWaitingForCancelAllStateWorker::on_time(const TimeStamp& ts){ if (ms_diff (ts, _cancel_timestamp) >= _spreader->_cancel_timeout){ @@ -48,7 +48,7 @@ void SpreaderWaitingForCancelAllStateWorker::on_quoter_order_error(SpreaderLegDa leg_data.quoter().update_order_status (leg_data.order_update_message()); } void SpreaderWaitingForCancelAllStateWorker::on_quoter_order_fill(SpreaderLegData& leg_data, - PerfTrace &){ + trace::CorID &){ leg_data.quoter().update_order_status (leg_data.order_update_message()); } void SpreaderWaitingForCancelAllStateWorker::on_quoter_order_status_update(SpreaderLegData& leg_data){ diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.h index 0ff8771a7..96c3128e5 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.h @@ -23,12 +23,12 @@ public: SpreaderOrderServices&) override; void on_update(Price, Quantity) override; void on_cancel() override; - void on_book(const Book&,PerfTrace &) override; + void on_book(const Book&,trace::CorID &) override; void on_settlement_price(const SettlementUpdateEvent&) override; void on_time(const TimeStamp&) override; void on_quoter_order_error(SpreaderLegData& leg_data) override; void on_quoter_order_fill(SpreaderLegData& leg_data, - PerfTrace &) override; + trace::CorID &) override; void on_quoter_order_status_update(SpreaderLegData& leg_data) override; void on_hedger_order_error(SingleFillHedger&) override; void on_hedger_order_update(SingleFillHedger&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp index 2cc07d80c..0e7cfd266 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp @@ -46,7 +46,7 @@ void SpreaderWaitingForInitialDataStateWorker::on_cancel(){ _spreader->_transform_to_END(); } void SpreaderWaitingForInitialDataStateWorker::on_book(const Book& book, - PerfTrace&){ + trace::CorID&){ SpreaderBookkeepingData& bookkeeping_data = _spreader->_bookkeeping_data(); SpreaderLegData& md_leg = bookkeeping_data.get_leg_data(book.security_key()); md_leg.update_book(book); @@ -71,7 +71,7 @@ void SpreaderWaitingForInitialDataStateWorker::on_quoter_order_error(SpreaderLeg "on_quoter_order_error is an illegal operation"); } void SpreaderWaitingForInitialDataStateWorker::on_quoter_order_fill(SpreaderLegData&, - PerfTrace&){ + trace::CorID&){ bts_assert_msg (false, "SpreaderWaitingForInitialDataStateWorker::" "on_quoter_order_fill is an illegal operation"); } diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.h index b9bd5c2f9..4477edacf 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.h @@ -25,12 +25,12 @@ public: SpreaderOrderServices&) override; void on_update(Price, Quantity) override; void on_cancel() override; - void on_book(const Book&,PerfTrace &) override; + void on_book(const Book&,trace::CorID &) override; void on_settlement_price(const SettlementUpdateEvent&) override; void on_time(const TimeStamp&) override; void on_quoter_order_error(SpreaderLegData& leg_data) override; void on_quoter_order_fill(SpreaderLegData& leg_data, - PerfTrace &) override; + trace::CorID &) override; void on_quoter_order_status_update(SpreaderLegData& leg_data) override; void on_hedger_order_error(SingleFillHedger&) override; void on_hedger_order_update(SingleFillHedger&) override; @@ -40,4 +40,4 @@ private: void _init_quoters(); void _go_to_working(); }; -}} \ No newline at end of file +}} diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp index 4a32b5451..989a46e3f 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp @@ -42,7 +42,7 @@ void SpreaderWorkingStateWorker::on_cancel(){ _spreader->_cancel_orders (true, true); _spreader->_transform_to_WAITING_FOR_CANCEL_ALL (); } -void SpreaderWorkingStateWorker::on_book(const Book& book,PerfTrace &trace){ +void SpreaderWorkingStateWorker::on_book(const Book& book,trace::CorID &trace){ SpreaderBookkeepingData& bookkeeping_data = _spreader->_bookkeeping_data(); // this is a key->index lookup SpreaderLegData& md_leg = bookkeeping_data.get_leg_data(book.security_key()); @@ -78,7 +78,7 @@ void SpreaderWorkingStateWorker::on_quoter_order_error(SpreaderLegData& leg_data _spreader->_transform_to_WAITING_FOR_CANCEL_ALL (); } void SpreaderWorkingStateWorker::on_quoter_order_fill(SpreaderLegData& leg_data, - PerfTrace &trace){ + trace::CorID &trace){ // this is the most complex part of the spreader. the following needs to be done // 1. tell other quoters about it (so they reduce their sizes) // 2. launch a new hedger diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.h index e832eef41..1ff8e4dab 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.h @@ -22,12 +22,12 @@ public: SpreaderOrderServices&) override; void on_update(Price, Quantity) override; void on_cancel() override; - void on_book(const Book&,PerfTrace &) override; + void on_book(const Book&,trace::CorID &) override; void on_settlement_price(const SettlementUpdateEvent&) override; void on_time(const TimeStamp&) override; void on_quoter_order_error(SpreaderLegData& leg_data) override; void on_quoter_order_fill(SpreaderLegData& leg_data, - PerfTrace &) override; + trace::CorID &) override; void on_quoter_order_status_update(SpreaderLegData& leg_data) override; void on_hedger_order_error(SingleFillHedger&) override; void on_hedger_order_update(SingleFillHedger&) override; diff --git a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp index b3bd2bbef..4baf91726 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp +++ b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp @@ -47,7 +47,7 @@ TEST_CASE ("quoter price quantity state", "[spreader]") REQUIRE (s.out_price() == Price (0.0)); REQUIRE (s.out_quantity() == Quantity (0)); // set out price and quantity - PerfTrace dont_care; + trace::CorID dont_care; bts::TimeStamp ts; order.place_order(Price (-0.35), Quantity (123),ts,dont_care); REQUIRE (s.target_spread_price() == Price (-1.0)); @@ -102,7 +102,7 @@ TEST_CASE ("quoter price quantity state", "[spreader]") s.add_hedged_reduction (Quantity(5)); s.add_hedged_reduction (Quantity(15)); // set out values - PerfTrace dont_care; + trace::CorID dont_care; bts::TimeStamp ts; order_2.place_order (Price(1), Quantity (50),ts,dont_care); REQUIRE (s.target_spread_price() == Price (-1.0)); @@ -1250,7 +1250,7 @@ TEST_CASE ("hedger_START_state", "[spreader]") 1, hedger_price, hedger_quantity, - PerfTrace()); + trace::CorID()); verify_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); SECTION("0. transition_to_start") @@ -1300,7 +1300,7 @@ TEST_CASE ("hedger_WAITING_FOR_FIRST_ACK_state", "[spreader]") 1, hedger_price, hedger_quantity, - PerfTrace()); + trace::CorID()); verify_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); hedger.init (); @@ -1359,7 +1359,7 @@ TEST_CASE ("hedger_WAITING_FOR_FIRST_ACK_CANCELLED_state", "[spreader]") 1, hedger_price, hedger_quantity, - PerfTrace()); + trace::CorID()); verify_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); hedger.init (); @@ -1420,7 +1420,7 @@ TEST_CASE ("hedger_WAITING_FOR_CANCEL_ACK_state", "[spreader]") 1, hedger_price, hedger_quantity, - PerfTrace()); + trace::CorID()); verify_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); hedger.init (); @@ -1492,7 +1492,7 @@ TEST_CASE ("hedger_END_state", "[spreader]") 1, hedger_price, hedger_quantity, - PerfTrace()); + trace::CorID()); verify_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); hedger.init (); @@ -1549,7 +1549,7 @@ TEST_CASE ("hedger_WORKING", "[spreader]") 1, hedger_price, hedger_quantity, - PerfTrace()); + trace::CorID()); verify_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); SpreaderChildOrderState& u = hedger.order_state(); @@ -1651,7 +1651,7 @@ TEST_CASE ("spreader_START", "[spreader]") } SECTION("5. on_cancel") { - spreader.on_cancel(PerfTrace()); + spreader.on_cancel(trace::CorID()); REQUIRE(spreader.test_only_func_spreader_state() == SpreaderState::END); LOG(OrderMan, Diag, "spreader_START.on_cancel"); } @@ -1763,7 +1763,7 @@ TEST_CASE ("spreader_WORKING", "[spreader]") // be as is spreader_price = Price (0); spreader_quantity = Quantity (200); - spreader.on_update (spreader_price, spreader_quantity,PerfTrace()); + spreader.on_update (spreader_price, spreader_quantity,trace::CorID()); verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity (30), Quantity(55), Price(1998), Quantity(130), Quantity(115), false); verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity (55), Quantity(30), Price(2004), Quantity(165), Quantity(115), false); @@ -1773,7 +1773,7 @@ TEST_CASE ("spreader_WORKING", "[spreader]") } SECTION("5. on_cancel") { - spreader.on_cancel(PerfTrace()); + spreader.on_cancel(trace::CorID()); verify_basic_spreader_state (spreader, SpreaderState::WAITING_FOR_CANCEL_ALL, spreader_price, spreader_quantity); generic_validate_quoters (QuoterState::WAITING_FOR_CANCEL_ACK, true); generic_validate_hedgers (HedgerState::WAITING_FOR_CANCEL_ACK); @@ -1794,7 +1794,7 @@ TEST_CASE ("spreader_WORKING", "[spreader]") new double[5] {2005, 2006, 2007, 2008, 2009}, new uint16_t[5] {0, 0, 0, 0, 0}, true); - spreader.test_only_on_book_update (modified_book, PerfTrace()); + spreader.test_only_on_book_update (modified_book, trace::CorID()); verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); generic_validate_quoters (QuoterState::WORKING, false); generic_validate_hedgers (HedgerState::WORKING); @@ -1808,8 +1808,8 @@ TEST_CASE ("spreader_WORKING", "[spreader]") new double[5] {2003, 2004, 2005, 2006, 2007}, new uint16_t[5] {25, 25, 20, 20, 10}, true); - //spreader.on_book (bts::orderman::PerfTrace(), modified_book); - spreader.test_only_on_book_update (modified_book,PerfTrace()); + //spreader.on_book (bts::orderman::trace::CorID(), modified_book); + spreader.test_only_on_book_update (modified_book,trace::CorID()); verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(1999), Quantity(45), Quantity(15), false); verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); @@ -1824,8 +1824,8 @@ TEST_CASE ("spreader_WORKING", "[spreader]") new double[5] {2003, 2004, 2005, 2006, 2007}, new uint16_t[5] {25, 25, 20, 20, 10}, true); - //spreader.on_book (bts::orderman::PerfTrace(), modified_book); - spreader.test_only_on_book_update (modified_book,PerfTrace()); + //spreader.on_book (bts::orderman::trace::CorID(), modified_book); + spreader.test_only_on_book_update (modified_book,trace::CorID()); verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2000), Quantity(34), Quantity(15), false); verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); @@ -1838,8 +1838,8 @@ TEST_CASE ("spreader_WORKING", "[spreader]") new double[5] {2003, 2004, 2005, 2006, 2007}, new uint16_t[5] {25, 25, 20, 20, 10}, true); - //spreader.on_book (bts::orderman::PerfTrace(), modified_book); - spreader.test_only_on_book_update (modified_book, PerfTrace()); + //spreader.on_book (bts::orderman::trace::CorID(), modified_book); + spreader.test_only_on_book_update (modified_book, trace::CorID()); verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2001), Quantity(45), Quantity(15), false); verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); @@ -1853,8 +1853,8 @@ TEST_CASE ("spreader_WORKING", "[spreader]") new double[5] {2003, 2004, 2005, 2006, 2007}, new uint16_t[5] {25, 25, 20, 20, 10}, true); - //spreader.on_book (bts::orderman::PerfTrace(), modified_book); - spreader.test_only_on_book_update (modified_book, PerfTrace()); + //spreader.on_book (bts::orderman::trace::CorID(), modified_book); + spreader.test_only_on_book_update (modified_book, trace::CorID()); verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WAITING_FOR_CANCEL_ACK, false, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2001), Quantity(45), Quantity(15), false); verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); @@ -2068,7 +2068,7 @@ TEST_CASE ("spreader_WAITING_FOR_CANCEL_ACK", "[spreader]") // now cancel the spreader bts::TimeStamp cancel_timestamp = std::chrono::system_clock::now(); spreader.test_only_on_time (cancel_timestamp); - spreader.on_cancel (PerfTrace()); + spreader.on_cancel (trace::CorID()); auto validate_state = [&]() -> void { verify_basic_spreader_state (spreader, SpreaderState::WAITING_FOR_CANCEL_ALL, spreader_price, spreader_quantity); @@ -2091,7 +2091,7 @@ TEST_CASE ("spreader_WAITING_FOR_CANCEL_ACK", "[spreader]") } SECTION("4. on_update") { - spreader.on_update (Price(-0.05), Quantity(200),PerfTrace()); + spreader.on_update (Price(-0.05), Quantity(200),trace::CorID()); validate_state(); // order changes dont go through validate_state(); @@ -2099,7 +2099,7 @@ TEST_CASE ("spreader_WAITING_FOR_CANCEL_ACK", "[spreader]") } SECTION("5. on_cancel") { - spreader.on_cancel(PerfTrace()); + spreader.on_cancel(trace::CorID()); // already in cancel state, no change validate_state(); LOG(OrderMan, Diag, "spreader_WAITING_FOR_CANCEL_ACK.on_cancel"); @@ -2668,10 +2668,10 @@ TEST_CASE ("spreader_perf_2legs", "[spreader]") for (uint32_t i=0; i(us_diff (t1,t0))/n_iters; @@ -2804,11 +2804,11 @@ TEST_CASE ("spreader_perf_4legs", "[spreader]") new uint16_t[5] {100,150,250,25,125}, true); spreader.test_only_on_book_update (BookUpdateEvent(book_1, - PerfTrace())); + trace::CorID())); spreader.test_only_on_book_update (BookUpdateEvent(book_2, - PerfTrace())); + trace::CorID())); spreader.test_only_on_book_update (BookUpdateEvent(book_3, - PerfTrace())); + trace::CorID())); verify_complete_quoter_state (qleg_data_4.quoter(), QuoterState::WAITING_FOR_FIRST_ACK, false, @@ -2843,10 +2843,10 @@ TEST_CASE ("spreader_perf_4legs", "[spreader]") for (uint32_t i=0; i(us_diff (t1,t0))/n_iters; diff --git a/src/lib/orderman/orders/spreader_orders/tests/tests_common.h b/src/lib/orderman/orders/spreader_orders/tests/tests_common.h index 7792d29c3..0f570d31e 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/tests_common.h +++ b/src/lib/orderman/orders/spreader_orders/tests/tests_common.h @@ -390,7 +390,7 @@ void fire_book_update (double* prices, uint16_t* sizes, api::Side side, size_t l bts::orderman::Book book; fill_book (book, prices, sizes, side); sm.set_book (book, leg_index); - PerfTrace trace; + trace::CorID trace; quoter.on_book (leg_index, book,trace); } void verify_leg_data (SpreaderLegData& l, bts::orderman::OrderKey, size_t leg_index, uint32_t sec_key, uint32_t exp_yr, uint32_t exp_m, uint32_t exp_day, const std::string& symbol, double leg_mult, double price_mult, api::Side side) @@ -441,7 +441,7 @@ void fire_book_update_hedger (double* prices, uint16_t* sizes, api::Side side, S { bts::orderman::Book book; fill_book (book, prices, sizes, side); - PerfTrace trace; + trace::CorID trace; hedger.on_book (book,trace); } void verify_complete_hedger_state (const SingleFillHedger& hedger, HedgerState state, Price target_price, Quantity target_quantity, Quantity aggregated_filled_quantity, @@ -525,11 +525,11 @@ void set_spreader_orders (SpreaderOrder& spreader, double* leg_1_bid_prices, uin bts::orderman::Book book_leg_1 = get_book (SecurityKey (leg_1_id), 5, leg_1_bid_prices, leg_1_bid_sizes, leg_1_ask_prices, leg_1_ask_sizes, true); - spreader.test_only_on_book_update (bts::orderman::BookUpdateEvent(book_leg_1, PerfTrace())); + spreader.test_only_on_book_update (bts::orderman::BookUpdateEvent(book_leg_1, trace::CorID())); bts::orderman::Book book_leg_2 = get_book (SecurityKey (leg_2_id), 5, leg_2_bid_prices, leg_2_bid_sizes, leg_2_ask_prices, leg_2_ask_sizes, true); - spreader.test_only_on_book_update (bts::orderman::BookUpdateEvent(book_leg_2,PerfTrace())); + spreader.test_only_on_book_update (bts::orderman::BookUpdateEvent(book_leg_2,trace::CorID())); spreader.test_only_on_child_order_update (leg_data_1.order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (leg_1_fills), Price (leg_1_filled_price)); spreader.test_only_on_child_order_update (leg_data_2.order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (leg_2_fills), Price (leg_2_filled_price)); } diff --git a/src/lib/orderman/server/OrderServiceServer.cpp b/src/lib/orderman/server/OrderServiceServer.cpp index 4348f0887..0b53e4a13 100644 --- a/src/lib/orderman/server/OrderServiceServer.cpp +++ b/src/lib/orderman/server/OrderServiceServer.cpp @@ -89,7 +89,7 @@ ActorThread *find_thread_for_actor( struct OrderServiceServer::PImpl { PImpl(bts::api::ServiceContext &ctx, std::shared_ptr &ss, - DynamicOrderRegistry const &d, metrics::MetricsContainer &stats, PerfTraceLog &log) + DynamicOrderRegistry const &d, metrics::MetricsContainer &stats, trace::PerfLog &log) : service_bridge(), service_ready(false), known_orders(), known_fills(), publish_orders(), publish_fills(), admin_service(ctx.locate()), md_consumer(ss), @@ -109,14 +109,14 @@ struct OrderServiceServer::PImpl { bts::md::MDConsumer md_consumer; metrics::MetricsContainer &stats; DynamicOrderRegistry const &dyn_order_registry; - PerfTraceLog &log; + trace::PerfLog &log; }; OrderServiceServer::OrderServiceServer( bts::api::ServiceContext &ctx, std::shared_ptr &ss, DynamicOrderRegistry const &d, metrics::MetricsContainer &stats, - PerfTraceLog &log) + trace::PerfLog &log) : api::orderman::OrderServiceBase(ctx), me(new PImpl(ctx, ss, d, stats,log)) { me->publish_orders = make_orders_publisher(); diff --git a/src/lib/orderman/server/OrderServiceServer.h b/src/lib/orderman/server/OrderServiceServer.h index 526a63b2a..4c23c13f9 100644 --- a/src/lib/orderman/server/OrderServiceServer.h +++ b/src/lib/orderman/server/OrderServiceServer.h @@ -6,7 +6,7 @@ #include namespace bts { -class PerfTraceLog; +namespace trace {class PerfLog;} namespace api { class ISyntheticSecurityService; } @@ -22,7 +22,7 @@ class OrderServiceServer : public api::orderman::OrderServiceBase { std::shared_ptr &, DynamicOrderRegistry const&, metrics::MetricsContainer &, - PerfTraceLog &); + trace::PerfLog &); ~OrderServiceServer(); void create_order(const api::orderman::Create &, diff --git a/src/server/sparkd/cmds/Benchmark.cpp b/src/server/sparkd/cmds/Benchmark.cpp index e25268b4c..089222abd 100644 --- a/src/server/sparkd/cmds/Benchmark.cpp +++ b/src/server/sparkd/cmds/Benchmark.cpp @@ -32,6 +32,7 @@ #include #include #include +#include "lib/tracing/PerfLog.h" #include @@ -835,6 +836,13 @@ static void fix_time_stamp(benchmark::State &state) { } BENCHMARK(fix_time_stamp); +static void perf_log(benchmark::State &state) { + trace::PerfLog l; + for (auto _ : state) + l.log(trace::CorID{"sim", 0}, "this", 1, 2, "txt", 3); +} +BENCHMARK(perf_log); + std::string Benchmark::help() { return "Run micro-benchmarks. Use --benchmark_filter=regex to run only " "specific benchmarks."; diff --git a/src/server/sparkd/cmds/QuickTest.cpp b/src/server/sparkd/cmds/QuickTest.cpp index 84d9931e1..0489920c7 100644 --- a/src/server/sparkd/cmds/QuickTest.cpp +++ b/src/server/sparkd/cmds/QuickTest.cpp @@ -1,30 +1,16 @@ #include "QuickTest.h" #include "ICmd.h" - -#include "lib/api/services/OrderService.server.pb.h" -#include "lib/mercury/actors/PingPong.h" -#include "lib/mercury/broker/BrokerProxy.h" -#include "lib/mercury/common/mercury_common.h" -#include "lib/mercury/executor/Executor.h" -#include "lib/utils/PBUtils.h" -#include "lib/utils/thread_manager.h" -#include "lib/orderman/events/OrderStateUpdateEvent.h" +#include "lib/tracing/PerfLog.h" #include namespace bts { namespace cmd { -using namespace bts::mercury; -using namespace bts::orderman; - int QuickTest::execute(std::vector const &) { - sleep_for(10s); - for (int i = 0; i < 100; i++) { - auto t = utils::TimeStamp::now(); - LOG(OrderMan,Info,"Now: {}", (utils::TimeStamp::now() - t).nanoseconds()); - } - sleep_for(10s); + trace::PerfLog l; + l.log(trace::CorID{"sim", 0}, "this", 1, 2, "txt", 3); + l.store_log_entries(); return 0; } diff --git a/src/server/sparkd/cmds/Run.cpp b/src/server/sparkd/cmds/Run.cpp index 516980043..701148644 100644 --- a/src/server/sparkd/cmds/Run.cpp +++ b/src/server/sparkd/cmds/Run.cpp @@ -10,26 +10,27 @@ #include "lib/quickbus/quickbus.h" #include "lib/utils/Dispatcher.h" +#include "lib/config/protos/toggles.pb.h" #include "lib/md/SyntheticSecurityService.h" #include "lib/md/relay/QueryServer.h" #include "lib/metrics/metrics.h" #include "lib/metrics/system_metrics.h" -#include "lib/orderman/orderman_utils/PerfTraceLog.h" +#include "lib/orderman/order_factory/DynamicOrderRegistry.h" #include "lib/orderman/server/OrderServiceServer.h" #include "lib/persistence/PersistenceServiceServer.h" +#include "lib/plugin/SparkServices.h" +#include "lib/plugin/plugin.h" +#include "lib/tracing/PerfLog.h" #include "lib/utils/thread_manager.h" #include "server/sparkd/http/WebServer.h" +#include "server/sparkd/md/MarketDataAuxiliaryServiceServer.h" #include "server/sparkd/md/run_md.h" #include "server/sparkd/position/PositionServiceServer.h" #include "server/sparkd/support/ErrorReportService.h" #include "server/sparkd/support/ShellLatencyServer.h" #include "server/sparkd/user/AdminServiceServer.h" -#include "server/sparkd/md/MarketDataAuxiliaryServiceServer.h" #include "server/sparkd/user/UserServiceServer.h" -#include "lib/orderman/order_factory/DynamicOrderRegistry.h" -#include "lib/plugin/SparkServices.h" -#include "lib/plugin/plugin.h" -#include "lib/config/protos/toggles.pb.h" + #include namespace bts { @@ -41,17 +42,16 @@ int Run::execute(std::vector const &) { "------------------------------------ Sparkd launched " "--------------------------------"); - config::QuickbusNodeCfg qb_cfg; auto &ports = config::get(); qb_cfg.set_my_port(ports.qbus_port()); qbus::Quickbus quickbus(qb_cfg); api::ServiceContext sc(&quickbus); - PerfTraceLog perf_log; + trace::PerfLog perf_log; metrics::MetricsContainer stats; metrics::publish_system_metrics(stats); - http::SparkWebServer webserver(sc, stats, perf_log,ports.config_port()); + http::SparkWebServer webserver(sc, stats, perf_log, ports.config_port()); persistence::PersistenceServiceServer settings_saver(sc, "settings"); user::UserServiceServer login_server(sc); @@ -67,10 +67,10 @@ int Run::execute(std::vector const &) { plugin::init_plugins(plugin_services); // finished initializing order plugins - orderman::OrderServiceServer order_service_server(sc, synthetic_service,dyn_order_registry, - stats, perf_log); + orderman::OrderServiceServer order_service_server( + sc, synthetic_service, dyn_order_registry, stats, perf_log); support::ErrorReportServer error_report_service(sc); - admin::AdminServiceServer admin_service(sc); + admin::AdminServiceServer admin_service(sc); md::auxiliary::MarketDataAuxiliaryServiceServer md_aux_server(sc); position::PositionServiceServer position_service(sc); metrics::ShellLatencyServer shell_latency_service( @@ -79,12 +79,11 @@ int Run::execute(std::vector const &) { auto bg_health = std::make_shared("spark_background_thread"); utils::DispatcherTimer timer(utils::Dispatcher::background(), 5000, - [=]() {bg_health->increment(); }); + [=]() { bg_health->increment(); }); timer.start(); - utils::DispatcherTimer timer2(utils::Dispatcher::background(), 1000, - [&]() {perf_log.persist_traces();}); + [&]() { perf_log.store_log_entries(); }); timer2.start(); stats.publish(bg_health); diff --git a/src/server/sparkd/cmds/Web.cpp b/src/server/sparkd/cmds/Web.cpp index 09bda5c6e..9ba90c72b 100644 --- a/src/server/sparkd/cmds/Web.cpp +++ b/src/server/sparkd/cmds/Web.cpp @@ -14,7 +14,7 @@ #include "server/sparkd/user/AdminServiceServer.h" #include "server/sparkd/user/UserServiceServer.h" #include "server/sparkd/md/run_md.h" -#include "lib/orderman/orderman_utils/PerfTraceLog.h" +#include "lib/tracing/PerfLog.h" #include #include @@ -31,7 +31,7 @@ int Web::execute(const std::vector& args) { metrics::MetricsContainer stats; metrics::publish_system_metrics(stats); - PerfTraceLog perf_log; + trace::PerfLog perf_log; http::SparkWebServer webserver(sc, stats, perf_log,ports.config_port()); user::UserServiceServer login_server(sc); diff --git a/src/server/sparkd/http/WebServer.cpp b/src/server/sparkd/http/WebServer.cpp index e72ffcebe..bcd6ddae2 100644 --- a/src/server/sparkd/http/WebServer.cpp +++ b/src/server/sparkd/http/WebServer.cpp @@ -6,7 +6,7 @@ #include "lib/logging/logging.h" #include "lib/os/os.h" #include "lib/utils/TimeStamp.h" -#include "lib/orderman/orderman_utils/PerfTraceLog.h" +#include "lib/tracing/PerfLog.h" #include #include @@ -54,9 +54,9 @@ namespace http { const api::ServiceContext& _ctx; metrics::MetricsContainer& _metrics; std::shared_ptr> _mtimer; - PerfTraceLog &_trace_log; + trace::PerfLog &_perf_log; - ServerState(const api::ServiceContext& ctx, metrics::MetricsContainer& metrics, PerfTraceLog &l,int port) : + ServerState(const api::ServiceContext& ctx, metrics::MetricsContainer& metrics, trace::PerfLog &l,int port) : _m(), _dispatcher(utils::Dispatcher::get_named("Webserver")), _session(), @@ -67,7 +67,7 @@ namespace http { _metrics(metrics), _mtimer(std::make_shared>("spark_metrics_query_duration_ms", std::array({ 0.5, 1.0, 5.0, 10.0 }))), - _trace_log(l) + _perf_log(l) { _www = os::sparkdata_path("www"); _conf = os::sparkdata_path("conf"); @@ -165,10 +165,10 @@ namespace http { _mtimer->observe((utils::TimeStamp::now() - start).microseconds() / 1000.0); } - void return_perf_trace_data(connection_ptr& con,size_t max_rows) { + void return_perf_trace_data(connection_ptr& con,size_t ) { utils::TimeStamp start = utils::TimeStamp::now(); std::stringstream ss; - _trace_log.print_latest_traces(ss,max_rows); + //_perf_log.print_latest_traces(ss,max_rows); con->set_body(ss.str()); con->set_status(websocketpp::http::status_code::ok); _mtimer->observe((utils::TimeStamp::now() - start).microseconds() / 1000.0); @@ -359,7 +359,7 @@ namespace http { -SparkWebServer::SparkWebServer(const api::ServiceContext& ctx, metrics::MetricsContainer& metrics, PerfTraceLog &l,int port) : +SparkWebServer::SparkWebServer(const api::ServiceContext& ctx, metrics::MetricsContainer& metrics, trace::PerfLog &l,int port) : _me(std::make_shared(ctx, metrics, l,port)) { } diff --git a/src/server/sparkd/http/WebServer.h b/src/server/sparkd/http/WebServer.h index 2414a4f8b..b9bb981df 100644 --- a/src/server/sparkd/http/WebServer.h +++ b/src/server/sparkd/http/WebServer.h @@ -4,7 +4,7 @@ #include namespace bts { -class PerfTraceLog; +namespace trace {class PerfLog;} namespace http { struct ServerState; @@ -12,7 +12,7 @@ namespace http { class SparkWebServer { std::shared_ptr _me; public: - SparkWebServer(const api::ServiceContext& ctx, metrics::MetricsContainer& metrics, PerfTraceLog &,int port); + SparkWebServer(const api::ServiceContext& ctx, metrics::MetricsContainer& metrics, trace::PerfLog &,int port); }; }} From 4446ef0f57a3ad8c970d0821e556d500fe1085c4 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Tue, 4 Dec 2018 16:52:22 -0500 Subject: [PATCH 024/107] Recoverd perflog --- src/lib/tracing/PerfLog.cpp | 184 ++++++++++++++++++++++++++++++++++++ src/lib/tracing/PerfLog.h | 60 ++++++++++++ 2 files changed, 244 insertions(+) create mode 100644 src/lib/tracing/PerfLog.cpp create mode 100644 src/lib/tracing/PerfLog.h diff --git a/src/lib/tracing/PerfLog.cpp b/src/lib/tracing/PerfLog.cpp new file mode 100644 index 000000000..849020d85 --- /dev/null +++ b/src/lib/tracing/PerfLog.cpp @@ -0,0 +1,184 @@ + + +#include "lib/tracing/PerfLog.h" +#include "lib/persistence/persistence_utils.h" +#include "lib/utils/datetime.h" +#include "lib/config/config.h" +#include "lib/config/protos/system.pb.h" + +#include +#include +#include +#include +#include + +namespace bts { +namespace trace { + +auto create_session = "create table session (" + "version TEXT, " + "host TEXT, " + "build_type TEXT, " + "session_start TIMESTAMP PRIMARY KEY" + ")"; + +auto create_trace = "create table trace (" + "session_start TIMESTAMP," + "ts INTEGER," + "hts timestamp," + "channel TEXT," + "entry_kind TEXT," + "txt_1 TEXT," + "sn INTEGER," + "uint32_1 INTEGER," + "uint32_2 INTEGER," + "uint64_1 INTEGER," + "thread TEXT" + ")"; + +auto insert_trace = "insert into trace (" + "session_start," + "ts," + "hts," + "channel," + "entry_kind," + "txt_1," + "sn," + "uint32_1," + "uint32_2," + "uint64_1," + "thread" + ") values (" + ":session_start," + ":ts," + ":hts," + ":channel," + ":entry_kind," + ":txt_1," + ":sn," + ":uint32_1," + ":uint32_2," + ":uint64_1," + ":thread" + ")"; + +auto insert_session = "insert into session (" + "version," + "host," + "build_type," + "session_start" + ") values (" + ":version," + ":host," + ":build_type," + ":session_start" + ")"; + +struct PerfLog::PImpl { + PImpl(std::string const &loc) + : db(loc, SQLite::OPEN_READWRITE | SQLite::OPEN_CREATE), + insert_trace_statement(), insert_session_statement(), session_start() {} + + SQLite::Database db; + std::unique_ptr insert_trace_statement; + std::unique_ptr insert_session_statement; + std::string session_start; + bool disabled; +}; + +PerfLog::PerfLog() : _pending(), _disabled(false), me() { + auto loc = init_storage_location(); + + if (loc.empty()) { + _disabled = true; + return; + } + + try { + me = std::make_unique(loc); + if (!me->db.tableExists("session")) { + LOG(persist, Warn, "{} database does not exist yet. Creating it ", + std::string(me->db.getFilename())); + me->db.exec(create_session); + me->db.exec(create_trace); + } + + me->insert_trace_statement = + std::make_unique(me->db, insert_trace); + me->insert_session_statement = + std::make_unique(me->db, insert_session); + me->session_start = datetime::FIX_timestamp(datetime::local_now()); + + me->insert_session_statement->bind(":version", + config::get().version()); + me->insert_session_statement->bind(":host", + config::get().host_name()); +#ifdef DEBUG + me->insert_session_statement->bind(":build_type", "debug"); +#else + me->insert_session_statement->bind(":build_type", "release"); +#endif + me->insert_session_statement->bind(":session_start", me->session_start); + me->insert_session_statement->exec(); + me->insert_session_statement->reset(); + } catch (SQLite::Exception const &e) { + LOG(persist, Error, "Error initializing perf_trace DB {}. Error: {}", loc, + std::string(e.getErrorStr())); + _disabled = true; + } +} + +PerfLog::~PerfLog() {} + +std::string PerfLog::init_storage_location() { + auto loc = persistence::storage_location("perf_trace2"); + auto parent = boost::filesystem::path(loc).parent_path(); + + if (!boost::filesystem::is_directory(parent)) { + if (boost::filesystem::create_directories(parent)) + return loc; + else + return ""; + } + else + return loc; +} + +size_t PerfLog::store_log_entries() { + if (_disabled) + return 0; + + PerfLogEntry ev; + size_t count = 0; + while (_pending.try_pop(ev)) + try { + me->insert_trace_statement->bind(":session_start", me->session_start); + me->insert_trace_statement->bind(":ts", (long long)ev.ts.to_uint64()); + me->insert_trace_statement->bind( + ":hts", + datetime::FIX_timestamp(datetime::timestamp_to_ptime(ev.ts))); + me->insert_trace_statement->bind(":channel", ev.channel); + me->insert_trace_statement->bind(":entry_kind", ev.entry_kind); + me->insert_trace_statement->bind(":txt_1", ev.txt_1); + me->insert_trace_statement->bind(":sn", ev.sn); + me->insert_trace_statement->bind(":uint32_1", ev.uint32_1); + me->insert_trace_statement->bind(":uint32_2", ev.uint32_2); + me->insert_trace_statement->bind(":uint64_1", (long long)ev.uint64_1); + + char tn[17]; + pthread_getname_np(pthread_self(), tn,16); + me->insert_trace_statement->bind(":thread", tn); + me->insert_trace_statement->exec(); + me->insert_trace_statement->reset(); + count ++; + } catch (SQLite::Exception const &e) { + LOG(persist, Error, "Unable to insert perf trace in {}. Error: {}", + std::string(me->db.getFilename()), std::string(e.getErrorStr())); + + _disabled = true; + } + return count; +} + +} // namespace trace +} // namespace trace diff --git a/src/lib/tracing/PerfLog.h b/src/lib/tracing/PerfLog.h new file mode 100644 index 000000000..cc0f31ad8 --- /dev/null +++ b/src/lib/tracing/PerfLog.h @@ -0,0 +1,60 @@ + +#pragma once + +#include "lib/utils/TimeStamp.h" +#include +#include + +namespace bts { +namespace trace { + +struct CorID { + const char *channel = ""; + uint32_t sn = 0; +}; + +struct PerfLogEntry { + utils::TimeStamp ts; + const char *channel; + const char *entry_kind; + const char *txt_1; + uint32_t sn; + uint32_t uint32_1; + uint32_t uint32_2; + uint64_t uint64_1; + std::thread::id thread_id; +}; + +class PerfLog { + tbb::concurrent_queue _pending; + bool _disabled; + struct PImpl; + std::unique_ptr me; + + public: + PerfLog() ; + ~PerfLog(); + size_t store_log_entries(); + + void log(CorID cid, const char *entry_kind, uint32_t uint32_1 = 0, + uint32_t uint32_2 = 0, const char *txt_1 = "", + uint64_t uint64_1 = 0) { + _pending.push({utils::TimeStamp::now(), cid.channel, entry_kind, txt_1, + cid.sn, uint32_1, uint32_2, uint64_1, + std::this_thread::get_id()}); + } + + void log(CorID cid, utils::TimeStamp ts, const char *entry_kind, + uint32_t uint32_1 = 0, uint32_t uint32_2 = 0, + const char *txt_1 = nullptr, uint64_t uint64_1 = 0) { + _pending.push({ts,cid.channel, entry_kind, txt_1, + cid.sn, uint32_1, uint32_2, uint64_1, + std::this_thread::get_id()}); + } + + private: + std::string init_storage_location(); +}; + +} // namespace trace +} // namespace bts From 91cb215b09c910df728a1f9c725c46d88e1e6f23 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Tue, 4 Dec 2018 18:11:34 -0500 Subject: [PATCH 025/107] fix SPARK-1914 --- src/server/sparkd/user/UserServiceServer.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/server/sparkd/user/UserServiceServer.cpp b/src/server/sparkd/user/UserServiceServer.cpp index e1ffb1857..4c4e38206 100644 --- a/src/server/sparkd/user/UserServiceServer.cpp +++ b/src/server/sparkd/user/UserServiceServer.cpp @@ -60,17 +60,19 @@ void UserServiceServer::authenticate_login(const api::user::AuthenticateLoginReq me->admin.get_admin_data(vod, [=](const api::Result& admin_data) { api::user::AuthenticateLoginResponse resp; resp.set_is_valid(false); - if (admin_data.success()) { + if (admin_data.success()) + { for (const auto& user : admin_data.result()->users()) { - if (user.name() == req.login() && user.password() == req.password() && user.is_present()) { - resp.set_is_valid(user.is_active()); + if (user.name() == req.login() && user.password() == req.password() && user.is_present()) { + auto toke = api::auth::generate_token(user); + api::user::TokenPayload payload; + api::auth::decode_token(toke.token(), &payload); + + resp.set_is_valid(payload.wheel() || user.is_active()); if(!resp.is_valid()) resp.set_reason("User login privledges restricted, please contact your risk manager"); resp.set_user_id(user.id()); - resp.mutable_token()->CopyFrom(api::auth::generate_token(user)); - - api::user::TokenPayload payload; - api::auth::decode_token(resp.token().token(), &payload); + resp.mutable_token()->CopyFrom(toke); resp.set_can_create(payload.wheel() || user.can_create()); respond(resp); return; From 0219dd2013241d4073e89bc19092986833015cce Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Tue, 4 Dec 2018 22:39:17 +0000 Subject: [PATCH 026/107] First cut at replacing log calls with new perf log. --- src/lib/jetfix/gateway/CoreGateway.cpp | 2 -- src/lib/jetfix/gateway/Session.cpp | 3 --- src/lib/orderman/actors/ExecutionGateway.cpp | 2 -- src/lib/orderman/orders/NativeOrder.cpp | 6 ------ .../spreader_orders/ISpreaderStateWorker.h | 4 ++-- .../orders/spreader_orders/SpreaderOrder.cpp | 14 +++++-------- .../orders/spreader_orders/SpreaderOrder.h | 2 +- .../spreader/SingleLegQuoter.cpp | 2 +- .../spreader/SingleLegQuoter.h | 2 +- .../SpreaderEndStateWorker.cpp | 4 ++-- .../spreader_states/SpreaderEndStateWorker.h | 4 ++-- .../SpreaderStartStateWorker.cpp | 4 ++-- .../SpreaderStartStateWorker.h | 4 ++-- ...SpreaderWaitingForCancelAllStateWorker.cpp | 4 ++-- .../SpreaderWaitingForCancelAllStateWorker.h | 4 ++-- ...readerWaitingForInitialDataStateWorker.cpp | 4 ++-- ...SpreaderWaitingForInitialDataStateWorker.h | 4 ++-- .../SpreaderWorkingStateWorker.cpp | 4 ++-- .../SpreaderWorkingStateWorker.h | 4 ++-- .../orderman/server/OrderServiceServer.cpp | 2 +- src/sdk/examples/order_plugin_example.cpp | 20 +++++++++---------- src/server/sparkd/cmds/Benchmark.cpp | 12 ----------- 22 files changed, 41 insertions(+), 70 deletions(-) diff --git a/src/lib/jetfix/gateway/CoreGateway.cpp b/src/lib/jetfix/gateway/CoreGateway.cpp index 67c54111f..e6bac0847 100644 --- a/src/lib/jetfix/gateway/CoreGateway.cpp +++ b/src/lib/jetfix/gateway/CoreGateway.cpp @@ -258,8 +258,6 @@ void CoreGateway::sync_stop(EventData const &) { } void CoreGateway::sync_send(EventData const &ev) { - tracepoint(bts_trace, trace_order, (char *)"CoreGateway.sync_send", 0, - ev.trace.md_sn, 0); switch (me->state) { case State::OFF: bts_assert(false); diff --git a/src/lib/jetfix/gateway/Session.cpp b/src/lib/jetfix/gateway/Session.cpp index 05609d611..ba7a69069 100644 --- a/src/lib/jetfix/gateway/Session.cpp +++ b/src/lib/jetfix/gateway/Session.cpp @@ -561,13 +561,10 @@ void Session::internal_send(trace::CorID trace, OutFIXPtr const &msgs) { data_vec[i].first = s.data(); data_vec[i].second = s.size(); } - tracepoint(bts_trace, trace_order, (char *)"Session.internal_send.pre_write", 0, trace.md_sn,0); if (me->connection.write(data_vec, msgs->fix.size(), trace) < 0) { terminate_session(JetFIXError::CONNECTION_ERROR); return; } - tracepoint(bts_trace, trace_order, - (char *)"Session.internal_send.post_write", 0, trace.md_sn, 0); me->last_sent_msg_timestamp = me->now(); me->store.store(msgs); msgs->set_ts(OutFIX::POST_STORE, utils::TimeStamp::now()); diff --git a/src/lib/orderman/actors/ExecutionGateway.cpp b/src/lib/orderman/actors/ExecutionGateway.cpp index 334f484ed..c50d75ad2 100644 --- a/src/lib/orderman/actors/ExecutionGateway.cpp +++ b/src/lib/orderman/actors/ExecutionGateway.cpp @@ -186,8 +186,6 @@ void ExecutionGateway::on_exe_report( data->exec_type = api::orderman::ExecType(msg.get()); data->msg_seq_num = msg.get(); - tracepoint(bts_trace, trace_order, - (char *)"ExecutionGateway.on_exe_report", 0, 0, 0); // copy data from fix msg to our structure if (msg.has()) diff --git a/src/lib/orderman/orders/NativeOrder.cpp b/src/lib/orderman/orders/NativeOrder.cpp index 78e4a1c26..33b89aadd 100644 --- a/src/lib/orderman/orders/NativeOrder.cpp +++ b/src/lib/orderman/orders/NativeOrder.cpp @@ -505,9 +505,6 @@ void NativeOrder::on_update(Price p, Quantity q, trace::CorID const &trace) { break; } - tracepoint(bts_trace, trace_order, (char *)"on_update.after_limits", 0, - trace.md_sn, trace.order_key); - // all good auto &encoding = me->update_encoding; me->update_price_bm = encoding.overwrite( @@ -517,9 +514,6 @@ void NativeOrder::on_update(Price p, Quantity q, trace::CorID const &trace) { me->update_quantity_bm = encoding.overwrite(me->update_quantity_bm, q.value(), quantity_sz()); - tracepoint(bts_trace, trace_order, (char *)"on_update.half_way", 0, - trace.md_sn, trace.order_key); - auto const &ts = me->services->get_time_str(); me->update_transact_time_bm = encoding.overwrite( me->update_transact_time_bm, &ts.value()[0], ts.value().size()); diff --git a/src/lib/orderman/orders/spreader_orders/ISpreaderStateWorker.h b/src/lib/orderman/orders/spreader_orders/ISpreaderStateWorker.h index f4ef18dca..07cefede3 100644 --- a/src/lib/orderman/orders/spreader_orders/ISpreaderStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/ISpreaderStateWorker.h @@ -34,7 +34,7 @@ public: // 5. called when the user cancels an order virtual void on_cancel() = 0; // 6. on market data update (support late joiners) - virtual void on_book(const Book&,trace::CorID &) = 0; + virtual void on_book(const Book&,trace::CorID ) = 0; // 15. settlement price update virtual void on_settlement_price(const SettlementUpdateEvent&) = 0; // 7. time event called by the infrastructure @@ -43,7 +43,7 @@ public: virtual void on_quoter_order_error(SpreaderLegData& leg_data) = 0; // 9. on a quoter order fill virtual void on_quoter_order_fill(SpreaderLegData& leg_data, - trace::CorID &) = 0; + trace::CorID ) = 0; // 10. on a quoter status update without a fill virtual void on_quoter_order_status_update(SpreaderLegData& leg_data) = 0; // 11. when a hedger order ack from the exchange has an error diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp index 8b5131a7e..0737f204f 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp @@ -115,9 +115,8 @@ void SpreaderOrder::_on_settlement_update(const SettlementUpdateEvent& _state_worker->on_settlement_price(settlement_event); } void SpreaderOrder::_on_child_order_update(const OrderStateUpdateEvent& ord_ev){ - auto trace = ord_ev.trace; - trace.spreader_on_child_order_update = utils::TimeStamp::now(); if (!_active) return; + _order_services->order_services().log(ord_ev.trace,"begin_on_child_order_update", key().value()); SecurityKey sec_key = SecurityKey(ord_ev.definition->security_key()); OrderKey order_key = ord_ev.key; bts::api::orderman::OrderStatus status = ord_ev.status; @@ -149,7 +148,7 @@ void SpreaderOrder::_on_child_order_update(const OrderStateUpdateEvent& ord_ev){ leg_data.order_update_message().on_order_update(ord_ev); if (order_error == ChildOrderError::NONE){ if (leg_data.order_update_message().last_update_filled_quantity().value() > 0) - _state_worker->on_quoter_order_fill (leg_data,trace); + _state_worker->on_quoter_order_fill (leg_data,ord_ev.trace); else _state_worker->on_quoter_order_status_update (leg_data); } @@ -185,8 +184,7 @@ void SpreaderOrder::_on_child_order_update(const OrderStateUpdateEvent& ord_ev){ } _send_check_termination(true); _report_state(); - LOG(Latency,Diag, "_on_child_order_update k:{} t:{}us", key().value(), - (utils::TimeStamp::now() - trace.spreader_on_child_order_update).microseconds()); + _order_services->order_services().log(ord_ev.trace,"end_on_child_order_update", key().value()); } // State Transformations //////////////////// ///////////////////////////////////////////// @@ -314,10 +312,8 @@ bool SpreaderOrder::_quoters_can_accept_modification (){ void SpreaderOrder::_send_hedge(size_t hedge_leg_index, Price hedge_price, Quantity hedge_qty, - const trace::CorID &trace){ - LOG(OrderMan, Info, "SpreaderOrder::_send_hedge key:{} hedge_leg_index:{} " - "hedge_price:{} hedge_qty:{} cid:{}", - key(), hedge_leg_index, hedge_price, hedge_qty, trace.md_sn); + const trace::CorID trace){ + SingleFillHedger& hedger = _bookkeeping_data().add_new_hedger (*this, hedge_leg_index, hedge_price, diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h index f97a8e68c..3835e922b 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h @@ -178,7 +178,7 @@ private: void _send_hedge(size_t hedge_leg_index, Price hedge_price, Quantity hedge_qty, - trace::CorID const&); + trace::CorID const); void _compute_hedge_price_quantity(size_t filled_leg_index, Price filled_price, double filled_quantity, diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp index b48208383..23860e5dd 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp @@ -101,7 +101,7 @@ void SingleLegQuoter::update_order_status(const SpreaderChildOrderState& u){ } } void SingleLegQuoter::on_book(size_t leg_index, - const bts::orderman::Book& book,trace::CorID &trace){ + const bts::orderman::Book& book,trace::CorID trace){ if (_active_quoting) _worker->on_book (leg_index, book,trace); } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h index 5139254d9..0a35fb934 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h @@ -101,7 +101,7 @@ public: //c. called when the market data associated // with this security is changed void on_book(size_t leg_index, - const bts::orderman::Book&,trace::CorID &); + const bts::orderman::Book&,trace::CorID ); //d. called when the order is cancelled, either // manually or automatically void cancel_order(); diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp index 4c74d2bf0..b0bc2c9dc 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp @@ -34,7 +34,7 @@ void SpreaderEndStateWorker::on_update(Price, Quantity){ } void SpreaderEndStateWorker::on_cancel(){ } -void SpreaderEndStateWorker::on_book(const Book&,trace::CorID&){ +void SpreaderEndStateWorker::on_book(const Book&,trace::CorID){ } void SpreaderEndStateWorker::on_settlement_price(const SettlementUpdateEvent&){ } @@ -43,7 +43,7 @@ void SpreaderEndStateWorker::on_time(const TimeStamp&){ void SpreaderEndStateWorker::on_quoter_order_error(SpreaderLegData&){ } void SpreaderEndStateWorker::on_quoter_order_fill(SpreaderLegData&, - trace::CorID&){ + trace::CorID){ } void SpreaderEndStateWorker::on_quoter_order_status_update(SpreaderLegData&){ } diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.h index 69bee63ed..cdf791845 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.h @@ -20,12 +20,12 @@ public: void on_activate(Price, Quantity, SpreaderOrderServices&) override; void on_update(Price, Quantity) override; void on_cancel() override; - void on_book(const Book&,trace::CorID&) override; + void on_book(const Book&,trace::CorID) override; void on_settlement_price(const SettlementUpdateEvent&) override; void on_time(const TimeStamp&) override; void on_quoter_order_error(SpreaderLegData& leg_data) override; void on_quoter_order_fill(SpreaderLegData& leg_data, - trace::CorID&) override; + trace::CorID) override; void on_quoter_order_status_update(SpreaderLegData& leg_data) override; void on_hedger_order_error(SingleFillHedger&) override; void on_hedger_order_update(SingleFillHedger&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp index 522f8dcdd..adc4108e2 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp @@ -117,7 +117,7 @@ void SpreaderStartStateWorker::on_cancel(){ // and hence it goes directly to END _spreader->_transform_to_END(); } -void SpreaderStartStateWorker::on_book(const bts::orderman::Book&,trace::CorID &){ +void SpreaderStartStateWorker::on_book(const bts::orderman::Book&,trace::CorID ){ bts_assert_msg (false, "SpreaderStartStateWorker::on_book is an illegal operation"); } void SpreaderStartStateWorker::on_settlement_price(const SettlementUpdateEvent&){ @@ -131,7 +131,7 @@ void SpreaderStartStateWorker::on_quoter_order_error(SpreaderLegData&){ bts_assert_msg (false, "SpreaderStartStateWorker::on_quoter_order_error is an illegal operation"); } void SpreaderStartStateWorker::on_quoter_order_fill(SpreaderLegData&, - trace::CorID&){ + trace::CorID){ bts_assert_msg (false, "SpreaderStartStateWorker::on_quoter_order_fill is an illegal operation"); } void SpreaderStartStateWorker::on_quoter_order_status_update(SpreaderLegData&){ diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.h index b14d8e08f..78e92a3cd 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.h @@ -25,12 +25,12 @@ public: SpreaderOrderServices&) override; void on_update(Price, Quantity) override; void on_cancel() override; - void on_book(const Book&,trace::CorID &) override; + void on_book(const Book&,trace::CorID ) override; void on_time(const TimeStamp&) override; void on_settlement_price(const SettlementUpdateEvent&) override; void on_quoter_order_error(SpreaderLegData& leg_data) override; void on_quoter_order_fill(SpreaderLegData& leg_data, - trace::CorID &) override; + trace::CorID ) override; void on_quoter_order_status_update(SpreaderLegData& leg_data) override; void on_hedger_order_error(SingleFillHedger&) override; void on_hedger_order_update(SingleFillHedger&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp index 36669f38e..d58ea59d5 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp @@ -33,7 +33,7 @@ void SpreaderWaitingForCancelAllStateWorker::on_update(Price, } void SpreaderWaitingForCancelAllStateWorker::on_cancel(){ } -void SpreaderWaitingForCancelAllStateWorker::on_book(const Book&,trace::CorID &){ +void SpreaderWaitingForCancelAllStateWorker::on_book(const Book&,trace::CorID ){ } void SpreaderWaitingForCancelAllStateWorker::on_time(const TimeStamp& ts){ if (ms_diff (ts, _cancel_timestamp) >= _spreader->_cancel_timeout){ @@ -48,7 +48,7 @@ void SpreaderWaitingForCancelAllStateWorker::on_quoter_order_error(SpreaderLegDa leg_data.quoter().update_order_status (leg_data.order_update_message()); } void SpreaderWaitingForCancelAllStateWorker::on_quoter_order_fill(SpreaderLegData& leg_data, - trace::CorID &){ + trace::CorID ){ leg_data.quoter().update_order_status (leg_data.order_update_message()); } void SpreaderWaitingForCancelAllStateWorker::on_quoter_order_status_update(SpreaderLegData& leg_data){ diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.h index 96c3128e5..cf6f7ca0b 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.h @@ -23,12 +23,12 @@ public: SpreaderOrderServices&) override; void on_update(Price, Quantity) override; void on_cancel() override; - void on_book(const Book&,trace::CorID &) override; + void on_book(const Book&,trace::CorID ) override; void on_settlement_price(const SettlementUpdateEvent&) override; void on_time(const TimeStamp&) override; void on_quoter_order_error(SpreaderLegData& leg_data) override; void on_quoter_order_fill(SpreaderLegData& leg_data, - trace::CorID &) override; + trace::CorID ) override; void on_quoter_order_status_update(SpreaderLegData& leg_data) override; void on_hedger_order_error(SingleFillHedger&) override; void on_hedger_order_update(SingleFillHedger&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp index 0e7cfd266..e69c0e62a 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp @@ -46,7 +46,7 @@ void SpreaderWaitingForInitialDataStateWorker::on_cancel(){ _spreader->_transform_to_END(); } void SpreaderWaitingForInitialDataStateWorker::on_book(const Book& book, - trace::CorID&){ + trace::CorID){ SpreaderBookkeepingData& bookkeeping_data = _spreader->_bookkeeping_data(); SpreaderLegData& md_leg = bookkeeping_data.get_leg_data(book.security_key()); md_leg.update_book(book); @@ -71,7 +71,7 @@ void SpreaderWaitingForInitialDataStateWorker::on_quoter_order_error(SpreaderLeg "on_quoter_order_error is an illegal operation"); } void SpreaderWaitingForInitialDataStateWorker::on_quoter_order_fill(SpreaderLegData&, - trace::CorID&){ + trace::CorID){ bts_assert_msg (false, "SpreaderWaitingForInitialDataStateWorker::" "on_quoter_order_fill is an illegal operation"); } diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.h index 4477edacf..c344a8542 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.h @@ -25,12 +25,12 @@ public: SpreaderOrderServices&) override; void on_update(Price, Quantity) override; void on_cancel() override; - void on_book(const Book&,trace::CorID &) override; + void on_book(const Book&,trace::CorID) override; void on_settlement_price(const SettlementUpdateEvent&) override; void on_time(const TimeStamp&) override; void on_quoter_order_error(SpreaderLegData& leg_data) override; void on_quoter_order_fill(SpreaderLegData& leg_data, - trace::CorID &) override; + trace::CorID ) override; void on_quoter_order_status_update(SpreaderLegData& leg_data) override; void on_hedger_order_error(SingleFillHedger&) override; void on_hedger_order_update(SingleFillHedger&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp index 989a46e3f..59fc70fbb 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp @@ -42,7 +42,7 @@ void SpreaderWorkingStateWorker::on_cancel(){ _spreader->_cancel_orders (true, true); _spreader->_transform_to_WAITING_FOR_CANCEL_ALL (); } -void SpreaderWorkingStateWorker::on_book(const Book& book,trace::CorID &trace){ +void SpreaderWorkingStateWorker::on_book(const Book& book,trace::CorID trace){ SpreaderBookkeepingData& bookkeeping_data = _spreader->_bookkeeping_data(); // this is a key->index lookup SpreaderLegData& md_leg = bookkeeping_data.get_leg_data(book.security_key()); @@ -78,7 +78,7 @@ void SpreaderWorkingStateWorker::on_quoter_order_error(SpreaderLegData& leg_data _spreader->_transform_to_WAITING_FOR_CANCEL_ALL (); } void SpreaderWorkingStateWorker::on_quoter_order_fill(SpreaderLegData& leg_data, - trace::CorID &trace){ + trace::CorID trace){ // this is the most complex part of the spreader. the following needs to be done // 1. tell other quoters about it (so they reduce their sizes) // 2. launch a new hedger diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.h index 1ff8e4dab..214e2eba1 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.h @@ -22,12 +22,12 @@ public: SpreaderOrderServices&) override; void on_update(Price, Quantity) override; void on_cancel() override; - void on_book(const Book&,trace::CorID &) override; + void on_book(const Book&,trace::CorID ) override; void on_settlement_price(const SettlementUpdateEvent&) override; void on_time(const TimeStamp&) override; void on_quoter_order_error(SpreaderLegData& leg_data) override; void on_quoter_order_fill(SpreaderLegData& leg_data, - trace::CorID &) override; + trace::CorID ) override; void on_quoter_order_status_update(SpreaderLegData& leg_data) override; void on_hedger_order_error(SingleFillHedger&) override; void on_hedger_order_update(SingleFillHedger&) override; diff --git a/src/lib/orderman/server/OrderServiceServer.cpp b/src/lib/orderman/server/OrderServiceServer.cpp index 0b53e4a13..9259a2a7c 100644 --- a/src/lib/orderman/server/OrderServiceServer.cpp +++ b/src/lib/orderman/server/OrderServiceServer.cpp @@ -137,7 +137,7 @@ OrderServiceServer::OrderServiceServer( bts_assert_msg(thread, "Could not find a configured thread for MDSource. See the " "OrdermanCfg key"); - thread->executor.spawn(me->md_consumer, me->stats); + thread->executor.spawn(me->md_consumer, me->stats,log); // OrderManager thread = find_thread_for_actor("OrderManager", me->actor_threads); diff --git a/src/sdk/examples/order_plugin_example.cpp b/src/sdk/examples/order_plugin_example.cpp index 8949c21f9..3202d102a 100644 --- a/src/sdk/examples/order_plugin_example.cpp +++ b/src/sdk/examples/order_plugin_example.cpp @@ -24,10 +24,10 @@ class DynamicIcebergOrder : public DynamicOrder { void on_init_recovered(OrderRecord const &, const PreActivationOrderServices &) override; void on_activate(Price, Quantity, OrderServices &, - PerfTrace const &) override; - void on_update(Price, Quantity, PerfTrace const &) override; - void on_crack(PerfTrace const &) override; - void on_cancel(PerfTrace const &) override; + trace::CorID const&) override; + void on_update(Price, Quantity, trace::CorID const&) override; + void on_crack(trace::CorID const &) override; + void on_cancel(trace::CorID const &) override; private: void report_state(); @@ -127,7 +127,7 @@ void DynamicIcebergOrder::on_init_recovered( void DynamicIcebergOrder::on_activate(Price p, Quantity q, OrderServices &services, - PerfTrace const &) { + trace::CorID const &) { bts_assert(!me->services); me->services = &services; me->child_builder.activate(services); @@ -136,8 +136,8 @@ void DynamicIcebergOrder::on_activate(Price p, Quantity q, case ORDER_STATUS_INACTIVE: me->state.set_price(p.value()); me->state.set_quantity(q.value()); - services.child_updates.sub( - key(), [this](auto const &os) { this->on_child_order_update(os); }); + services.subscribe_to_child_updates( + [this](auto const &os) { this->on_child_order_update(os); }); transition(ORDER_STATUS_WORKING); send_next_child_order(); break; @@ -164,7 +164,7 @@ void DynamicIcebergOrder::on_activate(Price p, Quantity q, report_state(); } -void DynamicIcebergOrder::on_update(Price p, Quantity q, PerfTrace const &) { +void DynamicIcebergOrder::on_update(Price p, Quantity q, trace::CorID const &) { switch (me->state.status()) { case ORDER_STATUS_WORKING: case ORDER_STATUS_PENDING_WORKING: @@ -191,9 +191,9 @@ void DynamicIcebergOrder::on_update(Price p, Quantity q, PerfTrace const &) { report_state(); } -void DynamicIcebergOrder::on_crack(PerfTrace const &) {} +void DynamicIcebergOrder::on_crack(trace::CorID const &) {} -void DynamicIcebergOrder::on_cancel(PerfTrace const &) { +void DynamicIcebergOrder::on_cancel(trace::CorID const &) { switch (me->state.status()) { case ORDER_STATUS_WORKING: LOG(Plugin, Info, "Canceling DynamicIceberg Order {}", key().value()); diff --git a/src/server/sparkd/cmds/Benchmark.cpp b/src/server/sparkd/cmds/Benchmark.cpp index 089222abd..eb35d3ce8 100644 --- a/src/server/sparkd/cmds/Benchmark.cpp +++ b/src/server/sparkd/cmds/Benchmark.cpp @@ -271,18 +271,6 @@ static void init_with_clean_os(benchmark::State &state) { } BENCHMARK(init_with_clean_os); -static void init_with_old_order_update(benchmark::State &state) { - api::orderman::OrderDefinition def; - auto order_state = - utils::pb::from_string(order_state_str); - PerfTrace trace; - OrderKey k(1); - for (auto _ : state) - benchmark::DoNotOptimize( - orderman::OrderStateUpdateEvent(k, k, def, order_state, trace)); -} -BENCHMARK(init_with_old_order_update); - static void serialize_update(benchmark::State &state) { api::orderman::Update update; update.set_order_key(1); From b5c24880a130da993e6171d2022e316af6004e4b Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Wed, 5 Dec 2018 10:51:37 -0500 Subject: [PATCH 027/107] SPARK-1901 - Send qualifier to stream access check --- src/client/spark_api/api/ApiServer.cs | 3 + src/client/spark_api/api/ApiUtils.cs | 126 +++++++++--------- .../api/Channels/QuickBusClientChannel.cs | 3 +- src/client/sparkcmd/Cmd/ServiceTestCommand.cs | 2 +- src/lib/api/apicore.proto | 3 + .../templates/c#/client.pb.cs | 4 +- .../templates/c#/server.pb.cs | 11 +- .../templates/cpp/server.pb.cc | 15 ++- .../templates/cpp/server.pb.h | 2 +- 9 files changed, 93 insertions(+), 76 deletions(-) diff --git a/src/client/spark_api/api/ApiServer.cs b/src/client/spark_api/api/ApiServer.cs index 6e7f08c95..6bf47ca34 100644 --- a/src/client/spark_api/api/ApiServer.cs +++ b/src/client/spark_api/api/ApiServer.cs @@ -19,6 +19,9 @@ namespace bts.api.core { public abstract void dispatch(RequestHeader header, Stream request, Action on_response); + // Indirection to allow ApiServer in different assembly + protected string format_qualifier(string method, string qualifier) => ApiUtils.format_qualifier(method, qualifier); + protected void respond(int request_id, Task task, Action on_response) where T : IMessage, IImmutableMessage { var header = new ResponseHeader() { RequestId = request_id }; if (task.IsCanceled || task.IsFaulted) { diff --git a/src/client/spark_api/api/ApiUtils.cs b/src/client/spark_api/api/ApiUtils.cs index 56a51d27a..75fca66ed 100644 --- a/src/client/spark_api/api/ApiUtils.cs +++ b/src/client/spark_api/api/ApiUtils.cs @@ -1,68 +1,72 @@ -using Google.Protobuf; -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace bts.api { - internal static class ApiUtils { - - - public static byte[] serialize(this RequestHeader header, T body) where T : IImmutableMessage { - int body_size = body?.CalculateSize() ?? 0; - int header_size = header.CalculateSize() + 1; // 1 byte header length - var buffer = new byte[header_size+body_size]; +using bts.api.core; +using Google.Protobuf; +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.IO; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace bts.api { + public static class ApiUtils { + + internal static byte[] serialize(this RequestHeader header, T body) where T : IImmutableMessage { + int body_size = body?.CalculateSize() ?? 0; + int header_size = header.CalculateSize() + 1; // 1 byte header length + var buffer = new byte[header_size + body_size]; using (var stream = new MemoryStream(buffer)) { checked { stream.WriteByte((byte)header_size); } header.WriteTo(stream); if (body != null) body.WriteTo(stream); - } - - return buffer; - } - - public struct DeserializeResult { - public THeader header; - public TBody body; - } - - private static DeserializeResult mkresult(THeader header, TBody body) { - return new DeserializeResult() { header = header, body = body }; } - - public static unsafe DeserializeResult deserialize(byte* buffer, long buffer_length) where THeader : IMessage,new() where TBody : class,IMessage,new() { - var header_size = buffer[0]; - Debug.Assert(header_size <= buffer_length); - THeader header = new THeader(); - header.MergeFrom(new UnmanagedMemoryStream(buffer+1, header_size - 1)); - TBody body = new TBody(); - if (buffer_length > header_size) { - body.MergeFrom(new UnmanagedMemoryStream(buffer + header_size, buffer_length - header_size)); - } - return mkresult(header, body); - } - - public static byte[] serialize(this ResponseHeader header, T body) where T : IImmutableMessage { - int header_size = 1 + header.CalculateSize(); - int body_size = body == null ? 0 : body.CalculateSize(); + } + + return buffer; + } + public static string format_qualifier(string method, string qualifier) { + if (string.IsNullOrEmpty(qualifier)) return method; + return $"{method}/{qualifier}"; + } + + internal struct DeserializeResult { + public THeader header; + public TBody body; + } + + private static DeserializeResult mkresult(THeader header, TBody body) { + return new DeserializeResult() { header = header, body = body }; } + + internal static unsafe DeserializeResult deserialize(byte* buffer, long buffer_length) where THeader : IMessage, new() where TBody : class, IMessage, new() { + var header_size = buffer[0]; + Debug.Assert(header_size <= buffer_length); + THeader header = new THeader(); + header.MergeFrom(new UnmanagedMemoryStream(buffer + 1, header_size - 1)); + TBody body = new TBody(); + if (buffer_length > header_size) { + body.MergeFrom(new UnmanagedMemoryStream(buffer + header_size, buffer_length - header_size)); + } + return mkresult(header, body); + } + + internal static byte[] serialize(this ResponseHeader header, T body) where T : IImmutableMessage { + int header_size = 1 + header.CalculateSize(); + int body_size = body == null ? 0 : body.CalculateSize(); var buffer = new byte[header_size + body_size]; - using (var stream = new MemoryStream(buffer)) { - checked { stream.WriteByte((byte)header_size); } - header.WriteTo(stream); - if (body != null) body.WriteTo(stream); + using (var stream = new MemoryStream(buffer)) { + checked { stream.WriteByte((byte)header_size); } + header.WriteTo(stream); + if (body != null) body.WriteTo(stream); } return buffer; - } - public static byte[] serialize(this ResponseHeader header) { - int header_size = 1 + header.CalculateSize(); - var buffer = new byte[header_size]; - using (var stream = new MemoryStream(buffer)) { - checked { stream.WriteByte((byte)header_size); } - header.WriteTo(stream); - } - return buffer; - } - } -} + } + internal static byte[] serialize(this ResponseHeader header) { + int header_size = 1 + header.CalculateSize(); + var buffer = new byte[header_size]; + using (var stream = new MemoryStream(buffer)) { + checked { stream.WriteByte((byte)header_size); } + header.WriteTo(stream); + } + return buffer; + } + } +} diff --git a/src/client/spark_api/api/Channels/QuickBusClientChannel.cs b/src/client/spark_api/api/Channels/QuickBusClientChannel.cs index 658f4a965..54aceebc1 100644 --- a/src/client/spark_api/api/Channels/QuickBusClientChannel.cs +++ b/src/client/spark_api/api/Channels/QuickBusClientChannel.cs @@ -59,7 +59,8 @@ namespace bts.api.core { public override IObservable> subscribe(int method_id, string method_and_qualifier, MessageParser parser, Func converter) { var result = Observable.Create>(async observer => { - var response = await send(method_id, null); + var request = new StreamAccessRequest() { Qualifier = method_and_qualifier }; + var response = await send(method_id, request); if (!response.success) { observer.OnError(new ApiException(response.error_message)); return Disposable.Empty; diff --git a/src/client/sparkcmd/Cmd/ServiceTestCommand.cs b/src/client/sparkcmd/Cmd/ServiceTestCommand.cs index 8682986b4..291adfe00 100644 --- a/src/client/sparkcmd/Cmd/ServiceTestCommand.cs +++ b/src/client/sparkcmd/Cmd/ServiceTestCommand.cs @@ -93,7 +93,7 @@ namespace bts { var ctx = new ServiceContext(); var s = ctx.locate(); - var d = s.subscribei_admin_data().Subscribe(Console.WriteLine); + var d = s.subscribei_admin_data("quack").Subscribe(Console.WriteLine); //var resp = s.get_admin_data(new VoidMessage()); //Console.WriteLine("{0}", resp); diff --git a/src/lib/api/apicore.proto b/src/lib/api/apicore.proto index 8166a63a6..c22e023cf 100644 --- a/src/lib/api/apicore.proto +++ b/src/lib/api/apicore.proto @@ -37,6 +37,9 @@ message ResponseHeader { ApiError code = 2; } +message StreamAccessRequest { + string qualifier = 1; +} message StreamAccessResponse { bool authorized = 1; } diff --git a/src/lib/api/service_compiler/templates/c#/client.pb.cs b/src/lib/api/service_compiler/templates/c#/client.pb.cs index 1e050b244..c5591de30 100644 --- a/src/lib/api/service_compiler/templates/c#/client.pb.cs +++ b/src/lib/api/service_compiler/templates/c#/client.pb.cs @@ -20,10 +20,10 @@ public sealed class {{name}} : IApiClient, IDisposable { {{#if server_streaming}} // {{comment}} public IObservable> subscribe_{{name}}(string qualifier=null) { - return _channel.subscribe<{{output_type_full}}, {{output_type_full}}>({{@index}}, qualifier, {{output_type_full}}.Parser, a=>a).reconstitute(key); + return _channel.subscribe<{{output_type_full}}, {{output_type_full}}>({{@index}}, bts.api.ApiUtils.format_qualifier("{{name}}",qualifier), {{output_type_full}}.Parser, a=>a).reconstitute(key); } public IObservable> subscribei_{{name}}(string qualifier=null) { - return _channel.subscribe<{{output_type_full}}, {{output_type_full}}Immutable>({{@index}}, qualifier, {{output_type_full}}.Parser, a=>({{output_type_full}}Immutable)a).reconstitute(key); + return _channel.subscribe<{{output_type_full}}, {{output_type_full}}Immutable>({{@index}}, bts.api.ApiUtils.format_qualifier("{{name}}",qualifier), {{output_type_full}}.Parser, a=>({{output_type_full}}Immutable)a).reconstitute(key); } private static {{key_type.cstype}} key({{output_type_full}} row) { return row.{{camel key_field}}; diff --git a/src/lib/api/service_compiler/templates/c#/server.pb.cs b/src/lib/api/service_compiler/templates/c#/server.pb.cs index a82e337eb..59a03518b 100644 --- a/src/lib/api/service_compiler/templates/c#/server.pb.cs +++ b/src/lib/api/service_compiler/templates/c#/server.pb.cs @@ -123,21 +123,21 @@ internal abstract class Authenticated{{name}}Base : ApiServer, IDisposable { //{{comment}} protected {{cap name}}Publisher make_{{name}}_publisher(string qualifier=null) { - IntPtr table = _channel.create_table(qualifier); + IntPtr table = _channel.create_table(format_qualifier("{{name}}",qualifier)); return new {{cap name}}Publisher(table); } protected static {{key_type.cstype}} {{name}}_key({{output_type_full}} row) { return row.{{camel key_field}}; } - public virtual Task allow_{{name}}(bts.api.AuthToken token) { + public virtual Task allow_{{name}}(bts.api.AuthTokenImmutable? token, string qualifier) { var r = new StreamAccessResponse() { Authorized = true }; return Task.FromResult(r); } {{else}} //{{comment}} - public abstract Task<{{output_type_full}}> {{name}}(bts.api.AuthToken token, {{input_type_full}} request); + public abstract Task<{{output_type_full}}> {{name}}(bts.api.AuthTokenImmutable? token, {{input_type_full}} request); {{/if}} {{/each}} @@ -158,7 +158,8 @@ internal abstract class Authenticated{{name}}Base : ApiServer, IDisposable { {{#each method}} case ServiceMethods.{{upper name}}: { {{#if server_streaming}} - var result = allow_{{name}}(header.Token); + var msg = bts.api.StreamAccessRequest.Parser.ParseFrom(request_stream); + var result = allow_{{name}}(header.Token, msg.Qualifier); {{else}} var msg = {{input_type_full}}.Parser.ParseFrom(request_stream); var result = {{name}}(header.Token, msg); @@ -183,7 +184,7 @@ internal abstract class {{name}}Base : Authenticated{{name}}Base , IDisposable { public {{name}}Base(ServiceContext context, string qualifier="") : base(context, qualifier) { } {{#each method}} {{#unless server_streaming}} - public override Task<{{output_type_full}}> {{name}}(bts.api.AuthToken token, {{input_type_full}} request) { + public override Task<{{output_type_full}}> {{name}}(bts.api.AuthTokenImmutable? token, {{input_type_full}} request) { return {{name}}(request); } // {{comment}} diff --git a/src/lib/api/service_compiler/templates/cpp/server.pb.cc b/src/lib/api/service_compiler/templates/cpp/server.pb.cc index 96a73b400..77b1592fa 100644 --- a/src/lib/api/service_compiler/templates/cpp/server.pb.cc +++ b/src/lib/api/service_compiler/templates/cpp/server.pb.cc @@ -38,9 +38,15 @@ void Authenticated{{name}}Base::dispatch(const bts::api::RequestHeader& header, case {{upper name}}: { {{#if server_streaming}} auto id = header.request_id(); - allow_{{name}}(header.has_token() ? &header.token() : nullptr, [this,id,on_response](const bts::api::StreamAccessResponse& result) { - respond(id,result,on_response); - }); + bts::api::StreamAccessRequest msg; + if (msg.ParsePartialFromZeroCopyStream(&stream)) { + allow_{{name}}( + header.has_token() ? &header.token() : nullptr, + msg.qualifier(), + [this,id,on_response](const bts::api::StreamAccessResponse& result) { + respond(id,result,on_response); + }); + } {{else}} {{input_type_cpp}} msg; if (msg.ParsePartialFromZeroCopyStream(&stream)) { @@ -177,8 +183,7 @@ void Authenticated{{name}}Base::dispatch(const bts::api::RequestHeader& header, return bts::api::StatefulPublisher<{{output_type_cpp}},{{key_type.cpptype}}>(make_{{name}}_publisher(qualifier), {{name}}_key); } -void Authenticated{{../name}}Base::allow_{{name}}(const bts::api::AuthToken* token, const api::Response& reply) { - (void)token; +void Authenticated{{../name}}Base::allow_{{name}}(const bts::api::AuthToken*, const std::string&, const api::Response& reply) { bts::api::StreamAccessResponse r; r.set_authorized(true); reply(r); diff --git a/src/lib/api/service_compiler/templates/cpp/server.pb.h b/src/lib/api/service_compiler/templates/cpp/server.pb.h index df5750064..ac6cc21fc 100644 --- a/src/lib/api/service_compiler/templates/cpp/server.pb.h +++ b/src/lib/api/service_compiler/templates/cpp/server.pb.h @@ -43,7 +43,7 @@ protected: {{cap name}}StatefulPublisher make_{{name}}_stateful_publisher() const; {{cap name}}StatefulPublisher make_{{name}}_stateful_publisher(const std::string& qualifier) const; - virtual void allow_{{name}}(const bts::api::AuthToken*, const api::Response& reply); + virtual void allow_{{name}}(const bts::api::AuthToken* token, const std::string& qualifier, const api::Response& reply); {{else}} From a0c572ef2e2fa9aa5598e106e40623c0554f5fb5 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Wed, 5 Dec 2018 11:08:25 -0500 Subject: [PATCH 028/107] Remove generated call to format_qualifier --- src/client/spark_api/api/ApiUtils.cs | 12 ++++++------ .../spark_api/api/Channels/QuickBusClientChannel.cs | 6 +++--- src/client/spark_api/api/ClientChannel.cs | 2 +- .../api/service_compiler/templates/c#/client.pb.cs | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/client/spark_api/api/ApiUtils.cs b/src/client/spark_api/api/ApiUtils.cs index 75fca66ed..ef1cd61ba 100644 --- a/src/client/spark_api/api/ApiUtils.cs +++ b/src/client/spark_api/api/ApiUtils.cs @@ -9,9 +9,9 @@ using System.Text; using System.Threading.Tasks; namespace bts.api { - public static class ApiUtils { + internal static class ApiUtils { - internal static byte[] serialize(this RequestHeader header, T body) where T : IImmutableMessage { + public static byte[] serialize(this RequestHeader header, T body) where T : IImmutableMessage { int body_size = body?.CalculateSize() ?? 0; int header_size = header.CalculateSize() + 1; // 1 byte header length var buffer = new byte[header_size + body_size]; @@ -28,7 +28,7 @@ namespace bts.api { return $"{method}/{qualifier}"; } - internal struct DeserializeResult { + public struct DeserializeResult { public THeader header; public TBody body; } @@ -36,7 +36,7 @@ namespace bts.api { private static DeserializeResult mkresult(THeader header, TBody body) { return new DeserializeResult() { header = header, body = body }; } - internal static unsafe DeserializeResult deserialize(byte* buffer, long buffer_length) where THeader : IMessage, new() where TBody : class, IMessage, new() { + public static unsafe DeserializeResult deserialize(byte* buffer, long buffer_length) where THeader : IMessage, new() where TBody : class, IMessage, new() { var header_size = buffer[0]; Debug.Assert(header_size <= buffer_length); THeader header = new THeader(); @@ -48,7 +48,7 @@ namespace bts.api { return mkresult(header, body); } - internal static byte[] serialize(this ResponseHeader header, T body) where T : IImmutableMessage { + public static byte[] serialize(this ResponseHeader header, T body) where T : IImmutableMessage { int header_size = 1 + header.CalculateSize(); int body_size = body == null ? 0 : body.CalculateSize(); var buffer = new byte[header_size + body_size]; @@ -59,7 +59,7 @@ namespace bts.api { } return buffer; } - internal static byte[] serialize(this ResponseHeader header) { + public static byte[] serialize(this ResponseHeader header) { int header_size = 1 + header.CalculateSize(); var buffer = new byte[header_size]; using (var stream = new MemoryStream(buffer)) { diff --git a/src/client/spark_api/api/Channels/QuickBusClientChannel.cs b/src/client/spark_api/api/Channels/QuickBusClientChannel.cs index 54aceebc1..15870c2f1 100644 --- a/src/client/spark_api/api/Channels/QuickBusClientChannel.cs +++ b/src/client/spark_api/api/Channels/QuickBusClientChannel.cs @@ -57,9 +57,9 @@ namespace bts.api.core { return tcs.Task; } - public override IObservable> subscribe(int method_id, string method_and_qualifier, MessageParser parser, Func converter) { + public override IObservable> subscribe(int method_id, string method, string qualifier, MessageParser parser, Func converter) { var result = Observable.Create>(async observer => { - var request = new StreamAccessRequest() { Qualifier = method_and_qualifier }; + var request = new StreamAccessRequest() { Qualifier = qualifier }; var response = await send(method_id, request); if (!response.success) { observer.OnError(new ApiException(response.error_message)); @@ -69,7 +69,7 @@ namespace bts.api.core { observer.OnError(new UnauthorizedAccessException()); return Disposable.Empty; } - return SubscribeNative(method_and_qualifier, parser, converter, observer); + return SubscribeNative(ApiUtils.format_qualifier(method, qualifier), parser, converter, observer); }); return result; } diff --git a/src/client/spark_api/api/ClientChannel.cs b/src/client/spark_api/api/ClientChannel.cs index 8ca3a7bbc..9624c9b93 100644 --- a/src/client/spark_api/api/ClientChannel.cs +++ b/src/client/spark_api/api/ClientChannel.cs @@ -13,7 +13,7 @@ namespace bts.api.core { public abstract void Dispose(); public abstract Task> send(int method_id, Request request) where Request: IImmutableMessage where Response : class,IMessage,new(); - public abstract IObservable> subscribe(int method_id, string method_and_qualifier, MessageParser parser, Func converter=null) + public abstract IObservable> subscribe(int method_id, string method, string qualifier, MessageParser parser, Func converter=null) where TParse : IMessage; public abstract bool is_sync_call_ok(); diff --git a/src/lib/api/service_compiler/templates/c#/client.pb.cs b/src/lib/api/service_compiler/templates/c#/client.pb.cs index c5591de30..892b58b74 100644 --- a/src/lib/api/service_compiler/templates/c#/client.pb.cs +++ b/src/lib/api/service_compiler/templates/c#/client.pb.cs @@ -20,10 +20,10 @@ public sealed class {{name}} : IApiClient, IDisposable { {{#if server_streaming}} // {{comment}} public IObservable> subscribe_{{name}}(string qualifier=null) { - return _channel.subscribe<{{output_type_full}}, {{output_type_full}}>({{@index}}, bts.api.ApiUtils.format_qualifier("{{name}}",qualifier), {{output_type_full}}.Parser, a=>a).reconstitute(key); + return _channel.subscribe<{{output_type_full}}, {{output_type_full}}>({{@index}}, "{{name}}", qualifier, {{output_type_full}}.Parser, a=>a).reconstitute(key); } public IObservable> subscribei_{{name}}(string qualifier=null) { - return _channel.subscribe<{{output_type_full}}, {{output_type_full}}Immutable>({{@index}}, bts.api.ApiUtils.format_qualifier("{{name}}",qualifier), {{output_type_full}}.Parser, a=>({{output_type_full}}Immutable)a).reconstitute(key); + return _channel.subscribe<{{output_type_full}}, {{output_type_full}}Immutable>({{@index}}, "{{name}}", qualifier, {{output_type_full}}.Parser, a=>({{output_type_full}}Immutable)a).reconstitute(key); } private static {{key_type.cstype}} key({{output_type_full}} row) { return row.{{camel key_field}}; From 0bdd2dfca02e765780c70f8cacf7d1920ed16906 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Wed, 5 Dec 2018 11:33:13 -0500 Subject: [PATCH 029/107] Api: centralize formatting stream topic+qualifier --- src/client/spark_api/api/ApiNativeMethods.cs | 4 ++-- src/client/spark_api/api/ApiServer.cs | 3 --- src/client/spark_api/api/ApiUtils.cs | 4 ---- .../api/Channels/QuickBusClientChannel.cs | 8 ++++---- src/client/spark_api/api/ServerChannel.cs | 4 ++-- src/lib/api/core/ApiClientInterop.cpp | 13 +++++++++---- src/lib/api/core/ApiClientInterop.h | 2 +- src/lib/api/core/ApiServerInterop.cpp | 6 +++--- src/lib/api/core/ApiServerInterop.h | 2 +- src/lib/api/public/ClientChannel.h | 6 +++--- src/lib/api/public/QuickbusClientChannel.cpp | 4 ++-- src/lib/api/public/QuickbusClientChannel.h | 2 +- src/lib/api/public/ServerChannel.cpp | 4 ++-- src/lib/api/public/ServerChannel.h | 2 +- .../api/service_compiler/templates/c#/server.pb.cs | 2 +- .../service_compiler/templates/cpp/client.pb.cc | 4 ++-- .../api/service_compiler/templates/cpp/client.pb.h | 4 +--- .../service_compiler/templates/cpp/server.pb.cc | 14 +++----------- .../api/service_compiler/templates/cpp/server.pb.h | 8 +++----- 19 files changed, 41 insertions(+), 55 deletions(-) diff --git a/src/client/spark_api/api/ApiNativeMethods.cs b/src/client/spark_api/api/ApiNativeMethods.cs index 7db7c0d20..fdc18ed0c 100644 --- a/src/client/spark_api/api/ApiNativeMethods.cs +++ b/src/client/spark_api/api/ApiNativeMethods.cs @@ -64,7 +64,7 @@ namespace bts.api.core { internal static extern void api_client_send(IntPtr nchannel, byte[] buffer, int length, raw_pb_callback p, IntPtr extra); [DllImport("libspark")] - internal static extern IntPtr api_client_subscribe(IntPtr client, string method_and_qualifier, raw_subscription_callback cb, IntPtr extra); + internal static extern IntPtr api_client_subscribe(IntPtr client, string method, string qualifier, raw_subscription_callback cb, IntPtr extra); [DllImport("libspark")] internal static extern void api_client_unsubscribe(IntPtr client, IntPtr subscription); @@ -96,7 +96,7 @@ namespace bts.api.core { } [DllImport("libspark")] - internal static extern IntPtr api_server_create_table(IntPtr server, string method_and_qualifier); + internal static extern IntPtr api_server_create_table(IntPtr server, string method, string qualifier); [DllImport("libspark")] internal static extern void api_server_update_table(IntPtr table, [In] StreamUpdate[] changes, long change_count); [DllImport("libspark")] diff --git a/src/client/spark_api/api/ApiServer.cs b/src/client/spark_api/api/ApiServer.cs index 6bf47ca34..6e7f08c95 100644 --- a/src/client/spark_api/api/ApiServer.cs +++ b/src/client/spark_api/api/ApiServer.cs @@ -19,9 +19,6 @@ namespace bts.api.core { public abstract void dispatch(RequestHeader header, Stream request, Action on_response); - // Indirection to allow ApiServer in different assembly - protected string format_qualifier(string method, string qualifier) => ApiUtils.format_qualifier(method, qualifier); - protected void respond(int request_id, Task task, Action on_response) where T : IMessage, IImmutableMessage { var header = new ResponseHeader() { RequestId = request_id }; if (task.IsCanceled || task.IsFaulted) { diff --git a/src/client/spark_api/api/ApiUtils.cs b/src/client/spark_api/api/ApiUtils.cs index ef1cd61ba..73f7c7545 100644 --- a/src/client/spark_api/api/ApiUtils.cs +++ b/src/client/spark_api/api/ApiUtils.cs @@ -23,10 +23,6 @@ namespace bts.api { return buffer; } - public static string format_qualifier(string method, string qualifier) { - if (string.IsNullOrEmpty(qualifier)) return method; - return $"{method}/{qualifier}"; - } public struct DeserializeResult { public THeader header; diff --git a/src/client/spark_api/api/Channels/QuickBusClientChannel.cs b/src/client/spark_api/api/Channels/QuickBusClientChannel.cs index 15870c2f1..570794013 100644 --- a/src/client/spark_api/api/Channels/QuickBusClientChannel.cs +++ b/src/client/spark_api/api/Channels/QuickBusClientChannel.cs @@ -69,12 +69,12 @@ namespace bts.api.core { observer.OnError(new UnauthorizedAccessException()); return Disposable.Empty; } - return SubscribeNative(ApiUtils.format_qualifier(method, qualifier), parser, converter, observer); + return SubscribeNative(method, qualifier, parser, converter, observer); }); return result; } - private unsafe IDisposable SubscribeNative(string method_and_qualifier, MessageParser parser, Func converter, IObserver> observer) where TParse : IMessage { + private unsafe IDisposable SubscribeNative(string method, string qualifier, MessageParser parser, Func converter, IObserver> observer) where TParse : IMessage { bool first_update = true; // Memory optimization. There is only one update per subscription. RawUpdate the_update = new RawUpdate(); @@ -107,13 +107,13 @@ namespace bts.api.core { } } catch (Exception e) { - ApiNativeMethods.api_client_log_error($"Exception in subscription callback for sub: '{method_and_qualifier}' \n--\n '{e}'"); + ApiNativeMethods.api_client_log_error($"Exception in subscription callback for sub: '{method}/{qualifier}' \n--\n '{e}'"); // Sleep to let the log message get asyncronously written to disk Thread.Sleep(100); Environment.Exit(-1); } }; - var subscription = ApiNativeMethods.api_client_subscribe(_client, method_and_qualifier, cb, IntPtr.Zero); + var subscription = ApiNativeMethods.api_client_subscribe(_client, method, qualifier, cb, IntPtr.Zero); return FinalizeableAnonymousDisposable.Create((disposing) => { ApiNativeMethods.api_client_unsubscribe(_client, subscription); subscription = IntPtr.Zero; diff --git a/src/client/spark_api/api/ServerChannel.cs b/src/client/spark_api/api/ServerChannel.cs index ca1b2e1a8..a16c3d4b4 100644 --- a/src/client/spark_api/api/ServerChannel.cs +++ b/src/client/spark_api/api/ServerChannel.cs @@ -34,8 +34,8 @@ namespace bts.api.core { } public Action> on_request; - public IntPtr create_table(string method_and_qualifier) { - return ApiNativeMethods.api_server_create_table(_server, method_and_qualifier); + public IntPtr create_table(string method, string qualifier) { + return ApiNativeMethods.api_server_create_table(_server, method, qualifier); } public void Dispose() { diff --git a/src/lib/api/core/ApiClientInterop.cpp b/src/lib/api/core/ApiClientInterop.cpp index e905114a2..3927bbc3e 100644 --- a/src/lib/api/core/ApiClientInterop.cpp +++ b/src/lib/api/core/ApiClientInterop.cpp @@ -181,11 +181,16 @@ void safe_call_subscription_callback(raw_subscription_callback cb, EventType typ } -bts::qbus::Topic stream_topic(const std::string& base_topic, const char* method_and_qualifier) { - return qbus::Topic(base_topic + "-" + method_and_qualifier); +bts::qbus::Topic stream_topic(const std::string& base_topic, const char* method, const char* qualifier) { + if (qualifier == nullptr || strlen(qualifier) == 0) { + return qbus::Topic(base_topic + "-" + method); + } + else { + return qbus::Topic(base_topic + "-" + method + "/" + qualifier); + } } -CAPI TableSubscription api_client_subscribe(ApiClient* pclient, const char* method_and_qualifier, raw_subscription_callback cb, void* extra) { +CAPI TableSubscription api_client_subscribe(ApiClient* pclient, const char* method, const char* qualifier, raw_subscription_callback cb, void* extra) { bts_assert(pclient); static_assert((int)qbus::TableEvent::EventType::TABLE_CREATED == EventType::TABLE_CREATED, "Keep these Enums in sync"); static_assert((int)qbus::TableEvent::EventType::TABLE_DESTROYED == EventType::TABLE_DESTROYED, ""); @@ -194,7 +199,7 @@ CAPI TableSubscription api_client_subscribe(ApiClient* pclient, const char* meth static_assert((int)qbus::Change::Type::REPLACE == StreamUpdate::REPLACE, ""); static_assert((int)qbus::Change::Type::CREATE == StreamUpdate::CREATE, ""); - auto topic = stream_topic(pclient->service_name, method_and_qualifier); + auto topic = stream_topic(pclient->service_name, method, qualifier); LOG(Api,Diag,"api subscribe: {}" ,topic.value()); auto result = new qbus::TableSubscriber(pclient->qbus, equal_topic(topic), [cb, extra](const qbus::TableEvent& ev) { diff --git a/src/lib/api/core/ApiClientInterop.h b/src/lib/api/core/ApiClientInterop.h index 863672f8b..b150e5463 100644 --- a/src/lib/api/core/ApiClientInterop.h +++ b/src/lib/api/core/ApiClientInterop.h @@ -21,7 +21,7 @@ enum EventType { typedef void* TableSubscription; typedef void(*raw_subscription_callback)(EventType event_type, const StreamUpdate* changes, int count, void* extra); -CAPI TableSubscription api_client_subscribe(ApiClient* pclient, const char* method_and_qualifier, raw_subscription_callback cb, void* extra); +CAPI TableSubscription api_client_subscribe(ApiClient* pclient, const char* method, const char* qualifier, raw_subscription_callback cb, void* extra); CAPI void api_client_unsubscribe(ApiClient* pclient, TableSubscription ptable); }}//namespace diff --git a/src/lib/api/core/ApiServerInterop.cpp b/src/lib/api/core/ApiServerInterop.cpp index fa00bdef9..8b57c72dd 100644 --- a/src/lib/api/core/ApiServerInterop.cpp +++ b/src/lib/api/core/ApiServerInterop.cpp @@ -9,7 +9,7 @@ namespace api { // defined in ApiClientInterop.h std::string base_topic(const char* type_name, const char* service_qualifier); bts::qbus::RPCServiceName rpc_topic(const std::string& base_topic); -bts::qbus::Topic stream_topic(const std::string& base_topic, const char* method_and_qualifier); +bts::qbus::Topic stream_topic(const std::string& base_topic, const char* method, const char* qualifier); struct ApiServerCore { ApiServerCore(Quickbus& qbus, const std::string topic, const qbus::OnRPCRequest& handler) : @@ -51,9 +51,9 @@ CAPI void api_server_call_callback(ReplyHandler** ppvhandler, const uint8_t* buf *pphandler = nullptr; } -CAPI TableHandle api_server_create_table(ApiServerCore* pserver, const char* method_and_qualifier) { +CAPI TableHandle api_server_create_table(ApiServerCore* pserver, const char* method, const char* qualifier) { bts_assert(pserver); - auto topic = stream_topic(pserver->topic, method_and_qualifier); + auto topic = stream_topic(pserver->topic, method, qualifier); LOG(Api,Info,"Create table: {}",topic.value()); return new qbus::TablePublisher(pserver->qbus, topic); } diff --git a/src/lib/api/core/ApiServerInterop.h b/src/lib/api/core/ApiServerInterop.h index 3e03d2be3..e25b637b2 100644 --- a/src/lib/api/core/ApiServerInterop.h +++ b/src/lib/api/core/ApiServerInterop.h @@ -12,7 +12,7 @@ CAPI ApiServerCore* api_server_create(Quickbus* pbus, const char* type_name, con CAPI void api_server_call_callback(ReplyHandler** pphandler, const uint8_t* buffer, int length); typedef void* TableHandle; -CAPI TableHandle api_server_create_table(ApiServerCore* pserver, const char* method_and_qualifier); +CAPI TableHandle api_server_create_table(ApiServerCore* pserver, const char* method, const char* qualifier); CAPI void api_server_update_table(TableHandle htable, StreamUpdate* raw_changes, int change_count); }}//namespace diff --git a/src/lib/api/public/ClientChannel.h b/src/lib/api/public/ClientChannel.h index 17782f46d..c194a1b5a 100644 --- a/src/lib/api/public/ClientChannel.h +++ b/src/lib/api/public/ClientChannel.h @@ -63,7 +63,7 @@ public: template - rxcpp::observable>> subscribe(const std::string& method_and_qualifier) { + rxcpp::observable>> subscribe(const char* method, const char* qualifier) { return rxcpp::observable<>::create>>([=](rxcpp::subscriber>> observer) { bool first_update = true; auto cb = [observer, first_update](EventType event_type, const StreamUpdate* changes, int change_count) mutable { @@ -98,7 +98,7 @@ public: } }; observer.add( - subscribe_core(method_and_qualifier, cb)); + subscribe_core(method, qualifier, cb)); }); } @@ -109,7 +109,7 @@ protected: typedef std::function Unsubscribe; typedef std::function OnSubscriptionCB; virtual void send_core(const std::string& request_buffer, OnReply on_response) = 0; - virtual Unsubscribe subscribe_core(const std::string& method_and_qualifier, OnSubscriptionCB cb) = 0; + virtual Unsubscribe subscribe_core(const char* method, const char* qualifier, OnSubscriptionCB cb) = 0; private: ClientChannel(const ClientChannel& other);// = delete; diff --git a/src/lib/api/public/QuickbusClientChannel.cpp b/src/lib/api/public/QuickbusClientChannel.cpp index 3713bcbf1..157e00c40 100644 --- a/src/lib/api/public/QuickbusClientChannel.cpp +++ b/src/lib/api/public/QuickbusClientChannel.cpp @@ -28,14 +28,14 @@ void QuickbusClientChannel::send_core(const std::string& request_envalope, OnRep api_client_send(_pclient, request_envalope.c_str(), request_envalope.size(), trampoline, heap_on_response); } -ClientChannel::Unsubscribe QuickbusClientChannel::subscribe_core(const std::string & method_and_qualifier, OnSubscriptionCB cb) { +ClientChannel::Unsubscribe QuickbusClientChannel::subscribe_core(const char* method, const char* qualifier, OnSubscriptionCB cb) { raw_subscription_callback trampoline = [](EventType event_type, const StreamUpdate* changes, int count, void* extra) { OnSubscriptionCB* heap_cb = static_cast(extra); assert(heap_cb != nullptr); (*heap_cb)(event_type, changes, count); }; OnSubscriptionCB* heap_cb = new OnSubscriptionCB(cb); - auto subscription = api_client_subscribe(_pclient, method_and_qualifier.c_str(), trampoline, heap_cb); + auto subscription = api_client_subscribe(_pclient, method, qualifier, trampoline, heap_cb); return [this,subscription,heap_cb]() { api_client_unsubscribe(_pclient, subscription); delete heap_cb; diff --git a/src/lib/api/public/QuickbusClientChannel.h b/src/lib/api/public/QuickbusClientChannel.h index ab973a9ee..bfda19f4f 100644 --- a/src/lib/api/public/QuickbusClientChannel.h +++ b/src/lib/api/public/QuickbusClientChannel.h @@ -19,7 +19,7 @@ private: BTS_NO_COPY(QuickbusClientChannel); virtual void send_core(const std::string& request_envalope, OnReply on_response) override; - virtual Unsubscribe subscribe_core(const std::string& method_and_qualifier, OnSubscriptionCB cb) override; + virtual Unsubscribe subscribe_core(const char* method, const char* qualifier, OnSubscriptionCB cb) override; virtual bool is_sync_call_ok() override; }; diff --git a/src/lib/api/public/ServerChannel.cpp b/src/lib/api/public/ServerChannel.cpp index a614806e8..6a791638e 100644 --- a/src/lib/api/public/ServerChannel.cpp +++ b/src/lib/api/public/ServerChannel.cpp @@ -51,8 +51,8 @@ ServerChannel::ServerChannel(ServerChannel&& other) : _me(std::move(other._me)) ServerChannel::~ServerChannel() { } -TableHandle ServerChannel::create_table(const std::string& method_and_qualifier) const { - return api_server_create_table(_me->_core, method_and_qualifier.c_str()); +TableHandle ServerChannel::create_table(const char* method, const char* qualifier) const { + return api_server_create_table(_me->_core, method, qualifier); } void ServerChannel::publish(TableHandle table, StreamUpdate* changes, int change_count) const { api_server_update_table(table, changes, change_count); diff --git a/src/lib/api/public/ServerChannel.h b/src/lib/api/public/ServerChannel.h index 102db0bf3..bce1c6661 100644 --- a/src/lib/api/public/ServerChannel.h +++ b/src/lib/api/public/ServerChannel.h @@ -15,7 +15,7 @@ public: ServerChannel(ServerChannel&& other);// : _me(std::move(other._me)) {} ~ServerChannel(); - TableHandle create_table(const std::string& method_and_qualifier) const; + TableHandle create_table(const char* method, const char* qualifier) const; void publish(TableHandle table, StreamUpdate* changes, int change_count) const; private: diff --git a/src/lib/api/service_compiler/templates/c#/server.pb.cs b/src/lib/api/service_compiler/templates/c#/server.pb.cs index 59a03518b..8e4fa0076 100644 --- a/src/lib/api/service_compiler/templates/c#/server.pb.cs +++ b/src/lib/api/service_compiler/templates/c#/server.pb.cs @@ -123,7 +123,7 @@ internal abstract class Authenticated{{name}}Base : ApiServer, IDisposable { //{{comment}} protected {{cap name}}Publisher make_{{name}}_publisher(string qualifier=null) { - IntPtr table = _channel.create_table(format_qualifier("{{name}}",qualifier)); + IntPtr table = _channel.create_table("{{name}}",qualifier); return new {{cap name}}Publisher(table); } protected static {{key_type.cstype}} {{name}}_key({{output_type_full}} row) { diff --git a/src/lib/api/service_compiler/templates/cpp/client.pb.cc b/src/lib/api/service_compiler/templates/cpp/client.pb.cc index 1bdc3dc9e..a14427d06 100644 --- a/src/lib/api/service_compiler/templates/cpp/client.pb.cc +++ b/src/lib/api/service_compiler/templates/cpp/client.pb.cc @@ -18,12 +18,12 @@ using namespace rxcpp::operators; {{#if server_streaming}} rxcpp::observable<{{cap name}}Update> {{../name}}::subscribe_{{name}}(std::string const&qualifier) { return - _pchannel->subscribe<{{output_type_cpp}}>(std::string("{{name}}/") + qualifier) + _pchannel->subscribe<{{output_type_cpp}}>("{{name}}/", qualifier.c_str()) | (bts::api::reconstitute,const {{key_type.cpptype}}, {{../name}}>()); } rxcpp::observable<{{cap name}}Update> {{../name}}::subscribe_{{name}}() { return - _pchannel->subscribe<{{output_type_cpp}}>("{{name}}") + _pchannel->subscribe<{{output_type_cpp}}>("{{name}}", nullptr) | (bts::api::reconstitute,const {{key_type.cpptype}}, {{../name}}>()); } diff --git a/src/lib/api/service_compiler/templates/cpp/client.pb.h b/src/lib/api/service_compiler/templates/cpp/client.pb.h index 836e8db84..338462bd1 100644 --- a/src/lib/api/service_compiler/templates/cpp/client.pb.h +++ b/src/lib/api/service_compiler/templates/cpp/client.pb.h @@ -47,9 +47,7 @@ class BTS_EXPORT {{name}} { {{#each method}} {{#if server_streaming}} // {{comment}} - // rxcpp::observable<{{cap name}}Update> subscribe_{{name}}(const {{input_type_cpp}}& qualifier); - // {{comment}} - rxcpp::observable<{{cap name}}Update> subscribe_{{name}}(std::string const&); + rxcpp::observable<{{cap name}}Update> subscribe_{{name}}(std::string const& qualifier); // {{comment}} rxcpp::observable<{{cap name}}Update> subscribe_{{name}}(); {{else}} diff --git a/src/lib/api/service_compiler/templates/cpp/server.pb.cc b/src/lib/api/service_compiler/templates/cpp/server.pb.cc index 77b1592fa..9c83b25c4 100644 --- a/src/lib/api/service_compiler/templates/cpp/server.pb.cc +++ b/src/lib/api/service_compiler/templates/cpp/server.pb.cc @@ -72,12 +72,8 @@ void Authenticated{{name}}Base::dispatch(const bts::api::RequestHeader& header, {{#each method}}{{#if server_streaming}} -{{../name}}Base::{{cap name}}Publisher Authenticated{{../name}}Base::make_{{name}}_publisher(std::string const&qualifier) const { - bts::api::TableHandle handle = _channel.create_table(std::string("{{name}}/") + qualifier); - return make_{{name}}_publisher(handle); -} -{{../name}}Base::{{cap name}}Publisher Authenticated{{../name}}Base::make_{{name}}_publisher() const { - bts::api::TableHandle handle = _channel.create_table("{{name}}"); +{{../name}}Base::{{cap name}}Publisher Authenticated{{../name}}Base::make_{{name}}_publisher(const char* qualifier) const { + bts::api::TableHandle handle = _channel.create_table("{{name}}", qualifier); return make_{{name}}_publisher(handle); } {{../name}}Base::{{cap name}}Publisher Authenticated{{../name}}Base::make_{{name}}_publisher(bts::api::TableHandle handle) const { @@ -175,11 +171,7 @@ void Authenticated{{name}}Base::dispatch(const bts::api::RequestHeader& header, }; } -{{../name}}Base::{{cap name}}StatefulPublisher Authenticated{{../name}}Base::make_{{name}}_stateful_publisher() const { - return bts::api::StatefulPublisher<{{output_type_cpp}},{{key_type.cpptype}}>(make_{{name}}_publisher(), {{name}}_key); -} - -{{../name}}Base::{{cap name}}StatefulPublisher Authenticated{{../name}}Base::make_{{name}}_stateful_publisher(const std::string& qualifier) const { +{{../name}}Base::{{cap name}}StatefulPublisher Authenticated{{../name}}Base::make_{{name}}_stateful_publisher(const char* qualifier) const { return bts::api::StatefulPublisher<{{output_type_cpp}},{{key_type.cpptype}}>(make_{{name}}_publisher(qualifier), {{name}}_key); } diff --git a/src/lib/api/service_compiler/templates/cpp/server.pb.h b/src/lib/api/service_compiler/templates/cpp/server.pb.h index ac6cc21fc..90aec631c 100644 --- a/src/lib/api/service_compiler/templates/cpp/server.pb.h +++ b/src/lib/api/service_compiler/templates/cpp/server.pb.h @@ -37,11 +37,9 @@ protected: {{#each method}} {{#if server_streaming}} - {{cap name}}Publisher make_{{name}}_publisher() const; - {{cap name}}Publisher make_{{name}}_publisher(const std::string &) const; - - {{cap name}}StatefulPublisher make_{{name}}_stateful_publisher() const; - {{cap name}}StatefulPublisher make_{{name}}_stateful_publisher(const std::string& qualifier) const; + {{cap name}}Publisher make_{{name}}_publisher(const std::string& qualifier) const { return make_{{name}}_publisher(qualifier.c_str()); } + {{cap name}}Publisher make_{{name}}_publisher(const char* qualifier=nullptr) const; + {{cap name}}StatefulPublisher make_{{name}}_stateful_publisher(const char* qualifier=nullptr) const; virtual void allow_{{name}}(const bts::api::AuthToken* token, const std::string& qualifier, const api::Response& reply); From 97925a82d43b11130adabaed01817838075c0afd Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Wed, 5 Dec 2018 13:35:57 -0500 Subject: [PATCH 030/107] SPARK-1906 - C++ client --- src/lib/api/public/ClientChannel.h | 79 +++++++++++-------- .../templates/cpp/client.pb.cc | 6 +- 2 files changed, 50 insertions(+), 35 deletions(-) diff --git a/src/lib/api/public/ClientChannel.h b/src/lib/api/public/ClientChannel.h index c194a1b5a..46266a1e9 100644 --- a/src/lib/api/public/ClientChannel.h +++ b/src/lib/api/public/ClientChannel.h @@ -21,7 +21,7 @@ public: virtual ~ClientChannel(); template - void send(int method_id, const Request& request, std::function)> on_response) { + void send(int method_id, const Request& request, std::function)> on_response) { RequestHeader header; header.set_method(method_id); header.set_request_id(++_id); @@ -63,42 +63,57 @@ public: template - rxcpp::observable>> subscribe(const char* method, const char* qualifier) { + rxcpp::observable>> subscribe(int method_id, const char* method, const std::string& qualifier) { return rxcpp::observable<>::create>>([=](rxcpp::subscriber>> observer) { - bool first_update = true; - auto cb = [observer, first_update](EventType event_type, const StreamUpdate* changes, int change_count) mutable { - if (event_type == EventType::TABLE_UPDATED) { - std::vector> added_items; - std::vector added_keys, - removed_keys; - for (size_t x = 0; x < change_count; ++x) { - const StreamUpdate& change = changes[x]; - if (change.type != StreamUpdate::REMOVE) { - added_keys.reserve(change_count); - added_items.reserve(change_count); - added_keys.push_back(change.key); - google::protobuf::io::ArrayInputStream stream(change.buffer, change.buffer_len); - auto item = std::make_shared(); - if (item->ParseFromZeroCopyStream(&stream)) { - added_items.push_back(move(item)); + StreamAccessRequest request; + request.set_qualifier(qualifier); + send(method_id, request, [=](const Result& response) { + // There is a race on server startup. If the server is not yet we can't return a dead stream + // if (!response) { + // observer.on_error( + // std::make_exception_ptr( + // ApiException(response.error_message()))); + // } + if (response && !response.value()->authorized()) { + observer.on_completed(); + } + else { + bool first_update = true; + auto cb = [observer, first_update](EventType event_type, const StreamUpdate* changes, int change_count) mutable { + if (event_type == EventType::TABLE_UPDATED) { + std::vector> added_items; + std::vector added_keys, + removed_keys; + for (size_t x = 0; x < change_count; ++x) { + const StreamUpdate& change = changes[x]; + if (change.type != StreamUpdate::REMOVE) { + added_keys.reserve(change_count); + added_items.reserve(change_count); + added_keys.push_back(change.key); + google::protobuf::io::ArrayInputStream stream(change.buffer, change.buffer_len); + auto item = std::make_shared(); + if (item->ParseFromZeroCopyStream(&stream)) { + added_items.push_back(move(item)); + } + } + if (change.type != StreamUpdate::CREATE) { + removed_keys.reserve(change_count); + removed_keys.push_back(change.key); + } } + observer.on_next(RawUpdate>(added_items, added_keys, removed_keys)); } - if (change.type != StreamUpdate::CREATE) { - removed_keys.reserve(change_count); - removed_keys.push_back(change.key); + else if (event_type == EventType::TABLE_CREATED) { + if (!first_update) { + observer.on_next(RawUpdate>::Reset()); + } + first_update = false; } - } - observer.on_next(RawUpdate>(added_items, added_keys, removed_keys)); + }; + observer.add( + subscribe_core(method, qualifier.c_str(), cb)); } - else if (event_type == EventType::TABLE_CREATED) { - if (!first_update) { - observer.on_next(RawUpdate>::Reset()); - } - first_update = false; - } - }; - observer.add( - subscribe_core(method, qualifier, cb)); + }); }); } diff --git a/src/lib/api/service_compiler/templates/cpp/client.pb.cc b/src/lib/api/service_compiler/templates/cpp/client.pb.cc index a14427d06..105646be3 100644 --- a/src/lib/api/service_compiler/templates/cpp/client.pb.cc +++ b/src/lib/api/service_compiler/templates/cpp/client.pb.cc @@ -18,12 +18,12 @@ using namespace rxcpp::operators; {{#if server_streaming}} rxcpp::observable<{{cap name}}Update> {{../name}}::subscribe_{{name}}(std::string const&qualifier) { return - _pchannel->subscribe<{{output_type_cpp}}>("{{name}}/", qualifier.c_str()) + _pchannel->subscribe<{{output_type_cpp}}>({{@index}}, "{{name}}/", qualifier) | (bts::api::reconstitute,const {{key_type.cpptype}}, {{../name}}>()); } rxcpp::observable<{{cap name}}Update> {{../name}}::subscribe_{{name}}() { return - _pchannel->subscribe<{{output_type_cpp}}>("{{name}}", nullptr) + _pchannel->subscribe<{{output_type_cpp}}>({{@index}}, "{{name}}", "") | (bts::api::reconstitute,const {{key_type.cpptype}}, {{../name}}>()); } @@ -39,7 +39,7 @@ using namespace rxcpp::operators; {{else}} - void {{../name}}::{{name}}(const {{input_type_cpp}}& input, std::function)> callback, uint32_t timeout_ms) { + void {{../name}}::{{name}}(const {{input_type_cpp}}& input, std::function)> callback, uint32_t timeout_ms) { _pchannel->send({{@index}}, input, callback); } From 67d0a0351acaa9554ce7b8a08002c457da7b22c8 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Wed, 5 Dec 2018 13:36:20 -0500 Subject: [PATCH 031/107] SPARK-1901 Fix race with server startup in c# api client --- .../api/Channels/QuickBusClientChannel.cs | 38 ++++++++++++++----- src/client/sparkcmd/Cmd/ServiceTestCommand.cs | 2 +- 2 files changed, 29 insertions(+), 11 deletions(-) diff --git a/src/client/spark_api/api/Channels/QuickBusClientChannel.cs b/src/client/spark_api/api/Channels/QuickBusClientChannel.cs index 570794013..5c78858c4 100644 --- a/src/client/spark_api/api/Channels/QuickBusClientChannel.cs +++ b/src/client/spark_api/api/Channels/QuickBusClientChannel.cs @@ -59,20 +59,38 @@ namespace bts.api.core { public override IObservable> subscribe(int method_id, string method, string qualifier, MessageParser parser, Func converter) { var result = Observable.Create>(async observer => { - var request = new StreamAccessRequest() { Qualifier = qualifier }; - var response = await send(method_id, request); - if (!response.success) { - observer.OnError(new ApiException(response.error_message)); - return Disposable.Empty; + while (true) { + var response = await check_stream_access(method_id, qualifier); + if (response.success) { + if (response.value.Authorized) { + // success. Break loop and subscribe + break; + } + else { + // Not authorized. return empty stream + observer.OnCompleted(); + return Disposable.Empty; + } + } + else { + // Wait for stream to fire once before trying again + var tcs = new TaskCompletionSource(); + ApiNativeMethods.raw_subscription_callback cb = (event_type, changes, change_count, unused) => { + tcs.SetResult(true); + }; + await tcs.Task; + } } - else if (!response.value.Authorized) { - observer.OnError(new UnauthorizedAccessException()); - return Disposable.Empty; - } - return SubscribeNative(method, qualifier, parser, converter, observer); + + // Authorized. Stream events + return SubscribeNative(method, qualifier, parser, converter, observer); }); return result; } + private Task> check_stream_access(int method_id, string qualifier) { + var request = new StreamAccessRequest() { Qualifier = qualifier }; + return send(method_id, request); + } private unsafe IDisposable SubscribeNative(string method, string qualifier, MessageParser parser, Func converter, IObserver> observer) where TParse : IMessage { bool first_update = true; diff --git a/src/client/sparkcmd/Cmd/ServiceTestCommand.cs b/src/client/sparkcmd/Cmd/ServiceTestCommand.cs index 291adfe00..8682986b4 100644 --- a/src/client/sparkcmd/Cmd/ServiceTestCommand.cs +++ b/src/client/sparkcmd/Cmd/ServiceTestCommand.cs @@ -93,7 +93,7 @@ namespace bts { var ctx = new ServiceContext(); var s = ctx.locate(); - var d = s.subscribei_admin_data("quack").Subscribe(Console.WriteLine); + var d = s.subscribei_admin_data().Subscribe(Console.WriteLine); //var resp = s.get_admin_data(new VoidMessage()); //Console.WriteLine("{0}", resp); From 5626614e2dc30f6b4df3fdb1525bed66ac557686 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Wed, 5 Dec 2018 13:54:21 -0500 Subject: [PATCH 032/107] SPARK-1901 Delegates don't do anything if they aren't used --- .../spark_api/api/Channels/QuickBusClientChannel.cs | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/client/spark_api/api/Channels/QuickBusClientChannel.cs b/src/client/spark_api/api/Channels/QuickBusClientChannel.cs index 5c78858c4..21ed082a7 100644 --- a/src/client/spark_api/api/Channels/QuickBusClientChannel.cs +++ b/src/client/spark_api/api/Channels/QuickBusClientChannel.cs @@ -59,6 +59,11 @@ namespace bts.api.core { public override IObservable> subscribe(int method_id, string method, string qualifier, MessageParser parser, Func converter) { var result = Observable.Create>(async observer => { + IntPtr temp_subscription = IntPtr.Zero; + void unsubscribe_temp_sub() { + // Unsubscribe late to keep qb refcount > 0 continuously + if (temp_subscription != IntPtr.Zero) ApiNativeMethods.api_client_unsubscribe(_client, temp_subscription); + } while (true) { var response = await check_stream_access(method_id, qualifier); if (response.success) { @@ -68,21 +73,26 @@ namespace bts.api.core { } else { // Not authorized. return empty stream + unsubscribe_temp_sub(); observer.OnCompleted(); return Disposable.Empty; } } else { // Wait for stream to fire once before trying again + unsubscribe_temp_sub(); var tcs = new TaskCompletionSource(); ApiNativeMethods.raw_subscription_callback cb = (event_type, changes, change_count, unused) => { - tcs.SetResult(true); + tcs.TrySetResult(true); }; + temp_subscription = ApiNativeMethods.api_client_subscribe(_client, method, qualifier, cb, IntPtr.Zero); await tcs.Task; + GC.KeepAlive(cb); } } // Authorized. Stream events + unsubscribe_temp_sub(); return SubscribeNative(method, qualifier, parser, converter, observer); }); return result; From 69b75c5f5eab27946fdbead65b9e8e182221a8f0 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Wed, 5 Dec 2018 14:08:28 -0500 Subject: [PATCH 033/107] SPARK-1901 Protobuf doesn't want null here --- src/client/spark_api/api/Channels/QuickBusClientChannel.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/spark_api/api/Channels/QuickBusClientChannel.cs b/src/client/spark_api/api/Channels/QuickBusClientChannel.cs index 21ed082a7..937ac10b8 100644 --- a/src/client/spark_api/api/Channels/QuickBusClientChannel.cs +++ b/src/client/spark_api/api/Channels/QuickBusClientChannel.cs @@ -98,7 +98,7 @@ namespace bts.api.core { return result; } private Task> check_stream_access(int method_id, string qualifier) { - var request = new StreamAccessRequest() { Qualifier = qualifier }; + var request = new StreamAccessRequest() { Qualifier = qualifier ?? "" }; return send(method_id, request); } From 0468fe4f4d12d784feae165c93595a130f092bb5 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Wed, 5 Dec 2018 15:37:40 -0500 Subject: [PATCH 034/107] Add AuthToken unit tests --- src/lib/utils/AuthToken.cpp | 1 + src/lib/utils/tests/AuthTokenTests.cpp | 40 ++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 src/lib/utils/tests/AuthTokenTests.cpp diff --git a/src/lib/utils/AuthToken.cpp b/src/lib/utils/AuthToken.cpp index 69537bfca..43f1290ec 100644 --- a/src/lib/utils/AuthToken.cpp +++ b/src/lib/utils/AuthToken.cpp @@ -40,6 +40,7 @@ AuthToken generate_wheel_token() { #endif bool decode_token(const std::string& token, user::TokenPayload* payload) { + if (token.empty()) return false; std::string temp = websocketpp::base64_decode(token); if (payload) { return payload->ParseFromString(temp); diff --git a/src/lib/utils/tests/AuthTokenTests.cpp b/src/lib/utils/tests/AuthTokenTests.cpp new file mode 100644 index 000000000..779f53f07 --- /dev/null +++ b/src/lib/utils/tests/AuthTokenTests.cpp @@ -0,0 +1,40 @@ +#ifndef _WIN32 +#include "../AuthToken.h" +#include "catch/catch.hpp" +namespace bts { +namespace test { + +TEST_CASE("AuthToken", "[security]") { + api::admin::BTSUser user; + user.set_id(42); + user.set_name("user1"); + + SECTION("round trip") { + auto token = api::auth::generate_token(user); + api::user::TokenPayload payload; + REQUIRE(api::auth::decode_token(token.token(), &payload)); + REQUIRE(payload.id() == user.id()); + REQUIRE(payload.wheel() == false); + } + + SECTION("empty token") { + api::user::TokenPayload payload; + REQUIRE(!api::auth::decode_token("", &payload)); + REQUIRE(payload.id() == 0); + REQUIRE(!payload.wheel()); + } + + SECTION("bts is the big wheel") { + user.set_name("bts"); + auto token = api::auth::generate_token(user); + api::user::TokenPayload payload; + REQUIRE(api::auth::decode_token(token.token(), &payload)); + REQUIRE(payload.id() == user.id()); + REQUIRE(payload.wheel()); + } + + +} + +}}//ns +#endif \ No newline at end of file From 096787d7102b8b22a866b925e75b224f48f6ecf3 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Wed, 5 Dec 2018 16:50:48 -0500 Subject: [PATCH 035/107] Merge --- CMakeLists.txt | 3 +- doc/dev/dev_process.md | 71 -- doc/user/docs/release_notes.md | 11 +- .../api/service_helpers/AdminServiceUtils.cpp | 1 - src/lib/jetfix/codec/FIXMsg.h | 8 +- src/lib/jetfix/common/InMsgBuffer.h | 8 +- src/lib/jetfix/connection/AsyncReader.cpp | 14 +- src/lib/jetfix/connection/AsyncReader.h | 2 - src/lib/jetfix/connection/IConnection.h | 4 +- .../jetfix/connection/SocketConnection.cpp | 66 +- src/lib/jetfix/connection/SocketConnection.h | 8 +- src/lib/jetfix/gateway/CoreGateway.cpp | 58 +- src/lib/jetfix/gateway/CoreGateway.h | 6 +- src/lib/jetfix/gateway/JetFIXGateway.h | 15 +- src/lib/jetfix/gateway/Session.cpp | 12 +- src/lib/jetfix/gateway/Session.h | 5 +- src/lib/jetfix/tests/async_reader_tests.cpp | 8 +- src/lib/mercury/actors/Actor.h | 10 - src/lib/mercury/actors/ContentSubscription.h | 12 +- src/lib/orderman/actors/AsyncFactory.cpp | 104 +-- src/lib/orderman/actors/ExecutionGateway.cpp | 90 +- src/lib/orderman/actors/ExecutionGateway.h | 61 +- src/lib/orderman/actors/FillStore.cpp | 15 +- src/lib/orderman/actors/MDSource.h | 16 +- .../orderman/actors/MDSupplementarySource.cpp | 67 +- src/lib/orderman/actors/SODPosition.cpp | 223 +++-- src/lib/orderman/actors/SecuritySrc.cpp | 25 +- src/lib/orderman/actors/ServiceBridge.cpp | 12 +- src/lib/orderman/actors/ServiceBridge.h | 4 +- .../actors/order_manager/ChildOrder.h | 92 +- .../actors/order_manager/OrderBuilder.cpp | 4 +- .../actors/order_manager/OrderBuilder.h | 111 +-- .../actors/order_manager/OrderManager.cpp | 228 ++--- .../actors/order_manager/OrderManager.h | 52 +- .../actors/order_manager/OrderServices.h | 283 ++----- .../order_manager/OrderServicesData.cpp | 15 +- .../actors/order_manager/OrderServicesData.h | 54 +- src/lib/orderman/events/ActivateOrderEvent.h | 5 +- src/lib/orderman/events/BookUpdateEvent.h | 5 +- src/lib/orderman/events/CancelOrderEvent.h | 5 +- src/lib/orderman/events/CancelRejectEvent.cpp | 5 +- src/lib/orderman/events/CrackOrderEvent.h | 5 +- .../events/NewExecutionReportEvent.cpp | 6 +- .../orderman/events/NewExecutionReportEvent.h | 6 +- .../orderman/events/OrderStateUpdateEvent.h | 9 +- src/lib/orderman/events/OutFIXMsgEvent.h | 32 + src/lib/orderman/events/UpdateOrderEvent.h | 5 +- src/lib/orderman/limiter/LimitStore.cpp | 112 ++- src/lib/orderman/limiter/Limiter.cpp | 137 +-- src/lib/orderman/limiter/ProductLimitNode.cpp | 33 +- src/lib/orderman/limiter/ProductLimitTree.cpp | 40 +- .../orderman/limiter/SecurityLimitNode.cpp | 32 +- .../orderman/limiter/SecurityLimitTree.cpp | 38 +- .../orderman/limiter/tests/limit_tests.cpp | 217 ++--- .../order_factory/DynamicOrderRegistry.cpp | 1 + .../orderman/order_factory/OrderFactory.cpp | 4 +- src/lib/orderman/order_router/OrderRouter.cpp | 4 +- src/lib/orderman/orderman_utils/EventStream.h | 33 +- src/lib/orderman/orders/DynamicOrder.cpp | 8 +- src/lib/orderman/orders/DynamicOrder.h | 8 +- src/lib/orderman/orders/IcebergOrder.cpp | 20 +- src/lib/orderman/orders/IcebergOrder.h | 8 +- src/lib/orderman/orders/NativeOrder.cpp | 63 +- src/lib/orderman/orders/NativeOrder.h | 12 +- src/lib/orderman/orders/Order.cpp | 19 +- src/lib/orderman/orders/Order.h | 15 +- src/lib/orderman/orders/TimeBoxOrder.cpp | 85 +- src/lib/orderman/orders/TimeBoxOrder.h | 8 +- src/lib/orderman/orders/TriggerOrder.cpp | 787 +++++++++--------- src/lib/orderman/orders/TriggerOrder.h | 8 +- .../orderman/orders/book_algos/BookAlgo.cpp | 326 ++++---- src/lib/orderman/orders/book_algos/BookAlgo.h | 8 +- .../orderman/orders/book_algos/CoverOrder.cpp | 114 +-- .../orderman/orders/book_algos/JoinOrder.cpp | 148 ++-- .../orderman/orders/book_algos/LeanOrder.cpp | 287 ++++--- .../orders/book_algos/OffsetOrder.cpp | 105 +-- .../orderman/orders/book_algos/TickOrder.cpp | 234 +++--- .../orderman/orders/book_algos/TopOrder.cpp | 175 ++-- .../spreader_orders/ISpreaderStateWorker.h | 4 +- .../orders/spreader_orders/SpreaderOrder.cpp | 29 +- .../orders/spreader_orders/SpreaderOrder.h | 14 +- .../spreader/SingleFillHedger.cpp | 4 +- .../spreader/SingleFillHedger.h | 6 +- .../spreader/SingleLegQuoter.cpp | 2 +- .../spreader/SingleLegQuoter.h | 6 +- .../spreader/SpreaderBookkeepingData.cpp | 4 +- .../spreader/SpreaderBookkeepingData.h | 2 +- .../spreader/SpreaderChildOrderState.h | 9 +- .../spreader/hedger/IHedgerStateWorker.h | 3 +- .../hedger_states/HedgerEndStateWorker.cpp | 2 +- .../hedger_states/HedgerEndStateWorker.h | 2 +- .../hedger_states/HedgerStartStateWorker.cpp | 2 +- .../hedger_states/HedgerStartStateWorker.h | 2 +- .../HedgerWaitingForCancelAckStateWorker.cpp | 2 +- .../HedgerWaitingForCancelAckStateWorker.h | 2 +- ...WaitingForFirstAckCancelledStateWorker.cpp | 2 +- ...erWaitingForFirstAckCancelledStateWorker.h | 2 +- .../HedgerWaitingForFirstAckStateWorker.cpp | 2 +- .../HedgerWaitingForFirstAckStateWorker.h | 2 +- .../HedgerWorkingStateWorker.cpp | 2 +- .../hedger_states/HedgerWorkingStateWorker.h | 2 +- .../spreader/quoter/IQuoterStateWorker.h | 2 +- .../quoter_states/QuoterEndStateWorker.cpp | 2 +- .../quoter_states/QuoterEndStateWorker.h | 2 +- .../quoter_states/QuoterStartStateWorker.cpp | 2 +- .../quoter_states/QuoterStartStateWorker.h | 2 +- .../QuoterWaitingForCancelAckStateWorker.cpp | 2 +- .../QuoterWaitingForCancelAckStateWorker.h | 2 +- ...uoterWaitingForFirstAckCancelledWorker.cpp | 2 +- .../QuoterWaitingForFirstAckCancelledWorker.h | 2 +- .../QuoterWaitingForFirstAckWorker.cpp | 2 +- .../QuoterWaitingForFirstAckWorker.h | 2 +- .../QuoterWaitingForIOCWorker.cpp | 2 +- .../quoter_states/QuoterWaitingForIOCWorker.h | 2 +- .../QuoterWaitingForSizeStateWorker.cpp | 6 +- .../QuoterWaitingForSizeStateWorker.h | 4 +- .../QuoterWorkingStateWorker.cpp | 8 +- .../quoter_states/QuoterWorkingStateWorker.h | 6 +- .../SpreaderEndStateWorker.cpp | 4 +- .../spreader_states/SpreaderEndStateWorker.h | 4 +- .../SpreaderStartStateWorker.cpp | 20 +- .../SpreaderStartStateWorker.h | 4 +- ...SpreaderWaitingForCancelAllStateWorker.cpp | 4 +- .../SpreaderWaitingForCancelAllStateWorker.h | 4 +- ...readerWaitingForInitialDataStateWorker.cpp | 4 +- ...SpreaderWaitingForInitialDataStateWorker.h | 6 +- .../SpreaderWorkingStateWorker.cpp | 4 +- .../SpreaderWorkingStateWorker.h | 4 +- .../spreader_orders/tests/spreader_tests.cpp | 60 +- .../spreader_orders/tests/tests_common.h | 8 +- .../orderman/server/OrderServiceServer.cpp | 38 +- src/lib/orderman/server/OrderServiceServer.h | 4 +- src/lib/orderman/tests/fat_wrapper_tests.cpp | 35 +- src/lib/orderman2/IOrderManagerObserver.h | 28 + src/lib/orderman2/OrderManager2.cpp | 7 + src/lib/orderman2/OrderManager2.h | 37 + src/lib/orderman2/orders/NativeOrder.cpp | 2 - src/lib/orderman2/orders/NativeOrder.h | 57 -- src/lib/orderman2/orders/Order.cpp | 2 - src/lib/orderman2/orders/Order.h | 70 -- src/sdk/examples/order_plugin_example.cpp | 20 +- src/sdk/sdk_shell.sh | 1 + src/server/sparkd/cmds/Benchmark.cpp | 20 +- src/server/sparkd/cmds/QuickTest.cpp | 22 +- src/server/sparkd/cmds/Run.cpp | 29 +- src/server/sparkd/cmds/Web.cpp | 4 +- src/server/sparkd/http/WebServer.cpp | 14 +- src/server/sparkd/http/WebServer.h | 4 +- 148 files changed, 2782 insertions(+), 2845 deletions(-) delete mode 100644 doc/dev/dev_process.md create mode 100644 src/lib/orderman/events/OutFIXMsgEvent.h create mode 100644 src/lib/orderman2/IOrderManagerObserver.h create mode 100644 src/lib/orderman2/OrderManager2.cpp create mode 100644 src/lib/orderman2/OrderManager2.h delete mode 100644 src/lib/orderman2/orders/NativeOrder.cpp delete mode 100644 src/lib/orderman2/orders/NativeOrder.h delete mode 100644 src/lib/orderman2/orders/Order.cpp delete mode 100644 src/lib/orderman2/orders/Order.h diff --git a/CMakeLists.txt b/CMakeLists.txt index a4395bfcf..b497a3092 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,9 +39,8 @@ else () set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} \ -fPIC -Wall -pedantic -Wextra -Werror \ -Wno-missing-braces -Wno-ignored-qualifiers \ - --std=c++17 -fdiagnostics-color") + --std=c++17 -fdiagnostics-color -Wl,--no-undefined") set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer -DNDEBUG -O3") - set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wno-undef") add_subdirectory(src/server/sparkd) add_subdirectory(src/lib) add_subdirectory(src/web) diff --git a/doc/dev/dev_process.md b/doc/dev/dev_process.md deleted file mode 100644 index 20e02e94d..000000000 --- a/doc/dev/dev_process.md +++ /dev/null @@ -1,71 +0,0 @@ -# The BTS Development Process # - -## The Big Picture ## - -Our development work is organized in projects. A project is an effort -to specifiy, develop and validate a related set of additions to our -Spark platform. A project can be assigned to one more developers and a -developer might concurrently be assigned to multiple -projects. Projects typically start out with specification work, -proceed to implementation and finish with validation efforts. At any -given time there will be multiple projects being worked on -concurrently. A project is concluded when the features it implements -are merged into the product and deployed to customers. - -## The Details ## -Typically project ideas come from sales interactions, opposition -research and customer feedback, alltough on occasion development or -operational requirements will also suggest potentially valuable -ideas. Whatever the source of a project idea the final decision of -which projects to pursue is always done by management. Once a project -idea has been selected for implementation the corresponding project -will go through several phases: inception, specification, development -and merge. We detail each of these phases below. - -* Inception. In this phase we create the infrastructure for the -project. Typically this means selecting a team, creating a project -case in Jira (that is a case assigned to the team@bluetradesys.com -Jira user) and possibly creating a new branch for the project. This -phase is mostly mechanical and the responsibility of Pedro. - -* Specification. The specification phase turns a usually vague and -ill-considered idea project idea into a concrete, implementable -specification that attempts to maximize the value/cost ratio of the -project. It is hard to exaggerate the impact of a this phase on the -rest of the project. *Nothing* has more impact on our ability to -quickly deliver value to customers than good specification -work. Specification typically take the form of shared google docs, -using a mix of text and UI mockups to capture both user requirements -and suggested implementation strategies. Taha is responsible for this -phase. - -* Development. Once a specification is complete, a team of developers -will use a project specific branch to implement the -specification. Periodically, typically once a week, progress on the -project is assessed by Pedro, possibly with the help of others. This -assessment takes the form of code reviews, demos, or just one-on-one -conversations. To ensure development does not go off on sub-optimal -tangents, developers are expected to continuously merge master into -the project branch as well as encouraged to create Pull Requests (PRs) -early in the project implementation, so that their work is kept -visible and integrated with that of the rest of the group. During the -implementation phase developers should reach out to Pedro for UI -reviews, architecture and design concerns as well as specification -trade off concerns. - -* Merge. Once a project is considered complete by developers, a PR -that includes Pedro should be created (unless, as mentioned above, an -early PR was already created in the development phase). Whether the PR -already existed or not, its description should be changed to start -with the "Ready To Merge" statement. This marks the project as ready -to be merged into master. Once a week, typically on Mondays, Pedro -will go through every PR marked as "Ready To Merge", build it, check -it out and if everything looks good merge it to master. At the end of -the day the resulting master will be tagged with a new version -number. This version will be go through some additional testing by -Brian and will then be deployed by Karl and Pete to customers -throughout the rest of the week. - -## Tools ## - * Pre-Merge checklist - * Code Review tutorial diff --git a/doc/user/docs/release_notes.md b/doc/user/docs/release_notes.md index c4a49f9b5..87f5766c2 100644 --- a/doc/user/docs/release_notes.md +++ b/doc/user/docs/release_notes.md @@ -6,18 +6,9 @@ ### Bug Fixes - Shell no longer crashes when removing a security from the synthetics window - It is now possible to create a new synthetic using the same name as a previously deleted synthetic -### SDK Improvements - - Improved Client and Server SDK clarity and documentation ### Performance Improvements - Synthetic calculation speed was improved by 400%. -### Risk / Entitlement System - - Risk Admin UI - - Spark users now have separate Trading, RiskAdmin, and/or MDAdmin permissions - - Spark users can now only add other users or accounts if permissioned to do so. - - Market Data Entitlement - - Automated market data reporting - - + ## 1.4.1 ### Tabs diff --git a/src/lib/api/service_helpers/AdminServiceUtils.cpp b/src/lib/api/service_helpers/AdminServiceUtils.cpp index ca30f9f61..ae6641719 100644 --- a/src/lib/api/service_helpers/AdminServiceUtils.cpp +++ b/src/lib/api/service_helpers/AdminServiceUtils.cpp @@ -1303,7 +1303,6 @@ void AdminServiceUtils::bootstrap_data (bts::api::admin::AdminData& data){ //associate users bts::api::admin::UserAccountPermissionUnit permission_unit; permission_unit.mutable_trading_permission()->set_submit_market_orders(true); - permission_unit.mutable_trading_permission()->set_has_permissions(true); permission_unit.mutable_admin_permission()->set_has_permissions(true); bts::api::admin::UserAccountPermissions account_permissions; account_permissions.mutable_account_permissions()->insert(google::protobuf::MapPair(parent_account->id(), permission_unit)); diff --git a/src/lib/jetfix/codec/FIXMsg.h b/src/lib/jetfix/codec/FIXMsg.h index 519946cbc..1d587802c 100644 --- a/src/lib/jetfix/codec/FIXMsg.h +++ b/src/lib/jetfix/codec/FIXMsg.h @@ -11,7 +11,7 @@ #include "lib/jetfix/codec/IFIXMsg.h" #include "lib/jetfix/common/InMsgBuffer.h" #include "lib/utils/meta_programming.h" -#include "lib/tracing/PerfLog.h" +#include "lib/orderman/orderman_utils/PerfTrace.h" namespace bts { namespace jetfix { @@ -73,8 +73,8 @@ public: } } - void set_trace (trace::CorID const&trace) {_trace = trace;} - trace::CorID const&trace() const {return _trace;} + void set_trace (PerfTrace const&trace) {_trace = trace;} + PerfTrace const&trace() const {return _trace;} private: typedef std::tuple FieldTuple; @@ -103,7 +103,7 @@ private: FieldTuple _fields; std::bitset::value> _has_value; std::vector> _field_idx; - trace::CorID _trace; + PerfTrace _trace; }; diff --git a/src/lib/jetfix/common/InMsgBuffer.h b/src/lib/jetfix/common/InMsgBuffer.h index bd1c76f9f..f01426120 100644 --- a/src/lib/jetfix/common/InMsgBuffer.h +++ b/src/lib/jetfix/common/InMsgBuffer.h @@ -6,7 +6,7 @@ #include #include "lib/utils/bts_assert.h" #include "lib/jetfix/codec/MessageTypes.h" -#include "lib/tracing/PerfLog.h" +#include "lib/orderman/orderman_utils/PerfTrace.h" namespace bts { namespace jetfix { @@ -114,16 +114,16 @@ public: std::string get_test_req_id () const {return get_string_field ("\001112=",sizeof("\001112=")-1);} - trace::CorID const&trace() const {return _trace;} + PerfTrace const&trace() const {return _trace;} - void set_trace(trace::CorID const&t) {_trace = t;} + void set_trace(PerfTrace const&t) {_trace = t;} private: const char *_data; size_t _size; MessageTypes _type; std::shared_ptr _buffer; - trace::CorID _trace; + PerfTrace _trace; MessageTypes get_type () const { diff --git a/src/lib/jetfix/connection/AsyncReader.cpp b/src/lib/jetfix/connection/AsyncReader.cpp index 93129e2d0..4c513f5a5 100644 --- a/src/lib/jetfix/connection/AsyncReader.cpp +++ b/src/lib/jetfix/connection/AsyncReader.cpp @@ -72,7 +72,6 @@ struct AsyncReader::PImpl PImpl(IConnection &connection, std::string const&connection_name, ICoreGatewayEventSink &sink, - trace::PerfLog &l, size_t buffer_sz, size_t high_water_mark) : @@ -82,7 +81,6 @@ struct AsyncReader::PImpl write_cursor (0), reader_thread (), sink (sink), - perf_log(l), high_water_mark (high_water_mark), connection_name(connection_name) {} @@ -100,8 +98,6 @@ struct AsyncReader::PImpl std::thread reader_thread; // an observer that will process the messages we frame ICoreGatewayEventSink &sink; - // For performance analysis - trace::PerfLog &perf_log; // a position in the current buffer that if reached signals the // need to increase the buffer size uint32_t high_water_mark; @@ -111,9 +107,8 @@ struct AsyncReader::PImpl AsyncReader::AsyncReader (IConnection &connection, std::string const&connection_name, ICoreGatewayEventSink &sink, - trace::PerfLog &log, size_t buffer_sz, size_t high_water_mark): - me (new PImpl(connection,connection_name,sink,log,buffer_sz,high_water_mark)) + me (new PImpl(connection,connection_name,sink,buffer_sz,high_water_mark)) {} void AsyncReader::start () @@ -142,9 +137,8 @@ void AsyncReader::dispatch () for (;;) { // read as many bytes as we have buffer space for auto read_count = me->connection.read (cursor (),free_bytes ()); - auto read_time = utils::TimeStamp::now(); - trace::CorID trace; - trace.channel = "fix"; + PerfTrace trace; + trace.fix_socket_r = utils::TimeStamp::now(); // signal a disconnect if the connection broke if (read_count <= 0) { @@ -168,8 +162,6 @@ void AsyncReader::dispatch () me->first_pending_msg += first_unprocessed_offset; for (auto &msg : framed_msgs) { - trace.sn = msg.get_seq_num(); - me->perf_log.log(trace,read_time,"fix_socket_r"); msg.set_trace(trace); LOG(Latency, Diag, "perf_event AsyncReader.on_fix"); tracepoint(bts_trace, trace_order, (char *)"AsyncReader.on_fix", 0, diff --git a/src/lib/jetfix/connection/AsyncReader.h b/src/lib/jetfix/connection/AsyncReader.h index 5ef506a28..85063d1c7 100644 --- a/src/lib/jetfix/connection/AsyncReader.h +++ b/src/lib/jetfix/connection/AsyncReader.h @@ -3,7 +3,6 @@ #include namespace bts { -namespace trace {class PerfLog;} namespace jetfix { class IConnection; @@ -17,7 +16,6 @@ public: AsyncReader(IConnection &connection, std::string const&connection_name, ICoreGatewayEventSink &sink, - trace::PerfLog &l, size_t buffer_sz, // initial buffer size to use size_t high_water_mark); // when do we allocate a new buffer void start (); diff --git a/src/lib/jetfix/connection/IConnection.h b/src/lib/jetfix/connection/IConnection.h index ab8b9b214..3673788b9 100644 --- a/src/lib/jetfix/connection/IConnection.h +++ b/src/lib/jetfix/connection/IConnection.h @@ -1,9 +1,9 @@ #pragma once #include +#include "lib/orderman/orderman_utils/PerfTrace.h" namespace bts { -namespace trace {struct CorID;} namespace jetfix { class IConnection @@ -14,7 +14,7 @@ public: virtual bool connect () = 0; virtual void shutdown () = 0; virtual int read (char* to_buffer,size_t read_count) = 0; - virtual int write (WriteVec const&vec,size_t vec_size,trace::CorID trace) = 0; + virtual int write (WriteVec const&vec,size_t vec_size,PerfTrace const&trace) = 0; virtual ~IConnection() {}; }; diff --git a/src/lib/jetfix/connection/SocketConnection.cpp b/src/lib/jetfix/connection/SocketConnection.cpp index a3b390a45..10fd1907f 100644 --- a/src/lib/jetfix/connection/SocketConnection.cpp +++ b/src/lib/jetfix/connection/SocketConnection.cpp @@ -1,11 +1,11 @@ #include "SocketConnection.h" #include "lib/jetfix/store/session_name.h" #include "lib/logging/logging.h" +#include "lib/orderman/orderman_utils/PerfTraceLog.h" #include "lib/tracing/bts_trace.h" #include "lib/utils/TimeStamp.h" #include "lib/utils/bts_assert.h" #include "lib/utils/helper_macros.h" -#include "lib/tracing/PerfLog.h" #include #include @@ -19,7 +19,7 @@ namespace bts { namespace jetfix { SocketConnection::SocketConnection(bts::config::JetFIX::Connection const &cfg, - trace::PerfLog &perf_log) + PerfTraceLog &perf_log) : _fd(-1), _cfg(cfg), _log(cfg.log_fix_stream()), _in_log(), _out_log(), _perf_log(perf_log) { if (_log) { @@ -98,7 +98,7 @@ int SocketConnection::read(char *to_buffer, size_t read_count) { } int SocketConnection::write(WriteVec const &vec, size_t vec_size, - trace::CorID trace) { + PerfTrace const &trace) { bts_assert(_fd >= 0); struct iovec iv[MaxWriteVecSz]; @@ -107,9 +107,65 @@ int SocketConnection::write(WriteVec const &vec, size_t vec_size, iv[i].iov_len = vec[i].second; } - _perf_log.log(trace,"before_fix_socket_w"); + auto trace_cpy = trace; + trace_cpy.fix_socket_w = utils::TimeStamp::now(); + + utils::TimeStamp::Interval s2s; + if (trace.md.to_uint64()) { + s2s = (trace_cpy.fix_socket_w - trace_cpy.md); + tracepoint(bts_trace, trace_order, + (char *)"SocketConnection.tick_to_order.pre_write", 0, + trace.md_sn, s2s.microseconds()); + } else { + s2s = (trace_cpy.fix_socket_w - trace_cpy.fix_socket_r); + tracepoint(bts_trace, trace_order, + (char *)"SocketConnection.fill_to_order.pre_write", 0, + trace.md_sn, s2s.microseconds()); + } + + LOG(Latency, Diag, "perf_event before_socket_write"); auto result = ::writev(_fd, iv, (int)vec_size); - _perf_log.log(trace,"after_fix_socket_w"); + + if (trace.md.to_uint64()) { + LOG(Latency, Info, + "perf_event:tick_to_order s2s_us:{} do_work_begin:{} fix_socket_r:{} " + "md:{} " + "md_src:{} spreader_on_book:{} spreader_modify_order:{} " + "spreader_on_child_order_update:{} " + "order_update:{} exe_gw:{} fix_socket_w:{} md_sn:{} order_key:{} " + "send_fix_buffer:{}", + s2s.microseconds(), trace_cpy.do_work_begin.to_uint64(), + trace_cpy.fix_socket_r.to_uint64(), trace_cpy.md.to_uint64(), + trace_cpy.md_src.to_uint64(), trace_cpy.spreader_on_book.to_uint64(), + trace_cpy.spreader_modify_order.to_uint64(), + trace_cpy.spreader_on_child_order_update.to_uint64(), + trace_cpy.order_update.to_uint64(), trace_cpy.exe_gw.to_uint64(), + trace_cpy.fix_socket_w.to_uint64(), trace_cpy.md_sn, + trace_cpy.order_key, trace.send_fix_buffer.to_uint64()); + _perf_log.log(trace_cpy); + } + + if (trace.fix_socket_r.to_uint64()) { + LOG(Latency, Info, + "perf_event:fill_to_order s2s_us:{} do_work_begin:{} fix_socket_r:{} " + "md:{} md_src:{} " + "spreader_on_book:{} spreader_modify_order:{} " + "spreader_on_child_order_update:{} " + "order_update:{} exe_gw:{} fix_socket_w:{} md_sn:{} order_key:{} " + "send_fix_buffer:{} ", + s2s.microseconds(), trace_cpy.do_work_begin.to_uint64(), + trace_cpy.fix_socket_r.to_uint64(), trace_cpy.md.to_uint64(), + trace_cpy.md_src.to_uint64(), trace_cpy.spreader_on_book.to_uint64(), + trace_cpy.spreader_modify_order.to_uint64(), + trace_cpy.spreader_on_child_order_update.to_uint64(), + trace_cpy.order_update.to_uint64(), trace_cpy.exe_gw.to_uint64(), + trace_cpy.fix_socket_w.to_uint64(), trace_cpy.md_sn, trace_cpy.order_key, + trace_cpy.send_fix_buffer.to_uint64()); + _perf_log.log(trace_cpy); + } + + tracepoint(bts_trace, trace_order, (char *)"SocketConnection.post_write", 0, + trace.md_sn, 0); if (_log && result > 0) { for (size_t i = 0; i < vec_size; i++) diff --git a/src/lib/jetfix/connection/SocketConnection.h b/src/lib/jetfix/connection/SocketConnection.h index ebdf75828..6246d3e5f 100644 --- a/src/lib/jetfix/connection/SocketConnection.h +++ b/src/lib/jetfix/connection/SocketConnection.h @@ -7,19 +7,19 @@ #include "lib/metrics/metrics.h" namespace bts { -namespace trace {class PerfLog;struct CorID;} +class PerfTraceLog; namespace jetfix { class SocketConnection : public IConnection { public: - SocketConnection(bts::config::JetFIX::Connection const &cfgl,trace::PerfLog &log); + SocketConnection(bts::config::JetFIX::Connection const &cfgl,PerfTraceLog &log); ~SocketConnection(); bool connect () override; void shutdown () override; int read (char* to_buffer,size_t read_count) override; - int write (WriteVec const&vec,size_t vec_size,trace::CorID ) override; + int write (WriteVec const&vec,size_t vec_size,const PerfTrace &trace) override; private: int _fd; @@ -27,7 +27,7 @@ private: bool _log; std::ofstream _in_log; std::ofstream _out_log; - trace::PerfLog &_perf_log; + PerfTraceLog &_perf_log; }; }} diff --git a/src/lib/jetfix/gateway/CoreGateway.cpp b/src/lib/jetfix/gateway/CoreGateway.cpp index e6bac0847..1f062ea2f 100644 --- a/src/lib/jetfix/gateway/CoreGateway.cpp +++ b/src/lib/jetfix/gateway/CoreGateway.cpp @@ -1,26 +1,26 @@ #include "CoreGateway.h" +#include "lib/logging/logging.h" +#include "lib/utils/TimeStamp.h" +#include "lib/utils/bts_chrono.h" +#include "lib/utils/datetime.h" #include "lib/jetfix/common/OutFIX.h" #include "lib/jetfix/connection/AsyncReader.h" #include "lib/jetfix/connection/IConnection.h" #include "lib/jetfix/gateway/ICoreGatewayObserver.h" #include "lib/jetfix/gateway/Session.h" #include "lib/jetfix/store/IFIXStore.h" -#include "lib/logging/logging.h" #include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/tracing/bts_trace.h" -#include "lib/utils/TimeStamp.h" -#include "lib/utils/bts_chrono.h" -#include "lib/utils/datetime.h" -#include "lib/utils/thread_manager.h" #include +#include "lib/utils/thread_manager.h" #include #include #include #include -#include #include +#include namespace bts { namespace jetfix { @@ -50,17 +50,22 @@ struct CoreGateway::EventData { : handler(src.handler), out_msgs(src.out_msgs), in_msg(src.in_msg), trace(src.trace), ts(src.ts) {} - EventData() : handler(), out_msgs(), in_msg(), trace(), ts() {} + EventData() + : handler(), out_msgs(), in_msg(), trace(), + ts() {} EventData(Handler handler) : handler(handler), out_msgs(), in_msg(), trace(), ts() {} - EventData(Handler handler, trace::CorID const &trace, OutFIXPtr const &out_msgs) + EventData(Handler handler, PerfTrace const &trace, + OutFIXPtr const &out_msgs) : handler(handler), out_msgs(out_msgs), in_msg(), trace(trace), ts() {} EventData(Handler handler, InMsgBuffer const &in_msg) - : handler(handler), out_msgs(), in_msg(in_msg), trace(), ts() {} + : handler(handler), out_msgs(), in_msg(in_msg), + trace(), ts() {} EventData(Handler handler, std::shared_ptr const &ts) - : handler(handler), out_msgs(), in_msg(), trace(), ts(ts) {} + : handler(handler), out_msgs(), in_msg(), + trace(), ts(ts) {} EventData &operator=(EventData &src) { handler = src.handler; @@ -82,19 +87,19 @@ struct CoreGateway::EventData { Handler handler; OutFIXPtr out_msgs; InMsgBuffer in_msg; - trace::CorID trace; + PerfTrace trace; std::shared_ptr ts; }; struct CoreGateway::PImpl { PImpl(config::JetFIX::Connection const &cfg, ICoreGatewayObserver &observer, ConnectionFactory const &conn_factory, - StoreFactory const &store_factory, trace::PerfLog &l) + StoreFactory const &store_factory) : cfg(cfg), observer(observer), make_connection(conn_factory), make_store(store_factory), state(State::OFF), start_of_pause(), session_info(), event_queue(), timer_thread(), destroy(false), is_on(false), has_replayed(false), send_batch(), recv_batch(), - connection_attempts(0), perf_log(l) { + connection_attempts(0) { send_batch.reserve(1024); recv_batch.reserve(1024); } @@ -107,7 +112,7 @@ struct CoreGateway::PImpl { State state; datetime::PTime start_of_pause; std::unique_ptr session_info; - tbb::concurrent_queue event_queue; + tbb::concurrent_queue event_queue; std::thread timer_thread; std::atomic destroy; bool is_on; @@ -115,21 +120,18 @@ struct CoreGateway::PImpl { std::vector send_batch; std::vector recv_batch; uint32_t connection_attempts; - trace::PerfLog &perf_log; }; std::thread CoreGateway::make_timer_thread() { - auto thread_name = fmt::format("jf_tmr_{}", me->cfg.name()); - return threading::make_thread(thread_name, - std::bind(&CoreGateway::call_time, this)); + auto thread_name = fmt::format ("jf_tmr_{}", me->cfg.name()); + return threading::make_thread(thread_name, std::bind(&CoreGateway::call_time, this)); } CoreGateway::CoreGateway(config::JetFIX::Connection const &cfg, ICoreGatewayObserver &observer, ConnectionFactory const &conn_factory, - StoreFactory const &store_factory, - trace::PerfLog &perf_trace) - : me(new PImpl(cfg, observer, conn_factory, store_factory, perf_trace)) { + StoreFactory const &store_factory) + : me(new PImpl(cfg, observer, conn_factory, store_factory)) { me->timer_thread = make_timer_thread(); } @@ -143,7 +145,8 @@ CoreGateway::~CoreGateway() { me->timer_thread.join(); } -void CoreGateway::send(OutFIXPtr const &fix, trace::CorID trace) { +void CoreGateway::send(PerfTrace const &trace, OutFIXPtr const &fix) { + tracepoint(bts_trace, trace_order, (char *)"CoreGateway.send", 0, trace.md_sn,0); me->event_queue.push(EventData(&CoreGateway::sync_send, trace, fix)); } @@ -258,6 +261,8 @@ void CoreGateway::sync_stop(EventData const &) { } void CoreGateway::sync_send(EventData const &ev) { + tracepoint(bts_trace, trace_order, (char *)"CoreGateway.sync_send", 0, + ev.trace.md_sn,0); switch (me->state) { case State::OFF: bts_assert(false); @@ -268,7 +273,7 @@ void CoreGateway::sync_send(EventData const &ev) { case State::WSESSION_TERMINATE: break; case State::READY: - me->session_info->session->send(ev.out_msgs,ev.trace); + me->session_info->session->send(ev.trace, ev.out_msgs); break; default: bts_assert(false); @@ -472,8 +477,7 @@ void CoreGateway::sync_time(EventData const &ev) { []() { return utils::TimeStamp::now(); })); me->session_info->reader.reset(new AsyncReader( *me->session_info->connection, me->cfg.name(), *this, - me->perf_log, me->cfg.msg_buffer_sz(), - me->cfg.msg_high_water_mark())); + me->cfg.msg_buffer_sz(), me->cfg.msg_high_water_mark())); me->session_info->reader->start(); me->session_info->session->start(); transition(State::CONNECTING); @@ -569,5 +573,5 @@ const char *CoreGateway::state_name(State st) { bts_assert(false); } } -} // namespace jetfix -} // namespace bts +} +} diff --git a/src/lib/jetfix/gateway/CoreGateway.h b/src/lib/jetfix/gateway/CoreGateway.h index fcba9510b..dba302441 100644 --- a/src/lib/jetfix/gateway/CoreGateway.h +++ b/src/lib/jetfix/gateway/CoreGateway.h @@ -10,7 +10,6 @@ #include "lib/config/protos/jetfix.pb.h" namespace bts { -namespace trace {class PerfLog;} namespace jetfix { class ICoreGatewayObserver; class IConnection; @@ -26,13 +25,12 @@ public: CoreGateway(config::JetFIX::Connection const &cfg, ICoreGatewayObserver &observer, ConnectionFactory const &conn_factory, - StoreFactory const &store_factory, - trace::PerfLog &); + StoreFactory const &store_factory); ~CoreGateway(); void start (); void stop (); - void send (OutFIXPtr const &msgs, trace::CorID trace); + void send (PerfTrace const&, OutFIXPtr const &msgs); void dispatch_events (); // for certification use only diff --git a/src/lib/jetfix/gateway/JetFIXGateway.h b/src/lib/jetfix/gateway/JetFIXGateway.h index 6454aab8f..6578bb8fd 100644 --- a/src/lib/jetfix/gateway/JetFIXGateway.h +++ b/src/lib/jetfix/gateway/JetFIXGateway.h @@ -8,12 +8,11 @@ #include "lib/jetfix/store/FIXFileStore.h" #include "lib/utils/meta_programming.h" #include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/tracing/PerfLog.h" #include "lib/config/protos/jetfix.pb.h" namespace bts { -namespace trace {class PerfLog;} +class PerfTraceLog; namespace jetfix { // A parsing layer over CoreGateway @@ -21,7 +20,7 @@ template class JetFIXGateway : ICoreGatewayObserver { public: - JetFIXGateway(config::JetFIX::Connection const &cfg, trace::PerfLog &log) + JetFIXGateway(config::JetFIX::Connection const &cfg, PerfTraceLog &log) : _core (cfg,*this, @@ -29,16 +28,13 @@ public: {return new SocketConnection (cfg,log);}, [] (config::JetFIX::Connection const &cfg) - { return new FIXFileStore (cfg);}, - - log), + { return new FIXFileStore (cfg);}), _dispatchers (), _dispatcher_idx (), _on_ready ([](){}), _on_disconnect ([](){}), _on_begin_replay ([](){}), - _on_end_replay ([](){}), - _perf_log(log) + _on_end_replay ([](){}) { std::vector disp_vec; meta::collect_tuple_items (_dispatchers,&disp_vec); @@ -49,7 +45,7 @@ public: void start () {_core.start ();} void stop () {_core.stop ();} - void send (OutFIXPtr const &msgs,trace::CorID trace ) {_core.send (msgs,trace);} + void send (PerfTrace const &trace, OutFIXPtr const &msgs) {_core.send (trace,msgs);} void dispatch_events () {_core.dispatch_events ();} @@ -127,7 +123,6 @@ private: std::function _on_disconnect; std::function _on_begin_replay; std::function _on_end_replay; - trace::PerfLog &_perf_log; }; }} diff --git a/src/lib/jetfix/gateway/Session.cpp b/src/lib/jetfix/gateway/Session.cpp index ba7a69069..232469c06 100644 --- a/src/lib/jetfix/gateway/Session.cpp +++ b/src/lib/jetfix/gateway/Session.cpp @@ -106,7 +106,8 @@ void Session::start() { *me->current_time, me->cfg)); } -void Session::send(OutFIXPtr const &msgs,trace::CorID trace) { +void Session::send(PerfTrace const &trace, OutFIXPtr const &msgs) { + tracepoint(bts_trace, trace_order, (char *)"Session.send", 0, trace.md_sn, 0); switch (me->state) { case State::READY: case State::CERT_MODE: @@ -546,10 +547,10 @@ void Session::buffer_or_deliver(InMsgBuffer const &msg) { } void Session::internal_send(OutFIXPtr const &msgs) { - internal_send(trace::CorID {},msgs); + internal_send(PerfTrace(), msgs); } -void Session::internal_send(trace::CorID trace, OutFIXPtr const &msgs) { +void Session::internal_send(PerfTrace const &trace, OutFIXPtr const &msgs) { IConnection::WriteVec data_vec; bts_assert(msgs->fix.size() < IConnection::MaxWriteVecSz); @@ -561,10 +562,13 @@ void Session::internal_send(trace::CorID trace, OutFIXPtr const &msgs) { data_vec[i].first = s.data(); data_vec[i].second = s.size(); } + tracepoint(bts_trace, trace_order, (char *)"Session.internal_send.pre_write", 0, trace.md_sn,0); if (me->connection.write(data_vec, msgs->fix.size(), trace) < 0) { terminate_session(JetFIXError::CONNECTION_ERROR); return; } + tracepoint(bts_trace, trace_order, + (char *)"Session.internal_send.post_write", 0, trace.md_sn, 0); me->last_sent_msg_timestamp = me->now(); me->store.store(msgs); msgs->set_ts(OutFIX::POST_STORE, utils::TimeStamp::now()); @@ -677,7 +681,7 @@ void Session::send_seq_reset(uint32_t sn, uint32_t new_sn) { IConnection::WriteVec data_vec; data_vec[0].first = stream.data(); data_vec[0].second = stream.size(); - if (me->connection.write(data_vec, 1, trace::CorID()) < 0) { + if (me->connection.write(data_vec, 1, PerfTrace()) < 0) { terminate_session(JetFIXError::CONNECTION_ERROR); return; } else { diff --git a/src/lib/jetfix/gateway/Session.h b/src/lib/jetfix/gateway/Session.h index 3808a78d1..86ac8472d 100644 --- a/src/lib/jetfix/gateway/Session.h +++ b/src/lib/jetfix/gateway/Session.h @@ -8,7 +8,6 @@ #include "lib/utils/datetime.h" #include "lib/jetfix/common/OutFIXPtr.h" #include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/tracing/PerfLog.h" #include "lib/config/protos/jetfix.pb.h" @@ -32,7 +31,7 @@ public: ~Session(); void start (); - void send (OutFIXPtr const&, trace::CorID); + void send (PerfTrace const &, OutFIXPtr const&); void receive (InMsgBuffer const&); void shutdown (); void time (std::shared_ptr const&time_str); @@ -60,7 +59,7 @@ private: void buffer (InMsgBuffer const &msg); void buffer_or_deliver (InMsgBuffer const&msg); - void internal_send (trace::CorID , OutFIXPtr const&); + void internal_send (PerfTrace const&, OutFIXPtr const&); void internal_send (OutFIXPtr const&); void logout (JetFIXError::Code reason); void logout (JetFIXError::Code reason,std::string const &extra_info); diff --git a/src/lib/jetfix/tests/async_reader_tests.cpp b/src/lib/jetfix/tests/async_reader_tests.cpp index d75fff0f2..362bb0211 100644 --- a/src/lib/jetfix/tests/async_reader_tests.cpp +++ b/src/lib/jetfix/tests/async_reader_tests.cpp @@ -111,7 +111,7 @@ struct Connection : public IConnection return str.gcount (); } - int write (WriteVec const&,size_t, trace::CorID ) + int write (WriteVec const&,size_t, PerfTrace const&) {return -1;} std::istream &str; @@ -119,8 +119,6 @@ struct Connection : public IConnection TEST_CASE ("JetFIX AsyncReaderTests", "[jetfix]") { - trace::PerfLog l; - SECTION ("jeftix_smoke") { std::stringstream str; @@ -130,7 +128,7 @@ TEST_CASE ("JetFIX AsyncReaderTests", "[jetfix]") MyGWObserver ob; { - AsyncReader r (c,"test",ob,l,10,5); + AsyncReader r (c,"test",ob,10,5); r.start (); } @@ -146,7 +144,7 @@ TEST_CASE ("JetFIX AsyncReaderTests", "[jetfix]") MyGWObserver ob; { - AsyncReader r (c,"test",ob,l,10,5); + AsyncReader r (c,"test",ob,10,5); r.start (); } REQUIRE (ob.got_eof); diff --git a/src/lib/mercury/actors/Actor.h b/src/lib/mercury/actors/Actor.h index 61e67cec1..2ca4e9416 100644 --- a/src/lib/mercury/actors/Actor.h +++ b/src/lib/mercury/actors/Actor.h @@ -37,10 +37,6 @@ class Actor { // Implement if you need special cleanup at actor destruction time virtual void finit(){}; - // Implement this if you want to be called before/after an event is dispatched - virtual void before_event() {} - virtual void after_event() {} - // subscribe to events using a specific tag template SubHandle subscribe(typename EV::Tag const &tag, CB const &cb) { @@ -71,12 +67,10 @@ class Actor { tracepoint(bts_trace, trace_event, utils::type_name(typeid(*this)), utils::type_name(), _broker_id, sid.value(), 0); - before_event(); if (payload) cb(UpdateType{sid, type, &(payload->unwrap())}); else cb(UpdateType{sid, type, nullptr}); - after_event(); }; auto result = _subscribe(filter, handler); @@ -113,12 +107,10 @@ class Actor { tracepoint(bts_trace, trace_event, utils::type_name(typeid(*this)), utils::type_name(), _broker_id, sid.value(), 0); - before_event(); if (payload) cb(UpdateType{sid, type, &(payload->unwrap())}); else cb(UpdateType{sid, type, nullptr}); - after_event(); }; auto result = _subscribe(filter, handler); @@ -154,12 +146,10 @@ class Actor { tracepoint(bts_trace, trace_event, utils::type_name(typeid(*this)), utils::type_name(), _broker_id, sid.value(), 0); - before_event(); if (payload) cb(UpdateType{sid, type, &(payload->unwrap())}); else cb(UpdateType{sid, type, nullptr}); - after_event(); }; auto result = _subscribe(filter, handler); diff --git a/src/lib/mercury/actors/ContentSubscription.h b/src/lib/mercury/actors/ContentSubscription.h index 92a6cccf5..bc549e4c7 100644 --- a/src/lib/mercury/actors/ContentSubscription.h +++ b/src/lib/mercury/actors/ContentSubscription.h @@ -4,7 +4,6 @@ #include #include #include -#include #include "lib/utils/bts_assert.h" @@ -30,9 +29,6 @@ template class ContentSubscription { using Key = decltype((*((KE *)nullptr))(*((EV *)nullptr))); using CB = std::function; struct SubID { - SubID() : k(), sid(0) {} - SubID(Key k, uint32_t sid) : k(k), sid(sid) {} - Key k; uint32_t sid; bool operator==(SubID const &rhs) const { @@ -43,7 +39,7 @@ template class ContentSubscription { ContentSubscription(Actor &actor) : _actor(&actor), _sub(_actor->subscribe( [this](auto const &u) { this->on_update(u); })), - _my_subs(), _dispatching(false), _current_sub_id(1), + _my_subs(), _dispatching(false), _current_sub_id(0), _pre_sub([](auto) {}) {} ContentSubscription(Actor &actor, std::function const &pscb) @@ -56,7 +52,7 @@ template class ContentSubscription { : _actor(&actor), _sub(_actor->subscribe( tag, [this](auto const &u) { this->on_update(u); })), - _my_subs(), _dispatching(false), _current_sub_id(1), + _my_subs(), _dispatching(false), _current_sub_id(0), _pre_sub([](auto) {}) {} template @@ -65,7 +61,7 @@ template class ContentSubscription { : _actor(&actor), _sub(_actor->subscribe( tag, [this](auto const &u) { this->on_update(u); })), - _my_subs(), _dispatching(false), _current_sub_id(1), + _my_subs(), _dispatching(false), _current_sub_id(0), _pre_sub(pscb) {} template SubID sub(Key k, CBT const &cb) { @@ -101,7 +97,7 @@ template class ContentSubscription { CB cb; }; - using SubList = boost::container::small_vector; + using SubList = std::vector; using Subscriptions = std::unordered_map; Actor *_actor; diff --git a/src/lib/orderman/actors/AsyncFactory.cpp b/src/lib/orderman/actors/AsyncFactory.cpp index 91b76045e..6a9bdd497 100644 --- a/src/lib/orderman/actors/AsyncFactory.cpp +++ b/src/lib/orderman/actors/AsyncFactory.cpp @@ -1,24 +1,29 @@ #include "AsyncFactory.h" -#include "lib/config/protos/jetfix.pb.h" -#include "lib/jetfix/common/OutFIX.h" -#include "lib/orderman/events/CreateFIXBufferReplyEvent.h" -#include "lib/orderman/events/CreateFIXBufferRequestEvent.h" -#include "lib/orderman/events/CreateOrderReplyEvent.h" #include "lib/orderman/events/CreateOrderRequestEvent.h" -#include "lib/orderman/events/NewAdminDataEvent.h" -#include "lib/orderman/events/NewSecuritiesEvent.h" +#include "lib/orderman/events/CreateOrderReplyEvent.h" +#include "lib/orderman/events/CreateFIXBufferRequestEvent.h" +#include "lib/orderman/events/CreateFIXBufferReplyEvent.h" #include "lib/orderman/order_factory/OrderFactory.h" -#include "lib/orderman/order_router/OrderRouter.h" +#include "lib/orderman/events/NewSecuritiesEvent.h" +#include "lib/jetfix/common/OutFIX.h" #include "lib/orderman/securities/MapSecurityDB.h" +#include "lib/config/protos/jetfix.pb.h" +#include "lib/orderman/order_router/OrderRouter.h" +#include "lib/orderman/events/NewAdminDataEvent.h" namespace bts { namespace orderman { -struct AsyncFactory::PImpl { - PImpl(DynamicOrderRegistry const &b) - : orders_stream(), fix_buffer_stream(), db(), order_router(), - order_factory(db, order_router, b) {} +struct AsyncFactory::PImpl +{ + PImpl(DynamicOrderRegistry const&b) : + orders_stream(), + fix_buffer_stream(), + db(), + order_router(), + order_factory(db,order_router,b) + {} mercury::Stream orders_stream; mercury::Stream fix_buffer_stream; @@ -27,49 +32,48 @@ struct AsyncFactory::PImpl { OrderFactory order_factory; }; -AsyncFactory::AsyncFactory(DynamicOrderRegistry const &b) : me(new PImpl(b)) {} -AsyncFactory::~AsyncFactory() {} +AsyncFactory::AsyncFactory(DynamicOrderRegistry const&b) : me(new PImpl(b)) {} +AsyncFactory::~AsyncFactory () {} -void AsyncFactory::init() { +void AsyncFactory::init() +{ me->orders_stream = make_stream(); - me->fix_buffer_stream = make_stream(); + me->fix_buffer_stream = make_stream (); subscribe([this](auto const &u) { - if (u.events) - for (auto ev : *(u.events)) - me->order_router.update(*ev.admin_data); - }); + if (u.events) + for (auto ev : *(u.events)) + me->order_router.update(*ev.admin_data); + }); - subscribe([this](auto const &u) { - if (u.events) - for (auto const &ev : *(u.events)) - me->db.securities[SecurityKey(ev.security->id())] = ev.security; - }); + subscribe([this] (auto const&u) { + if (u.events) + for (auto const &ev : *(u.events)) + me->db.securities[SecurityKey(ev.security->id())] = ev.security; + }); + + subscribe([this] (const auto &u) { + if (u.events) + for (auto const &ev : *u.events) { + std::vector response; + response.reserve(ev.n_orders); + while (response.size() < ev.n_orders) + response.push_back(&me->order_factory.create(ev.parent_key,*ev.def)); + this->publish(me->orders_stream,ev.request_id,std::move(response)); + } + }); - subscribe([this](const auto &u) { - if (u.events) - for (auto const &ev : *u.events) { - std::vector response; - response.reserve(ev.n_orders); - while (response.size() < ev.n_orders) - response.push_back( - &me->order_factory.create(ev.parent_key, *ev.def)); - this->publish(me->orders_stream, ev.request_id, - std::move(response)); - } - }); - - subscribe([this](const auto &u) { - if (u.events) - for (auto const &ev : *u.events) { - std::vector response; - response.reserve(ev.n_buffers); - while (response.size() < ev.n_buffers) - response.push_back(std::make_shared(*ev.cfg)); - this->publish(me->fix_buffer_stream, std::move(response), ev.cfg); - } - }); + subscribe([this] (const auto &u) { + if (u.events) + for (auto const &ev : *u.events) { + std::vector response; + response.reserve(ev.n_buffers); + while (response.size() < ev.n_buffers) + response.push_back(std::make_shared (*ev.cfg)); + this->publish(me->fix_buffer_stream,std::move(response),ev.cfg); + } + }); } -} // namespace orderman -} // namespace bts + +}} diff --git a/src/lib/orderman/actors/ExecutionGateway.cpp b/src/lib/orderman/actors/ExecutionGateway.cpp index c50d75ad2..fbc4c53f0 100644 --- a/src/lib/orderman/actors/ExecutionGateway.cpp +++ b/src/lib/orderman/actors/ExecutionGateway.cpp @@ -24,10 +24,11 @@ using JFGw = fix::RejectMsg, fix::CancelRejectMsg>; struct ExecutionGateway::PImpl { - PImpl(config::JetFIX::Connection const &cfg, trace::PerfLog &l) - : gw(cfg, l), exe_report_pool(), state(State::WAITING_FOR_SECURITIES), - securities(), securities_by_descriptor(), gw_name(cfg.name()), - cfg(cfg), perf_log(l) {} + PImpl(config::JetFIX::Connection const &cfg, PerfTraceLog &log) + : gw(cfg, log), exe_report_pool(), state(State::WAITING_FOR_SECURITIES), + securities(), securities_by_descriptor(), exe_report_stream(), + gw_status_change_stream(), cancel_reject_stream(), gw_name(cfg.name()), + cfg(cfg) {} JFGw gw; boost::object_pool exe_report_pool; @@ -35,21 +36,26 @@ struct ExecutionGateway::PImpl { std::unordered_map securities; std::unordered_map securities_by_descriptor; + mercury::Stream exe_report_stream; + mercury::Stream gw_status_change_stream; + mercury::Stream cancel_reject_stream; GatewayName gw_name; config::JetFIX::Connection cfg; - OnExeReport on_exe_report; - OnGwStatusChange on_gw_status_change; - OnCancelReject on_cancel_reject; - trace::PerfLog &perf_log; }; ExecutionGateway::ExecutionGateway(config::JetFIX::Connection const &cfg, - trace::PerfLog &log) - : me(new PImpl(cfg, log)) { - me->state = State::WAITING_FOR_SECURITIES; -} + PerfTraceLog &log) + : me(new PImpl(cfg, log)) {} ExecutionGateway::~ExecutionGateway() {} +void ExecutionGateway::init() { + me->state = State::WAITING_FOR_SECURITIES; + subscribe( + [this](auto const &sec_update) { this->on_securities(sec_update); }); + subscribe( + me->gw_name, [this](auto const &fix) { this->on_outgoing_fix(fix); }); +} + void ExecutionGateway::on_securities( const mercury::Update &update) { if (update.events) { @@ -90,22 +96,24 @@ void ExecutionGateway::on_securities( me->gw.on() = [this](auto const &m) { this->on_session_reject(m); }; + + // stream of execution reports + me->exe_report_stream = + make_stream(me->gw_name); + + // stream for gateway status + me->gw_status_change_stream = + make_stream(me->gw_name); + + // stream for cancel rejects + me->cancel_reject_stream = make_stream(me->gw_name); + + // start the gateway + me->gw.start(); } } } -void ExecutionGateway::start() { me->gw.start(); } - -OnExeReport &ExecutionGateway::on_exe_report() { return me->on_exe_report; } - -OnGwStatusChange &ExecutionGateway::on_gw_status_change() { - return me->on_gw_status_change; -} - -OnCancelReject &ExecutionGateway::on_cancel_reject() { - return me->on_cancel_reject; -} - void ExecutionGateway::on_exe_report( const jetfix::fix::ExecutionReportMsg &msg) { auto start = Timer::now(); @@ -186,6 +194,8 @@ void ExecutionGateway::on_exe_report( data->exec_type = api::orderman::ExecType(msg.get()); data->msg_seq_num = msg.get(); + tracepoint(bts_trace, trace_order, + (char *)"ExecutionGateway.on_exe_report", 0, 0, 0); // copy data from fix msg to our structure if (msg.has()) @@ -248,8 +258,9 @@ void ExecutionGateway::on_exe_report( str_to(msg.get(), &data->transact_time); data->cfg = &me->cfg; data->msg = text_msg; - me->perf_log.log(msg.trace(),"exe_gw"); - me->on_exe_report(*data, msg.trace()); + auto trace = msg.trace(); + trace.exe_gw = utils::TimeStamp::now(); + publish(me->exe_report_stream, data, trace); LOG(Latency, Info, "Finished handling of execution report for order {}. {}ns", ok.value(), ns_diff(Timer::now(), start)); @@ -268,7 +279,7 @@ void ExecutionGateway::on_cancel_reject( else if (msg.has()) reject_msg = fmt::format("Order cancel was rejected with error code {}", msg.get()); - me->on_cancel_reject(ok, reject_msg); + publish(me->cancel_reject_stream, ok, reject_msg); } void ExecutionGateway::on_connection_status_change(bool is_connected) { @@ -276,7 +287,8 @@ void ExecutionGateway::on_connection_status_change(bool is_connected) { me->gw_name.value(), is_connected ? std::string("connected") : std::string("disconnected")); - me->on_gw_status_change(is_connected); + publish(me->gw_status_change_stream, + GatewayStatusChangeEvent(me->gw_name, is_connected)); } void ExecutionGateway::on_business_reject( @@ -296,15 +308,21 @@ void ExecutionGateway::on_session_reject(jetfix::fix::RejectMsg const &m) { m.has() ? m.get() : std::string("Unknown")); } -void ExecutionGateway::dispatch_incoming_fix_messages() { - me->gw.dispatch_events(); -} +void ExecutionGateway::on_poll() { me->gw.dispatch_events(); } -void ExecutionGateway::send_fix(jetfix::OutFIXPtr const &fix, - trace::CorID trace) { - me->perf_log.log(trace,"exe_gw"); - me->gw.send(fix,trace); - me->gw.dispatch_events(); +void ExecutionGateway::on_outgoing_fix( + mercury::Update const &msg) { + if (msg.events) + for (auto const &ev : *(msg.events)) { + LOG(Latency, Info, "on_outgoing_fix sn: {} ok: {}", ev.trace.md_sn, + ev.trace.order_key); + tracepoint(bts_trace, trace_order, (char *)"on_outgoing_fix", 0, + ev.trace.md_sn, 0); + auto trace = ev.trace; + trace.exe_gw = utils::TimeStamp::now(); + me->gw.send(trace, ev.msg); + me->gw.dispatch_events(); + } } } // namespace orderman diff --git a/src/lib/orderman/actors/ExecutionGateway.h b/src/lib/orderman/actors/ExecutionGateway.h index b94d56afa..001773fac 100644 --- a/src/lib/orderman/actors/ExecutionGateway.h +++ b/src/lib/orderman/actors/ExecutionGateway.h @@ -1,51 +1,44 @@ #pragma once -#include "lib/config/protos/jetfix.pb.h" -#include "lib/jetfix/codec/MessageDefinitions.h" -#include "lib/jetfix/common/OutFIXPtr.h" -#include "lib/mercury/events/Update.h" -#include "lib/orderman/orderman_utils/orderman_common.h" - #include +#include "lib/config/protos/jetfix.pb.h" +#include "lib/mercury/actors/Actor.h" +#include "lib/jetfix/codec/MessageDefinitions.h" +#include "lib/mercury/events/Update.h" +#include "lib/orderman/events/OutFIXMsgEvent.h" +#include "lib/mercury/actors/IPollableActor.h" +#include "lib/mercury/actors/PingPong.h" namespace bts { -namespace trace {struct CorID;class PerfLog;} +class PerfTraceLog; +namespace mercury { class PollEvent;} namespace orderman { class NewSecuritiesEvent; -class ExecutionReport; - -using OnExeReport = - std::function; -using OnGwStatusChange = std::function; -using OnCancelReject = std::function; // fix execution gateway for a single FIX session -class ExecutionGateway { - public: - ExecutionGateway(config::JetFIX::Connection const &, trace::PerfLog &); +class ExecutionGateway : public mercury::Actor, + public mercury::IPollableActor +{ +public: + ExecutionGateway(config::JetFIX::Connection const&, PerfTraceLog& ); ~ExecutionGateway(); + void init() override; - void start(); - void dispatch_incoming_fix_messages(); - void on_securities(const mercury::Update &); - void send_fix(jetfix::OutFIXPtr const &fix, trace::CorID trace); - - OnExeReport& on_exe_report(); - OnGwStatusChange& on_gw_status_change(); - OnCancelReject &on_cancel_reject(); - - private: - enum class State { WAITING_FOR_SECURITIES, READY }; +private: + enum class State {WAITING_FOR_SECURITIES,READY}; struct PImpl; std::unique_ptr me; - // fix gateway events - void on_exe_report(jetfix::fix::ExecutionReportMsg const &); - void on_cancel_reject(jetfix::fix::CancelRejectMsg const &); + void on_poll() override; + + void on_securities(const mercury::Update &); + void on_exe_report(jetfix::fix::ExecutionReportMsg const&); + void on_cancel_reject(jetfix::fix::CancelRejectMsg const&); void on_connection_status_change(bool connected); - void on_business_reject(jetfix::fix::BusinessMessageRejectMsg const &); - void on_session_reject(jetfix::fix::RejectMsg const &); + void on_business_reject(jetfix::fix::BusinessMessageRejectMsg const&); + void on_session_reject(jetfix::fix::RejectMsg const&); + void on_outgoing_fix(const mercury::Update &); }; -} // namespace orderman -} // namespace bts +}} + diff --git a/src/lib/orderman/actors/FillStore.cpp b/src/lib/orderman/actors/FillStore.cpp index a7d2fab18..fe368bb32 100644 --- a/src/lib/orderman/actors/FillStore.cpp +++ b/src/lib/orderman/actors/FillStore.cpp @@ -19,7 +19,7 @@ enum class FillStore::State { WAIT_SEC, READY }; struct FillStore::UnresolvedFills { std::vector fills; - api::Security const *security; + api::Security const* security; }; struct FillStore::PImpl { @@ -145,13 +145,13 @@ void FillStore::on_execution_report( fill.mutable_timestamp()->set_seconds(tv.tv_sec); fill.mutable_timestamp()->set_nanos(tv.tv_usec * 1000); + auto order_def = me->known_orders[er.order_key]; if (order_def) fill.set_account(order_def->account()); else - me->fills_with_unresolved_accounts[er.order_key] - .fills.push_back(fill); - + me->fills_with_unresolved_accounts[er.order_key].fills.push_back(fill); + auto fv = utils::pb::to_string(fill); me->store->insert(fills_ns, fk, fv); publish(me->fill_stream, fill, *er.security); @@ -167,7 +167,7 @@ void FillStore::on_execution_report( void FillStore::on_order_state_update( mercury::Update const &u) { if (u.events) - for (auto const &ev : *u.events) { + for (auto const &ev : *u.events) { me->known_orders[ev.key] = ev.definition; // see if we can resolve the accounts for any fills that we @@ -177,12 +177,11 @@ void FillStore::on_order_state_update( f.set_account(ev.definition->account()); auto fv = utils::pb::to_string(f); me->store->update(fills_ns, f.fill_key(), fv); - publish(me->fill_stream, f, *unresolved_fills.security); + publish(me->fill_stream,f, *unresolved_fills.security); } unresolved_fills.fills.clear(); // end fill resolution } } -} // namespace orderman -} // namespace bts +}} // namespace orderman diff --git a/src/lib/orderman/actors/MDSource.h b/src/lib/orderman/actors/MDSource.h index 83f58a387..5a8e506e4 100644 --- a/src/lib/orderman/actors/MDSource.h +++ b/src/lib/orderman/actors/MDSource.h @@ -10,7 +10,6 @@ #include "lib/orderman/events/MDRequestEvent.h" #include "lib/tracing/bts_trace.h" #include "lib/utils/TimeStamp.h" -#include "lib/tracing/PerfLog.h" namespace bts { namespace orderman { @@ -22,8 +21,8 @@ namespace orderman { class MDSource : public mercury::Actor, public mercury::IPollableActor { public: - MDSource(md::MDConsumer &consumer, metrics::MetricsContainer &stats, trace::PerfLog &log) - : _handles(), _md_consumer(consumer), _book_update(), _perf_log(log),_stats(stats), _loop_timer() {} + MDSource(md::MDConsumer &consumer, metrics::MetricsContainer &stats) + : _handles(), _md_consumer(consumer), _book_update(), _stats(stats), _loop_timer() {} void init() override { LOG(OrderMan, Warn, "Starting MDSource actor"); bts_assert_msg(_md_consumer.all_heartbeats_ok(), "Marketdata heartbeats are bad. MDConsumer will not recover from this condition. Please run 'sparkd md cleanup' and restart sparkd"); @@ -78,15 +77,21 @@ class MDSource : public mercury::Actor, public mercury::IPollableActor { void on_poll() override { Book book; + PerfTrace trace; auto start = utils::TimeStamp::now(); + trace.do_work_begin = start; + for (auto &h : _handles) { auto &handle = h.handle; if (handle.get_book(h.last, std::tuple_size(), &book.bid()[0], &book.ask()[0]) == md::HandleReadResult::SUCCESS) { book._security_key = SecurityKey(handle.key()); - trace::CorID trace {"md",handle.sequence()}; - _perf_log.log(trace,h.last,"md",handle.key()); + trace.md_src = utils::TimeStamp::now(); + trace.md_sn = trace.md_src.to_uint64(); + trace.md = h.last; + + tracepoint(bts_trace, trace_order, "MDSource", 0, trace.md_sn, 0); publish(_book_update, book, trace); } } @@ -102,7 +107,6 @@ class MDSource : public mercury::Actor, public mercury::IPollableActor { std::vector _handles; md::MDConsumer _md_consumer; mercury::Stream _book_update; - trace::PerfLog &_perf_log; metrics::MetricsContainer &_stats; std::shared_ptr> _loop_timer; }; diff --git a/src/lib/orderman/actors/MDSupplementarySource.cpp b/src/lib/orderman/actors/MDSupplementarySource.cpp index ae41824b1..a9630b987 100644 --- a/src/lib/orderman/actors/MDSupplementarySource.cpp +++ b/src/lib/orderman/actors/MDSupplementarySource.cpp @@ -1,9 +1,10 @@ #include "MDSupplementarySource.h" -#include "lib/logging/logging.h" -#include "lib/md/MDConsumer.h" -#include "lib/md/MDConsumerHandle.h" #include "lib/orderman/events/SettlementRequestEvent.h" #include "lib/orderman/events/SettlementUpdateEvent.h" +#include "lib/logging/logging.h" +#include "lib/md/MDConsumerHandle.h" +#include "lib/md/MDConsumer.h" +#include "lib/md/MDConsumer.h" #include "lib/os/os.h" namespace bts { @@ -14,36 +15,45 @@ struct HandleRecord { md::IntPrice settlement_price; }; -struct MDSupplementarySource::PImpl { - PImpl(md::MDConsumer &md_consumer) - : md_consumer(md_consumer), handle_map(), settlement_update() {} +struct MDSupplementarySource::PImpl +{ + PImpl(md::MDConsumer& md_consumer) + : + md_consumer(md_consumer), + handle_map(), + settlement_update(){ + } md::MDConsumer md_consumer; // list of sec subscriptions vs their handles std::map handle_map; mercury::Stream settlement_update; }; -MDSupplementarySource::MDSupplementarySource(md::MDConsumer &md_consumer) - : me(new PImpl(md_consumer)) {} +MDSupplementarySource::MDSupplementarySource(md::MDConsumer& md_consumer) +: +me(new PImpl(md_consumer)){ +} -MDSupplementarySource::~MDSupplementarySource() {} +MDSupplementarySource::~MDSupplementarySource(){ +} -void MDSupplementarySource::init() { - me->settlement_update = make_stream(); +void MDSupplementarySource::init(){ + me->settlement_update=make_stream(); subscribe([this](auto const &update) { if (update.events) { for (auto const &ev : *update.events) { auto k = ev.security_key.value(); auto it = me->handle_map.find(k); - if (it == me->handle_map.end()) { + if(it ==me->handle_map.end()){ LOG(OrderMan, Info, "MDSupplementarySource::init key:{}", k); - me->handle_map[k] = {me->md_consumer.get_handle(k), md::INT_NAN}; - } else { + me->handle_map[k]={me->md_consumer.get_handle(k),md::INT_NAN}; + } + else { // late joiners auto const &hr = it->second; if (!hr.settlement_price.is_nan()) { - SettlementUpdateEvent ev(hr.settlement_price, SecurityKey(k)); - publish(me->settlement_update, ev); + SettlementUpdateEvent ev(hr.settlement_price,SecurityKey(k)); + publish(me->settlement_update,ev); } } } @@ -51,22 +61,21 @@ void MDSupplementarySource::init() { }); } -void MDSupplementarySource::on_poll() { - for (auto &kvp : me->handle_map) { - SecurityKey key(kvp.first); - HandleRecord &hr = kvp.second; +void MDSupplementarySource::on_poll(){ + for(auto& kvp : me->handle_map){ + SecurityKey key(kvp.first); + HandleRecord& hr=kvp.second; auto settlement_price = hr.handle.settlement_price(); - if (!settlement_price.is_nan() && - settlement_price != hr.settlement_price) { + if(!settlement_price.is_nan() && + settlement_price!=hr.settlement_price){ LOG(OrderMan, Info, - "MDSupplementarySource::on_poll new settle key:{} price:{}", key, - hr.settlement_price.price()); - hr.settlement_price = settlement_price; - SettlementUpdateEvent ev(settlement_price, key); - publish(me->settlement_update, ev); + "MDSupplementarySource::on_poll new settle key:{} price:{}", + key, hr.settlement_price.price()); + hr.settlement_price=settlement_price; + SettlementUpdateEvent ev(settlement_price,key); + publish(me->settlement_update,ev); } } } -} // namespace orderman -} // namespace bts +}} diff --git a/src/lib/orderman/actors/SODPosition.cpp b/src/lib/orderman/actors/SODPosition.cpp index ee9515be7..e5a09e0ca 100644 --- a/src/lib/orderman/actors/SODPosition.cpp +++ b/src/lib/orderman/actors/SODPosition.cpp @@ -1,134 +1,134 @@ #include "lib/orderman/actors/SODPosition.h" -#include "lib/config/config.h" -#include "lib/config/protos/orders_fills_cleanup.pb.h" -#include "lib/config/protos/toggles.pb.h" #include "lib/logging/logging.h" -#include "lib/utils/PBUtils.h" #include "lib/utils/bts_assert.h" -#include +#include "lib/config/protos/toggles.pb.h" +#include "lib/config/protos/orders_fills_cleanup.pb.h" +#include "lib/config/config.h" +#include "lib/utils/PBUtils.h" #include +#include -namespace bts { -namespace orderman { +namespace bts{ +namespace orderman{ SODPosition::SODPosition() - : _enabled(config::get().enabled()), - _sod_time(_get_fills_sod_time()) { - LOG(persist, Info, "SODPosition enabled:{} sec:{}", _enabled, - _sod_time.tv_sec); +: +_enabled (config::get().enabled()), +_sod_time(_get_fills_sod_time()){ + LOG(persist, Info, "SODPosition enabled:{} sec:{}", + _enabled, _sod_time.tv_sec); } // returns the timeval for today's hh,mm,ss // timeval is the microsecons from epoch) -timeval SODPosition::_to_timeval(uint16_t hh, uint16_t mm, uint16_t ss) { - bts_assert(hh < 24); - bts_assert(mm < 60); - bts_assert(ss < 60); +timeval SODPosition::_to_timeval(uint16_t hh, uint16_t mm, uint16_t ss){ + bts_assert(hh<24); + bts_assert(mm<60); + bts_assert(ss<60); time_t secs; - time(&secs); // seconds since epoch (utc) - struct tm *ptm = gmtime(&secs); - ptm->tm_hour = hh; - ptm->tm_min = mm; - ptm->tm_sec = ss; - ptm->tm_isdst = -1; - secs = mktime(ptm); + time (&secs); // seconds since epoch (utc) + struct tm* ptm = gmtime (&secs); + ptm->tm_hour=hh; + ptm->tm_min=mm; + ptm->tm_sec=ss; + ptm->tm_isdst=-1; + secs=mktime(ptm); timeval rv; - rv.tv_sec = secs; - rv.tv_usec = 0; + rv.tv_sec=secs; + rv.tv_usec=0; return rv; } -timeval SODPosition::_subtract_days(const timeval &tv, uint32_t n_days) { - uint32_t secs_in_day = 86400 * n_days; - timeval rv = tv; - rv.tv_sec = (rv.tv_sec > secs_in_day) ? rv.tv_sec - secs_in_day : 0; +timeval SODPosition::_subtract_days(const timeval& tv, uint32_t n_days){ + uint32_t secs_in_day=86400*n_days; + timeval rv=tv; + rv.tv_sec=(rv.tv_sec > secs_in_day) ? rv.tv_sec-secs_in_day : 0; return rv; } -timeval SODPosition::_get_fills_sod_time() { - const auto &sod_time = config::get(); - timeval sod = _to_timeval(sod_time.sod_hh(), sod_time.sod_mm(), 0); +timeval SODPosition::_get_fills_sod_time(){ + const auto& sod_time = config::get(); + timeval sod=_to_timeval(sod_time.sod_hh(),sod_time.sod_mm(),0); timeval now; gettimeofday(&now, NULL); // if the server started before the sod for today // we go back to yesterday - if (sod.tv_sec >= now.tv_sec) - sod = _subtract_days(sod); + if(sod.tv_sec >= now.tv_sec) + sod=_subtract_days(sod); return sod; } -timeval SODPosition::get_orders_start_time() { - const auto &sod_time = config::get(); - timeval sod = _to_timeval(sod_time.sod_hh(), sod_time.sod_mm(), 0); - const auto &orders_cleanup = config::get(); +timeval SODPosition::get_orders_start_time(){ + const auto& sod_time = config::get(); + timeval sod=_to_timeval(sod_time.sod_hh(),sod_time.sod_mm(),0); + const auto& orders_cleanup = config::get(); timeval now; gettimeofday(&now, NULL); // if the server started before the sod for today // we go back to yesterday - if (sod.tv_sec >= now.tv_sec) - sod = _subtract_days(sod); - sod = _subtract_days(sod, orders_cleanup.extra_days()); + if(sod.tv_sec >= now.tv_sec) + sod=_subtract_days(sod); + sod=_subtract_days(sod,orders_cleanup.extra_days()); return sod; } timeval SODPosition::get_order_cutoff_time( - const std::map &order_map) { - // returns true is t1 >= t2 - auto compare_ts = [&](google::protobuf::Timestamp t1, - google::protobuf::Timestamp t2) -> bool { + const std::map& order_map){ + //returns true is t1 >= t2 + auto compare_ts = [&](google::protobuf::Timestamp t1, google::protobuf::Timestamp t2) -> bool + { if (t1.seconds() > t2.seconds()) return true; else if (t1.seconds() < t2.seconds()) return false; else return t1.nanos() >= t2.nanos(); - }; + }; google::protobuf::Timestamp max_ts; max_ts.set_seconds(0); max_ts.set_nanos(0); - for (auto const &kvp : order_map) { + for (auto const &kvp : order_map){ OrderRecord trec; - if (utils::pb::from_string(kvp.second, - &trec)) { - const auto &ts = trec.state().created(); - if (compare_ts(ts, max_ts)) + if (utils::pb::from_string(kvp.second, &trec)){ + const auto& ts = trec.state().created(); + if(compare_ts(ts,max_ts)) (&max_ts)->CopyFrom(ts); - } else + } + else LOG(OrderMan, Error, "Could not recover order {} from storage. " "This should be investigated", kvp.first); } timeval rv; - rv.tv_sec = max_ts.seconds(); - rv.tv_usec = static_cast(max_ts.nanos()) / 1000; - const auto &orders_cleanup = config::get(); - return _subtract_days(rv, orders_cleanup.extra_days()); + rv.tv_sec=max_ts.seconds(); + rv.tv_usec=static_cast(max_ts.nanos())/1000; + const auto& orders_cleanup = config::get(); + return _subtract_days(rv,orders_cleanup.extra_days()); } -std::string SODPosition::_sod_fill_id(const Fill &fill, api::Side side) { - // sod:acct:long/short:sec +std::string SODPosition::_sod_fill_id(const Fill& fill,api::Side side){ + //sod:acct:long/short:sec std::ostringstream oss; - oss << "sod:" << fill.account() - << (side == api::Side::SIDE_BUY ? ":L:" : ":S:") << fill.security_key(); - return oss.str(); + oss << "sod:" << fill.account() << (side==api::Side::SIDE_BUY ? ":L:" : ":S:") + << fill.security_key(); + return oss.str(); } -void SODPosition::_merge_pos(Fill &pos, const Fill &fill) { - bts_assert(pos.security_key() == fill.security_key()); - bts_assert(pos.account() == fill.account()); - bts_assert(pos.side() == fill.side()); - double total_qty = pos.last_shares() + fill.last_shares(); - double avg_price = (pos.avg_price() * pos.last_shares() + - fill.last_price() * fill.last_shares()) / - total_qty; +void SODPosition::_merge_pos(Fill& pos, const Fill& fill){ + bts_assert(pos.security_key()==fill.security_key()); + bts_assert(pos.account()==fill.account()); + bts_assert(pos.side()==fill.side()); + double total_qty=pos.last_shares()+fill.last_shares(); + double avg_price=(pos.avg_price()*pos.last_shares()+ + fill.last_price()*fill.last_shares())/total_qty; pos.set_avg_price(avg_price); pos.set_last_price(avg_price); pos.set_last_shares(total_qty); } -void SODPosition::_zero_pos(Fill &pos, const Fill &fill, api::Side side) { +void SODPosition::_zero_pos(Fill& pos, const Fill& fill, api::Side side){ pos.set_security_key(fill.security_key()); pos.set_account(fill.account()); pos.set_side(side); @@ -136,61 +136,60 @@ void SODPosition::_zero_pos(Fill &pos, const Fill &fill, api::Side side) { pos.mutable_timestamp()->set_nanos(0); pos.set_fill_kind(Fill::FILL_KIND_SOD); pos.set_order_key(0); - pos.set_fill_key(_sod_fill_id(fill, side)); + pos.set_fill_key(_sod_fill_id(fill,side)); pos.set_last_shares(0); } -bool SODPosition::add_fill_to_sod_pos(const Fill &fill) { - if (_enabled && fill.timestamp().seconds() < _sod_time.tv_sec) { - uint32_t seckey = fill.security_key(); - const std::string &acct = fill.account(); - auto acct_it = _sod_map.find(acct); - if (acct_it == _sod_map.end()) - _sod_map[acct] = SecPosMap(); - acct_it = _sod_map.find(fill.account()); - bts_assert(acct_it != _sod_map.end()); - SecPosMap &sec_map = acct_it->second; - auto sec_it = sec_map.find(seckey); - if (sec_it == sec_map.end()) { +bool SODPosition::add_fill_to_sod_pos(const Fill& fill){ + if (_enabled && fill.timestamp().seconds() < _sod_time.tv_sec){ + uint32_t seckey=fill.security_key(); + const std::string& acct=fill.account(); + auto acct_it=_sod_map.find(acct); + if(acct_it==_sod_map.end()) + _sod_map[acct]=SecPosMap(); + acct_it=_sod_map.find(fill.account()); + bts_assert(acct_it!=_sod_map.end()); + SecPosMap& sec_map=acct_it->second; + auto sec_it=sec_map.find(seckey); + if(sec_it==sec_map.end()){ Fill long_pos, short_pos; - _zero_pos(long_pos, fill, api::Side::SIDE_BUY); - _zero_pos(short_pos, fill, api::Side::SIDE_SELL); - sec_map[seckey] = std::pair(long_pos, short_pos); + _zero_pos(long_pos,fill,api::Side::SIDE_BUY); + _zero_pos(short_pos,fill,api::Side::SIDE_SELL); + sec_map[seckey]=std::pair(long_pos,short_pos); } - sec_it = sec_map.find(seckey); - bts_assert(sec_it != sec_map.end()); - std::pair &pos = sec_it->second; - if (fill.side() == api::Side::SIDE_BUY) - _merge_pos(pos.first, fill); + sec_it=sec_map.find(seckey); + bts_assert(sec_it!=sec_map.end()); + std::pair& pos=sec_it->second; + if(fill.side()==api::Side::SIDE_BUY) + _merge_pos(pos.first,fill); else - _merge_pos(pos.second, fill); + _merge_pos(pos.second,fill); return true; - } else + } + else return false; } -void SODPosition::add_sod_pos_as_fill_events( - std::vector &fe, - std::map sec_map) { - if (_enabled) - for (auto &acct_p : _sod_map) { - for (auto &sec_p : acct_p.second) { - Fill &long_pos = sec_p.second.first; - Fill &short_pos = sec_p.second.second; - bts_assert(long_pos.security_key() == short_pos.security_key()); - auto sec_it = sec_map.find(SecurityKey(long_pos.security_key())); - if (sec_it == sec_map.end()) +void SODPosition::add_sod_pos_as_fill_events(std::vector& fe, + std::map sec_map){ + if(_enabled) + for (auto& acct_p : _sod_map){ + for(auto& sec_p : acct_p.second){ + Fill& long_pos=sec_p.second.first; + Fill& short_pos=sec_p.second.second; + bts_assert(long_pos.security_key()==short_pos.security_key()); + auto sec_it=sec_map.find(SecurityKey(long_pos.security_key())); + if(sec_it==sec_map.end()) LOG(persist, Error, - "Could not recover fill for key:{} from storage. " - "This should be investigated", - long_pos.security_key()); - else { - fe.emplace_back(long_pos, *sec_it->second); - fe.emplace_back(short_pos, *sec_it->second); + "Could not recover fill for key:{} from storage. " + "This should be investigated", + long_pos.security_key()); + else{ + fe.emplace_back(long_pos,*sec_it->second); + fe.emplace_back(short_pos,*sec_it->second); } } - } + } } -} // namespace orderman -} // namespace bts +}} diff --git a/src/lib/orderman/actors/SecuritySrc.cpp b/src/lib/orderman/actors/SecuritySrc.cpp index 8067ef85f..854ea8eba 100644 --- a/src/lib/orderman/actors/SecuritySrc.cpp +++ b/src/lib/orderman/actors/SecuritySrc.cpp @@ -1,8 +1,8 @@ #include "SecuritySrc.h" #include "lib/md/MDConsumer.h" +#include "lib/utils/bts_chrono.h" #include "lib/mercury/events/TimerEvent.h" #include "lib/orderman/events/NewSecuritiesEvent.h" -#include "lib/utils/bts_chrono.h" #include @@ -10,7 +10,7 @@ namespace bts { namespace orderman { struct SecuritySrc::PImpl { - PImpl(md::MDConsumer &md) : last_scan(Timer::now()), md_consumer(md) {} + PImpl(md::MDConsumer& md) : last_scan(Timer::now()),md_consumer(md) {} TimeStamp last_scan; mercury::Stream new_securities_stream; std::vector to_publish; @@ -18,19 +18,18 @@ struct SecuritySrc::PImpl { std::vector> securities_keep_alive; }; -SecuritySrc::SecuritySrc(md::MDConsumer &md) : me(new PImpl(md)) {} +SecuritySrc::SecuritySrc(md::MDConsumer& md) : me(new PImpl(md)) {} SecuritySrc::~SecuritySrc() {} void SecuritySrc::init() { me->new_securities_stream = make_stream(); - me->md_consumer.on_security( - [this](api::Security const &s, md::MDConsumerHandle) { - auto sec = std::make_unique(s); - auto sec_ptr = sec.get(); - me->securities_keep_alive.push_back(std::move(sec)); - me->to_publish.push_back(sec_ptr); - }); - + me->md_consumer.on_security([this](api::Security const &s, md::MDConsumerHandle) { + auto sec = std::make_unique (s); + auto sec_ptr = sec.get(); + me->securities_keep_alive.push_back(std::move(sec)); + me->to_publish.push_back(sec_ptr); + }); + subscribe([this](auto) { this->on_scan_securities(); }); } @@ -48,5 +47,5 @@ void SecuritySrc::on_scan_securities() { } } } -} // namespace orderman -} // namespace bts +} +} diff --git a/src/lib/orderman/actors/ServiceBridge.cpp b/src/lib/orderman/actors/ServiceBridge.cpp index de8f85dd6..f8d0cd3a7 100644 --- a/src/lib/orderman/actors/ServiceBridge.cpp +++ b/src/lib/orderman/actors/ServiceBridge.cpp @@ -15,7 +15,6 @@ #include "lib/orderman/order_router/OrderRouter.h" #include "lib/orderman/securities/MapSecurityDB.h" #include "lib/utils/PBUtils.h" -#include "lib/tracing/PerfLog.h" #include "lib/api/services/OrderService.pb.h" #include "lib/orderman/orderman_utils/orderman_common.h" @@ -26,9 +25,7 @@ namespace orderman { struct ServiceBridge::PImpl { PImpl(OnReady const &on_ready, OnOrders const &on_orders, - OnFills const &on_fills, - DynamicOrderRegistry const &dyn_order_registry, - mercury::BrokerProxy &service_call_marshaller) + OnFills const &on_fills, DynamicOrderRegistry const &dyn_order_registry, mercury::BrokerProxy &service_call_marshaller) : on_ready(on_ready), on_orders(on_orders), on_fills(on_fills), have_orders(false), have_securities(false), order_manager_ready(false), sec_db(), order_router(), @@ -58,9 +55,8 @@ struct ServiceBridge::PImpl { ServiceBridge::ServiceBridge(OnReady const &on_ready, OnOrders const &on_orders, OnFills const &on_fills, DynamicOrderRegistry const &dyn_order_registry, - mercury::BrokerProxy &service_call_marshaller) - : me(new PImpl(on_ready, on_orders, on_fills, dyn_order_registry, - service_call_marshaller)) {} + mercury::BrokerProxy &service_call_marshaller) + : me(new PImpl(on_ready, on_orders, on_fills, dyn_order_registry, service_call_marshaller)) {} ServiceBridge::~ServiceBridge() {} @@ -151,7 +147,7 @@ ServiceBridge::create_order(api::orderman::Create const &c) { me->order_factory.create(null_order_key(), c.new_order()); me->known_orders.insert(order.key()); publish(me->activate_order_pub, order, Price(c.price()), - Quantity(c.quantity()), trace::CorID()); + Quantity(c.quantity()), PerfTrace()); r.set_order_key(order.key().value()); r.set_error_code(api::orderman::ORDER_ERROR_OK); } else diff --git a/src/lib/orderman/actors/ServiceBridge.h b/src/lib/orderman/actors/ServiceBridge.h index f78f0a6c6..440b6e0fd 100644 --- a/src/lib/orderman/actors/ServiceBridge.h +++ b/src/lib/orderman/actors/ServiceBridge.h @@ -49,9 +49,7 @@ class ServiceBridge : public mercury::Actor { std::function const &)>; ServiceBridge(OnReady const &, OnOrders const &, OnFills const &, - DynamicOrderRegistry const &, - - mercury::BrokerProxy &service_call_marshaller); + DynamicOrderRegistry const &, mercury::BrokerProxy &service_call_marshaller); void init() override; ~ServiceBridge(); diff --git a/src/lib/orderman/actors/order_manager/ChildOrder.h b/src/lib/orderman/actors/order_manager/ChildOrder.h index ed506a3d2..6a985aa4f 100644 --- a/src/lib/orderman/actors/order_manager/ChildOrder.h +++ b/src/lib/orderman/actors/order_manager/ChildOrder.h @@ -1,78 +1,96 @@ #pragma once -#include "lib/orderman/actors/order_manager/OrderServices.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/utils/bts_assert.h" #include +#include "lib/orderman/orderman_utils/orderman_common.h" +#include "lib/orderman/actors/order_manager/OrderServices.h" +#include "lib/utils/bts_assert.h" namespace bts { namespace orderman { -class ChildOrder { - public: - ChildOrder() - : _order(nullptr), _parent_order_services(nullptr), _active(false) {} +class ChildOrder{ +public: + ChildOrder () + : _order(nullptr), + _order_services(nullptr), + _active(false) + {} - ChildOrder(Order &o, OrderServices &services) - : _order(&o), _parent_order_services(&services), - _child_order_services(nullptr), _active(false) {} + ChildOrder (Order &o, OrderServices &services) + : _order(&o) , + _order_services(&services), + _active(false) + {} - ChildOrder(ChildOrder &&src) { operator=(std::move(src)); } + ChildOrder (ChildOrder &&src) + { + operator=(std::move(src)); + } - ChildOrder &operator=(ChildOrder &&src) { + ChildOrder& operator=(ChildOrder &&src) + { _order = src._order; - _parent_order_services = src._parent_order_services; - _child_order_services = src._child_order_services; + _order_services = src._order_services; _active = src._active; - + src._order = nullptr; - src._parent_order_services = nullptr; - src._child_order_services = nullptr; + src._order_services = nullptr; src._active = false; return *this; } - OrderKey key() const { - bts_assert_d(_order); + OrderKey key() const + { + bts_assert(_order); return _order->key(); } - bool is_active() const { return _active; } - - void activate(Price p, Quantity q, trace::CorID const &trace = trace::CorID()) { + bool is_active() const {return _active;} + + void activate(Price p, Quantity q, PerfTrace const &trace = PerfTrace()) + { bts_assert(_order); bts_assert(!_active); - _child_order_services = - &_parent_order_services->activate_child(*_order, p, q, trace); + _order_services->send_activate(*_order,p,q, trace); _active = true; } - void update(Price p, Quantity q, trace::CorID const &trace = trace::CorID()) { + void update(Price p, Quantity q) + { + PerfTrace trace; + update(p,q,trace); + } + + void update(Price p, Quantity q, PerfTrace &trace) + { bts_assert(_order); bts_assert(_active); - _child_order_services->update(p, q, trace); + _order_services->send_update(_order->key(),p,q,trace); } - void crack(trace::CorID const &trace = trace::CorID()) { + void crack(PerfTrace const &trace = PerfTrace()) + { bts_assert(_order); bts_assert(_active); - _child_order_services->crack(trace); + _order_services->send_crack(_order->key(),trace); } - void cancel(trace::CorID const &trace = trace::CorID()) { + void cancel(PerfTrace const &trace = PerfTrace()) + { bts_assert(_order); bts_assert(_active); - _child_order_services->cancel(trace); + _order_services->send_cancel(_order->key(),trace); } - - private: + +private: friend class OrderBuilder; - Order *_order; - OrderServices *_parent_order_services; - OrderServices *_child_order_services; + Order* _order; + OrderServices *_order_services; bool _active; }; -} // namespace orderman -} // namespace bts + +}} + + diff --git a/src/lib/orderman/actors/order_manager/OrderBuilder.cpp b/src/lib/orderman/actors/order_manager/OrderBuilder.cpp index 1c2783534..1a19a6c56 100644 --- a/src/lib/orderman/actors/order_manager/OrderBuilder.cpp +++ b/src/lib/orderman/actors/order_manager/OrderBuilder.cpp @@ -4,5 +4,5 @@ namespace bts { namespace orderman { std::atomic OrderBuilder::_current_builder_id(0); -} -} // namespace bts + +}} diff --git a/src/lib/orderman/actors/order_manager/OrderBuilder.h b/src/lib/orderman/actors/order_manager/OrderBuilder.h index 1a446d59e..fcc43c062 100644 --- a/src/lib/orderman/actors/order_manager/OrderBuilder.h +++ b/src/lib/orderman/actors/order_manager/OrderBuilder.h @@ -1,85 +1,93 @@ #pragma once +#include +#include +#include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/api/services/OrderService.pb.h" +#include "lib/orderman/orders/PreActivationOrderServices.h" +#include "lib/orderman/actors/order_manager/OrderServices.h" #include "lib/logging/logging.h" #include "lib/orderman/actors/order_manager/ChildOrder.h" -#include "lib/orderman/actors/order_manager/OrderServices.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/orderman/orders/PreActivationOrderServices.h" -#include -#include namespace bts { namespace orderman { -class OrderBuilder { - public: +class OrderBuilder +{ +public: OrderBuilder() - : _parent_key(null_order_key()), _definition(), _reserve_sz(0), - _order_stash(), _builder_id(), _order_services(nullptr) {} + : _parent_key(null_order_key()), + _definition(), + _reserve_sz(0), + _order_stash(), + _builder_id(), + _order_services(nullptr) + {} - OrderBuilder(OrderBuilder &&src) { operator=(std::move(src)); } - - OrderBuilder(OrderKey parent_key, api::orderman::OrderDefinition const &def, - PreActivationOrderServices const &srv, size_t reserve_sz = 1) - : _parent_key(parent_key), _definition(def), _reserve_sz(reserve_sz), - _order_stash(), _builder_id(++_current_builder_id), - _order_services(nullptr) + OrderBuilder(OrderBuilder&&src) {operator=(std::move(src));} + OrderBuilder(OrderKey parent_key, + api::orderman::OrderDefinition const&def, + PreActivationOrderServices const &srv, + size_t reserve_sz = 1) + : _parent_key(parent_key), + _definition(def) , + _reserve_sz(reserve_sz), + _order_stash(), + _builder_id(++_current_builder_id), + _order_services(nullptr) + { bts_assert(parent_key != null_order_key()); while (_order_stash.size() != reserve_sz) - _order_stash.push_back( - &srv.order_factory.create(parent_key, _definition)); + _order_stash.push_back(&srv.order_factory.create(parent_key,_definition)); } - void activate(OrderServices &order_services) { + void activate(OrderServices &order_services) + { bts_assert(!_order_services); _order_services = &order_services; - _order_services->subscribe_to_order_creation_reply( - _builder_id, [this](auto const &order_ev) { - _order_stash.insert(_order_stash.end(), order_ev.orders.begin(), - order_ev.orders.end()); - }); + _order_services->order_creations.sub(_builder_id,[this] (auto const&order_ev) { + _order_stash.insert(_order_stash.end(),order_ev.orders.begin(),order_ev.orders.end()); + }); } - - ChildOrder build() { - bts_assert_msg( - _order_services, - "OrderBuilder::activate() must be called before orders can be built"); + + ChildOrder build() + { + bts_assert_msg(_order_services,"OrderBuilder::activate() must be called before orders can be built"); ChildOrder result; if (_order_stash.size()) { - result = ChildOrder(*_order_stash.back(), *_order_services); + result = ChildOrder( *_order_stash.back(), + *_order_services); _order_stash.pop_back(); - } else { - LOG(OrderMan, Warn, - "Ran out of pre-allocated child orders for order {}. Will " - "allocate directly. " - "This will have an impact on performance", - _parent_key); - result = ChildOrder( - _order_services->order_factory().create(_parent_key, _definition), - *_order_services); + } + else { + LOG(OrderMan,Warn, + "Ran out of pre-allocated child orders for order {}. Will allocate directly. " + "This will have an impact on performance", _parent_key); + result = ChildOrder (_order_services->order_factory().create(_parent_key,_definition), + *_order_services); } if (_reserve_sz > _order_stash.size()) { auto need = _reserve_sz - _order_stash.size(); - _order_services->send_order_create_req(_builder_id, _parent_key, - _definition, need); + _order_services->send_order_create_req(_builder_id,_parent_key,_definition,need); } return result; } - - OrderBuilder &operator=(OrderBuilder &&src) { + + OrderBuilder& operator=(OrderBuilder &&src) + { move_here(src); return *this; } - private: - void move_here(OrderBuilder &src) { +private: + void move_here(OrderBuilder &src) + { bts_assert(!_order_services); _parent_key = src._parent_key; - _definition = src._definition; + _definition= src._definition; _reserve_sz = src._reserve_sz; _order_stash = src._order_stash; _builder_id = src._builder_id; @@ -88,16 +96,15 @@ class OrderBuilder { src._order_services = nullptr; bts_assert(_parent_key != null_order_key()); } - + OrderKey _parent_key; api::orderman::OrderDefinition _definition; size_t _reserve_sz; - std::vector _order_stash; - size_t _builder_id; + std::vector _order_stash; + size_t _builder_id ; OrderServices *_order_services; - + static std::atomic _current_builder_id; }; -} // namespace orderman -} // namespace bts +}} diff --git a/src/lib/orderman/actors/order_manager/OrderManager.cpp b/src/lib/orderman/actors/order_manager/OrderManager.cpp index d65304712..fe06f382d 100644 --- a/src/lib/orderman/actors/order_manager/OrderManager.cpp +++ b/src/lib/orderman/actors/order_manager/OrderManager.cpp @@ -14,8 +14,8 @@ #include "lib/utils/inplace_function.h" #include -#include #include +#include namespace bts { namespace orderman { @@ -30,20 +30,37 @@ enum class OrderManager::State { READY }; +struct OrderManager::OrderInfo { + OrderInfo(Order &o, OrderServicesData &data) + : order(&o), order_services(std::make_unique(o, data)) {} + + OrderInfo() = default; + OrderInfo(OrderInfo &&src) = default; + OrderInfo &operator=(OrderInfo &&src) = default; + + Order *order; + std::unique_ptr order_services; +}; + struct OrderManager::PImpl { - PImpl(OrderManager &owner, DynamicOrderRegistry const &b, trace::PerfLog &l) - : state(State::WAIT_ADMIN), services_data(owner, b, l) {} + PImpl(OrderManager &owner, DynamicOrderRegistry const &b) + : state(State::WAIT_ADMIN), services_data(owner, b) { + pending_order_events.reserve(1000); + } State state; - std::unordered_map orders; + std::unordered_map orders; + + std::vector pending_order_events; + mercury::Actor::SubHandle stored_order_sub; mercury::Actor::SubHandle stored_fills_sub; OrderServicesData services_data; mercury::Stream pub_ready; }; -OrderManager::OrderManager(DynamicOrderRegistry const &b, trace::PerfLog &l) - : me(new PImpl(*this, b, l)) {} +OrderManager::OrderManager(DynamicOrderRegistry const &b) + : me(new PImpl(*this, b)) {} OrderManager::~OrderManager() {} void OrderManager::init() { @@ -73,11 +90,6 @@ void OrderManager::on_admin_data(const mercury::Update &m) { void OrderManager::on_securities( const mercury::Update &update) { - - // forward to execution gateways - for (auto &osd : me->services_data.sessions) - osd->gw.on_securities(update); - if (update.events) { // update our security db and accumulate for the sake of the limiter @@ -113,10 +125,8 @@ void OrderManager::on_fill_recovery( me->state = State::WAIT_ORDERS; for (auto const &ev : *(update.events)) { - auto trimmed_account_name = - boost::algorithm::trim_copy(ev.fill.account()); - me->services_data.limiter.add(*ev.security, trimmed_account_name, - ev.fill.side(), + auto trimmed_account_name = boost::algorithm::trim_copy(ev.fill.account()); + me->services_data.limiter.add(*ev.security, trimmed_account_name,ev.fill.side(), Quantity(ev.fill.last_shares())); } @@ -148,14 +158,13 @@ void OrderManager::on_order_recovery( for (auto const &ev : *(update.events)) { auto &order = me->services_data.order_factory.recover(ev.order_record); - order.init_order_services(me->services_data); - - auto r = me->orders.emplace(order.key(), &order); - bts_assert(r.second); auto const &ostate = ev.order_record.state(); + OrderInfo oi{order, me->services_data}; + auto serv_ptr = oi.order_services.get(); + me->orders[order.key()] = std::move(oi); order.on_activate(Price(ostate.price()), - Quantity(ostate.quantity()), *order._services, - trace::CorID()); + Quantity(ostate.quantity()), *serv_ptr, + PerfTrace()); } // signal that we are ready @@ -185,73 +194,91 @@ void OrderManager::on_execution_report( auto order = &me->services_data.order_factory.recreate_from_exe_report( *report.data); - order->init_order_services(me->services_data); - auto r = me->orders.emplace(order->key(), order); - bts_assert(r.second); + OrderInfo oi{*order, me->services_data}; + auto serv_ptr = oi.order_services.get(); + me->orders[order->key()] = std::move(oi); order->on_activate(report.data->price, report.data->quantity, - *order->_services, trace::CorID()); + *serv_ptr, PerfTrace()); } } } +void OrderManager::queue_order_event(PendingOrderEvent const &event_handler) { + me->pending_order_events.push_back(event_handler); +} + void OrderManager::on_activate_order( const mercury::Update &m) { if (m.events) - for (auto const &ev : *m.events) { - auto order = ev.order; - order->init_order_services(me->services_data); - auto r = me->orders.emplace(order->key(), order); - bts_assert(r.second); - order->on_activate(ev.price, ev.quantity, *order->_services, ev.trace); - } + for (auto const &ev : *m.events) + queue_order_event(ev); +} + +void OrderManager::handle_order_event(ActivateOrderEvent const &ev) { + auto order = ev.order; + auto k = order->key(); + bts_assert(me->orders.find(k) == me->orders.end()); + OrderInfo oi{*order, me->services_data}; + auto serv_ptr = oi.order_services.get(); + me->orders[k] = std::move(oi); + order->on_activate(ev.price, ev.quantity, *serv_ptr, ev.trace); } void OrderManager::on_update_order(const mercury::Update &m) { if (m.events) - for (auto const &ev : *m.events) { - auto k = ev.key(); - auto it = me->orders.find(k); - if (it != me->orders.end()) - it->second->on_update(ev.price, ev.quantity, ev.trace); - else { - LOG(OrderMan, Error, - "Received an update request for an unknown order {}. " - "This should not happen and likely indicates a serious bug. ", - ev.key().value()); - } - } + for (auto const &ev : *m.events) + queue_order_event(ev); +} + +void OrderManager::handle_order_event(UpdateOrderEvent const &ev) { + auto k = ev.key(); + auto it = me->orders.find(k); + if (it != me->orders.end()) + it->second.order->on_update(ev.price, ev.quantity, ev.trace); + else { + LOG(OrderMan, Error, + "Received an update request for an unknown order {}. " + "This should not happen and likely indicates a serious bug. ", + ev.key().value()); + } } void OrderManager::on_cancel_order(const mercury::Update &m) { if (m.events) - for (auto const &ev : *m.events) { - auto k = ev.key(); - auto it = me->orders.find(k); - if (it != me->orders.end()) - it->second->on_cancel(ev.trace); - else { - LOG(OrderMan, Error, - "Received a cancel request for an unknown order {}. " - "This should not happen and likely indicates a serious bug. ", - ev.key().value()); - } - } + for (auto const &ev : *m.events) + queue_order_event(ev); +} + +void OrderManager::handle_order_event(CancelOrderEvent const &ev) { + auto k = ev.key(); + auto it = me->orders.find(k); + if (it != me->orders.end()) + it->second.order->on_cancel(ev.trace); + else { + LOG(OrderMan, Error, + "Received a cancel request for an unknown order {}. " + "This should not happen and likely indicates a serious bug. ", + ev.key().value()); + } } void OrderManager::on_crack_order(const mercury::Update &m) { if (m.events) - for (auto const &ev : *m.events) { - auto k = ev.key(); - auto it = me->orders.find(k); - if (it != me->orders.end()) - it->second->on_crack(ev.trace); - else { - LOG(OrderMan, Error, - "Received a crack request for an unknown order {}. " - "This should not happen and likely indicates a serious bug. ", - ev.key().value()); - } - } + for (auto const &ev : *m.events) + queue_order_event(ev); +} + +void OrderManager::handle_order_event(CrackOrderEvent const &ev) { + auto k = ev.key(); + auto it = me->orders.find(k); + if (it != me->orders.end()) + it->second.order->on_crack(ev.trace); + else { + LOG(OrderMan, Error, + "Received a crack request for an unknown order {}. " + "This should not happen and likely indicates a serious bug. ", + ev.key().value()); + } } void OrderManager::on_gateway_state( @@ -263,16 +290,6 @@ void OrderManager::on_gateway_state( } } -OrderServices &OrderManager::activate_child(OrderServices &parent, Order &order, - Price p, Quantity q, - trace::CorID const &trace) { - order.init_order_services(me->services_data, parent); - auto r = me->orders.emplace(order.key(), &order); - bts_assert(r.second); - order.on_activate(p, q, *order._services, trace); - return *order._services; -} - void OrderManager::on_new_fix_buffer( const mercury::Update &m) { if (m.events) @@ -353,24 +370,8 @@ void OrderManager::init_order_services() { s->gateway_status_subs = std::make_unique< ContentSubscription>(*this, gw_name); - // publishers for execution reports, gateway status and cancel - // reject evets - auto s_ptr = s.get(); - s->exe_report_pub = make_stream(gw_name); - s->gw.on_exe_report() = [s_ptr,this] (auto const &er, auto const &t) { - publish(s_ptr->exe_report_pub, &er,t); - }; - s->gw_status_change_pub = make_stream(gw_name); - s->gw.on_gw_status_change() = [s_ptr,this,gw_name] (bool b) { - publish(s_ptr->gw_status_change_pub, gw_name,b); - }; - s->cancel_reject_pub = make_stream(gw_name); - s->gw.on_cancel_reject() = [s_ptr,this] (auto const &k,auto const&msg) { - publish(s_ptr->cancel_reject_pub, k,msg); - }; - // handlers are ready so we can start processing fix events - s->gw.start(); - + // FIX output + s->out_fix_pub = make_stream(gw_name); reload_fix_buffer(*s); } @@ -393,6 +394,11 @@ void OrderManager::init_order_services() { [this](auto const &ev) { this->on_new_fix_buffer(ev); }); // Outputs + me->services_data.activate_order_pub = make_stream(); + me->services_data.update_order_pub = make_stream(); + me->services_data.cancel_order_pub = make_stream(); + me->services_data.crack_order_pub = make_stream(); + me->services_data.create_order_req_pub = make_stream(); me->services_data.create_fix_req_pub = @@ -401,9 +407,12 @@ void OrderManager::init_order_services() { me->services_data.settlement_request_pub = make_stream(); me->services_data.report_order_state_pub = - make_stream(); + make_stream(); me->pub_ready = make_stream(); + me->services_data.child_order_subs = + std::make_unique>( + *this); // md subs are peculiar in that we try to make them on demand, so // we publish an event announcing the subscription std::function on_md_sub = [this](SecurityKey k) { @@ -423,36 +432,35 @@ void OrderManager::init_order_services() { std::make_unique>(*this); } -void OrderManager::after_event() { +void OrderManager::on_poll() { if (me->state == State::READY) { + for (size_t i = 0; i < me->pending_order_events.size(); i++) + me->pending_order_events[i](*this); + me->pending_order_events.clear(); for (auto &osd : me->services_data.sessions) { auto &fix_stream = osd->current_buffer->first_stream(); if (fix_stream.n_msgs()) { fix_stream.close(); - osd->gw.send_fix(osd->current_buffer, osd->current_trace); + publish(osd->out_fix_pub, osd->current_buffer, osd->current_traces); + osd->current_traces.clear(); reload_fix_buffer(*osd); } } } } -void OrderManager::reload_fix_buffer(SessionServicesData &osd) { - if (osd.free_buffers.size()) { - osd.current_buffer = osd.free_buffers.back(); - osd.free_buffers.pop_back(); +void OrderManager::reload_fix_buffer(SessionServicesData &dt) { + if (dt.free_buffers.size()) { + dt.current_buffer = dt.free_buffers.back(); + dt.free_buffers.pop_back(); } else { LOG(OrderMan, Warn, "Ran out of fix buffers in {}. Will allocate directly. " "This will have an impact on performance", - osd.cfg.name()); - osd.current_buffer = std::make_shared(osd.cfg); + dt.cfg.name()); + dt.current_buffer = std::make_shared(dt.cfg); } } -void OrderManager::on_poll() { - for (auto &osd : me->services_data.sessions) - osd->gw.dispatch_incoming_fix_messages(); -} - } // namespace orderman } // namespace bts diff --git a/src/lib/orderman/actors/order_manager/OrderManager.h b/src/lib/orderman/actors/order_manager/OrderManager.h index a8ec11582..3b6d403a9 100644 --- a/src/lib/orderman/actors/order_manager/OrderManager.h +++ b/src/lib/orderman/actors/order_manager/OrderManager.h @@ -4,17 +4,16 @@ #include "lib/jetfix/common/OutFIXPtr.h" #include "lib/mercury/actors/Actor.h" #include "lib/mercury/actors/IPollableActor.h" +#include "lib/utils/inplace_function.h" #include "lib/orderman/events/ActivateOrderEvent.h" +#include "lib/orderman/events/UpdateOrderEvent.h" #include "lib/orderman/events/CancelOrderEvent.h" #include "lib/orderman/events/CrackOrderEvent.h" -#include "lib/orderman/events/UpdateOrderEvent.h" -#include "lib/utils/inplace_function.h" #include // fwd namespace bts { -namespace trace {class PerfLog;} namespace mercury { class TimerEvent; } @@ -27,14 +26,13 @@ class CancelOrderEvent; class CrackOrderEvent; class StoredOrderEvent; class StoredFillEvent; -class OrderServices; class CreateFIXBufferReplyEvent; class GatewayStatusChangeEvent; class NewAdminDataEvent; struct SessionServicesData; class DynamicOrderRegistry; -} // namespace orderman -} // namespace bts +} +} namespace bts { namespace orderman { @@ -51,6 +49,8 @@ namespace orderman { // - security creation events // - timer updates // - order state changes +// - order update/cancel/crack events +// // // Additionally handles order maintenance events: // - create @@ -58,16 +58,16 @@ namespace orderman { // - crack // - update -class OrderManager : public mercury::Actor, public mercury::IPollableActor { +class OrderManager : public mercury::Actor, + public mercury::IPollableActor +{ public: - OrderManager(DynamicOrderRegistry const &dyn_order_builder, trace::PerfLog &); + OrderManager(DynamicOrderRegistry const&dyn_order_builder); ~OrderManager(); void init() override; private: friend class OrderServices; - - // external events void on_securities(const mercury::Update &); void on_fill_recovery(const mercury::Update &); void on_order_recovery(const mercury::Update &); @@ -80,22 +80,34 @@ class OrderManager : public mercury::Actor, public mercury::IPollableActor { void on_gateway_state(const mercury::Update &); void on_timer(const mercury::Update &); void on_admin_data(const mercury::Update &); - void on_poll() override; - // end external events void init_order_services(); + void on_poll() override; + + using PendingOrderEvent = stdext::inplace_function< + void(OrderManager &), + std::max({128ul, sizeof(ActivateOrderEvent), sizeof(UpdateOrderEvent), + sizeof(CancelOrderEvent), sizeof(CrackOrderEvent)})>; + + template + void queue_order_event(EV const&ev) { + queue_order_event(PendingOrderEvent( [ev] (auto &om) { + om.handle_order_event(ev); + })); + } + void queue_order_event(PendingOrderEvent const&ev); + void handle_order_event(ActivateOrderEvent const &); + void handle_order_event(UpdateOrderEvent const &); + void handle_order_event(CancelOrderEvent const &); + void handle_order_event(CrackOrderEvent const&); void reload_fix_buffer(SessionServicesData &dt); - - void after_event() override; - OrderServices &activate_child(OrderServices &parent, Order &, Price, - Quantity, trace::CorID const &); - - std::vector &free_buffers(std::string const &); + + std::vector &free_buffers(std::string const&); enum class State; struct OrderInfo; struct PImpl; std::unique_ptr me; }; -} // namespace orderman -} // namespace bts +} +} diff --git a/src/lib/orderman/actors/order_manager/OrderServices.h b/src/lib/orderman/actors/order_manager/OrderServices.h index d80f5c274..ac5826b57 100644 --- a/src/lib/orderman/actors/order_manager/OrderServices.h +++ b/src/lib/orderman/actors/order_manager/OrderServices.h @@ -8,8 +8,6 @@ #include "lib/orderman/governor/Governor.h" #include "lib/orderman/orderman_utils/EventStream.h" #include "lib/orderman/orders/Order.h" -#include "lib/tracing/PerfLog.h" -#include #include @@ -19,34 +17,11 @@ namespace orderman { class SessionServices { public: - SessionServices(SessionServices &&ss) { operator=(std::move(ss)); } - - SessionServices(SessionServices const &ss) { operator=(ss); } - SessionServices(SessionServicesData &session_data) - : _exe_reports(*session_data.exe_report_subs), - _cancel_rejects(*session_data.cancel_reject_subs), - _gateway_status(*session_data.gateway_status_subs), - _session_data(&session_data), _gateway_status_sub() {} - - SessionServices &operator=(SessionServices &&src) { - _exe_reports = std::move(src._exe_reports); - _cancel_rejects = std::move(src._cancel_rejects); - _gateway_status = std::move(src._gateway_status); - _session_data = src._session_data; - src._session_data = nullptr; - _gateway_status_sub = src._gateway_status_sub; - return *this; - } - - SessionServices &operator=(SessionServices const &src) { - _exe_reports = src._exe_reports; - _cancel_rejects = src._cancel_rejects; - _gateway_status = src._gateway_status; - _session_data = src._session_data; - _gateway_status_sub = src._gateway_status_sub; - return *this; - } + : exe_reports(*session_data.exe_report_subs), + cancel_rejects(*session_data.cancel_reject_subs), + gateway_status(*session_data.gateway_status_subs), + _session_data(&session_data) {} std::string const &session_name() const { return _session_data->session; } @@ -54,222 +29,122 @@ class SessionServices { return _session_data->cfg; } - void queue_fix(jetfix::MessageTypes mt, jetfix::FIXFragment const &f, - trace::CorID const &trace) { + void queue_fix(jetfix::MessageTypes mt, jetfix::FIXFragment const&f,PerfTrace const&trace) { auto &stream = _session_data->current_buffer->first_stream(); stream.new_msg(mt).append(f); - - if (stream.n_msgs() == 1) - _session_data->current_trace = trace; + _session_data->current_traces.push_back(trace); } - + bool is_gateway_connected() const { return _session_data->gw_connected; } Governor &governor() { return _session_data->governor; } - // Subscriptions - using ExeReportSubID = EventStream::SubID; - using CancelRejectSubID = EventStream::SubID; - - template - ExeReportSubID subscribe_to_exe_report(OrderKey k, CB &&cb) { - return _exe_reports.sub(k, std::forward(cb)); - } - void unsubscribe_from_exe_report(ExeReportSubID sid) { - _exe_reports.unsub(sid); - } - - template - CancelRejectSubID subscribe_to_cancel_reject(OrderKey k, CB &&cb) { - return _cancel_rejects.sub(k, std::forward(cb)); - } - void unsubscribe_from_cancel_reject(CancelRejectSubID sid) { - _cancel_rejects.unsub(sid); - } - - template void subscribe_to_gateway_status(CB &&cb) { - _gateway_status_sub = _gateway_status.sub(std::forward(cb)); - } - void unsubscribe_from_gateway_status() { - _gateway_status.unsub(_gateway_status_sub); - } + EventStream exe_reports; + EventStream cancel_rejects; + EventStream gateway_status; private: - EventStream _exe_reports; - EventStream _cancel_rejects; - EventStream _gateway_status; SessionServicesData *_session_data; - EventStream::SubID - _gateway_status_sub; }; class OrderServices { public: - OrderServices(Order &owner) - : _busy(false), _pending_calls(), _owner(&owner), _data(), - _parent(nullptr), _child_update_cb([](auto const &) {}), - _book_updates(), _settlement_updates(), _time_change(), _sessions(), - _create_order_reply() {} - - void init(OrderServicesData &data, OrderServices &parent) { - _parent = &parent; - init(data); - } - - void init(OrderServicesData &data) { - _data = &data; - _book_updates.init(*data.md_subs); - _settlement_updates.init(*data.settlement_subs); - _time_change.init(*data.time_subs); + OrderServices(Order &owner, OrderServicesData &data) + : book_updates(*data.md_subs), settlement_updates(*data.settlement_subs), + child_updates(*data.child_order_subs), time_change(*data.time_subs), + order_creations(*data.order_creation_subs), _owner(owner), _data(data), + _sessions() { for (auto &sd : data.sessions) - _sessions.emplace_back(*sd); - _create_order_reply.init(*data.order_creation_subs); + _sessions.push_back(std::make_unique(*sd)); } - securities::ISecurityDB &sec_db() { return _data->sec_db; } + EventStream book_updates; + EventStream settlement_updates; + EventStream child_updates; + EventStream time_change; + + securities::ISecurityDB &sec_db() { return _data.sec_db; } mercury::TimeStampStr const &get_time_str() const { - return _data->last_timer_ev.ts_str; + return _data.last_timer_ev.ts_str; } - void log(trace::CorID cid, const char *entry_kind, uint32_t uint32_1 = 0, - uint32_t uint32_2 = 0, const char *txt_1 = "", - uint64_t uint64_1 = 0) { - _data->log.log(cid,entry_kind,uint32_1,uint32_2,txt_1,uint64_1); - } + TimeStamp const &get_time() const { return _data.last_timer_ev.ts; } void report_state(const api::orderman::OrderState &state, - trace::CorID const &trace = trace::CorID()) { + PerfTrace const &trace = PerfTrace()) { - OrderStateUpdateEvent ev(_owner->key(), _owner->parent_key(), - _owner->definition(), state, trace); - - on_inter_order_call([ev](OrderServices &self) { - self._data->owner.publish(self._data->report_order_state_pub, ev); - if (orderman::in_terminal_state(ev.status)) { - LOG(OrderMan, Info, - "Order {} transitioned to a terminal state. Canceling all " - "subscriptions", - self._owner->key().value()); - self.unsubscribe_from_child_updates(); - self._book_updates.unsub_all(); - self._settlement_updates.unsub_all(); - self._time_change.unsub_all(); - self._create_order_reply.unsub_all(); - } - if (self._parent) - self._parent->_child_update_cb(ev); - }); - } - - Limiter &limiter() { return _data->limiter; } - - SessionServices &get_session_services(std::string const &for_session) { - for (auto &s : _sessions) - if (s.session_name() == for_session) - return s; - bts_assert(false); - } - - // Subscriptions ------------------------------ - using BookSubID = EventStream::SubID; - template BookSubID subscribe_to_book(SecurityKey k, CB &&cb) { - return _book_updates.sub(k, std::forward(cb)); - } - void unsubscribe_from_book(BookSubID sid) { _book_updates.unsub(sid); } - - using SettlementSubID = EventStream::SubID; - template - SettlementSubID subscribe_to_settlements(SecurityKey k, CB &&cb) { - return _settlement_updates.sub(k, std::forward(cb)); - } - void unsubscribe_from_settlements(SettlementSubID sid) { - _settlement_updates.unsub(sid); - } - - template void subscribe_to_time(CB &&cb) { - _time_change_sub = _time_change.sub(std::forward(cb)); - } - void unsubscribe_from_time() { _time_change.unsub(_time_change_sub); } - - template void subscribe_to_child_updates(CB &&cb) { - _child_update_cb = cb; - } - void unsubscribe_from_child_updates() { - _child_update_cb = [](auto const &) {}; - } - // End Subscriptions ------------------------------ - - private: - friend class OrderBuilder; - - template void on_inter_order_call(C const &c) { - if (_busy) - _pending_calls.emplace_back(c); - else { - _busy = true; - c(*this); - for (size_t i = 0; i < _pending_calls.size(); i++) { - auto c = _pending_calls[i]; - c(*this); - } - _pending_calls.clear(); - _busy = false; + _data.owner.publish(_data.report_order_state_pub, _owner.key(), + _owner.parent_key(), _owner.definition(), state, + trace); + if (orderman::in_terminal_state(state.status())) { + LOG(OrderMan, Info, + "Order {} transitioned to a terminal state. Canceling all " + "subscriptions", + _owner.key().value()); + book_updates.unsub_all(); + child_updates.unsub_all(); + time_change.unsub_all(); } } - IOrderFactory &order_factory() { return _data->order_factory; } + Limiter &limiter() { return _data.limiter; } - using CreateOrderReplySubID = EventStream::SubID; - - template - CreateOrderReplySubID subscribe_to_order_creation_reply(size_t req_id, - CB &&cb) { - return _create_order_reply.sub(req_id, std::forward(cb)); - } - void unsubscribe_from_order_creation_reply(CreateOrderReplySubID sid) { - _create_order_reply.unsub(sid); + SessionServices &get_session_services(std::string const &for_session) { + for (auto &s : _sessions) + if (s->session_name() == for_session) + return *s; + bts_assert(false); } + void schedule_action(std::function const &action) { + _data.owner.schedule_action(action); + } + + private: + friend class OrderBuilder; + IOrderFactory &order_factory() { return _data.order_factory; } + + EventStream order_creations; void send_order_create_req(size_t builder_id, OrderKey pk, api::orderman::OrderDefinition const &def, size_t n_orders) { - _data->owner.publish(_data->create_order_req_pub, builder_id, pk, def, - n_orders); + _data.owner.publish(_data.create_order_req_pub, builder_id, pk, def, + n_orders); } friend class ChildOrder; - OrderServices &activate_child(Order &o, Price p, Quantity q, - trace::CorID const &trace) { - return _data->owner.activate_child(*this, o, p, q, trace); + template void queue_order_op(const OP &op) { + _data.owner.queue_order_event(op); } - void update(Price p, Quantity q, trace::CorID const &trace) { - on_inter_order_call([p, q, trace](OrderServices &self) { - self._owner->on_update(p, q, trace); - }); + void send_activate(Order &o, Price p, Quantity q, PerfTrace const &trace) { + queue_order_op(ActivateOrderEvent{o, p, q, trace}); } - void crack(trace::CorID const &trace) { - on_inter_order_call( - [trace](OrderServices &self) { self._owner->on_crack(trace); }); + void send_activate(Order &o, Price p, Quantity q) { + queue_order_op(ActivateOrderEvent{o, p, q, PerfTrace()}); } - void cancel(trace::CorID const &trace) { - on_inter_order_call( - [trace](OrderServices &self) { self._owner->on_cancel(trace); }); + void send_update(OrderKey k, Price p, Quantity q, PerfTrace const &trace) { + queue_order_op(UpdateOrderEvent{k, p, q, trace}); + } + void send_update(OrderKey k, Price p, Quantity q) { + queue_order_op(UpdateOrderEvent{k, p, q, PerfTrace()}); + } + void send_crack(OrderKey k, PerfTrace const &trace) { + queue_order_op(CrackOrderEvent{k, trace}); + } + void send_crack(OrderKey k) { + queue_order_op(CrackOrderEvent{k, PerfTrace()}); + } + void send_cancel(OrderKey k, PerfTrace const &trace) { + queue_order_op(CancelOrderEvent{k, trace}); + } + void send_cancel(OrderKey k) { + queue_order_op(CancelOrderEvent{k, PerfTrace()}); } - bool _busy; - boost::container::small_vector, 10> - _pending_calls; - Order *_owner; - OrderServicesData *_data; - OrderServices *_parent; - std::function _child_update_cb; - EventStream _book_updates; - EventStream _settlement_updates; - EventStream _time_change; - boost::container::small_vector _sessions; - EventStream::SubID _time_change_sub; - EventStream _create_order_reply; + Order &_owner; + OrderServicesData &_data; + std::vector> _sessions; }; } // namespace orderman } // namespace bts diff --git a/src/lib/orderman/actors/order_manager/OrderServicesData.cpp b/src/lib/orderman/actors/order_manager/OrderServicesData.cpp index 5b19f6e44..15969fc0e 100644 --- a/src/lib/orderman/actors/order_manager/OrderServicesData.cpp +++ b/src/lib/orderman/actors/order_manager/OrderServicesData.cpp @@ -5,18 +5,15 @@ namespace bts { namespace orderman { -OrderServicesData::OrderServicesData(OrderManager &owner, - DynamicOrderRegistry const &b, - trace::PerfLog &l) - : owner(owner), log(l), order_router(), - order_factory(sec_db, order_router, b), +OrderServicesData::OrderServicesData(OrderManager &owner,DynamicOrderRegistry const&b) + : owner(owner), order_router(), order_factory(sec_db, order_router,b), last_timer_ev( Timer::now(), to(datetime::FIX_timestamp(datetime::now()))) { auto &all_connections = config::get().connection(); - for (auto const &c : all_connections) - sessions.push_back(std::make_unique(c, l)); + for (auto const &c : all_connections) + sessions.push_back (std::make_unique(c)); +} +} } -} // namespace orderman -} // namespace bts diff --git a/src/lib/orderman/actors/order_manager/OrderServicesData.h b/src/lib/orderman/actors/order_manager/OrderServicesData.h index 06fe8bca2..4b0f86f0b 100644 --- a/src/lib/orderman/actors/order_manager/OrderServicesData.h +++ b/src/lib/orderman/actors/order_manager/OrderServicesData.h @@ -7,10 +7,11 @@ #include "lib/orderman/order_factory/OrderFactory.h" #include "lib/orderman/securities/MapSecurityDB.h" +#include "lib/utils/datetime.h" #include "lib/mercury/events/TimerEvent.h" -#include "lib/orderman/actors/ExecutionGateway.h" #include "lib/orderman/events/ActivateOrderEvent.h" #include "lib/orderman/events/BookUpdateEvent.h" +#include "lib/orderman/events/SettlementUpdateEvent.h" #include "lib/orderman/events/CancelOrderEvent.h" #include "lib/orderman/events/CancelRejectEvent.h" #include "lib/orderman/events/CrackOrderEvent.h" @@ -20,16 +21,15 @@ #include "lib/orderman/events/CreateOrderRequestEvent.h" #include "lib/orderman/events/GatewayStatusChangeEvent.h" #include "lib/orderman/events/MDRequestEvent.h" +#include "lib/orderman/events/SettlementRequestEvent.h" #include "lib/orderman/events/NewExecutionReportEvent.h" #include "lib/orderman/events/NewSecuritiesEvent.h" #include "lib/orderman/events/OrderStateUpdateEvent.h" -#include "lib/orderman/events/SettlementRequestEvent.h" -#include "lib/orderman/events/SettlementUpdateEvent.h" +#include "lib/orderman/events/OutFIXMsgEvent.h" #include "lib/orderman/events/UpdateOrderEvent.h" -#include "lib/orderman/governor/Governor.h" #include "lib/orderman/limiter/Limiter.h" #include "lib/orderman/order_router/OrderRouter.h" -#include "lib/utils/datetime.h" +#include "lib/orderman/governor/Governor.h" #include @@ -44,13 +44,19 @@ struct ParentKey { }; struct SessionServicesData { - SessionServicesData(config::JetFIX::Connection const &cfg, trace::PerfLog &log) - : session(cfg.name()), gw_connected(false), cfg(cfg), - governor(cfg.max_order_msgs_per_window(), cfg.window_duration_msecs()), - gw(cfg, log) {} + SessionServicesData(config::JetFIX::Connection const&cfg) + : session(cfg.name()), + gw_connected(false), + cfg(cfg), + governor(cfg.max_order_msgs_per_window(), + cfg.window_duration_msecs()) + { + current_traces.reserve(1000); + } std::string session; std::vector free_buffers; + mercury::Stream out_fix_pub; bool gw_connected; config::JetFIX::Connection cfg; std::unique_ptr> @@ -63,34 +69,34 @@ struct SessionServicesData { Governor governor; jetfix::OutFIXPtr current_buffer; - trace::CorID current_trace; - ExecutionGateway gw; - mercury::Stream exe_report_pub; - mercury::Stream gw_status_change_pub; - mercury::Stream cancel_reject_pub; + std::vector current_traces; }; class OrderServicesData { - public: - - OrderServicesData(OrderManager &owner, DynamicOrderRegistry const &b, - trace::PerfLog &l); - +public: + OrderServicesData(OrderManager &owner,DynamicOrderRegistry const&b); OrderManager &owner; - trace::PerfLog &log; securities::MapSecurityDB sec_db; OrderRouter order_router; Limiter limiter; OrderFactory order_factory; + std::unique_ptr> md_subs; - std::unique_ptr> - settlement_subs; + std::unique_ptr> settlement_subs; + std::unique_ptr< + mercury::ContentSubscription> + child_order_subs; + std::unique_ptr< mercury::ContentSubscription> time_subs; std::unique_ptr> order_creation_subs; + mercury::Stream activate_order_pub; + mercury::Stream update_order_pub; + mercury::Stream cancel_order_pub; + mercury::Stream crack_order_pub; mercury::Stream create_order_req_pub; mercury::Stream create_fix_req_pub; mercury::Stream md_request_pub; @@ -107,5 +113,5 @@ class OrderServicesData { bts_assert(false); } }; -} // namespace orderman -} // namespace bts +} +} diff --git a/src/lib/orderman/events/ActivateOrderEvent.h b/src/lib/orderman/events/ActivateOrderEvent.h index 91f0f5f46..874b79f99 100644 --- a/src/lib/orderman/events/ActivateOrderEvent.h +++ b/src/lib/orderman/events/ActivateOrderEvent.h @@ -4,7 +4,6 @@ #include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/mercury/events/Event.h" -#include "lib/tracing/PerfLog.h" namespace bts { namespace orderman { @@ -19,14 +18,14 @@ public: order (&o),price(p),quantity(q), trace() {} - ActivateOrderEvent (Order &o,Price p, Quantity q,trace::CorID trace) : + ActivateOrderEvent (Order &o,Price p, Quantity q,PerfTrace trace) : order (&o),price(p),quantity(q), trace(trace) {} Order* order; Price price; Quantity quantity; - trace::CorID trace; + PerfTrace trace; }; }} diff --git a/src/lib/orderman/events/BookUpdateEvent.h b/src/lib/orderman/events/BookUpdateEvent.h index bf71357a8..cd2fe6aa1 100644 --- a/src/lib/orderman/events/BookUpdateEvent.h +++ b/src/lib/orderman/events/BookUpdateEvent.h @@ -5,7 +5,6 @@ #include "lib/mercury/events/Event.h" #include "lib/orderman/orderman_utils/Book.h" #include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/tracing/PerfLog.h" namespace bts { namespace orderman { @@ -14,10 +13,10 @@ class BookUpdateEvent : public mercury::Event { public: using SynopsisPolicy = mercury::NoSynopsis; Book book; - trace::CorID trace; + PerfTrace trace; SecurityKey key() const { return book.security_key(); } - BookUpdateEvent(const Book &b, trace::CorID const &trace) + BookUpdateEvent(const Book &b, PerfTrace const &trace) : book(b), trace(trace) {} }; } diff --git a/src/lib/orderman/events/CancelOrderEvent.h b/src/lib/orderman/events/CancelOrderEvent.h index cdc2fa563..9593dcd3c 100644 --- a/src/lib/orderman/events/CancelOrderEvent.h +++ b/src/lib/orderman/events/CancelOrderEvent.h @@ -4,7 +4,6 @@ #include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/mercury/events/Event.h" -#include "lib/tracing/PerfLog.h" namespace bts { namespace orderman { @@ -15,12 +14,12 @@ public: using SynopsisPolicy = mercury::NoSynopsis; CancelOrderEvent (OrderKey k) : k (k), trace() {} - CancelOrderEvent (OrderKey k,trace::CorID const&trace) : k (k), trace(trace) {} + CancelOrderEvent (OrderKey k,PerfTrace const&trace) : k (k), trace(trace) {} // used by ContentSubscription OrderKey key() const {return k;} OrderKey k; - trace::CorID trace; + PerfTrace trace; }; }} diff --git a/src/lib/orderman/events/CancelRejectEvent.cpp b/src/lib/orderman/events/CancelRejectEvent.cpp index 00f60fde9..10fcf5bfc 100644 --- a/src/lib/orderman/events/CancelRejectEvent.cpp +++ b/src/lib/orderman/events/CancelRejectEvent.cpp @@ -1,5 +1,6 @@ #include "CancelRejectEvent.h" namespace bts { -namespace orderman {} -} // namespace bts +namespace orderman { + +}} diff --git a/src/lib/orderman/events/CrackOrderEvent.h b/src/lib/orderman/events/CrackOrderEvent.h index 115826241..833df23ba 100644 --- a/src/lib/orderman/events/CrackOrderEvent.h +++ b/src/lib/orderman/events/CrackOrderEvent.h @@ -4,7 +4,6 @@ #include "lib/mercury/events/Event.h" #include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/tracing/PerfLog.h" namespace bts { namespace orderman { @@ -16,13 +15,13 @@ class CrackOrderEvent : public mercury::Event { CrackOrderEvent(OrderKey k) : k(k), trace() {} - CrackOrderEvent(OrderKey k, trace::CorID const &trace) + CrackOrderEvent(OrderKey k, PerfTrace const &trace) : k(k), trace(trace) {} // used by ContentSubscription OrderKey key() const { return k; } OrderKey k; - trace::CorID trace; + PerfTrace trace; }; } } diff --git a/src/lib/orderman/events/NewExecutionReportEvent.cpp b/src/lib/orderman/events/NewExecutionReportEvent.cpp index ae949d917..54b32a164 100644 --- a/src/lib/orderman/events/NewExecutionReportEvent.cpp +++ b/src/lib/orderman/events/NewExecutionReportEvent.cpp @@ -1,5 +1,7 @@ #include "NewExecutionReportEvent.h" namespace bts { -namespace orderman {} -} // namespace bts +namespace orderman { + + +}} diff --git a/src/lib/orderman/events/NewExecutionReportEvent.h b/src/lib/orderman/events/NewExecutionReportEvent.h index 87fb02224..c1971d4ce 100644 --- a/src/lib/orderman/events/NewExecutionReportEvent.h +++ b/src/lib/orderman/events/NewExecutionReportEvent.h @@ -7,8 +7,6 @@ #include "lib/mercury/synopsis/CacheAll.h" #include "lib/orderman/orderman_utils/ExecutionReport.h" #include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/tracing/PerfLog.h" - #include #include @@ -21,10 +19,10 @@ class NewExecutionReportEvent : public mercury::Event { using Tag = GatewayName; using SynopsisPolicy = mercury::CacheAll; ExecutionReport const *data; - trace::CorID trace; + PerfTrace trace; // used by ContentSubscription OrderKey key() const { return data->order_key; } - NewExecutionReportEvent(const ExecutionReport *dt, trace::CorID const &trace) + NewExecutionReportEvent(const ExecutionReport *dt, PerfTrace const &trace) : data(dt), trace(trace){}; }; diff --git a/src/lib/orderman/events/OrderStateUpdateEvent.h b/src/lib/orderman/events/OrderStateUpdateEvent.h index 1083866ba..5e888040c 100644 --- a/src/lib/orderman/events/OrderStateUpdateEvent.h +++ b/src/lib/orderman/events/OrderStateUpdateEvent.h @@ -2,11 +2,10 @@ #include "lib/mercury/events/Event.h" #include "lib/orderman/orderman_utils/PerfTrace.h" -#include "lib/api/services/OrderService.pb.h" -#include "lib/tracing/PerfLog.h" - #include +#include "lib/api/services/OrderService.pb.h" + namespace bts { namespace orderman { @@ -16,7 +15,7 @@ class OrderStateUpdateEvent : public mercury::Event { OrderStateUpdateEvent(OrderKey key, OrderKey parent_key, api::orderman::OrderDefinition const &def, api::orderman::OrderState const &state, - trace::CorID const &trace = trace::CorID()) + PerfTrace const &trace = PerfTrace()) : key(key), parent_key(parent_key), trace(trace), definition(&def) { status = state.status(); @@ -52,7 +51,7 @@ class OrderStateUpdateEvent : public mercury::Event { double avg_price; std::string last_msg; - trace::CorID trace; + PerfTrace trace; api::orderman::OrderState::CustomCase custom; // native order state diff --git a/src/lib/orderman/events/OutFIXMsgEvent.h b/src/lib/orderman/events/OutFIXMsgEvent.h new file mode 100644 index 000000000..5b0556fba --- /dev/null +++ b/src/lib/orderman/events/OutFIXMsgEvent.h @@ -0,0 +1,32 @@ +#pragma once +#include "lib/jetfix/common/OutFIXPtr.h" +#include "lib/orderman/orderman_utils/orderman_common.h" +#include "lib/mercury/events/Event.h" +#include "lib/mercury/synopsis/CacheAll.h" + + +namespace bts { +namespace orderman { + +class OutFIXMsgEvent : public mercury::Event { +public: + using Tag = GatewayName; + + // there is no need to store synopsis for this event because no one + // should be sending fix events (OutFIXMsgEvent) until they receive + // an event from the FIX gateway regarding the status of the FIX + // connection. Receipt of this connection event guarantees to + // potential publishers of OutFIXMsgEvent that the gateway is + // already subscribed to OutFIXMsgEvent and so no events will be + // missed. + using SynopsisPolicy = mercury::NoSynopsis; + + OutFIXMsgEvent (jetfix::OutFIXPtr const&fix,std::vector const&traces) : + msg(fix),trace(traces[0]) + {} + + jetfix::OutFIXPtr msg; + PerfTrace trace; +}; + +}} diff --git a/src/lib/orderman/events/UpdateOrderEvent.h b/src/lib/orderman/events/UpdateOrderEvent.h index c514c9649..80c0f3c54 100644 --- a/src/lib/orderman/events/UpdateOrderEvent.h +++ b/src/lib/orderman/events/UpdateOrderEvent.h @@ -4,7 +4,6 @@ #include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/mercury/events/Event.h" -#include "lib/tracing/PerfLog.h" namespace bts { namespace orderman { @@ -18,7 +17,7 @@ public: k(k), price(p), quantity(q), trace() {} - UpdateOrderEvent (OrderKey k, Price p, Quantity q,trace::CorID const&trace) : + UpdateOrderEvent (OrderKey k, Price p, Quantity q,PerfTrace const&trace) : k(k), price(p), quantity(q), trace(trace) {} @@ -28,7 +27,7 @@ public: OrderKey k; Price price; Quantity quantity; - trace::CorID trace; + PerfTrace trace; }; }} diff --git a/src/lib/orderman/limiter/LimitStore.cpp b/src/lib/orderman/limiter/LimitStore.cpp index e25807d7c..ae8395f9f 100644 --- a/src/lib/orderman/limiter/LimitStore.cpp +++ b/src/lib/orderman/limiter/LimitStore.cpp @@ -1,91 +1,77 @@ #include "LimitStore.h" -namespace bts { -namespace orderman { +namespace bts{ +namespace orderman{ -LimitStore::LimitStore(const bts::api::admin::AdminData &admin_data, - const std::map &sec_map) - : _admin_data(bts::admin::AdminServiceUtils::sort_limits(admin_data)), - _account_map(bts::admin::AdminServiceUtils::accounts_map(_admin_data)) { - for (auto it = sec_map.begin(); it != sec_map.end(); it++) { - const api::Security &security = *(it->second); +LimitStore::LimitStore(const bts::api::admin::AdminData& admin_data, + const std::map& sec_map) +: +_admin_data (bts::admin::AdminServiceUtils::sort_limits(admin_data)), +_account_map(bts::admin::AdminServiceUtils::accounts_map(_admin_data)) +{ + for(auto it=sec_map.begin(); it!=sec_map.end(); it++){ + const api::Security& security = *(it->second); _add_product_entry(security, _admin_data); - } - for (auto it = sec_map.begin(); it != sec_map.end(); it++) { + } + for(auto it=sec_map.begin(); it!=sec_map.end(); it++){ // pos limit - const api::Security &security = *(it->second); - ProductLimitTree *product_tree_ptr = _find_product_for_security(security); - bts_assert(product_tree_ptr != nullptr); - _sec_map.insert(std::pair( - security.id(), SecurityLimitTree(security, *product_tree_ptr, - _admin_data, _zero_security_limit))); + const api::Security& security = *(it->second); + ProductLimitTree* product_tree_ptr = _find_product_for_security (security); + bts_assert(product_tree_ptr!=nullptr); + _sec_map.insert(std::pair(security.id(),SecurityLimitTree(security, *product_tree_ptr, _admin_data, _zero_security_limit))); } _set_user_data(); } -void LimitStore::copy_positions_from(LimitStore &source) { +void LimitStore::copy_positions_from(LimitStore& source){ // copy securities - for (auto it = _sec_map.begin(); it != _sec_map.end(); it++) { - SecurityLimitTree *source_security_limit_tree = - source._find_security(it->first); - if (source_security_limit_tree != nullptr) + for (auto it=_sec_map.begin(); it!=_sec_map.end(); it++){ + SecurityLimitTree* source_security_limit_tree = source._find_security(it->first); + if(source_security_limit_tree != nullptr) it->second.copy_positions_from(*source_security_limit_tree); } } -void LimitStore::_add_product_entry( - const api::Security &security, - const bts::api::admin::AdminData &admin_data) { - ProductLimitTree *product_tree_ptr = _find_product_for_security(security); - if (product_tree_ptr == nullptr) { +void LimitStore::_add_product_entry(const api::Security& security, + const bts::api::admin::AdminData& admin_data){ + ProductLimitTree* product_tree_ptr = _find_product_for_security(security); + if (product_tree_ptr==nullptr){ api::Product product; - product.set_exchange(security.exchange()); - product.set_type(bts::admin::AdminServiceUtils::security_type(security)); - product.set_symbol(security.symbol()); - _prod_map.emplace_back(product, admin_data, _zero_product_limit); + product.set_exchange(security.exchange()); product.set_type(bts::admin::AdminServiceUtils::security_type(security)); product.set_symbol(security.symbol()); + _prod_map.emplace_back(product, admin_data, _zero_product_limit); } } -void LimitStore::_set_user_data() { - for (const auto &user : _admin_data.users()) { - if (user.is_present()) { +void LimitStore::_set_user_data (){ + for(const auto& user : _admin_data.users()){ + if (user.is_present()){ UserData user_data; user_data.user = &user; - bts::admin::AdminServiceUtils::find_user_trading_accounts( - _admin_data, user.id(), user_data.accounts); - _user_data_map.insert( - std::pair(user.id(), user_data)); + bts::admin::AdminServiceUtils::find_user_trading_accounts(_admin_data, user.id(), user_data.accounts); + _user_data_map.insert(std::pair(user.id(), user_data)); } + } +} +ProductLimitTree* LimitStore::_find_product_for_security(const api::Security& security){ + api::Product product; + product.set_exchange(security.exchange()); product.set_type(bts::admin::AdminServiceUtils::security_type(security)); product.set_symbol(security.symbol()); + return _find_product(product); } -} -ProductLimitTree * -LimitStore::_find_product_for_security(const api::Security &security) { - api::Product product; - product.set_exchange(security.exchange()); - product.set_type(bts::admin::AdminServiceUtils::security_type(security)); - product.set_symbol(security.symbol()); - return _find_product(product); -} -ProductLimitTree *LimitStore::_find_product(const api::Product &product) { - for (ProductLimitTree &plt : _prod_map) - if (product.exchange() == plt.product().exchange() && - product.type() == plt.product().type() && - product.symbol() == plt.product().symbol()) +ProductLimitTree* LimitStore::_find_product(const api::Product& product){ + for(ProductLimitTree& plt : _prod_map) + if(product.exchange() == plt.product().exchange() && product.type() == plt.product().type() && product.symbol() == plt.product().symbol()) return &plt; return nullptr; } -const SecurityLimitNode * -LimitStore::test_only_func_find_security_node(AccountID account_id, - uint32_t security_id) { - const SecurityLimitTree *sec_data = _find_security(security_id); - if (sec_data != nullptr) +const SecurityLimitNode* LimitStore::test_only_func_find_security_node(AccountID account_id, + uint32_t security_id){ + const SecurityLimitTree* sec_data = _find_security(security_id); + if(sec_data != nullptr) return sec_data->find_account(account_id.value()); return nullptr; } -const ProductLimitNode * -LimitStore::test_only_func_find_product_node(AccountID account_id, - const api::Product &product) { - ProductLimitTree *prod_data = _find_product(product); - if (prod_data != nullptr) +const ProductLimitNode* LimitStore::test_only_func_find_product_node(AccountID account_id, + const api::Product& product){ + ProductLimitTree* prod_data = _find_product(product); + if(prod_data != nullptr) return prod_data->find_account(account_id.value()); return nullptr; } -} // namespace orderman -} // namespace bts \ No newline at end of file +}} \ No newline at end of file diff --git a/src/lib/orderman/limiter/Limiter.cpp b/src/lib/orderman/limiter/Limiter.cpp index bfa21a12c..713672a5d 100644 --- a/src/lib/orderman/limiter/Limiter.cpp +++ b/src/lib/orderman/limiter/Limiter.cpp @@ -1,131 +1,144 @@ #include "Limiter.h" #include "LimitStore.h" -#include "lib/api/services/AdminService.server.pb.h" #include "lib/domain_model/Security.pb.h" +#include "lib/api/services/AdminService.server.pb.h" namespace bts { namespace orderman { struct Limiter::PImpl { - std::map sec_map; + std::map sec_map; std::unique_ptr limit_store; PImpl() - : sec_map(), limit_store(std::make_unique( - bts::api::admin::AdminData(), sec_map)) {} + : + sec_map(), + limit_store(std::make_unique(bts::api::admin::AdminData(), + sec_map)) + { + } }; Limiter::Limiter() : me(new PImpl()) {} Limiter::~Limiter() {} -void Limiter::update(api::admin::AdminData const &admin_data) { +void Limiter::update(api::admin::AdminData const& admin_data) { LOG(OrderMan, Info, "Limiter::update"); _reset(admin_data); } -void Limiter::add_securities( - std::vector const &new_securities) { +void Limiter::add_securities(std::vector const& new_securities){ LOG(OrderMan, Info, "Limiter::add_securities {} securities", - me->sec_map.size()); - for (const api::Security *s : new_securities) + me->sec_map.size()); + for(const api::Security* s : new_securities) _add_security(s); _reset(me->limit_store->admin_data()); } -void Limiter::add_security(api::Security const &security) { +void Limiter::add_security(api::Security const & security) { _add_security(&security); _reset(me->limit_store->admin_data()); } -void Limiter::add(api::Security const &security, AccountID account_id, - api::Side side, Quantity quantity) { +void Limiter::add(api::Security const &security, + AccountID account_id, + api::Side side, + Quantity quantity){ if (!_contains_security(&security)) add_security(security); - if (!me->limit_store->has_account(account_id)) { + if (!me->limit_store->has_account(account_id)){ // add a temporary account, so trades can go in there _add_account_and_reset(account_id); } me->limit_store->add_position(security, account_id, side, quantity); } -void Limiter::remove(api::Security const &security, AccountID account_id, - api::Side side, Quantity quantity) { +void Limiter::remove(api::Security const &security, + AccountID account_id, + api::Side side, + Quantity quantity) { if (!_contains_security(&security)) add_security(security); - if (!me->limit_store->has_account(account_id)) { + if (!me->limit_store->has_account(account_id)){ _add_account_and_reset(account_id); } me->limit_store->remove_position(security, account_id, side, quantity); } -void Limiter::add(const api::Security &security, - const std::string &account_name, api::Side side, - Quantity quantity) { - const auto *acct_ptr = bts::admin::AdminServiceUtils::find_account( - me->limit_store->admin_data(), account_name); - if (acct_ptr == nullptr) +void Limiter::add(const api::Security& security, + const std::string& account_name, + api::Side side, + Quantity quantity){ + const auto* acct_ptr= + bts::admin::AdminServiceUtils::find_account(me->limit_store->admin_data(), + account_name); + if(acct_ptr==nullptr) LOG(OrderMan, Error, "Limiter::add can not find account:{}", - account_name); + account_name); else - add(security, AccountID(acct_ptr->id()), side, quantity); + add(security,AccountID(acct_ptr->id()),side,quantity); } -void Limiter::remove(const api::Security &security, - const std::string &account_name, api::Side side, - Quantity quantity) { - const auto *acct_ptr = bts::admin::AdminServiceUtils::find_account( - me->limit_store->admin_data(), account_name); - if (acct_ptr == nullptr) +void Limiter::remove(const api::Security& security, + const std::string& account_name, + api::Side side, + Quantity quantity){ + const auto* acct_ptr= + bts::admin::AdminServiceUtils::find_account(me->limit_store->admin_data(), + account_name); + if(acct_ptr==nullptr) LOG(OrderMan, Error, "Limiter::remove can not find account:{}", - account_name); + account_name); else - remove(security, AccountID(acct_ptr->id()), side, quantity); + remove(security,AccountID(acct_ptr->id()),side,quantity); } Limiter::LimiterQueryResult Limiter::can_trade(UserID user_id, AccountID account_id) const { LimiterQueryResult rv = me->limit_store->can_trade(user_id, account_id); return rv; } -Limiter::LimiterQueryResult -Limiter::can_send_new_order(AccountID account_id, api::Security const &security, - api::Side side, Quantity quantity) const { - LimiterQueryResult rv = me->limit_store->can_send_new_order( - account_id, security, side, quantity); - // rv.ok = true; +Limiter::LimiterQueryResult Limiter::can_send_new_order(AccountID account_id, + api::Security const & security, + api::Side side, + Quantity quantity) const { + LimiterQueryResult rv = me->limit_store->can_send_new_order(account_id, + security, + side, + quantity); + //rv.ok = true; return rv; } -Limiter::LimiterQueryResult -Limiter::can_update_order(AccountID account_id, api::Security const &security, - api::Side side, Quantity from, Quantity to) const { +Limiter::LimiterQueryResult Limiter::can_update_order(AccountID account_id, + api::Security const & security, + api::Side side, + Quantity from, + Quantity to) const { LimiterQueryResult rv; - if (from == to) - rv.ok = true; - else - rv = me->limit_store->can_update_order(account_id, security, side, from, - to); + if (from == to) + rv.ok = true ; + else + rv = me->limit_store->can_update_order(account_id, security, side, from, to); return rv; } -void Limiter::_add_account_and_reset(AccountID account_id) { - bts::api::admin::AdminData admin_data_catchup = - me->limit_store->admin_data(); - bts::api::admin::BTSAccount *new_account = - admin_data_catchup.mutable_accounts()->Add(); +void Limiter::_add_account_and_reset(AccountID account_id){ + bts::api::admin::AdminData admin_data_catchup = me->limit_store->admin_data(); + bts::api::admin::BTSAccount* new_account = admin_data_catchup.mutable_accounts()->Add(); new_account->set_id(account_id.value()); new_account->set_is_active(true); update(admin_data_catchup); } -void Limiter::_reset(const bts::api::admin::AdminData &admin_data) { - LimitStore *new_store = new LimitStore(admin_data, me->sec_map); +void Limiter::_reset (const bts::api::admin::AdminData& admin_data){ + LimitStore* new_store = new LimitStore(admin_data, me->sec_map); new_store->copy_positions_from(*me->limit_store); me->limit_store.reset(new_store); } -void Limiter::_add_security(const api::Security *sec) { - if (!_contains_security(sec)) { - me->sec_map.insert( - std::pair(sec->id(), sec)); +void Limiter::_add_security (const api::Security* sec){ + if (!_contains_security(sec)){ + me->sec_map.insert(std::pair(sec->id(), sec)); if (sec->has_spread()) - for (const auto &leg : sec->spread().legs()) + for(const auto& leg : sec->spread().legs()) _add_security(&leg.security()); } } -bool Limiter::_contains_security(const api::Security *security) { +bool Limiter::_contains_security (const api::Security* security){ return me->sec_map.find(security->id()) != me->sec_map.end(); } -LimitStore &Limiter::limit_store() { return *me->limit_store; } -} // namespace orderman -} // namespace bts +LimitStore& Limiter::limit_store(){ + return *me->limit_store; +} +}} diff --git a/src/lib/orderman/limiter/ProductLimitNode.cpp b/src/lib/orderman/limiter/ProductLimitNode.cpp index 5e78bed62..a6ee36784 100644 --- a/src/lib/orderman/limiter/ProductLimitNode.cpp +++ b/src/lib/orderman/limiter/ProductLimitNode.cpp @@ -1,18 +1,21 @@ #include "ProductLimitNode.h" -namespace bts { -namespace orderman { +namespace bts{ +namespace orderman{ + +ProductLimitNode::ProductLimitNode(uint32_t account_id, + uint32_t, // parent_account_id, + const bts::api::admin::AccountProductPositionLimitUnit& limit, + bool enforce_net) + : + _account_id(account_id), + //_parent_account_id(parent_account_id), + _limit(limit), + _enforce_net(enforce_net), + _long_pos_limit (limit.long_position_limit()), + _short_pos_limit (limit.short_position_limit()), + _long_pos(0), + _short_pos(0) + {} +}} -ProductLimitNode::ProductLimitNode( - uint32_t account_id, - uint32_t, // parent_account_id, - const bts::api::admin::AccountProductPositionLimitUnit &limit, - bool enforce_net) - : _account_id(account_id), - //_parent_account_id(parent_account_id), - _limit(limit), _enforce_net(enforce_net), - _long_pos_limit(limit.long_position_limit()), - _short_pos_limit(limit.short_position_limit()), _long_pos(0), - _short_pos(0) {} -} // namespace orderman -} // namespace bts diff --git a/src/lib/orderman/limiter/ProductLimitTree.cpp b/src/lib/orderman/limiter/ProductLimitTree.cpp index 1df2aa4ea..bab765af6 100644 --- a/src/lib/orderman/limiter/ProductLimitTree.cpp +++ b/src/lib/orderman/limiter/ProductLimitTree.cpp @@ -1,27 +1,23 @@ #include "ProductLimitTree.h" -namespace bts { -namespace orderman { +namespace bts{ +namespace orderman{ -ProductLimitTree::ProductLimitTree( - const api::Product &product, const bts::api::admin::AdminData &admin_data, - const bts::api::admin::AccountProductPositionLimitUnit &zero_limit) - : _product(product) { - for (const auto &account : admin_data.accounts()) { - bool enforce_net = true; // default is net - if (account.has_risk_limit_enforcement()) - enforce_net = - account.risk_limit_enforcement().product_limit_in_net_terms(); - const bts::api::admin::AccountProductPositionLimitUnit *limit = - bts::admin::AdminServiceUtils::find_account_product_position_limit( - account, _product); - _tree.emplace_back( - account.id(), - bts::admin::AdminServiceUtils::has_id(account.parent_account_id()) - ? account.parent_account_id() - : 0, - limit != nullptr ? *limit : zero_limit, enforce_net); +ProductLimitTree::ProductLimitTree(const api::Product& product, + const bts::api::admin::AdminData& admin_data, + const bts::api::admin::AccountProductPositionLimitUnit& zero_limit) +: +_product (product) +{ + for(const auto& account : admin_data.accounts()){ + bool enforce_net=true; // default is net + if(account.has_risk_limit_enforcement()) + enforce_net=account.risk_limit_enforcement().product_limit_in_net_terms(); + const bts::api::admin::AccountProductPositionLimitUnit* limit = bts::admin::AdminServiceUtils::find_account_product_position_limit(account, _product); + _tree.emplace_back(account.id(), + bts::admin::AdminServiceUtils::has_id(account.parent_account_id()) ? account.parent_account_id() : 0, + limit != nullptr ? *limit : zero_limit, + enforce_net); } } -} // namespace orderman -} // namespace bts \ No newline at end of file +}} \ No newline at end of file diff --git a/src/lib/orderman/limiter/SecurityLimitNode.cpp b/src/lib/orderman/limiter/SecurityLimitNode.cpp index 9fbb209b0..bc7e12298 100644 --- a/src/lib/orderman/limiter/SecurityLimitNode.cpp +++ b/src/lib/orderman/limiter/SecurityLimitNode.cpp @@ -3,18 +3,22 @@ namespace bts { namespace orderman { -SecurityLimitNode::SecurityLimitNode( - uint32_t account_id, - uint32_t, // parent_account_id, - const bts::api::admin::AccountSecurityPositionLimitUnit &limit, - bool apply_sec_position_limits, ProductLimitNode &product_node, - uint32_t clip_size) - : _account_id(account_id), - //_parent_account_id(parent_account_id), - _limit(limit), _long_pos_limit(limit.long_position_limit()), - _short_pos_limit(-1 * limit.short_position_limit()), - _apply_sec_position_limits(apply_sec_position_limits), - _product_node(product_node), _clip_size(clip_size), _net_pos(0) {} +SecurityLimitNode::SecurityLimitNode(uint32_t account_id, + uint32_t, // parent_account_id, + const bts::api::admin::AccountSecurityPositionLimitUnit& limit, + bool apply_sec_position_limits, + ProductLimitNode& product_node, + uint32_t clip_size) + : + _account_id(account_id), + //_parent_account_id(parent_account_id), + _limit(limit), + _long_pos_limit (limit.long_position_limit()), + _short_pos_limit (-1 * limit.short_position_limit()), + _apply_sec_position_limits (apply_sec_position_limits), + _product_node(product_node), + _clip_size(clip_size), + _net_pos(0) +{} -} // namespace orderman -} // namespace bts +}} diff --git a/src/lib/orderman/limiter/SecurityLimitTree.cpp b/src/lib/orderman/limiter/SecurityLimitTree.cpp index a0a150961..68c4cbd9d 100644 --- a/src/lib/orderman/limiter/SecurityLimitTree.cpp +++ b/src/lib/orderman/limiter/SecurityLimitTree.cpp @@ -1,30 +1,20 @@ #include "lib/orderman/limiter/SecurityLimitTree.h" -namespace bts { -namespace orderman { +namespace bts{ +namespace orderman{ -SecurityLimitTree::SecurityLimitTree( - const api::Security &security, ProductLimitTree &product_tree, - const bts::api::admin::AdminData &admin_data, - const bts::api::admin::AccountSecurityPositionLimitUnit &zero_limit) { - for (const auto &account : admin_data.accounts()) { - ProductLimitNode *product_node_ptr = - product_tree.find_account(account.id()); +SecurityLimitTree::SecurityLimitTree(const api::Security& security, + ProductLimitTree& product_tree, + const bts::api::admin::AdminData& admin_data, + const bts::api::admin::AccountSecurityPositionLimitUnit& zero_limit) +{ + for(const auto& account : admin_data.accounts()){ + ProductLimitNode* product_node_ptr = product_tree.find_account(account.id()); bts_assert(product_node_ptr != nullptr); - const bts::api::admin::AccountSecurityPositionLimitUnit *limit = - bts::admin::AdminServiceUtils::find_account_security_position_limit( - account, security); - uint32_t clip_size = - bts::admin::AdminServiceUtils::find_account_security_clip_size( - account, security); - _tree.emplace_back( - account.id(), - bts::admin::AdminServiceUtils::has_id(account.parent_account_id()) - ? account.parent_account_id() - : 0, - limit != nullptr ? *limit : zero_limit, limit != nullptr, - *product_node_ptr, clip_size); + const bts::api::admin::AccountSecurityPositionLimitUnit* limit = bts::admin::AdminServiceUtils::find_account_security_position_limit(account, security); + uint32_t clip_size = bts::admin::AdminServiceUtils::find_account_security_clip_size(account, security); + _tree.emplace_back(account.id(), bts::admin::AdminServiceUtils::has_id(account.parent_account_id()) ? account.parent_account_id() : 0, + limit != nullptr ? *limit : zero_limit, limit != nullptr, *product_node_ptr, clip_size); } } -} // namespace orderman -} // namespace bts +}} diff --git a/src/lib/orderman/limiter/tests/limit_tests.cpp b/src/lib/orderman/limiter/tests/limit_tests.cpp index a6b89a7f2..394265d3f 100644 --- a/src/lib/orderman/limiter/tests/limit_tests.cpp +++ b/src/lib/orderman/limiter/tests/limit_tests.cpp @@ -1,71 +1,63 @@ #include "catch/catch.hpp" -#include "lib/api/service_helpers/AdminServiceUtils.h" -#include "lib/api/services/AdminService.server.pb.h" -#include "lib/config/config.h" -#include "lib/domain_model/Security.h" +#include #include "lib/orderman/limiter/LimitStore.h" #include "lib/orderman/limiter/Limiter.h" +#include "lib/api/services/AdminService.server.pb.h" +#include "lib/api/service_helpers/AdminServiceUtils.h" +#include "lib/domain_model/Security.h" #include "lib/utils/bts_chrono.h" #include "lib/utils/helper_macros.h" -#include +#include "lib/config/config.h" -namespace bts { -namespace orderman { +namespace bts{ +namespace orderman{ -void add_account_prod_pos_limit(bts::api::admin::AdminData &admin_data, - const std::string &account_name, +void add_account_prod_pos_limit(bts::api::admin::AdminData& admin_data, + const std::string& account_name, api::Venue prod_exchange, api::SecurityType prod_type, - const std::string &prod_symbol, + const std::string& prod_symbol, uint32_t long_pos_limit, - uint32_t short_pos_limit) { - auto account_ptr = - bts::admin::AdminServiceUtils::find_account(admin_data, account_name); - REQUIRE(account_ptr != nullptr); + uint32_t short_pos_limit){ + auto account_ptr = bts::admin::AdminServiceUtils::find_account(admin_data, account_name); + REQUIRE(account_ptr!=nullptr); bts::api::admin::ProductScope prod_scope; prod_scope.set_exchange(prod_exchange); prod_scope.set_security_type(prod_type); - prod_scope.set_security_symbol(prod_symbol); - auto new_prod_pos_limit_ptr = - account_ptr->mutable_product_position_limits()->Add(); + prod_scope.set_security_symbol(prod_symbol); + auto new_prod_pos_limit_ptr = account_ptr->mutable_product_position_limits()->Add(); new_prod_pos_limit_ptr->mutable_product()->CopyFrom(prod_scope); new_prod_pos_limit_ptr->set_long_position_limit(long_pos_limit); new_prod_pos_limit_ptr->set_short_position_limit(short_pos_limit); } -void add_account_security_pos_limit(bts::api::admin::AdminData &admin_data, - const std::string &account_name, +void add_account_security_pos_limit(bts::api::admin::AdminData& admin_data, + const std::string& account_name, api::Venue sec_exchange, api::SecurityType sec_type, - const std::string &sec_symbol, - uint32_t sec_id, // 0 for unset + const std::string& sec_symbol, + uint32_t sec_id, //0 for unset uint32_t long_pos_limit, - uint32_t short_pos_limit) { - auto account_ptr = - bts::admin::AdminServiceUtils::find_account(admin_data, account_name); - REQUIRE(account_ptr != nullptr); + uint32_t short_pos_limit){ + auto account_ptr = bts::admin::AdminServiceUtils::find_account(admin_data, account_name); + REQUIRE(account_ptr!=nullptr); bts::api::admin::SecurityScope sec_scope; sec_scope.set_exchange(sec_exchange); sec_scope.set_security_type(sec_type); sec_scope.set_security_symbol(sec_symbol); - if (sec_id != 0) + if(sec_id != 0) sec_scope.set_security_id(sec_id); - auto new_sec_pos_limit_ptr = - account_ptr->mutable_security_position_limits()->Add(); + auto new_sec_pos_limit_ptr = account_ptr->mutable_security_position_limits()->Add(); new_sec_pos_limit_ptr->mutable_security()->CopyFrom(sec_scope); new_sec_pos_limit_ptr->set_long_position_limit(long_pos_limit); new_sec_pos_limit_ptr->set_short_position_limit(short_pos_limit); } -void add_account_sec_pos_limit(bts::api::admin::BTSAccount &account, - api::Venue exchange, api::SecurityType sec_type, - const std::string &sec_symbol, uint32_t sec_id, - bool sec_id_set, uint32_t long_pos_limit, - uint32_t short_pos_limit) { +void add_account_sec_pos_limit(bts::api::admin::BTSAccount& account, + api::Venue exchange, api::SecurityType sec_type, const std::string& sec_symbol, uint32_t sec_id, bool sec_id_set, + uint32_t long_pos_limit, uint32_t short_pos_limit){ bts::api::admin::SecurityScope scope; - scope.set_exchange(exchange); - scope.set_security_type(sec_type); - scope.set_security_symbol(sec_symbol); + scope.set_exchange(exchange); scope.set_security_type(sec_type); scope.set_security_symbol(sec_symbol); if (sec_id_set) scope.set_security_id(sec_id); auto new_limit = account.add_security_position_limits(); @@ -74,14 +66,11 @@ void add_account_sec_pos_limit(bts::api::admin::BTSAccount &account, new_limit->set_short_position_limit(short_pos_limit); } -void add_account_sec_clip_size(bts::api::admin::BTSAccount &account, - api::Venue exchange, api::SecurityType sec_type, - const std::string &sec_symbol, uint32_t sec_id, - bool sec_id_set, uint32_t clip_size) { +void add_account_sec_clip_size(bts::api::admin::BTSAccount& account, + api::Venue exchange, api::SecurityType sec_type, const std::string& sec_symbol, uint32_t sec_id, bool sec_id_set, + uint32_t clip_size){ bts::api::admin::SecurityScope scope; - scope.set_exchange(exchange); - scope.set_security_type(sec_type); - scope.set_security_symbol(sec_symbol); + scope.set_exchange(exchange); scope.set_security_type(sec_type); scope.set_security_symbol(sec_symbol); if (sec_id_set) scope.set_security_id(sec_id); auto new_limit = account.mutable_security_clip_limits()->add_limit(); @@ -89,95 +78,69 @@ void add_account_sec_clip_size(bts::api::admin::BTSAccount &account, new_limit->set_clip_size(clip_size); } -void fill_future_security(api::Security &sec, uint32_t key, - const std::string &symbol, api::Venue exchange, - uint32_t expiration_year, uint32_t expiration_month, - uint32_t expiration_day, double tick_size) { - sec.set_id(key); - sec.set_symbol(symbol); - sec.set_exchange(exchange); +void fill_future_security (api::Security& sec, + uint32_t key, const std::string& symbol, api::Venue exchange, + uint32_t expiration_year, uint32_t expiration_month, uint32_t expiration_day, + double tick_size) +{ + sec.set_id (key); + sec.set_symbol (symbol); + sec.set_exchange (exchange); api::FutureContract fc; fc.set_expiration_year(expiration_year); fc.set_expiration_month(expiration_month); fc.set_expiration_day(expiration_day); - sec.mutable_future()->MergeFrom(fc); + sec.mutable_future()->MergeFrom (fc); api::ContractSpecification c_spec; - c_spec.set_low_tick(tick_size); - c_spec.set_high_tick(tick_size); - sec.mutable_contract_spec()->MergeFrom(c_spec); + c_spec.set_low_tick (tick_size); + c_spec.set_high_tick (tick_size); + sec.mutable_contract_spec()->MergeFrom (c_spec); } -void verify_security_limit_data(SecurityLimitNode const *acc_sec_state, - uint32_t expected_long_limit, - uint32_t expected_short_limit, - int expected_net_pos) { +void verify_security_limit_data(SecurityLimitNode const* acc_sec_state, + uint32_t expected_long_limit, uint32_t expected_short_limit, + int expected_net_pos){ REQUIRE(acc_sec_state != nullptr); - REQUIRE(acc_sec_state->test_only_func_limit().long_position_limit() == - expected_long_limit); - REQUIRE(acc_sec_state->test_only_func_limit().short_position_limit() == - expected_short_limit); + REQUIRE(acc_sec_state->test_only_func_limit().long_position_limit() == expected_long_limit); + REQUIRE(acc_sec_state->test_only_func_limit().short_position_limit() == expected_short_limit); REQUIRE(acc_sec_state->net_pos() == expected_net_pos); } -void verify_product_limit_data(ProductLimitNode const *acc_prod_state, - uint32_t expected_long_limit, - uint32_t expected_short_limit, - int expected_net_pos) { +void verify_product_limit_data(ProductLimitNode const* acc_prod_state, + uint32_t expected_long_limit, uint32_t expected_short_limit, + int expected_net_pos){ REQUIRE(acc_prod_state != nullptr); - REQUIRE(acc_prod_state->test_only_func_limit().long_position_limit() == - expected_long_limit); - REQUIRE(acc_prod_state->test_only_func_limit().short_position_limit() == - expected_short_limit); + REQUIRE(acc_prod_state->test_only_func_limit().long_position_limit() == expected_long_limit); + REQUIRE(acc_prod_state->test_only_func_limit().short_position_limit() == expected_short_limit); REQUIRE(acc_prod_state->net_pos() == expected_net_pos); } -// (bts::api::admin::BTSAccount& account, -// api::Venue exchange, api::SecurityType -// sec_type, const std::string& sec_symbol, -// uint32_t sec_id, bool sec_id_set, uint32_t -// long_pos_limit, uint32_t short_pos_limit){ -TEST_CASE("Limit Rule Res", "[limiter]") { +// (bts::api::admin::BTSAccount& account, +// api::Venue exchange, api::SecurityType sec_type, const std::string& sec_symbol, uint32_t sec_id, bool sec_id_set, +// uint32_t long_pos_limit, uint32_t short_pos_limit){ + +TEST_CASE ("Limit Rule Res", "[limiter]"){ api::Security sec_1, sec_2, sec_3; - fill_future_security(sec_1, 1000, std::string("ES"), api::Venue::VENUE_GLBX, - 2020, 1, 1, 0.25); - fill_future_security(sec_2, 2000, std::string("SI"), api::Venue::VENUE_GLBX, - 2021, 1, 1, 0.05); - fill_future_security(sec_3, 3000, std::string("SI"), api::Venue::VENUE_GLBX, - 2022, 1, 1, 0.05); + fill_future_security(sec_1, 1000, std::string("ES"), api::Venue::VENUE_GLBX, 2020, 1, 1, 0.25); + fill_future_security(sec_2, 2000, std::string("SI"), api::Venue::VENUE_GLBX, 2021, 1, 1, 0.05); + fill_future_security(sec_3, 3000, std::string("SI"), api::Venue::VENUE_GLBX, 2022, 1, 1, 0.05); // add multiple rules and check sorting bts::api::admin::AdminData admin_data; bts::api::admin::AdminServiceCreateAccountResult result; - bts::admin::AdminServiceUtils::create_account(admin_data, 0, "ACC A1", - "desc", true, result); - auto account_ptr = - bts::admin::AdminServiceUtils::find_account(admin_data, "ACC A1"); - add_account_sec_pos_limit(*account_ptr, api::Venue::VENUE_GLBX, - api::SecurityType::SECURITYTYPE_FUTURE, "*", 0, - false, 10, 21); - add_account_sec_pos_limit(*account_ptr, api::Venue::VENUE_GLBX, - api::SecurityType::SECURITYTYPE_FUTURE, "ES", 1000, - true, 1000, 2001); - add_account_sec_pos_limit(*account_ptr, api::Venue::VENUE_GLBX, - api::SecurityType::SECURITYTYPE_FUTURE, "ES", 0, - false, 100, 201); + bts::admin::AdminServiceUtils::create_account(admin_data, 0, "ACC A1", "desc", true, result); + auto account_ptr = bts::admin::AdminServiceUtils::find_account(admin_data, "ACC A1"); + add_account_sec_pos_limit(*account_ptr, api::Venue::VENUE_GLBX, api::SecurityType::SECURITYTYPE_FUTURE, "*", 0, false, 10, 21); + add_account_sec_pos_limit(*account_ptr, api::Venue::VENUE_GLBX, api::SecurityType::SECURITYTYPE_FUTURE, "ES", 1000, true, 1000, 2001); + add_account_sec_pos_limit(*account_ptr, api::Venue::VENUE_GLBX, api::SecurityType::SECURITYTYPE_FUTURE, "ES", 0, false, 100, 201); // add clip sizes - add_account_sec_clip_size(*account_ptr, api::Venue::VENUE_GLBX, - api::SecurityType::SECURITYTYPE_FUTURE, "SI", 0, - false, 11); - add_account_sec_clip_size(*account_ptr, api::Venue::VENUE_GLBX, - api::SecurityType::SECURITYTYPE_FUTURE, "ES", - sec_1.id(), true, 1001); - add_account_sec_clip_size(*account_ptr, api::Venue::VENUE_GLBX, - api::SecurityType::SECURITYTYPE_FUTURE, "SI", - sec_2.id(), true, 101); + add_account_sec_clip_size(*account_ptr, api::Venue::VENUE_GLBX, api::SecurityType::SECURITYTYPE_FUTURE, "SI", 0, false, 11); + add_account_sec_clip_size(*account_ptr, api::Venue::VENUE_GLBX, api::SecurityType::SECURITYTYPE_FUTURE, "ES", sec_1.id(), true, 1001); + add_account_sec_clip_size(*account_ptr, api::Venue::VENUE_GLBX, api::SecurityType::SECURITYTYPE_FUTURE, "SI", sec_2.id(), true, 101); // validate pos limits went in - REQUIRE(account_ptr->security_position_limits(0).long_position_limit() == - 10); - REQUIRE(account_ptr->security_position_limits(1).long_position_limit() == - 1000); - REQUIRE(account_ptr->security_position_limits(2).long_position_limit() == - 100); + REQUIRE(account_ptr->security_position_limits(0).long_position_limit() == 10); + REQUIRE(account_ptr->security_position_limits(1).long_position_limit() == 1000); + REQUIRE(account_ptr->security_position_limits(2).long_position_limit() == 100); // validate clip sizes went in REQUIRE(account_ptr->security_clip_limits().limit(0).clip_size() == 11); REQUIRE(account_ptr->security_clip_limits().limit(1).clip_size() == 1001); @@ -185,36 +148,22 @@ TEST_CASE("Limit Rule Res", "[limiter]") { // sort order bts::admin::AdminServiceUtils::sort_limits(*account_ptr); // validate pos limits order - REQUIRE(account_ptr->security_position_limits(0).long_position_limit() == - 1000); - REQUIRE(account_ptr->security_position_limits(1).long_position_limit() == - 100); - REQUIRE(account_ptr->security_position_limits(2).long_position_limit() == - 10); + REQUIRE(account_ptr->security_position_limits(0).long_position_limit() == 1000); + REQUIRE(account_ptr->security_position_limits(1).long_position_limit() == 100); + REQUIRE(account_ptr->security_position_limits(2).long_position_limit() == 10); // validate clip sizes order REQUIRE(account_ptr->security_clip_limits().limit(2).clip_size() == 11); - // resolve pos - auto sec_1_limit = - bts::admin::AdminServiceUtils::find_account_security_position_limit( - *account_ptr, sec_1); + // resolve pos + auto sec_1_limit = bts::admin::AdminServiceUtils::find_account_security_position_limit (*account_ptr, sec_1); REQUIRE(sec_1_limit->long_position_limit() == 1000); - auto sec_2_limit = - bts::admin::AdminServiceUtils::find_account_security_position_limit( - *account_ptr, sec_2); + auto sec_2_limit = bts::admin::AdminServiceUtils::find_account_security_position_limit (*account_ptr, sec_2); REQUIRE(sec_2_limit->long_position_limit() == 10); // resolve clip sizes - auto sec_1_clip = - bts::admin::AdminServiceUtils::find_account_security_clip_size( - *account_ptr, sec_1); + auto sec_1_clip = bts::admin::AdminServiceUtils::find_account_security_clip_size (*account_ptr, sec_1); REQUIRE(sec_1_clip == 1001); - auto sec_2_clip = - bts::admin::AdminServiceUtils::find_account_security_clip_size( - *account_ptr, sec_2); + auto sec_2_clip = bts::admin::AdminServiceUtils::find_account_security_clip_size (*account_ptr, sec_2); REQUIRE(sec_2_clip == 101); - auto sec_3_clip = - bts::admin::AdminServiceUtils::find_account_security_clip_size( - *account_ptr, sec_3); + auto sec_3_clip = bts::admin::AdminServiceUtils::find_account_security_clip_size (*account_ptr, sec_3); REQUIRE(sec_3_clip == 11); } -} // namespace orderman -} // namespace bts +}} diff --git a/src/lib/orderman/order_factory/DynamicOrderRegistry.cpp b/src/lib/orderman/order_factory/DynamicOrderRegistry.cpp index a2fda91b4..082b8ddab 100644 --- a/src/lib/orderman/order_factory/DynamicOrderRegistry.cpp +++ b/src/lib/orderman/order_factory/DynamicOrderRegistry.cpp @@ -40,5 +40,6 @@ DynamicOrderRegistry::get_all_dynamic_order_types() const { return result; } + } // namespace orderman } // namespace bts diff --git a/src/lib/orderman/order_factory/OrderFactory.cpp b/src/lib/orderman/order_factory/OrderFactory.cpp index a5eb59f90..1207b7764 100644 --- a/src/lib/orderman/order_factory/OrderFactory.cpp +++ b/src/lib/orderman/order_factory/OrderFactory.cpp @@ -17,8 +17,8 @@ #include "lib/orderman/orders/book_algos/CoverOrder.h" #include "lib/orderman/orders/book_algos/JoinOrder.h" #include "lib/orderman/orders/book_algos/LeanOrder.h" -#include "lib/orderman/orders/book_algos/OffsetOrder.h" #include "lib/orderman/orders/book_algos/TickOrder.h" +#include "lib/orderman/orders/book_algos/OffsetOrder.h" #include "lib/orderman/orders/book_algos/TopOrder.h" #include "lib/orderman/orders/spreader_orders/SpreaderOrder.h" @@ -153,7 +153,7 @@ Order &OrderFactory::allocate(OrderKey k, OrderKey pk, break; case CustomOrderDefinition::kOffset: order_ptr.reset(new orderman::OffsetOrder()); - break; + break; case CustomOrderDefinition::kDynamic: { order_ptr = me->dynamic_order_registry.build( def.custom_def().dynamic().dynamic_order_type()); diff --git a/src/lib/orderman/order_router/OrderRouter.cpp b/src/lib/orderman/order_router/OrderRouter.cpp index 24a710c5c..a174047d5 100644 --- a/src/lib/orderman/order_router/OrderRouter.cpp +++ b/src/lib/orderman/order_router/OrderRouter.cpp @@ -66,5 +66,5 @@ bool OrderRouter::is_valid_session(std::string const &session) const { } OrderRouter::~OrderRouter() {} -} // namespace orderman -} // namespace bts +} +} diff --git a/src/lib/orderman/orderman_utils/EventStream.h b/src/lib/orderman/orderman_utils/EventStream.h index 481c9791c..c4a191ab7 100644 --- a/src/lib/orderman/orderman_utils/EventStream.h +++ b/src/lib/orderman/orderman_utils/EventStream.h @@ -13,50 +13,27 @@ struct EventStream using CS = mercury::ContentSubscription; using SubID = typename CS::SubID; - EventStream () : cs (nullptr) {} - EventStream (CS&cs) : cs (&cs) {} - - void init(CS&csub) - { - bts_assert(!cs); - cs = ⫏ - } + EventStream (CS&cs) : cs (cs) {} template SubID sub(typename CS::Key k, CB&&cb) { - auto s = cs->sub(k,std::forward (cb)); + auto s = cs.sub(k,std::forward (cb)); active_subs.push_back(s); return s; } template SubID sub(CB&&cb) { - auto s = cs->sub(std::forward (cb)); + auto s = cs.sub(std::forward (cb)); active_subs.push_back(s); return s; } - EventStream& operator=(EventStream &&src) - { - cs = src.cs; - src.cs = nullptr; - active_subs = src.active_subs; - src.active_subs.clear(); - return *this; - } - - EventStream& operator=(EventStream const &src) - { - cs = src.cs; - active_subs = src.active_subs; - return *this; - } - void unsub(SubID sid) { auto it = std::find(active_subs.begin(), active_subs.end(),sid); if (it != active_subs.end()) { active_subs.erase(it); - cs->unsub(sid); + cs.unsub(sid); } } @@ -69,7 +46,7 @@ struct EventStream } private: - CS *cs; + CS &cs; boost::container::small_vector active_subs; }; diff --git a/src/lib/orderman/orders/DynamicOrder.cpp b/src/lib/orderman/orders/DynamicOrder.cpp index df6670c3f..3326b62e0 100644 --- a/src/lib/orderman/orders/DynamicOrder.cpp +++ b/src/lib/orderman/orders/DynamicOrder.cpp @@ -49,13 +49,13 @@ void DynamicOrder::on_init_recovered(api::orderman::OrderRecord const &rec, } void DynamicOrder::on_activate(Price, Quantity, OrderServices &services, - trace::CorID const &) { + PerfTrace const &) { services.report_state(me->state); } -void DynamicOrder::on_update(Price, Quantity, trace::CorID const &) {} -void DynamicOrder::on_crack(trace::CorID const &) {} -void DynamicOrder::on_cancel(trace::CorID const &) {} +void DynamicOrder::on_update(Price, Quantity, PerfTrace const &) {} +void DynamicOrder::on_crack(PerfTrace const &) {} +void DynamicOrder::on_cancel(PerfTrace const &) {} } // namespace orderman } // namespace bts diff --git a/src/lib/orderman/orders/DynamicOrder.h b/src/lib/orderman/orders/DynamicOrder.h index d346b6b5c..5318649bf 100644 --- a/src/lib/orderman/orders/DynamicOrder.h +++ b/src/lib/orderman/orders/DynamicOrder.h @@ -19,10 +19,10 @@ public: const PreActivationOrderServices&) override; void on_init_recovered(api::orderman::OrderRecord const&, const PreActivationOrderServices &) override; - void on_activate(Price,Quantity,OrderServices &, trace::CorID const&) override ; - void on_update(Price , Quantity,trace::CorID const&) override ; - void on_crack(trace::CorID const&) override ; - void on_cancel(trace::CorID const&) override ; + void on_activate(Price,Quantity,OrderServices &, PerfTrace const&) override ; + void on_update(Price , Quantity,PerfTrace const&) override ; + void on_crack(PerfTrace const&) override ; + void on_cancel(PerfTrace const&) override ; private: struct PImpl; diff --git a/src/lib/orderman/orders/IcebergOrder.cpp b/src/lib/orderman/orders/IcebergOrder.cpp index df72b6911..f533f50f3 100644 --- a/src/lib/orderman/orders/IcebergOrder.cpp +++ b/src/lib/orderman/orders/IcebergOrder.cpp @@ -1,11 +1,11 @@ #include "IcebergOrder.h" -#include "lib/config/config.h" -#include "lib/config/protos/orderman_cfg.pb.h" #include "lib/logging/logging.h" #include "lib/mercury/events/TimerEvent.h" #include "lib/orderman/actors/order_manager/OrderBuilder.h" #include "lib/utils/PBUtils.h" #include "lib/utils/bts_chrono.h" +#include "lib/config/config.h" +#include "lib/config/protos/orderman_cfg.pb.h" #include @@ -104,7 +104,7 @@ void IcebergOrder::on_init_recovered(api::orderman::OrderRecord const &rec, } void IcebergOrder::on_activate(Price p, Quantity q, OrderServices &services, - trace::CorID const &) { + PerfTrace const &) { bts_assert(!me->services); me->services = &services; me->child_builder.activate(services); @@ -114,10 +114,10 @@ void IcebergOrder::on_activate(Price p, Quantity q, OrderServices &services, me->state.set_price(p.value()); me->state.set_quantity(q.value()); if (me->pause_between_orders) - services.subscribe_to_time( + services.time_change.sub( [this](auto const &time) { this->on_time(time); }); - services.subscribe_to_child_updates( - [this](auto const &os) { this->on_child_order_update(os); }); + services.child_updates.sub( + key(), [this](auto const &os) { this->on_child_order_update(os); }); transition(ORDER_STATUS_WORKING); me->working_sub_status = WorkingSubStatus::WORKING; send_next_child_order(); @@ -145,7 +145,7 @@ void IcebergOrder::on_activate(Price p, Quantity q, OrderServices &services, report_state(); } -void IcebergOrder::on_update(Price p, Quantity q, trace::CorID const &) { +void IcebergOrder::on_update(Price p, Quantity q, PerfTrace const &) { switch (me->state.status()) { case ORDER_STATUS_WORKING: case ORDER_STATUS_PENDING_WORKING: @@ -171,9 +171,9 @@ void IcebergOrder::on_update(Price p, Quantity q, trace::CorID const &) { report_state(); } -void IcebergOrder::on_crack(trace::CorID const &) {} +void IcebergOrder::on_crack(PerfTrace const &) {} -void IcebergOrder::on_cancel(trace::CorID const &) { +void IcebergOrder::on_cancel(PerfTrace const &) { switch (me->state.status()) { case ORDER_STATUS_WORKING: LOG(OrderMan, Info, "Canceling Iceberg Order {}", key().value()); @@ -255,7 +255,7 @@ void IcebergOrder::send_next_child_order() { key().value(), me->child.order.key().value(), to_send, me->state.price(), me->state.filled_quantity(), me->state.quantity()); - me->child.order.activate(Price(me->state.price()), Quantity(to_send), trace::CorID()); + me->child.order.activate(Price(me->state.price()), Quantity(to_send)); } void IcebergOrder::on_child_order_update(OrderStateUpdateEvent const &ev) { diff --git a/src/lib/orderman/orders/IcebergOrder.h b/src/lib/orderman/orders/IcebergOrder.h index c0b3f8ceb..a7442b923 100644 --- a/src/lib/orderman/orders/IcebergOrder.h +++ b/src/lib/orderman/orders/IcebergOrder.h @@ -20,10 +20,10 @@ public: const PreActivationOrderServices&) override; void on_init_recovered(api::orderman::OrderRecord const&, const PreActivationOrderServices &) override; - void on_activate(Price,Quantity,OrderServices &, trace::CorID const&) override ; - void on_update(Price , Quantity,trace::CorID const&) override ; - void on_crack(trace::CorID const&) override ; - void on_cancel(trace::CorID const&) override ; + void on_activate(Price,Quantity,OrderServices &, PerfTrace const&) override ; + void on_update(Price , Quantity,PerfTrace const&) override ; + void on_crack(PerfTrace const&) override ; + void on_cancel(PerfTrace const&) override ; private: void report_state(); diff --git a/src/lib/orderman/orders/NativeOrder.cpp b/src/lib/orderman/orders/NativeOrder.cpp index 33b89aadd..8d8ab3757 100644 --- a/src/lib/orderman/orders/NativeOrder.cpp +++ b/src/lib/orderman/orders/NativeOrder.cpp @@ -30,7 +30,7 @@ struct NativeOrder::PImpl { PImpl() : services(nullptr), session_services(), sec(nullptr), previous_position_contribution(0), definition(), state(), - price_encoding_precision(7), have_exchange_order_id(false) {} + price_encoding_precision(7),have_exchange_order_id(false) {} OrderServices *services; SessionServices *session_services; @@ -42,7 +42,7 @@ struct NativeOrder::PImpl { OrderState state; int price_encoding_precision; bool have_exchange_order_id; - + jetfix::FIXFragment update_encoding; jetfix::FIXFragment::Bookmark update_price_bm; jetfix::FIXFragment::Bookmark update_quantity_bm; @@ -274,9 +274,14 @@ NativeOrder::~NativeOrder() {} void NativeOrder::on_activate(Price p, Quantity q, bts::orderman::OrderServices &services, - trace::CorID const &trace) { - services.log(trace,"on_activate_start",key().value()); + PerfTrace const &t) { + LOG(Latency,Info, "on_activate start {}", key().value()); + + auto trace = t; + trace.order_key = key().value(); + trace.order_update = utils::TimeStamp::now(); + tracepoint(bts_trace, trace_order, (char *)"on_activate", 0, trace.md_sn, key().value()); bts_assert(!me->services); me->services = &services; @@ -353,11 +358,11 @@ void NativeOrder::on_activate(Price p, Quantity q, // if we are here we are good. // subscribe to usefull events - me->session_services->subscribe_to_exe_report( + me->session_services->exe_reports.sub( key(), [this](auto const &r) { this->on_exe_report(r); }); - me->session_services->subscribe_to_cancel_reject( + me->session_services->cancel_rejects.sub( key(), [this](auto const &cr) { this->on_cancel_reject(cr); }); - me->session_services->subscribe_to_gateway_status( + me->session_services->gateway_status.sub( [this](auto const &gw) { this->on_gateway_status(gw); }); // send out order @@ -384,13 +389,14 @@ void NativeOrder::on_activate(Price p, Quantity q, auto const &ts = services.get_time_str(); me->create_transact_time_bm = encoding.overwrite( me->create_transact_time_bm, &ts.value()[0], ts.value().size()); - services.log(trace,"send_fix_buffer",key().value()); + trace.send_fix_buffer = utils::TimeStamp::now(); me->session_services->queue_fix(jetfix::MessageTypes::NewOrderSingle, me->create_encoding, trace); me->session_services->governor().record_sent(); me->state.set_status(ORDER_STATUS_PENDING_WORKING); - services.log(trace,"on_activate_done",key().value()); + LOG(Latency,Diag, "on_activate done fix {} t: {}us", key().value(), + (utils::TimeStamp::now() - trace.order_update).microseconds()); LOG(OrderMan, Info, "Sent new order with key {} to gateway", key().value()); // early return so we skip the expensive report_state() call @@ -401,11 +407,11 @@ void NativeOrder::on_activate(Price p, Quantity q, case ORDER_STATUS_WORKING: me->session_services = &me->services->get_session_services( get_native_state(me->state).routing_record().session()); - me->session_services->subscribe_to_exe_report( + me->session_services->exe_reports.sub( key(), [this](auto const &r) { this->on_exe_report(r); }); - me->session_services->subscribe_to_cancel_reject( + me->session_services->cancel_rejects.sub( key(), [this](auto const &cr) { this->on_cancel_reject(cr); }); - me->session_services->subscribe_to_gateway_status( + me->session_services->gateway_status.sub( [this](auto const &gw) { this->on_gateway_status(gw); }); if (!me->session_services->is_gateway_connected()) @@ -415,11 +421,11 @@ void NativeOrder::on_activate(Price p, Quantity q, case ORDER_STATUS_DISCONNECTED: me->session_services = &me->services->get_session_services( get_native_state(me->state).routing_record().session()); - me->session_services->subscribe_to_exe_report( + me->session_services->exe_reports.sub( key(), [this](auto const &r) { this->on_exe_report(r); }); - me->session_services->subscribe_to_cancel_reject( + me->session_services->cancel_rejects.sub( key(), [this](auto const &cr) { this->on_cancel_reject(cr); }); - me->session_services->subscribe_to_gateway_status( + me->session_services->gateway_status.sub( [this](auto const &gw) { this->on_gateway_status(gw); }); if (me->session_services->is_gateway_connected()) @@ -429,11 +435,11 @@ void NativeOrder::on_activate(Price p, Quantity q, case ORDER_STATUS_PENDING_WORKING: me->session_services = &me->services->get_session_services( get_native_state(me->state).routing_record().session()); - me->session_services->subscribe_to_exe_report( + me->session_services->exe_reports.sub( key(), [this](auto const &r) { this->on_exe_report(r); }); - me->session_services->subscribe_to_cancel_reject( + me->session_services->cancel_rejects.sub( key(), [this](auto const &cr) { this->on_cancel_reject(cr); }); - me->session_services->subscribe_to_gateway_status( + me->session_services->gateway_status.sub( [this](auto const &gw) { this->on_gateway_status(gw); }); break; @@ -451,9 +457,12 @@ void NativeOrder::on_activate(Price p, Quantity q, report_state(); } -void NativeOrder::on_update(Price p, Quantity q, trace::CorID const &trace) { - - me->services->log(trace,"order_update",key().value()); +void NativeOrder::on_update(Price p, Quantity q, PerfTrace const &t) { + auto trace = t; + trace.order_update = utils::TimeStamp::now(); + trace.order_key = key().value(); + tracepoint(bts_trace, trace_order, (char *)"on_update.begin", 0, trace.md_sn, + trace.order_key); switch (me->state.status()) { @@ -505,6 +514,9 @@ void NativeOrder::on_update(Price p, Quantity q, trace::CorID const &trace) { break; } + tracepoint(bts_trace, trace_order, (char *)"on_update.after_limits", 0, + trace.md_sn, trace.order_key); + // all good auto &encoding = me->update_encoding; me->update_price_bm = encoding.overwrite( @@ -514,6 +526,9 @@ void NativeOrder::on_update(Price p, Quantity q, trace::CorID const &trace) { me->update_quantity_bm = encoding.overwrite(me->update_quantity_bm, q.value(), quantity_sz()); + tracepoint(bts_trace, trace_order, (char *)"on_update.half_way", 0, + trace.md_sn, trace.order_key); + auto const &ts = me->services->get_time_str(); me->update_transact_time_bm = encoding.overwrite( me->update_transact_time_bm, &ts.value()[0], ts.value().size()); @@ -548,9 +563,9 @@ void NativeOrder::on_update(Price p, Quantity q, trace::CorID const &trace) { report_state(); } -void NativeOrder::on_crack(trace::CorID const &) {} +void NativeOrder::on_crack(PerfTrace const &) {} -void NativeOrder::on_cancel(trace::CorID const &trace) { +void NativeOrder::on_cancel(PerfTrace const &trace) { switch (me->state.status()) { case ORDER_STATUS_WORKING: { @@ -802,7 +817,7 @@ void NativeOrder::update_working_position() { key().value(), me->definition.security_key()); } -void NativeOrder::report_state(trace::CorID const &trace) { +void NativeOrder::report_state(PerfTrace const &trace) { update_working_position(); me->services->report_state(me->state, trace); } diff --git a/src/lib/orderman/orders/NativeOrder.h b/src/lib/orderman/orders/NativeOrder.h index 88c040a58..d1b52279c 100644 --- a/src/lib/orderman/orders/NativeOrder.h +++ b/src/lib/orderman/orders/NativeOrder.h @@ -3,7 +3,7 @@ #include #include "lib/orderman/orders/Order.h" #include "lib/api/services/OrderService.pb.h" -#include "lib/tracing/PerfLog.h" +#include "lib/orderman/orderman_utils/PerfTrace.h" namespace bts { namespace orderman { @@ -24,10 +24,10 @@ public: const PreActivationOrderServices&) override; void on_init_recovered(api::orderman::OrderRecord const&, const PreActivationOrderServices &) override; - void on_activate(Price,Quantity,OrderServices &, trace::CorID const&) override ; - void on_update(Price , Quantity,trace::CorID const&) override ; - void on_crack(trace::CorID const&) override ; - void on_cancel(trace::CorID const&) override ; + void on_activate(Price,Quantity,OrderServices &, PerfTrace const&) override ; + void on_update(Price , Quantity,PerfTrace const&) override ; + void on_crack(PerfTrace const&) override ; + void on_cancel(PerfTrace const&) override ; void on_init_from_exe_report(ExecutionReport const&,const PreActivationOrderServices &); private: @@ -36,7 +36,7 @@ private: void on_exe_report(const NewExecutionReportEvent &); void on_cancel_reject(const CancelRejectEvent&); void on_gateway_status(const GatewayStatusChangeEvent&); - void report_state(trace::CorID const&trace = trace::CorID()); + void report_state(PerfTrace const&trace = PerfTrace()); void init_fix(); void add_exchange_order_id_to_fix(); diff --git a/src/lib/orderman/orders/Order.cpp b/src/lib/orderman/orders/Order.cpp index a25ba3779..f1f58725d 100644 --- a/src/lib/orderman/orders/Order.cpp +++ b/src/lib/orderman/orders/Order.cpp @@ -1,25 +1,8 @@ #include "Order.h" -#include "lib/orderman/actors/order_manager/OrderServices.h" namespace bts { namespace orderman { -Order::Order() -{ - _services = std::make_unique(*this); -} - -void Order::init_order_services(OrderServicesData &osd) -{ - _services->init(osd); -} - -void Order::init_order_services(OrderServicesData &osd,OrderServices &parent) -{ - _services->init(osd,parent); -} - Order::~Order() {} -} // namespace orderman -} // namespace bts +}} diff --git a/src/lib/orderman/orders/Order.h b/src/lib/orderman/orders/Order.h index eebcea1bf..ee56707d1 100644 --- a/src/lib/orderman/orders/Order.h +++ b/src/lib/orderman/orders/Order.h @@ -5,13 +5,11 @@ // fwd namespace bts { -namespace trace {struct CorID;} namespace securities { class ISecurityDB; } namespace orderman { class IOrderFactory; -class OrderServicesData; } namespace api { namespace orderman { @@ -31,7 +29,6 @@ class OrderServices; class Order { public: - Order(); virtual ~Order(); OrderKey key() const { return _key; } @@ -46,21 +43,17 @@ class Order { const PreActivationOrderServices &) = 0; // activation - cannot be slow - virtual void on_activate(Price, Quantity, OrderServices &, trace::CorID const&) = 0; + virtual void on_activate(Price, Quantity, OrderServices &, PerfTrace const&) = 0; // order is running, maintenance - virtual void on_update(Price, Quantity, trace::CorID const&) = 0; - virtual void on_crack(trace::CorID const&) = 0; - virtual void on_cancel(trace::CorID const&) = 0; + virtual void on_update(Price, Quantity, PerfTrace const&) = 0; + virtual void on_crack(PerfTrace const&) = 0; + virtual void on_cancel(PerfTrace const&) = 0; private: OrderKey _key; OrderKey _parent_key; - std::unique_ptr _services; - void init_order_services(OrderServicesData &); - void init_order_services(OrderServicesData &,OrderServices &parent); friend class OrderFactory; - friend class OrderManager; }; } } diff --git a/src/lib/orderman/orders/TimeBoxOrder.cpp b/src/lib/orderman/orders/TimeBoxOrder.cpp index 8ad686489..542d86a06 100644 --- a/src/lib/orderman/orders/TimeBoxOrder.cpp +++ b/src/lib/orderman/orders/TimeBoxOrder.cpp @@ -1,6 +1,6 @@ #include "TimeBoxOrder.h" -#include "lib/orderman/actors/order_manager/OrderBuilder.h" #include "lib/utils/PBUtils.h" +#include "lib/orderman/actors/order_manager/OrderBuilder.h" #include namespace bts { @@ -38,7 +38,7 @@ void TimeBoxOrder::on_init_new(api::orderman::OrderDefinition const &def, me->start_time = timebox_def.start(); me->stop_time = timebox_def.stop(); me->child_state.set_status(ORDER_STATUS_INACTIVE); - + auto child_def = def; *child_def.mutable_custom_def() = timebox_def.child(); if (me->start_time.seconds() > utils::pb::pb_now().seconds() && @@ -84,21 +84,20 @@ void TimeBoxOrder::on_init_recovered(api::orderman::OrderRecord const &rec, } } -void TimeBoxOrder::on_activate(Price p, Quantity q, OrderServices &services, - trace::CorID const &) { +void TimeBoxOrder::on_activate(Price p, Quantity q, OrderServices &services,PerfTrace const&) { bts_assert(!me->services); me->services = &services; me->child_builder.activate(services); - + switch (me->state.status()) { case ORDER_STATUS_INACTIVE: me->child = me->child_builder.build(); me->state.set_price(p.value()); me->state.set_quantity(q.value()); - services.subscribe_to_child_updates( - [this](auto const &os) { this->on_child_order_update(os); }); - services.subscribe_to_time([this](auto) { this->on_time_change(); }); + services.child_updates.sub( + key(), [this](auto const &os) { this->on_child_order_update(os); }); + services.time_change.sub([this](auto) { this->on_time_change(); }); transition(ORDER_STATUS_WORKING); break; @@ -114,7 +113,7 @@ void TimeBoxOrder::on_activate(Price p, Quantity q, OrderServices &services, // state) case ORDER_STATUS_WORKING: case ORDER_STATUS_PENDING_WORKING: - case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_DISCONNECTED: case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: bts_assert(false); @@ -123,7 +122,7 @@ void TimeBoxOrder::on_activate(Price p, Quantity q, OrderServices &services, report_state(); } -void TimeBoxOrder::on_update(Price p, Quantity q, trace::CorID const &) { +void TimeBoxOrder::on_update(Price p, Quantity q,PerfTrace const&) { LOG(OrderMan, Info, "Updating TimeBox Order {}", key().value()); switch (me->state.status()) { @@ -141,7 +140,7 @@ void TimeBoxOrder::on_update(Price p, Quantity q, trace::CorID const &) { // we launched our child, everything is nominal me->state.set_price(p.value()); me->state.set_quantity(q.value()); - me->child.update(p, q); + me->child.update(p,q); break; case ORDER_STATUS_PENDING_WORKING: @@ -152,7 +151,7 @@ void TimeBoxOrder::on_update(Price p, Quantity q, trace::CorID const &) { // if the child was in any of these states we couldn't be // in the working state - case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_DISCONNECTED: case ORDER_STATUS_ERROR: case ORDER_STATUS_REJECTED_BY_SPARK: case ORDER_STATUS_COMPLETED: @@ -183,9 +182,9 @@ void TimeBoxOrder::on_update(Price p, Quantity q, trace::CorID const &) { report_state(); } -void TimeBoxOrder::on_crack(trace::CorID const &) {} +void TimeBoxOrder::on_crack(PerfTrace const&) {} -void TimeBoxOrder::on_cancel(trace::CorID const &) { +void TimeBoxOrder::on_cancel(PerfTrace const&) { LOG(OrderMan, Info, "Canceling TimeBox Order {}", key().value()); switch (me->state.status()) { @@ -211,7 +210,7 @@ void TimeBoxOrder::on_cancel(trace::CorID const &) { break; // child cannot be in any of these if we are in the working state - case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_DISCONNECTED: case ORDER_STATUS_ERROR: case ORDER_STATUS_REJECTED_BY_SPARK: case ORDER_STATUS_COMPLETED: @@ -264,7 +263,7 @@ void TimeBoxOrder::on_time_change() { case ORDER_STATUS_INACTIVE: { // we haven't yet launched the child, check the time and // launch it if appropriate - if (now >= me->start_time.seconds() && now < me->stop_time.seconds()) { + if ( now >= me->start_time.seconds() && now < me->stop_time.seconds()) { LOG(OrderMan, Info, "TimeBox order {} launching child {}", key().value(), me->child.key().value()); me->child.activate(Price(me->state.price()), @@ -286,12 +285,12 @@ void TimeBoxOrder::on_time_change() { report_state(); } break; - + case ORDER_STATUS_PENDING_WORKING: break; // child cannot be in any of these states if we are in the working state - case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_DISCONNECTED: case ORDER_STATUS_ERROR: case ORDER_STATUS_REJECTED_BY_SPARK: case ORDER_STATUS_COMPLETED: @@ -319,33 +318,34 @@ void TimeBoxOrder::on_time_change() { } } -void TimeBoxOrder::on_child_order_update(OrderStateUpdateEvent const &ev) { +void TimeBoxOrder::on_child_order_update(OrderStateUpdateEvent const&ev) +{ me->child_state = ev.rebuild_state(); switch (me->state.status()) { case ORDER_STATUS_WORKING: switch (ev.status) { - case ORDER_STATUS_WORKING: - case ORDER_STATUS_PENDING_WORKING: - // nothing to do but report new state - break; - case ORDER_STATUS_COMPLETED: - transition(ORDER_STATUS_COMPLETED); - break; + case ORDER_STATUS_WORKING: + case ORDER_STATUS_PENDING_WORKING: + // nothing to do but report new state + break; + case ORDER_STATUS_COMPLETED: + transition(ORDER_STATUS_COMPLETED); + break; - case ORDER_STATUS_DISCONNECTED: - case ORDER_STATUS_REJECTED_BY_SPARK: - case ORDER_STATUS_CANCELED: - case ORDER_STATUS_ERROR: - transition(ORDER_STATUS_ERROR, "Unexpected child order state"); - break; + case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_REJECTED_BY_SPARK: + case ORDER_STATUS_CANCELED: + case ORDER_STATUS_ERROR: + transition(ORDER_STATUS_ERROR, "Unexpected child order state"); + break; - case ORDER_STATUS_INACTIVE: - case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: - case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: - bts_assert(false); - break; + case ORDER_STATUS_INACTIVE: + case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: + case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: + bts_assert(false); + break; } break; @@ -368,11 +368,12 @@ void TimeBoxOrder::on_child_order_update(OrderStateUpdateEvent const &ev) { void TimeBoxOrder::report_state() { auto merged_state = me->state; - merged_state.set_filled_quantity(me->child_state.filled_quantity()); - merged_state.set_last_price(me->child_state.last_price()); - merged_state.set_avg_price(me->child_state.avg_price()); + merged_state.set_filled_quantity (me->child_state.filled_quantity()); + merged_state.set_last_price ( me->child_state.last_price()); + merged_state.set_avg_price ( me->child_state.avg_price()); me->services->report_state(merged_state); } -} // namespace orderman -} // namespace bts +} +} + diff --git a/src/lib/orderman/orders/TimeBoxOrder.h b/src/lib/orderman/orders/TimeBoxOrder.h index 9475a5a37..3a403ee38 100644 --- a/src/lib/orderman/orders/TimeBoxOrder.h +++ b/src/lib/orderman/orders/TimeBoxOrder.h @@ -19,10 +19,10 @@ public: const PreActivationOrderServices&) override; void on_init_recovered(api::orderman::OrderRecord const&, const PreActivationOrderServices &) override; - void on_activate(Price,Quantity,OrderServices &, trace::CorID const&) override ; - void on_update(Price , Quantity,trace::CorID const&) override ; - void on_crack(trace::CorID const&) override ; - void on_cancel(trace::CorID const&) override ; + void on_activate(Price,Quantity,OrderServices &, PerfTrace const&) override ; + void on_update(Price , Quantity,PerfTrace const&) override ; + void on_crack(PerfTrace const&) override ; + void on_cancel(PerfTrace const&) override ; private: void report_state(); diff --git a/src/lib/orderman/orders/TriggerOrder.cpp b/src/lib/orderman/orders/TriggerOrder.cpp index 5b8f2cc5f..f84235f59 100644 --- a/src/lib/orderman/orders/TriggerOrder.cpp +++ b/src/lib/orderman/orders/TriggerOrder.cpp @@ -1,16 +1,16 @@ #include "TriggerOrder.h" -#include "lib/domain_model/Security.h" #include "lib/logging/logging.h" +#include "lib/utils/PBUtils.h" #include "lib/orderman/actors/order_manager/OrderBuilder.h" #include "lib/orderman/events/BookUpdateEvent.h" #include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" +#include "lib/domain_model/Security.h" #include "lib/os/os.h" -#include "lib/utils/PBUtils.h" #include #include -namespace bts { -namespace orderman { +namespace bts{ +namespace orderman{ struct TriggerOrder::PImpl { OrderServices *services; @@ -42,491 +42,496 @@ struct TriggerOrder::PImpl { bool is_succ_inited; bts::TimeStamp child_order_time; PImpl() - : services(nullptr), order_def(), timeout_exit(false), - timeout_msecs(std::numeric_limits::max()), - price_cond_exit(false), state(), child_state(), child_order(), - order_placed(false), book(), cancel_mode(CancelMode::none), - market_observed_once(false), is_recovered(false), - is_succ_inited(false) {} + : + services(nullptr), + order_def(), + timeout_exit(false), + timeout_msecs(std::numeric_limits::max()), + price_cond_exit(false), + state(), + child_state(), + child_order(), + order_placed(false), + book(), + cancel_mode(CancelMode::none), + market_observed_once(false), + is_recovered(false), + is_succ_inited(false){ + } }; -TriggerOrder::TriggerOrder() : _state(State::START), me(new PImpl()) {} -TriggerOrder::~TriggerOrder() {} -const api::orderman::OrderDefinition &TriggerOrder::definition() const { +TriggerOrder::TriggerOrder() +: +_state(State::START), +me(new PImpl()){ +} +TriggerOrder::~TriggerOrder(){ +} +const api::orderman::OrderDefinition& TriggerOrder::definition() const{ return me->order_def; } -void TriggerOrder::on_init_new(const api::orderman::OrderDefinition &order_def, - const PreActivationOrderServices &pre_os) { - LOG(OrderMan, Info, "TriggerOrder::on_init_new key:{} state:{}", key(), - _state); - switch (_state) { - case State::START: - me->is_succ_inited = _on_init_new(order_def, pre_os); - break; - case State::WAITING_FOR_TRIGGER: - case State::WAITING_FOR_FIRST_ACK: - case State::STEADY: - case State::END: - std::ostringstream oss; - oss << "TriggerOrder::on_init_new key:" << key() << "state:" << _state; - bts_assert_msg(false, oss.str()); - break; +void TriggerOrder::on_init_new(const api::orderman::OrderDefinition& order_def, + const PreActivationOrderServices& pre_os){ + LOG(OrderMan, Info, "TriggerOrder::on_init_new key:{} state:{}", + key(),_state); + switch (_state){ + case State::START: + me->is_succ_inited=_on_init_new(order_def,pre_os); + break; + case State::WAITING_FOR_TRIGGER: + case State::WAITING_FOR_FIRST_ACK: + case State::STEADY: + case State::END: + std::ostringstream oss; + oss << "TriggerOrder::on_init_new key:" << key() << "state:" << _state; + bts_assert_msg(false, oss.str()); + break; } } -void TriggerOrder::on_init_recovered(const api::orderman::OrderRecord &rec, - const PreActivationOrderServices &pre_os) { - LOG(OrderMan, Info, "TriggerOrder::on_init_recovered key:{} state:{}", key(), - _state); - switch (_state) { - case State::START: - me->is_succ_inited = _on_init_new(rec.def(), pre_os); - // get the state from what was recovered (we will only use - // it for reporting) - me->state = rec.state(); - // if it was not in a terminal state, we will call it cancelled - if (!SpreaderUtils::order_in_terminal_state(me->state.status())) - me->state.set_status( - api::orderman::OrderStatus::ORDER_STATUS_CANCELED); - me->is_recovered = true; - break; - case State::WAITING_FOR_TRIGGER: - case State::WAITING_FOR_FIRST_ACK: - case State::STEADY: - case State::END: - std::ostringstream oss; - oss << "TriggerOrder::on_init_recovered key:" << key() - << "state:" << _state; - bts_assert_msg(false, oss.str()); - break; +void TriggerOrder::on_init_recovered(const api::orderman::OrderRecord& rec, + const PreActivationOrderServices& pre_os){ + LOG(OrderMan, Info, "TriggerOrder::on_init_recovered key:{} state:{}", + key(),_state); + switch (_state){ + case State::START: + me->is_succ_inited=_on_init_new(rec.def(),pre_os); + // get the state from what was recovered (we will only use + // it for reporting) + me->state=rec.state(); + // if it was not in a terminal state, we will call it cancelled + if (!SpreaderUtils::order_in_terminal_state(me->state.status())) + me->state.set_status(api::orderman::OrderStatus::ORDER_STATUS_CANCELED); + me->is_recovered=true; + break; + case State::WAITING_FOR_TRIGGER: + case State::WAITING_FOR_FIRST_ACK: + case State::STEADY: + case State::END: + std::ostringstream oss; + oss << "TriggerOrder::on_init_recovered key:" << key() << "state:" << _state; + bts_assert_msg(false, oss.str()); + break; } } -void TriggerOrder::on_activate(Price price, Quantity qty, - OrderServices &services, trace::CorID const &) { - LOG(OrderMan, Info, - "TriggerOrder::on_activate key:{} state:{} price:{} qty:{}", key(), - _state, price, qty); - switch (_state) { - case State::START: - me->services = &services; - me->state.set_price(price.value()); - me->state.set_quantity(qty.value()); - if (me->is_recovered || !me->is_succ_inited) - _switch_state(State::END); - else { - me->order_builder.activate(services); - me->child_order = me->order_builder.build(); - services.subscribe_to_child_updates( - [this](const OrderStateUpdateEvent &os) { - this->_on_child_order_update(os); - }); - services.subscribe_to_book(SecurityKey(me->order_def.security_key()), - [this](const BookUpdateEvent &bk_event) { - this->_on_book_update(bk_event); - }); - services.subscribe_to_time( - [this](const bts::mercury::TimerEvent &te) { _on_time(te); }); - _switch_state(State::WAITING_FOR_TRIGGER); +void TriggerOrder::on_activate(Price price, + Quantity qty, + OrderServices& services, + PerfTrace const&){ + LOG(OrderMan, Info, "TriggerOrder::on_activate key:{} state:{} price:{} qty:{}", + key(),_state, price, qty); + switch (_state){ + case State::START: + me->services=&services; + me->state.set_price(price.value()); + me->state.set_quantity(qty.value()); + if(me->is_recovered || !me->is_succ_inited) + _switch_state(State::END); + else{ + me->order_builder.activate(services); + me->child_order=me->order_builder.build(); + services.child_updates.sub(key(), + [this](const OrderStateUpdateEvent& os) + { this->_on_child_order_update (os);}); + services.book_updates.sub(SecurityKey(me->order_def.security_key()), + [this](const BookUpdateEvent& bk_event) + { this->_on_book_update (bk_event);}); + services.time_change.sub([this](const bts::mercury::TimerEvent& te) + {_on_time(te);}); + _switch_state(State::WAITING_FOR_TRIGGER); + } + break; + case State::WAITING_FOR_TRIGGER: + case State::WAITING_FOR_FIRST_ACK: + case State::STEADY: + case State::END:{ + std::ostringstream oss; + oss << "TriggerOrder::on_activate key:" << key() << "state:" << _state; + bts_assert_msg(false,oss.str()); + break; } - break; - case State::WAITING_FOR_TRIGGER: - case State::WAITING_FOR_FIRST_ACK: - case State::STEADY: - case State::END: { - std::ostringstream oss; - oss << "TriggerOrder::on_activate key:" << key() << "state:" << _state; - bts_assert_msg(false, oss.str()); - break; - } } } // order price, qty change -void TriggerOrder::on_update(Price price, Quantity qty, trace::CorID const &) { - LOG(OrderMan, Info, - "TriggerOrder::on_update key:{} state:{} price:{} qty:{}", key(), _state, - price, qty); - switch (_state) { - case State::START: - me->state.set_price(price.value()); - me->state.set_quantity(qty.value()); - // cant report because does not have order_services yet - break; - case State::WAITING_FOR_TRIGGER: - me->state.set_price(price.value()); - me->state.set_quantity(qty.value()); - _report_state(); - _analyze_trigger_and_shoot(); - break; - case State::WAITING_FOR_FIRST_ACK: - case State::STEADY: - me->state.set_last_msg( - "Trigger order can not be modified after the trigger has been hit"); - _report_state(); - break; - case State::END: - break; - } -} -void TriggerOrder::on_crack(trace::CorID const &) { - // not supported -} -void TriggerOrder::on_cancel(trace::CorID const &) { - LOG(OrderMan, Info, "TriggerOrder::on_cancel key:{} state:{}", key(), - _state); - me->cancel_mode = CancelMode::external; - switch (_state) { - case State::START: - _switch_state(State::END); - break; - case State::WAITING_FOR_TRIGGER: - _switch_state(State::END); - break; - case State::WAITING_FOR_FIRST_ACK: - // we dont have a WAITING_FOR_ACK_CANCELLED - // (like the Quoter), so this message is - // rejected and reported - me->state.set_last_msg("Order is in flight"); - _report_state(); - break; - case State::STEADY: - _cancel_order(CancelMode::external); - break; - case State::END: - break; - } -} -void TriggerOrder::_on_book_update(const BookUpdateEvent &b_event) { - switch (_state) { - case State::START: - break; - case State::WAITING_FOR_TRIGGER: - if (b_event.key().value() == me->order_def.security_key()) { - me->book = b_event.book; - _observe_market_once(); - _analyze_trigger_and_shoot(); - } - break; - case State::WAITING_FOR_FIRST_ACK: - break; - case State::STEADY: - if (b_event.key().value() == me->order_def.security_key()) { - if (me->price_cond_exit) { - me->book = b_event.book; - _analyze_trigger_and_cancel(); - } - } - case State::END: - break; - } -} -void TriggerOrder::_on_child_order_update(const OrderStateUpdateEvent &o_ev) { - if (o_ev.key == me->child_order.key()) { - auto ev_state = o_ev.rebuild_state(); - me->child_state = ev_state; - switch (_state) { +void TriggerOrder::on_update(Price price, + Quantity qty, + PerfTrace const&){ + LOG(OrderMan, Info, "TriggerOrder::on_update key:{} state:{} price:{} qty:{}", + key(),_state, price, qty); + switch (_state){ case State::START: + me->state.set_price(price.value()); + me->state.set_quantity(qty.value()); + // cant report because does not have order_services yet + break; case State::WAITING_FOR_TRIGGER: - bts_assert(false); + me->state.set_price(price.value()); + me->state.set_quantity(qty.value()); + _report_state(); + _analyze_trigger_and_shoot(); break; case State::WAITING_FOR_FIRST_ACK: - if (SpreaderUtils::order_acknowledged(o_ev.status)) { - if (SpreaderUtils::order_in_terminal_state(o_ev.status)) - _switch_state(State::END); - else - _switch_state(State::STEADY); - } - break; - case State::STEADY: - if (SpreaderUtils::order_in_terminal_state(ev_state.status())) - _switch_state(State::END); + case State::STEADY: + me->state.set_last_msg("Trigger order can not be modified after the trigger has been hit"); + _report_state(); break; case State::END: break; + } +} +void TriggerOrder::on_crack(PerfTrace const&){ + // not supported +} +void TriggerOrder::on_cancel(PerfTrace const&){ + LOG(OrderMan, Info, "TriggerOrder::on_cancel key:{} state:{}", + key(),_state); + me->cancel_mode=CancelMode::external; + switch (_state){ + case State::START: + _switch_state(State::END); + break; + case State::WAITING_FOR_TRIGGER: + _switch_state(State::END); + break; + case State::WAITING_FOR_FIRST_ACK: + // we dont have a WAITING_FOR_ACK_CANCELLED + // (like the Quoter), so this message is + // rejected and reported + me->state.set_last_msg("Order is in flight"); + _report_state(); + break; + case State::STEADY: + _cancel_order(CancelMode::external); + break; + case State::END: + break; + } +} +void TriggerOrder::_on_book_update(const BookUpdateEvent& b_event){ + switch (_state){ + case State::START: + break; + case State::WAITING_FOR_TRIGGER: + if(b_event.key().value()==me->order_def.security_key()){ + me->book=b_event.book; + _observe_market_once(); + _analyze_trigger_and_shoot(); + } + break; + case State::WAITING_FOR_FIRST_ACK: + break; + case State::STEADY: + if(b_event.key().value()==me->order_def.security_key()){ + if(me->price_cond_exit){ + me->book=b_event.book; + _analyze_trigger_and_cancel(); + } + } + case State::END: + break; + } +} +void TriggerOrder::_on_child_order_update(const OrderStateUpdateEvent& o_ev){ + if(o_ev.key==me->child_order.key()){ + auto ev_state = o_ev.rebuild_state(); + me->child_state=ev_state; + switch (_state){ + case State::START: + case State::WAITING_FOR_TRIGGER: + bts_assert(false); + break; + case State::WAITING_FOR_FIRST_ACK: + if(SpreaderUtils::order_acknowledged(o_ev.status)){ + if(SpreaderUtils::order_in_terminal_state(o_ev.status)) + _switch_state(State::END); + else + _switch_state(State::STEADY); + } + break; + case State::STEADY: + if(SpreaderUtils::order_in_terminal_state(ev_state.status())) + _switch_state(State::END); + break; + case State::END: + break; } _report_state(); } } -void TriggerOrder::_on_time(const bts::mercury::TimerEvent &) { - switch (_state) { - case State::START: - case State::WAITING_FOR_TRIGGER: - case State::WAITING_FOR_FIRST_ACK: - break; - case State::STEADY: { - if (me->timeout_exit) - _analyze_trigger_and_cancel(); - break; - } - case State::END: - break; +void TriggerOrder::_on_time(const bts::mercury::TimerEvent&){ + switch (_state){ + case State::START: + case State::WAITING_FOR_TRIGGER: + case State::WAITING_FOR_FIRST_ACK: + break; + case State::STEADY:{ + if(me->timeout_exit) + _analyze_trigger_and_cancel(); + break; + } + case State::END: + break; } } -bool TriggerOrder::_on_init_new(const api::orderman::OrderDefinition &order_def, - const PreActivationOrderServices &pre_os) { - me->order_def = order_def; - if (!me->order_def.has_custom_def() || - !me->order_def.custom_def().has_trigger()) { - LOG(OrderMan, Error, - "TriggerOrder::_on_init_new key:{} state:{} " - "OrderDefinition does not have TriggerOrderDefinition", - key(), _state); +bool TriggerOrder::_on_init_new(const api::orderman::OrderDefinition& order_def, + const PreActivationOrderServices& pre_os){ + me->order_def=order_def; + if (!me->order_def.has_custom_def() || !me->order_def.custom_def().has_trigger()){ + LOG(OrderMan, Error, "TriggerOrder::_on_init_new key:{} state:{} " + "OrderDefinition does not have TriggerOrderDefinition", + key(),_state); me->state.set_last_msg("Trigger Order not properly formed"); return false; } - if (pre_os.sec_db.resolve(SecurityKey(order_def.security_key())) == - nullptr) { - LOG(OrderMan, Error, - "TriggerOrder::_on_init_new key:{} state:{} " - "Could not resolve sec_key:{}", - key(), _state, order_def.security_key()); + if (pre_os.sec_db.resolve(SecurityKey(order_def.security_key()))==nullptr){ + LOG(OrderMan, Error, "TriggerOrder::_on_init_new key:{} state:{} " + "Could not resolve sec_key:{}", + key(),_state, order_def.security_key()); me->state.set_last_msg("Could not resolve Trigger Order security"); return false; - } - const auto &trigger_order_def = order_def.custom_def().trigger(); - if (pre_os.sec_db.resolve(SecurityKey( - trigger_order_def.trigger_action().security_id())) == nullptr) { - LOG(OrderMan, Error, - "TriggerOrder::_on_init_new key:{} state:{} " - "Could not resolve child key sec_key:{}", - key(), _state, trigger_order_def.trigger_action().security_id()); + } + const auto& trigger_order_def=order_def.custom_def().trigger(); + if(pre_os.sec_db.resolve(SecurityKey(trigger_order_def.trigger_action().security_id())) == nullptr){ + LOG(OrderMan, Error, "TriggerOrder::_on_init_new key:{} state:{} " + "Could not resolve child key sec_key:{}", + key(),_state, trigger_order_def.trigger_action().security_id()); me->state.set_last_msg("Could not resolve Trigger Order child security"); return false; } if (!trigger_order_def.trigger_action().has_payup() && - bts::os::is_nan(trigger_order_def.trigger_action().price())) { - LOG(OrderMan, Error, - "TriggerOrder::_on_init_new key:{} state:{} " - "illegal child order price", - key(), _state); + bts::os::is_nan(trigger_order_def.trigger_action().price())){ + LOG(OrderMan, Error, "TriggerOrder::_on_init_new key:{} state:{} " + "illegal child order price", + key(),_state); me->state.set_last_msg("Illegal Child Order price"); return false; } me->timeout_exit = trigger_order_def.has_exit_condition() && - trigger_order_def.exit_condition().timeout_enabled(); - me->timeout_msecs = - trigger_order_def.has_exit_condition() - ? 1000.0 * trigger_order_def.exit_condition().timeout_seconds() - : std::numeric_limits::max(); - me->price_cond_exit = - trigger_order_def.has_exit_condition() && - trigger_order_def.exit_condition().conditional_cancel(); + trigger_order_def.exit_condition().timeout_enabled(); + me->timeout_msecs = trigger_order_def.has_exit_condition() ? + 1000.0*trigger_order_def.exit_condition().timeout_seconds () : + std::numeric_limits::max(); + me->price_cond_exit = trigger_order_def.has_exit_condition() && + trigger_order_def.exit_condition().conditional_cancel(); api::orderman::OrderDefinition child_order_def = order_def; - child_order_def.set_security_key( - trigger_order_def.trigger_action().security_id()); + child_order_def.set_security_key(trigger_order_def.trigger_action().security_id()); child_order_def.mutable_custom_def()->CopyFrom(trigger_order_def.child()); - me->order_builder = OrderBuilder(key(), child_order_def, pre_os); - const auto *sec_ptr = - pre_os.sec_db.resolve(SecurityKey(order_def.security_key())); - me->tick_size = std::min(sec_ptr->contract_spec().low_tick(), - sec_ptr->contract_spec().high_tick()); - LOG(OrderMan, Info, - "TriggerOrder::_on_init_new key:{} state:{} " - "trigger_price_type:{} child_order_price:{}", - key(), _state, trigger_order_def.trigger_condition().price_type(), - trigger_order_def.trigger_action().price()); + me->order_builder=OrderBuilder(key(),child_order_def,pre_os); + const auto* sec_ptr = pre_os.sec_db.resolve(SecurityKey(order_def.security_key())); + me->tick_size=std::min(sec_ptr->contract_spec().low_tick(), + sec_ptr->contract_spec().high_tick()); + LOG(OrderMan, Info, "TriggerOrder::_on_init_new key:{} state:{} " + "trigger_price_type:{} child_order_price:{}", + key(),_state, + trigger_order_def.trigger_condition().price_type(), + trigger_order_def.trigger_action().price()); return true; } -void TriggerOrder::_report_state() { - if (_activated()) { +void TriggerOrder::_report_state(){ + if(_activated()){ _compute_state(); me->services->report_state(me->state); } } -void TriggerOrder::_switch_state(State new_state) { - switch (new_state) { - case State::START: - break; - case State::WAITING_FOR_TRIGGER: - bts_assert(_state == State::START); - break; - case State::WAITING_FOR_FIRST_ACK: - bts_assert(_state == State::WAITING_FOR_TRIGGER); - break; - case State::STEADY: - bts_assert(_state == State::WAITING_FOR_FIRST_ACK); - break; - case State::END: - bts_assert(_state != State::END); - break; +void TriggerOrder::_switch_state(State new_state){ + switch(new_state){ + case State::START: + break; + case State::WAITING_FOR_TRIGGER: + bts_assert(_state==State::START); + break; + case State::WAITING_FOR_FIRST_ACK: + bts_assert(_state==State::WAITING_FOR_TRIGGER); + break; + case State::STEADY: + bts_assert(_state==State::WAITING_FOR_FIRST_ACK); + break; + case State::END: + bts_assert(_state!=State::END); + break; } - LOG(OrderMan, Info, "TriggerOrder::_report_state key:{} {}->{}", key(), - _state, new_state); - _state = new_state; + LOG(OrderMan, Info, "TriggerOrder::_report_state key:{} {}->{}", + key(), + _state,new_state); + _state=new_state; _report_state(); } -void TriggerOrder::_analyze_trigger_and_shoot() { - if (me->market_observed_once) { - double trigger_price = _trigger_price(); - const md::PriceSize *obs_md = _observed_market(); - if (_trigger_met(obs_md, trigger_price, me->tick_size, - me->trigger_above_market)) { - me->child_order_time = bts::Timer::now(); - me->order_placed = true; - LOG(OrderMan, Info, - "TriggerOrder::_analyze_trigger_and_shoot" - "key:{} state:{} " - "trigger_above_md:{} trigger_price:{} md:{} " - "order_price:{} order_qty:{}", - key(), _state, me->trigger_above_market, trigger_price, - obs_md->price(), _child_order_price(), me->state.quantity()); +void TriggerOrder::_analyze_trigger_and_shoot(){ + if(me->market_observed_once){ + double trigger_price=_trigger_price(); + const md::PriceSize* obs_md=_observed_market(); + if (_trigger_met(obs_md,trigger_price, + me->tick_size,me->trigger_above_market)){ + me->child_order_time=bts::Timer::now(); + me->order_placed=true; + LOG(OrderMan, Info, "TriggerOrder::_analyze_trigger_and_shoot" + "key:{} state:{} " + "trigger_above_md:{} trigger_price:{} md:{} " + "order_price:{} order_qty:{}", + key(),_state, + me->trigger_above_market,trigger_price, + obs_md->price(), + _child_order_price(), + me->state.quantity()); me->child_order.activate(Price(_child_order_price()), Quantity(me->state.quantity())); _switch_state(State::WAITING_FOR_FIRST_ACK); } } } -void TriggerOrder::_analyze_trigger_and_cancel() { - if (me->timeout_exit) { - int64_t time_diff = ms_diff(bts::Timer::now(), me->child_order_time); - if (time_diff > me->timeout_msecs) { - LOG(OrderMan, Info, - "TriggerOrder::_analyze_trigger_and_cancel " - "key:{} state:{} msecs:{} " - "time out, cancelling order", - key(), _state, time_diff); +void TriggerOrder::_analyze_trigger_and_cancel(){ + if(me->timeout_exit){ + int64_t time_diff = ms_diff (bts::Timer::now(), me->child_order_time); + if(time_diff > me->timeout_msecs){ + LOG(OrderMan, Info, "TriggerOrder::_analyze_trigger_and_cancel " + "key:{} state:{} msecs:{} " + "time out, cancelling order", + key(),_state, time_diff); _cancel_order(CancelMode::trigger); return; } } - if (me->price_cond_exit) { - double trigger_price = _trigger_price(); - const md::PriceSize *obs_md = _observed_market(); - if (!_trigger_met(obs_md, trigger_price, me->tick_size, - me->trigger_above_market)) { - LOG(OrderMan, Info, - "TriggerOrder::_analyze_trigger_and_cancel" - "key:{} state:{} " - "price condition untrue, cancelling order" - "trigger_above_md:{} trigger_price:{} md:{} ", - key(), _state, me->trigger_above_market, trigger_price, - obs_md->price()); + if(me->price_cond_exit){ + double trigger_price=_trigger_price(); + const md::PriceSize* obs_md=_observed_market(); + if (!_trigger_met(obs_md,trigger_price, + me->tick_size,me->trigger_above_market)){ + LOG(OrderMan, Info, "TriggerOrder::_analyze_trigger_and_cancel" + "key:{} state:{} " + "price condition untrue, cancelling order" + "trigger_above_md:{} trigger_price:{} md:{} ", + key(),_state, + me->trigger_above_market,trigger_price, + obs_md->price()); _cancel_order(CancelMode::trigger); - return; + return; } } } -api::orderman::OrderStatus TriggerOrder::_status() const { - switch (_state) { - // will only be called once the order - // has been activated - case State::START: - case State::WAITING_FOR_TRIGGER: - case State::WAITING_FOR_FIRST_ACK: - case State::STEADY: - return api::orderman::OrderStatus::ORDER_STATUS_WORKING; - case State::END: - if (!me->is_succ_inited) - return api::orderman::OrderStatus::ORDER_STATUS_ERROR; - else { - if (me->order_placed) { - if (!SpreaderUtils::order_in_terminal_state( - me->child_state.status())) - return api::orderman::OrderStatus::ORDER_STATUS_WORKING; - else { - if (SpreaderUtils::order_in_error_state( - me->child_state.status())) - return api::orderman::OrderStatus::ORDER_STATUS_ERROR; - else if (SpreaderUtils::order_in_completed_state( - me->child_state.status())) - return api::orderman::OrderStatus::ORDER_STATUS_COMPLETED; - else if (SpreaderUtils::order_in_cancelled_state( - me->child_state.status())) { - switch (me->cancel_mode) { - case CancelMode::none: // this means an unscolicted child cxl - case CancelMode::external: - return api::orderman::OrderStatus::ORDER_STATUS_CANCELED; - case CancelMode::trigger: +api::orderman::OrderStatus TriggerOrder::_status() const{ + switch(_state){ + // will only be called once the order + // has been activated + case State::START: + case State::WAITING_FOR_TRIGGER: + case State::WAITING_FOR_FIRST_ACK: + case State::STEADY: + return api::orderman::OrderStatus::ORDER_STATUS_WORKING; + case State::END: + if(!me->is_succ_inited) + return api::orderman::OrderStatus::ORDER_STATUS_ERROR; + else{ + if(me->order_placed){ + if (!SpreaderUtils::order_in_terminal_state(me->child_state.status())) + return api::orderman::OrderStatus::ORDER_STATUS_WORKING; + else{ + if (SpreaderUtils::order_in_error_state(me->child_state.status())) + return api::orderman::OrderStatus::ORDER_STATUS_ERROR; + else if (SpreaderUtils::order_in_completed_state(me->child_state.status())) return api::orderman::OrderStatus::ORDER_STATUS_COMPLETED; + else if (SpreaderUtils::order_in_cancelled_state(me->child_state.status())){ + switch (me->cancel_mode){ + case CancelMode::none: //this means an unscolicted child cxl + case CancelMode::external: + return api::orderman::OrderStatus::ORDER_STATUS_CANCELED; + case CancelMode::trigger: + return api::orderman::OrderStatus::ORDER_STATUS_COMPLETED; + } } } } - } else - return api::orderman::OrderStatus::ORDER_STATUS_CANCELED; - } + else + return api::orderman::OrderStatus::ORDER_STATUS_CANCELED; + } } bts_assert(false); return api::orderman::OrderStatus::ORDER_STATUS_INACTIVE; } -void TriggerOrder::_compute_state() { - if (!me->is_recovered) { +void TriggerOrder::_compute_state(){ + if (!me->is_recovered){ me->state.set_status(_status()); me->state.set_filled_quantity(me->child_state.filled_quantity()); me->state.set_last_price(me->child_state.last_price()); me->state.set_avg_price(me->child_state.avg_price()); - if (_state == State::STEADY) + if(_state==State::STEADY) me->state.set_display_status(bts::api::orderman::OrderState::HIDDEN); else me->state.set_display_status(bts::api::orderman::OrderState::VISIBLE); + } } -void TriggerOrder::_observe_market_once() { - if (!me->market_observed_once) { - const md::PriceSize *obs_md = _observed_market(); - if (obs_md != nullptr && obs_md->size() > 0) { - me->market_observed_once = true; - me->trigger_above_market = _trigger_price() >= obs_md->price(); - LOG(OrderMan, Info, - "TriggerOrder::_observe_market_once " - "key:{} state:{} " - "md_p:{} md_q:{} trigger_above_md:{}", - key(), _state, obs_md->price(), obs_md->size(), - me->trigger_above_market); +void TriggerOrder::_observe_market_once(){ + if(!me->market_observed_once){ + const md::PriceSize* obs_md=_observed_market(); + if(obs_md != nullptr && obs_md->size()>0){ + me->market_observed_once=true; + me->trigger_above_market=_trigger_price()>=obs_md->price(); + LOG(OrderMan, Info, "TriggerOrder::_observe_market_once " + "key:{} state:{} " + "md_p:{} md_q:{} trigger_above_md:{}", + key(),_state, + obs_md->price(), obs_md->size(), + me->trigger_above_market); } } } -const md::PriceSize *TriggerOrder::_observed_market() const { - if (me->order_def.custom_def().trigger().trigger_condition().price_type() == - api::orderman::TriggerPriceType::BID) { - const auto &rv = me->book.bid()[0]; +const md::PriceSize* TriggerOrder::_observed_market() const{ + if(me->order_def.custom_def().trigger().trigger_condition().price_type()== + api::orderman::TriggerPriceType::BID){ + const auto& rv=me->book.bid()[0]; + return &rv; + } + else if (me->order_def.custom_def().trigger().trigger_condition().price_type()== + api::orderman::TriggerPriceType::ASK){ + const auto& rv=me->book.ask()[0]; return &rv; - } else if (me->order_def.custom_def() - .trigger() - .trigger_condition() - .price_type() == api::orderman::TriggerPriceType::ASK) { - const auto &rv = me->book.ask()[0]; - return &rv; - } else { + } + else{ bts_assert(false); return nullptr; } } -double TriggerOrder::_trigger_price() const { return me->state.price(); } -double TriggerOrder::_child_order_price() const { - const auto &trigger_action = - me->order_def.custom_def().trigger().trigger_action(); - double rv = bts::os::nan(); - if (trigger_action.has_payup()) { - double offset = trigger_action.payup().payup_ticks() * me->tick_size; - if (me->order_def.side() == api::Side::SIDE_BUY) - rv = _trigger_price() + offset; +double TriggerOrder::_trigger_price() const{ + return me->state.price(); +} +double TriggerOrder::_child_order_price() const{ + const auto& trigger_action= + me->order_def.custom_def().trigger().trigger_action(); + double rv=bts::os::nan(); + if(trigger_action.has_payup()){ + double offset=trigger_action.payup().payup_ticks()*me->tick_size; + if(me->order_def.side()==api::Side::SIDE_BUY) + rv=_trigger_price()+offset; else - rv = _trigger_price() - offset; - } else - rv = trigger_action.price(); - rv = bts::securities::raw_round_to_quote_price(rv, me->tick_size, - me->order_def.side()); + rv=_trigger_price()-offset; + } + else + rv=trigger_action.price(); + rv = bts::securities::raw_round_to_quote_price (rv, me->tick_size, + me->order_def.side()); return rv; } -void TriggerOrder::_cancel_order(CancelMode cancel_mode) { - me->cancel_mode = cancel_mode; +void TriggerOrder::_cancel_order(CancelMode cancel_mode){ + me->cancel_mode=cancel_mode; me->child_order.cancel(); LOG(OrderMan, Info, "TriggerOrder::_cancel_order key:{} state:{} mode:{}", - key(), _state, cancel_mode); + key(),_state,cancel_mode); _switch_state(State::END); } -bool TriggerOrder::_activated() const { return me->services != nullptr; } -bool TriggerOrder::_gr_than_eq(double p1, double p2, double tick_size) { - return bts::securities::test_price_equality(p1, p2, tick_size) || p1 >= p2; +bool TriggerOrder::_activated() const{ + return me->services!=nullptr; } -bool TriggerOrder::_trigger_met(const md::PriceSize *obs_md, double trpr, - double tick_size, bool trigger_above_md) { +bool TriggerOrder::_gr_than_eq(double p1, double p2, double tick_size){ + return bts::securities::test_price_equality(p1,p2,tick_size) || p1>=p2; +} +bool TriggerOrder::_trigger_met(const md::PriceSize* obs_md, + double trpr, + double tick_size, + bool trigger_above_md){ if (obs_md != nullptr) - return (trigger_above_md && - _gr_than_eq(obs_md->price(), trpr, tick_size)) || - (!trigger_above_md && - _gr_than_eq(trpr, obs_md->price(), tick_size)); + return (trigger_above_md && _gr_than_eq(obs_md->price(),trpr, tick_size)) || + (!trigger_above_md && _gr_than_eq(trpr,obs_md->price(),tick_size)); return false; } -} // namespace orderman -} // namespace bts +}} diff --git a/src/lib/orderman/orders/TriggerOrder.h b/src/lib/orderman/orders/TriggerOrder.h index a62c82cba..f79013ef6 100644 --- a/src/lib/orderman/orders/TriggerOrder.h +++ b/src/lib/orderman/orders/TriggerOrder.h @@ -56,10 +56,10 @@ public: const PreActivationOrderServices &) override; void on_activate(Price, Quantity, OrderServices&, - trace::CorID const&) override ; - void on_update(Price, Quantity, trace::CorID const&) override; - void on_crack(trace::CorID const&) override; - void on_cancel(trace::CorID const&) override; + PerfTrace const&) override ; + void on_update(Price, Quantity, PerfTrace const&) override; + void on_crack(PerfTrace const&) override; + void on_cancel(PerfTrace const&) override; private: // callbacks from book and child order udpates void _on_book_update(const BookUpdateEvent&); diff --git a/src/lib/orderman/orders/book_algos/BookAlgo.cpp b/src/lib/orderman/orders/book_algos/BookAlgo.cpp index 5298aa9d0..5e3ea18ae 100644 --- a/src/lib/orderman/orders/book_algos/BookAlgo.cpp +++ b/src/lib/orderman/orders/book_algos/BookAlgo.cpp @@ -1,7 +1,7 @@ #include "BookAlgo.h" -#include "lib/orderman/actors/order_manager/OrderBuilder.h" #include "lib/utils/PBUtils.h" #include "lib/utils/helper_macros.h" +#include "lib/orderman/actors/order_manager/OrderBuilder.h" #include namespace bts { @@ -9,113 +9,148 @@ namespace orderman { using namespace api::orderman; -struct BookAlgo::PImpl { - PImpl() - : services(nullptr), fake_detached_child(false), supports_hedge(false), - has_activated_child(false) {} - - OrderServices *services; - +struct BookAlgo::PImpl +{ + PImpl() : services(nullptr), fake_detached_child(false), + supports_hedge(false), has_activated_child(false) + { + } + + OrderServices* services; + api::orderman::OrderDefinition def; api::orderman::OrderState state; - + OrderBuilder child_builder; - ChildOrder child; - api::orderman::OrderState child_state; + ChildOrder child; + api::orderman::OrderState child_state; bool fake_detached_child; - - bool supports_hedge; - OrderBuilder hedge_builder; + + bool supports_hedge; + OrderBuilder hedge_builder; std::vector hedges; - using HedgeStateMap = - boost::container::flat_map; + using HedgeStateMap = boost::container::flat_map; HedgeStateMap hedges_state; - + double tick_size; bool has_activated_child; }; -BookAlgo::BookAlgo() : me(new PImpl()) {} +BookAlgo::BookAlgo() : me(new PImpl()) +{ +} BookAlgo::~BookAlgo() {} -const api::orderman::OrderDefinition &BookAlgo::definition() const { + + +const api::orderman::OrderDefinition& BookAlgo::definition() const +{ return me->def; } -const api::orderman::OrderState &BookAlgo::this_state() const { +const api::orderman::OrderState& BookAlgo::this_state() const +{ return me->state; } - -void BookAlgo::set_price(double p) { me->state.set_price(p); } - -void BookAlgo::set_quantity(uint32_t s) { me->state.set_quantity(s); } - -const api::orderman::OrderState &BookAlgo::child_state() const { - return me->child_state; + +void BookAlgo::set_price(double p) +{ + me->state.set_price(p); +} + +void BookAlgo::set_quantity(uint32_t s) +{ + me->state.set_quantity(s); } -void BookAlgo::set_child_price(double p) { me->child_state.set_price(p); } +const api::orderman::OrderState& BookAlgo::child_state() const +{ + return me->child_state; +} + +void BookAlgo::set_child_price(double p) +{ + me->child_state.set_price(p); +} -void BookAlgo::set_child_quantity(uint32_t s) { +void BookAlgo::set_child_quantity(uint32_t s) +{ me->child_state.set_quantity(s); } -void BookAlgo::activate_child(Price p, Quantity q) { - // per Pedro, activating the child is not a synchronous calls, and he asserts - // that this is done only once - if (!me->has_activated_child) { +void BookAlgo::activate_child(Price p, Quantity q) +{ + //per Pedro, activating the child is not a synchronous calls, and he asserts that this is done only once + if(!me->has_activated_child) + { me->child.activate(p, q); me->has_activated_child = true; } -} +} + +void BookAlgo::update_child(Price p, Quantity q) +{ + me->child.update(p, q); +} -void BookAlgo::update_child(Price p, Quantity q) { me->child.update(p, q); } +void BookAlgo::cancel_child() +{ + me->child.cancel(); +} -void BookAlgo::cancel_child() { me->child.cancel(); } - -void BookAlgo::build_and_send_hedge(Price p, Quantity q) { - auto hedge = me->hedge_builder.build(); +void BookAlgo::build_and_send_hedge(Price p, Quantity q) +{ + auto hedge = me->hedge_builder.build(); me->hedges.push_back(std::move(hedge)); - me->hedges.back().activate(p, q); + me->hedges.back().activate(p, q); } -double BookAlgo::tick_size() const { return me->tick_size; } +double BookAlgo::tick_size() const +{ + return me->tick_size; +} -void BookAlgo::on_init_new(const api::orderman::OrderDefinition &def, - const PreActivationOrderServices &services) { +void BookAlgo::on_init_new(const api::orderman::OrderDefinition& def, + const PreActivationOrderServices &services) +{ me->services = nullptr; me->def = def; - - me->child_state.set_status(ORDER_STATUS_INACTIVE); + + me->child_state.set_status(ORDER_STATUS_INACTIVE); OrderDefinition child_def = def; setup_child(def, services, me->child_state, &child_def); me->child_builder = OrderBuilder(key(), child_def, services, 1); - - OrderDefinition hedge_def = def; + + OrderDefinition hedge_def = def; me->supports_hedge = setup_hedge(def, services, &hedge_def); - if (me->supports_hedge) - me->hedge_builder = OrderBuilder(key(), hedge_def, services, 4); - - const bts::api::Security *sec = - services.sec_db.resolve(SecurityKey(def.security_key())); - if (sec) { + if(me->supports_hedge) + me->hedge_builder = OrderBuilder(key(), hedge_def, services, 4); + + const bts::api::Security* sec = services.sec_db.resolve(SecurityKey(def.security_key())); + if(sec) + { me->tick_size = sec->contract_spec().low_tick(); transition(ORDER_STATUS_INACTIVE); - } else { + } + else + { auto msg = fmt::format("Unknown security: {}", def.security_key()); me->state.set_last_msg(msg); - transition(ORDER_STATUS_REJECTED_BY_SPARK, msg); + transition(ORDER_STATUS_REJECTED_BY_SPARK, msg); } } -void BookAlgo::on_init_recovered(const api::orderman::OrderRecord &rec, - const PreActivationOrderServices &) { +void BookAlgo::on_init_recovered(const api::orderman::OrderRecord& rec, + const PreActivationOrderServices &) +{ auto const &def = rec.def(); me->def = def; me->state = rec.state(); - switch (me->state.status()) { - case ORDER_STATUS_WORKING: { + switch (me->state.status()) + { + case ORDER_STATUS_WORKING: + { auto msg = "System restarted with active BookAlgo"; me->state.set_last_msg(msg); transition(ORDER_STATUS_ERROR, msg); @@ -139,24 +174,24 @@ void BookAlgo::on_init_recovered(const api::orderman::OrderRecord &rec, } } -void BookAlgo::on_activate(Price p, Quantity q, OrderServices &services, - trace::CorID const &) { +void BookAlgo::on_activate(Price p, Quantity q, OrderServices& services,PerfTrace const&) +{ bts_assert(!me->services); me->services = &services; - switch (this_state().status()) { + switch (this_state().status()) + { case ORDER_STATUS_INACTIVE: - me->child_builder.activate(services); - if (me->supports_hedge) + me->child_builder.activate(services); + if(me->supports_hedge) me->hedge_builder.activate(services); - + me->child = me->child_builder.build(); set_price(p.value()); set_quantity(q.value()); - services.subscribe_to_child_updates( - [this](auto const &os) { this->on_child_order_update(os); }); - services.subscribe_to_book( - SecurityKey(me->def.security_key()), - [this](auto const &b) { this->on_book_update(b); }); + services.child_updates.sub(key(), + [this](auto const &os) { this->on_child_order_update(os); }); + services.book_updates.sub(SecurityKey(me->def.security_key()), + [this](auto const &b) { this->on_book_update(b); }); transition(ORDER_STATUS_WORKING); break; @@ -172,7 +207,7 @@ void BookAlgo::on_activate(Price p, Quantity q, OrderServices &services, // state) case ORDER_STATUS_WORKING: case ORDER_STATUS_PENDING_WORKING: - case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_DISCONNECTED: case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: bts_assert(false); @@ -181,11 +216,14 @@ void BookAlgo::on_activate(Price p, Quantity q, OrderServices &services, report_state(); } -void BookAlgo::on_update(Price p, Quantity q, trace::CorID const &) { +void BookAlgo::on_update(Price p, Quantity q,PerfTrace const&) +{ LOG(OrderMan, Info, "Updating BookAlgo {}", key().value()); - switch (this_state().status()) { + switch (this_state().status()) + { case ORDER_STATUS_WORKING: - switch (child_state().status()) { + switch (child_state().status()) + { case ORDER_STATUS_INACTIVE: set_price(p.value()); set_quantity(q.value()); @@ -193,8 +231,8 @@ void BookAlgo::on_update(Price p, Quantity q, trace::CorID const &) { case ORDER_STATUS_WORKING: set_price(p.value()); set_quantity(q.value()); - if (!me->fake_detached_child) - me->child.update(p, q); + if(!me->fake_detached_child) + me->child.update(p,q); break; case ORDER_STATUS_PENDING_WORKING: // we launched our child but we are not yet able @@ -204,7 +242,7 @@ void BookAlgo::on_update(Price p, Quantity q, trace::CorID const &) { // if the child was in any of these states we couldn't be // in the working state - case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_DISCONNECTED: case ORDER_STATUS_ERROR: case ORDER_STATUS_REJECTED_BY_SPARK: case ORDER_STATUS_COMPLETED: @@ -235,22 +273,25 @@ void BookAlgo::on_update(Price p, Quantity q, trace::CorID const &) { report_state(); } -void BookAlgo::on_crack(trace::CorID const &) {} +void BookAlgo::on_crack(PerfTrace const&) {} -void BookAlgo::on_cancel(trace::CorID const &) { +void BookAlgo::on_cancel(PerfTrace const&) +{ LOG(OrderMan, Info, "Canceling BookAlgo Order {}", key().value()); - switch (this_state().status()) { + switch (this_state().status()) + { case ORDER_STATUS_WORKING: - switch (child_state().status()) { + switch (child_state().status()) + { case ORDER_STATUS_INACTIVE: transition(ORDER_STATUS_CANCELED); break; case ORDER_STATUS_WORKING: - if (!me->fake_detached_child) + if(!me->fake_detached_child) me->child.cancel(); - for (auto &i : me->hedges) - i.crack(); + for(auto& i : me->hedges) + i.crack(); transition(ORDER_STATUS_CANCELED); break; case ORDER_STATUS_PENDING_WORKING: @@ -259,7 +300,7 @@ void BookAlgo::on_cancel(trace::CorID const &) { break; // child cannot be in any of these if we are in the working state - case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_DISCONNECTED: case ORDER_STATUS_ERROR: case ORDER_STATUS_REJECTED_BY_SPARK: case ORDER_STATUS_COMPLETED: @@ -289,50 +330,53 @@ void BookAlgo::on_cancel(trace::CorID const &) { report_state(); } -void BookAlgo::transition(api::orderman::OrderStatus new_status, - std::string msg) { +void BookAlgo::transition(api::orderman::OrderStatus new_status, std::string msg) +{ auto const &from = OrderStatus_Name(me->state.status()); auto const &to = OrderStatus_Name(new_status); - LOG(OrderMan, Info, "Transitioning BookAlgo {} from {} to {}. Msg: {}", - key().value(), from, to, msg); + LOG(OrderMan, Info, "Transitioning BookAlgo {} from {} to {}. Msg: {}", key().value(), from, to, msg); me->state.set_status(new_status); } -void BookAlgo::on_child_order_update(const OrderStateUpdateEvent &ev) { - if (me->fake_detached_child) - return; - if (ev.key != me->child.key()) +void BookAlgo::on_child_order_update(const OrderStateUpdateEvent& ev) +{ + if(me->fake_detached_child) + return; + if(ev.key != me->child.key()) me->hedges_state[ev.key] = ev.rebuild_state(); - else { + else + { api::orderman::OrderState orig_state = child_state(); me->child_state = ev.rebuild_state(); - switch (this_state().status()) { + switch (this_state().status()) + { case ORDER_STATUS_WORKING: - switch (ev.status) { - case ORDER_STATUS_PENDING_WORKING: - break; - case ORDER_STATUS_WORKING: - if (me->supports_hedge) - send_hedge_if_new_fills(orig_state, ev); - break; - case ORDER_STATUS_COMPLETED: - transition(ORDER_STATUS_COMPLETED); - if (me->supports_hedge) - send_hedge_if_new_fills(orig_state, ev); - break; + switch (ev.status) + { + case ORDER_STATUS_PENDING_WORKING: + break; + case ORDER_STATUS_WORKING: + if(me->supports_hedge) + send_hedge_if_new_fills(orig_state, ev); + break; + case ORDER_STATUS_COMPLETED: + transition(ORDER_STATUS_COMPLETED); + if(me->supports_hedge) + send_hedge_if_new_fills(orig_state, ev); + break; - case ORDER_STATUS_DISCONNECTED: - case ORDER_STATUS_REJECTED_BY_SPARK: - case ORDER_STATUS_CANCELED: - case ORDER_STATUS_ERROR: - transition(ORDER_STATUS_ERROR, "Unexpected child order state"); - break; + case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_REJECTED_BY_SPARK: + case ORDER_STATUS_CANCELED: + case ORDER_STATUS_ERROR: + transition(ORDER_STATUS_ERROR, "Unexpected child order state"); + break; - case ORDER_STATUS_INACTIVE: - case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: - case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: - bts_assert(false); - break; + case ORDER_STATUS_INACTIVE: + case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: + case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: + bts_assert(false); + break; } break; @@ -354,56 +398,52 @@ void BookAlgo::on_child_order_update(const OrderStateUpdateEvent &ev) { report_state(); } -void BookAlgo::report_state() { +void BookAlgo::report_state() +{ auto merged_state = me->state; merged_state.set_filled_quantity(child_state().filled_quantity()); merged_state.set_last_price(child_state().last_price()); merged_state.set_avg_price(child_state().avg_price()); - merged_state.set_display_status( - bts::api::orderman::OrderState_DisplayStatus:: - OrderState_DisplayStatus_HIDDEN); + merged_state.set_display_status(bts::api::orderman::OrderState_DisplayStatus::OrderState_DisplayStatus_HIDDEN); me->services->report_state(merged_state); } -void BookAlgo::payup(const md::PriceSize &opposite, - const bts::orderman::BookUpdateEvent &, - uint32_t cross_ticks) { +void BookAlgo::payup(const md::PriceSize& opposite, const bts::orderman::BookUpdateEvent&, uint32_t cross_ticks) +{ double new_price = opposite.price() + me->tick_size * cross_ticks; me->child.update(Price(new_price), Quantity(this_state().quantity())); report_state(); } -void BookAlgo::paydown(const md::PriceSize &opposite, - const bts::orderman::BookUpdateEvent &, - uint32_t cross_ticks) { +void BookAlgo::paydown(const md::PriceSize& opposite, const bts::orderman::BookUpdateEvent&, uint32_t cross_ticks) +{ double new_price = opposite.price() - me->tick_size * cross_ticks; me->child.update(Price(new_price), Quantity(this_state().quantity())); report_state(); } -void BookAlgo::detach(bts::api::orderman::OrderStatus status_after_detach) { +void BookAlgo::detach(bts::api::orderman::OrderStatus status_after_detach) +{ me->fake_detached_child = true; me->child.crack(); transition(status_after_detach); report_state(); } -void BookAlgo::on_book_update(const bts::orderman::BookUpdateEvent &) {} +void BookAlgo::on_book_update(const bts::orderman::BookUpdateEvent&) {} -bool BookAlgo::setup_hedge(const api::orderman::OrderDefinition &, - const PreActivationOrderServices &, - api::orderman::OrderDefinition *) { - return false; +bool BookAlgo::setup_hedge(const api::orderman::OrderDefinition&, const PreActivationOrderServices&, api::orderman::OrderDefinition*) +{ + return false; } -void BookAlgo::send_hedge_if_new_fills( - const api::orderman::OrderState &orig_state, - const OrderStateUpdateEvent &new_state) { - UNUSED(orig_state); - UNUSED(new_state); - // uint32_t qty = new_state.state.filled_quantity() - - // orig_state.filled_quantity(); UNUSED(qty); +void BookAlgo::send_hedge_if_new_fills(const api::orderman::OrderState& orig_state, const OrderStateUpdateEvent& new_state) +{ + UNUSED(orig_state);UNUSED(new_state); + // uint32_t qty = new_state.state.filled_quantity() - orig_state.filled_quantity(); + // UNUSED(qty); +} + +} } -} // namespace orderman -} // namespace bts diff --git a/src/lib/orderman/orders/book_algos/BookAlgo.h b/src/lib/orderman/orders/book_algos/BookAlgo.h index 689bb1da0..7c01878a0 100644 --- a/src/lib/orderman/orders/book_algos/BookAlgo.h +++ b/src/lib/orderman/orders/book_algos/BookAlgo.h @@ -24,10 +24,10 @@ public: const PreActivationOrderServices&) override; void on_init_recovered(const api::orderman::OrderRecord&, const PreActivationOrderServices &) override; - void on_activate(Price,Quantity,OrderServices &, trace::CorID const&) override ; - void on_update(Price , Quantity,trace::CorID const&) override ; - void on_crack(trace::CorID const&) override ; - void on_cancel(trace::CorID const&) override ; + void on_activate(Price,Quantity,OrderServices &, PerfTrace const&) override ; + void on_update(Price , Quantity,PerfTrace const&) override ; + void on_crack(PerfTrace const&) override ; + void on_cancel(PerfTrace const&) override ; protected: virtual void setup_child(const api::orderman::OrderDefinition& parent, const PreActivationOrderServices&, diff --git a/src/lib/orderman/orders/book_algos/CoverOrder.cpp b/src/lib/orderman/orders/book_algos/CoverOrder.cpp index 2805859e4..de1f773be 100644 --- a/src/lib/orderman/orders/book_algos/CoverOrder.cpp +++ b/src/lib/orderman/orders/book_algos/CoverOrder.cpp @@ -10,87 +10,94 @@ namespace orderman { using namespace api::orderman; -struct CoverOrder::PImpl { +struct CoverOrder::PImpl +{ PImpl() {} - - int hedge_ticks; - OrderDefinition hedge_def; + + int hedge_ticks; + OrderDefinition hedge_def; }; + CoverOrder::CoverOrder() : me(new PImpl()) {} CoverOrder::~CoverOrder() {} -void CoverOrder::setup_child(const api::orderman::OrderDefinition &this_def, - const PreActivationOrderServices &, - api::orderman::OrderState &initial_state, - api::orderman::OrderDefinition *out_child) { +void CoverOrder::setup_child(const api::orderman::OrderDefinition& this_def, const PreActivationOrderServices&, + api::orderman::OrderState& initial_state, api::orderman::OrderDefinition* out_child) +{ initial_state.mutable_cover(); - auto const &cover_def = this_def.custom_def().cover(); + auto const &cover_def = this_def.custom_def().cover(); *out_child->mutable_custom_def() = cover_def.child(); - - me->hedge_ticks = cover_def.hedge_ticks(); + + me->hedge_ticks = cover_def.hedge_ticks(); } -bool CoverOrder::setup_hedge(const api::orderman::OrderDefinition &this_def, - const PreActivationOrderServices &, - api::orderman::OrderDefinition *out_hedge) { +bool CoverOrder::setup_hedge(const api::orderman::OrderDefinition& this_def, const PreActivationOrderServices&, + api::orderman::OrderDefinition* out_hedge) +{ auto const &cover_def = this_def.custom_def().cover(); - if (cover_def.has_hedge()) { - *out_hedge->mutable_custom_def() = cover_def.hedge(); - if (definition().side() == api::SIDE_BUY) + if(cover_def.has_hedge()) + { + *out_hedge->mutable_custom_def() = cover_def.hedge(); + if(definition().side() == api::SIDE_BUY) out_hedge->set_side(api::SIDE_SELL); else out_hedge->set_side(api::SIDE_BUY); return true; - } else + } + else return false; } -void CoverOrder::send_hedge_if_new_fills( - const api::orderman::OrderState &orig_state, - const OrderStateUpdateEvent &new_state) { +void CoverOrder::send_hedge_if_new_fills(const api::orderman::OrderState& orig_state, const OrderStateUpdateEvent& new_state) +{ uint32_t qty = new_state.filled_quantity - orig_state.filled_quantity(); - if (qty > 0) { + if(qty > 0) + { double prx = new_state.last_price; - if (definition().side() == - api::SIDE_BUY) // if this is a buy, I'm going to sell my hedge, nticks - // higher than the fill price + if(definition().side() == api::SIDE_BUY) //if this is a buy, I'm going to sell my hedge, nticks higher than the fill price prx = prx + tick_size() * me->hedge_ticks; else prx = prx - tick_size() * me->hedge_ticks; - + build_and_send_hedge(Price(prx), Quantity(qty)); } } -void CoverOrder::on_book_update(const bts::orderman::BookUpdateEvent &) { - switch (this_state().status()) { +void CoverOrder::on_book_update(const bts::orderman::BookUpdateEvent& ) +{ + switch (this_state().status()) + { case ORDER_STATUS_WORKING: - switch (child_state().status()) { - case ORDER_STATUS_INACTIVE: { - activate_child(Price(this_state().price()), - Quantity(this_state().quantity())); - transition(ORDER_STATUS_WORKING); - report_state(); - } break; - case ORDER_STATUS_WORKING: { - } break; - - case ORDER_STATUS_PENDING_WORKING: + switch (child_state().status()) + { + case ORDER_STATUS_INACTIVE: + { + activate_child(Price(this_state().price()), Quantity(this_state().quantity())); + transition(ORDER_STATUS_WORKING); + report_state(); + } break; - - // child cannot be in any of these states if we are in the working state - case ORDER_STATUS_DISCONNECTED: - case ORDER_STATUS_ERROR: - case ORDER_STATUS_REJECTED_BY_SPARK: - case ORDER_STATUS_COMPLETED: - case ORDER_STATUS_CANCELED: - case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: - case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: - bts_assert(false); + case ORDER_STATUS_WORKING: + { + } break; - } + + case ORDER_STATUS_PENDING_WORKING: + break; + + // child cannot be in any of these states if we are in the working state + case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_ERROR: + case ORDER_STATUS_REJECTED_BY_SPARK: + case ORDER_STATUS_COMPLETED: + case ORDER_STATUS_CANCELED: + case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: + case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: + bts_assert(false); + break; + } break; case ORDER_STATUS_COMPLETED: @@ -106,8 +113,9 @@ void CoverOrder::on_book_update(const bts::orderman::BookUpdateEvent &) { case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: bts_assert(false); break; - } + } +} + +} } -} // namespace orderman -} // namespace bts diff --git a/src/lib/orderman/orders/book_algos/JoinOrder.cpp b/src/lib/orderman/orders/book_algos/JoinOrder.cpp index 1bf352523..46db1509c 100644 --- a/src/lib/orderman/orders/book_algos/JoinOrder.cpp +++ b/src/lib/orderman/orders/book_algos/JoinOrder.cpp @@ -10,90 +10,101 @@ namespace orderman { using namespace api::orderman; -struct JoinOrder::PImpl { +struct JoinOrder::PImpl +{ PImpl() {} - - spark::QuantityMeasure join_threshold; - - md::PriceSize opposite_at_inception; + + spark::QuantityMeasure join_threshold; + + md::PriceSize opposite_at_inception; bool did_join; }; + JoinOrder::JoinOrder() : me(new PImpl()) {} JoinOrder::~JoinOrder() {} -void JoinOrder::setup_child(const api::orderman::OrderDefinition &this_def, - const PreActivationOrderServices &, - api::orderman::OrderState &initial_state, - api::orderman::OrderDefinition *out_child) { +void JoinOrder::setup_child(const api::orderman::OrderDefinition& this_def, const PreActivationOrderServices&, + api::orderman::OrderState& initial_state, api::orderman::OrderDefinition* out_child) +{ initial_state.mutable_join(); - auto const &join_def = this_def.custom_def().join(); + auto const &join_def = this_def.custom_def().join(); *out_child->mutable_custom_def() = join_def.child(); - + me->join_threshold = join_def.join_threshold(); me->did_join = false; } -void JoinOrder::on_book_update(const bts::orderman::BookUpdateEvent &book) { - switch (this_state().status()) { +void JoinOrder::on_book_update(const bts::orderman::BookUpdateEvent& book) +{ + switch (this_state().status()) + { case ORDER_STATUS_WORKING: - switch (child_state().status()) { - case ORDER_STATUS_INACTIVE: { - if (definition().side() == api::SIDE_BUY) { - me->opposite_at_inception = book.book.side(api::Side::SIDE_SELL)[0]; - activate_child(Price(this_state().price()), - Quantity(this_state().quantity())); - transition(ORDER_STATUS_WORKING); - } else { - me->opposite_at_inception = book.book.side(api::Side::SIDE_BUY)[0]; - activate_child(Price(this_state().price()), - Quantity(this_state().quantity())); - transition(ORDER_STATUS_WORKING); + switch (child_state().status()) + { + case ORDER_STATUS_INACTIVE: + { + if(definition().side() == api::SIDE_BUY) + { + me->opposite_at_inception = book.book.side(api::Side::SIDE_SELL)[0]; + activate_child(Price(this_state().price()), Quantity(this_state().quantity())); + transition(ORDER_STATUS_WORKING); + } + else + { + me->opposite_at_inception = book.book.side(api::Side::SIDE_BUY)[0]; + activate_child(Price(this_state().price()), Quantity(this_state().quantity())); + transition(ORDER_STATUS_WORKING); + } + report_state(); } - report_state(); - } break; - case ORDER_STATUS_WORKING: { - Quantity thresh = SpreaderUtils::_quantity_threshold( - me->join_threshold, Quantity(this_state().quantity())); - if (definition().side() == api::SIDE_BUY) { - const auto &same = book.book.side(api::Side::SIDE_BUY)[0]; - if (me->opposite_at_inception.price() > same.price()) { + break; + case ORDER_STATUS_WORKING: + { + Quantity thresh = SpreaderUtils::_quantity_threshold(me->join_threshold, Quantity(this_state().quantity())); + if(definition().side() == api::SIDE_BUY) + { + const auto& same = book.book.side(api::Side::SIDE_BUY)[0]; + if(me->opposite_at_inception.price() > same.price()) + {} + //we join exactly once, but we can't detach because we have to hang around and look for hedges + else if(!me->did_join && same.size() >= thresh.value()) + { + me->did_join = true; + update_child(Price(same.price()), Quantity(this_state().quantity())); + report_state(); + } } - // we join exactly once, but we can't detach because we have to hang - // around and look for hedges - else if (!me->did_join && same.size() >= thresh.value()) { - me->did_join = true; - update_child(Price(same.price()), - Quantity(this_state().quantity())); - report_state(); - } - } else { - const auto &same = book.book.side(api::Side::SIDE_SELL)[0]; - if (me->opposite_at_inception.price() < same.price()) { - } else if (!me->did_join && same.size() >= thresh.value()) { - me->did_join = true; - update_child(Price(same.price()), - Quantity(this_state().quantity())); - report_state(); + else + { + const auto& same = book.book.side(api::Side::SIDE_SELL)[0]; + if(me->opposite_at_inception.price() < same.price()) + {} + else if(!me->did_join && same.size() >= thresh.value()) + { + me->did_join = true; + update_child(Price(same.price()), Quantity(this_state().quantity())); + report_state(); + } } + } + break; + + case ORDER_STATUS_PENDING_WORKING: + break; + + // child cannot be in any of these states if we are in the working state + case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_ERROR: + case ORDER_STATUS_REJECTED_BY_SPARK: + case ORDER_STATUS_COMPLETED: + case ORDER_STATUS_CANCELED: + case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: + case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: + bts_assert(false); + break; } - } break; - - case ORDER_STATUS_PENDING_WORKING: - break; - - // child cannot be in any of these states if we are in the working state - case ORDER_STATUS_DISCONNECTED: - case ORDER_STATUS_ERROR: - case ORDER_STATUS_REJECTED_BY_SPARK: - case ORDER_STATUS_COMPLETED: - case ORDER_STATUS_CANCELED: - case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: - case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: - bts_assert(false); - break; - } break; case ORDER_STATUS_COMPLETED: @@ -109,8 +120,9 @@ void JoinOrder::on_book_update(const bts::orderman::BookUpdateEvent &book) { case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: bts_assert(false); break; - } + } +} + +} } -} // namespace orderman -} // namespace bts diff --git a/src/lib/orderman/orders/book_algos/LeanOrder.cpp b/src/lib/orderman/orders/book_algos/LeanOrder.cpp index f538a8b2e..8d1213311 100644 --- a/src/lib/orderman/orders/book_algos/LeanOrder.cpp +++ b/src/lib/orderman/orders/book_algos/LeanOrder.cpp @@ -10,171 +10,185 @@ namespace orderman { using namespace api::orderman; -struct LeanOrder::PImpl { - PImpl() - : cross_threshold(), max_chase_ticks(0), - trade_toward_behavior(LeanOrderDefinition_OnToward_NO_CHANGE), - opposite_at_inception(), num_chases(0) {} - - spark::QuantityMeasure cross_threshold; - uint32_t max_chase_ticks; +struct LeanOrder::PImpl +{ + PImpl() : cross_threshold(), max_chase_ticks(0), trade_toward_behavior(LeanOrderDefinition_OnToward_NO_CHANGE), opposite_at_inception(), num_chases(0) + {} + + spark::QuantityMeasure cross_threshold; + uint32_t max_chase_ticks; LeanOrderDefinition_OnToward trade_toward_behavior; - - md::PriceSize opposite_at_inception; + + md::PriceSize opposite_at_inception; uint32_t num_chases; }; + LeanOrder::LeanOrder() : me(new PImpl()) {} LeanOrder::~LeanOrder() {} -void LeanOrder::setup_child(const api::orderman::OrderDefinition &this_def, - const PreActivationOrderServices &, - api::orderman::OrderState &initial_state, - api::orderman::OrderDefinition *out_child) { +void LeanOrder::setup_child(const api::orderman::OrderDefinition& this_def, const PreActivationOrderServices&, + api::orderman::OrderState& initial_state, api::orderman::OrderDefinition* out_child) +{ initial_state.mutable_lean(); - auto const &lean_def = this_def.custom_def().lean(); + auto const &lean_def = this_def.custom_def().lean(); *out_child->mutable_custom_def() = lean_def.child(); - + me->cross_threshold = lean_def.cross_threshold(); - me->max_chase_ticks = lean_def.max_chase_ticks(); - me->trade_toward_behavior = lean_def.trade_toward_behavior(); + me->max_chase_ticks = lean_def.max_chase_ticks(); + me->trade_toward_behavior = lean_def.trade_toward_behavior(); } -void LeanOrder::payup(const md::PriceSize &, - const bts::orderman::BookUpdateEvent &book, - uint32_t cross_ticks /*= 0*/) { - double new_price = - me->opposite_at_inception.price() + tick_size() * cross_ticks; - double limit = - me->opposite_at_inception.price() + tick_size() * me->max_chase_ticks; - if (new_price <= limit) +void LeanOrder::payup(const md::PriceSize&, const bts::orderman::BookUpdateEvent& book, uint32_t cross_ticks /*= 0*/) +{ + double new_price = me->opposite_at_inception.price() + tick_size() * cross_ticks; + double limit = me->opposite_at_inception.price() + tick_size() * me->max_chase_ticks; + if(new_price <= limit) update_child(Price(new_price), Quantity(this_state().quantity())); - else { - update_child(Price(limit), Quantity(this_state().quantity())); + else + { + update_child(Price(limit), Quantity(this_state().quantity())); detach(); return; - } - - const bts::orderman::BookSide &sellbook = - book.book.side(api::Side::SIDE_SELL); - for (const auto &i : sellbook) { + } + + const bts::orderman::BookSide& sellbook = book.book.side(api::Side::SIDE_SELL); + for(const auto& i : sellbook) + { me->opposite_at_inception = i; - if (me->opposite_at_inception.price() > new_price) + if(me->opposite_at_inception.price() > new_price) break; - } - if (me->opposite_at_inception.price() <= new_price) - detach(); - me->num_chases += cross_ticks + 1; - if (me->num_chases >= me->max_chase_ticks) - detach(); + } + if(me->opposite_at_inception.price() <= new_price) + detach(); + me->num_chases += cross_ticks+1; + if(me->num_chases >= me->max_chase_ticks) + detach(); report_state(); } -void LeanOrder::paydown(const md::PriceSize &, - const bts::orderman::BookUpdateEvent &book, - uint32_t cross_ticks /*= 0*/) { - double new_price = - me->opposite_at_inception.price() - tick_size() * cross_ticks; - double limit = - me->opposite_at_inception.price() - tick_size() * me->max_chase_ticks; - if (new_price >= limit) +void LeanOrder::paydown(const md::PriceSize&, const bts::orderman::BookUpdateEvent& book, uint32_t cross_ticks /*= 0*/) +{ + double new_price = me->opposite_at_inception.price() - tick_size() * cross_ticks; + double limit = me->opposite_at_inception.price() - tick_size() * me->max_chase_ticks; + if(new_price >= limit) update_child(Price(new_price), Quantity(this_state().quantity())); - else { - update_child(Price(limit), Quantity(this_state().quantity())); + else + { + update_child(Price(limit), Quantity(this_state().quantity())); detach(); return; - } - - const bts::orderman::BookSide &buybook = book.book.side(api::Side::SIDE_BUY); - for (const auto &i : buybook) { + } + + const bts::orderman::BookSide& buybook = book.book.side(api::Side::SIDE_BUY); + for(const auto& i : buybook) + { me->opposite_at_inception = i; - if (me->opposite_at_inception.price() < new_price) + if(me->opposite_at_inception.price() < new_price) break; - } - if (me->opposite_at_inception.price() >= new_price) - detach(); - me->num_chases += cross_ticks + 1; - if (me->num_chases >= me->max_chase_ticks) - detach(); + } + if(me->opposite_at_inception.price() >= new_price) + detach(); + me->num_chases += cross_ticks+1; + if(me->num_chases >= me->max_chase_ticks) + detach(); report_state(); } -void LeanOrder::choose_trade_toward_behavior(const md::PriceSize &opposite) { - switch (me->trade_toward_behavior) { - case LeanOrderDefinition_OnToward_CANCEL: { - cancel_child(); - transition(ORDER_STATUS_CANCELED); - report_state(); - } break; - case LeanOrderDefinition_OnToward_DETACH: { - detach(); - } break; - case LeanOrderDefinition_OnToward_REPRICE: { - me->opposite_at_inception = opposite; - } break; - case LeanOrderDefinition_OnToward_NO_CHANGE: - default: - break; - } -} - -void LeanOrder::on_book_update(const bts::orderman::BookUpdateEvent &book) { - switch (this_state().status()) { - case ORDER_STATUS_WORKING: - switch (child_state().status()) { - case ORDER_STATUS_INACTIVE: { - if (definition().side() == api::SIDE_BUY) - me->opposite_at_inception = book.book.side(api::Side::SIDE_SELL)[0]; - else - me->opposite_at_inception = book.book.side(api::Side::SIDE_BUY)[0]; - - activate_child(Price(this_state().price()), - Quantity(this_state().quantity())); - transition(ORDER_STATUS_WORKING); +void LeanOrder::choose_trade_toward_behavior(const md::PriceSize& opposite) +{ + switch (me->trade_toward_behavior) + { + case LeanOrderDefinition_OnToward_CANCEL: + { + cancel_child(); + transition(ORDER_STATUS_CANCELED); report_state(); - } break; - case ORDER_STATUS_WORKING: { - Quantity thresh = SpreaderUtils::_quantity_threshold( - me->cross_threshold, Quantity(this_state().quantity())); - if (definition().side() == api::SIDE_BUY) { - const auto &opposite = book.book.side(api::Side::SIDE_SELL)[0]; - if (opposite.price() < me->opposite_at_inception.price()) - choose_trade_toward_behavior(opposite); - else if (opposite.price() > me->opposite_at_inception.price()) - payup(opposite, book); // you missed, payup/join - else { - if (opposite.size() <= thresh.value()) - payup(opposite, book); - } - } else { - const auto &opposite = book.book.side(api::Side::SIDE_BUY)[0]; - if (opposite.price() > me->opposite_at_inception.price()) - choose_trade_toward_behavior(opposite); - else if (opposite.price() < me->opposite_at_inception.price()) - paydown(opposite, book); - else { - if (opposite.size() <= thresh.value()) - paydown(opposite, book); - } - } - } break; - - case ORDER_STATUS_PENDING_WORKING: - break; - - // child cannot be in any of these states if we are in the working state - case ORDER_STATUS_DISCONNECTED: - case ORDER_STATUS_ERROR: - case ORDER_STATUS_REJECTED_BY_SPARK: - case ORDER_STATUS_COMPLETED: - case ORDER_STATUS_CANCELED: - case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: - case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: - bts_assert(false); - break; } break; + case LeanOrderDefinition_OnToward_DETACH: + { + detach(); + } + break; + case LeanOrderDefinition_OnToward_REPRICE: + { + me->opposite_at_inception = opposite; + } + break; + case LeanOrderDefinition_OnToward_NO_CHANGE: + default: + break; + } +} + +void LeanOrder::on_book_update(const bts::orderman::BookUpdateEvent& book) +{ + switch (this_state().status()) + { + case ORDER_STATUS_WORKING: + switch (child_state().status()) + { + case ORDER_STATUS_INACTIVE: + { + if(definition().side() == api::SIDE_BUY) + me->opposite_at_inception = book.book.side(api::Side::SIDE_SELL)[0]; + else + me->opposite_at_inception = book.book.side(api::Side::SIDE_BUY)[0]; + + activate_child(Price(this_state().price()), Quantity(this_state().quantity())); + transition(ORDER_STATUS_WORKING); + report_state(); + } + break; + case ORDER_STATUS_WORKING: + { + Quantity thresh = SpreaderUtils::_quantity_threshold(me->cross_threshold, Quantity(this_state().quantity())); + if(definition().side() == api::SIDE_BUY) + { + const auto& opposite = book.book.side(api::Side::SIDE_SELL)[0]; + if(opposite.price() < me->opposite_at_inception.price()) + choose_trade_toward_behavior(opposite); + else if(opposite.price() > me->opposite_at_inception.price()) + payup(opposite, book); //you missed, payup/join + else + { + if(opposite.size() <= thresh.value()) + payup(opposite, book); + } + } + else + { + const auto& opposite = book.book.side(api::Side::SIDE_BUY)[0]; + if(opposite.price() > me->opposite_at_inception.price()) + choose_trade_toward_behavior(opposite); + else if(opposite.price() < me->opposite_at_inception.price()) + paydown(opposite, book); + else + { + if(opposite.size() <= thresh.value()) + paydown(opposite, book); + } + } + } + break; + + case ORDER_STATUS_PENDING_WORKING: + break; + + // child cannot be in any of these states if we are in the working state + case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_ERROR: + case ORDER_STATUS_REJECTED_BY_SPARK: + case ORDER_STATUS_COMPLETED: + case ORDER_STATUS_CANCELED: + case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: + case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: + bts_assert(false); + break; + } + break; case ORDER_STATUS_COMPLETED: case ORDER_STATUS_CANCELED: @@ -189,8 +203,9 @@ void LeanOrder::on_book_update(const bts::orderman::BookUpdateEvent &book) { case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: bts_assert(false); break; - } + } +} + +} } -} // namespace orderman -} // namespace bts diff --git a/src/lib/orderman/orders/book_algos/OffsetOrder.cpp b/src/lib/orderman/orders/book_algos/OffsetOrder.cpp index 973d1c0ce..fad23cc55 100644 --- a/src/lib/orderman/orders/book_algos/OffsetOrder.cpp +++ b/src/lib/orderman/orders/book_algos/OffsetOrder.cpp @@ -10,65 +10,75 @@ namespace orderman { using namespace api::orderman; -struct OffsetOrder::PImpl { +struct OffsetOrder::PImpl +{ PImpl() {} - - uint32_t tick_offset_on_deploy; + + uint32_t tick_offset_on_deploy; }; + OffsetOrder::OffsetOrder() : me(new PImpl()) {} OffsetOrder::~OffsetOrder() {} -void OffsetOrder::setup_child(const api::orderman::OrderDefinition &this_def, - const PreActivationOrderServices &, - api::orderman::OrderState &initial_state, - api::orderman::OrderDefinition *out_child) { +void OffsetOrder::setup_child(const api::orderman::OrderDefinition& this_def, const PreActivationOrderServices&, + api::orderman::OrderState& initial_state, api::orderman::OrderDefinition* out_child) +{ initial_state.mutable_tick(); - auto const &offset_def = this_def.custom_def().offset(); + auto const &offset_def = this_def.custom_def().offset(); *out_child->mutable_custom_def() = offset_def.child(); - - me->tick_offset_on_deploy = offset_def.tick_offset_on_deploy(); + + me->tick_offset_on_deploy = offset_def.tick_offset_on_deploy(); } -void OffsetOrder::on_book_update(const bts::orderman::BookUpdateEvent &book) { - switch (this_state().status()) { + +void OffsetOrder::on_book_update(const bts::orderman::BookUpdateEvent& book) +{ + switch (this_state().status()) + { case ORDER_STATUS_WORKING: - switch (child_state().status()) { - case ORDER_STATUS_INACTIVE: { - if (definition().side() == api::SIDE_BUY) { - const auto &same = book.book.side(api::Side::SIDE_BUY)[0]; - double price = - same.price() - tick_size() * me->tick_offset_on_deploy; - activate_child(Price(price), Quantity(this_state().quantity())); - transition(ORDER_STATUS_WORKING); - } else { - const auto &same = book.book.side(api::Side::SIDE_SELL)[0]; - double price = - same.price() + tick_size() * me->tick_offset_on_deploy; - activate_child(Price(price), Quantity(this_state().quantity())); - transition(ORDER_STATUS_WORKING); + switch (child_state().status()) + { + case ORDER_STATUS_INACTIVE: + { + if(definition().side() == api::SIDE_BUY) + { + const auto& same = book.book.side(api::Side::SIDE_BUY)[0]; + double price = same.price() - tick_size() * me->tick_offset_on_deploy; + activate_child(Price(price), Quantity(this_state().quantity())); + transition(ORDER_STATUS_WORKING); + } + else + { + const auto& same = book.book.side(api::Side::SIDE_SELL)[0]; + double price = same.price() + tick_size() * me->tick_offset_on_deploy; + activate_child(Price(price), Quantity(this_state().quantity())); + transition(ORDER_STATUS_WORKING); + } + report_state(); } - report_state(); - } break; - case ORDER_STATUS_WORKING: { - detach(); - } break; - - case ORDER_STATUS_PENDING_WORKING: break; - - // child cannot be in any of these states if we are in the working state - case ORDER_STATUS_DISCONNECTED: - case ORDER_STATUS_ERROR: - case ORDER_STATUS_REJECTED_BY_SPARK: - case ORDER_STATUS_COMPLETED: - case ORDER_STATUS_CANCELED: - case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: - case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: - bts_assert(false); + case ORDER_STATUS_WORKING: + { + detach(); + } break; - } + + case ORDER_STATUS_PENDING_WORKING: + break; + + // child cannot be in any of these states if we are in the working state + case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_ERROR: + case ORDER_STATUS_REJECTED_BY_SPARK: + case ORDER_STATUS_COMPLETED: + case ORDER_STATUS_CANCELED: + case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: + case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: + bts_assert(false); + break; + } break; case ORDER_STATUS_COMPLETED: @@ -84,8 +94,9 @@ void OffsetOrder::on_book_update(const bts::orderman::BookUpdateEvent &book) { case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: bts_assert(false); break; - } + } +} + +} } -} // namespace orderman -} // namespace bts diff --git a/src/lib/orderman/orders/book_algos/TickOrder.cpp b/src/lib/orderman/orders/book_algos/TickOrder.cpp index d05404458..105d74084 100644 --- a/src/lib/orderman/orders/book_algos/TickOrder.cpp +++ b/src/lib/orderman/orders/book_algos/TickOrder.cpp @@ -10,146 +10,165 @@ namespace orderman { using namespace api::orderman; -struct TickOrder::PImpl { +struct TickOrder::PImpl +{ PImpl() {} - - uint32_t tick_offset_on_deploy; - spark::QuantityMeasure cross_threshold; - uint32_t cross_ticks; - uint32_t max_chase_ticks; + + uint32_t tick_offset_on_deploy; + spark::QuantityMeasure cross_threshold; + uint32_t cross_ticks; + uint32_t max_chase_ticks; bool detach_on_toward; - - md::PriceSize opposite_at_inception; + + md::PriceSize opposite_at_inception; }; + TickOrder::TickOrder() : me(new PImpl()) {} TickOrder::~TickOrder() {} -void TickOrder::setup_child(const api::orderman::OrderDefinition &this_def, - const PreActivationOrderServices &, - api::orderman::OrderState &initial_state, - api::orderman::OrderDefinition *out_child) { +void TickOrder::setup_child(const api::orderman::OrderDefinition& this_def, const PreActivationOrderServices&, + api::orderman::OrderState& initial_state, api::orderman::OrderDefinition* out_child) +{ initial_state.mutable_tick(); - auto const &tick_def = this_def.custom_def().tick(); + auto const &tick_def = this_def.custom_def().tick(); *out_child->mutable_custom_def() = tick_def.child(); - - me->tick_offset_on_deploy = tick_def.tick_offset_on_deploy(); + + me->tick_offset_on_deploy = tick_def.tick_offset_on_deploy(); me->cross_threshold = tick_def.cross_threshold(); me->cross_ticks = tick_def.cross_ticks(); - me->max_chase_ticks = tick_def.max_chase_ticks(); + me->max_chase_ticks = tick_def.max_chase_ticks(); me->cross_threshold = tick_def.cross_threshold(); - me->detach_on_toward = tick_def.detach_on_toward(); + me->detach_on_toward = tick_def.detach_on_toward(); } -void TickOrder::payup(const md::PriceSize &opposite, - const bts::orderman::BookUpdateEvent &, - uint32_t cross_ticks) { +void TickOrder::payup(const md::PriceSize& opposite, const bts::orderman::BookUpdateEvent&, uint32_t cross_ticks) +{ double new_price = opposite.price() + tick_size() * cross_ticks; - double limit = - me->opposite_at_inception.price() + tick_size() * me->max_chase_ticks; - if (new_price <= limit) + double limit = me->opposite_at_inception.price() + tick_size() * me->max_chase_ticks; + if(new_price <= limit) update_child(Price(new_price), Quantity(this_state().quantity())); - else { + else + { update_child(Price(limit), Quantity(this_state().quantity())); detach(); } report_state(); } -void TickOrder::paydown(const md::PriceSize &opposite, - const bts::orderman::BookUpdateEvent &, - uint32_t cross_ticks) { +void TickOrder::paydown(const md::PriceSize& opposite, const bts::orderman::BookUpdateEvent&, uint32_t cross_ticks) +{ double new_price = opposite.price() - tick_size() * cross_ticks; - double limit = - me->opposite_at_inception.price() - tick_size() * me->max_chase_ticks; - if (new_price >= limit) + double limit = me->opposite_at_inception.price() - tick_size() * me->max_chase_ticks; + if(new_price >= limit) update_child(Price(new_price), Quantity(this_state().quantity())); - else { - update_child(Price(limit), Quantity(this_state().quantity())); + else + { + update_child(Price(limit), Quantity(this_state().quantity())); detach(); } report_state(); } -void TickOrder::on_book_update(const bts::orderman::BookUpdateEvent &book) { - switch (this_state().status()) { +void TickOrder::on_book_update(const bts::orderman::BookUpdateEvent& book) +{ + switch (this_state().status()) + { case ORDER_STATUS_WORKING: - switch (child_state().status()) { - case ORDER_STATUS_INACTIVE: { - if (definition().side() == api::SIDE_BUY) { - me->opposite_at_inception = book.book.side(api::Side::SIDE_SELL)[0]; - if (me->tick_offset_on_deploy > 0) { - double price = me->opposite_at_inception.price() - - tick_size() * me->tick_offset_on_deploy; - activate_child(Price(price), Quantity(this_state().quantity())); - transition(ORDER_STATUS_WORKING); - } else { - activate_child(Price(this_state().price()), - Quantity(this_state().quantity())); - transition(ORDER_STATUS_WORKING); - } - } else { - me->opposite_at_inception = book.book.side(api::Side::SIDE_BUY)[0]; - if (me->tick_offset_on_deploy > 0) { - double price = me->opposite_at_inception.price() + - tick_size() * me->tick_offset_on_deploy; - activate_child(Price(price), Quantity(this_state().quantity())); - transition(ORDER_STATUS_WORKING); - } else { - activate_child(Price(this_state().price()), - Quantity(this_state().quantity())); - transition(ORDER_STATUS_WORKING); - } - } - report_state(); - } break; - case ORDER_STATUS_WORKING: { - Quantity thresh = SpreaderUtils::_quantity_threshold( - me->cross_threshold, Quantity(this_state().quantity())); - if (definition().side() == api::SIDE_BUY) { - const auto &opposite = book.book.side(api::Side::SIDE_SELL)[0]; - if (opposite.price() < me->opposite_at_inception.price()) { - if (me->detach_on_toward) - detach(); + switch (child_state().status()) + { + case ORDER_STATUS_INACTIVE: + { + if(definition().side() == api::SIDE_BUY) + { + me->opposite_at_inception = book.book.side(api::Side::SIDE_SELL)[0]; + if(me->tick_offset_on_deploy > 0) + { + double price = me->opposite_at_inception.price() - tick_size() * me->tick_offset_on_deploy; + activate_child(Price(price), Quantity(this_state().quantity())); + transition(ORDER_STATUS_WORKING); + } else - me->opposite_at_inception = opposite; - } else if (opposite.price() > me->opposite_at_inception.price()) - payup(opposite, book, me->cross_ticks); - else { - if (opposite.size() <= thresh.value()) + { + activate_child(Price(this_state().price()), Quantity(this_state().quantity())); + transition(ORDER_STATUS_WORKING); + } + } + else + { + me->opposite_at_inception = book.book.side(api::Side::SIDE_BUY)[0]; + if(me->tick_offset_on_deploy > 0) + { + double price = me->opposite_at_inception.price() + tick_size() * me->tick_offset_on_deploy; + activate_child(Price(price), Quantity(this_state().quantity())); + transition(ORDER_STATUS_WORKING); + } + else + { + activate_child(Price(this_state().price()), Quantity(this_state().quantity())); + transition(ORDER_STATUS_WORKING); + } + } + report_state(); + } + break; + case ORDER_STATUS_WORKING: + { + Quantity thresh = SpreaderUtils::_quantity_threshold(me->cross_threshold, Quantity(this_state().quantity())); + if(definition().side() == api::SIDE_BUY) + { + const auto& opposite = book.book.side(api::Side::SIDE_SELL)[0]; + if(opposite.price() < me->opposite_at_inception.price()) + { + if(me->detach_on_toward) + detach(); + else + me->opposite_at_inception = opposite; + } + else if(opposite.price() > me->opposite_at_inception.price()) payup(opposite, book, me->cross_ticks); - } - } else { - const auto &opposite = book.book.side(api::Side::SIDE_BUY)[0]; - if (opposite.price() > me->opposite_at_inception.price()) { - if (me->detach_on_toward) - detach(); else - me->opposite_at_inception = opposite; - } else if (opposite.price() < me->opposite_at_inception.price()) - paydown(opposite, book, me->cross_ticks); - else { - if (opposite.size() <= thresh.value()) - paydown(opposite, book, me->cross_ticks); + { + if(opposite.size() <= thresh.value()) + payup(opposite, book, me->cross_ticks); + } } + else + { + const auto& opposite = book.book.side(api::Side::SIDE_BUY)[0]; + if(opposite.price() > me->opposite_at_inception.price()) + { + if(me->detach_on_toward) + detach(); + else + me->opposite_at_inception = opposite; + } + else if(opposite.price() < me->opposite_at_inception.price()) + paydown(opposite, book, me->cross_ticks); + else + { + if(opposite.size() <= thresh.value()) + paydown(opposite, book, me->cross_ticks); + } + } + } + break; + + case ORDER_STATUS_PENDING_WORKING: + break; + + // child cannot be in any of these states if we are in the working state + case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_ERROR: + case ORDER_STATUS_REJECTED_BY_SPARK: + case ORDER_STATUS_COMPLETED: + case ORDER_STATUS_CANCELED: + case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: + case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: + bts_assert(false); + break; } - } break; - - case ORDER_STATUS_PENDING_WORKING: - break; - - // child cannot be in any of these states if we are in the working state - case ORDER_STATUS_DISCONNECTED: - case ORDER_STATUS_ERROR: - case ORDER_STATUS_REJECTED_BY_SPARK: - case ORDER_STATUS_COMPLETED: - case ORDER_STATUS_CANCELED: - case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: - case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: - bts_assert(false); - break; - } break; case ORDER_STATUS_COMPLETED: @@ -165,8 +184,9 @@ void TickOrder::on_book_update(const bts::orderman::BookUpdateEvent &book) { case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: bts_assert(false); break; - } + } +} + +} } -} // namespace orderman -} // namespace bts diff --git a/src/lib/orderman/orders/book_algos/TopOrder.cpp b/src/lib/orderman/orders/book_algos/TopOrder.cpp index 8fded05b5..1feb1e6cf 100644 --- a/src/lib/orderman/orders/book_algos/TopOrder.cpp +++ b/src/lib/orderman/orders/book_algos/TopOrder.cpp @@ -1,8 +1,8 @@ #include "TopOrder.h" -#include "lib/domain_model/Security.h" #include "lib/orderman/actors/order_manager/OrderBuilder.h" #include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" +#include "lib/domain_model/Security.h" #include "lib/utils/PBUtils.h" #include @@ -11,102 +11,118 @@ namespace orderman { using namespace api::orderman; -struct TopOrder::PImpl { +struct TopOrder::PImpl +{ PImpl() {} - + uint32_t watch_level_tick_offset; - spark::QuantityMeasure top_threshold; + spark::QuantityMeasure top_threshold; }; + TopOrder::TopOrder() : me(new PImpl()) {} TopOrder::~TopOrder() {} -void TopOrder::setup_child(const api::orderman::OrderDefinition &this_def, - const PreActivationOrderServices &, - api::orderman::OrderState &initial_state, - api::orderman::OrderDefinition *out_child) { +void TopOrder::setup_child(const api::orderman::OrderDefinition& this_def, const PreActivationOrderServices&, + api::orderman::OrderState& initial_state, api::orderman::OrderDefinition* out_child) +{ initial_state.mutable_top(); auto const &top_def = this_def.custom_def().top(); *out_child->mutable_custom_def() = top_def.child(); - + me->watch_level_tick_offset = top_def.watch_level_tick_offset(); me->top_threshold = top_def.top_threshold(); } -void TopOrder::on_book_update(const bts::orderman::BookUpdateEvent &book) { - switch (this_state().status()) { + +void TopOrder::on_book_update(const bts::orderman::BookUpdateEvent& book) +{ + switch (this_state().status()) + { case ORDER_STATUS_WORKING: - switch (child_state().status()) { - case ORDER_STATUS_INACTIVE: { - Quantity thresh = SpreaderUtils::_quantity_threshold( - me->top_threshold, Quantity(this_state().quantity())); - if (definition().side() == api::SIDE_BUY) { - const auto &same = book.book.side(api::Side::SIDE_BUY)[0]; - if (securities::test_price_equality(this_state().price(), - same.price(), tick_size())) { - if (same.size() <= thresh.value()) { - transition(ORDER_STATUS_CANCELED); - report_state(); - return; + switch (child_state().status()) + { + case ORDER_STATUS_INACTIVE: + { + Quantity thresh = SpreaderUtils::_quantity_threshold(me->top_threshold, Quantity(this_state().quantity())); + if(definition().side() == api::SIDE_BUY) + { + const auto& same = book.book.side(api::Side::SIDE_BUY)[0]; + if(securities::test_price_equality(this_state().price(), same.price(), tick_size())) + { + if(same.size() <= thresh.value()) + { + transition(ORDER_STATUS_CANCELED); + report_state(); + return; + } } } - } else { - const auto &same = book.book.side(api::Side::SIDE_SELL)[0]; - if (securities::test_price_equality(this_state().price(), - same.price(), tick_size())) { - if (same.size() <= thresh.value()) { - transition(ORDER_STATUS_CANCELED); - report_state(); - return; + else + { + const auto& same = book.book.side(api::Side::SIDE_SELL)[0]; + if(securities::test_price_equality(this_state().price(), same.price(), tick_size())) + { + if(same.size() <= thresh.value()) + { + transition(ORDER_STATUS_CANCELED); + report_state(); + return; + } } - } - } - activate_child(Price(this_state().price()), - Quantity(this_state().quantity())); - transition(ORDER_STATUS_WORKING); - report_state(); - } break; - case ORDER_STATUS_WORKING: { - Quantity thresh = SpreaderUtils::_quantity_threshold( - me->top_threshold, Quantity(this_state().quantity())); - if (definition().side() == api::SIDE_BUY) { - const auto &same = book.book.side(api::Side::SIDE_BUY)[0]; - if (securities::test_price_equality(this_state().price(), - same.price(), tick_size())) { - if (same.size() <= thresh.value()) { - cancel_child(); - transition(ORDER_STATUS_CANCELED); - report_state(); - } - } - } else { - const auto &same = book.book.side(api::Side::SIDE_SELL)[0]; - if (securities::test_price_equality(this_state().price(), - same.price(), tick_size())) { - if (same.size() <= thresh.value()) { - cancel_child(); - transition(ORDER_STATUS_CANCELED); - report_state(); - } - } - } - } break; - - case ORDER_STATUS_PENDING_WORKING: + } + activate_child(Price(this_state().price()), Quantity(this_state().quantity())); + transition(ORDER_STATUS_WORKING); + report_state(); + } break; - - // child cannot be in any of these states if we are in the working state - case ORDER_STATUS_DISCONNECTED: - case ORDER_STATUS_ERROR: - case ORDER_STATUS_REJECTED_BY_SPARK: - case ORDER_STATUS_COMPLETED: - case ORDER_STATUS_CANCELED: - case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: - case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: - bts_assert(false); + case ORDER_STATUS_WORKING: + { + Quantity thresh = SpreaderUtils::_quantity_threshold(me->top_threshold, Quantity(this_state().quantity())); + if(definition().side() == api::SIDE_BUY) + { + const auto& same = book.book.side(api::Side::SIDE_BUY)[0]; + if(securities::test_price_equality(this_state().price(), same.price(), tick_size())) + { + if(same.size() <= thresh.value()) + { + cancel_child(); + transition(ORDER_STATUS_CANCELED); + report_state(); + } + } + } + else + { + const auto& same = book.book.side(api::Side::SIDE_SELL)[0]; + if(securities::test_price_equality(this_state().price(), same.price(), tick_size())) + { + if(same.size() <= thresh.value()) + { + cancel_child(); + transition(ORDER_STATUS_CANCELED); + report_state(); + } + } + } + } break; - } + + case ORDER_STATUS_PENDING_WORKING: + break; + + // child cannot be in any of these states if we are in the working state + case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_ERROR: + case ORDER_STATUS_REJECTED_BY_SPARK: + case ORDER_STATUS_COMPLETED: + case ORDER_STATUS_CANCELED: + case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: + case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: + bts_assert(false); + break; + } break; case ORDER_STATUS_COMPLETED: @@ -122,8 +138,9 @@ void TopOrder::on_book_update(const bts::orderman::BookUpdateEvent &book) { case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: bts_assert(false); break; - } + } +} + +} } -} // namespace orderman -} // namespace bts diff --git a/src/lib/orderman/orders/spreader_orders/ISpreaderStateWorker.h b/src/lib/orderman/orders/spreader_orders/ISpreaderStateWorker.h index 07cefede3..c5519bddb 100644 --- a/src/lib/orderman/orders/spreader_orders/ISpreaderStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/ISpreaderStateWorker.h @@ -34,7 +34,7 @@ public: // 5. called when the user cancels an order virtual void on_cancel() = 0; // 6. on market data update (support late joiners) - virtual void on_book(const Book&,trace::CorID ) = 0; + virtual void on_book(const Book&,PerfTrace &) = 0; // 15. settlement price update virtual void on_settlement_price(const SettlementUpdateEvent&) = 0; // 7. time event called by the infrastructure @@ -43,7 +43,7 @@ public: virtual void on_quoter_order_error(SpreaderLegData& leg_data) = 0; // 9. on a quoter order fill virtual void on_quoter_order_fill(SpreaderLegData& leg_data, - trace::CorID ) = 0; + PerfTrace &) = 0; // 10. on a quoter status update without a fill virtual void on_quoter_order_status_update(SpreaderLegData& leg_data) = 0; // 11. when a hedger order ack from the exchange has an error diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp index 0737f204f..cccba1190 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp @@ -54,26 +54,26 @@ void SpreaderOrder::on_init_recovered(const bts::api::orderman::OrderRecord& ord _report_state(); } void SpreaderOrder::on_activate(Price price, Quantity quantity, - OrderServices& services, const trace::CorID&){ + OrderServices& services, const PerfTrace&){ if (!_active) return; SpreaderOrderServices spreader_order_services (&services); _on_activate(price, quantity, spreader_order_services); _report_state(); } -void SpreaderOrder::on_update(Price price, Quantity quantity,trace::CorID const&){ +void SpreaderOrder::on_update(Price price, Quantity quantity,PerfTrace const&){ if (!_active) return; LOG(OrderMan, Info, "SpreaderOrder.on_update key:{} price:{} quantity:{}", key().value(), price.value(), quantity.value()); _state_worker->on_update(price, quantity); _report_state(); } -void SpreaderOrder::on_cancel(trace::CorID const&){ +void SpreaderOrder::on_cancel(PerfTrace const&){ if (!_active) return; LOG(OrderMan, Info, "SpreaderOrder.on_cancel key:{}", key().value()); _state_worker->on_cancel(); _report_state(); } -void SpreaderOrder::on_crack(trace::CorID const&){ +void SpreaderOrder::on_crack(PerfTrace const&){ if (!_active) return; LOG(OrderMan, Info, "SpreaderOrder.on_crack key: {}", key().value()); _state_worker->on_crack(); @@ -100,9 +100,10 @@ void SpreaderOrder::_on_time(const bts::mercury::TimerEvent& t_event){ } void SpreaderOrder::_on_book_update(const BookUpdateEvent& book_event){ if (!_active) return; - - _order_services->order_services().log(book_event.trace,"spreader_on_book", key().value()); - _state_worker->on_book (book_event.book,book_event.trace); + tracepoint (bts_trace,trace_order,(char*) "_on_book_update", key().value(),book_event.trace.md_sn,0); + auto trace = book_event.trace; + trace.spreader_on_book = utils::TimeStamp::now(); + _state_worker->on_book (book_event.book,trace); } void SpreaderOrder::_on_settlement_update(const SettlementUpdateEvent& settlement_event){ @@ -115,8 +116,9 @@ void SpreaderOrder::_on_settlement_update(const SettlementUpdateEvent& _state_worker->on_settlement_price(settlement_event); } void SpreaderOrder::_on_child_order_update(const OrderStateUpdateEvent& ord_ev){ + auto trace = ord_ev.trace; + trace.spreader_on_child_order_update = utils::TimeStamp::now(); if (!_active) return; - _order_services->order_services().log(ord_ev.trace,"begin_on_child_order_update", key().value()); SecurityKey sec_key = SecurityKey(ord_ev.definition->security_key()); OrderKey order_key = ord_ev.key; bts::api::orderman::OrderStatus status = ord_ev.status; @@ -148,7 +150,7 @@ void SpreaderOrder::_on_child_order_update(const OrderStateUpdateEvent& ord_ev){ leg_data.order_update_message().on_order_update(ord_ev); if (order_error == ChildOrderError::NONE){ if (leg_data.order_update_message().last_update_filled_quantity().value() > 0) - _state_worker->on_quoter_order_fill (leg_data,ord_ev.trace); + _state_worker->on_quoter_order_fill (leg_data,trace); else _state_worker->on_quoter_order_status_update (leg_data); } @@ -184,7 +186,8 @@ void SpreaderOrder::_on_child_order_update(const OrderStateUpdateEvent& ord_ev){ } _send_check_termination(true); _report_state(); - _order_services->order_services().log(ord_ev.trace,"end_on_child_order_update", key().value()); + LOG(Latency,Diag, "_on_child_order_update k:{} t:{}us", key().value(), + (utils::TimeStamp::now() - trace.spreader_on_child_order_update).microseconds()); } // State Transformations //////////////////// ///////////////////////////////////////////// @@ -312,8 +315,10 @@ bool SpreaderOrder::_quoters_can_accept_modification (){ void SpreaderOrder::_send_hedge(size_t hedge_leg_index, Price hedge_price, Quantity hedge_qty, - const trace::CorID trace){ - + const PerfTrace &trace){ + LOG(OrderMan, Info, "SpreaderOrder::_send_hedge key:{} hedge_leg_index:{} " + "hedge_price:{} hedge_qty:{} cid:{}", + key(), hedge_leg_index, hedge_price, hedge_qty, trace.md_sn); SingleFillHedger& hedger = _bookkeeping_data().add_new_hedger (*this, hedge_leg_index, hedge_price, diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h index 3835e922b..9b377d948 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h @@ -99,15 +99,15 @@ public: const PreActivationOrderServices&) override; // this is in the critical path, orders can be submitted now // (this is only called once and after the on_init_new) - void on_activate(Price, Quantity, OrderServices&,trace::CorID const&) override; + void on_activate(Price, Quantity, OrderServices&,PerfTrace const&) override; // called when the user (or a higher level order) // updates the order's price or quantity - void on_update(Price, Quantity,trace::CorID const&) override; + void on_update(Price, Quantity,PerfTrace const&) override; // called when the user (or higher level order) cancels an order - void on_cancel(trace::CorID const&) override; + void on_cancel(PerfTrace const&) override; // crack means to let the lower level orders lose from the higher // level order and cancel the higher level order - void on_crack(trace::CorID const&) override; + void on_crack(PerfTrace const&) override; // ISpreaderManager //////////////////// //////////////////////////////////////// public: @@ -178,7 +178,7 @@ private: void _send_hedge(size_t hedge_leg_index, Price hedge_price, Quantity hedge_qty, - trace::CorID const); + PerfTrace const&); void _compute_hedge_price_quantity(size_t filled_leg_index, Price filled_price, double filled_quantity, @@ -251,7 +251,7 @@ public: SpreaderBookkeepingData& test_only_func_spreader_full_data () {return _bookkeeping_data();} int64_t test_cancel_timeout () {return _cancel_timeout;} void test_only_on_book_update(const bts::orderman::BookUpdateEvent& b) {_on_book_update(b);} - void test_only_on_book_update(const bts::orderman::Book& b, trace::CorID const&trace) {_on_book_update(bts::orderman::BookUpdateEvent(b, trace));} + void test_only_on_book_update(const bts::orderman::Book& b, PerfTrace const&trace) {_on_book_update(bts::orderman::BookUpdateEvent(b, trace));} void test_only_on_child_order_update (bts::orderman::OrderKey order_key, bts::api::orderman::OrderStatus status, Quantity total_filled_qty, Price avg_price) { bts::api::orderman::OrderDefinition order_def; @@ -260,7 +260,7 @@ public: order_state.set_status(status); order_state.set_filled_quantity(total_filled_qty.value()); order_state.set_last_price(avg_price.value()); - OrderStateUpdateEvent ord_ev (order_key, OrderKey(0), order_def, order_state,trace::CorID()); + OrderStateUpdateEvent ord_ev (order_key, OrderKey(0), order_def, order_state,PerfTrace()); _on_child_order_update (ord_ev); } void test_only_on_init_new(const bts::api::orderman::OrderDefinition& order_def, const SpreaderPreActivationOrderServices& pao_services) {_on_init_new(order_def, pao_services);} diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp index 2060e02fd..5025a4c2d 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp @@ -14,7 +14,7 @@ SingleFillHedger::SingleFillHedger(ISpreaderManager& spreader_manager, ChildOrder& child_order, bts::Price hedge_price, bts::Quantity hedge_quantity, - trace::CorID const &fill_trace, + PerfTrace const &fill_trace, bool is_live) : _spreader(spreader_manager), @@ -94,7 +94,7 @@ void SingleFillHedger::on_order_update(const SpreaderChildOrderState& u){ u.last_update_filled_quantity()); _worker->on_order_update (u); } -void SingleFillHedger::on_book(const bts::orderman::Book& book,trace::CorID &trace){ +void SingleFillHedger::on_book(const bts::orderman::Book& book,PerfTrace &trace){ _worker->on_book (book,trace); } void SingleFillHedger::cancel_hedge(){ diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h index 1e3bf495c..9b9fa926c 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h @@ -30,7 +30,7 @@ private: const LegPropertyData& _leg_property_data; SpreaderChildOrderState _child_order_state; HedgePriceQuantityState _price_quantity_state; - trace::CorID _fill_trace; + PerfTrace _fill_trace; IHedgerStateWorker* _worker; HedgerStartStateWorker _start_state_worker; HedgerWaitingForFirstAckStateWorker _waiting_for_first_ack_state_worker; @@ -71,7 +71,7 @@ public: ChildOrder& child_order, bts::Price hedge_price, bts::Quantity hedge_quantity, - trace::CorID const &trace, + PerfTrace const &trace, bool is_live); SingleFillHedger() = delete; SingleFillHedger (const SingleFillHedger&) = delete; @@ -88,7 +88,7 @@ public: void on_order_update(const SpreaderChildOrderState& order_update_message); //c. called when the market data associated // with this security is changed - void on_book(const bts::orderman::Book& book,trace::CorID &); + void on_book(const bts::orderman::Book& book,PerfTrace &); //d. called when the hedge order is cancelled, either // manually or automatically void cancel_hedge(); diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp index 23860e5dd..573b1dbf8 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp @@ -101,7 +101,7 @@ void SingleLegQuoter::update_order_status(const SpreaderChildOrderState& u){ } } void SingleLegQuoter::on_book(size_t leg_index, - const bts::orderman::Book& book,trace::CorID trace){ + const bts::orderman::Book& book,PerfTrace &trace){ if (_active_quoting) _worker->on_book (leg_index, book,trace); } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h index 0a35fb934..c55968042 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h @@ -101,7 +101,7 @@ public: //c. called when the market data associated // with this security is changed void on_book(size_t leg_index, - const bts::orderman::Book&,trace::CorID ); + const bts::orderman::Book&,PerfTrace &); //d. called when the order is cancelled, either // manually or automatically void cancel_order(); @@ -171,13 +171,13 @@ private: } void _place_order (Price price, Quantity quantity, - const trace::CorID &trace) { + const PerfTrace &trace) { _child_order_state.place_order(price, quantity, _spreader.current_time(), trace); } - void _modify_order (Price price, Quantity quantity, trace::CorID &trace) { + void _modify_order (Price price, Quantity quantity, PerfTrace &trace) { _child_order_state.modify_order(price, quantity, trace); } void _cancel_order () {_child_order_state.cancel_order();} diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp index 7a3c8d5b5..2e8064684 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp @@ -84,10 +84,10 @@ SingleFillHedger& SpreaderBookkeepingData::add_new_hedger(ISpreaderManager& spre size_t leg_index, bts::Price hedge_price, bts::Quantity hedge_quantity, - const trace::CorID &trace){ + const PerfTrace &trace){ LOG(OrderMan, Info, "SpreaderBookkeepingData::add_new_hedger " "leg_index:{} price:{} quantity:{} cid:{}", - leg_index, hedge_price, hedge_quantity,trace.sn); + leg_index, hedge_price, hedge_quantity,trace.md_sn); bts_assert(leg_index < _n_legs); SpreaderLegData& leg_data = _leg_data[leg_index]; std::vector& leg_hedgers = _hedgers[leg_index]; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h index 0d1b4832f..77998a4f1 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h @@ -108,7 +108,7 @@ public: size_t leg_index, bts::Price hedge_price, bts::Quantity hedge_quantity, - trace::CorID const &); + PerfTrace const &); // finds the spreader fill, price (ie averages it out, using // the size and price ratio, across all legs) void total_fills (Quantity& out_quantity, Price& out_price) const; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h index 1f8f9c875..aa42e7b85 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h @@ -130,7 +130,7 @@ public: void place_order(Price price, Quantity quantity, bts::TimeStamp curr_time, - const trace::CorID& trace){ + const PerfTrace& trace){ _out_price = price; _out_quantity = quantity; _order_place_time=curr_time; @@ -140,15 +140,15 @@ public: "key:{} is_quoting:{} sec_key:{} live:{} " "price:{} qty:{} cid:{}", order_key(), _is_quoting, _sec_key, - _is_live, price, quantity, trace.sn); + _is_live, price, quantity, trace.md_sn); if (_is_live) _child_order.activate(price, quantity, trace); } void modify_order(Price price, Quantity quantity){ - trace::CorID dont_care; + PerfTrace dont_care; modify_order(price,quantity,dont_care); } - void modify_order(Price price, Quantity quantity, trace::CorID &trace){ + void modify_order(Price price, Quantity quantity, PerfTrace &trace){ _out_price = price; _out_quantity = quantity; _n_modify_orders++; @@ -158,6 +158,7 @@ public: order_key(), _is_quoting, _sec_key, _is_live, price, quantity, _n_modify_orders); if (_is_live) { + trace.spreader_modify_order = utils::TimeStamp::now(); _child_order.update(price, quantity, trace); } } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/IHedgerStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/IHedgerStateWorker.h index ff966a518..186c8d074 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/IHedgerStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/IHedgerStateWorker.h @@ -5,7 +5,6 @@ #include "lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerState.h" namespace bts { -namespace trace {struct CorID;} namespace orderman {class Book;} namespace orderman { class SpreaderChildOrderState; @@ -25,7 +24,7 @@ public: virtual void on_order_update (const SpreaderChildOrderState& order_update) = 0; // called only when the security that the hedger is working on // has a market data update - virtual void on_book (const bts::orderman::Book& book,trace::CorID &) = 0; + virtual void on_book (const bts::orderman::Book& book,PerfTrace &) = 0; // when the spreader wants the hedger to cancel its order virtual void cancel() = 0; // on terminate, the hedger should simply go to its end state diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp index 61ce32ef4..ac6a92a71 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp @@ -9,7 +9,7 @@ void HedgerEndStateWorker::init(){ } void HedgerEndStateWorker::on_order_update(const SpreaderChildOrderState&){ } -void HedgerEndStateWorker::on_book(const bts::orderman::Book&,trace::CorID &){ +void HedgerEndStateWorker::on_book(const bts::orderman::Book&,PerfTrace &){ } void HedgerEndStateWorker::cancel(){ } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.h index 549d67306..1ab5917b5 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.h @@ -17,7 +17,7 @@ public: const std::string state_text () const override {return "END";} void init () override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (const bts::orderman::Book& book,trace::CorID &) override; + void on_book (const bts::orderman::Book& book,PerfTrace &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp index 1ed919153..b23d78c92 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp @@ -18,7 +18,7 @@ void HedgerStartStateWorker::init(){ void HedgerStartStateWorker::on_order_update(const SpreaderChildOrderState&){ bts_assert_msg (false, "HedgerStartStateWorker::on_order_update illegal operation"); } -void HedgerStartStateWorker::on_book(const bts::orderman::Book&,trace::CorID &){ +void HedgerStartStateWorker::on_book(const bts::orderman::Book&,PerfTrace &){ // market data will not be sent until out of start. bts_assert_msg (false, "HedgerStartStateWorker::on_book illegal operation"); } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.h index 12757001b..37c9c79ef 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.h @@ -21,7 +21,7 @@ public: const std::string state_text () const override {return "START";} void init () override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (const bts::orderman::Book& book,trace::CorID &) override; + void on_book (const bts::orderman::Book& book,PerfTrace &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp index c31a3a112..92bc38267 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp @@ -17,7 +17,7 @@ void HedgerWaitingForCancelAckStateWorker::on_order_update(const SpreaderChildOr _hedger->transform_to_END (); } } -void HedgerWaitingForCancelAckStateWorker::on_book(const bts::orderman::Book&,trace::CorID &){ +void HedgerWaitingForCancelAckStateWorker::on_book(const bts::orderman::Book&,PerfTrace &){ } void HedgerWaitingForCancelAckStateWorker::cancel(){ } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.h index d2be51786..6a7800ec5 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.h @@ -21,7 +21,7 @@ public: const std::string state_text () const override {return "WAITING_FOR_CANCEL_ACK";} void init () override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (const bts::orderman::Book& book,trace::CorID &) override; + void on_book (const bts::orderman::Book& book,PerfTrace &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp index 084b8c3de..e8b5bf049 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp @@ -23,7 +23,7 @@ void HedgerWaitingForFirstAckCancelledStateWorker::on_order_update(const Spreade _hedger->transform_to_WAITING_FOR_CANCEL_ACK (); } } -void HedgerWaitingForFirstAckCancelledStateWorker::on_book(const bts::orderman::Book&,trace::CorID &){ +void HedgerWaitingForFirstAckCancelledStateWorker::on_book(const bts::orderman::Book&,PerfTrace &){ } void HedgerWaitingForFirstAckCancelledStateWorker::cancel(){ } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.h index 97383f885..21f542f5b 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.h @@ -21,7 +21,7 @@ public: const std::string state_text () const override {return "WAITING_FOR_FIRST_ACK_CANCELLED";} void init () override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (const bts::orderman::Book& book,trace::CorID &) override; + void on_book (const bts::orderman::Book& book,PerfTrace &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp index cb99478c4..8e5a7e396 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp @@ -18,7 +18,7 @@ void HedgerWaitingForFirstAckStateWorker::on_order_update(const SpreaderChildOrd // this means the first ack _hedger->transform_to_WORKING (); } -void HedgerWaitingForFirstAckStateWorker::on_book(const bts::orderman::Book&,trace::CorID &){ +void HedgerWaitingForFirstAckStateWorker::on_book(const bts::orderman::Book&,PerfTrace &){ } void HedgerWaitingForFirstAckStateWorker::cancel(){ _hedger->transform_to_WAITING_FOR_FIRST_ACK_CANCELLED (); diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.h index b1ca9c5f0..900e6b4ed 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.h @@ -21,7 +21,7 @@ public: const std::string state_text () const override {return "WAITING_FOR_FIRST_ACK";} void init () override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (const bts::orderman::Book& book,trace::CorID &) override; + void on_book (const bts::orderman::Book& book,PerfTrace &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp index aebb18a6a..019b87e21 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp @@ -20,7 +20,7 @@ void HedgerWorkingStateWorker::on_order_update(const SpreaderChildOrderState& or _hedger->transform_to_END (); } } -void HedgerWorkingStateWorker::on_book(const bts::orderman::Book&,trace::CorID &){ +void HedgerWorkingStateWorker::on_book(const bts::orderman::Book&,PerfTrace &){ double new_price; if (SpreaderUtils::post_hedge_market_based_price_action (_hedger->_price_quantity_state.out_price().value(), _hedger->_price_quantity_state.out_quantity().value(), diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.h index 1e23979ff..be0201d94 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.h @@ -24,7 +24,7 @@ public: const std::string state_text () const override {return "WORKING";} void init () override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (const bts::orderman::Book& book,trace::CorID &) override; + void on_book (const bts::orderman::Book& book,PerfTrace &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/IQuoterStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/IQuoterStateWorker.h index a83697af0..909239e1b 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/IQuoterStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/IQuoterStateWorker.h @@ -26,7 +26,7 @@ public: virtual void on_order_update (const SpreaderChildOrderState& order_update) = 0; // called when any of the legs in the spread has a book update //virtual void on_book (TickToTradeCorID corid, size_t leg_id, const Book& book) = 0; - virtual void on_book (size_t, const bts::orderman::Book&,trace::CorID &) = 0; + virtual void on_book (size_t, const bts::orderman::Book&,PerfTrace &) = 0; // when the spreader wants the quoter to cancel its order virtual void cancel() = 0; // on terminate, the quoter should simply go to its end state diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp index 24c417c8f..d73bfc9b4 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp @@ -29,7 +29,7 @@ void QuoterEndStateWorker::one_time_activate (Price, Quantity){ void QuoterEndStateWorker::on_order_update (const SpreaderChildOrderState&) {} void QuoterEndStateWorker::on_book (size_t, - const bts::orderman::Book&,trace::CorID &) + const bts::orderman::Book&,PerfTrace &) {} void QuoterEndStateWorker::cancel() {} diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.h index 2a52ee1a6..c8342757a 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.h @@ -25,7 +25,7 @@ public: virtual void on_transition () override; void one_time_activate (Price, Quantity) override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (size_t leg_id, const bts::orderman::Book& book,trace::CorID &) override; + void on_book (size_t leg_id, const bts::orderman::Book& book,PerfTrace &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp& ts) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp index 38d3b9dea..754a3aa47 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp @@ -24,7 +24,7 @@ void QuoterStartStateWorker::on_order_update (const SpreaderChildOrderState&){ bts_assert_msg (false, "QuoterStartStateWorker::on_order_update is an illegal operation, nothing can happen before one_time_activate"); } void QuoterStartStateWorker::on_book (size_t, - const bts::orderman::Book&,trace::CorID &){ + const bts::orderman::Book&,PerfTrace &){ } void QuoterStartStateWorker::cancel(){ // since no order has been sent for this leg, diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.h index dae5ada02..05e9f74d2 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.h @@ -23,7 +23,7 @@ public: virtual void on_transition () override {} void one_time_activate (Price, Quantity) override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (size_t leg_id, const bts::orderman::Book& book,trace::CorID &) override; + void on_book (size_t leg_id, const bts::orderman::Book& book,PerfTrace &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp& ts) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp index bf493f55f..bbef8d47c 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp @@ -21,7 +21,7 @@ void QuoterWaitingForCancelAckStateWorker::on_order_update (const SpreaderChildO } void QuoterWaitingForCancelAckStateWorker::on_book (size_t, const bts::orderman::Book&, - trace::CorID &){ + PerfTrace &){ } void QuoterWaitingForCancelAckStateWorker::cancel(){ } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.h index 9ef9d2409..bd8a4be24 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.h @@ -24,7 +24,7 @@ public: virtual void on_transition () override {} void one_time_activate (Price, Quantity) override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (size_t leg_id, const bts::orderman::Book& book,trace::CorID &) override; + void on_book (size_t leg_id, const bts::orderman::Book& book,PerfTrace &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp& ts) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp index b674b1d3b..dac791970 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp @@ -25,7 +25,7 @@ void QuoterWaitingForFirstAckCancelledWorker::on_order_update (const SpreaderChi _quoter->_transform_to_WAITING_FOR_CANCEL_ACK (); } } -void QuoterWaitingForFirstAckCancelledWorker::on_book (size_t , const bts::orderman::Book& ,trace::CorID &) { +void QuoterWaitingForFirstAckCancelledWorker::on_book (size_t , const bts::orderman::Book& ,PerfTrace &) { } void QuoterWaitingForFirstAckCancelledWorker::cancel(){ } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.h index 085e9b919..60db96ace 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.h @@ -30,7 +30,7 @@ public: virtual void on_transition () override {} void one_time_activate (Price, Quantity) override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (size_t leg_id, const bts::orderman::Book& book,trace::CorID &) override; + void on_book (size_t leg_id, const bts::orderman::Book& book,PerfTrace &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp& ts) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp index cd5e845b2..c68d7db84 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp @@ -22,7 +22,7 @@ void QuoterWaitingForFirstAckWorker::on_order_update (const SpreaderChildOrderSt _quoter->_transform_to_WORKING (); } void QuoterWaitingForFirstAckWorker::on_book (size_t, - const bts::orderman::Book&,trace::CorID &){ + const bts::orderman::Book&,PerfTrace &){ _analyze_and_act(); } void QuoterWaitingForFirstAckWorker::cancel(){ diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.h index d4c8d0ed0..ded3b991b 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.h @@ -28,7 +28,7 @@ public: virtual void on_transition () override {} void one_time_activate (Price, Quantity) override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (size_t leg_id, const bts::orderman::Book& book,trace::CorID & ) override; + void on_book (size_t leg_id, const bts::orderman::Book& book,PerfTrace & ) override; void cancel() override; void terminate() override; void on_time(const TimeStamp& ts) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp index 588761444..a4a17678f 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp @@ -24,7 +24,7 @@ void QuoterWaitingForIOCWorker::on_order_update (const SpreaderChildOrderState& } } void QuoterWaitingForIOCWorker::on_book (size_t, - const bts::orderman::Book&,trace::CorID &){ + const bts::orderman::Book&,PerfTrace &){ } void QuoterWaitingForIOCWorker::cancel(){ _quoter->_transform_to_WAITING_FOR_FIRST_ACK_CANCELLED (); diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.h index 69ba40109..48bf749eb 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.h @@ -31,7 +31,7 @@ public: void one_time_activate (Price, Quantity) override; void on_order_update (const SpreaderChildOrderState& order_update) override; void on_book (size_t leg_id, - const bts::orderman::Book& book,trace::CorID &) override; + const bts::orderman::Book& book,PerfTrace &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp& ts) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp index 6cefbfcf3..d5e90f133 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp @@ -20,7 +20,7 @@ void QuoterWaitingForSizeStateWorker::on_order_update (const SpreaderChildOrderS "is an illegal operation"); } void QuoterWaitingForSizeStateWorker::on_book (size_t, - const Book&,trace::CorID &trace){ + const Book&,PerfTrace &trace){ _longpath_analyze_and_act (trace); } void QuoterWaitingForSizeStateWorker::cancel(){ @@ -45,10 +45,10 @@ void QuoterWaitingForSizeStateWorker::update_spreader_order (Price price, _longpath_analyze_and_act (); } void QuoterWaitingForSizeStateWorker::_longpath_analyze_and_act(){ - trace::CorID trace; + PerfTrace trace; _longpath_analyze_and_act(trace); } -void QuoterWaitingForSizeStateWorker::_longpath_analyze_and_act(trace::CorID &trace){ +void QuoterWaitingForSizeStateWorker::_longpath_analyze_and_act(PerfTrace &trace){ if (_quoter->_price_quantity_state.target_reached()){ LOG(OrderMan, Info, "QuoterWaitingForSizeStateWorker key:{} " "target reached, transforming to end", diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.h index 5cbad6abf..830e61557 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.h @@ -30,7 +30,7 @@ public: virtual void on_transition () override {} void one_time_activate (Price, Quantity) override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (size_t leg_id, const bts::orderman::Book& book,trace::CorID &) override; + void on_book (size_t leg_id, const bts::orderman::Book& book,PerfTrace &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp& ts) override; @@ -41,6 +41,6 @@ private: // if it has. otherwise computes the price, qty and if // its valid, places an order goes to waiting_for_first_ack void _longpath_analyze_and_act (); - void _longpath_analyze_and_act (trace::CorID &); + void _longpath_analyze_and_act (PerfTrace &); }; }} diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp index 0c505d9b6..8fcf93397 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp @@ -31,7 +31,7 @@ void QuoterWorkingStateWorker::on_order_update (const SpreaderChildOrderState& u } void QuoterWorkingStateWorker::on_book (size_t, const bts::orderman::Book&, - trace::CorID &trace){ + PerfTrace &trace){ _longpath_analyze_and_act (trace); } void QuoterWorkingStateWorker::cancel(){ @@ -55,10 +55,10 @@ void QuoterWorkingStateWorker::update_spreader_order (Price price, } void QuoterWorkingStateWorker::_longpath_analyze_and_act () { - trace::CorID trace; + PerfTrace trace; _longpath_analyze_and_act(trace); } -void QuoterWorkingStateWorker::_longpath_analyze_and_act (trace::CorID &trace) +void QuoterWorkingStateWorker::_longpath_analyze_and_act (PerfTrace &trace) { if (_quoter->_price_quantity_state.target_reached()){ // this could happen if @@ -94,7 +94,7 @@ void QuoterWorkingStateWorker::_longpath_analyze_and_act (trace::CorID &trace) } } } -void QuoterWorkingStateWorker::_modify_order (Price price, Quantity quantity,trace::CorID &trace ){ +void QuoterWorkingStateWorker::_modify_order (Price price, Quantity quantity,PerfTrace &trace ){ bool same_price_qty = _quoter->_price_quantity_state.out_quantity() == quantity && bts::securities::test_price_equality(_quoter->_price_quantity_state.out_price().value(), price.value(), _quoter->_this_leg_data.tick_size()); diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.h index e7f5ee612..a0568256f 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.h @@ -23,7 +23,7 @@ public: virtual void on_transition () override; void one_time_activate (Price, Quantity) override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (size_t leg_id, const bts::orderman::Book& book,trace::CorID &) override; + void on_book (size_t leg_id, const bts::orderman::Book& book,PerfTrace &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp& ts) override; @@ -34,8 +34,8 @@ private: // i. if target reached => cxl order and go to waiting_for_cancel_ack_final // ii. if computed_qty = 0 => cxl order and go to waiting_for_cancel_ack_continue // iii. if reprice (ie qty changed or price changed beyond the threshold) => requote - void _longpath_analyze_and_act (trace::CorID &); + void _longpath_analyze_and_act (PerfTrace &); void _longpath_analyze_and_act (); - void _modify_order (Price price, Quantity quantity,trace::CorID &); + void _modify_order (Price price, Quantity quantity,PerfTrace &); }; }} diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp index b0bc2c9dc..2dcd517cb 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp @@ -34,7 +34,7 @@ void SpreaderEndStateWorker::on_update(Price, Quantity){ } void SpreaderEndStateWorker::on_cancel(){ } -void SpreaderEndStateWorker::on_book(const Book&,trace::CorID){ +void SpreaderEndStateWorker::on_book(const Book&,PerfTrace&){ } void SpreaderEndStateWorker::on_settlement_price(const SettlementUpdateEvent&){ } @@ -43,7 +43,7 @@ void SpreaderEndStateWorker::on_time(const TimeStamp&){ void SpreaderEndStateWorker::on_quoter_order_error(SpreaderLegData&){ } void SpreaderEndStateWorker::on_quoter_order_fill(SpreaderLegData&, - trace::CorID){ + PerfTrace&){ } void SpreaderEndStateWorker::on_quoter_order_status_update(SpreaderLegData&){ } diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.h index cdf791845..2c19c9bcd 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.h @@ -20,12 +20,12 @@ public: void on_activate(Price, Quantity, SpreaderOrderServices&) override; void on_update(Price, Quantity) override; void on_cancel() override; - void on_book(const Book&,trace::CorID) override; + void on_book(const Book&,PerfTrace&) override; void on_settlement_price(const SettlementUpdateEvent&) override; void on_time(const TimeStamp&) override; void on_quoter_order_error(SpreaderLegData& leg_data) override; void on_quoter_order_fill(SpreaderLegData& leg_data, - trace::CorID) override; + PerfTrace&) override; void on_quoter_order_status_update(SpreaderLegData& leg_data) override; void on_hedger_order_error(SingleFillHedger&) override; void on_hedger_order_update(SingleFillHedger&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp index adc4108e2..2d7169017 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp @@ -89,21 +89,21 @@ void SpreaderStartStateWorker::on_activate(Price price, { // 4. sub to child orders order // (could have hidden that inside SpreaderOrderServices by exposing events) - order_services.order_services().subscribe_to_child_updates([this](const bts::orderman::OrderStateUpdateEvent& os) { _spreader->_on_child_order_update (os);}); + order_services.order_services().child_updates.sub(_spreader->key(), [this](const bts::orderman::OrderStateUpdateEvent& os) { _spreader->_on_child_order_update (os);}); // 5. sub to market data for (size_t l_idx = 0; l_idx < _spreader->_bookkeeping_data().n_legs(); l_idx++) { const LegPropertyData& leg_prop = _spreader->_bookkeeping_data().get_leg_data(l_idx).leg_property_data(); LOG(OrderMan, Info, "SpreaderStartStateWorker::on_activate subbing to book sec_key: {}", leg_prop.security_key()); - order_services.order_services().subscribe_to_book(leg_prop.leg_security_key(), - [this](const BookUpdateEvent& bk_event) - {_spreader->_on_book_update (bk_event);}); - order_services.order_services().subscribe_to_settlements(leg_prop.leg_security_key(), - [this](const SettlementUpdateEvent& s_event) - {_spreader->_on_settlement_update (s_event);}); + order_services.order_services().book_updates.sub(leg_prop.leg_security_key(), + [this](const BookUpdateEvent& bk_event) + {_spreader->_on_book_update (bk_event);}); + order_services.order_services().settlement_updates.sub(leg_prop.leg_security_key(), + [this](const SettlementUpdateEvent& s_event) + {_spreader->_on_settlement_update (s_event);}); } // 6. sub to time - order_services.order_services().subscribe_to_time([this](const bts::mercury::TimerEvent& t_event){_spreader->_on_time(t_event);}); + order_services.order_services().time_change.sub([this](const bts::mercury::TimerEvent& t_event){_spreader->_on_time(t_event);}); } // quoters are init'ed in the next state _spreader->_transform_to_WAITING_FOR_INITIAL_DATA(); @@ -117,7 +117,7 @@ void SpreaderStartStateWorker::on_cancel(){ // and hence it goes directly to END _spreader->_transform_to_END(); } -void SpreaderStartStateWorker::on_book(const bts::orderman::Book&,trace::CorID ){ +void SpreaderStartStateWorker::on_book(const bts::orderman::Book&,PerfTrace &){ bts_assert_msg (false, "SpreaderStartStateWorker::on_book is an illegal operation"); } void SpreaderStartStateWorker::on_settlement_price(const SettlementUpdateEvent&){ @@ -131,7 +131,7 @@ void SpreaderStartStateWorker::on_quoter_order_error(SpreaderLegData&){ bts_assert_msg (false, "SpreaderStartStateWorker::on_quoter_order_error is an illegal operation"); } void SpreaderStartStateWorker::on_quoter_order_fill(SpreaderLegData&, - trace::CorID){ + PerfTrace&){ bts_assert_msg (false, "SpreaderStartStateWorker::on_quoter_order_fill is an illegal operation"); } void SpreaderStartStateWorker::on_quoter_order_status_update(SpreaderLegData&){ diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.h index 78e92a3cd..fe2f863ac 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.h @@ -25,12 +25,12 @@ public: SpreaderOrderServices&) override; void on_update(Price, Quantity) override; void on_cancel() override; - void on_book(const Book&,trace::CorID ) override; + void on_book(const Book&,PerfTrace &) override; void on_time(const TimeStamp&) override; void on_settlement_price(const SettlementUpdateEvent&) override; void on_quoter_order_error(SpreaderLegData& leg_data) override; void on_quoter_order_fill(SpreaderLegData& leg_data, - trace::CorID ) override; + PerfTrace &) override; void on_quoter_order_status_update(SpreaderLegData& leg_data) override; void on_hedger_order_error(SingleFillHedger&) override; void on_hedger_order_update(SingleFillHedger&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp index d58ea59d5..dbc6b2955 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp @@ -33,7 +33,7 @@ void SpreaderWaitingForCancelAllStateWorker::on_update(Price, } void SpreaderWaitingForCancelAllStateWorker::on_cancel(){ } -void SpreaderWaitingForCancelAllStateWorker::on_book(const Book&,trace::CorID ){ +void SpreaderWaitingForCancelAllStateWorker::on_book(const Book&,PerfTrace &){ } void SpreaderWaitingForCancelAllStateWorker::on_time(const TimeStamp& ts){ if (ms_diff (ts, _cancel_timestamp) >= _spreader->_cancel_timeout){ @@ -48,7 +48,7 @@ void SpreaderWaitingForCancelAllStateWorker::on_quoter_order_error(SpreaderLegDa leg_data.quoter().update_order_status (leg_data.order_update_message()); } void SpreaderWaitingForCancelAllStateWorker::on_quoter_order_fill(SpreaderLegData& leg_data, - trace::CorID ){ + PerfTrace &){ leg_data.quoter().update_order_status (leg_data.order_update_message()); } void SpreaderWaitingForCancelAllStateWorker::on_quoter_order_status_update(SpreaderLegData& leg_data){ diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.h index cf6f7ca0b..0ff8771a7 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.h @@ -23,12 +23,12 @@ public: SpreaderOrderServices&) override; void on_update(Price, Quantity) override; void on_cancel() override; - void on_book(const Book&,trace::CorID ) override; + void on_book(const Book&,PerfTrace &) override; void on_settlement_price(const SettlementUpdateEvent&) override; void on_time(const TimeStamp&) override; void on_quoter_order_error(SpreaderLegData& leg_data) override; void on_quoter_order_fill(SpreaderLegData& leg_data, - trace::CorID ) override; + PerfTrace &) override; void on_quoter_order_status_update(SpreaderLegData& leg_data) override; void on_hedger_order_error(SingleFillHedger&) override; void on_hedger_order_update(SingleFillHedger&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp index e69c0e62a..2cc07d80c 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp @@ -46,7 +46,7 @@ void SpreaderWaitingForInitialDataStateWorker::on_cancel(){ _spreader->_transform_to_END(); } void SpreaderWaitingForInitialDataStateWorker::on_book(const Book& book, - trace::CorID){ + PerfTrace&){ SpreaderBookkeepingData& bookkeeping_data = _spreader->_bookkeeping_data(); SpreaderLegData& md_leg = bookkeeping_data.get_leg_data(book.security_key()); md_leg.update_book(book); @@ -71,7 +71,7 @@ void SpreaderWaitingForInitialDataStateWorker::on_quoter_order_error(SpreaderLeg "on_quoter_order_error is an illegal operation"); } void SpreaderWaitingForInitialDataStateWorker::on_quoter_order_fill(SpreaderLegData&, - trace::CorID){ + PerfTrace&){ bts_assert_msg (false, "SpreaderWaitingForInitialDataStateWorker::" "on_quoter_order_fill is an illegal operation"); } diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.h index c344a8542..b9bd5c2f9 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.h @@ -25,12 +25,12 @@ public: SpreaderOrderServices&) override; void on_update(Price, Quantity) override; void on_cancel() override; - void on_book(const Book&,trace::CorID) override; + void on_book(const Book&,PerfTrace &) override; void on_settlement_price(const SettlementUpdateEvent&) override; void on_time(const TimeStamp&) override; void on_quoter_order_error(SpreaderLegData& leg_data) override; void on_quoter_order_fill(SpreaderLegData& leg_data, - trace::CorID ) override; + PerfTrace &) override; void on_quoter_order_status_update(SpreaderLegData& leg_data) override; void on_hedger_order_error(SingleFillHedger&) override; void on_hedger_order_update(SingleFillHedger&) override; @@ -40,4 +40,4 @@ private: void _init_quoters(); void _go_to_working(); }; -}} +}} \ No newline at end of file diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp index 59fc70fbb..4a32b5451 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp @@ -42,7 +42,7 @@ void SpreaderWorkingStateWorker::on_cancel(){ _spreader->_cancel_orders (true, true); _spreader->_transform_to_WAITING_FOR_CANCEL_ALL (); } -void SpreaderWorkingStateWorker::on_book(const Book& book,trace::CorID trace){ +void SpreaderWorkingStateWorker::on_book(const Book& book,PerfTrace &trace){ SpreaderBookkeepingData& bookkeeping_data = _spreader->_bookkeeping_data(); // this is a key->index lookup SpreaderLegData& md_leg = bookkeeping_data.get_leg_data(book.security_key()); @@ -78,7 +78,7 @@ void SpreaderWorkingStateWorker::on_quoter_order_error(SpreaderLegData& leg_data _spreader->_transform_to_WAITING_FOR_CANCEL_ALL (); } void SpreaderWorkingStateWorker::on_quoter_order_fill(SpreaderLegData& leg_data, - trace::CorID trace){ + PerfTrace &trace){ // this is the most complex part of the spreader. the following needs to be done // 1. tell other quoters about it (so they reduce their sizes) // 2. launch a new hedger diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.h index 214e2eba1..e832eef41 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.h @@ -22,12 +22,12 @@ public: SpreaderOrderServices&) override; void on_update(Price, Quantity) override; void on_cancel() override; - void on_book(const Book&,trace::CorID ) override; + void on_book(const Book&,PerfTrace &) override; void on_settlement_price(const SettlementUpdateEvent&) override; void on_time(const TimeStamp&) override; void on_quoter_order_error(SpreaderLegData& leg_data) override; void on_quoter_order_fill(SpreaderLegData& leg_data, - trace::CorID ) override; + PerfTrace &) override; void on_quoter_order_status_update(SpreaderLegData& leg_data) override; void on_hedger_order_error(SingleFillHedger&) override; void on_hedger_order_update(SingleFillHedger&) override; diff --git a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp index 4baf91726..b3bd2bbef 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp +++ b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp @@ -47,7 +47,7 @@ TEST_CASE ("quoter price quantity state", "[spreader]") REQUIRE (s.out_price() == Price (0.0)); REQUIRE (s.out_quantity() == Quantity (0)); // set out price and quantity - trace::CorID dont_care; + PerfTrace dont_care; bts::TimeStamp ts; order.place_order(Price (-0.35), Quantity (123),ts,dont_care); REQUIRE (s.target_spread_price() == Price (-1.0)); @@ -102,7 +102,7 @@ TEST_CASE ("quoter price quantity state", "[spreader]") s.add_hedged_reduction (Quantity(5)); s.add_hedged_reduction (Quantity(15)); // set out values - trace::CorID dont_care; + PerfTrace dont_care; bts::TimeStamp ts; order_2.place_order (Price(1), Quantity (50),ts,dont_care); REQUIRE (s.target_spread_price() == Price (-1.0)); @@ -1250,7 +1250,7 @@ TEST_CASE ("hedger_START_state", "[spreader]") 1, hedger_price, hedger_quantity, - trace::CorID()); + PerfTrace()); verify_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); SECTION("0. transition_to_start") @@ -1300,7 +1300,7 @@ TEST_CASE ("hedger_WAITING_FOR_FIRST_ACK_state", "[spreader]") 1, hedger_price, hedger_quantity, - trace::CorID()); + PerfTrace()); verify_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); hedger.init (); @@ -1359,7 +1359,7 @@ TEST_CASE ("hedger_WAITING_FOR_FIRST_ACK_CANCELLED_state", "[spreader]") 1, hedger_price, hedger_quantity, - trace::CorID()); + PerfTrace()); verify_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); hedger.init (); @@ -1420,7 +1420,7 @@ TEST_CASE ("hedger_WAITING_FOR_CANCEL_ACK_state", "[spreader]") 1, hedger_price, hedger_quantity, - trace::CorID()); + PerfTrace()); verify_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); hedger.init (); @@ -1492,7 +1492,7 @@ TEST_CASE ("hedger_END_state", "[spreader]") 1, hedger_price, hedger_quantity, - trace::CorID()); + PerfTrace()); verify_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); hedger.init (); @@ -1549,7 +1549,7 @@ TEST_CASE ("hedger_WORKING", "[spreader]") 1, hedger_price, hedger_quantity, - trace::CorID()); + PerfTrace()); verify_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); SpreaderChildOrderState& u = hedger.order_state(); @@ -1651,7 +1651,7 @@ TEST_CASE ("spreader_START", "[spreader]") } SECTION("5. on_cancel") { - spreader.on_cancel(trace::CorID()); + spreader.on_cancel(PerfTrace()); REQUIRE(spreader.test_only_func_spreader_state() == SpreaderState::END); LOG(OrderMan, Diag, "spreader_START.on_cancel"); } @@ -1763,7 +1763,7 @@ TEST_CASE ("spreader_WORKING", "[spreader]") // be as is spreader_price = Price (0); spreader_quantity = Quantity (200); - spreader.on_update (spreader_price, spreader_quantity,trace::CorID()); + spreader.on_update (spreader_price, spreader_quantity,PerfTrace()); verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity (30), Quantity(55), Price(1998), Quantity(130), Quantity(115), false); verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity (55), Quantity(30), Price(2004), Quantity(165), Quantity(115), false); @@ -1773,7 +1773,7 @@ TEST_CASE ("spreader_WORKING", "[spreader]") } SECTION("5. on_cancel") { - spreader.on_cancel(trace::CorID()); + spreader.on_cancel(PerfTrace()); verify_basic_spreader_state (spreader, SpreaderState::WAITING_FOR_CANCEL_ALL, spreader_price, spreader_quantity); generic_validate_quoters (QuoterState::WAITING_FOR_CANCEL_ACK, true); generic_validate_hedgers (HedgerState::WAITING_FOR_CANCEL_ACK); @@ -1794,7 +1794,7 @@ TEST_CASE ("spreader_WORKING", "[spreader]") new double[5] {2005, 2006, 2007, 2008, 2009}, new uint16_t[5] {0, 0, 0, 0, 0}, true); - spreader.test_only_on_book_update (modified_book, trace::CorID()); + spreader.test_only_on_book_update (modified_book, PerfTrace()); verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); generic_validate_quoters (QuoterState::WORKING, false); generic_validate_hedgers (HedgerState::WORKING); @@ -1808,8 +1808,8 @@ TEST_CASE ("spreader_WORKING", "[spreader]") new double[5] {2003, 2004, 2005, 2006, 2007}, new uint16_t[5] {25, 25, 20, 20, 10}, true); - //spreader.on_book (bts::orderman::trace::CorID(), modified_book); - spreader.test_only_on_book_update (modified_book,trace::CorID()); + //spreader.on_book (bts::orderman::PerfTrace(), modified_book); + spreader.test_only_on_book_update (modified_book,PerfTrace()); verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(1999), Quantity(45), Quantity(15), false); verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); @@ -1824,8 +1824,8 @@ TEST_CASE ("spreader_WORKING", "[spreader]") new double[5] {2003, 2004, 2005, 2006, 2007}, new uint16_t[5] {25, 25, 20, 20, 10}, true); - //spreader.on_book (bts::orderman::trace::CorID(), modified_book); - spreader.test_only_on_book_update (modified_book,trace::CorID()); + //spreader.on_book (bts::orderman::PerfTrace(), modified_book); + spreader.test_only_on_book_update (modified_book,PerfTrace()); verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2000), Quantity(34), Quantity(15), false); verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); @@ -1838,8 +1838,8 @@ TEST_CASE ("spreader_WORKING", "[spreader]") new double[5] {2003, 2004, 2005, 2006, 2007}, new uint16_t[5] {25, 25, 20, 20, 10}, true); - //spreader.on_book (bts::orderman::trace::CorID(), modified_book); - spreader.test_only_on_book_update (modified_book, trace::CorID()); + //spreader.on_book (bts::orderman::PerfTrace(), modified_book); + spreader.test_only_on_book_update (modified_book, PerfTrace()); verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2001), Quantity(45), Quantity(15), false); verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); @@ -1853,8 +1853,8 @@ TEST_CASE ("spreader_WORKING", "[spreader]") new double[5] {2003, 2004, 2005, 2006, 2007}, new uint16_t[5] {25, 25, 20, 20, 10}, true); - //spreader.on_book (bts::orderman::trace::CorID(), modified_book); - spreader.test_only_on_book_update (modified_book, trace::CorID()); + //spreader.on_book (bts::orderman::PerfTrace(), modified_book); + spreader.test_only_on_book_update (modified_book, PerfTrace()); verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WAITING_FOR_CANCEL_ACK, false, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2001), Quantity(45), Quantity(15), false); verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); @@ -2068,7 +2068,7 @@ TEST_CASE ("spreader_WAITING_FOR_CANCEL_ACK", "[spreader]") // now cancel the spreader bts::TimeStamp cancel_timestamp = std::chrono::system_clock::now(); spreader.test_only_on_time (cancel_timestamp); - spreader.on_cancel (trace::CorID()); + spreader.on_cancel (PerfTrace()); auto validate_state = [&]() -> void { verify_basic_spreader_state (spreader, SpreaderState::WAITING_FOR_CANCEL_ALL, spreader_price, spreader_quantity); @@ -2091,7 +2091,7 @@ TEST_CASE ("spreader_WAITING_FOR_CANCEL_ACK", "[spreader]") } SECTION("4. on_update") { - spreader.on_update (Price(-0.05), Quantity(200),trace::CorID()); + spreader.on_update (Price(-0.05), Quantity(200),PerfTrace()); validate_state(); // order changes dont go through validate_state(); @@ -2099,7 +2099,7 @@ TEST_CASE ("spreader_WAITING_FOR_CANCEL_ACK", "[spreader]") } SECTION("5. on_cancel") { - spreader.on_cancel(trace::CorID()); + spreader.on_cancel(PerfTrace()); // already in cancel state, no change validate_state(); LOG(OrderMan, Diag, "spreader_WAITING_FOR_CANCEL_ACK.on_cancel"); @@ -2668,10 +2668,10 @@ TEST_CASE ("spreader_perf_2legs", "[spreader]") for (uint32_t i=0; i(us_diff (t1,t0))/n_iters; @@ -2804,11 +2804,11 @@ TEST_CASE ("spreader_perf_4legs", "[spreader]") new uint16_t[5] {100,150,250,25,125}, true); spreader.test_only_on_book_update (BookUpdateEvent(book_1, - trace::CorID())); + PerfTrace())); spreader.test_only_on_book_update (BookUpdateEvent(book_2, - trace::CorID())); + PerfTrace())); spreader.test_only_on_book_update (BookUpdateEvent(book_3, - trace::CorID())); + PerfTrace())); verify_complete_quoter_state (qleg_data_4.quoter(), QuoterState::WAITING_FOR_FIRST_ACK, false, @@ -2843,10 +2843,10 @@ TEST_CASE ("spreader_perf_4legs", "[spreader]") for (uint32_t i=0; i(us_diff (t1,t0))/n_iters; diff --git a/src/lib/orderman/orders/spreader_orders/tests/tests_common.h b/src/lib/orderman/orders/spreader_orders/tests/tests_common.h index 0f570d31e..7792d29c3 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/tests_common.h +++ b/src/lib/orderman/orders/spreader_orders/tests/tests_common.h @@ -390,7 +390,7 @@ void fire_book_update (double* prices, uint16_t* sizes, api::Side side, size_t l bts::orderman::Book book; fill_book (book, prices, sizes, side); sm.set_book (book, leg_index); - trace::CorID trace; + PerfTrace trace; quoter.on_book (leg_index, book,trace); } void verify_leg_data (SpreaderLegData& l, bts::orderman::OrderKey, size_t leg_index, uint32_t sec_key, uint32_t exp_yr, uint32_t exp_m, uint32_t exp_day, const std::string& symbol, double leg_mult, double price_mult, api::Side side) @@ -441,7 +441,7 @@ void fire_book_update_hedger (double* prices, uint16_t* sizes, api::Side side, S { bts::orderman::Book book; fill_book (book, prices, sizes, side); - trace::CorID trace; + PerfTrace trace; hedger.on_book (book,trace); } void verify_complete_hedger_state (const SingleFillHedger& hedger, HedgerState state, Price target_price, Quantity target_quantity, Quantity aggregated_filled_quantity, @@ -525,11 +525,11 @@ void set_spreader_orders (SpreaderOrder& spreader, double* leg_1_bid_prices, uin bts::orderman::Book book_leg_1 = get_book (SecurityKey (leg_1_id), 5, leg_1_bid_prices, leg_1_bid_sizes, leg_1_ask_prices, leg_1_ask_sizes, true); - spreader.test_only_on_book_update (bts::orderman::BookUpdateEvent(book_leg_1, trace::CorID())); + spreader.test_only_on_book_update (bts::orderman::BookUpdateEvent(book_leg_1, PerfTrace())); bts::orderman::Book book_leg_2 = get_book (SecurityKey (leg_2_id), 5, leg_2_bid_prices, leg_2_bid_sizes, leg_2_ask_prices, leg_2_ask_sizes, true); - spreader.test_only_on_book_update (bts::orderman::BookUpdateEvent(book_leg_2,trace::CorID())); + spreader.test_only_on_book_update (bts::orderman::BookUpdateEvent(book_leg_2,PerfTrace())); spreader.test_only_on_child_order_update (leg_data_1.order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (leg_1_fills), Price (leg_1_filled_price)); spreader.test_only_on_child_order_update (leg_data_2.order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (leg_2_fills), Price (leg_2_filled_price)); } diff --git a/src/lib/orderman/server/OrderServiceServer.cpp b/src/lib/orderman/server/OrderServiceServer.cpp index 9259a2a7c..9eb1abb06 100644 --- a/src/lib/orderman/server/OrderServiceServer.cpp +++ b/src/lib/orderman/server/OrderServiceServer.cpp @@ -9,6 +9,7 @@ #include "lib/mercury/executor/Executor.h" #include "lib/metrics/metrics.h" #include "lib/orderman/actors/AsyncFactory.h" +#include "lib/orderman/actors/ExecutionGateway.h" #include "lib/orderman/actors/FillStore.h" #include "lib/orderman/actors/MDSource.h" #include "lib/orderman/actors/MDSupplementarySource.h" @@ -17,12 +18,12 @@ #include "lib/orderman/actors/ServiceBridge.h" #include "lib/orderman/actors/order_manager/OrderManager.h" #include "lib/orderman/order_factory/DynamicOrderRegistry.h" -#include "lib/plugin/SparkServices.h" -#include "lib/plugin/plugin.h" #include "lib/utils/bts_chrono.h" +#include "lib/plugin/plugin.h" +#include "lib/plugin/SparkServices.h" #include "lib/utils/thread_manager.h" #include "lib/utils/type_name.h" - + #include namespace bts { @@ -89,11 +90,12 @@ ActorThread *find_thread_for_actor( struct OrderServiceServer::PImpl { PImpl(bts::api::ServiceContext &ctx, std::shared_ptr &ss, - DynamicOrderRegistry const &d, metrics::MetricsContainer &stats, trace::PerfLog &log) + DynamicOrderRegistry const &d, + metrics::MetricsContainer &stats) : service_bridge(), service_ready(false), known_orders(), known_fills(), publish_orders(), publish_fills(), admin_service(ctx.locate()), md_consumer(ss), - stats(stats), dyn_order_registry(d),log(log) {} + stats(stats), dyn_order_registry(d) {} ServiceBridge *service_bridge; @@ -109,16 +111,15 @@ struct OrderServiceServer::PImpl { bts::md::MDConsumer md_consumer; metrics::MetricsContainer &stats; DynamicOrderRegistry const &dyn_order_registry; - trace::PerfLog &log; }; OrderServiceServer::OrderServiceServer( bts::api::ServiceContext &ctx, std::shared_ptr &ss, - DynamicOrderRegistry const &d, metrics::MetricsContainer &stats, - trace::PerfLog &log) - : api::orderman::OrderServiceBase(ctx), me(new PImpl(ctx, ss, d, stats,log)) { - + DynamicOrderRegistry const&d, + metrics::MetricsContainer &stats, PerfTraceLog &log) + : api::orderman::OrderServiceBase(ctx), me(new PImpl(ctx, ss, d,stats)) { + me->publish_orders = make_orders_publisher(); me->publish_fills = make_fills_publisher(); @@ -137,14 +138,23 @@ OrderServiceServer::OrderServiceServer( bts_assert_msg(thread, "Could not find a configured thread for MDSource. See the " "OrdermanCfg key"); - thread->executor.spawn(me->md_consumer, me->stats,log); + thread->executor.spawn(me->md_consumer, me->stats); // OrderManager thread = find_thread_for_actor("OrderManager", me->actor_threads); bts_assert_msg(thread, "Could not find a configured thread for OrderManager. See " "the OrdermanCfg key"); - thread->executor.spawn(d,me->log); + thread->executor.spawn(d); + + // ExecutionGateway's + thread = find_thread_for_actor("ExecutionGateway", me->actor_threads); + bts_assert_msg(thread, + "Could not find a configured thread for ExecutionGateway " + "instances. See the OrdermanCfg key"); + auto &all_connections = config::get().connection(); + for (auto const &c : all_connections) + thread->executor.spawn(c, log); // Timer thread = find_thread_for_actor("Timer", me->actor_threads); @@ -204,7 +214,9 @@ OrderServiceServer::OrderServiceServer( [this, &ctx](auto const &fill) { ctx.post([this, fill] { this->on_fills(fill); }); }, - me->dyn_order_registry, thread->executor.make_proxy()); + me->dyn_order_registry, + thread->executor.make_proxy()); + thread->executor.activate(me->service_bridge); diff --git a/src/lib/orderman/server/OrderServiceServer.h b/src/lib/orderman/server/OrderServiceServer.h index 4c23c13f9..526a63b2a 100644 --- a/src/lib/orderman/server/OrderServiceServer.h +++ b/src/lib/orderman/server/OrderServiceServer.h @@ -6,7 +6,7 @@ #include namespace bts { -namespace trace {class PerfLog;} +class PerfTraceLog; namespace api { class ISyntheticSecurityService; } @@ -22,7 +22,7 @@ class OrderServiceServer : public api::orderman::OrderServiceBase { std::shared_ptr &, DynamicOrderRegistry const&, metrics::MetricsContainer &, - trace::PerfLog &); + PerfTraceLog &); ~OrderServiceServer(); void create_order(const api::orderman::Create &, diff --git a/src/lib/orderman/tests/fat_wrapper_tests.cpp b/src/lib/orderman/tests/fat_wrapper_tests.cpp index b3a45dc12..0472ca363 100644 --- a/src/lib/orderman/tests/fat_wrapper_tests.cpp +++ b/src/lib/orderman/tests/fat_wrapper_tests.cpp @@ -6,14 +6,16 @@ namespace mercury { struct A { std::string s; - bool operator==(const A &src) const { return src.s == s; } + bool operator==(const A&src) const {return src.s == s;} }; -TEST_CASE("FatWrapperTests", "[mercury]") { +TEST_CASE ("FatWrapperTests" , "[mercury]") +{ - SECTION("fat_wrapper_works_small") { - mercury::FatWrapper<128> fw; - A a{"hello"}; + SECTION("fat_wrapper_works_small") + { + mercury::FatWrapper <128> fw; + A a {"hello"}; fw.wrap(a); REQUIRE(a == fw.unwrap()); @@ -21,13 +23,14 @@ TEST_CASE("FatWrapperTests", "[mercury]") { fw2 = fw; REQUIRE(a == fw2.unwrap()); - auto fw3(fw); + auto fw3 (fw); REQUIRE(a == fw3.unwrap()); } - SECTION("fat_wrapper_works_big") { - mercury::FatWrapper<32> fw; - A a{"hello"}; + SECTION("fat_wrapper_works_big") + { + mercury::FatWrapper <32> fw; + A a {"hello"}; fw.wrap(a); REQUIRE(a == fw.unwrap()); @@ -35,16 +38,16 @@ TEST_CASE("FatWrapperTests", "[mercury]") { fw2 = fw; REQUIRE(a == fw2.unwrap()); - auto fw3(fw); + auto fw3 (fw); REQUIRE(a == fw3.unwrap()); } - SECTION("empty_can_be_copied") { - mercury::FatWrapper<64> fw; - mercury::FatWrapper<64> fw2; - fw2 = fw; + SECTION("empty_can_be_copied") + { + mercury::FatWrapper <64> fw; + mercury::FatWrapper <64> fw2; + fw2=fw; } } -} // namespace mercury -} // namespace bts +}} diff --git a/src/lib/orderman2/IOrderManagerObserver.h b/src/lib/orderman2/IOrderManagerObserver.h new file mode 100644 index 000000000..f5596b663 --- /dev/null +++ b/src/lib/orderman2/IOrderManagerObserver.h @@ -0,0 +1,28 @@ +#pragma once + +#include "lib/config/protos/jetfix.pb.h" +#include "lib/domain_model/SecurityKey.h" +#include "orderman_utils/orderman_utils.h" + +namespace bts { +namespace api { +namespace orderman { +class OrderDefinition; +} +} // namespace api +namespace orderman2 { + +class OrderState; + +class IOrderManagerObserver { + public: + void subscribe_book(SecurityKey, void *sub); + void request_new_fill_buffers(config::JetFIX::Connection const &, + size_t n_buffers, void *sub); + void request_new_orders(api::orderman::OrderDefinition const &, + OrderKey parent_key, size_t n_orders, void *sub); + void send_fix(size_t gw_idx, jetfix::OutFIXPtr const &); +}; + +} // namespace orderman2 +} // namespace bts diff --git a/src/lib/orderman2/OrderManager2.cpp b/src/lib/orderman2/OrderManager2.cpp new file mode 100644 index 000000000..44949ac83 --- /dev/null +++ b/src/lib/orderman2/OrderManager2.cpp @@ -0,0 +1,7 @@ +#include "OrderManager2.h" +#include "IOrderManagerObserver.h" + +namespace bts { +namespace orderman2 { + +}} diff --git a/src/lib/orderman2/OrderManager2.h b/src/lib/orderman2/OrderManager2.h new file mode 100644 index 000000000..1f761b75b --- /dev/null +++ b/src/lib/orderman2/OrderManager2.h @@ -0,0 +1,37 @@ +#pragma once + +#include "orderman_utils/orderman_utils.h" +#include "orderman_utils/Book.h" +#include "lib/jetfix/common/OutFIXPtr.h" + +#include + +namespace bts { +namespace api { class Security;} +namespace orderman2 { + +class Order; +class IOrderManagerObserver; +class ExecutionReport; + +class OrderManager { + OrderManager(); + + void init(IOrderManagerObserver &observer); + + void on_activate(Order &, Price , Quantity); + void on_update(Order&, Price , Quantity); + void on_cancel(Order&); + void on_book_update(Book const&b,void*sub); + void on_execution_report(ExecutionReport &); + + void on_securities(std::vector const&); + void on_new_fill_buffers(std::vector const&,void*sub); + void on_new_orders(std::vector const&,void*sub); + +private: + struct PImpl; + std::unique_ptr me; +}; + +}} diff --git a/src/lib/orderman2/orders/NativeOrder.cpp b/src/lib/orderman2/orders/NativeOrder.cpp deleted file mode 100644 index 96e505504..000000000 --- a/src/lib/orderman2/orders/NativeOrder.cpp +++ /dev/null @@ -1,2 +0,0 @@ -#include "NativeOrder.h" - diff --git a/src/lib/orderman2/orders/NativeOrder.h b/src/lib/orderman2/orders/NativeOrder.h deleted file mode 100644 index 3e03df4de..000000000 --- a/src/lib/orderman2/orders/NativeOrder.h +++ /dev/null @@ -1,57 +0,0 @@ -#pragma once -#include "Order.h" - - -namespace bts { -namespace orderman { - - -struct PermissionQueryResult { - bool can_send; - std::string error_msg; -}; - -struct RouteQueryResult { - bool has_route; - std::string error_msg; - api::orderman::RoutingRecord routing_record; -}; - -class NativeOrder2 : public Order2 { -public: - virtual void on_execution_report(std::string const &, OrderKey, - ExecutionReport const &){}; - virtual void on_cancel_reject(std::string const &, OrderKey, - std::string const & /*msg*/){}; - virtual void on_gateway_status(std::string const &, bool /*is_connected*/){}; - - void subscribe_execution_report(std::string const &gw, OrderKey k); - void unsubscribe_execution_report(std::string const &gw, OrderKey k); - void subscribe_cancel_reject(std::string const &gw, OrderKey k); - void unsubscribe_cancel_reject(std::string const &gw, OrderKey k); - void subscribe_gateway_status(std::string const &); - void unsubscribe_gateway_status(std::string const &); - - RouteQueryResult get_route(AccountID, UserID, api::Security const &); - PermissionRec - get_permission_record(api::orderman::RoutingRecord const &routing, AccountID, - UserID, api::Security const &, api::Side); - - PermissionQueryResult can_send_new_order(PermissionRec const &, Quantity, - Price); - - PermissionQueryResult can_update_order(PermissionRec const &, Quantity from, - Quantity to, Price p); - - bool is_route_connected(api::orderman::RoutingRecord const &); - void send_fix(api::orderman::RoutingRecord const &rr, - jetfix::MessageTypes mt, jetfix::FIXFragment const &f); - - TimeStamp time() const; - mercury::TimeStampStr time_str() const; - private: - struct PImpl; - std::unique_ptr me; -}; - -}} diff --git a/src/lib/orderman2/orders/Order.cpp b/src/lib/orderman2/orders/Order.cpp deleted file mode 100644 index a14ec8bed..000000000 --- a/src/lib/orderman2/orders/Order.cpp +++ /dev/null @@ -1,2 +0,0 @@ -#include "Order.h" - diff --git a/src/lib/orderman2/orders/Order.h b/src/lib/orderman2/orders/Order.h deleted file mode 100644 index 24c10b533..000000000 --- a/src/lib/orderman2/orders/Order.h +++ /dev/null @@ -1,70 +0,0 @@ -#pragma once - -#include "lib/api/services/OrderService.pb.h" -#include "lib/domain_model/common.h" -#include "lib/jetfix/common/OutFIX.h" -#include "lib/mercury/common/mercury_common.h" -#include "lib/orderman/orderman_utils/Book.h" -#include "lib/orderman/orderman_utils/ExecutionReport.h" -#include "lib/orderman/orderman_utils/orderman_common.h" - -#include - -namespace bts { -namespace api { -namespace orderman { -class OrderDefinition; -class OrderRecord; -} // namespace orderman -} // namespace api -} // namespace bts - -namespace bts { -namespace orderman { - -struct ChildOrderDescriptor {}; -struct ChildOrder {}; - -class PermissionRec {}; - -class Order2 { - public: - virtual ~Order2(); - - virtual void on_init_new(api::orderman::OrderDefinition const &) = 0; - virtual void on_init_recovered(api::orderman::OrderRecord const &) = 0; - - virtual void on_activate(Price, Quantity) = 0; - virtual void on_update(Price, Quantity) = 0; - virtual void on_cancel() = 0; - virtual void on_child_order_update(OrderKey, api::orderman::OrderState const &){}; - virtual void on_book(SecurityKey, Book const &) {} - virtual void on_settlement(SecurityKey, Book const &) {} - virtual void on_time(TimeStamp const &) {} - - void subscribe_child_updates(OrderKey child); - void unsubscribe_child_updates(OrderKey child); - void subscribe_book(SecurityKey); - void unsubscribe_book(SecurityKey); - void subscribe_settlement(SecurityKey); - void unsubscribe_settlement(SecurityKey); - void subscribe_time(); - void unsubscribe_time(); - - api::Security const *resolve_security(SecurityKey const &k) const; - void report_state(const api::orderman::OrderState &state); - - ChildOrderDescriptor const & - make_child_order_descriptor(api::orderman::OrderDefinition const &, - size_t hint = 1); - ChildOrder make_child_order(ChildOrderDescriptor const &desc); - void send_child(ChildOrder ch, Price, Quantity); - void update_child(ChildOrder ch, Price, Quantity); - void cancel_child(ChildOrder ch); - - private: - struct PImpl; - std::unique_ptr me; -}; -} // namespace orderman -} // namespace bts diff --git a/src/sdk/examples/order_plugin_example.cpp b/src/sdk/examples/order_plugin_example.cpp index 3202d102a..8949c21f9 100644 --- a/src/sdk/examples/order_plugin_example.cpp +++ b/src/sdk/examples/order_plugin_example.cpp @@ -24,10 +24,10 @@ class DynamicIcebergOrder : public DynamicOrder { void on_init_recovered(OrderRecord const &, const PreActivationOrderServices &) override; void on_activate(Price, Quantity, OrderServices &, - trace::CorID const&) override; - void on_update(Price, Quantity, trace::CorID const&) override; - void on_crack(trace::CorID const &) override; - void on_cancel(trace::CorID const &) override; + PerfTrace const &) override; + void on_update(Price, Quantity, PerfTrace const &) override; + void on_crack(PerfTrace const &) override; + void on_cancel(PerfTrace const &) override; private: void report_state(); @@ -127,7 +127,7 @@ void DynamicIcebergOrder::on_init_recovered( void DynamicIcebergOrder::on_activate(Price p, Quantity q, OrderServices &services, - trace::CorID const &) { + PerfTrace const &) { bts_assert(!me->services); me->services = &services; me->child_builder.activate(services); @@ -136,8 +136,8 @@ void DynamicIcebergOrder::on_activate(Price p, Quantity q, case ORDER_STATUS_INACTIVE: me->state.set_price(p.value()); me->state.set_quantity(q.value()); - services.subscribe_to_child_updates( - [this](auto const &os) { this->on_child_order_update(os); }); + services.child_updates.sub( + key(), [this](auto const &os) { this->on_child_order_update(os); }); transition(ORDER_STATUS_WORKING); send_next_child_order(); break; @@ -164,7 +164,7 @@ void DynamicIcebergOrder::on_activate(Price p, Quantity q, report_state(); } -void DynamicIcebergOrder::on_update(Price p, Quantity q, trace::CorID const &) { +void DynamicIcebergOrder::on_update(Price p, Quantity q, PerfTrace const &) { switch (me->state.status()) { case ORDER_STATUS_WORKING: case ORDER_STATUS_PENDING_WORKING: @@ -191,9 +191,9 @@ void DynamicIcebergOrder::on_update(Price p, Quantity q, trace::CorID const &) { report_state(); } -void DynamicIcebergOrder::on_crack(trace::CorID const &) {} +void DynamicIcebergOrder::on_crack(PerfTrace const &) {} -void DynamicIcebergOrder::on_cancel(trace::CorID const &) { +void DynamicIcebergOrder::on_cancel(PerfTrace const &) { switch (me->state.status()) { case ORDER_STATUS_WORKING: LOG(Plugin, Info, "Canceling DynamicIceberg Order {}", key().value()); diff --git a/src/sdk/sdk_shell.sh b/src/sdk/sdk_shell.sh index 70da324f4..d6c65969e 100644 --- a/src/sdk/sdk_shell.sh +++ b/src/sdk/sdk_shell.sh @@ -12,6 +12,7 @@ docker run \ -w $PWD \ -u root \ -v /home:/home \ + -e DISPLAY=$DISPLAY \ --name bts_sdk \ -d \ -t bluetradingsystems/linux_docker \ diff --git a/src/server/sparkd/cmds/Benchmark.cpp b/src/server/sparkd/cmds/Benchmark.cpp index eb35d3ce8..e25268b4c 100644 --- a/src/server/sparkd/cmds/Benchmark.cpp +++ b/src/server/sparkd/cmds/Benchmark.cpp @@ -32,7 +32,6 @@ #include #include #include -#include "lib/tracing/PerfLog.h" #include @@ -271,6 +270,18 @@ static void init_with_clean_os(benchmark::State &state) { } BENCHMARK(init_with_clean_os); +static void init_with_old_order_update(benchmark::State &state) { + api::orderman::OrderDefinition def; + auto order_state = + utils::pb::from_string(order_state_str); + PerfTrace trace; + OrderKey k(1); + for (auto _ : state) + benchmark::DoNotOptimize( + orderman::OrderStateUpdateEvent(k, k, def, order_state, trace)); +} +BENCHMARK(init_with_old_order_update); + static void serialize_update(benchmark::State &state) { api::orderman::Update update; update.set_order_key(1); @@ -824,13 +835,6 @@ static void fix_time_stamp(benchmark::State &state) { } BENCHMARK(fix_time_stamp); -static void perf_log(benchmark::State &state) { - trace::PerfLog l; - for (auto _ : state) - l.log(trace::CorID{"sim", 0}, "this", 1, 2, "txt", 3); -} -BENCHMARK(perf_log); - std::string Benchmark::help() { return "Run micro-benchmarks. Use --benchmark_filter=regex to run only " "specific benchmarks."; diff --git a/src/server/sparkd/cmds/QuickTest.cpp b/src/server/sparkd/cmds/QuickTest.cpp index 0489920c7..84d9931e1 100644 --- a/src/server/sparkd/cmds/QuickTest.cpp +++ b/src/server/sparkd/cmds/QuickTest.cpp @@ -1,16 +1,30 @@ #include "QuickTest.h" #include "ICmd.h" -#include "lib/tracing/PerfLog.h" + +#include "lib/api/services/OrderService.server.pb.h" +#include "lib/mercury/actors/PingPong.h" +#include "lib/mercury/broker/BrokerProxy.h" +#include "lib/mercury/common/mercury_common.h" +#include "lib/mercury/executor/Executor.h" +#include "lib/utils/PBUtils.h" +#include "lib/utils/thread_manager.h" +#include "lib/orderman/events/OrderStateUpdateEvent.h" #include namespace bts { namespace cmd { +using namespace bts::mercury; +using namespace bts::orderman; + int QuickTest::execute(std::vector const &) { - trace::PerfLog l; - l.log(trace::CorID{"sim", 0}, "this", 1, 2, "txt", 3); - l.store_log_entries(); + sleep_for(10s); + for (int i = 0; i < 100; i++) { + auto t = utils::TimeStamp::now(); + LOG(OrderMan,Info,"Now: {}", (utils::TimeStamp::now() - t).nanoseconds()); + } + sleep_for(10s); return 0; } diff --git a/src/server/sparkd/cmds/Run.cpp b/src/server/sparkd/cmds/Run.cpp index 701148644..516980043 100644 --- a/src/server/sparkd/cmds/Run.cpp +++ b/src/server/sparkd/cmds/Run.cpp @@ -10,27 +10,26 @@ #include "lib/quickbus/quickbus.h" #include "lib/utils/Dispatcher.h" -#include "lib/config/protos/toggles.pb.h" #include "lib/md/SyntheticSecurityService.h" #include "lib/md/relay/QueryServer.h" #include "lib/metrics/metrics.h" #include "lib/metrics/system_metrics.h" -#include "lib/orderman/order_factory/DynamicOrderRegistry.h" +#include "lib/orderman/orderman_utils/PerfTraceLog.h" #include "lib/orderman/server/OrderServiceServer.h" #include "lib/persistence/PersistenceServiceServer.h" -#include "lib/plugin/SparkServices.h" -#include "lib/plugin/plugin.h" -#include "lib/tracing/PerfLog.h" #include "lib/utils/thread_manager.h" #include "server/sparkd/http/WebServer.h" -#include "server/sparkd/md/MarketDataAuxiliaryServiceServer.h" #include "server/sparkd/md/run_md.h" #include "server/sparkd/position/PositionServiceServer.h" #include "server/sparkd/support/ErrorReportService.h" #include "server/sparkd/support/ShellLatencyServer.h" #include "server/sparkd/user/AdminServiceServer.h" +#include "server/sparkd/md/MarketDataAuxiliaryServiceServer.h" #include "server/sparkd/user/UserServiceServer.h" - +#include "lib/orderman/order_factory/DynamicOrderRegistry.h" +#include "lib/plugin/SparkServices.h" +#include "lib/plugin/plugin.h" +#include "lib/config/protos/toggles.pb.h" #include namespace bts { @@ -42,16 +41,17 @@ int Run::execute(std::vector const &) { "------------------------------------ Sparkd launched " "--------------------------------"); + config::QuickbusNodeCfg qb_cfg; auto &ports = config::get(); qb_cfg.set_my_port(ports.qbus_port()); qbus::Quickbus quickbus(qb_cfg); api::ServiceContext sc(&quickbus); - trace::PerfLog perf_log; + PerfTraceLog perf_log; metrics::MetricsContainer stats; metrics::publish_system_metrics(stats); - http::SparkWebServer webserver(sc, stats, perf_log, ports.config_port()); + http::SparkWebServer webserver(sc, stats, perf_log,ports.config_port()); persistence::PersistenceServiceServer settings_saver(sc, "settings"); user::UserServiceServer login_server(sc); @@ -67,10 +67,10 @@ int Run::execute(std::vector const &) { plugin::init_plugins(plugin_services); // finished initializing order plugins - orderman::OrderServiceServer order_service_server( - sc, synthetic_service, dyn_order_registry, stats, perf_log); + orderman::OrderServiceServer order_service_server(sc, synthetic_service,dyn_order_registry, + stats, perf_log); support::ErrorReportServer error_report_service(sc); - admin::AdminServiceServer admin_service(sc); + admin::AdminServiceServer admin_service(sc); md::auxiliary::MarketDataAuxiliaryServiceServer md_aux_server(sc); position::PositionServiceServer position_service(sc); metrics::ShellLatencyServer shell_latency_service( @@ -79,11 +79,12 @@ int Run::execute(std::vector const &) { auto bg_health = std::make_shared("spark_background_thread"); utils::DispatcherTimer timer(utils::Dispatcher::background(), 5000, - [=]() { bg_health->increment(); }); + [=]() {bg_health->increment(); }); timer.start(); + utils::DispatcherTimer timer2(utils::Dispatcher::background(), 1000, - [&]() { perf_log.store_log_entries(); }); + [&]() {perf_log.persist_traces();}); timer2.start(); stats.publish(bg_health); diff --git a/src/server/sparkd/cmds/Web.cpp b/src/server/sparkd/cmds/Web.cpp index 9ba90c72b..09bda5c6e 100644 --- a/src/server/sparkd/cmds/Web.cpp +++ b/src/server/sparkd/cmds/Web.cpp @@ -14,7 +14,7 @@ #include "server/sparkd/user/AdminServiceServer.h" #include "server/sparkd/user/UserServiceServer.h" #include "server/sparkd/md/run_md.h" -#include "lib/tracing/PerfLog.h" +#include "lib/orderman/orderman_utils/PerfTraceLog.h" #include #include @@ -31,7 +31,7 @@ int Web::execute(const std::vector& args) { metrics::MetricsContainer stats; metrics::publish_system_metrics(stats); - trace::PerfLog perf_log; + PerfTraceLog perf_log; http::SparkWebServer webserver(sc, stats, perf_log,ports.config_port()); user::UserServiceServer login_server(sc); diff --git a/src/server/sparkd/http/WebServer.cpp b/src/server/sparkd/http/WebServer.cpp index bcd6ddae2..e72ffcebe 100644 --- a/src/server/sparkd/http/WebServer.cpp +++ b/src/server/sparkd/http/WebServer.cpp @@ -6,7 +6,7 @@ #include "lib/logging/logging.h" #include "lib/os/os.h" #include "lib/utils/TimeStamp.h" -#include "lib/tracing/PerfLog.h" +#include "lib/orderman/orderman_utils/PerfTraceLog.h" #include #include @@ -54,9 +54,9 @@ namespace http { const api::ServiceContext& _ctx; metrics::MetricsContainer& _metrics; std::shared_ptr> _mtimer; - trace::PerfLog &_perf_log; + PerfTraceLog &_trace_log; - ServerState(const api::ServiceContext& ctx, metrics::MetricsContainer& metrics, trace::PerfLog &l,int port) : + ServerState(const api::ServiceContext& ctx, metrics::MetricsContainer& metrics, PerfTraceLog &l,int port) : _m(), _dispatcher(utils::Dispatcher::get_named("Webserver")), _session(), @@ -67,7 +67,7 @@ namespace http { _metrics(metrics), _mtimer(std::make_shared>("spark_metrics_query_duration_ms", std::array({ 0.5, 1.0, 5.0, 10.0 }))), - _perf_log(l) + _trace_log(l) { _www = os::sparkdata_path("www"); _conf = os::sparkdata_path("conf"); @@ -165,10 +165,10 @@ namespace http { _mtimer->observe((utils::TimeStamp::now() - start).microseconds() / 1000.0); } - void return_perf_trace_data(connection_ptr& con,size_t ) { + void return_perf_trace_data(connection_ptr& con,size_t max_rows) { utils::TimeStamp start = utils::TimeStamp::now(); std::stringstream ss; - //_perf_log.print_latest_traces(ss,max_rows); + _trace_log.print_latest_traces(ss,max_rows); con->set_body(ss.str()); con->set_status(websocketpp::http::status_code::ok); _mtimer->observe((utils::TimeStamp::now() - start).microseconds() / 1000.0); @@ -359,7 +359,7 @@ namespace http { -SparkWebServer::SparkWebServer(const api::ServiceContext& ctx, metrics::MetricsContainer& metrics, trace::PerfLog &l,int port) : +SparkWebServer::SparkWebServer(const api::ServiceContext& ctx, metrics::MetricsContainer& metrics, PerfTraceLog &l,int port) : _me(std::make_shared(ctx, metrics, l,port)) { } diff --git a/src/server/sparkd/http/WebServer.h b/src/server/sparkd/http/WebServer.h index b9bb981df..2414a4f8b 100644 --- a/src/server/sparkd/http/WebServer.h +++ b/src/server/sparkd/http/WebServer.h @@ -4,7 +4,7 @@ #include namespace bts { -namespace trace {class PerfLog;} +class PerfTraceLog; namespace http { struct ServerState; @@ -12,7 +12,7 @@ namespace http { class SparkWebServer { std::shared_ptr _me; public: - SparkWebServer(const api::ServiceContext& ctx, metrics::MetricsContainer& metrics, trace::PerfLog &,int port); + SparkWebServer(const api::ServiceContext& ctx, metrics::MetricsContainer& metrics, PerfTraceLog &,int port); }; }} From e6a9c7e433d28a5cba62fb9d516b0e746c136c85 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Wed, 5 Dec 2018 21:52:04 +0000 Subject: [PATCH 036/107] Merged. --- CMakeLists.txt | 3 +- doc/user/docs/release_notes.md | 11 +- src/lib/CMakeDeps.cmake | 2 +- .../api/service_helpers/AdminServiceUtils.cpp | 1 + src/lib/jetfix/codec/FIXMsg.h | 8 +- src/lib/jetfix/common/InMsgBuffer.h | 8 +- src/lib/jetfix/connection/AsyncReader.cpp | 14 +- src/lib/jetfix/connection/AsyncReader.h | 2 + src/lib/jetfix/connection/IConnection.h | 4 +- .../jetfix/connection/SocketConnection.cpp | 66 +- src/lib/jetfix/connection/SocketConnection.h | 8 +- src/lib/jetfix/gateway/CoreGateway.cpp | 58 +- src/lib/jetfix/gateway/CoreGateway.h | 6 +- src/lib/jetfix/gateway/JetFIXGateway.h | 15 +- src/lib/jetfix/gateway/Session.cpp | 12 +- src/lib/jetfix/gateway/Session.h | 5 +- src/lib/jetfix/tests/async_reader_tests.cpp | 8 +- src/lib/mercury/actors/Actor.h | 10 + src/lib/mercury/actors/ContentSubscription.h | 12 +- src/lib/orderman/actors/AsyncFactory.cpp | 106 ++- src/lib/orderman/actors/ExecutionGateway.cpp | 88 +- src/lib/orderman/actors/ExecutionGateway.h | 57 +- src/lib/orderman/actors/FillStore.cpp | 15 +- src/lib/orderman/actors/MDSource.h | 16 +- .../orderman/actors/MDSupplementarySource.cpp | 67 +- src/lib/orderman/actors/SODPosition.cpp | 223 ++--- src/lib/orderman/actors/SecuritySrc.cpp | 25 +- src/lib/orderman/actors/ServiceBridge.cpp | 12 +- src/lib/orderman/actors/ServiceBridge.h | 4 +- .../actors/order_manager/ChildOrder.h | 90 +- .../actors/order_manager/OrderBuilder.cpp | 4 +- .../actors/order_manager/OrderBuilder.h | 111 ++- .../actors/order_manager/OrderManager.cpp | 228 +++-- .../actors/order_manager/OrderManager.h | 52 +- .../actors/order_manager/OrderServices.h | 269 ++++-- .../order_manager/OrderServicesData.cpp | 15 +- .../actors/order_manager/OrderServicesData.h | 54 +- src/lib/orderman/events/ActivateOrderEvent.h | 5 +- src/lib/orderman/events/BookUpdateEvent.h | 5 +- src/lib/orderman/events/CancelOrderEvent.h | 5 +- src/lib/orderman/events/CancelRejectEvent.cpp | 5 +- src/lib/orderman/events/CrackOrderEvent.h | 5 +- .../events/NewExecutionReportEvent.cpp | 6 +- .../orderman/events/NewExecutionReportEvent.h | 6 +- .../orderman/events/OrderStateUpdateEvent.h | 9 +- src/lib/orderman/events/OutFIXMsgEvent.h | 32 - src/lib/orderman/events/UpdateOrderEvent.h | 5 +- src/lib/orderman/limiter/LimitStore.cpp | 112 +-- src/lib/orderman/limiter/Limiter.cpp | 137 ++- src/lib/orderman/limiter/ProductLimitNode.cpp | 33 +- src/lib/orderman/limiter/ProductLimitTree.cpp | 40 +- .../orderman/limiter/SecurityLimitNode.cpp | 32 +- .../orderman/limiter/SecurityLimitTree.cpp | 38 +- .../orderman/limiter/tests/limit_tests.cpp | 215 +++-- .../order_factory/DynamicOrderRegistry.cpp | 1 - .../orderman/order_factory/OrderFactory.cpp | 4 +- src/lib/orderman/order_router/OrderRouter.cpp | 4 +- src/lib/orderman/orderman_utils/EventStream.h | 33 +- src/lib/orderman/orders/DynamicOrder.cpp | 8 +- src/lib/orderman/orders/DynamicOrder.h | 8 +- src/lib/orderman/orders/IcebergOrder.cpp | 20 +- src/lib/orderman/orders/IcebergOrder.h | 8 +- src/lib/orderman/orders/NativeOrder.cpp | 63 +- src/lib/orderman/orders/NativeOrder.h | 12 +- src/lib/orderman/orders/Order.cpp | 19 +- src/lib/orderman/orders/Order.h | 15 +- src/lib/orderman/orders/TimeBoxOrder.cpp | 85 +- src/lib/orderman/orders/TimeBoxOrder.h | 8 +- src/lib/orderman/orders/TriggerOrder.cpp | 779 +++++++++--------- src/lib/orderman/orders/TriggerOrder.h | 8 +- .../orderman/orders/book_algos/BookAlgo.cpp | 324 ++++---- src/lib/orderman/orders/book_algos/BookAlgo.h | 8 +- .../orderman/orders/book_algos/CoverOrder.cpp | 116 ++- .../orderman/orders/book_algos/JoinOrder.cpp | 148 ++-- .../orderman/orders/book_algos/LeanOrder.cpp | 279 +++---- .../orders/book_algos/OffsetOrder.cpp | 107 ++- .../orderman/orders/book_algos/TickOrder.cpp | 230 +++--- .../orderman/orders/book_algos/TopOrder.cpp | 177 ++-- .../spreader_orders/ISpreaderStateWorker.h | 4 +- .../orders/spreader_orders/SpreaderOrder.cpp | 29 +- .../orders/spreader_orders/SpreaderOrder.h | 14 +- .../spreader/SingleFillHedger.cpp | 4 +- .../spreader/SingleFillHedger.h | 6 +- .../spreader/SingleLegQuoter.cpp | 2 +- .../spreader/SingleLegQuoter.h | 6 +- .../spreader/SpreaderBookkeepingData.cpp | 4 +- .../spreader/SpreaderBookkeepingData.h | 2 +- .../spreader/SpreaderChildOrderState.h | 9 +- .../spreader/hedger/IHedgerStateWorker.h | 3 +- .../hedger_states/HedgerEndStateWorker.cpp | 2 +- .../hedger_states/HedgerEndStateWorker.h | 2 +- .../hedger_states/HedgerStartStateWorker.cpp | 2 +- .../hedger_states/HedgerStartStateWorker.h | 2 +- .../HedgerWaitingForCancelAckStateWorker.cpp | 2 +- .../HedgerWaitingForCancelAckStateWorker.h | 2 +- ...WaitingForFirstAckCancelledStateWorker.cpp | 2 +- ...erWaitingForFirstAckCancelledStateWorker.h | 2 +- .../HedgerWaitingForFirstAckStateWorker.cpp | 2 +- .../HedgerWaitingForFirstAckStateWorker.h | 2 +- .../HedgerWorkingStateWorker.cpp | 2 +- .../hedger_states/HedgerWorkingStateWorker.h | 2 +- .../spreader/quoter/IQuoterStateWorker.h | 2 +- .../quoter_states/QuoterEndStateWorker.cpp | 2 +- .../quoter_states/QuoterEndStateWorker.h | 2 +- .../quoter_states/QuoterStartStateWorker.cpp | 2 +- .../quoter_states/QuoterStartStateWorker.h | 2 +- .../QuoterWaitingForCancelAckStateWorker.cpp | 2 +- .../QuoterWaitingForCancelAckStateWorker.h | 2 +- ...uoterWaitingForFirstAckCancelledWorker.cpp | 2 +- .../QuoterWaitingForFirstAckCancelledWorker.h | 2 +- .../QuoterWaitingForFirstAckWorker.cpp | 2 +- .../QuoterWaitingForFirstAckWorker.h | 2 +- .../QuoterWaitingForIOCWorker.cpp | 2 +- .../quoter_states/QuoterWaitingForIOCWorker.h | 2 +- .../QuoterWaitingForSizeStateWorker.cpp | 6 +- .../QuoterWaitingForSizeStateWorker.h | 4 +- .../QuoterWorkingStateWorker.cpp | 8 +- .../quoter_states/QuoterWorkingStateWorker.h | 6 +- .../SpreaderEndStateWorker.cpp | 4 +- .../spreader_states/SpreaderEndStateWorker.h | 4 +- .../SpreaderStartStateWorker.cpp | 20 +- .../SpreaderStartStateWorker.h | 4 +- ...SpreaderWaitingForCancelAllStateWorker.cpp | 4 +- .../SpreaderWaitingForCancelAllStateWorker.h | 4 +- ...readerWaitingForInitialDataStateWorker.cpp | 4 +- ...SpreaderWaitingForInitialDataStateWorker.h | 6 +- .../SpreaderWorkingStateWorker.cpp | 4 +- .../SpreaderWorkingStateWorker.h | 4 +- .../spreader_orders/tests/spreader_tests.cpp | 60 +- .../spreader_orders/tests/tests_common.h | 8 +- .../orderman/server/OrderServiceServer.cpp | 38 +- src/lib/orderman/server/OrderServiceServer.h | 4 +- src/lib/orderman/tests/fat_wrapper_tests.cpp | 35 +- src/lib/orderman2/IOrderManagerObserver.h | 28 - src/lib/orderman2/OrderManager2.cpp | 7 - src/lib/orderman2/OrderManager2.h | 37 - src/lib/orderman2/orders/NativeOrder.cpp | 2 + src/lib/orderman2/orders/NativeOrder.h | 57 ++ src/lib/orderman2/orders/Order.cpp | 2 + src/lib/orderman2/orders/Order.h | 70 ++ src/sdk/examples/order_plugin_example.cpp | 20 +- src/sdk/sdk_shell.sh | 1 - src/server/sparkd/CMakeDeps.cmake | 2 +- src/server/sparkd/cmds/Benchmark.cpp | 20 +- src/server/sparkd/cmds/QuickTest.cpp | 22 +- src/server/sparkd/cmds/Run.cpp | 29 +- src/server/sparkd/cmds/Web.cpp | 4 +- src/server/sparkd/http/WebServer.cpp | 12 +- src/server/sparkd/http/WebServer.h | 4 +- src/web/CMakeDeps.cmake | 2 +- 150 files changed, 2757 insertions(+), 2765 deletions(-) delete mode 100644 src/lib/orderman/events/OutFIXMsgEvent.h delete mode 100644 src/lib/orderman2/IOrderManagerObserver.h delete mode 100644 src/lib/orderman2/OrderManager2.cpp delete mode 100644 src/lib/orderman2/OrderManager2.h create mode 100644 src/lib/orderman2/orders/NativeOrder.cpp create mode 100644 src/lib/orderman2/orders/NativeOrder.h create mode 100644 src/lib/orderman2/orders/Order.cpp create mode 100644 src/lib/orderman2/orders/Order.h diff --git a/CMakeLists.txt b/CMakeLists.txt index b497a3092..a4395bfcf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,8 +39,9 @@ else () set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} \ -fPIC -Wall -pedantic -Wextra -Werror \ -Wno-missing-braces -Wno-ignored-qualifiers \ - --std=c++17 -fdiagnostics-color -Wl,--no-undefined") + --std=c++17 -fdiagnostics-color") set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer -DNDEBUG -O3") + set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wno-undef") add_subdirectory(src/server/sparkd) add_subdirectory(src/lib) add_subdirectory(src/web) diff --git a/doc/user/docs/release_notes.md b/doc/user/docs/release_notes.md index 87f5766c2..c4a49f9b5 100644 --- a/doc/user/docs/release_notes.md +++ b/doc/user/docs/release_notes.md @@ -6,9 +6,18 @@ ### Bug Fixes - Shell no longer crashes when removing a security from the synthetics window - It is now possible to create a new synthetic using the same name as a previously deleted synthetic +### SDK Improvements + - Improved Client and Server SDK clarity and documentation ### Performance Improvements - Synthetic calculation speed was improved by 400%. - +### Risk / Entitlement System + - Risk Admin UI + - Spark users now have separate Trading, RiskAdmin, and/or MDAdmin permissions + - Spark users can now only add other users or accounts if permissioned to do so. + - Market Data Entitlement + - Automated market data reporting + + ## 1.4.1 ### Tabs diff --git a/src/lib/CMakeDeps.cmake b/src/lib/CMakeDeps.cmake index cd221187f..f4f65e19d 100644 --- a/src/lib/CMakeDeps.cmake +++ b/src/lib/CMakeDeps.cmake @@ -1 +1 @@ -set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/services/UserService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/Executor.conf;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/PerfTraceLog.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/IcebergOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/CoverOrder.cpp;orderman/orders/book_algos/JoinOrder.cpp;orderman/orders/book_algos/LeanOrder.cpp;orderman/orders/book_algos/OffsetOrder.cpp;orderman/orders/book_algos/TickOrder.cpp;orderman/orders/book_algos/TopOrder.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;orderman2/OrderManager2.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/thread_manager.cpp) \ No newline at end of file +set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/services/UserService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/PerfTraceLog.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/IcebergOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/CoverOrder.cpp;orderman/orders/book_algos/JoinOrder.cpp;orderman/orders/book_algos/LeanOrder.cpp;orderman/orders/book_algos/OffsetOrder.cpp;orderman/orders/book_algos/TickOrder.cpp;orderman/orders/book_algos/TopOrder.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;orderman2/OrderManager2.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;tracing/PerfLog.cpp;tracing/bts_trace.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/thread_manager.cpp) \ No newline at end of file diff --git a/src/lib/api/service_helpers/AdminServiceUtils.cpp b/src/lib/api/service_helpers/AdminServiceUtils.cpp index ae6641719..ca30f9f61 100644 --- a/src/lib/api/service_helpers/AdminServiceUtils.cpp +++ b/src/lib/api/service_helpers/AdminServiceUtils.cpp @@ -1303,6 +1303,7 @@ void AdminServiceUtils::bootstrap_data (bts::api::admin::AdminData& data){ //associate users bts::api::admin::UserAccountPermissionUnit permission_unit; permission_unit.mutable_trading_permission()->set_submit_market_orders(true); + permission_unit.mutable_trading_permission()->set_has_permissions(true); permission_unit.mutable_admin_permission()->set_has_permissions(true); bts::api::admin::UserAccountPermissions account_permissions; account_permissions.mutable_account_permissions()->insert(google::protobuf::MapPair(parent_account->id(), permission_unit)); diff --git a/src/lib/jetfix/codec/FIXMsg.h b/src/lib/jetfix/codec/FIXMsg.h index 1d587802c..519946cbc 100644 --- a/src/lib/jetfix/codec/FIXMsg.h +++ b/src/lib/jetfix/codec/FIXMsg.h @@ -11,7 +11,7 @@ #include "lib/jetfix/codec/IFIXMsg.h" #include "lib/jetfix/common/InMsgBuffer.h" #include "lib/utils/meta_programming.h" -#include "lib/orderman/orderman_utils/PerfTrace.h" +#include "lib/tracing/PerfLog.h" namespace bts { namespace jetfix { @@ -73,8 +73,8 @@ public: } } - void set_trace (PerfTrace const&trace) {_trace = trace;} - PerfTrace const&trace() const {return _trace;} + void set_trace (trace::CorID const&trace) {_trace = trace;} + trace::CorID const&trace() const {return _trace;} private: typedef std::tuple FieldTuple; @@ -103,7 +103,7 @@ private: FieldTuple _fields; std::bitset::value> _has_value; std::vector> _field_idx; - PerfTrace _trace; + trace::CorID _trace; }; diff --git a/src/lib/jetfix/common/InMsgBuffer.h b/src/lib/jetfix/common/InMsgBuffer.h index f01426120..bd1c76f9f 100644 --- a/src/lib/jetfix/common/InMsgBuffer.h +++ b/src/lib/jetfix/common/InMsgBuffer.h @@ -6,7 +6,7 @@ #include #include "lib/utils/bts_assert.h" #include "lib/jetfix/codec/MessageTypes.h" -#include "lib/orderman/orderman_utils/PerfTrace.h" +#include "lib/tracing/PerfLog.h" namespace bts { namespace jetfix { @@ -114,16 +114,16 @@ public: std::string get_test_req_id () const {return get_string_field ("\001112=",sizeof("\001112=")-1);} - PerfTrace const&trace() const {return _trace;} + trace::CorID const&trace() const {return _trace;} - void set_trace(PerfTrace const&t) {_trace = t;} + void set_trace(trace::CorID const&t) {_trace = t;} private: const char *_data; size_t _size; MessageTypes _type; std::shared_ptr _buffer; - PerfTrace _trace; + trace::CorID _trace; MessageTypes get_type () const { diff --git a/src/lib/jetfix/connection/AsyncReader.cpp b/src/lib/jetfix/connection/AsyncReader.cpp index 4c513f5a5..93129e2d0 100644 --- a/src/lib/jetfix/connection/AsyncReader.cpp +++ b/src/lib/jetfix/connection/AsyncReader.cpp @@ -72,6 +72,7 @@ struct AsyncReader::PImpl PImpl(IConnection &connection, std::string const&connection_name, ICoreGatewayEventSink &sink, + trace::PerfLog &l, size_t buffer_sz, size_t high_water_mark) : @@ -81,6 +82,7 @@ struct AsyncReader::PImpl write_cursor (0), reader_thread (), sink (sink), + perf_log(l), high_water_mark (high_water_mark), connection_name(connection_name) {} @@ -98,6 +100,8 @@ struct AsyncReader::PImpl std::thread reader_thread; // an observer that will process the messages we frame ICoreGatewayEventSink &sink; + // For performance analysis + trace::PerfLog &perf_log; // a position in the current buffer that if reached signals the // need to increase the buffer size uint32_t high_water_mark; @@ -107,8 +111,9 @@ struct AsyncReader::PImpl AsyncReader::AsyncReader (IConnection &connection, std::string const&connection_name, ICoreGatewayEventSink &sink, + trace::PerfLog &log, size_t buffer_sz, size_t high_water_mark): - me (new PImpl(connection,connection_name,sink,buffer_sz,high_water_mark)) + me (new PImpl(connection,connection_name,sink,log,buffer_sz,high_water_mark)) {} void AsyncReader::start () @@ -137,8 +142,9 @@ void AsyncReader::dispatch () for (;;) { // read as many bytes as we have buffer space for auto read_count = me->connection.read (cursor (),free_bytes ()); - PerfTrace trace; - trace.fix_socket_r = utils::TimeStamp::now(); + auto read_time = utils::TimeStamp::now(); + trace::CorID trace; + trace.channel = "fix"; // signal a disconnect if the connection broke if (read_count <= 0) { @@ -162,6 +168,8 @@ void AsyncReader::dispatch () me->first_pending_msg += first_unprocessed_offset; for (auto &msg : framed_msgs) { + trace.sn = msg.get_seq_num(); + me->perf_log.log(trace,read_time,"fix_socket_r"); msg.set_trace(trace); LOG(Latency, Diag, "perf_event AsyncReader.on_fix"); tracepoint(bts_trace, trace_order, (char *)"AsyncReader.on_fix", 0, diff --git a/src/lib/jetfix/connection/AsyncReader.h b/src/lib/jetfix/connection/AsyncReader.h index 85063d1c7..5ef506a28 100644 --- a/src/lib/jetfix/connection/AsyncReader.h +++ b/src/lib/jetfix/connection/AsyncReader.h @@ -3,6 +3,7 @@ #include namespace bts { +namespace trace {class PerfLog;} namespace jetfix { class IConnection; @@ -16,6 +17,7 @@ public: AsyncReader(IConnection &connection, std::string const&connection_name, ICoreGatewayEventSink &sink, + trace::PerfLog &l, size_t buffer_sz, // initial buffer size to use size_t high_water_mark); // when do we allocate a new buffer void start (); diff --git a/src/lib/jetfix/connection/IConnection.h b/src/lib/jetfix/connection/IConnection.h index 3673788b9..ab8b9b214 100644 --- a/src/lib/jetfix/connection/IConnection.h +++ b/src/lib/jetfix/connection/IConnection.h @@ -1,9 +1,9 @@ #pragma once #include -#include "lib/orderman/orderman_utils/PerfTrace.h" namespace bts { +namespace trace {struct CorID;} namespace jetfix { class IConnection @@ -14,7 +14,7 @@ public: virtual bool connect () = 0; virtual void shutdown () = 0; virtual int read (char* to_buffer,size_t read_count) = 0; - virtual int write (WriteVec const&vec,size_t vec_size,PerfTrace const&trace) = 0; + virtual int write (WriteVec const&vec,size_t vec_size,trace::CorID trace) = 0; virtual ~IConnection() {}; }; diff --git a/src/lib/jetfix/connection/SocketConnection.cpp b/src/lib/jetfix/connection/SocketConnection.cpp index 10fd1907f..a3b390a45 100644 --- a/src/lib/jetfix/connection/SocketConnection.cpp +++ b/src/lib/jetfix/connection/SocketConnection.cpp @@ -1,11 +1,11 @@ #include "SocketConnection.h" #include "lib/jetfix/store/session_name.h" #include "lib/logging/logging.h" -#include "lib/orderman/orderman_utils/PerfTraceLog.h" #include "lib/tracing/bts_trace.h" #include "lib/utils/TimeStamp.h" #include "lib/utils/bts_assert.h" #include "lib/utils/helper_macros.h" +#include "lib/tracing/PerfLog.h" #include #include @@ -19,7 +19,7 @@ namespace bts { namespace jetfix { SocketConnection::SocketConnection(bts::config::JetFIX::Connection const &cfg, - PerfTraceLog &perf_log) + trace::PerfLog &perf_log) : _fd(-1), _cfg(cfg), _log(cfg.log_fix_stream()), _in_log(), _out_log(), _perf_log(perf_log) { if (_log) { @@ -98,7 +98,7 @@ int SocketConnection::read(char *to_buffer, size_t read_count) { } int SocketConnection::write(WriteVec const &vec, size_t vec_size, - PerfTrace const &trace) { + trace::CorID trace) { bts_assert(_fd >= 0); struct iovec iv[MaxWriteVecSz]; @@ -107,65 +107,9 @@ int SocketConnection::write(WriteVec const &vec, size_t vec_size, iv[i].iov_len = vec[i].second; } - auto trace_cpy = trace; - trace_cpy.fix_socket_w = utils::TimeStamp::now(); - - utils::TimeStamp::Interval s2s; - if (trace.md.to_uint64()) { - s2s = (trace_cpy.fix_socket_w - trace_cpy.md); - tracepoint(bts_trace, trace_order, - (char *)"SocketConnection.tick_to_order.pre_write", 0, - trace.md_sn, s2s.microseconds()); - } else { - s2s = (trace_cpy.fix_socket_w - trace_cpy.fix_socket_r); - tracepoint(bts_trace, trace_order, - (char *)"SocketConnection.fill_to_order.pre_write", 0, - trace.md_sn, s2s.microseconds()); - } - - LOG(Latency, Diag, "perf_event before_socket_write"); + _perf_log.log(trace,"before_fix_socket_w"); auto result = ::writev(_fd, iv, (int)vec_size); - - if (trace.md.to_uint64()) { - LOG(Latency, Info, - "perf_event:tick_to_order s2s_us:{} do_work_begin:{} fix_socket_r:{} " - "md:{} " - "md_src:{} spreader_on_book:{} spreader_modify_order:{} " - "spreader_on_child_order_update:{} " - "order_update:{} exe_gw:{} fix_socket_w:{} md_sn:{} order_key:{} " - "send_fix_buffer:{}", - s2s.microseconds(), trace_cpy.do_work_begin.to_uint64(), - trace_cpy.fix_socket_r.to_uint64(), trace_cpy.md.to_uint64(), - trace_cpy.md_src.to_uint64(), trace_cpy.spreader_on_book.to_uint64(), - trace_cpy.spreader_modify_order.to_uint64(), - trace_cpy.spreader_on_child_order_update.to_uint64(), - trace_cpy.order_update.to_uint64(), trace_cpy.exe_gw.to_uint64(), - trace_cpy.fix_socket_w.to_uint64(), trace_cpy.md_sn, - trace_cpy.order_key, trace.send_fix_buffer.to_uint64()); - _perf_log.log(trace_cpy); - } - - if (trace.fix_socket_r.to_uint64()) { - LOG(Latency, Info, - "perf_event:fill_to_order s2s_us:{} do_work_begin:{} fix_socket_r:{} " - "md:{} md_src:{} " - "spreader_on_book:{} spreader_modify_order:{} " - "spreader_on_child_order_update:{} " - "order_update:{} exe_gw:{} fix_socket_w:{} md_sn:{} order_key:{} " - "send_fix_buffer:{} ", - s2s.microseconds(), trace_cpy.do_work_begin.to_uint64(), - trace_cpy.fix_socket_r.to_uint64(), trace_cpy.md.to_uint64(), - trace_cpy.md_src.to_uint64(), trace_cpy.spreader_on_book.to_uint64(), - trace_cpy.spreader_modify_order.to_uint64(), - trace_cpy.spreader_on_child_order_update.to_uint64(), - trace_cpy.order_update.to_uint64(), trace_cpy.exe_gw.to_uint64(), - trace_cpy.fix_socket_w.to_uint64(), trace_cpy.md_sn, trace_cpy.order_key, - trace_cpy.send_fix_buffer.to_uint64()); - _perf_log.log(trace_cpy); - } - - tracepoint(bts_trace, trace_order, (char *)"SocketConnection.post_write", 0, - trace.md_sn, 0); + _perf_log.log(trace,"after_fix_socket_w"); if (_log && result > 0) { for (size_t i = 0; i < vec_size; i++) diff --git a/src/lib/jetfix/connection/SocketConnection.h b/src/lib/jetfix/connection/SocketConnection.h index 6246d3e5f..ebdf75828 100644 --- a/src/lib/jetfix/connection/SocketConnection.h +++ b/src/lib/jetfix/connection/SocketConnection.h @@ -7,19 +7,19 @@ #include "lib/metrics/metrics.h" namespace bts { -class PerfTraceLog; +namespace trace {class PerfLog;struct CorID;} namespace jetfix { class SocketConnection : public IConnection { public: - SocketConnection(bts::config::JetFIX::Connection const &cfgl,PerfTraceLog &log); + SocketConnection(bts::config::JetFIX::Connection const &cfgl,trace::PerfLog &log); ~SocketConnection(); bool connect () override; void shutdown () override; int read (char* to_buffer,size_t read_count) override; - int write (WriteVec const&vec,size_t vec_size,const PerfTrace &trace) override; + int write (WriteVec const&vec,size_t vec_size,trace::CorID ) override; private: int _fd; @@ -27,7 +27,7 @@ private: bool _log; std::ofstream _in_log; std::ofstream _out_log; - PerfTraceLog &_perf_log; + trace::PerfLog &_perf_log; }; }} diff --git a/src/lib/jetfix/gateway/CoreGateway.cpp b/src/lib/jetfix/gateway/CoreGateway.cpp index 1f062ea2f..e6bac0847 100644 --- a/src/lib/jetfix/gateway/CoreGateway.cpp +++ b/src/lib/jetfix/gateway/CoreGateway.cpp @@ -1,26 +1,26 @@ #include "CoreGateway.h" -#include "lib/logging/logging.h" -#include "lib/utils/TimeStamp.h" -#include "lib/utils/bts_chrono.h" -#include "lib/utils/datetime.h" #include "lib/jetfix/common/OutFIX.h" #include "lib/jetfix/connection/AsyncReader.h" #include "lib/jetfix/connection/IConnection.h" #include "lib/jetfix/gateway/ICoreGatewayObserver.h" #include "lib/jetfix/gateway/Session.h" #include "lib/jetfix/store/IFIXStore.h" +#include "lib/logging/logging.h" #include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/tracing/bts_trace.h" -#include +#include "lib/utils/TimeStamp.h" +#include "lib/utils/bts_chrono.h" +#include "lib/utils/datetime.h" #include "lib/utils/thread_manager.h" +#include #include #include #include #include -#include #include +#include namespace bts { namespace jetfix { @@ -50,22 +50,17 @@ struct CoreGateway::EventData { : handler(src.handler), out_msgs(src.out_msgs), in_msg(src.in_msg), trace(src.trace), ts(src.ts) {} - EventData() - : handler(), out_msgs(), in_msg(), trace(), - ts() {} + EventData() : handler(), out_msgs(), in_msg(), trace(), ts() {} EventData(Handler handler) : handler(handler), out_msgs(), in_msg(), trace(), ts() {} - EventData(Handler handler, PerfTrace const &trace, - OutFIXPtr const &out_msgs) + EventData(Handler handler, trace::CorID const &trace, OutFIXPtr const &out_msgs) : handler(handler), out_msgs(out_msgs), in_msg(), trace(trace), ts() {} EventData(Handler handler, InMsgBuffer const &in_msg) - : handler(handler), out_msgs(), in_msg(in_msg), - trace(), ts() {} + : handler(handler), out_msgs(), in_msg(in_msg), trace(), ts() {} EventData(Handler handler, std::shared_ptr const &ts) - : handler(handler), out_msgs(), in_msg(), - trace(), ts(ts) {} + : handler(handler), out_msgs(), in_msg(), trace(), ts(ts) {} EventData &operator=(EventData &src) { handler = src.handler; @@ -87,19 +82,19 @@ struct CoreGateway::EventData { Handler handler; OutFIXPtr out_msgs; InMsgBuffer in_msg; - PerfTrace trace; + trace::CorID trace; std::shared_ptr ts; }; struct CoreGateway::PImpl { PImpl(config::JetFIX::Connection const &cfg, ICoreGatewayObserver &observer, ConnectionFactory const &conn_factory, - StoreFactory const &store_factory) + StoreFactory const &store_factory, trace::PerfLog &l) : cfg(cfg), observer(observer), make_connection(conn_factory), make_store(store_factory), state(State::OFF), start_of_pause(), session_info(), event_queue(), timer_thread(), destroy(false), is_on(false), has_replayed(false), send_batch(), recv_batch(), - connection_attempts(0) { + connection_attempts(0), perf_log(l) { send_batch.reserve(1024); recv_batch.reserve(1024); } @@ -112,7 +107,7 @@ struct CoreGateway::PImpl { State state; datetime::PTime start_of_pause; std::unique_ptr session_info; - tbb::concurrent_queue event_queue; + tbb::concurrent_queue event_queue; std::thread timer_thread; std::atomic destroy; bool is_on; @@ -120,18 +115,21 @@ struct CoreGateway::PImpl { std::vector send_batch; std::vector recv_batch; uint32_t connection_attempts; + trace::PerfLog &perf_log; }; std::thread CoreGateway::make_timer_thread() { - auto thread_name = fmt::format ("jf_tmr_{}", me->cfg.name()); - return threading::make_thread(thread_name, std::bind(&CoreGateway::call_time, this)); + auto thread_name = fmt::format("jf_tmr_{}", me->cfg.name()); + return threading::make_thread(thread_name, + std::bind(&CoreGateway::call_time, this)); } CoreGateway::CoreGateway(config::JetFIX::Connection const &cfg, ICoreGatewayObserver &observer, ConnectionFactory const &conn_factory, - StoreFactory const &store_factory) - : me(new PImpl(cfg, observer, conn_factory, store_factory)) { + StoreFactory const &store_factory, + trace::PerfLog &perf_trace) + : me(new PImpl(cfg, observer, conn_factory, store_factory, perf_trace)) { me->timer_thread = make_timer_thread(); } @@ -145,8 +143,7 @@ CoreGateway::~CoreGateway() { me->timer_thread.join(); } -void CoreGateway::send(PerfTrace const &trace, OutFIXPtr const &fix) { - tracepoint(bts_trace, trace_order, (char *)"CoreGateway.send", 0, trace.md_sn,0); +void CoreGateway::send(OutFIXPtr const &fix, trace::CorID trace) { me->event_queue.push(EventData(&CoreGateway::sync_send, trace, fix)); } @@ -261,8 +258,6 @@ void CoreGateway::sync_stop(EventData const &) { } void CoreGateway::sync_send(EventData const &ev) { - tracepoint(bts_trace, trace_order, (char *)"CoreGateway.sync_send", 0, - ev.trace.md_sn,0); switch (me->state) { case State::OFF: bts_assert(false); @@ -273,7 +268,7 @@ void CoreGateway::sync_send(EventData const &ev) { case State::WSESSION_TERMINATE: break; case State::READY: - me->session_info->session->send(ev.trace, ev.out_msgs); + me->session_info->session->send(ev.out_msgs,ev.trace); break; default: bts_assert(false); @@ -477,7 +472,8 @@ void CoreGateway::sync_time(EventData const &ev) { []() { return utils::TimeStamp::now(); })); me->session_info->reader.reset(new AsyncReader( *me->session_info->connection, me->cfg.name(), *this, - me->cfg.msg_buffer_sz(), me->cfg.msg_high_water_mark())); + me->perf_log, me->cfg.msg_buffer_sz(), + me->cfg.msg_high_water_mark())); me->session_info->reader->start(); me->session_info->session->start(); transition(State::CONNECTING); @@ -573,5 +569,5 @@ const char *CoreGateway::state_name(State st) { bts_assert(false); } } -} -} +} // namespace jetfix +} // namespace bts diff --git a/src/lib/jetfix/gateway/CoreGateway.h b/src/lib/jetfix/gateway/CoreGateway.h index dba302441..fcba9510b 100644 --- a/src/lib/jetfix/gateway/CoreGateway.h +++ b/src/lib/jetfix/gateway/CoreGateway.h @@ -10,6 +10,7 @@ #include "lib/config/protos/jetfix.pb.h" namespace bts { +namespace trace {class PerfLog;} namespace jetfix { class ICoreGatewayObserver; class IConnection; @@ -25,12 +26,13 @@ public: CoreGateway(config::JetFIX::Connection const &cfg, ICoreGatewayObserver &observer, ConnectionFactory const &conn_factory, - StoreFactory const &store_factory); + StoreFactory const &store_factory, + trace::PerfLog &); ~CoreGateway(); void start (); void stop (); - void send (PerfTrace const&, OutFIXPtr const &msgs); + void send (OutFIXPtr const &msgs, trace::CorID trace); void dispatch_events (); // for certification use only diff --git a/src/lib/jetfix/gateway/JetFIXGateway.h b/src/lib/jetfix/gateway/JetFIXGateway.h index 6578bb8fd..6454aab8f 100644 --- a/src/lib/jetfix/gateway/JetFIXGateway.h +++ b/src/lib/jetfix/gateway/JetFIXGateway.h @@ -8,11 +8,12 @@ #include "lib/jetfix/store/FIXFileStore.h" #include "lib/utils/meta_programming.h" #include "lib/orderman/orderman_utils/orderman_common.h" +#include "lib/tracing/PerfLog.h" #include "lib/config/protos/jetfix.pb.h" namespace bts { -class PerfTraceLog; +namespace trace {class PerfLog;} namespace jetfix { // A parsing layer over CoreGateway @@ -20,7 +21,7 @@ template class JetFIXGateway : ICoreGatewayObserver { public: - JetFIXGateway(config::JetFIX::Connection const &cfg, PerfTraceLog &log) + JetFIXGateway(config::JetFIX::Connection const &cfg, trace::PerfLog &log) : _core (cfg,*this, @@ -28,13 +29,16 @@ public: {return new SocketConnection (cfg,log);}, [] (config::JetFIX::Connection const &cfg) - { return new FIXFileStore (cfg);}), + { return new FIXFileStore (cfg);}, + + log), _dispatchers (), _dispatcher_idx (), _on_ready ([](){}), _on_disconnect ([](){}), _on_begin_replay ([](){}), - _on_end_replay ([](){}) + _on_end_replay ([](){}), + _perf_log(log) { std::vector disp_vec; meta::collect_tuple_items (_dispatchers,&disp_vec); @@ -45,7 +49,7 @@ public: void start () {_core.start ();} void stop () {_core.stop ();} - void send (PerfTrace const &trace, OutFIXPtr const &msgs) {_core.send (trace,msgs);} + void send (OutFIXPtr const &msgs,trace::CorID trace ) {_core.send (msgs,trace);} void dispatch_events () {_core.dispatch_events ();} @@ -123,6 +127,7 @@ private: std::function _on_disconnect; std::function _on_begin_replay; std::function _on_end_replay; + trace::PerfLog &_perf_log; }; }} diff --git a/src/lib/jetfix/gateway/Session.cpp b/src/lib/jetfix/gateway/Session.cpp index 232469c06..ba7a69069 100644 --- a/src/lib/jetfix/gateway/Session.cpp +++ b/src/lib/jetfix/gateway/Session.cpp @@ -106,8 +106,7 @@ void Session::start() { *me->current_time, me->cfg)); } -void Session::send(PerfTrace const &trace, OutFIXPtr const &msgs) { - tracepoint(bts_trace, trace_order, (char *)"Session.send", 0, trace.md_sn, 0); +void Session::send(OutFIXPtr const &msgs,trace::CorID trace) { switch (me->state) { case State::READY: case State::CERT_MODE: @@ -547,10 +546,10 @@ void Session::buffer_or_deliver(InMsgBuffer const &msg) { } void Session::internal_send(OutFIXPtr const &msgs) { - internal_send(PerfTrace(), msgs); + internal_send(trace::CorID {},msgs); } -void Session::internal_send(PerfTrace const &trace, OutFIXPtr const &msgs) { +void Session::internal_send(trace::CorID trace, OutFIXPtr const &msgs) { IConnection::WriteVec data_vec; bts_assert(msgs->fix.size() < IConnection::MaxWriteVecSz); @@ -562,13 +561,10 @@ void Session::internal_send(PerfTrace const &trace, OutFIXPtr const &msgs) { data_vec[i].first = s.data(); data_vec[i].second = s.size(); } - tracepoint(bts_trace, trace_order, (char *)"Session.internal_send.pre_write", 0, trace.md_sn,0); if (me->connection.write(data_vec, msgs->fix.size(), trace) < 0) { terminate_session(JetFIXError::CONNECTION_ERROR); return; } - tracepoint(bts_trace, trace_order, - (char *)"Session.internal_send.post_write", 0, trace.md_sn, 0); me->last_sent_msg_timestamp = me->now(); me->store.store(msgs); msgs->set_ts(OutFIX::POST_STORE, utils::TimeStamp::now()); @@ -681,7 +677,7 @@ void Session::send_seq_reset(uint32_t sn, uint32_t new_sn) { IConnection::WriteVec data_vec; data_vec[0].first = stream.data(); data_vec[0].second = stream.size(); - if (me->connection.write(data_vec, 1, PerfTrace()) < 0) { + if (me->connection.write(data_vec, 1, trace::CorID()) < 0) { terminate_session(JetFIXError::CONNECTION_ERROR); return; } else { diff --git a/src/lib/jetfix/gateway/Session.h b/src/lib/jetfix/gateway/Session.h index 86ac8472d..3808a78d1 100644 --- a/src/lib/jetfix/gateway/Session.h +++ b/src/lib/jetfix/gateway/Session.h @@ -8,6 +8,7 @@ #include "lib/utils/datetime.h" #include "lib/jetfix/common/OutFIXPtr.h" #include "lib/orderman/orderman_utils/orderman_common.h" +#include "lib/tracing/PerfLog.h" #include "lib/config/protos/jetfix.pb.h" @@ -31,7 +32,7 @@ public: ~Session(); void start (); - void send (PerfTrace const &, OutFIXPtr const&); + void send (OutFIXPtr const&, trace::CorID); void receive (InMsgBuffer const&); void shutdown (); void time (std::shared_ptr const&time_str); @@ -59,7 +60,7 @@ private: void buffer (InMsgBuffer const &msg); void buffer_or_deliver (InMsgBuffer const&msg); - void internal_send (PerfTrace const&, OutFIXPtr const&); + void internal_send (trace::CorID , OutFIXPtr const&); void internal_send (OutFIXPtr const&); void logout (JetFIXError::Code reason); void logout (JetFIXError::Code reason,std::string const &extra_info); diff --git a/src/lib/jetfix/tests/async_reader_tests.cpp b/src/lib/jetfix/tests/async_reader_tests.cpp index 362bb0211..d75fff0f2 100644 --- a/src/lib/jetfix/tests/async_reader_tests.cpp +++ b/src/lib/jetfix/tests/async_reader_tests.cpp @@ -111,7 +111,7 @@ struct Connection : public IConnection return str.gcount (); } - int write (WriteVec const&,size_t, PerfTrace const&) + int write (WriteVec const&,size_t, trace::CorID ) {return -1;} std::istream &str; @@ -119,6 +119,8 @@ struct Connection : public IConnection TEST_CASE ("JetFIX AsyncReaderTests", "[jetfix]") { + trace::PerfLog l; + SECTION ("jeftix_smoke") { std::stringstream str; @@ -128,7 +130,7 @@ TEST_CASE ("JetFIX AsyncReaderTests", "[jetfix]") MyGWObserver ob; { - AsyncReader r (c,"test",ob,10,5); + AsyncReader r (c,"test",ob,l,10,5); r.start (); } @@ -144,7 +146,7 @@ TEST_CASE ("JetFIX AsyncReaderTests", "[jetfix]") MyGWObserver ob; { - AsyncReader r (c,"test",ob,10,5); + AsyncReader r (c,"test",ob,l,10,5); r.start (); } REQUIRE (ob.got_eof); diff --git a/src/lib/mercury/actors/Actor.h b/src/lib/mercury/actors/Actor.h index 2ca4e9416..61e67cec1 100644 --- a/src/lib/mercury/actors/Actor.h +++ b/src/lib/mercury/actors/Actor.h @@ -37,6 +37,10 @@ class Actor { // Implement if you need special cleanup at actor destruction time virtual void finit(){}; + // Implement this if you want to be called before/after an event is dispatched + virtual void before_event() {} + virtual void after_event() {} + // subscribe to events using a specific tag template SubHandle subscribe(typename EV::Tag const &tag, CB const &cb) { @@ -67,10 +71,12 @@ class Actor { tracepoint(bts_trace, trace_event, utils::type_name(typeid(*this)), utils::type_name(), _broker_id, sid.value(), 0); + before_event(); if (payload) cb(UpdateType{sid, type, &(payload->unwrap())}); else cb(UpdateType{sid, type, nullptr}); + after_event(); }; auto result = _subscribe(filter, handler); @@ -107,10 +113,12 @@ class Actor { tracepoint(bts_trace, trace_event, utils::type_name(typeid(*this)), utils::type_name(), _broker_id, sid.value(), 0); + before_event(); if (payload) cb(UpdateType{sid, type, &(payload->unwrap())}); else cb(UpdateType{sid, type, nullptr}); + after_event(); }; auto result = _subscribe(filter, handler); @@ -146,10 +154,12 @@ class Actor { tracepoint(bts_trace, trace_event, utils::type_name(typeid(*this)), utils::type_name(), _broker_id, sid.value(), 0); + before_event(); if (payload) cb(UpdateType{sid, type, &(payload->unwrap())}); else cb(UpdateType{sid, type, nullptr}); + after_event(); }; auto result = _subscribe(filter, handler); diff --git a/src/lib/mercury/actors/ContentSubscription.h b/src/lib/mercury/actors/ContentSubscription.h index bc549e4c7..92a6cccf5 100644 --- a/src/lib/mercury/actors/ContentSubscription.h +++ b/src/lib/mercury/actors/ContentSubscription.h @@ -4,6 +4,7 @@ #include #include #include +#include #include "lib/utils/bts_assert.h" @@ -29,6 +30,9 @@ template class ContentSubscription { using Key = decltype((*((KE *)nullptr))(*((EV *)nullptr))); using CB = std::function; struct SubID { + SubID() : k(), sid(0) {} + SubID(Key k, uint32_t sid) : k(k), sid(sid) {} + Key k; uint32_t sid; bool operator==(SubID const &rhs) const { @@ -39,7 +43,7 @@ template class ContentSubscription { ContentSubscription(Actor &actor) : _actor(&actor), _sub(_actor->subscribe( [this](auto const &u) { this->on_update(u); })), - _my_subs(), _dispatching(false), _current_sub_id(0), + _my_subs(), _dispatching(false), _current_sub_id(1), _pre_sub([](auto) {}) {} ContentSubscription(Actor &actor, std::function const &pscb) @@ -52,7 +56,7 @@ template class ContentSubscription { : _actor(&actor), _sub(_actor->subscribe( tag, [this](auto const &u) { this->on_update(u); })), - _my_subs(), _dispatching(false), _current_sub_id(0), + _my_subs(), _dispatching(false), _current_sub_id(1), _pre_sub([](auto) {}) {} template @@ -61,7 +65,7 @@ template class ContentSubscription { : _actor(&actor), _sub(_actor->subscribe( tag, [this](auto const &u) { this->on_update(u); })), - _my_subs(), _dispatching(false), _current_sub_id(0), + _my_subs(), _dispatching(false), _current_sub_id(1), _pre_sub(pscb) {} template SubID sub(Key k, CBT const &cb) { @@ -97,7 +101,7 @@ template class ContentSubscription { CB cb; }; - using SubList = std::vector; + using SubList = boost::container::small_vector; using Subscriptions = std::unordered_map; Actor *_actor; diff --git a/src/lib/orderman/actors/AsyncFactory.cpp b/src/lib/orderman/actors/AsyncFactory.cpp index 6a9bdd497..91b76045e 100644 --- a/src/lib/orderman/actors/AsyncFactory.cpp +++ b/src/lib/orderman/actors/AsyncFactory.cpp @@ -1,29 +1,24 @@ #include "AsyncFactory.h" -#include "lib/orderman/events/CreateOrderRequestEvent.h" -#include "lib/orderman/events/CreateOrderReplyEvent.h" -#include "lib/orderman/events/CreateFIXBufferRequestEvent.h" -#include "lib/orderman/events/CreateFIXBufferReplyEvent.h" -#include "lib/orderman/order_factory/OrderFactory.h" -#include "lib/orderman/events/NewSecuritiesEvent.h" -#include "lib/jetfix/common/OutFIX.h" -#include "lib/orderman/securities/MapSecurityDB.h" #include "lib/config/protos/jetfix.pb.h" -#include "lib/orderman/order_router/OrderRouter.h" +#include "lib/jetfix/common/OutFIX.h" +#include "lib/orderman/events/CreateFIXBufferReplyEvent.h" +#include "lib/orderman/events/CreateFIXBufferRequestEvent.h" +#include "lib/orderman/events/CreateOrderReplyEvent.h" +#include "lib/orderman/events/CreateOrderRequestEvent.h" #include "lib/orderman/events/NewAdminDataEvent.h" +#include "lib/orderman/events/NewSecuritiesEvent.h" +#include "lib/orderman/order_factory/OrderFactory.h" +#include "lib/orderman/order_router/OrderRouter.h" +#include "lib/orderman/securities/MapSecurityDB.h" namespace bts { namespace orderman { -struct AsyncFactory::PImpl -{ - PImpl(DynamicOrderRegistry const&b) : - orders_stream(), - fix_buffer_stream(), - db(), - order_router(), - order_factory(db,order_router,b) - {} +struct AsyncFactory::PImpl { + PImpl(DynamicOrderRegistry const &b) + : orders_stream(), fix_buffer_stream(), db(), order_router(), + order_factory(db, order_router, b) {} mercury::Stream orders_stream; mercury::Stream fix_buffer_stream; @@ -32,48 +27,49 @@ struct AsyncFactory::PImpl OrderFactory order_factory; }; -AsyncFactory::AsyncFactory(DynamicOrderRegistry const&b) : me(new PImpl(b)) {} -AsyncFactory::~AsyncFactory () {} +AsyncFactory::AsyncFactory(DynamicOrderRegistry const &b) : me(new PImpl(b)) {} +AsyncFactory::~AsyncFactory() {} -void AsyncFactory::init() -{ +void AsyncFactory::init() { me->orders_stream = make_stream(); - me->fix_buffer_stream = make_stream (); + me->fix_buffer_stream = make_stream(); subscribe([this](auto const &u) { - if (u.events) - for (auto ev : *(u.events)) - me->order_router.update(*ev.admin_data); - }); + if (u.events) + for (auto ev : *(u.events)) + me->order_router.update(*ev.admin_data); + }); - subscribe([this] (auto const&u) { - if (u.events) - for (auto const &ev : *(u.events)) - me->db.securities[SecurityKey(ev.security->id())] = ev.security; - }); - - subscribe([this] (const auto &u) { - if (u.events) - for (auto const &ev : *u.events) { - std::vector response; - response.reserve(ev.n_orders); - while (response.size() < ev.n_orders) - response.push_back(&me->order_factory.create(ev.parent_key,*ev.def)); - this->publish(me->orders_stream,ev.request_id,std::move(response)); - } - }); + subscribe([this](auto const &u) { + if (u.events) + for (auto const &ev : *(u.events)) + me->db.securities[SecurityKey(ev.security->id())] = ev.security; + }); - subscribe([this] (const auto &u) { - if (u.events) - for (auto const &ev : *u.events) { - std::vector response; - response.reserve(ev.n_buffers); - while (response.size() < ev.n_buffers) - response.push_back(std::make_shared (*ev.cfg)); - this->publish(me->fix_buffer_stream,std::move(response),ev.cfg); - } - }); + subscribe([this](const auto &u) { + if (u.events) + for (auto const &ev : *u.events) { + std::vector response; + response.reserve(ev.n_orders); + while (response.size() < ev.n_orders) + response.push_back( + &me->order_factory.create(ev.parent_key, *ev.def)); + this->publish(me->orders_stream, ev.request_id, + std::move(response)); + } + }); + + subscribe([this](const auto &u) { + if (u.events) + for (auto const &ev : *u.events) { + std::vector response; + response.reserve(ev.n_buffers); + while (response.size() < ev.n_buffers) + response.push_back(std::make_shared(*ev.cfg)); + this->publish(me->fix_buffer_stream, std::move(response), ev.cfg); + } + }); } - -}} +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/actors/ExecutionGateway.cpp b/src/lib/orderman/actors/ExecutionGateway.cpp index fbc4c53f0..c50d75ad2 100644 --- a/src/lib/orderman/actors/ExecutionGateway.cpp +++ b/src/lib/orderman/actors/ExecutionGateway.cpp @@ -24,11 +24,10 @@ using JFGw = fix::RejectMsg, fix::CancelRejectMsg>; struct ExecutionGateway::PImpl { - PImpl(config::JetFIX::Connection const &cfg, PerfTraceLog &log) - : gw(cfg, log), exe_report_pool(), state(State::WAITING_FOR_SECURITIES), - securities(), securities_by_descriptor(), exe_report_stream(), - gw_status_change_stream(), cancel_reject_stream(), gw_name(cfg.name()), - cfg(cfg) {} + PImpl(config::JetFIX::Connection const &cfg, trace::PerfLog &l) + : gw(cfg, l), exe_report_pool(), state(State::WAITING_FOR_SECURITIES), + securities(), securities_by_descriptor(), gw_name(cfg.name()), + cfg(cfg), perf_log(l) {} JFGw gw; boost::object_pool exe_report_pool; @@ -36,25 +35,20 @@ struct ExecutionGateway::PImpl { std::unordered_map securities; std::unordered_map securities_by_descriptor; - mercury::Stream exe_report_stream; - mercury::Stream gw_status_change_stream; - mercury::Stream cancel_reject_stream; GatewayName gw_name; config::JetFIX::Connection cfg; + OnExeReport on_exe_report; + OnGwStatusChange on_gw_status_change; + OnCancelReject on_cancel_reject; + trace::PerfLog &perf_log; }; ExecutionGateway::ExecutionGateway(config::JetFIX::Connection const &cfg, - PerfTraceLog &log) - : me(new PImpl(cfg, log)) {} -ExecutionGateway::~ExecutionGateway() {} - -void ExecutionGateway::init() { + trace::PerfLog &log) + : me(new PImpl(cfg, log)) { me->state = State::WAITING_FOR_SECURITIES; - subscribe( - [this](auto const &sec_update) { this->on_securities(sec_update); }); - subscribe( - me->gw_name, [this](auto const &fix) { this->on_outgoing_fix(fix); }); } +ExecutionGateway::~ExecutionGateway() {} void ExecutionGateway::on_securities( const mercury::Update &update) { @@ -96,24 +90,22 @@ void ExecutionGateway::on_securities( me->gw.on() = [this](auto const &m) { this->on_session_reject(m); }; - - // stream of execution reports - me->exe_report_stream = - make_stream(me->gw_name); - - // stream for gateway status - me->gw_status_change_stream = - make_stream(me->gw_name); - - // stream for cancel rejects - me->cancel_reject_stream = make_stream(me->gw_name); - - // start the gateway - me->gw.start(); } } } +void ExecutionGateway::start() { me->gw.start(); } + +OnExeReport &ExecutionGateway::on_exe_report() { return me->on_exe_report; } + +OnGwStatusChange &ExecutionGateway::on_gw_status_change() { + return me->on_gw_status_change; +} + +OnCancelReject &ExecutionGateway::on_cancel_reject() { + return me->on_cancel_reject; +} + void ExecutionGateway::on_exe_report( const jetfix::fix::ExecutionReportMsg &msg) { auto start = Timer::now(); @@ -194,8 +186,6 @@ void ExecutionGateway::on_exe_report( data->exec_type = api::orderman::ExecType(msg.get()); data->msg_seq_num = msg.get(); - tracepoint(bts_trace, trace_order, - (char *)"ExecutionGateway.on_exe_report", 0, 0, 0); // copy data from fix msg to our structure if (msg.has()) @@ -258,9 +248,8 @@ void ExecutionGateway::on_exe_report( str_to(msg.get(), &data->transact_time); data->cfg = &me->cfg; data->msg = text_msg; - auto trace = msg.trace(); - trace.exe_gw = utils::TimeStamp::now(); - publish(me->exe_report_stream, data, trace); + me->perf_log.log(msg.trace(),"exe_gw"); + me->on_exe_report(*data, msg.trace()); LOG(Latency, Info, "Finished handling of execution report for order {}. {}ns", ok.value(), ns_diff(Timer::now(), start)); @@ -279,7 +268,7 @@ void ExecutionGateway::on_cancel_reject( else if (msg.has()) reject_msg = fmt::format("Order cancel was rejected with error code {}", msg.get()); - publish(me->cancel_reject_stream, ok, reject_msg); + me->on_cancel_reject(ok, reject_msg); } void ExecutionGateway::on_connection_status_change(bool is_connected) { @@ -287,8 +276,7 @@ void ExecutionGateway::on_connection_status_change(bool is_connected) { me->gw_name.value(), is_connected ? std::string("connected") : std::string("disconnected")); - publish(me->gw_status_change_stream, - GatewayStatusChangeEvent(me->gw_name, is_connected)); + me->on_gw_status_change(is_connected); } void ExecutionGateway::on_business_reject( @@ -308,21 +296,15 @@ void ExecutionGateway::on_session_reject(jetfix::fix::RejectMsg const &m) { m.has() ? m.get() : std::string("Unknown")); } -void ExecutionGateway::on_poll() { me->gw.dispatch_events(); } +void ExecutionGateway::dispatch_incoming_fix_messages() { + me->gw.dispatch_events(); +} -void ExecutionGateway::on_outgoing_fix( - mercury::Update const &msg) { - if (msg.events) - for (auto const &ev : *(msg.events)) { - LOG(Latency, Info, "on_outgoing_fix sn: {} ok: {}", ev.trace.md_sn, - ev.trace.order_key); - tracepoint(bts_trace, trace_order, (char *)"on_outgoing_fix", 0, - ev.trace.md_sn, 0); - auto trace = ev.trace; - trace.exe_gw = utils::TimeStamp::now(); - me->gw.send(trace, ev.msg); - me->gw.dispatch_events(); - } +void ExecutionGateway::send_fix(jetfix::OutFIXPtr const &fix, + trace::CorID trace) { + me->perf_log.log(trace,"exe_gw"); + me->gw.send(fix,trace); + me->gw.dispatch_events(); } } // namespace orderman diff --git a/src/lib/orderman/actors/ExecutionGateway.h b/src/lib/orderman/actors/ExecutionGateway.h index 001773fac..b94d56afa 100644 --- a/src/lib/orderman/actors/ExecutionGateway.h +++ b/src/lib/orderman/actors/ExecutionGateway.h @@ -1,44 +1,51 @@ #pragma once -#include #include "lib/config/protos/jetfix.pb.h" -#include "lib/mercury/actors/Actor.h" #include "lib/jetfix/codec/MessageDefinitions.h" +#include "lib/jetfix/common/OutFIXPtr.h" #include "lib/mercury/events/Update.h" -#include "lib/orderman/events/OutFIXMsgEvent.h" -#include "lib/mercury/actors/IPollableActor.h" -#include "lib/mercury/actors/PingPong.h" +#include "lib/orderman/orderman_utils/orderman_common.h" + +#include namespace bts { -class PerfTraceLog; -namespace mercury { class PollEvent;} +namespace trace {struct CorID;class PerfLog;} namespace orderman { class NewSecuritiesEvent; +class ExecutionReport; + +using OnExeReport = + std::function; +using OnGwStatusChange = std::function; +using OnCancelReject = std::function; // fix execution gateway for a single FIX session -class ExecutionGateway : public mercury::Actor, - public mercury::IPollableActor -{ -public: - ExecutionGateway(config::JetFIX::Connection const&, PerfTraceLog& ); +class ExecutionGateway { + public: + ExecutionGateway(config::JetFIX::Connection const &, trace::PerfLog &); ~ExecutionGateway(); - void init() override; -private: - enum class State {WAITING_FOR_SECURITIES,READY}; + void start(); + void dispatch_incoming_fix_messages(); + void on_securities(const mercury::Update &); + void send_fix(jetfix::OutFIXPtr const &fix, trace::CorID trace); + + OnExeReport& on_exe_report(); + OnGwStatusChange& on_gw_status_change(); + OnCancelReject &on_cancel_reject(); + + private: + enum class State { WAITING_FOR_SECURITIES, READY }; struct PImpl; std::unique_ptr me; - void on_poll() override; - - void on_securities(const mercury::Update &); - void on_exe_report(jetfix::fix::ExecutionReportMsg const&); - void on_cancel_reject(jetfix::fix::CancelRejectMsg const&); + // fix gateway events + void on_exe_report(jetfix::fix::ExecutionReportMsg const &); + void on_cancel_reject(jetfix::fix::CancelRejectMsg const &); void on_connection_status_change(bool connected); - void on_business_reject(jetfix::fix::BusinessMessageRejectMsg const&); - void on_session_reject(jetfix::fix::RejectMsg const&); - void on_outgoing_fix(const mercury::Update &); + void on_business_reject(jetfix::fix::BusinessMessageRejectMsg const &); + void on_session_reject(jetfix::fix::RejectMsg const &); }; -}} - +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/actors/FillStore.cpp b/src/lib/orderman/actors/FillStore.cpp index fe368bb32..a7d2fab18 100644 --- a/src/lib/orderman/actors/FillStore.cpp +++ b/src/lib/orderman/actors/FillStore.cpp @@ -19,7 +19,7 @@ enum class FillStore::State { WAIT_SEC, READY }; struct FillStore::UnresolvedFills { std::vector fills; - api::Security const* security; + api::Security const *security; }; struct FillStore::PImpl { @@ -145,13 +145,13 @@ void FillStore::on_execution_report( fill.mutable_timestamp()->set_seconds(tv.tv_sec); fill.mutable_timestamp()->set_nanos(tv.tv_usec * 1000); - auto order_def = me->known_orders[er.order_key]; if (order_def) fill.set_account(order_def->account()); else - me->fills_with_unresolved_accounts[er.order_key].fills.push_back(fill); - + me->fills_with_unresolved_accounts[er.order_key] + .fills.push_back(fill); + auto fv = utils::pb::to_string(fill); me->store->insert(fills_ns, fk, fv); publish(me->fill_stream, fill, *er.security); @@ -167,7 +167,7 @@ void FillStore::on_execution_report( void FillStore::on_order_state_update( mercury::Update const &u) { if (u.events) - for (auto const &ev : *u.events) { + for (auto const &ev : *u.events) { me->known_orders[ev.key] = ev.definition; // see if we can resolve the accounts for any fills that we @@ -177,11 +177,12 @@ void FillStore::on_order_state_update( f.set_account(ev.definition->account()); auto fv = utils::pb::to_string(f); me->store->update(fills_ns, f.fill_key(), fv); - publish(me->fill_stream,f, *unresolved_fills.security); + publish(me->fill_stream, f, *unresolved_fills.security); } unresolved_fills.fills.clear(); // end fill resolution } } -}} // namespace orderman +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/actors/MDSource.h b/src/lib/orderman/actors/MDSource.h index 5a8e506e4..83f58a387 100644 --- a/src/lib/orderman/actors/MDSource.h +++ b/src/lib/orderman/actors/MDSource.h @@ -10,6 +10,7 @@ #include "lib/orderman/events/MDRequestEvent.h" #include "lib/tracing/bts_trace.h" #include "lib/utils/TimeStamp.h" +#include "lib/tracing/PerfLog.h" namespace bts { namespace orderman { @@ -21,8 +22,8 @@ namespace orderman { class MDSource : public mercury::Actor, public mercury::IPollableActor { public: - MDSource(md::MDConsumer &consumer, metrics::MetricsContainer &stats) - : _handles(), _md_consumer(consumer), _book_update(), _stats(stats), _loop_timer() {} + MDSource(md::MDConsumer &consumer, metrics::MetricsContainer &stats, trace::PerfLog &log) + : _handles(), _md_consumer(consumer), _book_update(), _perf_log(log),_stats(stats), _loop_timer() {} void init() override { LOG(OrderMan, Warn, "Starting MDSource actor"); bts_assert_msg(_md_consumer.all_heartbeats_ok(), "Marketdata heartbeats are bad. MDConsumer will not recover from this condition. Please run 'sparkd md cleanup' and restart sparkd"); @@ -77,21 +78,15 @@ class MDSource : public mercury::Actor, public mercury::IPollableActor { void on_poll() override { Book book; - PerfTrace trace; auto start = utils::TimeStamp::now(); - trace.do_work_begin = start; - for (auto &h : _handles) { auto &handle = h.handle; if (handle.get_book(h.last, std::tuple_size(), &book.bid()[0], &book.ask()[0]) == md::HandleReadResult::SUCCESS) { book._security_key = SecurityKey(handle.key()); - trace.md_src = utils::TimeStamp::now(); - trace.md_sn = trace.md_src.to_uint64(); - trace.md = h.last; - - tracepoint(bts_trace, trace_order, "MDSource", 0, trace.md_sn, 0); + trace::CorID trace {"md",handle.sequence()}; + _perf_log.log(trace,h.last,"md",handle.key()); publish(_book_update, book, trace); } } @@ -107,6 +102,7 @@ class MDSource : public mercury::Actor, public mercury::IPollableActor { std::vector _handles; md::MDConsumer _md_consumer; mercury::Stream _book_update; + trace::PerfLog &_perf_log; metrics::MetricsContainer &_stats; std::shared_ptr> _loop_timer; }; diff --git a/src/lib/orderman/actors/MDSupplementarySource.cpp b/src/lib/orderman/actors/MDSupplementarySource.cpp index a9630b987..ae41824b1 100644 --- a/src/lib/orderman/actors/MDSupplementarySource.cpp +++ b/src/lib/orderman/actors/MDSupplementarySource.cpp @@ -1,10 +1,9 @@ #include "MDSupplementarySource.h" +#include "lib/logging/logging.h" +#include "lib/md/MDConsumer.h" +#include "lib/md/MDConsumerHandle.h" #include "lib/orderman/events/SettlementRequestEvent.h" #include "lib/orderman/events/SettlementUpdateEvent.h" -#include "lib/logging/logging.h" -#include "lib/md/MDConsumerHandle.h" -#include "lib/md/MDConsumer.h" -#include "lib/md/MDConsumer.h" #include "lib/os/os.h" namespace bts { @@ -15,45 +14,36 @@ struct HandleRecord { md::IntPrice settlement_price; }; -struct MDSupplementarySource::PImpl -{ - PImpl(md::MDConsumer& md_consumer) - : - md_consumer(md_consumer), - handle_map(), - settlement_update(){ - } +struct MDSupplementarySource::PImpl { + PImpl(md::MDConsumer &md_consumer) + : md_consumer(md_consumer), handle_map(), settlement_update() {} md::MDConsumer md_consumer; // list of sec subscriptions vs their handles std::map handle_map; mercury::Stream settlement_update; }; -MDSupplementarySource::MDSupplementarySource(md::MDConsumer& md_consumer) -: -me(new PImpl(md_consumer)){ -} +MDSupplementarySource::MDSupplementarySource(md::MDConsumer &md_consumer) + : me(new PImpl(md_consumer)) {} -MDSupplementarySource::~MDSupplementarySource(){ -} +MDSupplementarySource::~MDSupplementarySource() {} -void MDSupplementarySource::init(){ - me->settlement_update=make_stream(); +void MDSupplementarySource::init() { + me->settlement_update = make_stream(); subscribe([this](auto const &update) { if (update.events) { for (auto const &ev : *update.events) { auto k = ev.security_key.value(); auto it = me->handle_map.find(k); - if(it ==me->handle_map.end()){ + if (it == me->handle_map.end()) { LOG(OrderMan, Info, "MDSupplementarySource::init key:{}", k); - me->handle_map[k]={me->md_consumer.get_handle(k),md::INT_NAN}; - } - else { + me->handle_map[k] = {me->md_consumer.get_handle(k), md::INT_NAN}; + } else { // late joiners auto const &hr = it->second; if (!hr.settlement_price.is_nan()) { - SettlementUpdateEvent ev(hr.settlement_price,SecurityKey(k)); - publish(me->settlement_update,ev); + SettlementUpdateEvent ev(hr.settlement_price, SecurityKey(k)); + publish(me->settlement_update, ev); } } } @@ -61,21 +51,22 @@ void MDSupplementarySource::init(){ }); } -void MDSupplementarySource::on_poll(){ - for(auto& kvp : me->handle_map){ - SecurityKey key(kvp.first); - HandleRecord& hr=kvp.second; +void MDSupplementarySource::on_poll() { + for (auto &kvp : me->handle_map) { + SecurityKey key(kvp.first); + HandleRecord &hr = kvp.second; auto settlement_price = hr.handle.settlement_price(); - if(!settlement_price.is_nan() && - settlement_price!=hr.settlement_price){ + if (!settlement_price.is_nan() && + settlement_price != hr.settlement_price) { LOG(OrderMan, Info, - "MDSupplementarySource::on_poll new settle key:{} price:{}", - key, hr.settlement_price.price()); - hr.settlement_price=settlement_price; - SettlementUpdateEvent ev(settlement_price,key); - publish(me->settlement_update,ev); + "MDSupplementarySource::on_poll new settle key:{} price:{}", key, + hr.settlement_price.price()); + hr.settlement_price = settlement_price; + SettlementUpdateEvent ev(settlement_price, key); + publish(me->settlement_update, ev); } } } -}} +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/actors/SODPosition.cpp b/src/lib/orderman/actors/SODPosition.cpp index e5a09e0ca..ee9515be7 100644 --- a/src/lib/orderman/actors/SODPosition.cpp +++ b/src/lib/orderman/actors/SODPosition.cpp @@ -1,134 +1,134 @@ #include "lib/orderman/actors/SODPosition.h" -#include "lib/logging/logging.h" -#include "lib/utils/bts_assert.h" -#include "lib/config/protos/toggles.pb.h" -#include "lib/config/protos/orders_fills_cleanup.pb.h" #include "lib/config/config.h" +#include "lib/config/protos/orders_fills_cleanup.pb.h" +#include "lib/config/protos/toggles.pb.h" +#include "lib/logging/logging.h" #include "lib/utils/PBUtils.h" -#include +#include "lib/utils/bts_assert.h" #include +#include -namespace bts{ -namespace orderman{ +namespace bts { +namespace orderman { SODPosition::SODPosition() -: -_enabled (config::get().enabled()), -_sod_time(_get_fills_sod_time()){ - LOG(persist, Info, "SODPosition enabled:{} sec:{}", - _enabled, _sod_time.tv_sec); + : _enabled(config::get().enabled()), + _sod_time(_get_fills_sod_time()) { + LOG(persist, Info, "SODPosition enabled:{} sec:{}", _enabled, + _sod_time.tv_sec); } // returns the timeval for today's hh,mm,ss // timeval is the microsecons from epoch) -timeval SODPosition::_to_timeval(uint16_t hh, uint16_t mm, uint16_t ss){ - bts_assert(hh<24); - bts_assert(mm<60); - bts_assert(ss<60); +timeval SODPosition::_to_timeval(uint16_t hh, uint16_t mm, uint16_t ss) { + bts_assert(hh < 24); + bts_assert(mm < 60); + bts_assert(ss < 60); time_t secs; - time (&secs); // seconds since epoch (utc) - struct tm* ptm = gmtime (&secs); - ptm->tm_hour=hh; - ptm->tm_min=mm; - ptm->tm_sec=ss; - ptm->tm_isdst=-1; - secs=mktime(ptm); + time(&secs); // seconds since epoch (utc) + struct tm *ptm = gmtime(&secs); + ptm->tm_hour = hh; + ptm->tm_min = mm; + ptm->tm_sec = ss; + ptm->tm_isdst = -1; + secs = mktime(ptm); timeval rv; - rv.tv_sec=secs; - rv.tv_usec=0; + rv.tv_sec = secs; + rv.tv_usec = 0; return rv; } -timeval SODPosition::_subtract_days(const timeval& tv, uint32_t n_days){ - uint32_t secs_in_day=86400*n_days; - timeval rv=tv; - rv.tv_sec=(rv.tv_sec > secs_in_day) ? rv.tv_sec-secs_in_day : 0; +timeval SODPosition::_subtract_days(const timeval &tv, uint32_t n_days) { + uint32_t secs_in_day = 86400 * n_days; + timeval rv = tv; + rv.tv_sec = (rv.tv_sec > secs_in_day) ? rv.tv_sec - secs_in_day : 0; return rv; } -timeval SODPosition::_get_fills_sod_time(){ - const auto& sod_time = config::get(); - timeval sod=_to_timeval(sod_time.sod_hh(),sod_time.sod_mm(),0); +timeval SODPosition::_get_fills_sod_time() { + const auto &sod_time = config::get(); + timeval sod = _to_timeval(sod_time.sod_hh(), sod_time.sod_mm(), 0); timeval now; gettimeofday(&now, NULL); // if the server started before the sod for today // we go back to yesterday - if(sod.tv_sec >= now.tv_sec) - sod=_subtract_days(sod); + if (sod.tv_sec >= now.tv_sec) + sod = _subtract_days(sod); return sod; } -timeval SODPosition::get_orders_start_time(){ - const auto& sod_time = config::get(); - timeval sod=_to_timeval(sod_time.sod_hh(),sod_time.sod_mm(),0); - const auto& orders_cleanup = config::get(); +timeval SODPosition::get_orders_start_time() { + const auto &sod_time = config::get(); + timeval sod = _to_timeval(sod_time.sod_hh(), sod_time.sod_mm(), 0); + const auto &orders_cleanup = config::get(); timeval now; gettimeofday(&now, NULL); // if the server started before the sod for today // we go back to yesterday - if(sod.tv_sec >= now.tv_sec) - sod=_subtract_days(sod); - sod=_subtract_days(sod,orders_cleanup.extra_days()); + if (sod.tv_sec >= now.tv_sec) + sod = _subtract_days(sod); + sod = _subtract_days(sod, orders_cleanup.extra_days()); return sod; } timeval SODPosition::get_order_cutoff_time( - const std::map& order_map){ - //returns true is t1 >= t2 - auto compare_ts = [&](google::protobuf::Timestamp t1, google::protobuf::Timestamp t2) -> bool - { + const std::map &order_map) { + // returns true is t1 >= t2 + auto compare_ts = [&](google::protobuf::Timestamp t1, + google::protobuf::Timestamp t2) -> bool { if (t1.seconds() > t2.seconds()) return true; else if (t1.seconds() < t2.seconds()) return false; else return t1.nanos() >= t2.nanos(); - }; + }; google::protobuf::Timestamp max_ts; max_ts.set_seconds(0); max_ts.set_nanos(0); - for (auto const &kvp : order_map){ + for (auto const &kvp : order_map) { OrderRecord trec; - if (utils::pb::from_string(kvp.second, &trec)){ - const auto& ts = trec.state().created(); - if(compare_ts(ts,max_ts)) + if (utils::pb::from_string(kvp.second, + &trec)) { + const auto &ts = trec.state().created(); + if (compare_ts(ts, max_ts)) (&max_ts)->CopyFrom(ts); - } - else + } else LOG(OrderMan, Error, "Could not recover order {} from storage. " "This should be investigated", kvp.first); } timeval rv; - rv.tv_sec=max_ts.seconds(); - rv.tv_usec=static_cast(max_ts.nanos())/1000; - const auto& orders_cleanup = config::get(); - return _subtract_days(rv,orders_cleanup.extra_days()); + rv.tv_sec = max_ts.seconds(); + rv.tv_usec = static_cast(max_ts.nanos()) / 1000; + const auto &orders_cleanup = config::get(); + return _subtract_days(rv, orders_cleanup.extra_days()); } -std::string SODPosition::_sod_fill_id(const Fill& fill,api::Side side){ - //sod:acct:long/short:sec +std::string SODPosition::_sod_fill_id(const Fill &fill, api::Side side) { + // sod:acct:long/short:sec std::ostringstream oss; - oss << "sod:" << fill.account() << (side==api::Side::SIDE_BUY ? ":L:" : ":S:") - << fill.security_key(); - return oss.str(); + oss << "sod:" << fill.account() + << (side == api::Side::SIDE_BUY ? ":L:" : ":S:") << fill.security_key(); + return oss.str(); } -void SODPosition::_merge_pos(Fill& pos, const Fill& fill){ - bts_assert(pos.security_key()==fill.security_key()); - bts_assert(pos.account()==fill.account()); - bts_assert(pos.side()==fill.side()); - double total_qty=pos.last_shares()+fill.last_shares(); - double avg_price=(pos.avg_price()*pos.last_shares()+ - fill.last_price()*fill.last_shares())/total_qty; +void SODPosition::_merge_pos(Fill &pos, const Fill &fill) { + bts_assert(pos.security_key() == fill.security_key()); + bts_assert(pos.account() == fill.account()); + bts_assert(pos.side() == fill.side()); + double total_qty = pos.last_shares() + fill.last_shares(); + double avg_price = (pos.avg_price() * pos.last_shares() + + fill.last_price() * fill.last_shares()) / + total_qty; pos.set_avg_price(avg_price); pos.set_last_price(avg_price); pos.set_last_shares(total_qty); } -void SODPosition::_zero_pos(Fill& pos, const Fill& fill, api::Side side){ +void SODPosition::_zero_pos(Fill &pos, const Fill &fill, api::Side side) { pos.set_security_key(fill.security_key()); pos.set_account(fill.account()); pos.set_side(side); @@ -136,60 +136,61 @@ void SODPosition::_zero_pos(Fill& pos, const Fill& fill, api::Side side){ pos.mutable_timestamp()->set_nanos(0); pos.set_fill_kind(Fill::FILL_KIND_SOD); pos.set_order_key(0); - pos.set_fill_key(_sod_fill_id(fill,side)); + pos.set_fill_key(_sod_fill_id(fill, side)); pos.set_last_shares(0); } -bool SODPosition::add_fill_to_sod_pos(const Fill& fill){ - if (_enabled && fill.timestamp().seconds() < _sod_time.tv_sec){ - uint32_t seckey=fill.security_key(); - const std::string& acct=fill.account(); - auto acct_it=_sod_map.find(acct); - if(acct_it==_sod_map.end()) - _sod_map[acct]=SecPosMap(); - acct_it=_sod_map.find(fill.account()); - bts_assert(acct_it!=_sod_map.end()); - SecPosMap& sec_map=acct_it->second; - auto sec_it=sec_map.find(seckey); - if(sec_it==sec_map.end()){ +bool SODPosition::add_fill_to_sod_pos(const Fill &fill) { + if (_enabled && fill.timestamp().seconds() < _sod_time.tv_sec) { + uint32_t seckey = fill.security_key(); + const std::string &acct = fill.account(); + auto acct_it = _sod_map.find(acct); + if (acct_it == _sod_map.end()) + _sod_map[acct] = SecPosMap(); + acct_it = _sod_map.find(fill.account()); + bts_assert(acct_it != _sod_map.end()); + SecPosMap &sec_map = acct_it->second; + auto sec_it = sec_map.find(seckey); + if (sec_it == sec_map.end()) { Fill long_pos, short_pos; - _zero_pos(long_pos,fill,api::Side::SIDE_BUY); - _zero_pos(short_pos,fill,api::Side::SIDE_SELL); - sec_map[seckey]=std::pair(long_pos,short_pos); + _zero_pos(long_pos, fill, api::Side::SIDE_BUY); + _zero_pos(short_pos, fill, api::Side::SIDE_SELL); + sec_map[seckey] = std::pair(long_pos, short_pos); } - sec_it=sec_map.find(seckey); - bts_assert(sec_it!=sec_map.end()); - std::pair& pos=sec_it->second; - if(fill.side()==api::Side::SIDE_BUY) - _merge_pos(pos.first,fill); + sec_it = sec_map.find(seckey); + bts_assert(sec_it != sec_map.end()); + std::pair &pos = sec_it->second; + if (fill.side() == api::Side::SIDE_BUY) + _merge_pos(pos.first, fill); else - _merge_pos(pos.second,fill); + _merge_pos(pos.second, fill); return true; - } - else + } else return false; } -void SODPosition::add_sod_pos_as_fill_events(std::vector& fe, - std::map sec_map){ - if(_enabled) - for (auto& acct_p : _sod_map){ - for(auto& sec_p : acct_p.second){ - Fill& long_pos=sec_p.second.first; - Fill& short_pos=sec_p.second.second; - bts_assert(long_pos.security_key()==short_pos.security_key()); - auto sec_it=sec_map.find(SecurityKey(long_pos.security_key())); - if(sec_it==sec_map.end()) +void SODPosition::add_sod_pos_as_fill_events( + std::vector &fe, + std::map sec_map) { + if (_enabled) + for (auto &acct_p : _sod_map) { + for (auto &sec_p : acct_p.second) { + Fill &long_pos = sec_p.second.first; + Fill &short_pos = sec_p.second.second; + bts_assert(long_pos.security_key() == short_pos.security_key()); + auto sec_it = sec_map.find(SecurityKey(long_pos.security_key())); + if (sec_it == sec_map.end()) LOG(persist, Error, - "Could not recover fill for key:{} from storage. " - "This should be investigated", - long_pos.security_key()); - else{ - fe.emplace_back(long_pos,*sec_it->second); - fe.emplace_back(short_pos,*sec_it->second); + "Could not recover fill for key:{} from storage. " + "This should be investigated", + long_pos.security_key()); + else { + fe.emplace_back(long_pos, *sec_it->second); + fe.emplace_back(short_pos, *sec_it->second); } } - } + } } -}} +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/actors/SecuritySrc.cpp b/src/lib/orderman/actors/SecuritySrc.cpp index 854ea8eba..8067ef85f 100644 --- a/src/lib/orderman/actors/SecuritySrc.cpp +++ b/src/lib/orderman/actors/SecuritySrc.cpp @@ -1,8 +1,8 @@ #include "SecuritySrc.h" #include "lib/md/MDConsumer.h" -#include "lib/utils/bts_chrono.h" #include "lib/mercury/events/TimerEvent.h" #include "lib/orderman/events/NewSecuritiesEvent.h" +#include "lib/utils/bts_chrono.h" #include @@ -10,7 +10,7 @@ namespace bts { namespace orderman { struct SecuritySrc::PImpl { - PImpl(md::MDConsumer& md) : last_scan(Timer::now()),md_consumer(md) {} + PImpl(md::MDConsumer &md) : last_scan(Timer::now()), md_consumer(md) {} TimeStamp last_scan; mercury::Stream new_securities_stream; std::vector to_publish; @@ -18,18 +18,19 @@ struct SecuritySrc::PImpl { std::vector> securities_keep_alive; }; -SecuritySrc::SecuritySrc(md::MDConsumer& md) : me(new PImpl(md)) {} +SecuritySrc::SecuritySrc(md::MDConsumer &md) : me(new PImpl(md)) {} SecuritySrc::~SecuritySrc() {} void SecuritySrc::init() { me->new_securities_stream = make_stream(); - me->md_consumer.on_security([this](api::Security const &s, md::MDConsumerHandle) { - auto sec = std::make_unique (s); - auto sec_ptr = sec.get(); - me->securities_keep_alive.push_back(std::move(sec)); - me->to_publish.push_back(sec_ptr); - }); - + me->md_consumer.on_security( + [this](api::Security const &s, md::MDConsumerHandle) { + auto sec = std::make_unique(s); + auto sec_ptr = sec.get(); + me->securities_keep_alive.push_back(std::move(sec)); + me->to_publish.push_back(sec_ptr); + }); + subscribe([this](auto) { this->on_scan_securities(); }); } @@ -47,5 +48,5 @@ void SecuritySrc::on_scan_securities() { } } } -} -} +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/actors/ServiceBridge.cpp b/src/lib/orderman/actors/ServiceBridge.cpp index f8d0cd3a7..de8f85dd6 100644 --- a/src/lib/orderman/actors/ServiceBridge.cpp +++ b/src/lib/orderman/actors/ServiceBridge.cpp @@ -15,6 +15,7 @@ #include "lib/orderman/order_router/OrderRouter.h" #include "lib/orderman/securities/MapSecurityDB.h" #include "lib/utils/PBUtils.h" +#include "lib/tracing/PerfLog.h" #include "lib/api/services/OrderService.pb.h" #include "lib/orderman/orderman_utils/orderman_common.h" @@ -25,7 +26,9 @@ namespace orderman { struct ServiceBridge::PImpl { PImpl(OnReady const &on_ready, OnOrders const &on_orders, - OnFills const &on_fills, DynamicOrderRegistry const &dyn_order_registry, mercury::BrokerProxy &service_call_marshaller) + OnFills const &on_fills, + DynamicOrderRegistry const &dyn_order_registry, + mercury::BrokerProxy &service_call_marshaller) : on_ready(on_ready), on_orders(on_orders), on_fills(on_fills), have_orders(false), have_securities(false), order_manager_ready(false), sec_db(), order_router(), @@ -55,8 +58,9 @@ struct ServiceBridge::PImpl { ServiceBridge::ServiceBridge(OnReady const &on_ready, OnOrders const &on_orders, OnFills const &on_fills, DynamicOrderRegistry const &dyn_order_registry, - mercury::BrokerProxy &service_call_marshaller) - : me(new PImpl(on_ready, on_orders, on_fills, dyn_order_registry, service_call_marshaller)) {} + mercury::BrokerProxy &service_call_marshaller) + : me(new PImpl(on_ready, on_orders, on_fills, dyn_order_registry, + service_call_marshaller)) {} ServiceBridge::~ServiceBridge() {} @@ -147,7 +151,7 @@ ServiceBridge::create_order(api::orderman::Create const &c) { me->order_factory.create(null_order_key(), c.new_order()); me->known_orders.insert(order.key()); publish(me->activate_order_pub, order, Price(c.price()), - Quantity(c.quantity()), PerfTrace()); + Quantity(c.quantity()), trace::CorID()); r.set_order_key(order.key().value()); r.set_error_code(api::orderman::ORDER_ERROR_OK); } else diff --git a/src/lib/orderman/actors/ServiceBridge.h b/src/lib/orderman/actors/ServiceBridge.h index 440b6e0fd..f78f0a6c6 100644 --- a/src/lib/orderman/actors/ServiceBridge.h +++ b/src/lib/orderman/actors/ServiceBridge.h @@ -49,7 +49,9 @@ class ServiceBridge : public mercury::Actor { std::function const &)>; ServiceBridge(OnReady const &, OnOrders const &, OnFills const &, - DynamicOrderRegistry const &, mercury::BrokerProxy &service_call_marshaller); + DynamicOrderRegistry const &, + + mercury::BrokerProxy &service_call_marshaller); void init() override; ~ServiceBridge(); diff --git a/src/lib/orderman/actors/order_manager/ChildOrder.h b/src/lib/orderman/actors/order_manager/ChildOrder.h index 6a985aa4f..ed506a3d2 100644 --- a/src/lib/orderman/actors/order_manager/ChildOrder.h +++ b/src/lib/orderman/actors/order_manager/ChildOrder.h @@ -1,96 +1,78 @@ #pragma once -#include -#include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/orderman/actors/order_manager/OrderServices.h" +#include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/utils/bts_assert.h" +#include namespace bts { namespace orderman { -class ChildOrder{ -public: - ChildOrder () - : _order(nullptr), - _order_services(nullptr), - _active(false) - {} +class ChildOrder { + public: + ChildOrder() + : _order(nullptr), _parent_order_services(nullptr), _active(false) {} - ChildOrder (Order &o, OrderServices &services) - : _order(&o) , - _order_services(&services), - _active(false) - {} + ChildOrder(Order &o, OrderServices &services) + : _order(&o), _parent_order_services(&services), + _child_order_services(nullptr), _active(false) {} - ChildOrder (ChildOrder &&src) - { - operator=(std::move(src)); - } + ChildOrder(ChildOrder &&src) { operator=(std::move(src)); } - ChildOrder& operator=(ChildOrder &&src) - { + ChildOrder &operator=(ChildOrder &&src) { _order = src._order; - _order_services = src._order_services; + _parent_order_services = src._parent_order_services; + _child_order_services = src._child_order_services; _active = src._active; - + src._order = nullptr; - src._order_services = nullptr; + src._parent_order_services = nullptr; + src._child_order_services = nullptr; src._active = false; return *this; } - OrderKey key() const - { - bts_assert(_order); + OrderKey key() const { + bts_assert_d(_order); return _order->key(); } - bool is_active() const {return _active;} - - void activate(Price p, Quantity q, PerfTrace const &trace = PerfTrace()) - { + bool is_active() const { return _active; } + + void activate(Price p, Quantity q, trace::CorID const &trace = trace::CorID()) { bts_assert(_order); bts_assert(!_active); - _order_services->send_activate(*_order,p,q, trace); + _child_order_services = + &_parent_order_services->activate_child(*_order, p, q, trace); _active = true; } - void update(Price p, Quantity q) - { - PerfTrace trace; - update(p,q,trace); - } - - void update(Price p, Quantity q, PerfTrace &trace) - { + void update(Price p, Quantity q, trace::CorID const &trace = trace::CorID()) { bts_assert(_order); bts_assert(_active); - _order_services->send_update(_order->key(),p,q,trace); + _child_order_services->update(p, q, trace); } - void crack(PerfTrace const &trace = PerfTrace()) - { + void crack(trace::CorID const &trace = trace::CorID()) { bts_assert(_order); bts_assert(_active); - _order_services->send_crack(_order->key(),trace); + _child_order_services->crack(trace); } - void cancel(PerfTrace const &trace = PerfTrace()) - { + void cancel(trace::CorID const &trace = trace::CorID()) { bts_assert(_order); bts_assert(_active); - _order_services->send_cancel(_order->key(),trace); + _child_order_services->cancel(trace); } - -private: + + private: friend class OrderBuilder; - Order* _order; - OrderServices *_order_services; + Order *_order; + OrderServices *_parent_order_services; + OrderServices *_child_order_services; bool _active; }; - -}} - - +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/actors/order_manager/OrderBuilder.cpp b/src/lib/orderman/actors/order_manager/OrderBuilder.cpp index 1a19a6c56..1c2783534 100644 --- a/src/lib/orderman/actors/order_manager/OrderBuilder.cpp +++ b/src/lib/orderman/actors/order_manager/OrderBuilder.cpp @@ -4,5 +4,5 @@ namespace bts { namespace orderman { std::atomic OrderBuilder::_current_builder_id(0); - -}} +} +} // namespace bts diff --git a/src/lib/orderman/actors/order_manager/OrderBuilder.h b/src/lib/orderman/actors/order_manager/OrderBuilder.h index fcc43c062..1a446d59e 100644 --- a/src/lib/orderman/actors/order_manager/OrderBuilder.h +++ b/src/lib/orderman/actors/order_manager/OrderBuilder.h @@ -1,93 +1,85 @@ #pragma once -#include -#include -#include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/api/services/OrderService.pb.h" -#include "lib/orderman/orders/PreActivationOrderServices.h" -#include "lib/orderman/actors/order_manager/OrderServices.h" #include "lib/logging/logging.h" #include "lib/orderman/actors/order_manager/ChildOrder.h" +#include "lib/orderman/actors/order_manager/OrderServices.h" +#include "lib/orderman/orderman_utils/orderman_common.h" +#include "lib/orderman/orders/PreActivationOrderServices.h" +#include +#include namespace bts { namespace orderman { -class OrderBuilder -{ -public: +class OrderBuilder { + public: OrderBuilder() - : _parent_key(null_order_key()), - _definition(), - _reserve_sz(0), - _order_stash(), - _builder_id(), - _order_services(nullptr) - {} + : _parent_key(null_order_key()), _definition(), _reserve_sz(0), + _order_stash(), _builder_id(), _order_services(nullptr) {} - OrderBuilder(OrderBuilder&&src) {operator=(std::move(src));} + OrderBuilder(OrderBuilder &&src) { operator=(std::move(src)); } + + OrderBuilder(OrderKey parent_key, api::orderman::OrderDefinition const &def, + PreActivationOrderServices const &srv, size_t reserve_sz = 1) + : _parent_key(parent_key), _definition(def), _reserve_sz(reserve_sz), + _order_stash(), _builder_id(++_current_builder_id), + _order_services(nullptr) - OrderBuilder(OrderKey parent_key, - api::orderman::OrderDefinition const&def, - PreActivationOrderServices const &srv, - size_t reserve_sz = 1) - : _parent_key(parent_key), - _definition(def) , - _reserve_sz(reserve_sz), - _order_stash(), - _builder_id(++_current_builder_id), - _order_services(nullptr) - { bts_assert(parent_key != null_order_key()); while (_order_stash.size() != reserve_sz) - _order_stash.push_back(&srv.order_factory.create(parent_key,_definition)); + _order_stash.push_back( + &srv.order_factory.create(parent_key, _definition)); } - void activate(OrderServices &order_services) - { + void activate(OrderServices &order_services) { bts_assert(!_order_services); _order_services = &order_services; - _order_services->order_creations.sub(_builder_id,[this] (auto const&order_ev) { - _order_stash.insert(_order_stash.end(),order_ev.orders.begin(),order_ev.orders.end()); - }); + _order_services->subscribe_to_order_creation_reply( + _builder_id, [this](auto const &order_ev) { + _order_stash.insert(_order_stash.end(), order_ev.orders.begin(), + order_ev.orders.end()); + }); } - - ChildOrder build() - { - bts_assert_msg(_order_services,"OrderBuilder::activate() must be called before orders can be built"); + + ChildOrder build() { + bts_assert_msg( + _order_services, + "OrderBuilder::activate() must be called before orders can be built"); ChildOrder result; if (_order_stash.size()) { - result = ChildOrder( *_order_stash.back(), - *_order_services); + result = ChildOrder(*_order_stash.back(), *_order_services); _order_stash.pop_back(); - } - else { - LOG(OrderMan,Warn, - "Ran out of pre-allocated child orders for order {}. Will allocate directly. " - "This will have an impact on performance", _parent_key); - result = ChildOrder (_order_services->order_factory().create(_parent_key,_definition), - *_order_services); + } else { + LOG(OrderMan, Warn, + "Ran out of pre-allocated child orders for order {}. Will " + "allocate directly. " + "This will have an impact on performance", + _parent_key); + result = ChildOrder( + _order_services->order_factory().create(_parent_key, _definition), + *_order_services); } if (_reserve_sz > _order_stash.size()) { auto need = _reserve_sz - _order_stash.size(); - _order_services->send_order_create_req(_builder_id,_parent_key,_definition,need); + _order_services->send_order_create_req(_builder_id, _parent_key, + _definition, need); } return result; } - - OrderBuilder& operator=(OrderBuilder &&src) - { + + OrderBuilder &operator=(OrderBuilder &&src) { move_here(src); return *this; } -private: - void move_here(OrderBuilder &src) - { + private: + void move_here(OrderBuilder &src) { bts_assert(!_order_services); _parent_key = src._parent_key; - _definition= src._definition; + _definition = src._definition; _reserve_sz = src._reserve_sz; _order_stash = src._order_stash; _builder_id = src._builder_id; @@ -96,15 +88,16 @@ private: src._order_services = nullptr; bts_assert(_parent_key != null_order_key()); } - + OrderKey _parent_key; api::orderman::OrderDefinition _definition; size_t _reserve_sz; - std::vector _order_stash; - size_t _builder_id ; + std::vector _order_stash; + size_t _builder_id; OrderServices *_order_services; - + static std::atomic _current_builder_id; }; -}} +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/actors/order_manager/OrderManager.cpp b/src/lib/orderman/actors/order_manager/OrderManager.cpp index fe06f382d..d65304712 100644 --- a/src/lib/orderman/actors/order_manager/OrderManager.cpp +++ b/src/lib/orderman/actors/order_manager/OrderManager.cpp @@ -14,8 +14,8 @@ #include "lib/utils/inplace_function.h" #include -#include #include +#include namespace bts { namespace orderman { @@ -30,37 +30,20 @@ enum class OrderManager::State { READY }; -struct OrderManager::OrderInfo { - OrderInfo(Order &o, OrderServicesData &data) - : order(&o), order_services(std::make_unique(o, data)) {} - - OrderInfo() = default; - OrderInfo(OrderInfo &&src) = default; - OrderInfo &operator=(OrderInfo &&src) = default; - - Order *order; - std::unique_ptr order_services; -}; - struct OrderManager::PImpl { - PImpl(OrderManager &owner, DynamicOrderRegistry const &b) - : state(State::WAIT_ADMIN), services_data(owner, b) { - pending_order_events.reserve(1000); - } + PImpl(OrderManager &owner, DynamicOrderRegistry const &b, trace::PerfLog &l) + : state(State::WAIT_ADMIN), services_data(owner, b, l) {} State state; - std::unordered_map orders; - - std::vector pending_order_events; - + std::unordered_map orders; mercury::Actor::SubHandle stored_order_sub; mercury::Actor::SubHandle stored_fills_sub; OrderServicesData services_data; mercury::Stream pub_ready; }; -OrderManager::OrderManager(DynamicOrderRegistry const &b) - : me(new PImpl(*this, b)) {} +OrderManager::OrderManager(DynamicOrderRegistry const &b, trace::PerfLog &l) + : me(new PImpl(*this, b, l)) {} OrderManager::~OrderManager() {} void OrderManager::init() { @@ -90,6 +73,11 @@ void OrderManager::on_admin_data(const mercury::Update &m) { void OrderManager::on_securities( const mercury::Update &update) { + + // forward to execution gateways + for (auto &osd : me->services_data.sessions) + osd->gw.on_securities(update); + if (update.events) { // update our security db and accumulate for the sake of the limiter @@ -125,8 +113,10 @@ void OrderManager::on_fill_recovery( me->state = State::WAIT_ORDERS; for (auto const &ev : *(update.events)) { - auto trimmed_account_name = boost::algorithm::trim_copy(ev.fill.account()); - me->services_data.limiter.add(*ev.security, trimmed_account_name,ev.fill.side(), + auto trimmed_account_name = + boost::algorithm::trim_copy(ev.fill.account()); + me->services_data.limiter.add(*ev.security, trimmed_account_name, + ev.fill.side(), Quantity(ev.fill.last_shares())); } @@ -158,13 +148,14 @@ void OrderManager::on_order_recovery( for (auto const &ev : *(update.events)) { auto &order = me->services_data.order_factory.recover(ev.order_record); + order.init_order_services(me->services_data); + + auto r = me->orders.emplace(order.key(), &order); + bts_assert(r.second); auto const &ostate = ev.order_record.state(); - OrderInfo oi{order, me->services_data}; - auto serv_ptr = oi.order_services.get(); - me->orders[order.key()] = std::move(oi); order.on_activate(Price(ostate.price()), - Quantity(ostate.quantity()), *serv_ptr, - PerfTrace()); + Quantity(ostate.quantity()), *order._services, + trace::CorID()); } // signal that we are ready @@ -194,91 +185,73 @@ void OrderManager::on_execution_report( auto order = &me->services_data.order_factory.recreate_from_exe_report( *report.data); - OrderInfo oi{*order, me->services_data}; - auto serv_ptr = oi.order_services.get(); - me->orders[order->key()] = std::move(oi); + order->init_order_services(me->services_data); + auto r = me->orders.emplace(order->key(), order); + bts_assert(r.second); order->on_activate(report.data->price, report.data->quantity, - *serv_ptr, PerfTrace()); + *order->_services, trace::CorID()); } } } -void OrderManager::queue_order_event(PendingOrderEvent const &event_handler) { - me->pending_order_events.push_back(event_handler); -} - void OrderManager::on_activate_order( const mercury::Update &m) { if (m.events) - for (auto const &ev : *m.events) - queue_order_event(ev); -} - -void OrderManager::handle_order_event(ActivateOrderEvent const &ev) { - auto order = ev.order; - auto k = order->key(); - bts_assert(me->orders.find(k) == me->orders.end()); - OrderInfo oi{*order, me->services_data}; - auto serv_ptr = oi.order_services.get(); - me->orders[k] = std::move(oi); - order->on_activate(ev.price, ev.quantity, *serv_ptr, ev.trace); + for (auto const &ev : *m.events) { + auto order = ev.order; + order->init_order_services(me->services_data); + auto r = me->orders.emplace(order->key(), order); + bts_assert(r.second); + order->on_activate(ev.price, ev.quantity, *order->_services, ev.trace); + } } void OrderManager::on_update_order(const mercury::Update &m) { if (m.events) - for (auto const &ev : *m.events) - queue_order_event(ev); -} - -void OrderManager::handle_order_event(UpdateOrderEvent const &ev) { - auto k = ev.key(); - auto it = me->orders.find(k); - if (it != me->orders.end()) - it->second.order->on_update(ev.price, ev.quantity, ev.trace); - else { - LOG(OrderMan, Error, - "Received an update request for an unknown order {}. " - "This should not happen and likely indicates a serious bug. ", - ev.key().value()); - } + for (auto const &ev : *m.events) { + auto k = ev.key(); + auto it = me->orders.find(k); + if (it != me->orders.end()) + it->second->on_update(ev.price, ev.quantity, ev.trace); + else { + LOG(OrderMan, Error, + "Received an update request for an unknown order {}. " + "This should not happen and likely indicates a serious bug. ", + ev.key().value()); + } + } } void OrderManager::on_cancel_order(const mercury::Update &m) { if (m.events) - for (auto const &ev : *m.events) - queue_order_event(ev); -} - -void OrderManager::handle_order_event(CancelOrderEvent const &ev) { - auto k = ev.key(); - auto it = me->orders.find(k); - if (it != me->orders.end()) - it->second.order->on_cancel(ev.trace); - else { - LOG(OrderMan, Error, - "Received a cancel request for an unknown order {}. " - "This should not happen and likely indicates a serious bug. ", - ev.key().value()); - } + for (auto const &ev : *m.events) { + auto k = ev.key(); + auto it = me->orders.find(k); + if (it != me->orders.end()) + it->second->on_cancel(ev.trace); + else { + LOG(OrderMan, Error, + "Received a cancel request for an unknown order {}. " + "This should not happen and likely indicates a serious bug. ", + ev.key().value()); + } + } } void OrderManager::on_crack_order(const mercury::Update &m) { if (m.events) - for (auto const &ev : *m.events) - queue_order_event(ev); -} - -void OrderManager::handle_order_event(CrackOrderEvent const &ev) { - auto k = ev.key(); - auto it = me->orders.find(k); - if (it != me->orders.end()) - it->second.order->on_crack(ev.trace); - else { - LOG(OrderMan, Error, - "Received a crack request for an unknown order {}. " - "This should not happen and likely indicates a serious bug. ", - ev.key().value()); - } + for (auto const &ev : *m.events) { + auto k = ev.key(); + auto it = me->orders.find(k); + if (it != me->orders.end()) + it->second->on_crack(ev.trace); + else { + LOG(OrderMan, Error, + "Received a crack request for an unknown order {}. " + "This should not happen and likely indicates a serious bug. ", + ev.key().value()); + } + } } void OrderManager::on_gateway_state( @@ -290,6 +263,16 @@ void OrderManager::on_gateway_state( } } +OrderServices &OrderManager::activate_child(OrderServices &parent, Order &order, + Price p, Quantity q, + trace::CorID const &trace) { + order.init_order_services(me->services_data, parent); + auto r = me->orders.emplace(order.key(), &order); + bts_assert(r.second); + order.on_activate(p, q, *order._services, trace); + return *order._services; +} + void OrderManager::on_new_fix_buffer( const mercury::Update &m) { if (m.events) @@ -370,8 +353,24 @@ void OrderManager::init_order_services() { s->gateway_status_subs = std::make_unique< ContentSubscription>(*this, gw_name); - // FIX output - s->out_fix_pub = make_stream(gw_name); + // publishers for execution reports, gateway status and cancel + // reject evets + auto s_ptr = s.get(); + s->exe_report_pub = make_stream(gw_name); + s->gw.on_exe_report() = [s_ptr,this] (auto const &er, auto const &t) { + publish(s_ptr->exe_report_pub, &er,t); + }; + s->gw_status_change_pub = make_stream(gw_name); + s->gw.on_gw_status_change() = [s_ptr,this,gw_name] (bool b) { + publish(s_ptr->gw_status_change_pub, gw_name,b); + }; + s->cancel_reject_pub = make_stream(gw_name); + s->gw.on_cancel_reject() = [s_ptr,this] (auto const &k,auto const&msg) { + publish(s_ptr->cancel_reject_pub, k,msg); + }; + // handlers are ready so we can start processing fix events + s->gw.start(); + reload_fix_buffer(*s); } @@ -394,11 +393,6 @@ void OrderManager::init_order_services() { [this](auto const &ev) { this->on_new_fix_buffer(ev); }); // Outputs - me->services_data.activate_order_pub = make_stream(); - me->services_data.update_order_pub = make_stream(); - me->services_data.cancel_order_pub = make_stream(); - me->services_data.crack_order_pub = make_stream(); - me->services_data.create_order_req_pub = make_stream(); me->services_data.create_fix_req_pub = @@ -407,12 +401,9 @@ void OrderManager::init_order_services() { me->services_data.settlement_request_pub = make_stream(); me->services_data.report_order_state_pub = - make_stream(); + make_stream(); me->pub_ready = make_stream(); - me->services_data.child_order_subs = - std::make_unique>( - *this); // md subs are peculiar in that we try to make them on demand, so // we publish an event announcing the subscription std::function on_md_sub = [this](SecurityKey k) { @@ -432,35 +423,36 @@ void OrderManager::init_order_services() { std::make_unique>(*this); } -void OrderManager::on_poll() { +void OrderManager::after_event() { if (me->state == State::READY) { - for (size_t i = 0; i < me->pending_order_events.size(); i++) - me->pending_order_events[i](*this); - me->pending_order_events.clear(); for (auto &osd : me->services_data.sessions) { auto &fix_stream = osd->current_buffer->first_stream(); if (fix_stream.n_msgs()) { fix_stream.close(); - publish(osd->out_fix_pub, osd->current_buffer, osd->current_traces); - osd->current_traces.clear(); + osd->gw.send_fix(osd->current_buffer, osd->current_trace); reload_fix_buffer(*osd); } } } } -void OrderManager::reload_fix_buffer(SessionServicesData &dt) { - if (dt.free_buffers.size()) { - dt.current_buffer = dt.free_buffers.back(); - dt.free_buffers.pop_back(); +void OrderManager::reload_fix_buffer(SessionServicesData &osd) { + if (osd.free_buffers.size()) { + osd.current_buffer = osd.free_buffers.back(); + osd.free_buffers.pop_back(); } else { LOG(OrderMan, Warn, "Ran out of fix buffers in {}. Will allocate directly. " "This will have an impact on performance", - dt.cfg.name()); - dt.current_buffer = std::make_shared(dt.cfg); + osd.cfg.name()); + osd.current_buffer = std::make_shared(osd.cfg); } } +void OrderManager::on_poll() { + for (auto &osd : me->services_data.sessions) + osd->gw.dispatch_incoming_fix_messages(); +} + } // namespace orderman } // namespace bts diff --git a/src/lib/orderman/actors/order_manager/OrderManager.h b/src/lib/orderman/actors/order_manager/OrderManager.h index 3b6d403a9..a8ec11582 100644 --- a/src/lib/orderman/actors/order_manager/OrderManager.h +++ b/src/lib/orderman/actors/order_manager/OrderManager.h @@ -4,16 +4,17 @@ #include "lib/jetfix/common/OutFIXPtr.h" #include "lib/mercury/actors/Actor.h" #include "lib/mercury/actors/IPollableActor.h" -#include "lib/utils/inplace_function.h" #include "lib/orderman/events/ActivateOrderEvent.h" -#include "lib/orderman/events/UpdateOrderEvent.h" #include "lib/orderman/events/CancelOrderEvent.h" #include "lib/orderman/events/CrackOrderEvent.h" +#include "lib/orderman/events/UpdateOrderEvent.h" +#include "lib/utils/inplace_function.h" #include // fwd namespace bts { +namespace trace {class PerfLog;} namespace mercury { class TimerEvent; } @@ -26,13 +27,14 @@ class CancelOrderEvent; class CrackOrderEvent; class StoredOrderEvent; class StoredFillEvent; +class OrderServices; class CreateFIXBufferReplyEvent; class GatewayStatusChangeEvent; class NewAdminDataEvent; struct SessionServicesData; class DynamicOrderRegistry; -} -} +} // namespace orderman +} // namespace bts namespace bts { namespace orderman { @@ -49,8 +51,6 @@ namespace orderman { // - security creation events // - timer updates // - order state changes -// - order update/cancel/crack events -// // // Additionally handles order maintenance events: // - create @@ -58,16 +58,16 @@ namespace orderman { // - crack // - update -class OrderManager : public mercury::Actor, - public mercury::IPollableActor -{ +class OrderManager : public mercury::Actor, public mercury::IPollableActor { public: - OrderManager(DynamicOrderRegistry const&dyn_order_builder); + OrderManager(DynamicOrderRegistry const &dyn_order_builder, trace::PerfLog &); ~OrderManager(); void init() override; private: friend class OrderServices; + + // external events void on_securities(const mercury::Update &); void on_fill_recovery(const mercury::Update &); void on_order_recovery(const mercury::Update &); @@ -80,34 +80,22 @@ class OrderManager : public mercury::Actor, void on_gateway_state(const mercury::Update &); void on_timer(const mercury::Update &); void on_admin_data(const mercury::Update &); + void on_poll() override; + // end external events void init_order_services(); - void on_poll() override; - - using PendingOrderEvent = stdext::inplace_function< - void(OrderManager &), - std::max({128ul, sizeof(ActivateOrderEvent), sizeof(UpdateOrderEvent), - sizeof(CancelOrderEvent), sizeof(CrackOrderEvent)})>; - - template - void queue_order_event(EV const&ev) { - queue_order_event(PendingOrderEvent( [ev] (auto &om) { - om.handle_order_event(ev); - })); - } - void queue_order_event(PendingOrderEvent const&ev); - void handle_order_event(ActivateOrderEvent const &); - void handle_order_event(UpdateOrderEvent const &); - void handle_order_event(CancelOrderEvent const &); - void handle_order_event(CrackOrderEvent const&); void reload_fix_buffer(SessionServicesData &dt); - - std::vector &free_buffers(std::string const&); + + void after_event() override; + OrderServices &activate_child(OrderServices &parent, Order &, Price, + Quantity, trace::CorID const &); + + std::vector &free_buffers(std::string const &); enum class State; struct OrderInfo; struct PImpl; std::unique_ptr me; }; -} -} +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/actors/order_manager/OrderServices.h b/src/lib/orderman/actors/order_manager/OrderServices.h index ac5826b57..d80f5c274 100644 --- a/src/lib/orderman/actors/order_manager/OrderServices.h +++ b/src/lib/orderman/actors/order_manager/OrderServices.h @@ -8,6 +8,8 @@ #include "lib/orderman/governor/Governor.h" #include "lib/orderman/orderman_utils/EventStream.h" #include "lib/orderman/orders/Order.h" +#include "lib/tracing/PerfLog.h" +#include #include @@ -17,11 +19,34 @@ namespace orderman { class SessionServices { public: + SessionServices(SessionServices &&ss) { operator=(std::move(ss)); } + + SessionServices(SessionServices const &ss) { operator=(ss); } + SessionServices(SessionServicesData &session_data) - : exe_reports(*session_data.exe_report_subs), - cancel_rejects(*session_data.cancel_reject_subs), - gateway_status(*session_data.gateway_status_subs), - _session_data(&session_data) {} + : _exe_reports(*session_data.exe_report_subs), + _cancel_rejects(*session_data.cancel_reject_subs), + _gateway_status(*session_data.gateway_status_subs), + _session_data(&session_data), _gateway_status_sub() {} + + SessionServices &operator=(SessionServices &&src) { + _exe_reports = std::move(src._exe_reports); + _cancel_rejects = std::move(src._cancel_rejects); + _gateway_status = std::move(src._gateway_status); + _session_data = src._session_data; + src._session_data = nullptr; + _gateway_status_sub = src._gateway_status_sub; + return *this; + } + + SessionServices &operator=(SessionServices const &src) { + _exe_reports = src._exe_reports; + _cancel_rejects = src._cancel_rejects; + _gateway_status = src._gateway_status; + _session_data = src._session_data; + _gateway_status_sub = src._gateway_status_sub; + return *this; + } std::string const &session_name() const { return _session_data->session; } @@ -29,122 +54,222 @@ class SessionServices { return _session_data->cfg; } - void queue_fix(jetfix::MessageTypes mt, jetfix::FIXFragment const&f,PerfTrace const&trace) { + void queue_fix(jetfix::MessageTypes mt, jetfix::FIXFragment const &f, + trace::CorID const &trace) { auto &stream = _session_data->current_buffer->first_stream(); stream.new_msg(mt).append(f); - _session_data->current_traces.push_back(trace); + + if (stream.n_msgs() == 1) + _session_data->current_trace = trace; } - + bool is_gateway_connected() const { return _session_data->gw_connected; } Governor &governor() { return _session_data->governor; } - EventStream exe_reports; - EventStream cancel_rejects; - EventStream gateway_status; + // Subscriptions + using ExeReportSubID = EventStream::SubID; + using CancelRejectSubID = EventStream::SubID; + + template + ExeReportSubID subscribe_to_exe_report(OrderKey k, CB &&cb) { + return _exe_reports.sub(k, std::forward(cb)); + } + void unsubscribe_from_exe_report(ExeReportSubID sid) { + _exe_reports.unsub(sid); + } + + template + CancelRejectSubID subscribe_to_cancel_reject(OrderKey k, CB &&cb) { + return _cancel_rejects.sub(k, std::forward(cb)); + } + void unsubscribe_from_cancel_reject(CancelRejectSubID sid) { + _cancel_rejects.unsub(sid); + } + + template void subscribe_to_gateway_status(CB &&cb) { + _gateway_status_sub = _gateway_status.sub(std::forward(cb)); + } + void unsubscribe_from_gateway_status() { + _gateway_status.unsub(_gateway_status_sub); + } private: + EventStream _exe_reports; + EventStream _cancel_rejects; + EventStream _gateway_status; SessionServicesData *_session_data; + EventStream::SubID + _gateway_status_sub; }; class OrderServices { public: - OrderServices(Order &owner, OrderServicesData &data) - : book_updates(*data.md_subs), settlement_updates(*data.settlement_subs), - child_updates(*data.child_order_subs), time_change(*data.time_subs), - order_creations(*data.order_creation_subs), _owner(owner), _data(data), - _sessions() { - for (auto &sd : data.sessions) - _sessions.push_back(std::make_unique(*sd)); + OrderServices(Order &owner) + : _busy(false), _pending_calls(), _owner(&owner), _data(), + _parent(nullptr), _child_update_cb([](auto const &) {}), + _book_updates(), _settlement_updates(), _time_change(), _sessions(), + _create_order_reply() {} + + void init(OrderServicesData &data, OrderServices &parent) { + _parent = &parent; + init(data); } - EventStream book_updates; - EventStream settlement_updates; - EventStream child_updates; - EventStream time_change; + void init(OrderServicesData &data) { + _data = &data; + _book_updates.init(*data.md_subs); + _settlement_updates.init(*data.settlement_subs); + _time_change.init(*data.time_subs); + for (auto &sd : data.sessions) + _sessions.emplace_back(*sd); + _create_order_reply.init(*data.order_creation_subs); + } - securities::ISecurityDB &sec_db() { return _data.sec_db; } + securities::ISecurityDB &sec_db() { return _data->sec_db; } mercury::TimeStampStr const &get_time_str() const { - return _data.last_timer_ev.ts_str; + return _data->last_timer_ev.ts_str; } - TimeStamp const &get_time() const { return _data.last_timer_ev.ts; } + void log(trace::CorID cid, const char *entry_kind, uint32_t uint32_1 = 0, + uint32_t uint32_2 = 0, const char *txt_1 = "", + uint64_t uint64_1 = 0) { + _data->log.log(cid,entry_kind,uint32_1,uint32_2,txt_1,uint64_1); + } void report_state(const api::orderman::OrderState &state, - PerfTrace const &trace = PerfTrace()) { + trace::CorID const &trace = trace::CorID()) { - _data.owner.publish(_data.report_order_state_pub, _owner.key(), - _owner.parent_key(), _owner.definition(), state, - trace); - if (orderman::in_terminal_state(state.status())) { - LOG(OrderMan, Info, - "Order {} transitioned to a terminal state. Canceling all " - "subscriptions", - _owner.key().value()); - book_updates.unsub_all(); - child_updates.unsub_all(); - time_change.unsub_all(); - } + OrderStateUpdateEvent ev(_owner->key(), _owner->parent_key(), + _owner->definition(), state, trace); + + on_inter_order_call([ev](OrderServices &self) { + self._data->owner.publish(self._data->report_order_state_pub, ev); + if (orderman::in_terminal_state(ev.status)) { + LOG(OrderMan, Info, + "Order {} transitioned to a terminal state. Canceling all " + "subscriptions", + self._owner->key().value()); + self.unsubscribe_from_child_updates(); + self._book_updates.unsub_all(); + self._settlement_updates.unsub_all(); + self._time_change.unsub_all(); + self._create_order_reply.unsub_all(); + } + if (self._parent) + self._parent->_child_update_cb(ev); + }); } - Limiter &limiter() { return _data.limiter; } + Limiter &limiter() { return _data->limiter; } SessionServices &get_session_services(std::string const &for_session) { for (auto &s : _sessions) - if (s->session_name() == for_session) - return *s; + if (s.session_name() == for_session) + return s; bts_assert(false); } - void schedule_action(std::function const &action) { - _data.owner.schedule_action(action); + // Subscriptions ------------------------------ + using BookSubID = EventStream::SubID; + template BookSubID subscribe_to_book(SecurityKey k, CB &&cb) { + return _book_updates.sub(k, std::forward(cb)); } + void unsubscribe_from_book(BookSubID sid) { _book_updates.unsub(sid); } + + using SettlementSubID = EventStream::SubID; + template + SettlementSubID subscribe_to_settlements(SecurityKey k, CB &&cb) { + return _settlement_updates.sub(k, std::forward(cb)); + } + void unsubscribe_from_settlements(SettlementSubID sid) { + _settlement_updates.unsub(sid); + } + + template void subscribe_to_time(CB &&cb) { + _time_change_sub = _time_change.sub(std::forward(cb)); + } + void unsubscribe_from_time() { _time_change.unsub(_time_change_sub); } + + template void subscribe_to_child_updates(CB &&cb) { + _child_update_cb = cb; + } + void unsubscribe_from_child_updates() { + _child_update_cb = [](auto const &) {}; + } + // End Subscriptions ------------------------------ private: friend class OrderBuilder; - IOrderFactory &order_factory() { return _data.order_factory; } - EventStream order_creations; + template void on_inter_order_call(C const &c) { + if (_busy) + _pending_calls.emplace_back(c); + else { + _busy = true; + c(*this); + for (size_t i = 0; i < _pending_calls.size(); i++) { + auto c = _pending_calls[i]; + c(*this); + } + _pending_calls.clear(); + _busy = false; + } + } + + IOrderFactory &order_factory() { return _data->order_factory; } + + using CreateOrderReplySubID = EventStream::SubID; + + template + CreateOrderReplySubID subscribe_to_order_creation_reply(size_t req_id, + CB &&cb) { + return _create_order_reply.sub(req_id, std::forward(cb)); + } + void unsubscribe_from_order_creation_reply(CreateOrderReplySubID sid) { + _create_order_reply.unsub(sid); + } + void send_order_create_req(size_t builder_id, OrderKey pk, api::orderman::OrderDefinition const &def, size_t n_orders) { - _data.owner.publish(_data.create_order_req_pub, builder_id, pk, def, - n_orders); + _data->owner.publish(_data->create_order_req_pub, builder_id, pk, def, + n_orders); } friend class ChildOrder; - template void queue_order_op(const OP &op) { - _data.owner.queue_order_event(op); + OrderServices &activate_child(Order &o, Price p, Quantity q, + trace::CorID const &trace) { + return _data->owner.activate_child(*this, o, p, q, trace); } - void send_activate(Order &o, Price p, Quantity q, PerfTrace const &trace) { - queue_order_op(ActivateOrderEvent{o, p, q, trace}); + void update(Price p, Quantity q, trace::CorID const &trace) { + on_inter_order_call([p, q, trace](OrderServices &self) { + self._owner->on_update(p, q, trace); + }); } - void send_activate(Order &o, Price p, Quantity q) { - queue_order_op(ActivateOrderEvent{o, p, q, PerfTrace()}); + void crack(trace::CorID const &trace) { + on_inter_order_call( + [trace](OrderServices &self) { self._owner->on_crack(trace); }); } - void send_update(OrderKey k, Price p, Quantity q, PerfTrace const &trace) { - queue_order_op(UpdateOrderEvent{k, p, q, trace}); - } - void send_update(OrderKey k, Price p, Quantity q) { - queue_order_op(UpdateOrderEvent{k, p, q, PerfTrace()}); - } - void send_crack(OrderKey k, PerfTrace const &trace) { - queue_order_op(CrackOrderEvent{k, trace}); - } - void send_crack(OrderKey k) { - queue_order_op(CrackOrderEvent{k, PerfTrace()}); - } - void send_cancel(OrderKey k, PerfTrace const &trace) { - queue_order_op(CancelOrderEvent{k, trace}); - } - void send_cancel(OrderKey k) { - queue_order_op(CancelOrderEvent{k, PerfTrace()}); + void cancel(trace::CorID const &trace) { + on_inter_order_call( + [trace](OrderServices &self) { self._owner->on_cancel(trace); }); } - Order &_owner; - OrderServicesData &_data; - std::vector> _sessions; + bool _busy; + boost::container::small_vector, 10> + _pending_calls; + Order *_owner; + OrderServicesData *_data; + OrderServices *_parent; + std::function _child_update_cb; + EventStream _book_updates; + EventStream _settlement_updates; + EventStream _time_change; + boost::container::small_vector _sessions; + EventStream::SubID _time_change_sub; + EventStream _create_order_reply; }; } // namespace orderman } // namespace bts diff --git a/src/lib/orderman/actors/order_manager/OrderServicesData.cpp b/src/lib/orderman/actors/order_manager/OrderServicesData.cpp index 15969fc0e..5b19f6e44 100644 --- a/src/lib/orderman/actors/order_manager/OrderServicesData.cpp +++ b/src/lib/orderman/actors/order_manager/OrderServicesData.cpp @@ -5,15 +5,18 @@ namespace bts { namespace orderman { -OrderServicesData::OrderServicesData(OrderManager &owner,DynamicOrderRegistry const&b) - : owner(owner), order_router(), order_factory(sec_db, order_router,b), +OrderServicesData::OrderServicesData(OrderManager &owner, + DynamicOrderRegistry const &b, + trace::PerfLog &l) + : owner(owner), log(l), order_router(), + order_factory(sec_db, order_router, b), last_timer_ev( Timer::now(), to(datetime::FIX_timestamp(datetime::now()))) { auto &all_connections = config::get().connection(); - for (auto const &c : all_connections) - sessions.push_back (std::make_unique(c)); -} -} + for (auto const &c : all_connections) + sessions.push_back(std::make_unique(c, l)); } +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/actors/order_manager/OrderServicesData.h b/src/lib/orderman/actors/order_manager/OrderServicesData.h index 4b0f86f0b..06fe8bca2 100644 --- a/src/lib/orderman/actors/order_manager/OrderServicesData.h +++ b/src/lib/orderman/actors/order_manager/OrderServicesData.h @@ -7,11 +7,10 @@ #include "lib/orderman/order_factory/OrderFactory.h" #include "lib/orderman/securities/MapSecurityDB.h" -#include "lib/utils/datetime.h" #include "lib/mercury/events/TimerEvent.h" +#include "lib/orderman/actors/ExecutionGateway.h" #include "lib/orderman/events/ActivateOrderEvent.h" #include "lib/orderman/events/BookUpdateEvent.h" -#include "lib/orderman/events/SettlementUpdateEvent.h" #include "lib/orderman/events/CancelOrderEvent.h" #include "lib/orderman/events/CancelRejectEvent.h" #include "lib/orderman/events/CrackOrderEvent.h" @@ -21,15 +20,16 @@ #include "lib/orderman/events/CreateOrderRequestEvent.h" #include "lib/orderman/events/GatewayStatusChangeEvent.h" #include "lib/orderman/events/MDRequestEvent.h" -#include "lib/orderman/events/SettlementRequestEvent.h" #include "lib/orderman/events/NewExecutionReportEvent.h" #include "lib/orderman/events/NewSecuritiesEvent.h" #include "lib/orderman/events/OrderStateUpdateEvent.h" -#include "lib/orderman/events/OutFIXMsgEvent.h" +#include "lib/orderman/events/SettlementRequestEvent.h" +#include "lib/orderman/events/SettlementUpdateEvent.h" #include "lib/orderman/events/UpdateOrderEvent.h" +#include "lib/orderman/governor/Governor.h" #include "lib/orderman/limiter/Limiter.h" #include "lib/orderman/order_router/OrderRouter.h" -#include "lib/orderman/governor/Governor.h" +#include "lib/utils/datetime.h" #include @@ -44,19 +44,13 @@ struct ParentKey { }; struct SessionServicesData { - SessionServicesData(config::JetFIX::Connection const&cfg) - : session(cfg.name()), - gw_connected(false), - cfg(cfg), - governor(cfg.max_order_msgs_per_window(), - cfg.window_duration_msecs()) - { - current_traces.reserve(1000); - } + SessionServicesData(config::JetFIX::Connection const &cfg, trace::PerfLog &log) + : session(cfg.name()), gw_connected(false), cfg(cfg), + governor(cfg.max_order_msgs_per_window(), cfg.window_duration_msecs()), + gw(cfg, log) {} std::string session; std::vector free_buffers; - mercury::Stream out_fix_pub; bool gw_connected; config::JetFIX::Connection cfg; std::unique_ptr> @@ -69,34 +63,34 @@ struct SessionServicesData { Governor governor; jetfix::OutFIXPtr current_buffer; - std::vector current_traces; + trace::CorID current_trace; + ExecutionGateway gw; + mercury::Stream exe_report_pub; + mercury::Stream gw_status_change_pub; + mercury::Stream cancel_reject_pub; }; class OrderServicesData { -public: - OrderServicesData(OrderManager &owner,DynamicOrderRegistry const&b); + public: + + OrderServicesData(OrderManager &owner, DynamicOrderRegistry const &b, + trace::PerfLog &l); + OrderManager &owner; + trace::PerfLog &log; securities::MapSecurityDB sec_db; OrderRouter order_router; Limiter limiter; OrderFactory order_factory; - std::unique_ptr> md_subs; - std::unique_ptr> settlement_subs; - std::unique_ptr< - mercury::ContentSubscription> - child_order_subs; - + std::unique_ptr> + settlement_subs; std::unique_ptr< mercury::ContentSubscription> time_subs; std::unique_ptr> order_creation_subs; - mercury::Stream activate_order_pub; - mercury::Stream update_order_pub; - mercury::Stream cancel_order_pub; - mercury::Stream crack_order_pub; mercury::Stream create_order_req_pub; mercury::Stream create_fix_req_pub; mercury::Stream md_request_pub; @@ -113,5 +107,5 @@ public: bts_assert(false); } }; -} -} +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/events/ActivateOrderEvent.h b/src/lib/orderman/events/ActivateOrderEvent.h index 874b79f99..91f0f5f46 100644 --- a/src/lib/orderman/events/ActivateOrderEvent.h +++ b/src/lib/orderman/events/ActivateOrderEvent.h @@ -4,6 +4,7 @@ #include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/mercury/events/Event.h" +#include "lib/tracing/PerfLog.h" namespace bts { namespace orderman { @@ -18,14 +19,14 @@ public: order (&o),price(p),quantity(q), trace() {} - ActivateOrderEvent (Order &o,Price p, Quantity q,PerfTrace trace) : + ActivateOrderEvent (Order &o,Price p, Quantity q,trace::CorID trace) : order (&o),price(p),quantity(q), trace(trace) {} Order* order; Price price; Quantity quantity; - PerfTrace trace; + trace::CorID trace; }; }} diff --git a/src/lib/orderman/events/BookUpdateEvent.h b/src/lib/orderman/events/BookUpdateEvent.h index cd2fe6aa1..bf71357a8 100644 --- a/src/lib/orderman/events/BookUpdateEvent.h +++ b/src/lib/orderman/events/BookUpdateEvent.h @@ -5,6 +5,7 @@ #include "lib/mercury/events/Event.h" #include "lib/orderman/orderman_utils/Book.h" #include "lib/orderman/orderman_utils/orderman_common.h" +#include "lib/tracing/PerfLog.h" namespace bts { namespace orderman { @@ -13,10 +14,10 @@ class BookUpdateEvent : public mercury::Event { public: using SynopsisPolicy = mercury::NoSynopsis; Book book; - PerfTrace trace; + trace::CorID trace; SecurityKey key() const { return book.security_key(); } - BookUpdateEvent(const Book &b, PerfTrace const &trace) + BookUpdateEvent(const Book &b, trace::CorID const &trace) : book(b), trace(trace) {} }; } diff --git a/src/lib/orderman/events/CancelOrderEvent.h b/src/lib/orderman/events/CancelOrderEvent.h index 9593dcd3c..cdc2fa563 100644 --- a/src/lib/orderman/events/CancelOrderEvent.h +++ b/src/lib/orderman/events/CancelOrderEvent.h @@ -4,6 +4,7 @@ #include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/mercury/events/Event.h" +#include "lib/tracing/PerfLog.h" namespace bts { namespace orderman { @@ -14,12 +15,12 @@ public: using SynopsisPolicy = mercury::NoSynopsis; CancelOrderEvent (OrderKey k) : k (k), trace() {} - CancelOrderEvent (OrderKey k,PerfTrace const&trace) : k (k), trace(trace) {} + CancelOrderEvent (OrderKey k,trace::CorID const&trace) : k (k), trace(trace) {} // used by ContentSubscription OrderKey key() const {return k;} OrderKey k; - PerfTrace trace; + trace::CorID trace; }; }} diff --git a/src/lib/orderman/events/CancelRejectEvent.cpp b/src/lib/orderman/events/CancelRejectEvent.cpp index 10fcf5bfc..00f60fde9 100644 --- a/src/lib/orderman/events/CancelRejectEvent.cpp +++ b/src/lib/orderman/events/CancelRejectEvent.cpp @@ -1,6 +1,5 @@ #include "CancelRejectEvent.h" namespace bts { -namespace orderman { - -}} +namespace orderman {} +} // namespace bts diff --git a/src/lib/orderman/events/CrackOrderEvent.h b/src/lib/orderman/events/CrackOrderEvent.h index 833df23ba..115826241 100644 --- a/src/lib/orderman/events/CrackOrderEvent.h +++ b/src/lib/orderman/events/CrackOrderEvent.h @@ -4,6 +4,7 @@ #include "lib/mercury/events/Event.h" #include "lib/orderman/orderman_utils/orderman_common.h" +#include "lib/tracing/PerfLog.h" namespace bts { namespace orderman { @@ -15,13 +16,13 @@ class CrackOrderEvent : public mercury::Event { CrackOrderEvent(OrderKey k) : k(k), trace() {} - CrackOrderEvent(OrderKey k, PerfTrace const &trace) + CrackOrderEvent(OrderKey k, trace::CorID const &trace) : k(k), trace(trace) {} // used by ContentSubscription OrderKey key() const { return k; } OrderKey k; - PerfTrace trace; + trace::CorID trace; }; } } diff --git a/src/lib/orderman/events/NewExecutionReportEvent.cpp b/src/lib/orderman/events/NewExecutionReportEvent.cpp index 54b32a164..ae949d917 100644 --- a/src/lib/orderman/events/NewExecutionReportEvent.cpp +++ b/src/lib/orderman/events/NewExecutionReportEvent.cpp @@ -1,7 +1,5 @@ #include "NewExecutionReportEvent.h" namespace bts { -namespace orderman { - - -}} +namespace orderman {} +} // namespace bts diff --git a/src/lib/orderman/events/NewExecutionReportEvent.h b/src/lib/orderman/events/NewExecutionReportEvent.h index c1971d4ce..87fb02224 100644 --- a/src/lib/orderman/events/NewExecutionReportEvent.h +++ b/src/lib/orderman/events/NewExecutionReportEvent.h @@ -7,6 +7,8 @@ #include "lib/mercury/synopsis/CacheAll.h" #include "lib/orderman/orderman_utils/ExecutionReport.h" #include "lib/orderman/orderman_utils/orderman_common.h" +#include "lib/tracing/PerfLog.h" + #include #include @@ -19,10 +21,10 @@ class NewExecutionReportEvent : public mercury::Event { using Tag = GatewayName; using SynopsisPolicy = mercury::CacheAll; ExecutionReport const *data; - PerfTrace trace; + trace::CorID trace; // used by ContentSubscription OrderKey key() const { return data->order_key; } - NewExecutionReportEvent(const ExecutionReport *dt, PerfTrace const &trace) + NewExecutionReportEvent(const ExecutionReport *dt, trace::CorID const &trace) : data(dt), trace(trace){}; }; diff --git a/src/lib/orderman/events/OrderStateUpdateEvent.h b/src/lib/orderman/events/OrderStateUpdateEvent.h index 5e888040c..1083866ba 100644 --- a/src/lib/orderman/events/OrderStateUpdateEvent.h +++ b/src/lib/orderman/events/OrderStateUpdateEvent.h @@ -2,9 +2,10 @@ #include "lib/mercury/events/Event.h" #include "lib/orderman/orderman_utils/PerfTrace.h" -#include - #include "lib/api/services/OrderService.pb.h" +#include "lib/tracing/PerfLog.h" + +#include namespace bts { namespace orderman { @@ -15,7 +16,7 @@ class OrderStateUpdateEvent : public mercury::Event { OrderStateUpdateEvent(OrderKey key, OrderKey parent_key, api::orderman::OrderDefinition const &def, api::orderman::OrderState const &state, - PerfTrace const &trace = PerfTrace()) + trace::CorID const &trace = trace::CorID()) : key(key), parent_key(parent_key), trace(trace), definition(&def) { status = state.status(); @@ -51,7 +52,7 @@ class OrderStateUpdateEvent : public mercury::Event { double avg_price; std::string last_msg; - PerfTrace trace; + trace::CorID trace; api::orderman::OrderState::CustomCase custom; // native order state diff --git a/src/lib/orderman/events/OutFIXMsgEvent.h b/src/lib/orderman/events/OutFIXMsgEvent.h deleted file mode 100644 index 5b0556fba..000000000 --- a/src/lib/orderman/events/OutFIXMsgEvent.h +++ /dev/null @@ -1,32 +0,0 @@ -#pragma once -#include "lib/jetfix/common/OutFIXPtr.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/mercury/events/Event.h" -#include "lib/mercury/synopsis/CacheAll.h" - - -namespace bts { -namespace orderman { - -class OutFIXMsgEvent : public mercury::Event { -public: - using Tag = GatewayName; - - // there is no need to store synopsis for this event because no one - // should be sending fix events (OutFIXMsgEvent) until they receive - // an event from the FIX gateway regarding the status of the FIX - // connection. Receipt of this connection event guarantees to - // potential publishers of OutFIXMsgEvent that the gateway is - // already subscribed to OutFIXMsgEvent and so no events will be - // missed. - using SynopsisPolicy = mercury::NoSynopsis; - - OutFIXMsgEvent (jetfix::OutFIXPtr const&fix,std::vector const&traces) : - msg(fix),trace(traces[0]) - {} - - jetfix::OutFIXPtr msg; - PerfTrace trace; -}; - -}} diff --git a/src/lib/orderman/events/UpdateOrderEvent.h b/src/lib/orderman/events/UpdateOrderEvent.h index 80c0f3c54..c514c9649 100644 --- a/src/lib/orderman/events/UpdateOrderEvent.h +++ b/src/lib/orderman/events/UpdateOrderEvent.h @@ -4,6 +4,7 @@ #include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/mercury/events/Event.h" +#include "lib/tracing/PerfLog.h" namespace bts { namespace orderman { @@ -17,7 +18,7 @@ public: k(k), price(p), quantity(q), trace() {} - UpdateOrderEvent (OrderKey k, Price p, Quantity q,PerfTrace const&trace) : + UpdateOrderEvent (OrderKey k, Price p, Quantity q,trace::CorID const&trace) : k(k), price(p), quantity(q), trace(trace) {} @@ -27,7 +28,7 @@ public: OrderKey k; Price price; Quantity quantity; - PerfTrace trace; + trace::CorID trace; }; }} diff --git a/src/lib/orderman/limiter/LimitStore.cpp b/src/lib/orderman/limiter/LimitStore.cpp index ae8395f9f..e25807d7c 100644 --- a/src/lib/orderman/limiter/LimitStore.cpp +++ b/src/lib/orderman/limiter/LimitStore.cpp @@ -1,77 +1,91 @@ #include "LimitStore.h" -namespace bts{ -namespace orderman{ +namespace bts { +namespace orderman { -LimitStore::LimitStore(const bts::api::admin::AdminData& admin_data, - const std::map& sec_map) -: -_admin_data (bts::admin::AdminServiceUtils::sort_limits(admin_data)), -_account_map(bts::admin::AdminServiceUtils::accounts_map(_admin_data)) -{ - for(auto it=sec_map.begin(); it!=sec_map.end(); it++){ - const api::Security& security = *(it->second); +LimitStore::LimitStore(const bts::api::admin::AdminData &admin_data, + const std::map &sec_map) + : _admin_data(bts::admin::AdminServiceUtils::sort_limits(admin_data)), + _account_map(bts::admin::AdminServiceUtils::accounts_map(_admin_data)) { + for (auto it = sec_map.begin(); it != sec_map.end(); it++) { + const api::Security &security = *(it->second); _add_product_entry(security, _admin_data); - } - for(auto it=sec_map.begin(); it!=sec_map.end(); it++){ + } + for (auto it = sec_map.begin(); it != sec_map.end(); it++) { // pos limit - const api::Security& security = *(it->second); - ProductLimitTree* product_tree_ptr = _find_product_for_security (security); - bts_assert(product_tree_ptr!=nullptr); - _sec_map.insert(std::pair(security.id(),SecurityLimitTree(security, *product_tree_ptr, _admin_data, _zero_security_limit))); + const api::Security &security = *(it->second); + ProductLimitTree *product_tree_ptr = _find_product_for_security(security); + bts_assert(product_tree_ptr != nullptr); + _sec_map.insert(std::pair( + security.id(), SecurityLimitTree(security, *product_tree_ptr, + _admin_data, _zero_security_limit))); } _set_user_data(); } -void LimitStore::copy_positions_from(LimitStore& source){ +void LimitStore::copy_positions_from(LimitStore &source) { // copy securities - for (auto it=_sec_map.begin(); it!=_sec_map.end(); it++){ - SecurityLimitTree* source_security_limit_tree = source._find_security(it->first); - if(source_security_limit_tree != nullptr) + for (auto it = _sec_map.begin(); it != _sec_map.end(); it++) { + SecurityLimitTree *source_security_limit_tree = + source._find_security(it->first); + if (source_security_limit_tree != nullptr) it->second.copy_positions_from(*source_security_limit_tree); } } -void LimitStore::_add_product_entry(const api::Security& security, - const bts::api::admin::AdminData& admin_data){ - ProductLimitTree* product_tree_ptr = _find_product_for_security(security); - if (product_tree_ptr==nullptr){ +void LimitStore::_add_product_entry( + const api::Security &security, + const bts::api::admin::AdminData &admin_data) { + ProductLimitTree *product_tree_ptr = _find_product_for_security(security); + if (product_tree_ptr == nullptr) { api::Product product; - product.set_exchange(security.exchange()); product.set_type(bts::admin::AdminServiceUtils::security_type(security)); product.set_symbol(security.symbol()); - _prod_map.emplace_back(product, admin_data, _zero_product_limit); + product.set_exchange(security.exchange()); + product.set_type(bts::admin::AdminServiceUtils::security_type(security)); + product.set_symbol(security.symbol()); + _prod_map.emplace_back(product, admin_data, _zero_product_limit); } } -void LimitStore::_set_user_data (){ - for(const auto& user : _admin_data.users()){ - if (user.is_present()){ +void LimitStore::_set_user_data() { + for (const auto &user : _admin_data.users()) { + if (user.is_present()) { UserData user_data; user_data.user = &user; - bts::admin::AdminServiceUtils::find_user_trading_accounts(_admin_data, user.id(), user_data.accounts); - _user_data_map.insert(std::pair(user.id(), user_data)); + bts::admin::AdminServiceUtils::find_user_trading_accounts( + _admin_data, user.id(), user_data.accounts); + _user_data_map.insert( + std::pair(user.id(), user_data)); } - } -} -ProductLimitTree* LimitStore::_find_product_for_security(const api::Security& security){ - api::Product product; - product.set_exchange(security.exchange()); product.set_type(bts::admin::AdminServiceUtils::security_type(security)); product.set_symbol(security.symbol()); - return _find_product(product); } -ProductLimitTree* LimitStore::_find_product(const api::Product& product){ - for(ProductLimitTree& plt : _prod_map) - if(product.exchange() == plt.product().exchange() && product.type() == plt.product().type() && product.symbol() == plt.product().symbol()) +} +ProductLimitTree * +LimitStore::_find_product_for_security(const api::Security &security) { + api::Product product; + product.set_exchange(security.exchange()); + product.set_type(bts::admin::AdminServiceUtils::security_type(security)); + product.set_symbol(security.symbol()); + return _find_product(product); +} +ProductLimitTree *LimitStore::_find_product(const api::Product &product) { + for (ProductLimitTree &plt : _prod_map) + if (product.exchange() == plt.product().exchange() && + product.type() == plt.product().type() && + product.symbol() == plt.product().symbol()) return &plt; return nullptr; } -const SecurityLimitNode* LimitStore::test_only_func_find_security_node(AccountID account_id, - uint32_t security_id){ - const SecurityLimitTree* sec_data = _find_security(security_id); - if(sec_data != nullptr) +const SecurityLimitNode * +LimitStore::test_only_func_find_security_node(AccountID account_id, + uint32_t security_id) { + const SecurityLimitTree *sec_data = _find_security(security_id); + if (sec_data != nullptr) return sec_data->find_account(account_id.value()); return nullptr; } -const ProductLimitNode* LimitStore::test_only_func_find_product_node(AccountID account_id, - const api::Product& product){ - ProductLimitTree* prod_data = _find_product(product); - if(prod_data != nullptr) +const ProductLimitNode * +LimitStore::test_only_func_find_product_node(AccountID account_id, + const api::Product &product) { + ProductLimitTree *prod_data = _find_product(product); + if (prod_data != nullptr) return prod_data->find_account(account_id.value()); return nullptr; } -}} \ No newline at end of file +} // namespace orderman +} // namespace bts \ No newline at end of file diff --git a/src/lib/orderman/limiter/Limiter.cpp b/src/lib/orderman/limiter/Limiter.cpp index 713672a5d..bfa21a12c 100644 --- a/src/lib/orderman/limiter/Limiter.cpp +++ b/src/lib/orderman/limiter/Limiter.cpp @@ -1,144 +1,131 @@ #include "Limiter.h" #include "LimitStore.h" -#include "lib/domain_model/Security.pb.h" #include "lib/api/services/AdminService.server.pb.h" +#include "lib/domain_model/Security.pb.h" namespace bts { namespace orderman { struct Limiter::PImpl { - std::map sec_map; + std::map sec_map; std::unique_ptr limit_store; PImpl() - : - sec_map(), - limit_store(std::make_unique(bts::api::admin::AdminData(), - sec_map)) - { - } + : sec_map(), limit_store(std::make_unique( + bts::api::admin::AdminData(), sec_map)) {} }; Limiter::Limiter() : me(new PImpl()) {} Limiter::~Limiter() {} -void Limiter::update(api::admin::AdminData const& admin_data) { +void Limiter::update(api::admin::AdminData const &admin_data) { LOG(OrderMan, Info, "Limiter::update"); _reset(admin_data); } -void Limiter::add_securities(std::vector const& new_securities){ +void Limiter::add_securities( + std::vector const &new_securities) { LOG(OrderMan, Info, "Limiter::add_securities {} securities", - me->sec_map.size()); - for(const api::Security* s : new_securities) + me->sec_map.size()); + for (const api::Security *s : new_securities) _add_security(s); _reset(me->limit_store->admin_data()); } -void Limiter::add_security(api::Security const & security) { +void Limiter::add_security(api::Security const &security) { _add_security(&security); _reset(me->limit_store->admin_data()); } -void Limiter::add(api::Security const &security, - AccountID account_id, - api::Side side, - Quantity quantity){ +void Limiter::add(api::Security const &security, AccountID account_id, + api::Side side, Quantity quantity) { if (!_contains_security(&security)) add_security(security); - if (!me->limit_store->has_account(account_id)){ + if (!me->limit_store->has_account(account_id)) { // add a temporary account, so trades can go in there _add_account_and_reset(account_id); } me->limit_store->add_position(security, account_id, side, quantity); } -void Limiter::remove(api::Security const &security, - AccountID account_id, - api::Side side, - Quantity quantity) { +void Limiter::remove(api::Security const &security, AccountID account_id, + api::Side side, Quantity quantity) { if (!_contains_security(&security)) add_security(security); - if (!me->limit_store->has_account(account_id)){ + if (!me->limit_store->has_account(account_id)) { _add_account_and_reset(account_id); } me->limit_store->remove_position(security, account_id, side, quantity); } -void Limiter::add(const api::Security& security, - const std::string& account_name, - api::Side side, - Quantity quantity){ - const auto* acct_ptr= - bts::admin::AdminServiceUtils::find_account(me->limit_store->admin_data(), - account_name); - if(acct_ptr==nullptr) +void Limiter::add(const api::Security &security, + const std::string &account_name, api::Side side, + Quantity quantity) { + const auto *acct_ptr = bts::admin::AdminServiceUtils::find_account( + me->limit_store->admin_data(), account_name); + if (acct_ptr == nullptr) LOG(OrderMan, Error, "Limiter::add can not find account:{}", - account_name); + account_name); else - add(security,AccountID(acct_ptr->id()),side,quantity); + add(security, AccountID(acct_ptr->id()), side, quantity); } -void Limiter::remove(const api::Security& security, - const std::string& account_name, - api::Side side, - Quantity quantity){ - const auto* acct_ptr= - bts::admin::AdminServiceUtils::find_account(me->limit_store->admin_data(), - account_name); - if(acct_ptr==nullptr) +void Limiter::remove(const api::Security &security, + const std::string &account_name, api::Side side, + Quantity quantity) { + const auto *acct_ptr = bts::admin::AdminServiceUtils::find_account( + me->limit_store->admin_data(), account_name); + if (acct_ptr == nullptr) LOG(OrderMan, Error, "Limiter::remove can not find account:{}", - account_name); + account_name); else - remove(security,AccountID(acct_ptr->id()),side,quantity); + remove(security, AccountID(acct_ptr->id()), side, quantity); } Limiter::LimiterQueryResult Limiter::can_trade(UserID user_id, AccountID account_id) const { LimiterQueryResult rv = me->limit_store->can_trade(user_id, account_id); return rv; } -Limiter::LimiterQueryResult Limiter::can_send_new_order(AccountID account_id, - api::Security const & security, - api::Side side, - Quantity quantity) const { - LimiterQueryResult rv = me->limit_store->can_send_new_order(account_id, - security, - side, - quantity); - //rv.ok = true; +Limiter::LimiterQueryResult +Limiter::can_send_new_order(AccountID account_id, api::Security const &security, + api::Side side, Quantity quantity) const { + LimiterQueryResult rv = me->limit_store->can_send_new_order( + account_id, security, side, quantity); + // rv.ok = true; return rv; } -Limiter::LimiterQueryResult Limiter::can_update_order(AccountID account_id, - api::Security const & security, - api::Side side, - Quantity from, - Quantity to) const { +Limiter::LimiterQueryResult +Limiter::can_update_order(AccountID account_id, api::Security const &security, + api::Side side, Quantity from, Quantity to) const { LimiterQueryResult rv; - if (from == to) - rv.ok = true ; - else - rv = me->limit_store->can_update_order(account_id, security, side, from, to); + if (from == to) + rv.ok = true; + else + rv = me->limit_store->can_update_order(account_id, security, side, from, + to); return rv; } -void Limiter::_add_account_and_reset(AccountID account_id){ - bts::api::admin::AdminData admin_data_catchup = me->limit_store->admin_data(); - bts::api::admin::BTSAccount* new_account = admin_data_catchup.mutable_accounts()->Add(); +void Limiter::_add_account_and_reset(AccountID account_id) { + bts::api::admin::AdminData admin_data_catchup = + me->limit_store->admin_data(); + bts::api::admin::BTSAccount *new_account = + admin_data_catchup.mutable_accounts()->Add(); new_account->set_id(account_id.value()); new_account->set_is_active(true); update(admin_data_catchup); } -void Limiter::_reset (const bts::api::admin::AdminData& admin_data){ - LimitStore* new_store = new LimitStore(admin_data, me->sec_map); +void Limiter::_reset(const bts::api::admin::AdminData &admin_data) { + LimitStore *new_store = new LimitStore(admin_data, me->sec_map); new_store->copy_positions_from(*me->limit_store); me->limit_store.reset(new_store); } -void Limiter::_add_security (const api::Security* sec){ - if (!_contains_security(sec)){ - me->sec_map.insert(std::pair(sec->id(), sec)); +void Limiter::_add_security(const api::Security *sec) { + if (!_contains_security(sec)) { + me->sec_map.insert( + std::pair(sec->id(), sec)); if (sec->has_spread()) - for(const auto& leg : sec->spread().legs()) + for (const auto &leg : sec->spread().legs()) _add_security(&leg.security()); } } -bool Limiter::_contains_security (const api::Security* security){ +bool Limiter::_contains_security(const api::Security *security) { return me->sec_map.find(security->id()) != me->sec_map.end(); } -LimitStore& Limiter::limit_store(){ - return *me->limit_store; -} -}} +LimitStore &Limiter::limit_store() { return *me->limit_store; } +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/limiter/ProductLimitNode.cpp b/src/lib/orderman/limiter/ProductLimitNode.cpp index a6ee36784..5e78bed62 100644 --- a/src/lib/orderman/limiter/ProductLimitNode.cpp +++ b/src/lib/orderman/limiter/ProductLimitNode.cpp @@ -1,21 +1,18 @@ #include "ProductLimitNode.h" -namespace bts{ -namespace orderman{ - -ProductLimitNode::ProductLimitNode(uint32_t account_id, - uint32_t, // parent_account_id, - const bts::api::admin::AccountProductPositionLimitUnit& limit, - bool enforce_net) - : - _account_id(account_id), - //_parent_account_id(parent_account_id), - _limit(limit), - _enforce_net(enforce_net), - _long_pos_limit (limit.long_position_limit()), - _short_pos_limit (limit.short_position_limit()), - _long_pos(0), - _short_pos(0) - {} -}} +namespace bts { +namespace orderman { +ProductLimitNode::ProductLimitNode( + uint32_t account_id, + uint32_t, // parent_account_id, + const bts::api::admin::AccountProductPositionLimitUnit &limit, + bool enforce_net) + : _account_id(account_id), + //_parent_account_id(parent_account_id), + _limit(limit), _enforce_net(enforce_net), + _long_pos_limit(limit.long_position_limit()), + _short_pos_limit(limit.short_position_limit()), _long_pos(0), + _short_pos(0) {} +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/limiter/ProductLimitTree.cpp b/src/lib/orderman/limiter/ProductLimitTree.cpp index bab765af6..1df2aa4ea 100644 --- a/src/lib/orderman/limiter/ProductLimitTree.cpp +++ b/src/lib/orderman/limiter/ProductLimitTree.cpp @@ -1,23 +1,27 @@ #include "ProductLimitTree.h" -namespace bts{ -namespace orderman{ +namespace bts { +namespace orderman { -ProductLimitTree::ProductLimitTree(const api::Product& product, - const bts::api::admin::AdminData& admin_data, - const bts::api::admin::AccountProductPositionLimitUnit& zero_limit) -: -_product (product) -{ - for(const auto& account : admin_data.accounts()){ - bool enforce_net=true; // default is net - if(account.has_risk_limit_enforcement()) - enforce_net=account.risk_limit_enforcement().product_limit_in_net_terms(); - const bts::api::admin::AccountProductPositionLimitUnit* limit = bts::admin::AdminServiceUtils::find_account_product_position_limit(account, _product); - _tree.emplace_back(account.id(), - bts::admin::AdminServiceUtils::has_id(account.parent_account_id()) ? account.parent_account_id() : 0, - limit != nullptr ? *limit : zero_limit, - enforce_net); +ProductLimitTree::ProductLimitTree( + const api::Product &product, const bts::api::admin::AdminData &admin_data, + const bts::api::admin::AccountProductPositionLimitUnit &zero_limit) + : _product(product) { + for (const auto &account : admin_data.accounts()) { + bool enforce_net = true; // default is net + if (account.has_risk_limit_enforcement()) + enforce_net = + account.risk_limit_enforcement().product_limit_in_net_terms(); + const bts::api::admin::AccountProductPositionLimitUnit *limit = + bts::admin::AdminServiceUtils::find_account_product_position_limit( + account, _product); + _tree.emplace_back( + account.id(), + bts::admin::AdminServiceUtils::has_id(account.parent_account_id()) + ? account.parent_account_id() + : 0, + limit != nullptr ? *limit : zero_limit, enforce_net); } } -}} \ No newline at end of file +} // namespace orderman +} // namespace bts \ No newline at end of file diff --git a/src/lib/orderman/limiter/SecurityLimitNode.cpp b/src/lib/orderman/limiter/SecurityLimitNode.cpp index bc7e12298..9fbb209b0 100644 --- a/src/lib/orderman/limiter/SecurityLimitNode.cpp +++ b/src/lib/orderman/limiter/SecurityLimitNode.cpp @@ -3,22 +3,18 @@ namespace bts { namespace orderman { -SecurityLimitNode::SecurityLimitNode(uint32_t account_id, - uint32_t, // parent_account_id, - const bts::api::admin::AccountSecurityPositionLimitUnit& limit, - bool apply_sec_position_limits, - ProductLimitNode& product_node, - uint32_t clip_size) - : - _account_id(account_id), - //_parent_account_id(parent_account_id), - _limit(limit), - _long_pos_limit (limit.long_position_limit()), - _short_pos_limit (-1 * limit.short_position_limit()), - _apply_sec_position_limits (apply_sec_position_limits), - _product_node(product_node), - _clip_size(clip_size), - _net_pos(0) -{} +SecurityLimitNode::SecurityLimitNode( + uint32_t account_id, + uint32_t, // parent_account_id, + const bts::api::admin::AccountSecurityPositionLimitUnit &limit, + bool apply_sec_position_limits, ProductLimitNode &product_node, + uint32_t clip_size) + : _account_id(account_id), + //_parent_account_id(parent_account_id), + _limit(limit), _long_pos_limit(limit.long_position_limit()), + _short_pos_limit(-1 * limit.short_position_limit()), + _apply_sec_position_limits(apply_sec_position_limits), + _product_node(product_node), _clip_size(clip_size), _net_pos(0) {} -}} +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/limiter/SecurityLimitTree.cpp b/src/lib/orderman/limiter/SecurityLimitTree.cpp index 68c4cbd9d..a0a150961 100644 --- a/src/lib/orderman/limiter/SecurityLimitTree.cpp +++ b/src/lib/orderman/limiter/SecurityLimitTree.cpp @@ -1,20 +1,30 @@ #include "lib/orderman/limiter/SecurityLimitTree.h" -namespace bts{ -namespace orderman{ +namespace bts { +namespace orderman { -SecurityLimitTree::SecurityLimitTree(const api::Security& security, - ProductLimitTree& product_tree, - const bts::api::admin::AdminData& admin_data, - const bts::api::admin::AccountSecurityPositionLimitUnit& zero_limit) -{ - for(const auto& account : admin_data.accounts()){ - ProductLimitNode* product_node_ptr = product_tree.find_account(account.id()); +SecurityLimitTree::SecurityLimitTree( + const api::Security &security, ProductLimitTree &product_tree, + const bts::api::admin::AdminData &admin_data, + const bts::api::admin::AccountSecurityPositionLimitUnit &zero_limit) { + for (const auto &account : admin_data.accounts()) { + ProductLimitNode *product_node_ptr = + product_tree.find_account(account.id()); bts_assert(product_node_ptr != nullptr); - const bts::api::admin::AccountSecurityPositionLimitUnit* limit = bts::admin::AdminServiceUtils::find_account_security_position_limit(account, security); - uint32_t clip_size = bts::admin::AdminServiceUtils::find_account_security_clip_size(account, security); - _tree.emplace_back(account.id(), bts::admin::AdminServiceUtils::has_id(account.parent_account_id()) ? account.parent_account_id() : 0, - limit != nullptr ? *limit : zero_limit, limit != nullptr, *product_node_ptr, clip_size); + const bts::api::admin::AccountSecurityPositionLimitUnit *limit = + bts::admin::AdminServiceUtils::find_account_security_position_limit( + account, security); + uint32_t clip_size = + bts::admin::AdminServiceUtils::find_account_security_clip_size( + account, security); + _tree.emplace_back( + account.id(), + bts::admin::AdminServiceUtils::has_id(account.parent_account_id()) + ? account.parent_account_id() + : 0, + limit != nullptr ? *limit : zero_limit, limit != nullptr, + *product_node_ptr, clip_size); } } -}} +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/limiter/tests/limit_tests.cpp b/src/lib/orderman/limiter/tests/limit_tests.cpp index 394265d3f..a6b89a7f2 100644 --- a/src/lib/orderman/limiter/tests/limit_tests.cpp +++ b/src/lib/orderman/limiter/tests/limit_tests.cpp @@ -1,63 +1,71 @@ #include "catch/catch.hpp" -#include +#include "lib/api/service_helpers/AdminServiceUtils.h" +#include "lib/api/services/AdminService.server.pb.h" +#include "lib/config/config.h" +#include "lib/domain_model/Security.h" #include "lib/orderman/limiter/LimitStore.h" #include "lib/orderman/limiter/Limiter.h" -#include "lib/api/services/AdminService.server.pb.h" -#include "lib/api/service_helpers/AdminServiceUtils.h" -#include "lib/domain_model/Security.h" #include "lib/utils/bts_chrono.h" #include "lib/utils/helper_macros.h" -#include "lib/config/config.h" +#include -namespace bts{ -namespace orderman{ +namespace bts { +namespace orderman { -void add_account_prod_pos_limit(bts::api::admin::AdminData& admin_data, - const std::string& account_name, +void add_account_prod_pos_limit(bts::api::admin::AdminData &admin_data, + const std::string &account_name, api::Venue prod_exchange, api::SecurityType prod_type, - const std::string& prod_symbol, + const std::string &prod_symbol, uint32_t long_pos_limit, - uint32_t short_pos_limit){ - auto account_ptr = bts::admin::AdminServiceUtils::find_account(admin_data, account_name); - REQUIRE(account_ptr!=nullptr); + uint32_t short_pos_limit) { + auto account_ptr = + bts::admin::AdminServiceUtils::find_account(admin_data, account_name); + REQUIRE(account_ptr != nullptr); bts::api::admin::ProductScope prod_scope; prod_scope.set_exchange(prod_exchange); prod_scope.set_security_type(prod_type); - prod_scope.set_security_symbol(prod_symbol); - auto new_prod_pos_limit_ptr = account_ptr->mutable_product_position_limits()->Add(); + prod_scope.set_security_symbol(prod_symbol); + auto new_prod_pos_limit_ptr = + account_ptr->mutable_product_position_limits()->Add(); new_prod_pos_limit_ptr->mutable_product()->CopyFrom(prod_scope); new_prod_pos_limit_ptr->set_long_position_limit(long_pos_limit); new_prod_pos_limit_ptr->set_short_position_limit(short_pos_limit); } -void add_account_security_pos_limit(bts::api::admin::AdminData& admin_data, - const std::string& account_name, +void add_account_security_pos_limit(bts::api::admin::AdminData &admin_data, + const std::string &account_name, api::Venue sec_exchange, api::SecurityType sec_type, - const std::string& sec_symbol, - uint32_t sec_id, //0 for unset + const std::string &sec_symbol, + uint32_t sec_id, // 0 for unset uint32_t long_pos_limit, - uint32_t short_pos_limit){ - auto account_ptr = bts::admin::AdminServiceUtils::find_account(admin_data, account_name); - REQUIRE(account_ptr!=nullptr); + uint32_t short_pos_limit) { + auto account_ptr = + bts::admin::AdminServiceUtils::find_account(admin_data, account_name); + REQUIRE(account_ptr != nullptr); bts::api::admin::SecurityScope sec_scope; sec_scope.set_exchange(sec_exchange); sec_scope.set_security_type(sec_type); sec_scope.set_security_symbol(sec_symbol); - if(sec_id != 0) + if (sec_id != 0) sec_scope.set_security_id(sec_id); - auto new_sec_pos_limit_ptr = account_ptr->mutable_security_position_limits()->Add(); + auto new_sec_pos_limit_ptr = + account_ptr->mutable_security_position_limits()->Add(); new_sec_pos_limit_ptr->mutable_security()->CopyFrom(sec_scope); new_sec_pos_limit_ptr->set_long_position_limit(long_pos_limit); new_sec_pos_limit_ptr->set_short_position_limit(short_pos_limit); } -void add_account_sec_pos_limit(bts::api::admin::BTSAccount& account, - api::Venue exchange, api::SecurityType sec_type, const std::string& sec_symbol, uint32_t sec_id, bool sec_id_set, - uint32_t long_pos_limit, uint32_t short_pos_limit){ +void add_account_sec_pos_limit(bts::api::admin::BTSAccount &account, + api::Venue exchange, api::SecurityType sec_type, + const std::string &sec_symbol, uint32_t sec_id, + bool sec_id_set, uint32_t long_pos_limit, + uint32_t short_pos_limit) { bts::api::admin::SecurityScope scope; - scope.set_exchange(exchange); scope.set_security_type(sec_type); scope.set_security_symbol(sec_symbol); + scope.set_exchange(exchange); + scope.set_security_type(sec_type); + scope.set_security_symbol(sec_symbol); if (sec_id_set) scope.set_security_id(sec_id); auto new_limit = account.add_security_position_limits(); @@ -66,11 +74,14 @@ void add_account_sec_pos_limit(bts::api::admin::BTSAccount& account, new_limit->set_short_position_limit(short_pos_limit); } -void add_account_sec_clip_size(bts::api::admin::BTSAccount& account, - api::Venue exchange, api::SecurityType sec_type, const std::string& sec_symbol, uint32_t sec_id, bool sec_id_set, - uint32_t clip_size){ +void add_account_sec_clip_size(bts::api::admin::BTSAccount &account, + api::Venue exchange, api::SecurityType sec_type, + const std::string &sec_symbol, uint32_t sec_id, + bool sec_id_set, uint32_t clip_size) { bts::api::admin::SecurityScope scope; - scope.set_exchange(exchange); scope.set_security_type(sec_type); scope.set_security_symbol(sec_symbol); + scope.set_exchange(exchange); + scope.set_security_type(sec_type); + scope.set_security_symbol(sec_symbol); if (sec_id_set) scope.set_security_id(sec_id); auto new_limit = account.mutable_security_clip_limits()->add_limit(); @@ -78,69 +89,95 @@ void add_account_sec_clip_size(bts::api::admin::BTSAccount& account, new_limit->set_clip_size(clip_size); } -void fill_future_security (api::Security& sec, - uint32_t key, const std::string& symbol, api::Venue exchange, - uint32_t expiration_year, uint32_t expiration_month, uint32_t expiration_day, - double tick_size) -{ - sec.set_id (key); - sec.set_symbol (symbol); - sec.set_exchange (exchange); +void fill_future_security(api::Security &sec, uint32_t key, + const std::string &symbol, api::Venue exchange, + uint32_t expiration_year, uint32_t expiration_month, + uint32_t expiration_day, double tick_size) { + sec.set_id(key); + sec.set_symbol(symbol); + sec.set_exchange(exchange); api::FutureContract fc; fc.set_expiration_year(expiration_year); fc.set_expiration_month(expiration_month); fc.set_expiration_day(expiration_day); - sec.mutable_future()->MergeFrom (fc); + sec.mutable_future()->MergeFrom(fc); api::ContractSpecification c_spec; - c_spec.set_low_tick (tick_size); - c_spec.set_high_tick (tick_size); - sec.mutable_contract_spec()->MergeFrom (c_spec); + c_spec.set_low_tick(tick_size); + c_spec.set_high_tick(tick_size); + sec.mutable_contract_spec()->MergeFrom(c_spec); } -void verify_security_limit_data(SecurityLimitNode const* acc_sec_state, - uint32_t expected_long_limit, uint32_t expected_short_limit, - int expected_net_pos){ +void verify_security_limit_data(SecurityLimitNode const *acc_sec_state, + uint32_t expected_long_limit, + uint32_t expected_short_limit, + int expected_net_pos) { REQUIRE(acc_sec_state != nullptr); - REQUIRE(acc_sec_state->test_only_func_limit().long_position_limit() == expected_long_limit); - REQUIRE(acc_sec_state->test_only_func_limit().short_position_limit() == expected_short_limit); + REQUIRE(acc_sec_state->test_only_func_limit().long_position_limit() == + expected_long_limit); + REQUIRE(acc_sec_state->test_only_func_limit().short_position_limit() == + expected_short_limit); REQUIRE(acc_sec_state->net_pos() == expected_net_pos); } -void verify_product_limit_data(ProductLimitNode const* acc_prod_state, - uint32_t expected_long_limit, uint32_t expected_short_limit, - int expected_net_pos){ +void verify_product_limit_data(ProductLimitNode const *acc_prod_state, + uint32_t expected_long_limit, + uint32_t expected_short_limit, + int expected_net_pos) { REQUIRE(acc_prod_state != nullptr); - REQUIRE(acc_prod_state->test_only_func_limit().long_position_limit() == expected_long_limit); - REQUIRE(acc_prod_state->test_only_func_limit().short_position_limit() == expected_short_limit); + REQUIRE(acc_prod_state->test_only_func_limit().long_position_limit() == + expected_long_limit); + REQUIRE(acc_prod_state->test_only_func_limit().short_position_limit() == + expected_short_limit); REQUIRE(acc_prod_state->net_pos() == expected_net_pos); } - // (bts::api::admin::BTSAccount& account, -// api::Venue exchange, api::SecurityType sec_type, const std::string& sec_symbol, uint32_t sec_id, bool sec_id_set, -// uint32_t long_pos_limit, uint32_t short_pos_limit){ +// api::Venue exchange, api::SecurityType +// sec_type, const std::string& sec_symbol, +// uint32_t sec_id, bool sec_id_set, uint32_t +// long_pos_limit, uint32_t short_pos_limit){ -TEST_CASE ("Limit Rule Res", "[limiter]"){ +TEST_CASE("Limit Rule Res", "[limiter]") { api::Security sec_1, sec_2, sec_3; - fill_future_security(sec_1, 1000, std::string("ES"), api::Venue::VENUE_GLBX, 2020, 1, 1, 0.25); - fill_future_security(sec_2, 2000, std::string("SI"), api::Venue::VENUE_GLBX, 2021, 1, 1, 0.05); - fill_future_security(sec_3, 3000, std::string("SI"), api::Venue::VENUE_GLBX, 2022, 1, 1, 0.05); + fill_future_security(sec_1, 1000, std::string("ES"), api::Venue::VENUE_GLBX, + 2020, 1, 1, 0.25); + fill_future_security(sec_2, 2000, std::string("SI"), api::Venue::VENUE_GLBX, + 2021, 1, 1, 0.05); + fill_future_security(sec_3, 3000, std::string("SI"), api::Venue::VENUE_GLBX, + 2022, 1, 1, 0.05); // add multiple rules and check sorting bts::api::admin::AdminData admin_data; bts::api::admin::AdminServiceCreateAccountResult result; - bts::admin::AdminServiceUtils::create_account(admin_data, 0, "ACC A1", "desc", true, result); - auto account_ptr = bts::admin::AdminServiceUtils::find_account(admin_data, "ACC A1"); - add_account_sec_pos_limit(*account_ptr, api::Venue::VENUE_GLBX, api::SecurityType::SECURITYTYPE_FUTURE, "*", 0, false, 10, 21); - add_account_sec_pos_limit(*account_ptr, api::Venue::VENUE_GLBX, api::SecurityType::SECURITYTYPE_FUTURE, "ES", 1000, true, 1000, 2001); - add_account_sec_pos_limit(*account_ptr, api::Venue::VENUE_GLBX, api::SecurityType::SECURITYTYPE_FUTURE, "ES", 0, false, 100, 201); + bts::admin::AdminServiceUtils::create_account(admin_data, 0, "ACC A1", + "desc", true, result); + auto account_ptr = + bts::admin::AdminServiceUtils::find_account(admin_data, "ACC A1"); + add_account_sec_pos_limit(*account_ptr, api::Venue::VENUE_GLBX, + api::SecurityType::SECURITYTYPE_FUTURE, "*", 0, + false, 10, 21); + add_account_sec_pos_limit(*account_ptr, api::Venue::VENUE_GLBX, + api::SecurityType::SECURITYTYPE_FUTURE, "ES", 1000, + true, 1000, 2001); + add_account_sec_pos_limit(*account_ptr, api::Venue::VENUE_GLBX, + api::SecurityType::SECURITYTYPE_FUTURE, "ES", 0, + false, 100, 201); // add clip sizes - add_account_sec_clip_size(*account_ptr, api::Venue::VENUE_GLBX, api::SecurityType::SECURITYTYPE_FUTURE, "SI", 0, false, 11); - add_account_sec_clip_size(*account_ptr, api::Venue::VENUE_GLBX, api::SecurityType::SECURITYTYPE_FUTURE, "ES", sec_1.id(), true, 1001); - add_account_sec_clip_size(*account_ptr, api::Venue::VENUE_GLBX, api::SecurityType::SECURITYTYPE_FUTURE, "SI", sec_2.id(), true, 101); + add_account_sec_clip_size(*account_ptr, api::Venue::VENUE_GLBX, + api::SecurityType::SECURITYTYPE_FUTURE, "SI", 0, + false, 11); + add_account_sec_clip_size(*account_ptr, api::Venue::VENUE_GLBX, + api::SecurityType::SECURITYTYPE_FUTURE, "ES", + sec_1.id(), true, 1001); + add_account_sec_clip_size(*account_ptr, api::Venue::VENUE_GLBX, + api::SecurityType::SECURITYTYPE_FUTURE, "SI", + sec_2.id(), true, 101); // validate pos limits went in - REQUIRE(account_ptr->security_position_limits(0).long_position_limit() == 10); - REQUIRE(account_ptr->security_position_limits(1).long_position_limit() == 1000); - REQUIRE(account_ptr->security_position_limits(2).long_position_limit() == 100); + REQUIRE(account_ptr->security_position_limits(0).long_position_limit() == + 10); + REQUIRE(account_ptr->security_position_limits(1).long_position_limit() == + 1000); + REQUIRE(account_ptr->security_position_limits(2).long_position_limit() == + 100); // validate clip sizes went in REQUIRE(account_ptr->security_clip_limits().limit(0).clip_size() == 11); REQUIRE(account_ptr->security_clip_limits().limit(1).clip_size() == 1001); @@ -148,22 +185,36 @@ TEST_CASE ("Limit Rule Res", "[limiter]"){ // sort order bts::admin::AdminServiceUtils::sort_limits(*account_ptr); // validate pos limits order - REQUIRE(account_ptr->security_position_limits(0).long_position_limit() == 1000); - REQUIRE(account_ptr->security_position_limits(1).long_position_limit() == 100); - REQUIRE(account_ptr->security_position_limits(2).long_position_limit() == 10); + REQUIRE(account_ptr->security_position_limits(0).long_position_limit() == + 1000); + REQUIRE(account_ptr->security_position_limits(1).long_position_limit() == + 100); + REQUIRE(account_ptr->security_position_limits(2).long_position_limit() == + 10); // validate clip sizes order REQUIRE(account_ptr->security_clip_limits().limit(2).clip_size() == 11); - // resolve pos - auto sec_1_limit = bts::admin::AdminServiceUtils::find_account_security_position_limit (*account_ptr, sec_1); + // resolve pos + auto sec_1_limit = + bts::admin::AdminServiceUtils::find_account_security_position_limit( + *account_ptr, sec_1); REQUIRE(sec_1_limit->long_position_limit() == 1000); - auto sec_2_limit = bts::admin::AdminServiceUtils::find_account_security_position_limit (*account_ptr, sec_2); + auto sec_2_limit = + bts::admin::AdminServiceUtils::find_account_security_position_limit( + *account_ptr, sec_2); REQUIRE(sec_2_limit->long_position_limit() == 10); // resolve clip sizes - auto sec_1_clip = bts::admin::AdminServiceUtils::find_account_security_clip_size (*account_ptr, sec_1); + auto sec_1_clip = + bts::admin::AdminServiceUtils::find_account_security_clip_size( + *account_ptr, sec_1); REQUIRE(sec_1_clip == 1001); - auto sec_2_clip = bts::admin::AdminServiceUtils::find_account_security_clip_size (*account_ptr, sec_2); + auto sec_2_clip = + bts::admin::AdminServiceUtils::find_account_security_clip_size( + *account_ptr, sec_2); REQUIRE(sec_2_clip == 101); - auto sec_3_clip = bts::admin::AdminServiceUtils::find_account_security_clip_size (*account_ptr, sec_3); + auto sec_3_clip = + bts::admin::AdminServiceUtils::find_account_security_clip_size( + *account_ptr, sec_3); REQUIRE(sec_3_clip == 11); } -}} +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/order_factory/DynamicOrderRegistry.cpp b/src/lib/orderman/order_factory/DynamicOrderRegistry.cpp index 082b8ddab..a2fda91b4 100644 --- a/src/lib/orderman/order_factory/DynamicOrderRegistry.cpp +++ b/src/lib/orderman/order_factory/DynamicOrderRegistry.cpp @@ -40,6 +40,5 @@ DynamicOrderRegistry::get_all_dynamic_order_types() const { return result; } - } // namespace orderman } // namespace bts diff --git a/src/lib/orderman/order_factory/OrderFactory.cpp b/src/lib/orderman/order_factory/OrderFactory.cpp index 1207b7764..a5eb59f90 100644 --- a/src/lib/orderman/order_factory/OrderFactory.cpp +++ b/src/lib/orderman/order_factory/OrderFactory.cpp @@ -17,8 +17,8 @@ #include "lib/orderman/orders/book_algos/CoverOrder.h" #include "lib/orderman/orders/book_algos/JoinOrder.h" #include "lib/orderman/orders/book_algos/LeanOrder.h" -#include "lib/orderman/orders/book_algos/TickOrder.h" #include "lib/orderman/orders/book_algos/OffsetOrder.h" +#include "lib/orderman/orders/book_algos/TickOrder.h" #include "lib/orderman/orders/book_algos/TopOrder.h" #include "lib/orderman/orders/spreader_orders/SpreaderOrder.h" @@ -153,7 +153,7 @@ Order &OrderFactory::allocate(OrderKey k, OrderKey pk, break; case CustomOrderDefinition::kOffset: order_ptr.reset(new orderman::OffsetOrder()); - break; + break; case CustomOrderDefinition::kDynamic: { order_ptr = me->dynamic_order_registry.build( def.custom_def().dynamic().dynamic_order_type()); diff --git a/src/lib/orderman/order_router/OrderRouter.cpp b/src/lib/orderman/order_router/OrderRouter.cpp index a174047d5..24a710c5c 100644 --- a/src/lib/orderman/order_router/OrderRouter.cpp +++ b/src/lib/orderman/order_router/OrderRouter.cpp @@ -66,5 +66,5 @@ bool OrderRouter::is_valid_session(std::string const &session) const { } OrderRouter::~OrderRouter() {} -} -} +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/orderman_utils/EventStream.h b/src/lib/orderman/orderman_utils/EventStream.h index c4a191ab7..481c9791c 100644 --- a/src/lib/orderman/orderman_utils/EventStream.h +++ b/src/lib/orderman/orderman_utils/EventStream.h @@ -13,27 +13,50 @@ struct EventStream using CS = mercury::ContentSubscription; using SubID = typename CS::SubID; - EventStream (CS&cs) : cs (cs) {} + EventStream () : cs (nullptr) {} + EventStream (CS&cs) : cs (&cs) {} + + void init(CS&csub) + { + bts_assert(!cs); + cs = ⫏ + } template SubID sub(typename CS::Key k, CB&&cb) { - auto s = cs.sub(k,std::forward (cb)); + auto s = cs->sub(k,std::forward (cb)); active_subs.push_back(s); return s; } template SubID sub(CB&&cb) { - auto s = cs.sub(std::forward (cb)); + auto s = cs->sub(std::forward (cb)); active_subs.push_back(s); return s; } + EventStream& operator=(EventStream &&src) + { + cs = src.cs; + src.cs = nullptr; + active_subs = src.active_subs; + src.active_subs.clear(); + return *this; + } + + EventStream& operator=(EventStream const &src) + { + cs = src.cs; + active_subs = src.active_subs; + return *this; + } + void unsub(SubID sid) { auto it = std::find(active_subs.begin(), active_subs.end(),sid); if (it != active_subs.end()) { active_subs.erase(it); - cs.unsub(sid); + cs->unsub(sid); } } @@ -46,7 +69,7 @@ struct EventStream } private: - CS &cs; + CS *cs; boost::container::small_vector active_subs; }; diff --git a/src/lib/orderman/orders/DynamicOrder.cpp b/src/lib/orderman/orders/DynamicOrder.cpp index 3326b62e0..df6670c3f 100644 --- a/src/lib/orderman/orders/DynamicOrder.cpp +++ b/src/lib/orderman/orders/DynamicOrder.cpp @@ -49,13 +49,13 @@ void DynamicOrder::on_init_recovered(api::orderman::OrderRecord const &rec, } void DynamicOrder::on_activate(Price, Quantity, OrderServices &services, - PerfTrace const &) { + trace::CorID const &) { services.report_state(me->state); } -void DynamicOrder::on_update(Price, Quantity, PerfTrace const &) {} -void DynamicOrder::on_crack(PerfTrace const &) {} -void DynamicOrder::on_cancel(PerfTrace const &) {} +void DynamicOrder::on_update(Price, Quantity, trace::CorID const &) {} +void DynamicOrder::on_crack(trace::CorID const &) {} +void DynamicOrder::on_cancel(trace::CorID const &) {} } // namespace orderman } // namespace bts diff --git a/src/lib/orderman/orders/DynamicOrder.h b/src/lib/orderman/orders/DynamicOrder.h index 5318649bf..d346b6b5c 100644 --- a/src/lib/orderman/orders/DynamicOrder.h +++ b/src/lib/orderman/orders/DynamicOrder.h @@ -19,10 +19,10 @@ public: const PreActivationOrderServices&) override; void on_init_recovered(api::orderman::OrderRecord const&, const PreActivationOrderServices &) override; - void on_activate(Price,Quantity,OrderServices &, PerfTrace const&) override ; - void on_update(Price , Quantity,PerfTrace const&) override ; - void on_crack(PerfTrace const&) override ; - void on_cancel(PerfTrace const&) override ; + void on_activate(Price,Quantity,OrderServices &, trace::CorID const&) override ; + void on_update(Price , Quantity,trace::CorID const&) override ; + void on_crack(trace::CorID const&) override ; + void on_cancel(trace::CorID const&) override ; private: struct PImpl; diff --git a/src/lib/orderman/orders/IcebergOrder.cpp b/src/lib/orderman/orders/IcebergOrder.cpp index f533f50f3..df72b6911 100644 --- a/src/lib/orderman/orders/IcebergOrder.cpp +++ b/src/lib/orderman/orders/IcebergOrder.cpp @@ -1,11 +1,11 @@ #include "IcebergOrder.h" +#include "lib/config/config.h" +#include "lib/config/protos/orderman_cfg.pb.h" #include "lib/logging/logging.h" #include "lib/mercury/events/TimerEvent.h" #include "lib/orderman/actors/order_manager/OrderBuilder.h" #include "lib/utils/PBUtils.h" #include "lib/utils/bts_chrono.h" -#include "lib/config/config.h" -#include "lib/config/protos/orderman_cfg.pb.h" #include @@ -104,7 +104,7 @@ void IcebergOrder::on_init_recovered(api::orderman::OrderRecord const &rec, } void IcebergOrder::on_activate(Price p, Quantity q, OrderServices &services, - PerfTrace const &) { + trace::CorID const &) { bts_assert(!me->services); me->services = &services; me->child_builder.activate(services); @@ -114,10 +114,10 @@ void IcebergOrder::on_activate(Price p, Quantity q, OrderServices &services, me->state.set_price(p.value()); me->state.set_quantity(q.value()); if (me->pause_between_orders) - services.time_change.sub( + services.subscribe_to_time( [this](auto const &time) { this->on_time(time); }); - services.child_updates.sub( - key(), [this](auto const &os) { this->on_child_order_update(os); }); + services.subscribe_to_child_updates( + [this](auto const &os) { this->on_child_order_update(os); }); transition(ORDER_STATUS_WORKING); me->working_sub_status = WorkingSubStatus::WORKING; send_next_child_order(); @@ -145,7 +145,7 @@ void IcebergOrder::on_activate(Price p, Quantity q, OrderServices &services, report_state(); } -void IcebergOrder::on_update(Price p, Quantity q, PerfTrace const &) { +void IcebergOrder::on_update(Price p, Quantity q, trace::CorID const &) { switch (me->state.status()) { case ORDER_STATUS_WORKING: case ORDER_STATUS_PENDING_WORKING: @@ -171,9 +171,9 @@ void IcebergOrder::on_update(Price p, Quantity q, PerfTrace const &) { report_state(); } -void IcebergOrder::on_crack(PerfTrace const &) {} +void IcebergOrder::on_crack(trace::CorID const &) {} -void IcebergOrder::on_cancel(PerfTrace const &) { +void IcebergOrder::on_cancel(trace::CorID const &) { switch (me->state.status()) { case ORDER_STATUS_WORKING: LOG(OrderMan, Info, "Canceling Iceberg Order {}", key().value()); @@ -255,7 +255,7 @@ void IcebergOrder::send_next_child_order() { key().value(), me->child.order.key().value(), to_send, me->state.price(), me->state.filled_quantity(), me->state.quantity()); - me->child.order.activate(Price(me->state.price()), Quantity(to_send)); + me->child.order.activate(Price(me->state.price()), Quantity(to_send), trace::CorID()); } void IcebergOrder::on_child_order_update(OrderStateUpdateEvent const &ev) { diff --git a/src/lib/orderman/orders/IcebergOrder.h b/src/lib/orderman/orders/IcebergOrder.h index a7442b923..c0b3f8ceb 100644 --- a/src/lib/orderman/orders/IcebergOrder.h +++ b/src/lib/orderman/orders/IcebergOrder.h @@ -20,10 +20,10 @@ public: const PreActivationOrderServices&) override; void on_init_recovered(api::orderman::OrderRecord const&, const PreActivationOrderServices &) override; - void on_activate(Price,Quantity,OrderServices &, PerfTrace const&) override ; - void on_update(Price , Quantity,PerfTrace const&) override ; - void on_crack(PerfTrace const&) override ; - void on_cancel(PerfTrace const&) override ; + void on_activate(Price,Quantity,OrderServices &, trace::CorID const&) override ; + void on_update(Price , Quantity,trace::CorID const&) override ; + void on_crack(trace::CorID const&) override ; + void on_cancel(trace::CorID const&) override ; private: void report_state(); diff --git a/src/lib/orderman/orders/NativeOrder.cpp b/src/lib/orderman/orders/NativeOrder.cpp index 8d8ab3757..33b89aadd 100644 --- a/src/lib/orderman/orders/NativeOrder.cpp +++ b/src/lib/orderman/orders/NativeOrder.cpp @@ -30,7 +30,7 @@ struct NativeOrder::PImpl { PImpl() : services(nullptr), session_services(), sec(nullptr), previous_position_contribution(0), definition(), state(), - price_encoding_precision(7),have_exchange_order_id(false) {} + price_encoding_precision(7), have_exchange_order_id(false) {} OrderServices *services; SessionServices *session_services; @@ -42,7 +42,7 @@ struct NativeOrder::PImpl { OrderState state; int price_encoding_precision; bool have_exchange_order_id; - + jetfix::FIXFragment update_encoding; jetfix::FIXFragment::Bookmark update_price_bm; jetfix::FIXFragment::Bookmark update_quantity_bm; @@ -274,14 +274,9 @@ NativeOrder::~NativeOrder() {} void NativeOrder::on_activate(Price p, Quantity q, bts::orderman::OrderServices &services, - PerfTrace const &t) { - LOG(Latency,Info, "on_activate start {}", key().value()); - - auto trace = t; - trace.order_key = key().value(); - trace.order_update = utils::TimeStamp::now(); + trace::CorID const &trace) { + services.log(trace,"on_activate_start",key().value()); - tracepoint(bts_trace, trace_order, (char *)"on_activate", 0, trace.md_sn, key().value()); bts_assert(!me->services); me->services = &services; @@ -358,11 +353,11 @@ void NativeOrder::on_activate(Price p, Quantity q, // if we are here we are good. // subscribe to usefull events - me->session_services->exe_reports.sub( + me->session_services->subscribe_to_exe_report( key(), [this](auto const &r) { this->on_exe_report(r); }); - me->session_services->cancel_rejects.sub( + me->session_services->subscribe_to_cancel_reject( key(), [this](auto const &cr) { this->on_cancel_reject(cr); }); - me->session_services->gateway_status.sub( + me->session_services->subscribe_to_gateway_status( [this](auto const &gw) { this->on_gateway_status(gw); }); // send out order @@ -389,14 +384,13 @@ void NativeOrder::on_activate(Price p, Quantity q, auto const &ts = services.get_time_str(); me->create_transact_time_bm = encoding.overwrite( me->create_transact_time_bm, &ts.value()[0], ts.value().size()); - trace.send_fix_buffer = utils::TimeStamp::now(); + services.log(trace,"send_fix_buffer",key().value()); me->session_services->queue_fix(jetfix::MessageTypes::NewOrderSingle, me->create_encoding, trace); me->session_services->governor().record_sent(); me->state.set_status(ORDER_STATUS_PENDING_WORKING); - LOG(Latency,Diag, "on_activate done fix {} t: {}us", key().value(), - (utils::TimeStamp::now() - trace.order_update).microseconds()); + services.log(trace,"on_activate_done",key().value()); LOG(OrderMan, Info, "Sent new order with key {} to gateway", key().value()); // early return so we skip the expensive report_state() call @@ -407,11 +401,11 @@ void NativeOrder::on_activate(Price p, Quantity q, case ORDER_STATUS_WORKING: me->session_services = &me->services->get_session_services( get_native_state(me->state).routing_record().session()); - me->session_services->exe_reports.sub( + me->session_services->subscribe_to_exe_report( key(), [this](auto const &r) { this->on_exe_report(r); }); - me->session_services->cancel_rejects.sub( + me->session_services->subscribe_to_cancel_reject( key(), [this](auto const &cr) { this->on_cancel_reject(cr); }); - me->session_services->gateway_status.sub( + me->session_services->subscribe_to_gateway_status( [this](auto const &gw) { this->on_gateway_status(gw); }); if (!me->session_services->is_gateway_connected()) @@ -421,11 +415,11 @@ void NativeOrder::on_activate(Price p, Quantity q, case ORDER_STATUS_DISCONNECTED: me->session_services = &me->services->get_session_services( get_native_state(me->state).routing_record().session()); - me->session_services->exe_reports.sub( + me->session_services->subscribe_to_exe_report( key(), [this](auto const &r) { this->on_exe_report(r); }); - me->session_services->cancel_rejects.sub( + me->session_services->subscribe_to_cancel_reject( key(), [this](auto const &cr) { this->on_cancel_reject(cr); }); - me->session_services->gateway_status.sub( + me->session_services->subscribe_to_gateway_status( [this](auto const &gw) { this->on_gateway_status(gw); }); if (me->session_services->is_gateway_connected()) @@ -435,11 +429,11 @@ void NativeOrder::on_activate(Price p, Quantity q, case ORDER_STATUS_PENDING_WORKING: me->session_services = &me->services->get_session_services( get_native_state(me->state).routing_record().session()); - me->session_services->exe_reports.sub( + me->session_services->subscribe_to_exe_report( key(), [this](auto const &r) { this->on_exe_report(r); }); - me->session_services->cancel_rejects.sub( + me->session_services->subscribe_to_cancel_reject( key(), [this](auto const &cr) { this->on_cancel_reject(cr); }); - me->session_services->gateway_status.sub( + me->session_services->subscribe_to_gateway_status( [this](auto const &gw) { this->on_gateway_status(gw); }); break; @@ -457,12 +451,9 @@ void NativeOrder::on_activate(Price p, Quantity q, report_state(); } -void NativeOrder::on_update(Price p, Quantity q, PerfTrace const &t) { - auto trace = t; - trace.order_update = utils::TimeStamp::now(); - trace.order_key = key().value(); - tracepoint(bts_trace, trace_order, (char *)"on_update.begin", 0, trace.md_sn, - trace.order_key); +void NativeOrder::on_update(Price p, Quantity q, trace::CorID const &trace) { + + me->services->log(trace,"order_update",key().value()); switch (me->state.status()) { @@ -514,9 +505,6 @@ void NativeOrder::on_update(Price p, Quantity q, PerfTrace const &t) { break; } - tracepoint(bts_trace, trace_order, (char *)"on_update.after_limits", 0, - trace.md_sn, trace.order_key); - // all good auto &encoding = me->update_encoding; me->update_price_bm = encoding.overwrite( @@ -526,9 +514,6 @@ void NativeOrder::on_update(Price p, Quantity q, PerfTrace const &t) { me->update_quantity_bm = encoding.overwrite(me->update_quantity_bm, q.value(), quantity_sz()); - tracepoint(bts_trace, trace_order, (char *)"on_update.half_way", 0, - trace.md_sn, trace.order_key); - auto const &ts = me->services->get_time_str(); me->update_transact_time_bm = encoding.overwrite( me->update_transact_time_bm, &ts.value()[0], ts.value().size()); @@ -563,9 +548,9 @@ void NativeOrder::on_update(Price p, Quantity q, PerfTrace const &t) { report_state(); } -void NativeOrder::on_crack(PerfTrace const &) {} +void NativeOrder::on_crack(trace::CorID const &) {} -void NativeOrder::on_cancel(PerfTrace const &trace) { +void NativeOrder::on_cancel(trace::CorID const &trace) { switch (me->state.status()) { case ORDER_STATUS_WORKING: { @@ -817,7 +802,7 @@ void NativeOrder::update_working_position() { key().value(), me->definition.security_key()); } -void NativeOrder::report_state(PerfTrace const &trace) { +void NativeOrder::report_state(trace::CorID const &trace) { update_working_position(); me->services->report_state(me->state, trace); } diff --git a/src/lib/orderman/orders/NativeOrder.h b/src/lib/orderman/orders/NativeOrder.h index d1b52279c..88c040a58 100644 --- a/src/lib/orderman/orders/NativeOrder.h +++ b/src/lib/orderman/orders/NativeOrder.h @@ -3,7 +3,7 @@ #include #include "lib/orderman/orders/Order.h" #include "lib/api/services/OrderService.pb.h" -#include "lib/orderman/orderman_utils/PerfTrace.h" +#include "lib/tracing/PerfLog.h" namespace bts { namespace orderman { @@ -24,10 +24,10 @@ public: const PreActivationOrderServices&) override; void on_init_recovered(api::orderman::OrderRecord const&, const PreActivationOrderServices &) override; - void on_activate(Price,Quantity,OrderServices &, PerfTrace const&) override ; - void on_update(Price , Quantity,PerfTrace const&) override ; - void on_crack(PerfTrace const&) override ; - void on_cancel(PerfTrace const&) override ; + void on_activate(Price,Quantity,OrderServices &, trace::CorID const&) override ; + void on_update(Price , Quantity,trace::CorID const&) override ; + void on_crack(trace::CorID const&) override ; + void on_cancel(trace::CorID const&) override ; void on_init_from_exe_report(ExecutionReport const&,const PreActivationOrderServices &); private: @@ -36,7 +36,7 @@ private: void on_exe_report(const NewExecutionReportEvent &); void on_cancel_reject(const CancelRejectEvent&); void on_gateway_status(const GatewayStatusChangeEvent&); - void report_state(PerfTrace const&trace = PerfTrace()); + void report_state(trace::CorID const&trace = trace::CorID()); void init_fix(); void add_exchange_order_id_to_fix(); diff --git a/src/lib/orderman/orders/Order.cpp b/src/lib/orderman/orders/Order.cpp index f1f58725d..a25ba3779 100644 --- a/src/lib/orderman/orders/Order.cpp +++ b/src/lib/orderman/orders/Order.cpp @@ -1,8 +1,25 @@ #include "Order.h" +#include "lib/orderman/actors/order_manager/OrderServices.h" namespace bts { namespace orderman { +Order::Order() +{ + _services = std::make_unique(*this); +} + +void Order::init_order_services(OrderServicesData &osd) +{ + _services->init(osd); +} + +void Order::init_order_services(OrderServicesData &osd,OrderServices &parent) +{ + _services->init(osd,parent); +} + Order::~Order() {} -}} +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/orders/Order.h b/src/lib/orderman/orders/Order.h index ee56707d1..eebcea1bf 100644 --- a/src/lib/orderman/orders/Order.h +++ b/src/lib/orderman/orders/Order.h @@ -5,11 +5,13 @@ // fwd namespace bts { +namespace trace {struct CorID;} namespace securities { class ISecurityDB; } namespace orderman { class IOrderFactory; +class OrderServicesData; } namespace api { namespace orderman { @@ -29,6 +31,7 @@ class OrderServices; class Order { public: + Order(); virtual ~Order(); OrderKey key() const { return _key; } @@ -43,17 +46,21 @@ class Order { const PreActivationOrderServices &) = 0; // activation - cannot be slow - virtual void on_activate(Price, Quantity, OrderServices &, PerfTrace const&) = 0; + virtual void on_activate(Price, Quantity, OrderServices &, trace::CorID const&) = 0; // order is running, maintenance - virtual void on_update(Price, Quantity, PerfTrace const&) = 0; - virtual void on_crack(PerfTrace const&) = 0; - virtual void on_cancel(PerfTrace const&) = 0; + virtual void on_update(Price, Quantity, trace::CorID const&) = 0; + virtual void on_crack(trace::CorID const&) = 0; + virtual void on_cancel(trace::CorID const&) = 0; private: OrderKey _key; OrderKey _parent_key; + std::unique_ptr _services; + void init_order_services(OrderServicesData &); + void init_order_services(OrderServicesData &,OrderServices &parent); friend class OrderFactory; + friend class OrderManager; }; } } diff --git a/src/lib/orderman/orders/TimeBoxOrder.cpp b/src/lib/orderman/orders/TimeBoxOrder.cpp index 542d86a06..8ad686489 100644 --- a/src/lib/orderman/orders/TimeBoxOrder.cpp +++ b/src/lib/orderman/orders/TimeBoxOrder.cpp @@ -1,6 +1,6 @@ #include "TimeBoxOrder.h" -#include "lib/utils/PBUtils.h" #include "lib/orderman/actors/order_manager/OrderBuilder.h" +#include "lib/utils/PBUtils.h" #include namespace bts { @@ -38,7 +38,7 @@ void TimeBoxOrder::on_init_new(api::orderman::OrderDefinition const &def, me->start_time = timebox_def.start(); me->stop_time = timebox_def.stop(); me->child_state.set_status(ORDER_STATUS_INACTIVE); - + auto child_def = def; *child_def.mutable_custom_def() = timebox_def.child(); if (me->start_time.seconds() > utils::pb::pb_now().seconds() && @@ -84,20 +84,21 @@ void TimeBoxOrder::on_init_recovered(api::orderman::OrderRecord const &rec, } } -void TimeBoxOrder::on_activate(Price p, Quantity q, OrderServices &services,PerfTrace const&) { +void TimeBoxOrder::on_activate(Price p, Quantity q, OrderServices &services, + trace::CorID const &) { bts_assert(!me->services); me->services = &services; me->child_builder.activate(services); - + switch (me->state.status()) { case ORDER_STATUS_INACTIVE: me->child = me->child_builder.build(); me->state.set_price(p.value()); me->state.set_quantity(q.value()); - services.child_updates.sub( - key(), [this](auto const &os) { this->on_child_order_update(os); }); - services.time_change.sub([this](auto) { this->on_time_change(); }); + services.subscribe_to_child_updates( + [this](auto const &os) { this->on_child_order_update(os); }); + services.subscribe_to_time([this](auto) { this->on_time_change(); }); transition(ORDER_STATUS_WORKING); break; @@ -113,7 +114,7 @@ void TimeBoxOrder::on_activate(Price p, Quantity q, OrderServices &services,Perf // state) case ORDER_STATUS_WORKING: case ORDER_STATUS_PENDING_WORKING: - case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_DISCONNECTED: case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: bts_assert(false); @@ -122,7 +123,7 @@ void TimeBoxOrder::on_activate(Price p, Quantity q, OrderServices &services,Perf report_state(); } -void TimeBoxOrder::on_update(Price p, Quantity q,PerfTrace const&) { +void TimeBoxOrder::on_update(Price p, Quantity q, trace::CorID const &) { LOG(OrderMan, Info, "Updating TimeBox Order {}", key().value()); switch (me->state.status()) { @@ -140,7 +141,7 @@ void TimeBoxOrder::on_update(Price p, Quantity q,PerfTrace const&) { // we launched our child, everything is nominal me->state.set_price(p.value()); me->state.set_quantity(q.value()); - me->child.update(p,q); + me->child.update(p, q); break; case ORDER_STATUS_PENDING_WORKING: @@ -151,7 +152,7 @@ void TimeBoxOrder::on_update(Price p, Quantity q,PerfTrace const&) { // if the child was in any of these states we couldn't be // in the working state - case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_DISCONNECTED: case ORDER_STATUS_ERROR: case ORDER_STATUS_REJECTED_BY_SPARK: case ORDER_STATUS_COMPLETED: @@ -182,9 +183,9 @@ void TimeBoxOrder::on_update(Price p, Quantity q,PerfTrace const&) { report_state(); } -void TimeBoxOrder::on_crack(PerfTrace const&) {} +void TimeBoxOrder::on_crack(trace::CorID const &) {} -void TimeBoxOrder::on_cancel(PerfTrace const&) { +void TimeBoxOrder::on_cancel(trace::CorID const &) { LOG(OrderMan, Info, "Canceling TimeBox Order {}", key().value()); switch (me->state.status()) { @@ -210,7 +211,7 @@ void TimeBoxOrder::on_cancel(PerfTrace const&) { break; // child cannot be in any of these if we are in the working state - case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_DISCONNECTED: case ORDER_STATUS_ERROR: case ORDER_STATUS_REJECTED_BY_SPARK: case ORDER_STATUS_COMPLETED: @@ -263,7 +264,7 @@ void TimeBoxOrder::on_time_change() { case ORDER_STATUS_INACTIVE: { // we haven't yet launched the child, check the time and // launch it if appropriate - if ( now >= me->start_time.seconds() && now < me->stop_time.seconds()) { + if (now >= me->start_time.seconds() && now < me->stop_time.seconds()) { LOG(OrderMan, Info, "TimeBox order {} launching child {}", key().value(), me->child.key().value()); me->child.activate(Price(me->state.price()), @@ -285,12 +286,12 @@ void TimeBoxOrder::on_time_change() { report_state(); } break; - + case ORDER_STATUS_PENDING_WORKING: break; // child cannot be in any of these states if we are in the working state - case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_DISCONNECTED: case ORDER_STATUS_ERROR: case ORDER_STATUS_REJECTED_BY_SPARK: case ORDER_STATUS_COMPLETED: @@ -318,34 +319,33 @@ void TimeBoxOrder::on_time_change() { } } -void TimeBoxOrder::on_child_order_update(OrderStateUpdateEvent const&ev) -{ +void TimeBoxOrder::on_child_order_update(OrderStateUpdateEvent const &ev) { me->child_state = ev.rebuild_state(); switch (me->state.status()) { case ORDER_STATUS_WORKING: switch (ev.status) { - case ORDER_STATUS_WORKING: - case ORDER_STATUS_PENDING_WORKING: - // nothing to do but report new state - break; - case ORDER_STATUS_COMPLETED: - transition(ORDER_STATUS_COMPLETED); - break; + case ORDER_STATUS_WORKING: + case ORDER_STATUS_PENDING_WORKING: + // nothing to do but report new state + break; + case ORDER_STATUS_COMPLETED: + transition(ORDER_STATUS_COMPLETED); + break; - case ORDER_STATUS_DISCONNECTED: - case ORDER_STATUS_REJECTED_BY_SPARK: - case ORDER_STATUS_CANCELED: - case ORDER_STATUS_ERROR: - transition(ORDER_STATUS_ERROR, "Unexpected child order state"); - break; + case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_REJECTED_BY_SPARK: + case ORDER_STATUS_CANCELED: + case ORDER_STATUS_ERROR: + transition(ORDER_STATUS_ERROR, "Unexpected child order state"); + break; - case ORDER_STATUS_INACTIVE: - case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: - case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: - bts_assert(false); - break; + case ORDER_STATUS_INACTIVE: + case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: + case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: + bts_assert(false); + break; } break; @@ -368,12 +368,11 @@ void TimeBoxOrder::on_child_order_update(OrderStateUpdateEvent const&ev) void TimeBoxOrder::report_state() { auto merged_state = me->state; - merged_state.set_filled_quantity (me->child_state.filled_quantity()); - merged_state.set_last_price ( me->child_state.last_price()); - merged_state.set_avg_price ( me->child_state.avg_price()); + merged_state.set_filled_quantity(me->child_state.filled_quantity()); + merged_state.set_last_price(me->child_state.last_price()); + merged_state.set_avg_price(me->child_state.avg_price()); me->services->report_state(merged_state); } -} -} - +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/orders/TimeBoxOrder.h b/src/lib/orderman/orders/TimeBoxOrder.h index 3a403ee38..9475a5a37 100644 --- a/src/lib/orderman/orders/TimeBoxOrder.h +++ b/src/lib/orderman/orders/TimeBoxOrder.h @@ -19,10 +19,10 @@ public: const PreActivationOrderServices&) override; void on_init_recovered(api::orderman::OrderRecord const&, const PreActivationOrderServices &) override; - void on_activate(Price,Quantity,OrderServices &, PerfTrace const&) override ; - void on_update(Price , Quantity,PerfTrace const&) override ; - void on_crack(PerfTrace const&) override ; - void on_cancel(PerfTrace const&) override ; + void on_activate(Price,Quantity,OrderServices &, trace::CorID const&) override ; + void on_update(Price , Quantity,trace::CorID const&) override ; + void on_crack(trace::CorID const&) override ; + void on_cancel(trace::CorID const&) override ; private: void report_state(); diff --git a/src/lib/orderman/orders/TriggerOrder.cpp b/src/lib/orderman/orders/TriggerOrder.cpp index f84235f59..5b8f2cc5f 100644 --- a/src/lib/orderman/orders/TriggerOrder.cpp +++ b/src/lib/orderman/orders/TriggerOrder.cpp @@ -1,16 +1,16 @@ #include "TriggerOrder.h" +#include "lib/domain_model/Security.h" #include "lib/logging/logging.h" -#include "lib/utils/PBUtils.h" #include "lib/orderman/actors/order_manager/OrderBuilder.h" #include "lib/orderman/events/BookUpdateEvent.h" #include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" -#include "lib/domain_model/Security.h" #include "lib/os/os.h" +#include "lib/utils/PBUtils.h" #include #include -namespace bts{ -namespace orderman{ +namespace bts { +namespace orderman { struct TriggerOrder::PImpl { OrderServices *services; @@ -42,496 +42,491 @@ struct TriggerOrder::PImpl { bool is_succ_inited; bts::TimeStamp child_order_time; PImpl() - : - services(nullptr), - order_def(), - timeout_exit(false), - timeout_msecs(std::numeric_limits::max()), - price_cond_exit(false), - state(), - child_state(), - child_order(), - order_placed(false), - book(), - cancel_mode(CancelMode::none), - market_observed_once(false), - is_recovered(false), - is_succ_inited(false){ - } + : services(nullptr), order_def(), timeout_exit(false), + timeout_msecs(std::numeric_limits::max()), + price_cond_exit(false), state(), child_state(), child_order(), + order_placed(false), book(), cancel_mode(CancelMode::none), + market_observed_once(false), is_recovered(false), + is_succ_inited(false) {} }; -TriggerOrder::TriggerOrder() -: -_state(State::START), -me(new PImpl()){ -} -TriggerOrder::~TriggerOrder(){ -} -const api::orderman::OrderDefinition& TriggerOrder::definition() const{ +TriggerOrder::TriggerOrder() : _state(State::START), me(new PImpl()) {} +TriggerOrder::~TriggerOrder() {} +const api::orderman::OrderDefinition &TriggerOrder::definition() const { return me->order_def; } -void TriggerOrder::on_init_new(const api::orderman::OrderDefinition& order_def, - const PreActivationOrderServices& pre_os){ - LOG(OrderMan, Info, "TriggerOrder::on_init_new key:{} state:{}", - key(),_state); - switch (_state){ - case State::START: - me->is_succ_inited=_on_init_new(order_def,pre_os); - break; - case State::WAITING_FOR_TRIGGER: - case State::WAITING_FOR_FIRST_ACK: - case State::STEADY: - case State::END: - std::ostringstream oss; - oss << "TriggerOrder::on_init_new key:" << key() << "state:" << _state; - bts_assert_msg(false, oss.str()); - break; +void TriggerOrder::on_init_new(const api::orderman::OrderDefinition &order_def, + const PreActivationOrderServices &pre_os) { + LOG(OrderMan, Info, "TriggerOrder::on_init_new key:{} state:{}", key(), + _state); + switch (_state) { + case State::START: + me->is_succ_inited = _on_init_new(order_def, pre_os); + break; + case State::WAITING_FOR_TRIGGER: + case State::WAITING_FOR_FIRST_ACK: + case State::STEADY: + case State::END: + std::ostringstream oss; + oss << "TriggerOrder::on_init_new key:" << key() << "state:" << _state; + bts_assert_msg(false, oss.str()); + break; } } -void TriggerOrder::on_init_recovered(const api::orderman::OrderRecord& rec, - const PreActivationOrderServices& pre_os){ - LOG(OrderMan, Info, "TriggerOrder::on_init_recovered key:{} state:{}", - key(),_state); - switch (_state){ - case State::START: - me->is_succ_inited=_on_init_new(rec.def(),pre_os); - // get the state from what was recovered (we will only use - // it for reporting) - me->state=rec.state(); - // if it was not in a terminal state, we will call it cancelled - if (!SpreaderUtils::order_in_terminal_state(me->state.status())) - me->state.set_status(api::orderman::OrderStatus::ORDER_STATUS_CANCELED); - me->is_recovered=true; - break; - case State::WAITING_FOR_TRIGGER: - case State::WAITING_FOR_FIRST_ACK: - case State::STEADY: - case State::END: - std::ostringstream oss; - oss << "TriggerOrder::on_init_recovered key:" << key() << "state:" << _state; - bts_assert_msg(false, oss.str()); - break; +void TriggerOrder::on_init_recovered(const api::orderman::OrderRecord &rec, + const PreActivationOrderServices &pre_os) { + LOG(OrderMan, Info, "TriggerOrder::on_init_recovered key:{} state:{}", key(), + _state); + switch (_state) { + case State::START: + me->is_succ_inited = _on_init_new(rec.def(), pre_os); + // get the state from what was recovered (we will only use + // it for reporting) + me->state = rec.state(); + // if it was not in a terminal state, we will call it cancelled + if (!SpreaderUtils::order_in_terminal_state(me->state.status())) + me->state.set_status( + api::orderman::OrderStatus::ORDER_STATUS_CANCELED); + me->is_recovered = true; + break; + case State::WAITING_FOR_TRIGGER: + case State::WAITING_FOR_FIRST_ACK: + case State::STEADY: + case State::END: + std::ostringstream oss; + oss << "TriggerOrder::on_init_recovered key:" << key() + << "state:" << _state; + bts_assert_msg(false, oss.str()); + break; } } -void TriggerOrder::on_activate(Price price, - Quantity qty, - OrderServices& services, - PerfTrace const&){ - LOG(OrderMan, Info, "TriggerOrder::on_activate key:{} state:{} price:{} qty:{}", - key(),_state, price, qty); - switch (_state){ - case State::START: - me->services=&services; - me->state.set_price(price.value()); - me->state.set_quantity(qty.value()); - if(me->is_recovered || !me->is_succ_inited) - _switch_state(State::END); - else{ - me->order_builder.activate(services); - me->child_order=me->order_builder.build(); - services.child_updates.sub(key(), - [this](const OrderStateUpdateEvent& os) - { this->_on_child_order_update (os);}); - services.book_updates.sub(SecurityKey(me->order_def.security_key()), - [this](const BookUpdateEvent& bk_event) - { this->_on_book_update (bk_event);}); - services.time_change.sub([this](const bts::mercury::TimerEvent& te) - {_on_time(te);}); - _switch_state(State::WAITING_FOR_TRIGGER); - } - break; - case State::WAITING_FOR_TRIGGER: - case State::WAITING_FOR_FIRST_ACK: - case State::STEADY: - case State::END:{ - std::ostringstream oss; - oss << "TriggerOrder::on_activate key:" << key() << "state:" << _state; - bts_assert_msg(false,oss.str()); - break; +void TriggerOrder::on_activate(Price price, Quantity qty, + OrderServices &services, trace::CorID const &) { + LOG(OrderMan, Info, + "TriggerOrder::on_activate key:{} state:{} price:{} qty:{}", key(), + _state, price, qty); + switch (_state) { + case State::START: + me->services = &services; + me->state.set_price(price.value()); + me->state.set_quantity(qty.value()); + if (me->is_recovered || !me->is_succ_inited) + _switch_state(State::END); + else { + me->order_builder.activate(services); + me->child_order = me->order_builder.build(); + services.subscribe_to_child_updates( + [this](const OrderStateUpdateEvent &os) { + this->_on_child_order_update(os); + }); + services.subscribe_to_book(SecurityKey(me->order_def.security_key()), + [this](const BookUpdateEvent &bk_event) { + this->_on_book_update(bk_event); + }); + services.subscribe_to_time( + [this](const bts::mercury::TimerEvent &te) { _on_time(te); }); + _switch_state(State::WAITING_FOR_TRIGGER); } + break; + case State::WAITING_FOR_TRIGGER: + case State::WAITING_FOR_FIRST_ACK: + case State::STEADY: + case State::END: { + std::ostringstream oss; + oss << "TriggerOrder::on_activate key:" << key() << "state:" << _state; + bts_assert_msg(false, oss.str()); + break; + } } } // order price, qty change -void TriggerOrder::on_update(Price price, - Quantity qty, - PerfTrace const&){ - LOG(OrderMan, Info, "TriggerOrder::on_update key:{} state:{} price:{} qty:{}", - key(),_state, price, qty); - switch (_state){ - case State::START: - me->state.set_price(price.value()); - me->state.set_quantity(qty.value()); - // cant report because does not have order_services yet - break; - case State::WAITING_FOR_TRIGGER: - me->state.set_price(price.value()); - me->state.set_quantity(qty.value()); - _report_state(); - _analyze_trigger_and_shoot(); - break; - case State::WAITING_FOR_FIRST_ACK: - case State::STEADY: - me->state.set_last_msg("Trigger order can not be modified after the trigger has been hit"); - _report_state(); - break; - case State::END: - break; +void TriggerOrder::on_update(Price price, Quantity qty, trace::CorID const &) { + LOG(OrderMan, Info, + "TriggerOrder::on_update key:{} state:{} price:{} qty:{}", key(), _state, + price, qty); + switch (_state) { + case State::START: + me->state.set_price(price.value()); + me->state.set_quantity(qty.value()); + // cant report because does not have order_services yet + break; + case State::WAITING_FOR_TRIGGER: + me->state.set_price(price.value()); + me->state.set_quantity(qty.value()); + _report_state(); + _analyze_trigger_and_shoot(); + break; + case State::WAITING_FOR_FIRST_ACK: + case State::STEADY: + me->state.set_last_msg( + "Trigger order can not be modified after the trigger has been hit"); + _report_state(); + break; + case State::END: + break; } } -void TriggerOrder::on_crack(PerfTrace const&){ +void TriggerOrder::on_crack(trace::CorID const &) { // not supported } -void TriggerOrder::on_cancel(PerfTrace const&){ - LOG(OrderMan, Info, "TriggerOrder::on_cancel key:{} state:{}", - key(),_state); - me->cancel_mode=CancelMode::external; - switch (_state){ - case State::START: - _switch_state(State::END); - break; - case State::WAITING_FOR_TRIGGER: - _switch_state(State::END); - break; - case State::WAITING_FOR_FIRST_ACK: - // we dont have a WAITING_FOR_ACK_CANCELLED - // (like the Quoter), so this message is - // rejected and reported - me->state.set_last_msg("Order is in flight"); - _report_state(); - break; - case State::STEADY: - _cancel_order(CancelMode::external); - break; - case State::END: - break; +void TriggerOrder::on_cancel(trace::CorID const &) { + LOG(OrderMan, Info, "TriggerOrder::on_cancel key:{} state:{}", key(), + _state); + me->cancel_mode = CancelMode::external; + switch (_state) { + case State::START: + _switch_state(State::END); + break; + case State::WAITING_FOR_TRIGGER: + _switch_state(State::END); + break; + case State::WAITING_FOR_FIRST_ACK: + // we dont have a WAITING_FOR_ACK_CANCELLED + // (like the Quoter), so this message is + // rejected and reported + me->state.set_last_msg("Order is in flight"); + _report_state(); + break; + case State::STEADY: + _cancel_order(CancelMode::external); + break; + case State::END: + break; } } -void TriggerOrder::_on_book_update(const BookUpdateEvent& b_event){ - switch (_state){ - case State::START: - break; - case State::WAITING_FOR_TRIGGER: - if(b_event.key().value()==me->order_def.security_key()){ - me->book=b_event.book; - _observe_market_once(); - _analyze_trigger_and_shoot(); +void TriggerOrder::_on_book_update(const BookUpdateEvent &b_event) { + switch (_state) { + case State::START: + break; + case State::WAITING_FOR_TRIGGER: + if (b_event.key().value() == me->order_def.security_key()) { + me->book = b_event.book; + _observe_market_once(); + _analyze_trigger_and_shoot(); + } + break; + case State::WAITING_FOR_FIRST_ACK: + break; + case State::STEADY: + if (b_event.key().value() == me->order_def.security_key()) { + if (me->price_cond_exit) { + me->book = b_event.book; + _analyze_trigger_and_cancel(); } - break; - case State::WAITING_FOR_FIRST_ACK: - break; - case State::STEADY: - if(b_event.key().value()==me->order_def.security_key()){ - if(me->price_cond_exit){ - me->book=b_event.book; - _analyze_trigger_and_cancel(); - } - } - case State::END: - break; + } + case State::END: + break; } } -void TriggerOrder::_on_child_order_update(const OrderStateUpdateEvent& o_ev){ - if(o_ev.key==me->child_order.key()){ +void TriggerOrder::_on_child_order_update(const OrderStateUpdateEvent &o_ev) { + if (o_ev.key == me->child_order.key()) { auto ev_state = o_ev.rebuild_state(); - me->child_state=ev_state; - switch (_state){ - case State::START: - case State::WAITING_FOR_TRIGGER: - bts_assert(false); - break; - case State::WAITING_FOR_FIRST_ACK: - if(SpreaderUtils::order_acknowledged(o_ev.status)){ - if(SpreaderUtils::order_in_terminal_state(o_ev.status)) - _switch_state(State::END); - else - _switch_state(State::STEADY); - } - break; - case State::STEADY: - if(SpreaderUtils::order_in_terminal_state(ev_state.status())) + me->child_state = ev_state; + switch (_state) { + case State::START: + case State::WAITING_FOR_TRIGGER: + bts_assert(false); + break; + case State::WAITING_FOR_FIRST_ACK: + if (SpreaderUtils::order_acknowledged(o_ev.status)) { + if (SpreaderUtils::order_in_terminal_state(o_ev.status)) _switch_state(State::END); - break; - case State::END: - break; + else + _switch_state(State::STEADY); + } + break; + case State::STEADY: + if (SpreaderUtils::order_in_terminal_state(ev_state.status())) + _switch_state(State::END); + break; + case State::END: + break; } _report_state(); } } -void TriggerOrder::_on_time(const bts::mercury::TimerEvent&){ - switch (_state){ - case State::START: - case State::WAITING_FOR_TRIGGER: - case State::WAITING_FOR_FIRST_ACK: - break; - case State::STEADY:{ - if(me->timeout_exit) - _analyze_trigger_and_cancel(); - break; - } - case State::END: - break; +void TriggerOrder::_on_time(const bts::mercury::TimerEvent &) { + switch (_state) { + case State::START: + case State::WAITING_FOR_TRIGGER: + case State::WAITING_FOR_FIRST_ACK: + break; + case State::STEADY: { + if (me->timeout_exit) + _analyze_trigger_and_cancel(); + break; + } + case State::END: + break; } } -bool TriggerOrder::_on_init_new(const api::orderman::OrderDefinition& order_def, - const PreActivationOrderServices& pre_os){ - me->order_def=order_def; - if (!me->order_def.has_custom_def() || !me->order_def.custom_def().has_trigger()){ - LOG(OrderMan, Error, "TriggerOrder::_on_init_new key:{} state:{} " - "OrderDefinition does not have TriggerOrderDefinition", - key(),_state); +bool TriggerOrder::_on_init_new(const api::orderman::OrderDefinition &order_def, + const PreActivationOrderServices &pre_os) { + me->order_def = order_def; + if (!me->order_def.has_custom_def() || + !me->order_def.custom_def().has_trigger()) { + LOG(OrderMan, Error, + "TriggerOrder::_on_init_new key:{} state:{} " + "OrderDefinition does not have TriggerOrderDefinition", + key(), _state); me->state.set_last_msg("Trigger Order not properly formed"); return false; } - if (pre_os.sec_db.resolve(SecurityKey(order_def.security_key()))==nullptr){ - LOG(OrderMan, Error, "TriggerOrder::_on_init_new key:{} state:{} " - "Could not resolve sec_key:{}", - key(),_state, order_def.security_key()); + if (pre_os.sec_db.resolve(SecurityKey(order_def.security_key())) == + nullptr) { + LOG(OrderMan, Error, + "TriggerOrder::_on_init_new key:{} state:{} " + "Could not resolve sec_key:{}", + key(), _state, order_def.security_key()); me->state.set_last_msg("Could not resolve Trigger Order security"); return false; - } - const auto& trigger_order_def=order_def.custom_def().trigger(); - if(pre_os.sec_db.resolve(SecurityKey(trigger_order_def.trigger_action().security_id())) == nullptr){ - LOG(OrderMan, Error, "TriggerOrder::_on_init_new key:{} state:{} " - "Could not resolve child key sec_key:{}", - key(),_state, trigger_order_def.trigger_action().security_id()); + } + const auto &trigger_order_def = order_def.custom_def().trigger(); + if (pre_os.sec_db.resolve(SecurityKey( + trigger_order_def.trigger_action().security_id())) == nullptr) { + LOG(OrderMan, Error, + "TriggerOrder::_on_init_new key:{} state:{} " + "Could not resolve child key sec_key:{}", + key(), _state, trigger_order_def.trigger_action().security_id()); me->state.set_last_msg("Could not resolve Trigger Order child security"); return false; } if (!trigger_order_def.trigger_action().has_payup() && - bts::os::is_nan(trigger_order_def.trigger_action().price())){ - LOG(OrderMan, Error, "TriggerOrder::_on_init_new key:{} state:{} " - "illegal child order price", - key(),_state); + bts::os::is_nan(trigger_order_def.trigger_action().price())) { + LOG(OrderMan, Error, + "TriggerOrder::_on_init_new key:{} state:{} " + "illegal child order price", + key(), _state); me->state.set_last_msg("Illegal Child Order price"); return false; } me->timeout_exit = trigger_order_def.has_exit_condition() && - trigger_order_def.exit_condition().timeout_enabled(); - me->timeout_msecs = trigger_order_def.has_exit_condition() ? - 1000.0*trigger_order_def.exit_condition().timeout_seconds () : - std::numeric_limits::max(); - me->price_cond_exit = trigger_order_def.has_exit_condition() && - trigger_order_def.exit_condition().conditional_cancel(); + trigger_order_def.exit_condition().timeout_enabled(); + me->timeout_msecs = + trigger_order_def.has_exit_condition() + ? 1000.0 * trigger_order_def.exit_condition().timeout_seconds() + : std::numeric_limits::max(); + me->price_cond_exit = + trigger_order_def.has_exit_condition() && + trigger_order_def.exit_condition().conditional_cancel(); api::orderman::OrderDefinition child_order_def = order_def; - child_order_def.set_security_key(trigger_order_def.trigger_action().security_id()); + child_order_def.set_security_key( + trigger_order_def.trigger_action().security_id()); child_order_def.mutable_custom_def()->CopyFrom(trigger_order_def.child()); - me->order_builder=OrderBuilder(key(),child_order_def,pre_os); - const auto* sec_ptr = pre_os.sec_db.resolve(SecurityKey(order_def.security_key())); - me->tick_size=std::min(sec_ptr->contract_spec().low_tick(), - sec_ptr->contract_spec().high_tick()); - LOG(OrderMan, Info, "TriggerOrder::_on_init_new key:{} state:{} " - "trigger_price_type:{} child_order_price:{}", - key(),_state, - trigger_order_def.trigger_condition().price_type(), - trigger_order_def.trigger_action().price()); + me->order_builder = OrderBuilder(key(), child_order_def, pre_os); + const auto *sec_ptr = + pre_os.sec_db.resolve(SecurityKey(order_def.security_key())); + me->tick_size = std::min(sec_ptr->contract_spec().low_tick(), + sec_ptr->contract_spec().high_tick()); + LOG(OrderMan, Info, + "TriggerOrder::_on_init_new key:{} state:{} " + "trigger_price_type:{} child_order_price:{}", + key(), _state, trigger_order_def.trigger_condition().price_type(), + trigger_order_def.trigger_action().price()); return true; } -void TriggerOrder::_report_state(){ - if(_activated()){ +void TriggerOrder::_report_state() { + if (_activated()) { _compute_state(); me->services->report_state(me->state); } } -void TriggerOrder::_switch_state(State new_state){ - switch(new_state){ - case State::START: - break; - case State::WAITING_FOR_TRIGGER: - bts_assert(_state==State::START); - break; - case State::WAITING_FOR_FIRST_ACK: - bts_assert(_state==State::WAITING_FOR_TRIGGER); - break; - case State::STEADY: - bts_assert(_state==State::WAITING_FOR_FIRST_ACK); - break; - case State::END: - bts_assert(_state!=State::END); - break; +void TriggerOrder::_switch_state(State new_state) { + switch (new_state) { + case State::START: + break; + case State::WAITING_FOR_TRIGGER: + bts_assert(_state == State::START); + break; + case State::WAITING_FOR_FIRST_ACK: + bts_assert(_state == State::WAITING_FOR_TRIGGER); + break; + case State::STEADY: + bts_assert(_state == State::WAITING_FOR_FIRST_ACK); + break; + case State::END: + bts_assert(_state != State::END); + break; } - LOG(OrderMan, Info, "TriggerOrder::_report_state key:{} {}->{}", - key(), - _state,new_state); - _state=new_state; + LOG(OrderMan, Info, "TriggerOrder::_report_state key:{} {}->{}", key(), + _state, new_state); + _state = new_state; _report_state(); } -void TriggerOrder::_analyze_trigger_and_shoot(){ - if(me->market_observed_once){ - double trigger_price=_trigger_price(); - const md::PriceSize* obs_md=_observed_market(); - if (_trigger_met(obs_md,trigger_price, - me->tick_size,me->trigger_above_market)){ - me->child_order_time=bts::Timer::now(); - me->order_placed=true; - LOG(OrderMan, Info, "TriggerOrder::_analyze_trigger_and_shoot" - "key:{} state:{} " - "trigger_above_md:{} trigger_price:{} md:{} " - "order_price:{} order_qty:{}", - key(),_state, - me->trigger_above_market,trigger_price, - obs_md->price(), - _child_order_price(), - me->state.quantity()); +void TriggerOrder::_analyze_trigger_and_shoot() { + if (me->market_observed_once) { + double trigger_price = _trigger_price(); + const md::PriceSize *obs_md = _observed_market(); + if (_trigger_met(obs_md, trigger_price, me->tick_size, + me->trigger_above_market)) { + me->child_order_time = bts::Timer::now(); + me->order_placed = true; + LOG(OrderMan, Info, + "TriggerOrder::_analyze_trigger_and_shoot" + "key:{} state:{} " + "trigger_above_md:{} trigger_price:{} md:{} " + "order_price:{} order_qty:{}", + key(), _state, me->trigger_above_market, trigger_price, + obs_md->price(), _child_order_price(), me->state.quantity()); me->child_order.activate(Price(_child_order_price()), Quantity(me->state.quantity())); _switch_state(State::WAITING_FOR_FIRST_ACK); } } } -void TriggerOrder::_analyze_trigger_and_cancel(){ - if(me->timeout_exit){ - int64_t time_diff = ms_diff (bts::Timer::now(), me->child_order_time); - if(time_diff > me->timeout_msecs){ - LOG(OrderMan, Info, "TriggerOrder::_analyze_trigger_and_cancel " - "key:{} state:{} msecs:{} " - "time out, cancelling order", - key(),_state, time_diff); +void TriggerOrder::_analyze_trigger_and_cancel() { + if (me->timeout_exit) { + int64_t time_diff = ms_diff(bts::Timer::now(), me->child_order_time); + if (time_diff > me->timeout_msecs) { + LOG(OrderMan, Info, + "TriggerOrder::_analyze_trigger_and_cancel " + "key:{} state:{} msecs:{} " + "time out, cancelling order", + key(), _state, time_diff); _cancel_order(CancelMode::trigger); return; } } - if(me->price_cond_exit){ - double trigger_price=_trigger_price(); - const md::PriceSize* obs_md=_observed_market(); - if (!_trigger_met(obs_md,trigger_price, - me->tick_size,me->trigger_above_market)){ - LOG(OrderMan, Info, "TriggerOrder::_analyze_trigger_and_cancel" - "key:{} state:{} " - "price condition untrue, cancelling order" - "trigger_above_md:{} trigger_price:{} md:{} ", - key(),_state, - me->trigger_above_market,trigger_price, - obs_md->price()); + if (me->price_cond_exit) { + double trigger_price = _trigger_price(); + const md::PriceSize *obs_md = _observed_market(); + if (!_trigger_met(obs_md, trigger_price, me->tick_size, + me->trigger_above_market)) { + LOG(OrderMan, Info, + "TriggerOrder::_analyze_trigger_and_cancel" + "key:{} state:{} " + "price condition untrue, cancelling order" + "trigger_above_md:{} trigger_price:{} md:{} ", + key(), _state, me->trigger_above_market, trigger_price, + obs_md->price()); _cancel_order(CancelMode::trigger); - return; + return; } } } -api::orderman::OrderStatus TriggerOrder::_status() const{ - switch(_state){ - // will only be called once the order - // has been activated - case State::START: - case State::WAITING_FOR_TRIGGER: - case State::WAITING_FOR_FIRST_ACK: - case State::STEADY: - return api::orderman::OrderStatus::ORDER_STATUS_WORKING; - case State::END: - if(!me->is_succ_inited) - return api::orderman::OrderStatus::ORDER_STATUS_ERROR; - else{ - if(me->order_placed){ - if (!SpreaderUtils::order_in_terminal_state(me->child_state.status())) - return api::orderman::OrderStatus::ORDER_STATUS_WORKING; - else{ - if (SpreaderUtils::order_in_error_state(me->child_state.status())) - return api::orderman::OrderStatus::ORDER_STATUS_ERROR; - else if (SpreaderUtils::order_in_completed_state(me->child_state.status())) +api::orderman::OrderStatus TriggerOrder::_status() const { + switch (_state) { + // will only be called once the order + // has been activated + case State::START: + case State::WAITING_FOR_TRIGGER: + case State::WAITING_FOR_FIRST_ACK: + case State::STEADY: + return api::orderman::OrderStatus::ORDER_STATUS_WORKING; + case State::END: + if (!me->is_succ_inited) + return api::orderman::OrderStatus::ORDER_STATUS_ERROR; + else { + if (me->order_placed) { + if (!SpreaderUtils::order_in_terminal_state( + me->child_state.status())) + return api::orderman::OrderStatus::ORDER_STATUS_WORKING; + else { + if (SpreaderUtils::order_in_error_state( + me->child_state.status())) + return api::orderman::OrderStatus::ORDER_STATUS_ERROR; + else if (SpreaderUtils::order_in_completed_state( + me->child_state.status())) + return api::orderman::OrderStatus::ORDER_STATUS_COMPLETED; + else if (SpreaderUtils::order_in_cancelled_state( + me->child_state.status())) { + switch (me->cancel_mode) { + case CancelMode::none: // this means an unscolicted child cxl + case CancelMode::external: + return api::orderman::OrderStatus::ORDER_STATUS_CANCELED; + case CancelMode::trigger: return api::orderman::OrderStatus::ORDER_STATUS_COMPLETED; - else if (SpreaderUtils::order_in_cancelled_state(me->child_state.status())){ - switch (me->cancel_mode){ - case CancelMode::none: //this means an unscolicted child cxl - case CancelMode::external: - return api::orderman::OrderStatus::ORDER_STATUS_CANCELED; - case CancelMode::trigger: - return api::orderman::OrderStatus::ORDER_STATUS_COMPLETED; - } } } } - else - return api::orderman::OrderStatus::ORDER_STATUS_CANCELED; - } + } else + return api::orderman::OrderStatus::ORDER_STATUS_CANCELED; + } } bts_assert(false); return api::orderman::OrderStatus::ORDER_STATUS_INACTIVE; } -void TriggerOrder::_compute_state(){ - if (!me->is_recovered){ +void TriggerOrder::_compute_state() { + if (!me->is_recovered) { me->state.set_status(_status()); me->state.set_filled_quantity(me->child_state.filled_quantity()); me->state.set_last_price(me->child_state.last_price()); me->state.set_avg_price(me->child_state.avg_price()); - if(_state==State::STEADY) + if (_state == State::STEADY) me->state.set_display_status(bts::api::orderman::OrderState::HIDDEN); else me->state.set_display_status(bts::api::orderman::OrderState::VISIBLE); - } } -void TriggerOrder::_observe_market_once(){ - if(!me->market_observed_once){ - const md::PriceSize* obs_md=_observed_market(); - if(obs_md != nullptr && obs_md->size()>0){ - me->market_observed_once=true; - me->trigger_above_market=_trigger_price()>=obs_md->price(); - LOG(OrderMan, Info, "TriggerOrder::_observe_market_once " - "key:{} state:{} " - "md_p:{} md_q:{} trigger_above_md:{}", - key(),_state, - obs_md->price(), obs_md->size(), - me->trigger_above_market); +void TriggerOrder::_observe_market_once() { + if (!me->market_observed_once) { + const md::PriceSize *obs_md = _observed_market(); + if (obs_md != nullptr && obs_md->size() > 0) { + me->market_observed_once = true; + me->trigger_above_market = _trigger_price() >= obs_md->price(); + LOG(OrderMan, Info, + "TriggerOrder::_observe_market_once " + "key:{} state:{} " + "md_p:{} md_q:{} trigger_above_md:{}", + key(), _state, obs_md->price(), obs_md->size(), + me->trigger_above_market); } } } -const md::PriceSize* TriggerOrder::_observed_market() const{ - if(me->order_def.custom_def().trigger().trigger_condition().price_type()== - api::orderman::TriggerPriceType::BID){ - const auto& rv=me->book.bid()[0]; - return &rv; - } - else if (me->order_def.custom_def().trigger().trigger_condition().price_type()== - api::orderman::TriggerPriceType::ASK){ - const auto& rv=me->book.ask()[0]; +const md::PriceSize *TriggerOrder::_observed_market() const { + if (me->order_def.custom_def().trigger().trigger_condition().price_type() == + api::orderman::TriggerPriceType::BID) { + const auto &rv = me->book.bid()[0]; return &rv; - } - else{ + } else if (me->order_def.custom_def() + .trigger() + .trigger_condition() + .price_type() == api::orderman::TriggerPriceType::ASK) { + const auto &rv = me->book.ask()[0]; + return &rv; + } else { bts_assert(false); return nullptr; } } -double TriggerOrder::_trigger_price() const{ - return me->state.price(); -} -double TriggerOrder::_child_order_price() const{ - const auto& trigger_action= - me->order_def.custom_def().trigger().trigger_action(); - double rv=bts::os::nan(); - if(trigger_action.has_payup()){ - double offset=trigger_action.payup().payup_ticks()*me->tick_size; - if(me->order_def.side()==api::Side::SIDE_BUY) - rv=_trigger_price()+offset; +double TriggerOrder::_trigger_price() const { return me->state.price(); } +double TriggerOrder::_child_order_price() const { + const auto &trigger_action = + me->order_def.custom_def().trigger().trigger_action(); + double rv = bts::os::nan(); + if (trigger_action.has_payup()) { + double offset = trigger_action.payup().payup_ticks() * me->tick_size; + if (me->order_def.side() == api::Side::SIDE_BUY) + rv = _trigger_price() + offset; else - rv=_trigger_price()-offset; - } - else - rv=trigger_action.price(); - rv = bts::securities::raw_round_to_quote_price (rv, me->tick_size, - me->order_def.side()); + rv = _trigger_price() - offset; + } else + rv = trigger_action.price(); + rv = bts::securities::raw_round_to_quote_price(rv, me->tick_size, + me->order_def.side()); return rv; } -void TriggerOrder::_cancel_order(CancelMode cancel_mode){ - me->cancel_mode=cancel_mode; +void TriggerOrder::_cancel_order(CancelMode cancel_mode) { + me->cancel_mode = cancel_mode; me->child_order.cancel(); LOG(OrderMan, Info, "TriggerOrder::_cancel_order key:{} state:{} mode:{}", - key(),_state,cancel_mode); + key(), _state, cancel_mode); _switch_state(State::END); } -bool TriggerOrder::_activated() const{ - return me->services!=nullptr; +bool TriggerOrder::_activated() const { return me->services != nullptr; } +bool TriggerOrder::_gr_than_eq(double p1, double p2, double tick_size) { + return bts::securities::test_price_equality(p1, p2, tick_size) || p1 >= p2; } -bool TriggerOrder::_gr_than_eq(double p1, double p2, double tick_size){ - return bts::securities::test_price_equality(p1,p2,tick_size) || p1>=p2; -} -bool TriggerOrder::_trigger_met(const md::PriceSize* obs_md, - double trpr, - double tick_size, - bool trigger_above_md){ +bool TriggerOrder::_trigger_met(const md::PriceSize *obs_md, double trpr, + double tick_size, bool trigger_above_md) { if (obs_md != nullptr) - return (trigger_above_md && _gr_than_eq(obs_md->price(),trpr, tick_size)) || - (!trigger_above_md && _gr_than_eq(trpr,obs_md->price(),tick_size)); + return (trigger_above_md && + _gr_than_eq(obs_md->price(), trpr, tick_size)) || + (!trigger_above_md && + _gr_than_eq(trpr, obs_md->price(), tick_size)); return false; } -}} +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/orders/TriggerOrder.h b/src/lib/orderman/orders/TriggerOrder.h index f79013ef6..a62c82cba 100644 --- a/src/lib/orderman/orders/TriggerOrder.h +++ b/src/lib/orderman/orders/TriggerOrder.h @@ -56,10 +56,10 @@ public: const PreActivationOrderServices &) override; void on_activate(Price, Quantity, OrderServices&, - PerfTrace const&) override ; - void on_update(Price, Quantity, PerfTrace const&) override; - void on_crack(PerfTrace const&) override; - void on_cancel(PerfTrace const&) override; + trace::CorID const&) override ; + void on_update(Price, Quantity, trace::CorID const&) override; + void on_crack(trace::CorID const&) override; + void on_cancel(trace::CorID const&) override; private: // callbacks from book and child order udpates void _on_book_update(const BookUpdateEvent&); diff --git a/src/lib/orderman/orders/book_algos/BookAlgo.cpp b/src/lib/orderman/orders/book_algos/BookAlgo.cpp index 5e3ea18ae..5298aa9d0 100644 --- a/src/lib/orderman/orders/book_algos/BookAlgo.cpp +++ b/src/lib/orderman/orders/book_algos/BookAlgo.cpp @@ -1,7 +1,7 @@ #include "BookAlgo.h" +#include "lib/orderman/actors/order_manager/OrderBuilder.h" #include "lib/utils/PBUtils.h" #include "lib/utils/helper_macros.h" -#include "lib/orderman/actors/order_manager/OrderBuilder.h" #include namespace bts { @@ -9,148 +9,113 @@ namespace orderman { using namespace api::orderman; -struct BookAlgo::PImpl -{ - PImpl() : services(nullptr), fake_detached_child(false), - supports_hedge(false), has_activated_child(false) - { - } - - OrderServices* services; - +struct BookAlgo::PImpl { + PImpl() + : services(nullptr), fake_detached_child(false), supports_hedge(false), + has_activated_child(false) {} + + OrderServices *services; + api::orderman::OrderDefinition def; api::orderman::OrderState state; - + OrderBuilder child_builder; - ChildOrder child; - api::orderman::OrderState child_state; + ChildOrder child; + api::orderman::OrderState child_state; bool fake_detached_child; - - bool supports_hedge; - OrderBuilder hedge_builder; + + bool supports_hedge; + OrderBuilder hedge_builder; std::vector hedges; - using HedgeStateMap = boost::container::flat_map; + using HedgeStateMap = + boost::container::flat_map; HedgeStateMap hedges_state; - + double tick_size; bool has_activated_child; }; -BookAlgo::BookAlgo() : me(new PImpl()) -{ -} +BookAlgo::BookAlgo() : me(new PImpl()) {} BookAlgo::~BookAlgo() {} - - -const api::orderman::OrderDefinition& BookAlgo::definition() const -{ +const api::orderman::OrderDefinition &BookAlgo::definition() const { return me->def; } -const api::orderman::OrderState& BookAlgo::this_state() const -{ +const api::orderman::OrderState &BookAlgo::this_state() const { return me->state; } - -void BookAlgo::set_price(double p) -{ - me->state.set_price(p); -} - -void BookAlgo::set_quantity(uint32_t s) -{ - me->state.set_quantity(s); -} -const api::orderman::OrderState& BookAlgo::child_state() const -{ +void BookAlgo::set_price(double p) { me->state.set_price(p); } + +void BookAlgo::set_quantity(uint32_t s) { me->state.set_quantity(s); } + +const api::orderman::OrderState &BookAlgo::child_state() const { return me->child_state; } - -void BookAlgo::set_child_price(double p) -{ - me->child_state.set_price(p); -} -void BookAlgo::set_child_quantity(uint32_t s) -{ +void BookAlgo::set_child_price(double p) { me->child_state.set_price(p); } + +void BookAlgo::set_child_quantity(uint32_t s) { me->child_state.set_quantity(s); } -void BookAlgo::activate_child(Price p, Quantity q) -{ - //per Pedro, activating the child is not a synchronous calls, and he asserts that this is done only once - if(!me->has_activated_child) - { +void BookAlgo::activate_child(Price p, Quantity q) { + // per Pedro, activating the child is not a synchronous calls, and he asserts + // that this is done only once + if (!me->has_activated_child) { me->child.activate(p, q); me->has_activated_child = true; } -} - -void BookAlgo::update_child(Price p, Quantity q) -{ - me->child.update(p, q); -} +} -void BookAlgo::cancel_child() -{ - me->child.cancel(); -} +void BookAlgo::update_child(Price p, Quantity q) { me->child.update(p, q); } -void BookAlgo::build_and_send_hedge(Price p, Quantity q) -{ - auto hedge = me->hedge_builder.build(); +void BookAlgo::cancel_child() { me->child.cancel(); } + +void BookAlgo::build_and_send_hedge(Price p, Quantity q) { + auto hedge = me->hedge_builder.build(); me->hedges.push_back(std::move(hedge)); - me->hedges.back().activate(p, q); + me->hedges.back().activate(p, q); } -double BookAlgo::tick_size() const -{ - return me->tick_size; -} +double BookAlgo::tick_size() const { return me->tick_size; } -void BookAlgo::on_init_new(const api::orderman::OrderDefinition& def, - const PreActivationOrderServices &services) -{ +void BookAlgo::on_init_new(const api::orderman::OrderDefinition &def, + const PreActivationOrderServices &services) { me->services = nullptr; me->def = def; - - me->child_state.set_status(ORDER_STATUS_INACTIVE); + + me->child_state.set_status(ORDER_STATUS_INACTIVE); OrderDefinition child_def = def; setup_child(def, services, me->child_state, &child_def); me->child_builder = OrderBuilder(key(), child_def, services, 1); - - OrderDefinition hedge_def = def; + + OrderDefinition hedge_def = def; me->supports_hedge = setup_hedge(def, services, &hedge_def); - if(me->supports_hedge) - me->hedge_builder = OrderBuilder(key(), hedge_def, services, 4); - - const bts::api::Security* sec = services.sec_db.resolve(SecurityKey(def.security_key())); - if(sec) - { + if (me->supports_hedge) + me->hedge_builder = OrderBuilder(key(), hedge_def, services, 4); + + const bts::api::Security *sec = + services.sec_db.resolve(SecurityKey(def.security_key())); + if (sec) { me->tick_size = sec->contract_spec().low_tick(); transition(ORDER_STATUS_INACTIVE); - } - else - { + } else { auto msg = fmt::format("Unknown security: {}", def.security_key()); me->state.set_last_msg(msg); - transition(ORDER_STATUS_REJECTED_BY_SPARK, msg); + transition(ORDER_STATUS_REJECTED_BY_SPARK, msg); } } -void BookAlgo::on_init_recovered(const api::orderman::OrderRecord& rec, - const PreActivationOrderServices &) -{ +void BookAlgo::on_init_recovered(const api::orderman::OrderRecord &rec, + const PreActivationOrderServices &) { auto const &def = rec.def(); me->def = def; me->state = rec.state(); - switch (me->state.status()) - { - case ORDER_STATUS_WORKING: - { + switch (me->state.status()) { + case ORDER_STATUS_WORKING: { auto msg = "System restarted with active BookAlgo"; me->state.set_last_msg(msg); transition(ORDER_STATUS_ERROR, msg); @@ -174,24 +139,24 @@ void BookAlgo::on_init_recovered(const api::orderman::OrderRecord& rec, } } -void BookAlgo::on_activate(Price p, Quantity q, OrderServices& services,PerfTrace const&) -{ +void BookAlgo::on_activate(Price p, Quantity q, OrderServices &services, + trace::CorID const &) { bts_assert(!me->services); me->services = &services; - switch (this_state().status()) - { + switch (this_state().status()) { case ORDER_STATUS_INACTIVE: - me->child_builder.activate(services); - if(me->supports_hedge) + me->child_builder.activate(services); + if (me->supports_hedge) me->hedge_builder.activate(services); - + me->child = me->child_builder.build(); set_price(p.value()); set_quantity(q.value()); - services.child_updates.sub(key(), - [this](auto const &os) { this->on_child_order_update(os); }); - services.book_updates.sub(SecurityKey(me->def.security_key()), - [this](auto const &b) { this->on_book_update(b); }); + services.subscribe_to_child_updates( + [this](auto const &os) { this->on_child_order_update(os); }); + services.subscribe_to_book( + SecurityKey(me->def.security_key()), + [this](auto const &b) { this->on_book_update(b); }); transition(ORDER_STATUS_WORKING); break; @@ -207,7 +172,7 @@ void BookAlgo::on_activate(Price p, Quantity q, OrderServices& services,PerfTrac // state) case ORDER_STATUS_WORKING: case ORDER_STATUS_PENDING_WORKING: - case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_DISCONNECTED: case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: bts_assert(false); @@ -216,14 +181,11 @@ void BookAlgo::on_activate(Price p, Quantity q, OrderServices& services,PerfTrac report_state(); } -void BookAlgo::on_update(Price p, Quantity q,PerfTrace const&) -{ +void BookAlgo::on_update(Price p, Quantity q, trace::CorID const &) { LOG(OrderMan, Info, "Updating BookAlgo {}", key().value()); - switch (this_state().status()) - { + switch (this_state().status()) { case ORDER_STATUS_WORKING: - switch (child_state().status()) - { + switch (child_state().status()) { case ORDER_STATUS_INACTIVE: set_price(p.value()); set_quantity(q.value()); @@ -231,8 +193,8 @@ void BookAlgo::on_update(Price p, Quantity q,PerfTrace const&) case ORDER_STATUS_WORKING: set_price(p.value()); set_quantity(q.value()); - if(!me->fake_detached_child) - me->child.update(p,q); + if (!me->fake_detached_child) + me->child.update(p, q); break; case ORDER_STATUS_PENDING_WORKING: // we launched our child but we are not yet able @@ -242,7 +204,7 @@ void BookAlgo::on_update(Price p, Quantity q,PerfTrace const&) // if the child was in any of these states we couldn't be // in the working state - case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_DISCONNECTED: case ORDER_STATUS_ERROR: case ORDER_STATUS_REJECTED_BY_SPARK: case ORDER_STATUS_COMPLETED: @@ -273,25 +235,22 @@ void BookAlgo::on_update(Price p, Quantity q,PerfTrace const&) report_state(); } -void BookAlgo::on_crack(PerfTrace const&) {} +void BookAlgo::on_crack(trace::CorID const &) {} -void BookAlgo::on_cancel(PerfTrace const&) -{ +void BookAlgo::on_cancel(trace::CorID const &) { LOG(OrderMan, Info, "Canceling BookAlgo Order {}", key().value()); - switch (this_state().status()) - { + switch (this_state().status()) { case ORDER_STATUS_WORKING: - switch (child_state().status()) - { + switch (child_state().status()) { case ORDER_STATUS_INACTIVE: transition(ORDER_STATUS_CANCELED); break; case ORDER_STATUS_WORKING: - if(!me->fake_detached_child) + if (!me->fake_detached_child) me->child.cancel(); - for(auto& i : me->hedges) - i.crack(); + for (auto &i : me->hedges) + i.crack(); transition(ORDER_STATUS_CANCELED); break; case ORDER_STATUS_PENDING_WORKING: @@ -300,7 +259,7 @@ void BookAlgo::on_cancel(PerfTrace const&) break; // child cannot be in any of these if we are in the working state - case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_DISCONNECTED: case ORDER_STATUS_ERROR: case ORDER_STATUS_REJECTED_BY_SPARK: case ORDER_STATUS_COMPLETED: @@ -330,53 +289,50 @@ void BookAlgo::on_cancel(PerfTrace const&) report_state(); } -void BookAlgo::transition(api::orderman::OrderStatus new_status, std::string msg) -{ +void BookAlgo::transition(api::orderman::OrderStatus new_status, + std::string msg) { auto const &from = OrderStatus_Name(me->state.status()); auto const &to = OrderStatus_Name(new_status); - LOG(OrderMan, Info, "Transitioning BookAlgo {} from {} to {}. Msg: {}", key().value(), from, to, msg); + LOG(OrderMan, Info, "Transitioning BookAlgo {} from {} to {}. Msg: {}", + key().value(), from, to, msg); me->state.set_status(new_status); } -void BookAlgo::on_child_order_update(const OrderStateUpdateEvent& ev) -{ - if(me->fake_detached_child) - return; - if(ev.key != me->child.key()) +void BookAlgo::on_child_order_update(const OrderStateUpdateEvent &ev) { + if (me->fake_detached_child) + return; + if (ev.key != me->child.key()) me->hedges_state[ev.key] = ev.rebuild_state(); - else - { + else { api::orderman::OrderState orig_state = child_state(); me->child_state = ev.rebuild_state(); - switch (this_state().status()) - { + switch (this_state().status()) { case ORDER_STATUS_WORKING: - switch (ev.status) - { - case ORDER_STATUS_PENDING_WORKING: - break; - case ORDER_STATUS_WORKING: - if(me->supports_hedge) - send_hedge_if_new_fills(orig_state, ev); - break; - case ORDER_STATUS_COMPLETED: - transition(ORDER_STATUS_COMPLETED); - if(me->supports_hedge) - send_hedge_if_new_fills(orig_state, ev); - break; + switch (ev.status) { + case ORDER_STATUS_PENDING_WORKING: + break; + case ORDER_STATUS_WORKING: + if (me->supports_hedge) + send_hedge_if_new_fills(orig_state, ev); + break; + case ORDER_STATUS_COMPLETED: + transition(ORDER_STATUS_COMPLETED); + if (me->supports_hedge) + send_hedge_if_new_fills(orig_state, ev); + break; - case ORDER_STATUS_DISCONNECTED: - case ORDER_STATUS_REJECTED_BY_SPARK: - case ORDER_STATUS_CANCELED: - case ORDER_STATUS_ERROR: - transition(ORDER_STATUS_ERROR, "Unexpected child order state"); - break; + case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_REJECTED_BY_SPARK: + case ORDER_STATUS_CANCELED: + case ORDER_STATUS_ERROR: + transition(ORDER_STATUS_ERROR, "Unexpected child order state"); + break; - case ORDER_STATUS_INACTIVE: - case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: - case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: - bts_assert(false); - break; + case ORDER_STATUS_INACTIVE: + case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: + case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: + bts_assert(false); + break; } break; @@ -398,52 +354,56 @@ void BookAlgo::on_child_order_update(const OrderStateUpdateEvent& ev) report_state(); } -void BookAlgo::report_state() -{ +void BookAlgo::report_state() { auto merged_state = me->state; merged_state.set_filled_quantity(child_state().filled_quantity()); merged_state.set_last_price(child_state().last_price()); merged_state.set_avg_price(child_state().avg_price()); - merged_state.set_display_status(bts::api::orderman::OrderState_DisplayStatus::OrderState_DisplayStatus_HIDDEN); + merged_state.set_display_status( + bts::api::orderman::OrderState_DisplayStatus:: + OrderState_DisplayStatus_HIDDEN); me->services->report_state(merged_state); } -void BookAlgo::payup(const md::PriceSize& opposite, const bts::orderman::BookUpdateEvent&, uint32_t cross_ticks) -{ +void BookAlgo::payup(const md::PriceSize &opposite, + const bts::orderman::BookUpdateEvent &, + uint32_t cross_ticks) { double new_price = opposite.price() + me->tick_size * cross_ticks; me->child.update(Price(new_price), Quantity(this_state().quantity())); report_state(); } -void BookAlgo::paydown(const md::PriceSize& opposite, const bts::orderman::BookUpdateEvent&, uint32_t cross_ticks) -{ +void BookAlgo::paydown(const md::PriceSize &opposite, + const bts::orderman::BookUpdateEvent &, + uint32_t cross_ticks) { double new_price = opposite.price() - me->tick_size * cross_ticks; me->child.update(Price(new_price), Quantity(this_state().quantity())); report_state(); } -void BookAlgo::detach(bts::api::orderman::OrderStatus status_after_detach) -{ +void BookAlgo::detach(bts::api::orderman::OrderStatus status_after_detach) { me->fake_detached_child = true; me->child.crack(); transition(status_after_detach); report_state(); } -void BookAlgo::on_book_update(const bts::orderman::BookUpdateEvent&) {} +void BookAlgo::on_book_update(const bts::orderman::BookUpdateEvent &) {} -bool BookAlgo::setup_hedge(const api::orderman::OrderDefinition&, const PreActivationOrderServices&, api::orderman::OrderDefinition*) -{ - return false; +bool BookAlgo::setup_hedge(const api::orderman::OrderDefinition &, + const PreActivationOrderServices &, + api::orderman::OrderDefinition *) { + return false; } -void BookAlgo::send_hedge_if_new_fills(const api::orderman::OrderState& orig_state, const OrderStateUpdateEvent& new_state) -{ - UNUSED(orig_state);UNUSED(new_state); - // uint32_t qty = new_state.state.filled_quantity() - orig_state.filled_quantity(); - // UNUSED(qty); -} - -} +void BookAlgo::send_hedge_if_new_fills( + const api::orderman::OrderState &orig_state, + const OrderStateUpdateEvent &new_state) { + UNUSED(orig_state); + UNUSED(new_state); + // uint32_t qty = new_state.state.filled_quantity() - + // orig_state.filled_quantity(); UNUSED(qty); } +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/orders/book_algos/BookAlgo.h b/src/lib/orderman/orders/book_algos/BookAlgo.h index 7c01878a0..689bb1da0 100644 --- a/src/lib/orderman/orders/book_algos/BookAlgo.h +++ b/src/lib/orderman/orders/book_algos/BookAlgo.h @@ -24,10 +24,10 @@ public: const PreActivationOrderServices&) override; void on_init_recovered(const api::orderman::OrderRecord&, const PreActivationOrderServices &) override; - void on_activate(Price,Quantity,OrderServices &, PerfTrace const&) override ; - void on_update(Price , Quantity,PerfTrace const&) override ; - void on_crack(PerfTrace const&) override ; - void on_cancel(PerfTrace const&) override ; + void on_activate(Price,Quantity,OrderServices &, trace::CorID const&) override ; + void on_update(Price , Quantity,trace::CorID const&) override ; + void on_crack(trace::CorID const&) override ; + void on_cancel(trace::CorID const&) override ; protected: virtual void setup_child(const api::orderman::OrderDefinition& parent, const PreActivationOrderServices&, diff --git a/src/lib/orderman/orders/book_algos/CoverOrder.cpp b/src/lib/orderman/orders/book_algos/CoverOrder.cpp index de1f773be..2805859e4 100644 --- a/src/lib/orderman/orders/book_algos/CoverOrder.cpp +++ b/src/lib/orderman/orders/book_algos/CoverOrder.cpp @@ -10,94 +10,87 @@ namespace orderman { using namespace api::orderman; -struct CoverOrder::PImpl -{ +struct CoverOrder::PImpl { PImpl() {} - - int hedge_ticks; - OrderDefinition hedge_def; -}; + int hedge_ticks; + OrderDefinition hedge_def; +}; CoverOrder::CoverOrder() : me(new PImpl()) {} CoverOrder::~CoverOrder() {} -void CoverOrder::setup_child(const api::orderman::OrderDefinition& this_def, const PreActivationOrderServices&, - api::orderman::OrderState& initial_state, api::orderman::OrderDefinition* out_child) -{ +void CoverOrder::setup_child(const api::orderman::OrderDefinition &this_def, + const PreActivationOrderServices &, + api::orderman::OrderState &initial_state, + api::orderman::OrderDefinition *out_child) { initial_state.mutable_cover(); - auto const &cover_def = this_def.custom_def().cover(); + auto const &cover_def = this_def.custom_def().cover(); *out_child->mutable_custom_def() = cover_def.child(); - - me->hedge_ticks = cover_def.hedge_ticks(); + + me->hedge_ticks = cover_def.hedge_ticks(); } -bool CoverOrder::setup_hedge(const api::orderman::OrderDefinition& this_def, const PreActivationOrderServices&, - api::orderman::OrderDefinition* out_hedge) -{ +bool CoverOrder::setup_hedge(const api::orderman::OrderDefinition &this_def, + const PreActivationOrderServices &, + api::orderman::OrderDefinition *out_hedge) { auto const &cover_def = this_def.custom_def().cover(); - if(cover_def.has_hedge()) - { - *out_hedge->mutable_custom_def() = cover_def.hedge(); - if(definition().side() == api::SIDE_BUY) + if (cover_def.has_hedge()) { + *out_hedge->mutable_custom_def() = cover_def.hedge(); + if (definition().side() == api::SIDE_BUY) out_hedge->set_side(api::SIDE_SELL); else out_hedge->set_side(api::SIDE_BUY); return true; - } - else + } else return false; } -void CoverOrder::send_hedge_if_new_fills(const api::orderman::OrderState& orig_state, const OrderStateUpdateEvent& new_state) -{ +void CoverOrder::send_hedge_if_new_fills( + const api::orderman::OrderState &orig_state, + const OrderStateUpdateEvent &new_state) { uint32_t qty = new_state.filled_quantity - orig_state.filled_quantity(); - if(qty > 0) - { + if (qty > 0) { double prx = new_state.last_price; - if(definition().side() == api::SIDE_BUY) //if this is a buy, I'm going to sell my hedge, nticks higher than the fill price + if (definition().side() == + api::SIDE_BUY) // if this is a buy, I'm going to sell my hedge, nticks + // higher than the fill price prx = prx + tick_size() * me->hedge_ticks; else prx = prx - tick_size() * me->hedge_ticks; - + build_and_send_hedge(Price(prx), Quantity(qty)); } } -void CoverOrder::on_book_update(const bts::orderman::BookUpdateEvent& ) -{ - switch (this_state().status()) - { +void CoverOrder::on_book_update(const bts::orderman::BookUpdateEvent &) { + switch (this_state().status()) { case ORDER_STATUS_WORKING: - switch (child_state().status()) - { - case ORDER_STATUS_INACTIVE: - { - activate_child(Price(this_state().price()), Quantity(this_state().quantity())); - transition(ORDER_STATUS_WORKING); - report_state(); - } - break; - case ORDER_STATUS_WORKING: - { - } - break; - - case ORDER_STATUS_PENDING_WORKING: - break; + switch (child_state().status()) { + case ORDER_STATUS_INACTIVE: { + activate_child(Price(this_state().price()), + Quantity(this_state().quantity())); + transition(ORDER_STATUS_WORKING); + report_state(); + } break; + case ORDER_STATUS_WORKING: { + } break; - // child cannot be in any of these states if we are in the working state - case ORDER_STATUS_DISCONNECTED: - case ORDER_STATUS_ERROR: - case ORDER_STATUS_REJECTED_BY_SPARK: - case ORDER_STATUS_COMPLETED: - case ORDER_STATUS_CANCELED: - case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: - case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: - bts_assert(false); - break; - } + case ORDER_STATUS_PENDING_WORKING: + break; + + // child cannot be in any of these states if we are in the working state + case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_ERROR: + case ORDER_STATUS_REJECTED_BY_SPARK: + case ORDER_STATUS_COMPLETED: + case ORDER_STATUS_CANCELED: + case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: + case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: + bts_assert(false); + break; + } break; case ORDER_STATUS_COMPLETED: @@ -113,9 +106,8 @@ void CoverOrder::on_book_update(const bts::orderman::BookUpdateEvent& ) case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: bts_assert(false); break; - } -} - -} + } } +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/orders/book_algos/JoinOrder.cpp b/src/lib/orderman/orders/book_algos/JoinOrder.cpp index 46db1509c..1bf352523 100644 --- a/src/lib/orderman/orders/book_algos/JoinOrder.cpp +++ b/src/lib/orderman/orders/book_algos/JoinOrder.cpp @@ -10,101 +10,90 @@ namespace orderman { using namespace api::orderman; -struct JoinOrder::PImpl -{ +struct JoinOrder::PImpl { PImpl() {} - - spark::QuantityMeasure join_threshold; - - md::PriceSize opposite_at_inception; + + spark::QuantityMeasure join_threshold; + + md::PriceSize opposite_at_inception; bool did_join; }; - JoinOrder::JoinOrder() : me(new PImpl()) {} JoinOrder::~JoinOrder() {} -void JoinOrder::setup_child(const api::orderman::OrderDefinition& this_def, const PreActivationOrderServices&, - api::orderman::OrderState& initial_state, api::orderman::OrderDefinition* out_child) -{ +void JoinOrder::setup_child(const api::orderman::OrderDefinition &this_def, + const PreActivationOrderServices &, + api::orderman::OrderState &initial_state, + api::orderman::OrderDefinition *out_child) { initial_state.mutable_join(); - auto const &join_def = this_def.custom_def().join(); + auto const &join_def = this_def.custom_def().join(); *out_child->mutable_custom_def() = join_def.child(); - + me->join_threshold = join_def.join_threshold(); me->did_join = false; } -void JoinOrder::on_book_update(const bts::orderman::BookUpdateEvent& book) -{ - switch (this_state().status()) - { +void JoinOrder::on_book_update(const bts::orderman::BookUpdateEvent &book) { + switch (this_state().status()) { case ORDER_STATUS_WORKING: - switch (child_state().status()) - { - case ORDER_STATUS_INACTIVE: - { - if(definition().side() == api::SIDE_BUY) - { - me->opposite_at_inception = book.book.side(api::Side::SIDE_SELL)[0]; - activate_child(Price(this_state().price()), Quantity(this_state().quantity())); - transition(ORDER_STATUS_WORKING); - } - else - { - me->opposite_at_inception = book.book.side(api::Side::SIDE_BUY)[0]; - activate_child(Price(this_state().price()), Quantity(this_state().quantity())); - transition(ORDER_STATUS_WORKING); - } - report_state(); + switch (child_state().status()) { + case ORDER_STATUS_INACTIVE: { + if (definition().side() == api::SIDE_BUY) { + me->opposite_at_inception = book.book.side(api::Side::SIDE_SELL)[0]; + activate_child(Price(this_state().price()), + Quantity(this_state().quantity())); + transition(ORDER_STATUS_WORKING); + } else { + me->opposite_at_inception = book.book.side(api::Side::SIDE_BUY)[0]; + activate_child(Price(this_state().price()), + Quantity(this_state().quantity())); + transition(ORDER_STATUS_WORKING); } - break; - case ORDER_STATUS_WORKING: - { - Quantity thresh = SpreaderUtils::_quantity_threshold(me->join_threshold, Quantity(this_state().quantity())); - if(definition().side() == api::SIDE_BUY) - { - const auto& same = book.book.side(api::Side::SIDE_BUY)[0]; - if(me->opposite_at_inception.price() > same.price()) - {} - //we join exactly once, but we can't detach because we have to hang around and look for hedges - else if(!me->did_join && same.size() >= thresh.value()) - { - me->did_join = true; - update_child(Price(same.price()), Quantity(this_state().quantity())); - report_state(); - } + report_state(); + } break; + case ORDER_STATUS_WORKING: { + Quantity thresh = SpreaderUtils::_quantity_threshold( + me->join_threshold, Quantity(this_state().quantity())); + if (definition().side() == api::SIDE_BUY) { + const auto &same = book.book.side(api::Side::SIDE_BUY)[0]; + if (me->opposite_at_inception.price() > same.price()) { } - else - { - const auto& same = book.book.side(api::Side::SIDE_SELL)[0]; - if(me->opposite_at_inception.price() < same.price()) - {} - else if(!me->did_join && same.size() >= thresh.value()) - { - me->did_join = true; - update_child(Price(same.price()), Quantity(this_state().quantity())); - report_state(); - } + // we join exactly once, but we can't detach because we have to hang + // around and look for hedges + else if (!me->did_join && same.size() >= thresh.value()) { + me->did_join = true; + update_child(Price(same.price()), + Quantity(this_state().quantity())); + report_state(); } - } - break; - - case ORDER_STATUS_PENDING_WORKING: - break; + } else { + const auto &same = book.book.side(api::Side::SIDE_SELL)[0]; + if (me->opposite_at_inception.price() < same.price()) { + } else if (!me->did_join && same.size() >= thresh.value()) { + me->did_join = true; + update_child(Price(same.price()), + Quantity(this_state().quantity())); + report_state(); + } + } + } break; - // child cannot be in any of these states if we are in the working state - case ORDER_STATUS_DISCONNECTED: - case ORDER_STATUS_ERROR: - case ORDER_STATUS_REJECTED_BY_SPARK: - case ORDER_STATUS_COMPLETED: - case ORDER_STATUS_CANCELED: - case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: - case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: - bts_assert(false); - break; - } + case ORDER_STATUS_PENDING_WORKING: + break; + + // child cannot be in any of these states if we are in the working state + case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_ERROR: + case ORDER_STATUS_REJECTED_BY_SPARK: + case ORDER_STATUS_COMPLETED: + case ORDER_STATUS_CANCELED: + case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: + case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: + bts_assert(false); + break; + } break; case ORDER_STATUS_COMPLETED: @@ -120,9 +109,8 @@ void JoinOrder::on_book_update(const bts::orderman::BookUpdateEvent& book) case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: bts_assert(false); break; - } -} - -} + } } +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/orders/book_algos/LeanOrder.cpp b/src/lib/orderman/orders/book_algos/LeanOrder.cpp index 8d1213311..f538a8b2e 100644 --- a/src/lib/orderman/orders/book_algos/LeanOrder.cpp +++ b/src/lib/orderman/orders/book_algos/LeanOrder.cpp @@ -10,184 +10,170 @@ namespace orderman { using namespace api::orderman; -struct LeanOrder::PImpl -{ - PImpl() : cross_threshold(), max_chase_ticks(0), trade_toward_behavior(LeanOrderDefinition_OnToward_NO_CHANGE), opposite_at_inception(), num_chases(0) - {} - - spark::QuantityMeasure cross_threshold; - uint32_t max_chase_ticks; +struct LeanOrder::PImpl { + PImpl() + : cross_threshold(), max_chase_ticks(0), + trade_toward_behavior(LeanOrderDefinition_OnToward_NO_CHANGE), + opposite_at_inception(), num_chases(0) {} + + spark::QuantityMeasure cross_threshold; + uint32_t max_chase_ticks; LeanOrderDefinition_OnToward trade_toward_behavior; - - md::PriceSize opposite_at_inception; + + md::PriceSize opposite_at_inception; uint32_t num_chases; }; - LeanOrder::LeanOrder() : me(new PImpl()) {} LeanOrder::~LeanOrder() {} -void LeanOrder::setup_child(const api::orderman::OrderDefinition& this_def, const PreActivationOrderServices&, - api::orderman::OrderState& initial_state, api::orderman::OrderDefinition* out_child) -{ +void LeanOrder::setup_child(const api::orderman::OrderDefinition &this_def, + const PreActivationOrderServices &, + api::orderman::OrderState &initial_state, + api::orderman::OrderDefinition *out_child) { initial_state.mutable_lean(); - auto const &lean_def = this_def.custom_def().lean(); + auto const &lean_def = this_def.custom_def().lean(); *out_child->mutable_custom_def() = lean_def.child(); - + me->cross_threshold = lean_def.cross_threshold(); - me->max_chase_ticks = lean_def.max_chase_ticks(); - me->trade_toward_behavior = lean_def.trade_toward_behavior(); + me->max_chase_ticks = lean_def.max_chase_ticks(); + me->trade_toward_behavior = lean_def.trade_toward_behavior(); } -void LeanOrder::payup(const md::PriceSize&, const bts::orderman::BookUpdateEvent& book, uint32_t cross_ticks /*= 0*/) -{ - double new_price = me->opposite_at_inception.price() + tick_size() * cross_ticks; - double limit = me->opposite_at_inception.price() + tick_size() * me->max_chase_ticks; - if(new_price <= limit) +void LeanOrder::payup(const md::PriceSize &, + const bts::orderman::BookUpdateEvent &book, + uint32_t cross_ticks /*= 0*/) { + double new_price = + me->opposite_at_inception.price() + tick_size() * cross_ticks; + double limit = + me->opposite_at_inception.price() + tick_size() * me->max_chase_ticks; + if (new_price <= limit) update_child(Price(new_price), Quantity(this_state().quantity())); - else - { - update_child(Price(limit), Quantity(this_state().quantity())); + else { + update_child(Price(limit), Quantity(this_state().quantity())); detach(); return; - } - - const bts::orderman::BookSide& sellbook = book.book.side(api::Side::SIDE_SELL); - for(const auto& i : sellbook) - { + } + + const bts::orderman::BookSide &sellbook = + book.book.side(api::Side::SIDE_SELL); + for (const auto &i : sellbook) { me->opposite_at_inception = i; - if(me->opposite_at_inception.price() > new_price) + if (me->opposite_at_inception.price() > new_price) break; - } - if(me->opposite_at_inception.price() <= new_price) - detach(); - me->num_chases += cross_ticks+1; - if(me->num_chases >= me->max_chase_ticks) - detach(); + } + if (me->opposite_at_inception.price() <= new_price) + detach(); + me->num_chases += cross_ticks + 1; + if (me->num_chases >= me->max_chase_ticks) + detach(); report_state(); } -void LeanOrder::paydown(const md::PriceSize&, const bts::orderman::BookUpdateEvent& book, uint32_t cross_ticks /*= 0*/) -{ - double new_price = me->opposite_at_inception.price() - tick_size() * cross_ticks; - double limit = me->opposite_at_inception.price() - tick_size() * me->max_chase_ticks; - if(new_price >= limit) +void LeanOrder::paydown(const md::PriceSize &, + const bts::orderman::BookUpdateEvent &book, + uint32_t cross_ticks /*= 0*/) { + double new_price = + me->opposite_at_inception.price() - tick_size() * cross_ticks; + double limit = + me->opposite_at_inception.price() - tick_size() * me->max_chase_ticks; + if (new_price >= limit) update_child(Price(new_price), Quantity(this_state().quantity())); - else - { - update_child(Price(limit), Quantity(this_state().quantity())); + else { + update_child(Price(limit), Quantity(this_state().quantity())); detach(); return; - } - - const bts::orderman::BookSide& buybook = book.book.side(api::Side::SIDE_BUY); - for(const auto& i : buybook) - { + } + + const bts::orderman::BookSide &buybook = book.book.side(api::Side::SIDE_BUY); + for (const auto &i : buybook) { me->opposite_at_inception = i; - if(me->opposite_at_inception.price() < new_price) + if (me->opposite_at_inception.price() < new_price) break; - } - if(me->opposite_at_inception.price() >= new_price) - detach(); - me->num_chases += cross_ticks+1; - if(me->num_chases >= me->max_chase_ticks) - detach(); + } + if (me->opposite_at_inception.price() >= new_price) + detach(); + me->num_chases += cross_ticks + 1; + if (me->num_chases >= me->max_chase_ticks) + detach(); report_state(); } -void LeanOrder::choose_trade_toward_behavior(const md::PriceSize& opposite) -{ - switch (me->trade_toward_behavior) - { - case LeanOrderDefinition_OnToward_CANCEL: - { - cancel_child(); - transition(ORDER_STATUS_CANCELED); - report_state(); - } +void LeanOrder::choose_trade_toward_behavior(const md::PriceSize &opposite) { + switch (me->trade_toward_behavior) { + case LeanOrderDefinition_OnToward_CANCEL: { + cancel_child(); + transition(ORDER_STATUS_CANCELED); + report_state(); + } break; + case LeanOrderDefinition_OnToward_DETACH: { + detach(); + } break; + case LeanOrderDefinition_OnToward_REPRICE: { + me->opposite_at_inception = opposite; + } break; + case LeanOrderDefinition_OnToward_NO_CHANGE: + default: break; - case LeanOrderDefinition_OnToward_DETACH: - { - detach(); - } - break; - case LeanOrderDefinition_OnToward_REPRICE: - { - me->opposite_at_inception = opposite; - } - break; - case LeanOrderDefinition_OnToward_NO_CHANGE: - default: - break; - } + } } -void LeanOrder::on_book_update(const bts::orderman::BookUpdateEvent& book) -{ - switch (this_state().status()) - { +void LeanOrder::on_book_update(const bts::orderman::BookUpdateEvent &book) { + switch (this_state().status()) { case ORDER_STATUS_WORKING: - switch (child_state().status()) - { - case ORDER_STATUS_INACTIVE: - { - if(definition().side() == api::SIDE_BUY) - me->opposite_at_inception = book.book.side(api::Side::SIDE_SELL)[0]; - else - me->opposite_at_inception = book.book.side(api::Side::SIDE_BUY)[0]; - - activate_child(Price(this_state().price()), Quantity(this_state().quantity())); - transition(ORDER_STATUS_WORKING); - report_state(); - } - break; - case ORDER_STATUS_WORKING: - { - Quantity thresh = SpreaderUtils::_quantity_threshold(me->cross_threshold, Quantity(this_state().quantity())); - if(definition().side() == api::SIDE_BUY) - { - const auto& opposite = book.book.side(api::Side::SIDE_SELL)[0]; - if(opposite.price() < me->opposite_at_inception.price()) - choose_trade_toward_behavior(opposite); - else if(opposite.price() > me->opposite_at_inception.price()) - payup(opposite, book); //you missed, payup/join - else - { - if(opposite.size() <= thresh.value()) - payup(opposite, book); - } - } - else - { - const auto& opposite = book.book.side(api::Side::SIDE_BUY)[0]; - if(opposite.price() > me->opposite_at_inception.price()) - choose_trade_toward_behavior(opposite); - else if(opposite.price() < me->opposite_at_inception.price()) - paydown(opposite, book); - else - { - if(opposite.size() <= thresh.value()) - paydown(opposite, book); - } - } - } - break; - - case ORDER_STATUS_PENDING_WORKING: - break; + switch (child_state().status()) { + case ORDER_STATUS_INACTIVE: { + if (definition().side() == api::SIDE_BUY) + me->opposite_at_inception = book.book.side(api::Side::SIDE_SELL)[0]; + else + me->opposite_at_inception = book.book.side(api::Side::SIDE_BUY)[0]; - // child cannot be in any of these states if we are in the working state - case ORDER_STATUS_DISCONNECTED: - case ORDER_STATUS_ERROR: - case ORDER_STATUS_REJECTED_BY_SPARK: - case ORDER_STATUS_COMPLETED: - case ORDER_STATUS_CANCELED: - case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: - case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: - bts_assert(false); - break; + activate_child(Price(this_state().price()), + Quantity(this_state().quantity())); + transition(ORDER_STATUS_WORKING); + report_state(); + } break; + case ORDER_STATUS_WORKING: { + Quantity thresh = SpreaderUtils::_quantity_threshold( + me->cross_threshold, Quantity(this_state().quantity())); + if (definition().side() == api::SIDE_BUY) { + const auto &opposite = book.book.side(api::Side::SIDE_SELL)[0]; + if (opposite.price() < me->opposite_at_inception.price()) + choose_trade_toward_behavior(opposite); + else if (opposite.price() > me->opposite_at_inception.price()) + payup(opposite, book); // you missed, payup/join + else { + if (opposite.size() <= thresh.value()) + payup(opposite, book); + } + } else { + const auto &opposite = book.book.side(api::Side::SIDE_BUY)[0]; + if (opposite.price() > me->opposite_at_inception.price()) + choose_trade_toward_behavior(opposite); + else if (opposite.price() < me->opposite_at_inception.price()) + paydown(opposite, book); + else { + if (opposite.size() <= thresh.value()) + paydown(opposite, book); + } } + } break; + + case ORDER_STATUS_PENDING_WORKING: + break; + + // child cannot be in any of these states if we are in the working state + case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_ERROR: + case ORDER_STATUS_REJECTED_BY_SPARK: + case ORDER_STATUS_COMPLETED: + case ORDER_STATUS_CANCELED: + case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: + case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: + bts_assert(false); + break; + } break; case ORDER_STATUS_COMPLETED: @@ -203,9 +189,8 @@ void LeanOrder::on_book_update(const bts::orderman::BookUpdateEvent& book) case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: bts_assert(false); break; - } -} - -} + } } +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/orders/book_algos/OffsetOrder.cpp b/src/lib/orderman/orders/book_algos/OffsetOrder.cpp index fad23cc55..973d1c0ce 100644 --- a/src/lib/orderman/orders/book_algos/OffsetOrder.cpp +++ b/src/lib/orderman/orders/book_algos/OffsetOrder.cpp @@ -10,75 +10,65 @@ namespace orderman { using namespace api::orderman; -struct OffsetOrder::PImpl -{ +struct OffsetOrder::PImpl { PImpl() {} - - uint32_t tick_offset_on_deploy; -}; + uint32_t tick_offset_on_deploy; +}; OffsetOrder::OffsetOrder() : me(new PImpl()) {} OffsetOrder::~OffsetOrder() {} -void OffsetOrder::setup_child(const api::orderman::OrderDefinition& this_def, const PreActivationOrderServices&, - api::orderman::OrderState& initial_state, api::orderman::OrderDefinition* out_child) -{ +void OffsetOrder::setup_child(const api::orderman::OrderDefinition &this_def, + const PreActivationOrderServices &, + api::orderman::OrderState &initial_state, + api::orderman::OrderDefinition *out_child) { initial_state.mutable_tick(); - auto const &offset_def = this_def.custom_def().offset(); + auto const &offset_def = this_def.custom_def().offset(); *out_child->mutable_custom_def() = offset_def.child(); - - me->tick_offset_on_deploy = offset_def.tick_offset_on_deploy(); + + me->tick_offset_on_deploy = offset_def.tick_offset_on_deploy(); } - -void OffsetOrder::on_book_update(const bts::orderman::BookUpdateEvent& book) -{ - switch (this_state().status()) - { +void OffsetOrder::on_book_update(const bts::orderman::BookUpdateEvent &book) { + switch (this_state().status()) { case ORDER_STATUS_WORKING: - switch (child_state().status()) - { - case ORDER_STATUS_INACTIVE: - { - if(definition().side() == api::SIDE_BUY) - { - const auto& same = book.book.side(api::Side::SIDE_BUY)[0]; - double price = same.price() - tick_size() * me->tick_offset_on_deploy; - activate_child(Price(price), Quantity(this_state().quantity())); - transition(ORDER_STATUS_WORKING); - } - else - { - const auto& same = book.book.side(api::Side::SIDE_SELL)[0]; - double price = same.price() + tick_size() * me->tick_offset_on_deploy; - activate_child(Price(price), Quantity(this_state().quantity())); - transition(ORDER_STATUS_WORKING); - } - report_state(); + switch (child_state().status()) { + case ORDER_STATUS_INACTIVE: { + if (definition().side() == api::SIDE_BUY) { + const auto &same = book.book.side(api::Side::SIDE_BUY)[0]; + double price = + same.price() - tick_size() * me->tick_offset_on_deploy; + activate_child(Price(price), Quantity(this_state().quantity())); + transition(ORDER_STATUS_WORKING); + } else { + const auto &same = book.book.side(api::Side::SIDE_SELL)[0]; + double price = + same.price() + tick_size() * me->tick_offset_on_deploy; + activate_child(Price(price), Quantity(this_state().quantity())); + transition(ORDER_STATUS_WORKING); } - break; - case ORDER_STATUS_WORKING: - { - detach(); - } - break; - - case ORDER_STATUS_PENDING_WORKING: - break; + report_state(); + } break; + case ORDER_STATUS_WORKING: { + detach(); + } break; - // child cannot be in any of these states if we are in the working state - case ORDER_STATUS_DISCONNECTED: - case ORDER_STATUS_ERROR: - case ORDER_STATUS_REJECTED_BY_SPARK: - case ORDER_STATUS_COMPLETED: - case ORDER_STATUS_CANCELED: - case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: - case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: - bts_assert(false); - break; - } + case ORDER_STATUS_PENDING_WORKING: + break; + + // child cannot be in any of these states if we are in the working state + case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_ERROR: + case ORDER_STATUS_REJECTED_BY_SPARK: + case ORDER_STATUS_COMPLETED: + case ORDER_STATUS_CANCELED: + case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: + case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: + bts_assert(false); + break; + } break; case ORDER_STATUS_COMPLETED: @@ -94,9 +84,8 @@ void OffsetOrder::on_book_update(const bts::orderman::BookUpdateEvent& book) case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: bts_assert(false); break; - } -} - -} + } } +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/orders/book_algos/TickOrder.cpp b/src/lib/orderman/orders/book_algos/TickOrder.cpp index 105d74084..d05404458 100644 --- a/src/lib/orderman/orders/book_algos/TickOrder.cpp +++ b/src/lib/orderman/orders/book_algos/TickOrder.cpp @@ -10,165 +10,146 @@ namespace orderman { using namespace api::orderman; -struct TickOrder::PImpl -{ +struct TickOrder::PImpl { PImpl() {} - - uint32_t tick_offset_on_deploy; - spark::QuantityMeasure cross_threshold; - uint32_t cross_ticks; - uint32_t max_chase_ticks; - bool detach_on_toward; - - md::PriceSize opposite_at_inception; -}; + uint32_t tick_offset_on_deploy; + spark::QuantityMeasure cross_threshold; + uint32_t cross_ticks; + uint32_t max_chase_ticks; + bool detach_on_toward; + + md::PriceSize opposite_at_inception; +}; TickOrder::TickOrder() : me(new PImpl()) {} TickOrder::~TickOrder() {} -void TickOrder::setup_child(const api::orderman::OrderDefinition& this_def, const PreActivationOrderServices&, - api::orderman::OrderState& initial_state, api::orderman::OrderDefinition* out_child) -{ +void TickOrder::setup_child(const api::orderman::OrderDefinition &this_def, + const PreActivationOrderServices &, + api::orderman::OrderState &initial_state, + api::orderman::OrderDefinition *out_child) { initial_state.mutable_tick(); - auto const &tick_def = this_def.custom_def().tick(); + auto const &tick_def = this_def.custom_def().tick(); *out_child->mutable_custom_def() = tick_def.child(); - - me->tick_offset_on_deploy = tick_def.tick_offset_on_deploy(); + + me->tick_offset_on_deploy = tick_def.tick_offset_on_deploy(); me->cross_threshold = tick_def.cross_threshold(); me->cross_ticks = tick_def.cross_ticks(); - me->max_chase_ticks = tick_def.max_chase_ticks(); + me->max_chase_ticks = tick_def.max_chase_ticks(); me->cross_threshold = tick_def.cross_threshold(); - me->detach_on_toward = tick_def.detach_on_toward(); + me->detach_on_toward = tick_def.detach_on_toward(); } -void TickOrder::payup(const md::PriceSize& opposite, const bts::orderman::BookUpdateEvent&, uint32_t cross_ticks) -{ +void TickOrder::payup(const md::PriceSize &opposite, + const bts::orderman::BookUpdateEvent &, + uint32_t cross_ticks) { double new_price = opposite.price() + tick_size() * cross_ticks; - double limit = me->opposite_at_inception.price() + tick_size() * me->max_chase_ticks; - if(new_price <= limit) + double limit = + me->opposite_at_inception.price() + tick_size() * me->max_chase_ticks; + if (new_price <= limit) update_child(Price(new_price), Quantity(this_state().quantity())); - else - { + else { update_child(Price(limit), Quantity(this_state().quantity())); detach(); } report_state(); } -void TickOrder::paydown(const md::PriceSize& opposite, const bts::orderman::BookUpdateEvent&, uint32_t cross_ticks) -{ +void TickOrder::paydown(const md::PriceSize &opposite, + const bts::orderman::BookUpdateEvent &, + uint32_t cross_ticks) { double new_price = opposite.price() - tick_size() * cross_ticks; - double limit = me->opposite_at_inception.price() - tick_size() * me->max_chase_ticks; - if(new_price >= limit) + double limit = + me->opposite_at_inception.price() - tick_size() * me->max_chase_ticks; + if (new_price >= limit) update_child(Price(new_price), Quantity(this_state().quantity())); - else - { - update_child(Price(limit), Quantity(this_state().quantity())); + else { + update_child(Price(limit), Quantity(this_state().quantity())); detach(); } report_state(); } -void TickOrder::on_book_update(const bts::orderman::BookUpdateEvent& book) -{ - switch (this_state().status()) - { +void TickOrder::on_book_update(const bts::orderman::BookUpdateEvent &book) { + switch (this_state().status()) { case ORDER_STATUS_WORKING: - switch (child_state().status()) - { - case ORDER_STATUS_INACTIVE: - { - if(definition().side() == api::SIDE_BUY) - { - me->opposite_at_inception = book.book.side(api::Side::SIDE_SELL)[0]; - if(me->tick_offset_on_deploy > 0) - { - double price = me->opposite_at_inception.price() - tick_size() * me->tick_offset_on_deploy; - activate_child(Price(price), Quantity(this_state().quantity())); - transition(ORDER_STATUS_WORKING); - } - else - { - activate_child(Price(this_state().price()), Quantity(this_state().quantity())); - transition(ORDER_STATUS_WORKING); - } + switch (child_state().status()) { + case ORDER_STATUS_INACTIVE: { + if (definition().side() == api::SIDE_BUY) { + me->opposite_at_inception = book.book.side(api::Side::SIDE_SELL)[0]; + if (me->tick_offset_on_deploy > 0) { + double price = me->opposite_at_inception.price() - + tick_size() * me->tick_offset_on_deploy; + activate_child(Price(price), Quantity(this_state().quantity())); + transition(ORDER_STATUS_WORKING); + } else { + activate_child(Price(this_state().price()), + Quantity(this_state().quantity())); + transition(ORDER_STATUS_WORKING); } - else - { - me->opposite_at_inception = book.book.side(api::Side::SIDE_BUY)[0]; - if(me->tick_offset_on_deploy > 0) - { - double price = me->opposite_at_inception.price() + tick_size() * me->tick_offset_on_deploy; - activate_child(Price(price), Quantity(this_state().quantity())); - transition(ORDER_STATUS_WORKING); - } - else - { - activate_child(Price(this_state().price()), Quantity(this_state().quantity())); - transition(ORDER_STATUS_WORKING); - } + } else { + me->opposite_at_inception = book.book.side(api::Side::SIDE_BUY)[0]; + if (me->tick_offset_on_deploy > 0) { + double price = me->opposite_at_inception.price() + + tick_size() * me->tick_offset_on_deploy; + activate_child(Price(price), Quantity(this_state().quantity())); + transition(ORDER_STATUS_WORKING); + } else { + activate_child(Price(this_state().price()), + Quantity(this_state().quantity())); + transition(ORDER_STATUS_WORKING); } - report_state(); } - break; - case ORDER_STATUS_WORKING: - { - Quantity thresh = SpreaderUtils::_quantity_threshold(me->cross_threshold, Quantity(this_state().quantity())); - if(definition().side() == api::SIDE_BUY) - { - const auto& opposite = book.book.side(api::Side::SIDE_SELL)[0]; - if(opposite.price() < me->opposite_at_inception.price()) - { - if(me->detach_on_toward) - detach(); - else - me->opposite_at_inception = opposite; - } - else if(opposite.price() > me->opposite_at_inception.price()) + report_state(); + } break; + case ORDER_STATUS_WORKING: { + Quantity thresh = SpreaderUtils::_quantity_threshold( + me->cross_threshold, Quantity(this_state().quantity())); + if (definition().side() == api::SIDE_BUY) { + const auto &opposite = book.book.side(api::Side::SIDE_SELL)[0]; + if (opposite.price() < me->opposite_at_inception.price()) { + if (me->detach_on_toward) + detach(); + else + me->opposite_at_inception = opposite; + } else if (opposite.price() > me->opposite_at_inception.price()) + payup(opposite, book, me->cross_ticks); + else { + if (opposite.size() <= thresh.value()) payup(opposite, book, me->cross_ticks); - else - { - if(opposite.size() <= thresh.value()) - payup(opposite, book, me->cross_ticks); - } } - else - { - const auto& opposite = book.book.side(api::Side::SIDE_BUY)[0]; - if(opposite.price() > me->opposite_at_inception.price()) - { - if(me->detach_on_toward) - detach(); - else - me->opposite_at_inception = opposite; - } - else if(opposite.price() < me->opposite_at_inception.price()) + } else { + const auto &opposite = book.book.side(api::Side::SIDE_BUY)[0]; + if (opposite.price() > me->opposite_at_inception.price()) { + if (me->detach_on_toward) + detach(); + else + me->opposite_at_inception = opposite; + } else if (opposite.price() < me->opposite_at_inception.price()) + paydown(opposite, book, me->cross_ticks); + else { + if (opposite.size() <= thresh.value()) paydown(opposite, book, me->cross_ticks); - else - { - if(opposite.size() <= thresh.value()) - paydown(opposite, book, me->cross_ticks); - } } - } - break; - - case ORDER_STATUS_PENDING_WORKING: - break; - - // child cannot be in any of these states if we are in the working state - case ORDER_STATUS_DISCONNECTED: - case ORDER_STATUS_ERROR: - case ORDER_STATUS_REJECTED_BY_SPARK: - case ORDER_STATUS_COMPLETED: - case ORDER_STATUS_CANCELED: - case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: - case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: - bts_assert(false); - break; } + } break; + + case ORDER_STATUS_PENDING_WORKING: + break; + + // child cannot be in any of these states if we are in the working state + case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_ERROR: + case ORDER_STATUS_REJECTED_BY_SPARK: + case ORDER_STATUS_COMPLETED: + case ORDER_STATUS_CANCELED: + case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: + case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: + bts_assert(false); + break; + } break; case ORDER_STATUS_COMPLETED: @@ -184,9 +165,8 @@ void TickOrder::on_book_update(const bts::orderman::BookUpdateEvent& book) case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: bts_assert(false); break; - } -} - -} + } } +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/orders/book_algos/TopOrder.cpp b/src/lib/orderman/orders/book_algos/TopOrder.cpp index 1feb1e6cf..8fded05b5 100644 --- a/src/lib/orderman/orders/book_algos/TopOrder.cpp +++ b/src/lib/orderman/orders/book_algos/TopOrder.cpp @@ -1,8 +1,8 @@ #include "TopOrder.h" +#include "lib/domain_model/Security.h" #include "lib/orderman/actors/order_manager/OrderBuilder.h" #include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" -#include "lib/domain_model/Security.h" #include "lib/utils/PBUtils.h" #include @@ -11,118 +11,102 @@ namespace orderman { using namespace api::orderman; -struct TopOrder::PImpl -{ +struct TopOrder::PImpl { PImpl() {} - - uint32_t watch_level_tick_offset; - spark::QuantityMeasure top_threshold; -}; + uint32_t watch_level_tick_offset; + spark::QuantityMeasure top_threshold; +}; TopOrder::TopOrder() : me(new PImpl()) {} TopOrder::~TopOrder() {} -void TopOrder::setup_child(const api::orderman::OrderDefinition& this_def, const PreActivationOrderServices&, - api::orderman::OrderState& initial_state, api::orderman::OrderDefinition* out_child) -{ +void TopOrder::setup_child(const api::orderman::OrderDefinition &this_def, + const PreActivationOrderServices &, + api::orderman::OrderState &initial_state, + api::orderman::OrderDefinition *out_child) { initial_state.mutable_top(); auto const &top_def = this_def.custom_def().top(); *out_child->mutable_custom_def() = top_def.child(); - + me->watch_level_tick_offset = top_def.watch_level_tick_offset(); me->top_threshold = top_def.top_threshold(); } - -void TopOrder::on_book_update(const bts::orderman::BookUpdateEvent& book) -{ - switch (this_state().status()) - { +void TopOrder::on_book_update(const bts::orderman::BookUpdateEvent &book) { + switch (this_state().status()) { case ORDER_STATUS_WORKING: - switch (child_state().status()) - { - case ORDER_STATUS_INACTIVE: - { - Quantity thresh = SpreaderUtils::_quantity_threshold(me->top_threshold, Quantity(this_state().quantity())); - if(definition().side() == api::SIDE_BUY) - { - const auto& same = book.book.side(api::Side::SIDE_BUY)[0]; - if(securities::test_price_equality(this_state().price(), same.price(), tick_size())) - { - if(same.size() <= thresh.value()) - { - transition(ORDER_STATUS_CANCELED); - report_state(); - return; - } + switch (child_state().status()) { + case ORDER_STATUS_INACTIVE: { + Quantity thresh = SpreaderUtils::_quantity_threshold( + me->top_threshold, Quantity(this_state().quantity())); + if (definition().side() == api::SIDE_BUY) { + const auto &same = book.book.side(api::Side::SIDE_BUY)[0]; + if (securities::test_price_equality(this_state().price(), + same.price(), tick_size())) { + if (same.size() <= thresh.value()) { + transition(ORDER_STATUS_CANCELED); + report_state(); + return; } } - else - { - const auto& same = book.book.side(api::Side::SIDE_SELL)[0]; - if(securities::test_price_equality(this_state().price(), same.price(), tick_size())) - { - if(same.size() <= thresh.value()) - { - transition(ORDER_STATUS_CANCELED); - report_state(); - return; - } - } - } - activate_child(Price(this_state().price()), Quantity(this_state().quantity())); - transition(ORDER_STATUS_WORKING); - report_state(); - } - break; - case ORDER_STATUS_WORKING: - { - Quantity thresh = SpreaderUtils::_quantity_threshold(me->top_threshold, Quantity(this_state().quantity())); - if(definition().side() == api::SIDE_BUY) - { - const auto& same = book.book.side(api::Side::SIDE_BUY)[0]; - if(securities::test_price_equality(this_state().price(), same.price(), tick_size())) - { - if(same.size() <= thresh.value()) - { - cancel_child(); - transition(ORDER_STATUS_CANCELED); - report_state(); - } + } else { + const auto &same = book.book.side(api::Side::SIDE_SELL)[0]; + if (securities::test_price_equality(this_state().price(), + same.price(), tick_size())) { + if (same.size() <= thresh.value()) { + transition(ORDER_STATUS_CANCELED); + report_state(); + return; } } - else - { - const auto& same = book.book.side(api::Side::SIDE_SELL)[0]; - if(securities::test_price_equality(this_state().price(), same.price(), tick_size())) - { - if(same.size() <= thresh.value()) - { - cancel_child(); - transition(ORDER_STATUS_CANCELED); - report_state(); - } - } - } - } - break; - - case ORDER_STATUS_PENDING_WORKING: - break; - - // child cannot be in any of these states if we are in the working state - case ORDER_STATUS_DISCONNECTED: - case ORDER_STATUS_ERROR: - case ORDER_STATUS_REJECTED_BY_SPARK: - case ORDER_STATUS_COMPLETED: - case ORDER_STATUS_CANCELED: - case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: - case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: - bts_assert(false); - break; } + activate_child(Price(this_state().price()), + Quantity(this_state().quantity())); + transition(ORDER_STATUS_WORKING); + report_state(); + } break; + case ORDER_STATUS_WORKING: { + Quantity thresh = SpreaderUtils::_quantity_threshold( + me->top_threshold, Quantity(this_state().quantity())); + if (definition().side() == api::SIDE_BUY) { + const auto &same = book.book.side(api::Side::SIDE_BUY)[0]; + if (securities::test_price_equality(this_state().price(), + same.price(), tick_size())) { + if (same.size() <= thresh.value()) { + cancel_child(); + transition(ORDER_STATUS_CANCELED); + report_state(); + } + } + } else { + const auto &same = book.book.side(api::Side::SIDE_SELL)[0]; + if (securities::test_price_equality(this_state().price(), + same.price(), tick_size())) { + if (same.size() <= thresh.value()) { + cancel_child(); + transition(ORDER_STATUS_CANCELED); + report_state(); + } + } + } + } break; + + case ORDER_STATUS_PENDING_WORKING: + break; + + // child cannot be in any of these states if we are in the working state + case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_ERROR: + case ORDER_STATUS_REJECTED_BY_SPARK: + case ORDER_STATUS_COMPLETED: + case ORDER_STATUS_CANCELED: + case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: + case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: + bts_assert(false); + break; + } break; case ORDER_STATUS_COMPLETED: @@ -138,9 +122,8 @@ void TopOrder::on_book_update(const bts::orderman::BookUpdateEvent& book) case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: bts_assert(false); break; - } -} - -} + } } +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/orders/spreader_orders/ISpreaderStateWorker.h b/src/lib/orderman/orders/spreader_orders/ISpreaderStateWorker.h index c5519bddb..07cefede3 100644 --- a/src/lib/orderman/orders/spreader_orders/ISpreaderStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/ISpreaderStateWorker.h @@ -34,7 +34,7 @@ public: // 5. called when the user cancels an order virtual void on_cancel() = 0; // 6. on market data update (support late joiners) - virtual void on_book(const Book&,PerfTrace &) = 0; + virtual void on_book(const Book&,trace::CorID ) = 0; // 15. settlement price update virtual void on_settlement_price(const SettlementUpdateEvent&) = 0; // 7. time event called by the infrastructure @@ -43,7 +43,7 @@ public: virtual void on_quoter_order_error(SpreaderLegData& leg_data) = 0; // 9. on a quoter order fill virtual void on_quoter_order_fill(SpreaderLegData& leg_data, - PerfTrace &) = 0; + trace::CorID ) = 0; // 10. on a quoter status update without a fill virtual void on_quoter_order_status_update(SpreaderLegData& leg_data) = 0; // 11. when a hedger order ack from the exchange has an error diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp index cccba1190..0737f204f 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp @@ -54,26 +54,26 @@ void SpreaderOrder::on_init_recovered(const bts::api::orderman::OrderRecord& ord _report_state(); } void SpreaderOrder::on_activate(Price price, Quantity quantity, - OrderServices& services, const PerfTrace&){ + OrderServices& services, const trace::CorID&){ if (!_active) return; SpreaderOrderServices spreader_order_services (&services); _on_activate(price, quantity, spreader_order_services); _report_state(); } -void SpreaderOrder::on_update(Price price, Quantity quantity,PerfTrace const&){ +void SpreaderOrder::on_update(Price price, Quantity quantity,trace::CorID const&){ if (!_active) return; LOG(OrderMan, Info, "SpreaderOrder.on_update key:{} price:{} quantity:{}", key().value(), price.value(), quantity.value()); _state_worker->on_update(price, quantity); _report_state(); } -void SpreaderOrder::on_cancel(PerfTrace const&){ +void SpreaderOrder::on_cancel(trace::CorID const&){ if (!_active) return; LOG(OrderMan, Info, "SpreaderOrder.on_cancel key:{}", key().value()); _state_worker->on_cancel(); _report_state(); } -void SpreaderOrder::on_crack(PerfTrace const&){ +void SpreaderOrder::on_crack(trace::CorID const&){ if (!_active) return; LOG(OrderMan, Info, "SpreaderOrder.on_crack key: {}", key().value()); _state_worker->on_crack(); @@ -100,10 +100,9 @@ void SpreaderOrder::_on_time(const bts::mercury::TimerEvent& t_event){ } void SpreaderOrder::_on_book_update(const BookUpdateEvent& book_event){ if (!_active) return; - tracepoint (bts_trace,trace_order,(char*) "_on_book_update", key().value(),book_event.trace.md_sn,0); - auto trace = book_event.trace; - trace.spreader_on_book = utils::TimeStamp::now(); - _state_worker->on_book (book_event.book,trace); + + _order_services->order_services().log(book_event.trace,"spreader_on_book", key().value()); + _state_worker->on_book (book_event.book,book_event.trace); } void SpreaderOrder::_on_settlement_update(const SettlementUpdateEvent& settlement_event){ @@ -116,9 +115,8 @@ void SpreaderOrder::_on_settlement_update(const SettlementUpdateEvent& _state_worker->on_settlement_price(settlement_event); } void SpreaderOrder::_on_child_order_update(const OrderStateUpdateEvent& ord_ev){ - auto trace = ord_ev.trace; - trace.spreader_on_child_order_update = utils::TimeStamp::now(); if (!_active) return; + _order_services->order_services().log(ord_ev.trace,"begin_on_child_order_update", key().value()); SecurityKey sec_key = SecurityKey(ord_ev.definition->security_key()); OrderKey order_key = ord_ev.key; bts::api::orderman::OrderStatus status = ord_ev.status; @@ -150,7 +148,7 @@ void SpreaderOrder::_on_child_order_update(const OrderStateUpdateEvent& ord_ev){ leg_data.order_update_message().on_order_update(ord_ev); if (order_error == ChildOrderError::NONE){ if (leg_data.order_update_message().last_update_filled_quantity().value() > 0) - _state_worker->on_quoter_order_fill (leg_data,trace); + _state_worker->on_quoter_order_fill (leg_data,ord_ev.trace); else _state_worker->on_quoter_order_status_update (leg_data); } @@ -186,8 +184,7 @@ void SpreaderOrder::_on_child_order_update(const OrderStateUpdateEvent& ord_ev){ } _send_check_termination(true); _report_state(); - LOG(Latency,Diag, "_on_child_order_update k:{} t:{}us", key().value(), - (utils::TimeStamp::now() - trace.spreader_on_child_order_update).microseconds()); + _order_services->order_services().log(ord_ev.trace,"end_on_child_order_update", key().value()); } // State Transformations //////////////////// ///////////////////////////////////////////// @@ -315,10 +312,8 @@ bool SpreaderOrder::_quoters_can_accept_modification (){ void SpreaderOrder::_send_hedge(size_t hedge_leg_index, Price hedge_price, Quantity hedge_qty, - const PerfTrace &trace){ - LOG(OrderMan, Info, "SpreaderOrder::_send_hedge key:{} hedge_leg_index:{} " - "hedge_price:{} hedge_qty:{} cid:{}", - key(), hedge_leg_index, hedge_price, hedge_qty, trace.md_sn); + const trace::CorID trace){ + SingleFillHedger& hedger = _bookkeeping_data().add_new_hedger (*this, hedge_leg_index, hedge_price, diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h index 9b377d948..3835e922b 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h @@ -99,15 +99,15 @@ public: const PreActivationOrderServices&) override; // this is in the critical path, orders can be submitted now // (this is only called once and after the on_init_new) - void on_activate(Price, Quantity, OrderServices&,PerfTrace const&) override; + void on_activate(Price, Quantity, OrderServices&,trace::CorID const&) override; // called when the user (or a higher level order) // updates the order's price or quantity - void on_update(Price, Quantity,PerfTrace const&) override; + void on_update(Price, Quantity,trace::CorID const&) override; // called when the user (or higher level order) cancels an order - void on_cancel(PerfTrace const&) override; + void on_cancel(trace::CorID const&) override; // crack means to let the lower level orders lose from the higher // level order and cancel the higher level order - void on_crack(PerfTrace const&) override; + void on_crack(trace::CorID const&) override; // ISpreaderManager //////////////////// //////////////////////////////////////// public: @@ -178,7 +178,7 @@ private: void _send_hedge(size_t hedge_leg_index, Price hedge_price, Quantity hedge_qty, - PerfTrace const&); + trace::CorID const); void _compute_hedge_price_quantity(size_t filled_leg_index, Price filled_price, double filled_quantity, @@ -251,7 +251,7 @@ public: SpreaderBookkeepingData& test_only_func_spreader_full_data () {return _bookkeeping_data();} int64_t test_cancel_timeout () {return _cancel_timeout;} void test_only_on_book_update(const bts::orderman::BookUpdateEvent& b) {_on_book_update(b);} - void test_only_on_book_update(const bts::orderman::Book& b, PerfTrace const&trace) {_on_book_update(bts::orderman::BookUpdateEvent(b, trace));} + void test_only_on_book_update(const bts::orderman::Book& b, trace::CorID const&trace) {_on_book_update(bts::orderman::BookUpdateEvent(b, trace));} void test_only_on_child_order_update (bts::orderman::OrderKey order_key, bts::api::orderman::OrderStatus status, Quantity total_filled_qty, Price avg_price) { bts::api::orderman::OrderDefinition order_def; @@ -260,7 +260,7 @@ public: order_state.set_status(status); order_state.set_filled_quantity(total_filled_qty.value()); order_state.set_last_price(avg_price.value()); - OrderStateUpdateEvent ord_ev (order_key, OrderKey(0), order_def, order_state,PerfTrace()); + OrderStateUpdateEvent ord_ev (order_key, OrderKey(0), order_def, order_state,trace::CorID()); _on_child_order_update (ord_ev); } void test_only_on_init_new(const bts::api::orderman::OrderDefinition& order_def, const SpreaderPreActivationOrderServices& pao_services) {_on_init_new(order_def, pao_services);} diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp index 5025a4c2d..2060e02fd 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp @@ -14,7 +14,7 @@ SingleFillHedger::SingleFillHedger(ISpreaderManager& spreader_manager, ChildOrder& child_order, bts::Price hedge_price, bts::Quantity hedge_quantity, - PerfTrace const &fill_trace, + trace::CorID const &fill_trace, bool is_live) : _spreader(spreader_manager), @@ -94,7 +94,7 @@ void SingleFillHedger::on_order_update(const SpreaderChildOrderState& u){ u.last_update_filled_quantity()); _worker->on_order_update (u); } -void SingleFillHedger::on_book(const bts::orderman::Book& book,PerfTrace &trace){ +void SingleFillHedger::on_book(const bts::orderman::Book& book,trace::CorID &trace){ _worker->on_book (book,trace); } void SingleFillHedger::cancel_hedge(){ diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h index 9b9fa926c..1e3bf495c 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h @@ -30,7 +30,7 @@ private: const LegPropertyData& _leg_property_data; SpreaderChildOrderState _child_order_state; HedgePriceQuantityState _price_quantity_state; - PerfTrace _fill_trace; + trace::CorID _fill_trace; IHedgerStateWorker* _worker; HedgerStartStateWorker _start_state_worker; HedgerWaitingForFirstAckStateWorker _waiting_for_first_ack_state_worker; @@ -71,7 +71,7 @@ public: ChildOrder& child_order, bts::Price hedge_price, bts::Quantity hedge_quantity, - PerfTrace const &trace, + trace::CorID const &trace, bool is_live); SingleFillHedger() = delete; SingleFillHedger (const SingleFillHedger&) = delete; @@ -88,7 +88,7 @@ public: void on_order_update(const SpreaderChildOrderState& order_update_message); //c. called when the market data associated // with this security is changed - void on_book(const bts::orderman::Book& book,PerfTrace &); + void on_book(const bts::orderman::Book& book,trace::CorID &); //d. called when the hedge order is cancelled, either // manually or automatically void cancel_hedge(); diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp index 573b1dbf8..23860e5dd 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp @@ -101,7 +101,7 @@ void SingleLegQuoter::update_order_status(const SpreaderChildOrderState& u){ } } void SingleLegQuoter::on_book(size_t leg_index, - const bts::orderman::Book& book,PerfTrace &trace){ + const bts::orderman::Book& book,trace::CorID trace){ if (_active_quoting) _worker->on_book (leg_index, book,trace); } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h index c55968042..0a35fb934 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h @@ -101,7 +101,7 @@ public: //c. called when the market data associated // with this security is changed void on_book(size_t leg_index, - const bts::orderman::Book&,PerfTrace &); + const bts::orderman::Book&,trace::CorID ); //d. called when the order is cancelled, either // manually or automatically void cancel_order(); @@ -171,13 +171,13 @@ private: } void _place_order (Price price, Quantity quantity, - const PerfTrace &trace) { + const trace::CorID &trace) { _child_order_state.place_order(price, quantity, _spreader.current_time(), trace); } - void _modify_order (Price price, Quantity quantity, PerfTrace &trace) { + void _modify_order (Price price, Quantity quantity, trace::CorID &trace) { _child_order_state.modify_order(price, quantity, trace); } void _cancel_order () {_child_order_state.cancel_order();} diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp index 2e8064684..7a3c8d5b5 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp @@ -84,10 +84,10 @@ SingleFillHedger& SpreaderBookkeepingData::add_new_hedger(ISpreaderManager& spre size_t leg_index, bts::Price hedge_price, bts::Quantity hedge_quantity, - const PerfTrace &trace){ + const trace::CorID &trace){ LOG(OrderMan, Info, "SpreaderBookkeepingData::add_new_hedger " "leg_index:{} price:{} quantity:{} cid:{}", - leg_index, hedge_price, hedge_quantity,trace.md_sn); + leg_index, hedge_price, hedge_quantity,trace.sn); bts_assert(leg_index < _n_legs); SpreaderLegData& leg_data = _leg_data[leg_index]; std::vector& leg_hedgers = _hedgers[leg_index]; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h index 77998a4f1..0d1b4832f 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h @@ -108,7 +108,7 @@ public: size_t leg_index, bts::Price hedge_price, bts::Quantity hedge_quantity, - PerfTrace const &); + trace::CorID const &); // finds the spreader fill, price (ie averages it out, using // the size and price ratio, across all legs) void total_fills (Quantity& out_quantity, Price& out_price) const; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h index aa42e7b85..1f8f9c875 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h @@ -130,7 +130,7 @@ public: void place_order(Price price, Quantity quantity, bts::TimeStamp curr_time, - const PerfTrace& trace){ + const trace::CorID& trace){ _out_price = price; _out_quantity = quantity; _order_place_time=curr_time; @@ -140,15 +140,15 @@ public: "key:{} is_quoting:{} sec_key:{} live:{} " "price:{} qty:{} cid:{}", order_key(), _is_quoting, _sec_key, - _is_live, price, quantity, trace.md_sn); + _is_live, price, quantity, trace.sn); if (_is_live) _child_order.activate(price, quantity, trace); } void modify_order(Price price, Quantity quantity){ - PerfTrace dont_care; + trace::CorID dont_care; modify_order(price,quantity,dont_care); } - void modify_order(Price price, Quantity quantity, PerfTrace &trace){ + void modify_order(Price price, Quantity quantity, trace::CorID &trace){ _out_price = price; _out_quantity = quantity; _n_modify_orders++; @@ -158,7 +158,6 @@ public: order_key(), _is_quoting, _sec_key, _is_live, price, quantity, _n_modify_orders); if (_is_live) { - trace.spreader_modify_order = utils::TimeStamp::now(); _child_order.update(price, quantity, trace); } } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/IHedgerStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/IHedgerStateWorker.h index 186c8d074..ff966a518 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/IHedgerStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/IHedgerStateWorker.h @@ -5,6 +5,7 @@ #include "lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerState.h" namespace bts { +namespace trace {struct CorID;} namespace orderman {class Book;} namespace orderman { class SpreaderChildOrderState; @@ -24,7 +25,7 @@ public: virtual void on_order_update (const SpreaderChildOrderState& order_update) = 0; // called only when the security that the hedger is working on // has a market data update - virtual void on_book (const bts::orderman::Book& book,PerfTrace &) = 0; + virtual void on_book (const bts::orderman::Book& book,trace::CorID &) = 0; // when the spreader wants the hedger to cancel its order virtual void cancel() = 0; // on terminate, the hedger should simply go to its end state diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp index ac6a92a71..61ce32ef4 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp @@ -9,7 +9,7 @@ void HedgerEndStateWorker::init(){ } void HedgerEndStateWorker::on_order_update(const SpreaderChildOrderState&){ } -void HedgerEndStateWorker::on_book(const bts::orderman::Book&,PerfTrace &){ +void HedgerEndStateWorker::on_book(const bts::orderman::Book&,trace::CorID &){ } void HedgerEndStateWorker::cancel(){ } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.h index 1ab5917b5..549d67306 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.h @@ -17,7 +17,7 @@ public: const std::string state_text () const override {return "END";} void init () override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (const bts::orderman::Book& book,PerfTrace &) override; + void on_book (const bts::orderman::Book& book,trace::CorID &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp index b23d78c92..1ed919153 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp @@ -18,7 +18,7 @@ void HedgerStartStateWorker::init(){ void HedgerStartStateWorker::on_order_update(const SpreaderChildOrderState&){ bts_assert_msg (false, "HedgerStartStateWorker::on_order_update illegal operation"); } -void HedgerStartStateWorker::on_book(const bts::orderman::Book&,PerfTrace &){ +void HedgerStartStateWorker::on_book(const bts::orderman::Book&,trace::CorID &){ // market data will not be sent until out of start. bts_assert_msg (false, "HedgerStartStateWorker::on_book illegal operation"); } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.h index 37c9c79ef..12757001b 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.h @@ -21,7 +21,7 @@ public: const std::string state_text () const override {return "START";} void init () override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (const bts::orderman::Book& book,PerfTrace &) override; + void on_book (const bts::orderman::Book& book,trace::CorID &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp index 92bc38267..c31a3a112 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp @@ -17,7 +17,7 @@ void HedgerWaitingForCancelAckStateWorker::on_order_update(const SpreaderChildOr _hedger->transform_to_END (); } } -void HedgerWaitingForCancelAckStateWorker::on_book(const bts::orderman::Book&,PerfTrace &){ +void HedgerWaitingForCancelAckStateWorker::on_book(const bts::orderman::Book&,trace::CorID &){ } void HedgerWaitingForCancelAckStateWorker::cancel(){ } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.h index 6a7800ec5..d2be51786 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.h @@ -21,7 +21,7 @@ public: const std::string state_text () const override {return "WAITING_FOR_CANCEL_ACK";} void init () override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (const bts::orderman::Book& book,PerfTrace &) override; + void on_book (const bts::orderman::Book& book,trace::CorID &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp index e8b5bf049..084b8c3de 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp @@ -23,7 +23,7 @@ void HedgerWaitingForFirstAckCancelledStateWorker::on_order_update(const Spreade _hedger->transform_to_WAITING_FOR_CANCEL_ACK (); } } -void HedgerWaitingForFirstAckCancelledStateWorker::on_book(const bts::orderman::Book&,PerfTrace &){ +void HedgerWaitingForFirstAckCancelledStateWorker::on_book(const bts::orderman::Book&,trace::CorID &){ } void HedgerWaitingForFirstAckCancelledStateWorker::cancel(){ } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.h index 21f542f5b..97383f885 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.h @@ -21,7 +21,7 @@ public: const std::string state_text () const override {return "WAITING_FOR_FIRST_ACK_CANCELLED";} void init () override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (const bts::orderman::Book& book,PerfTrace &) override; + void on_book (const bts::orderman::Book& book,trace::CorID &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp index 8e5a7e396..cb99478c4 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp @@ -18,7 +18,7 @@ void HedgerWaitingForFirstAckStateWorker::on_order_update(const SpreaderChildOrd // this means the first ack _hedger->transform_to_WORKING (); } -void HedgerWaitingForFirstAckStateWorker::on_book(const bts::orderman::Book&,PerfTrace &){ +void HedgerWaitingForFirstAckStateWorker::on_book(const bts::orderman::Book&,trace::CorID &){ } void HedgerWaitingForFirstAckStateWorker::cancel(){ _hedger->transform_to_WAITING_FOR_FIRST_ACK_CANCELLED (); diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.h index 900e6b4ed..b1ca9c5f0 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.h @@ -21,7 +21,7 @@ public: const std::string state_text () const override {return "WAITING_FOR_FIRST_ACK";} void init () override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (const bts::orderman::Book& book,PerfTrace &) override; + void on_book (const bts::orderman::Book& book,trace::CorID &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp index 019b87e21..aebb18a6a 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp @@ -20,7 +20,7 @@ void HedgerWorkingStateWorker::on_order_update(const SpreaderChildOrderState& or _hedger->transform_to_END (); } } -void HedgerWorkingStateWorker::on_book(const bts::orderman::Book&,PerfTrace &){ +void HedgerWorkingStateWorker::on_book(const bts::orderman::Book&,trace::CorID &){ double new_price; if (SpreaderUtils::post_hedge_market_based_price_action (_hedger->_price_quantity_state.out_price().value(), _hedger->_price_quantity_state.out_quantity().value(), diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.h index be0201d94..1e23979ff 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.h @@ -24,7 +24,7 @@ public: const std::string state_text () const override {return "WORKING";} void init () override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (const bts::orderman::Book& book,PerfTrace &) override; + void on_book (const bts::orderman::Book& book,trace::CorID &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/IQuoterStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/IQuoterStateWorker.h index 909239e1b..a83697af0 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/IQuoterStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/IQuoterStateWorker.h @@ -26,7 +26,7 @@ public: virtual void on_order_update (const SpreaderChildOrderState& order_update) = 0; // called when any of the legs in the spread has a book update //virtual void on_book (TickToTradeCorID corid, size_t leg_id, const Book& book) = 0; - virtual void on_book (size_t, const bts::orderman::Book&,PerfTrace &) = 0; + virtual void on_book (size_t, const bts::orderman::Book&,trace::CorID &) = 0; // when the spreader wants the quoter to cancel its order virtual void cancel() = 0; // on terminate, the quoter should simply go to its end state diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp index d73bfc9b4..24c417c8f 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp @@ -29,7 +29,7 @@ void QuoterEndStateWorker::one_time_activate (Price, Quantity){ void QuoterEndStateWorker::on_order_update (const SpreaderChildOrderState&) {} void QuoterEndStateWorker::on_book (size_t, - const bts::orderman::Book&,PerfTrace &) + const bts::orderman::Book&,trace::CorID &) {} void QuoterEndStateWorker::cancel() {} diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.h index c8342757a..2a52ee1a6 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.h @@ -25,7 +25,7 @@ public: virtual void on_transition () override; void one_time_activate (Price, Quantity) override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (size_t leg_id, const bts::orderman::Book& book,PerfTrace &) override; + void on_book (size_t leg_id, const bts::orderman::Book& book,trace::CorID &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp& ts) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp index 754a3aa47..38d3b9dea 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp @@ -24,7 +24,7 @@ void QuoterStartStateWorker::on_order_update (const SpreaderChildOrderState&){ bts_assert_msg (false, "QuoterStartStateWorker::on_order_update is an illegal operation, nothing can happen before one_time_activate"); } void QuoterStartStateWorker::on_book (size_t, - const bts::orderman::Book&,PerfTrace &){ + const bts::orderman::Book&,trace::CorID &){ } void QuoterStartStateWorker::cancel(){ // since no order has been sent for this leg, diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.h index 05e9f74d2..dae5ada02 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.h @@ -23,7 +23,7 @@ public: virtual void on_transition () override {} void one_time_activate (Price, Quantity) override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (size_t leg_id, const bts::orderman::Book& book,PerfTrace &) override; + void on_book (size_t leg_id, const bts::orderman::Book& book,trace::CorID &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp& ts) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp index bbef8d47c..bf493f55f 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp @@ -21,7 +21,7 @@ void QuoterWaitingForCancelAckStateWorker::on_order_update (const SpreaderChildO } void QuoterWaitingForCancelAckStateWorker::on_book (size_t, const bts::orderman::Book&, - PerfTrace &){ + trace::CorID &){ } void QuoterWaitingForCancelAckStateWorker::cancel(){ } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.h index bd8a4be24..9ef9d2409 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.h @@ -24,7 +24,7 @@ public: virtual void on_transition () override {} void one_time_activate (Price, Quantity) override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (size_t leg_id, const bts::orderman::Book& book,PerfTrace &) override; + void on_book (size_t leg_id, const bts::orderman::Book& book,trace::CorID &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp& ts) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp index dac791970..b674b1d3b 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp @@ -25,7 +25,7 @@ void QuoterWaitingForFirstAckCancelledWorker::on_order_update (const SpreaderChi _quoter->_transform_to_WAITING_FOR_CANCEL_ACK (); } } -void QuoterWaitingForFirstAckCancelledWorker::on_book (size_t , const bts::orderman::Book& ,PerfTrace &) { +void QuoterWaitingForFirstAckCancelledWorker::on_book (size_t , const bts::orderman::Book& ,trace::CorID &) { } void QuoterWaitingForFirstAckCancelledWorker::cancel(){ } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.h index 60db96ace..085e9b919 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.h @@ -30,7 +30,7 @@ public: virtual void on_transition () override {} void one_time_activate (Price, Quantity) override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (size_t leg_id, const bts::orderman::Book& book,PerfTrace &) override; + void on_book (size_t leg_id, const bts::orderman::Book& book,trace::CorID &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp& ts) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp index c68d7db84..cd5e845b2 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp @@ -22,7 +22,7 @@ void QuoterWaitingForFirstAckWorker::on_order_update (const SpreaderChildOrderSt _quoter->_transform_to_WORKING (); } void QuoterWaitingForFirstAckWorker::on_book (size_t, - const bts::orderman::Book&,PerfTrace &){ + const bts::orderman::Book&,trace::CorID &){ _analyze_and_act(); } void QuoterWaitingForFirstAckWorker::cancel(){ diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.h index ded3b991b..d4c8d0ed0 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.h @@ -28,7 +28,7 @@ public: virtual void on_transition () override {} void one_time_activate (Price, Quantity) override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (size_t leg_id, const bts::orderman::Book& book,PerfTrace & ) override; + void on_book (size_t leg_id, const bts::orderman::Book& book,trace::CorID & ) override; void cancel() override; void terminate() override; void on_time(const TimeStamp& ts) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp index a4a17678f..588761444 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp @@ -24,7 +24,7 @@ void QuoterWaitingForIOCWorker::on_order_update (const SpreaderChildOrderState& } } void QuoterWaitingForIOCWorker::on_book (size_t, - const bts::orderman::Book&,PerfTrace &){ + const bts::orderman::Book&,trace::CorID &){ } void QuoterWaitingForIOCWorker::cancel(){ _quoter->_transform_to_WAITING_FOR_FIRST_ACK_CANCELLED (); diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.h index 48bf749eb..69ba40109 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.h @@ -31,7 +31,7 @@ public: void one_time_activate (Price, Quantity) override; void on_order_update (const SpreaderChildOrderState& order_update) override; void on_book (size_t leg_id, - const bts::orderman::Book& book,PerfTrace &) override; + const bts::orderman::Book& book,trace::CorID &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp& ts) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp index d5e90f133..6cefbfcf3 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp @@ -20,7 +20,7 @@ void QuoterWaitingForSizeStateWorker::on_order_update (const SpreaderChildOrderS "is an illegal operation"); } void QuoterWaitingForSizeStateWorker::on_book (size_t, - const Book&,PerfTrace &trace){ + const Book&,trace::CorID &trace){ _longpath_analyze_and_act (trace); } void QuoterWaitingForSizeStateWorker::cancel(){ @@ -45,10 +45,10 @@ void QuoterWaitingForSizeStateWorker::update_spreader_order (Price price, _longpath_analyze_and_act (); } void QuoterWaitingForSizeStateWorker::_longpath_analyze_and_act(){ - PerfTrace trace; + trace::CorID trace; _longpath_analyze_and_act(trace); } -void QuoterWaitingForSizeStateWorker::_longpath_analyze_and_act(PerfTrace &trace){ +void QuoterWaitingForSizeStateWorker::_longpath_analyze_and_act(trace::CorID &trace){ if (_quoter->_price_quantity_state.target_reached()){ LOG(OrderMan, Info, "QuoterWaitingForSizeStateWorker key:{} " "target reached, transforming to end", diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.h index 830e61557..5cbad6abf 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.h @@ -30,7 +30,7 @@ public: virtual void on_transition () override {} void one_time_activate (Price, Quantity) override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (size_t leg_id, const bts::orderman::Book& book,PerfTrace &) override; + void on_book (size_t leg_id, const bts::orderman::Book& book,trace::CorID &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp& ts) override; @@ -41,6 +41,6 @@ private: // if it has. otherwise computes the price, qty and if // its valid, places an order goes to waiting_for_first_ack void _longpath_analyze_and_act (); - void _longpath_analyze_and_act (PerfTrace &); + void _longpath_analyze_and_act (trace::CorID &); }; }} diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp index 8fcf93397..0c505d9b6 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp @@ -31,7 +31,7 @@ void QuoterWorkingStateWorker::on_order_update (const SpreaderChildOrderState& u } void QuoterWorkingStateWorker::on_book (size_t, const bts::orderman::Book&, - PerfTrace &trace){ + trace::CorID &trace){ _longpath_analyze_and_act (trace); } void QuoterWorkingStateWorker::cancel(){ @@ -55,10 +55,10 @@ void QuoterWorkingStateWorker::update_spreader_order (Price price, } void QuoterWorkingStateWorker::_longpath_analyze_and_act () { - PerfTrace trace; + trace::CorID trace; _longpath_analyze_and_act(trace); } -void QuoterWorkingStateWorker::_longpath_analyze_and_act (PerfTrace &trace) +void QuoterWorkingStateWorker::_longpath_analyze_and_act (trace::CorID &trace) { if (_quoter->_price_quantity_state.target_reached()){ // this could happen if @@ -94,7 +94,7 @@ void QuoterWorkingStateWorker::_longpath_analyze_and_act (PerfTrace &trace) } } } -void QuoterWorkingStateWorker::_modify_order (Price price, Quantity quantity,PerfTrace &trace ){ +void QuoterWorkingStateWorker::_modify_order (Price price, Quantity quantity,trace::CorID &trace ){ bool same_price_qty = _quoter->_price_quantity_state.out_quantity() == quantity && bts::securities::test_price_equality(_quoter->_price_quantity_state.out_price().value(), price.value(), _quoter->_this_leg_data.tick_size()); diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.h index a0568256f..e7f5ee612 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.h @@ -23,7 +23,7 @@ public: virtual void on_transition () override; void one_time_activate (Price, Quantity) override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (size_t leg_id, const bts::orderman::Book& book,PerfTrace &) override; + void on_book (size_t leg_id, const bts::orderman::Book& book,trace::CorID &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp& ts) override; @@ -34,8 +34,8 @@ private: // i. if target reached => cxl order and go to waiting_for_cancel_ack_final // ii. if computed_qty = 0 => cxl order and go to waiting_for_cancel_ack_continue // iii. if reprice (ie qty changed or price changed beyond the threshold) => requote - void _longpath_analyze_and_act (PerfTrace &); + void _longpath_analyze_and_act (trace::CorID &); void _longpath_analyze_and_act (); - void _modify_order (Price price, Quantity quantity,PerfTrace &); + void _modify_order (Price price, Quantity quantity,trace::CorID &); }; }} diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp index 2dcd517cb..b0bc2c9dc 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp @@ -34,7 +34,7 @@ void SpreaderEndStateWorker::on_update(Price, Quantity){ } void SpreaderEndStateWorker::on_cancel(){ } -void SpreaderEndStateWorker::on_book(const Book&,PerfTrace&){ +void SpreaderEndStateWorker::on_book(const Book&,trace::CorID){ } void SpreaderEndStateWorker::on_settlement_price(const SettlementUpdateEvent&){ } @@ -43,7 +43,7 @@ void SpreaderEndStateWorker::on_time(const TimeStamp&){ void SpreaderEndStateWorker::on_quoter_order_error(SpreaderLegData&){ } void SpreaderEndStateWorker::on_quoter_order_fill(SpreaderLegData&, - PerfTrace&){ + trace::CorID){ } void SpreaderEndStateWorker::on_quoter_order_status_update(SpreaderLegData&){ } diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.h index 2c19c9bcd..cdf791845 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.h @@ -20,12 +20,12 @@ public: void on_activate(Price, Quantity, SpreaderOrderServices&) override; void on_update(Price, Quantity) override; void on_cancel() override; - void on_book(const Book&,PerfTrace&) override; + void on_book(const Book&,trace::CorID) override; void on_settlement_price(const SettlementUpdateEvent&) override; void on_time(const TimeStamp&) override; void on_quoter_order_error(SpreaderLegData& leg_data) override; void on_quoter_order_fill(SpreaderLegData& leg_data, - PerfTrace&) override; + trace::CorID) override; void on_quoter_order_status_update(SpreaderLegData& leg_data) override; void on_hedger_order_error(SingleFillHedger&) override; void on_hedger_order_update(SingleFillHedger&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp index 2d7169017..adc4108e2 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp @@ -89,21 +89,21 @@ void SpreaderStartStateWorker::on_activate(Price price, { // 4. sub to child orders order // (could have hidden that inside SpreaderOrderServices by exposing events) - order_services.order_services().child_updates.sub(_spreader->key(), [this](const bts::orderman::OrderStateUpdateEvent& os) { _spreader->_on_child_order_update (os);}); + order_services.order_services().subscribe_to_child_updates([this](const bts::orderman::OrderStateUpdateEvent& os) { _spreader->_on_child_order_update (os);}); // 5. sub to market data for (size_t l_idx = 0; l_idx < _spreader->_bookkeeping_data().n_legs(); l_idx++) { const LegPropertyData& leg_prop = _spreader->_bookkeeping_data().get_leg_data(l_idx).leg_property_data(); LOG(OrderMan, Info, "SpreaderStartStateWorker::on_activate subbing to book sec_key: {}", leg_prop.security_key()); - order_services.order_services().book_updates.sub(leg_prop.leg_security_key(), - [this](const BookUpdateEvent& bk_event) - {_spreader->_on_book_update (bk_event);}); - order_services.order_services().settlement_updates.sub(leg_prop.leg_security_key(), - [this](const SettlementUpdateEvent& s_event) - {_spreader->_on_settlement_update (s_event);}); + order_services.order_services().subscribe_to_book(leg_prop.leg_security_key(), + [this](const BookUpdateEvent& bk_event) + {_spreader->_on_book_update (bk_event);}); + order_services.order_services().subscribe_to_settlements(leg_prop.leg_security_key(), + [this](const SettlementUpdateEvent& s_event) + {_spreader->_on_settlement_update (s_event);}); } // 6. sub to time - order_services.order_services().time_change.sub([this](const bts::mercury::TimerEvent& t_event){_spreader->_on_time(t_event);}); + order_services.order_services().subscribe_to_time([this](const bts::mercury::TimerEvent& t_event){_spreader->_on_time(t_event);}); } // quoters are init'ed in the next state _spreader->_transform_to_WAITING_FOR_INITIAL_DATA(); @@ -117,7 +117,7 @@ void SpreaderStartStateWorker::on_cancel(){ // and hence it goes directly to END _spreader->_transform_to_END(); } -void SpreaderStartStateWorker::on_book(const bts::orderman::Book&,PerfTrace &){ +void SpreaderStartStateWorker::on_book(const bts::orderman::Book&,trace::CorID ){ bts_assert_msg (false, "SpreaderStartStateWorker::on_book is an illegal operation"); } void SpreaderStartStateWorker::on_settlement_price(const SettlementUpdateEvent&){ @@ -131,7 +131,7 @@ void SpreaderStartStateWorker::on_quoter_order_error(SpreaderLegData&){ bts_assert_msg (false, "SpreaderStartStateWorker::on_quoter_order_error is an illegal operation"); } void SpreaderStartStateWorker::on_quoter_order_fill(SpreaderLegData&, - PerfTrace&){ + trace::CorID){ bts_assert_msg (false, "SpreaderStartStateWorker::on_quoter_order_fill is an illegal operation"); } void SpreaderStartStateWorker::on_quoter_order_status_update(SpreaderLegData&){ diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.h index fe2f863ac..78e92a3cd 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.h @@ -25,12 +25,12 @@ public: SpreaderOrderServices&) override; void on_update(Price, Quantity) override; void on_cancel() override; - void on_book(const Book&,PerfTrace &) override; + void on_book(const Book&,trace::CorID ) override; void on_time(const TimeStamp&) override; void on_settlement_price(const SettlementUpdateEvent&) override; void on_quoter_order_error(SpreaderLegData& leg_data) override; void on_quoter_order_fill(SpreaderLegData& leg_data, - PerfTrace &) override; + trace::CorID ) override; void on_quoter_order_status_update(SpreaderLegData& leg_data) override; void on_hedger_order_error(SingleFillHedger&) override; void on_hedger_order_update(SingleFillHedger&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp index dbc6b2955..d58ea59d5 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp @@ -33,7 +33,7 @@ void SpreaderWaitingForCancelAllStateWorker::on_update(Price, } void SpreaderWaitingForCancelAllStateWorker::on_cancel(){ } -void SpreaderWaitingForCancelAllStateWorker::on_book(const Book&,PerfTrace &){ +void SpreaderWaitingForCancelAllStateWorker::on_book(const Book&,trace::CorID ){ } void SpreaderWaitingForCancelAllStateWorker::on_time(const TimeStamp& ts){ if (ms_diff (ts, _cancel_timestamp) >= _spreader->_cancel_timeout){ @@ -48,7 +48,7 @@ void SpreaderWaitingForCancelAllStateWorker::on_quoter_order_error(SpreaderLegDa leg_data.quoter().update_order_status (leg_data.order_update_message()); } void SpreaderWaitingForCancelAllStateWorker::on_quoter_order_fill(SpreaderLegData& leg_data, - PerfTrace &){ + trace::CorID ){ leg_data.quoter().update_order_status (leg_data.order_update_message()); } void SpreaderWaitingForCancelAllStateWorker::on_quoter_order_status_update(SpreaderLegData& leg_data){ diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.h index 0ff8771a7..cf6f7ca0b 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.h @@ -23,12 +23,12 @@ public: SpreaderOrderServices&) override; void on_update(Price, Quantity) override; void on_cancel() override; - void on_book(const Book&,PerfTrace &) override; + void on_book(const Book&,trace::CorID ) override; void on_settlement_price(const SettlementUpdateEvent&) override; void on_time(const TimeStamp&) override; void on_quoter_order_error(SpreaderLegData& leg_data) override; void on_quoter_order_fill(SpreaderLegData& leg_data, - PerfTrace &) override; + trace::CorID ) override; void on_quoter_order_status_update(SpreaderLegData& leg_data) override; void on_hedger_order_error(SingleFillHedger&) override; void on_hedger_order_update(SingleFillHedger&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp index 2cc07d80c..e69c0e62a 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp @@ -46,7 +46,7 @@ void SpreaderWaitingForInitialDataStateWorker::on_cancel(){ _spreader->_transform_to_END(); } void SpreaderWaitingForInitialDataStateWorker::on_book(const Book& book, - PerfTrace&){ + trace::CorID){ SpreaderBookkeepingData& bookkeeping_data = _spreader->_bookkeeping_data(); SpreaderLegData& md_leg = bookkeeping_data.get_leg_data(book.security_key()); md_leg.update_book(book); @@ -71,7 +71,7 @@ void SpreaderWaitingForInitialDataStateWorker::on_quoter_order_error(SpreaderLeg "on_quoter_order_error is an illegal operation"); } void SpreaderWaitingForInitialDataStateWorker::on_quoter_order_fill(SpreaderLegData&, - PerfTrace&){ + trace::CorID){ bts_assert_msg (false, "SpreaderWaitingForInitialDataStateWorker::" "on_quoter_order_fill is an illegal operation"); } diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.h index b9bd5c2f9..c344a8542 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.h @@ -25,12 +25,12 @@ public: SpreaderOrderServices&) override; void on_update(Price, Quantity) override; void on_cancel() override; - void on_book(const Book&,PerfTrace &) override; + void on_book(const Book&,trace::CorID) override; void on_settlement_price(const SettlementUpdateEvent&) override; void on_time(const TimeStamp&) override; void on_quoter_order_error(SpreaderLegData& leg_data) override; void on_quoter_order_fill(SpreaderLegData& leg_data, - PerfTrace &) override; + trace::CorID ) override; void on_quoter_order_status_update(SpreaderLegData& leg_data) override; void on_hedger_order_error(SingleFillHedger&) override; void on_hedger_order_update(SingleFillHedger&) override; @@ -40,4 +40,4 @@ private: void _init_quoters(); void _go_to_working(); }; -}} \ No newline at end of file +}} diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp index 4a32b5451..59fc70fbb 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp @@ -42,7 +42,7 @@ void SpreaderWorkingStateWorker::on_cancel(){ _spreader->_cancel_orders (true, true); _spreader->_transform_to_WAITING_FOR_CANCEL_ALL (); } -void SpreaderWorkingStateWorker::on_book(const Book& book,PerfTrace &trace){ +void SpreaderWorkingStateWorker::on_book(const Book& book,trace::CorID trace){ SpreaderBookkeepingData& bookkeeping_data = _spreader->_bookkeeping_data(); // this is a key->index lookup SpreaderLegData& md_leg = bookkeeping_data.get_leg_data(book.security_key()); @@ -78,7 +78,7 @@ void SpreaderWorkingStateWorker::on_quoter_order_error(SpreaderLegData& leg_data _spreader->_transform_to_WAITING_FOR_CANCEL_ALL (); } void SpreaderWorkingStateWorker::on_quoter_order_fill(SpreaderLegData& leg_data, - PerfTrace &trace){ + trace::CorID trace){ // this is the most complex part of the spreader. the following needs to be done // 1. tell other quoters about it (so they reduce their sizes) // 2. launch a new hedger diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.h index e832eef41..214e2eba1 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.h @@ -22,12 +22,12 @@ public: SpreaderOrderServices&) override; void on_update(Price, Quantity) override; void on_cancel() override; - void on_book(const Book&,PerfTrace &) override; + void on_book(const Book&,trace::CorID ) override; void on_settlement_price(const SettlementUpdateEvent&) override; void on_time(const TimeStamp&) override; void on_quoter_order_error(SpreaderLegData& leg_data) override; void on_quoter_order_fill(SpreaderLegData& leg_data, - PerfTrace &) override; + trace::CorID ) override; void on_quoter_order_status_update(SpreaderLegData& leg_data) override; void on_hedger_order_error(SingleFillHedger&) override; void on_hedger_order_update(SingleFillHedger&) override; diff --git a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp index b3bd2bbef..4baf91726 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp +++ b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp @@ -47,7 +47,7 @@ TEST_CASE ("quoter price quantity state", "[spreader]") REQUIRE (s.out_price() == Price (0.0)); REQUIRE (s.out_quantity() == Quantity (0)); // set out price and quantity - PerfTrace dont_care; + trace::CorID dont_care; bts::TimeStamp ts; order.place_order(Price (-0.35), Quantity (123),ts,dont_care); REQUIRE (s.target_spread_price() == Price (-1.0)); @@ -102,7 +102,7 @@ TEST_CASE ("quoter price quantity state", "[spreader]") s.add_hedged_reduction (Quantity(5)); s.add_hedged_reduction (Quantity(15)); // set out values - PerfTrace dont_care; + trace::CorID dont_care; bts::TimeStamp ts; order_2.place_order (Price(1), Quantity (50),ts,dont_care); REQUIRE (s.target_spread_price() == Price (-1.0)); @@ -1250,7 +1250,7 @@ TEST_CASE ("hedger_START_state", "[spreader]") 1, hedger_price, hedger_quantity, - PerfTrace()); + trace::CorID()); verify_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); SECTION("0. transition_to_start") @@ -1300,7 +1300,7 @@ TEST_CASE ("hedger_WAITING_FOR_FIRST_ACK_state", "[spreader]") 1, hedger_price, hedger_quantity, - PerfTrace()); + trace::CorID()); verify_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); hedger.init (); @@ -1359,7 +1359,7 @@ TEST_CASE ("hedger_WAITING_FOR_FIRST_ACK_CANCELLED_state", "[spreader]") 1, hedger_price, hedger_quantity, - PerfTrace()); + trace::CorID()); verify_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); hedger.init (); @@ -1420,7 +1420,7 @@ TEST_CASE ("hedger_WAITING_FOR_CANCEL_ACK_state", "[spreader]") 1, hedger_price, hedger_quantity, - PerfTrace()); + trace::CorID()); verify_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); hedger.init (); @@ -1492,7 +1492,7 @@ TEST_CASE ("hedger_END_state", "[spreader]") 1, hedger_price, hedger_quantity, - PerfTrace()); + trace::CorID()); verify_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); hedger.init (); @@ -1549,7 +1549,7 @@ TEST_CASE ("hedger_WORKING", "[spreader]") 1, hedger_price, hedger_quantity, - PerfTrace()); + trace::CorID()); verify_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); SpreaderChildOrderState& u = hedger.order_state(); @@ -1651,7 +1651,7 @@ TEST_CASE ("spreader_START", "[spreader]") } SECTION("5. on_cancel") { - spreader.on_cancel(PerfTrace()); + spreader.on_cancel(trace::CorID()); REQUIRE(spreader.test_only_func_spreader_state() == SpreaderState::END); LOG(OrderMan, Diag, "spreader_START.on_cancel"); } @@ -1763,7 +1763,7 @@ TEST_CASE ("spreader_WORKING", "[spreader]") // be as is spreader_price = Price (0); spreader_quantity = Quantity (200); - spreader.on_update (spreader_price, spreader_quantity,PerfTrace()); + spreader.on_update (spreader_price, spreader_quantity,trace::CorID()); verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity (30), Quantity(55), Price(1998), Quantity(130), Quantity(115), false); verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity (55), Quantity(30), Price(2004), Quantity(165), Quantity(115), false); @@ -1773,7 +1773,7 @@ TEST_CASE ("spreader_WORKING", "[spreader]") } SECTION("5. on_cancel") { - spreader.on_cancel(PerfTrace()); + spreader.on_cancel(trace::CorID()); verify_basic_spreader_state (spreader, SpreaderState::WAITING_FOR_CANCEL_ALL, spreader_price, spreader_quantity); generic_validate_quoters (QuoterState::WAITING_FOR_CANCEL_ACK, true); generic_validate_hedgers (HedgerState::WAITING_FOR_CANCEL_ACK); @@ -1794,7 +1794,7 @@ TEST_CASE ("spreader_WORKING", "[spreader]") new double[5] {2005, 2006, 2007, 2008, 2009}, new uint16_t[5] {0, 0, 0, 0, 0}, true); - spreader.test_only_on_book_update (modified_book, PerfTrace()); + spreader.test_only_on_book_update (modified_book, trace::CorID()); verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); generic_validate_quoters (QuoterState::WORKING, false); generic_validate_hedgers (HedgerState::WORKING); @@ -1808,8 +1808,8 @@ TEST_CASE ("spreader_WORKING", "[spreader]") new double[5] {2003, 2004, 2005, 2006, 2007}, new uint16_t[5] {25, 25, 20, 20, 10}, true); - //spreader.on_book (bts::orderman::PerfTrace(), modified_book); - spreader.test_only_on_book_update (modified_book,PerfTrace()); + //spreader.on_book (bts::orderman::trace::CorID(), modified_book); + spreader.test_only_on_book_update (modified_book,trace::CorID()); verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(1999), Quantity(45), Quantity(15), false); verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); @@ -1824,8 +1824,8 @@ TEST_CASE ("spreader_WORKING", "[spreader]") new double[5] {2003, 2004, 2005, 2006, 2007}, new uint16_t[5] {25, 25, 20, 20, 10}, true); - //spreader.on_book (bts::orderman::PerfTrace(), modified_book); - spreader.test_only_on_book_update (modified_book,PerfTrace()); + //spreader.on_book (bts::orderman::trace::CorID(), modified_book); + spreader.test_only_on_book_update (modified_book,trace::CorID()); verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2000), Quantity(34), Quantity(15), false); verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); @@ -1838,8 +1838,8 @@ TEST_CASE ("spreader_WORKING", "[spreader]") new double[5] {2003, 2004, 2005, 2006, 2007}, new uint16_t[5] {25, 25, 20, 20, 10}, true); - //spreader.on_book (bts::orderman::PerfTrace(), modified_book); - spreader.test_only_on_book_update (modified_book, PerfTrace()); + //spreader.on_book (bts::orderman::trace::CorID(), modified_book); + spreader.test_only_on_book_update (modified_book, trace::CorID()); verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2001), Quantity(45), Quantity(15), false); verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); @@ -1853,8 +1853,8 @@ TEST_CASE ("spreader_WORKING", "[spreader]") new double[5] {2003, 2004, 2005, 2006, 2007}, new uint16_t[5] {25, 25, 20, 20, 10}, true); - //spreader.on_book (bts::orderman::PerfTrace(), modified_book); - spreader.test_only_on_book_update (modified_book, PerfTrace()); + //spreader.on_book (bts::orderman::trace::CorID(), modified_book); + spreader.test_only_on_book_update (modified_book, trace::CorID()); verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WAITING_FOR_CANCEL_ACK, false, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2001), Quantity(45), Quantity(15), false); verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); @@ -2068,7 +2068,7 @@ TEST_CASE ("spreader_WAITING_FOR_CANCEL_ACK", "[spreader]") // now cancel the spreader bts::TimeStamp cancel_timestamp = std::chrono::system_clock::now(); spreader.test_only_on_time (cancel_timestamp); - spreader.on_cancel (PerfTrace()); + spreader.on_cancel (trace::CorID()); auto validate_state = [&]() -> void { verify_basic_spreader_state (spreader, SpreaderState::WAITING_FOR_CANCEL_ALL, spreader_price, spreader_quantity); @@ -2091,7 +2091,7 @@ TEST_CASE ("spreader_WAITING_FOR_CANCEL_ACK", "[spreader]") } SECTION("4. on_update") { - spreader.on_update (Price(-0.05), Quantity(200),PerfTrace()); + spreader.on_update (Price(-0.05), Quantity(200),trace::CorID()); validate_state(); // order changes dont go through validate_state(); @@ -2099,7 +2099,7 @@ TEST_CASE ("spreader_WAITING_FOR_CANCEL_ACK", "[spreader]") } SECTION("5. on_cancel") { - spreader.on_cancel(PerfTrace()); + spreader.on_cancel(trace::CorID()); // already in cancel state, no change validate_state(); LOG(OrderMan, Diag, "spreader_WAITING_FOR_CANCEL_ACK.on_cancel"); @@ -2668,10 +2668,10 @@ TEST_CASE ("spreader_perf_2legs", "[spreader]") for (uint32_t i=0; i(us_diff (t1,t0))/n_iters; @@ -2804,11 +2804,11 @@ TEST_CASE ("spreader_perf_4legs", "[spreader]") new uint16_t[5] {100,150,250,25,125}, true); spreader.test_only_on_book_update (BookUpdateEvent(book_1, - PerfTrace())); + trace::CorID())); spreader.test_only_on_book_update (BookUpdateEvent(book_2, - PerfTrace())); + trace::CorID())); spreader.test_only_on_book_update (BookUpdateEvent(book_3, - PerfTrace())); + trace::CorID())); verify_complete_quoter_state (qleg_data_4.quoter(), QuoterState::WAITING_FOR_FIRST_ACK, false, @@ -2843,10 +2843,10 @@ TEST_CASE ("spreader_perf_4legs", "[spreader]") for (uint32_t i=0; i(us_diff (t1,t0))/n_iters; diff --git a/src/lib/orderman/orders/spreader_orders/tests/tests_common.h b/src/lib/orderman/orders/spreader_orders/tests/tests_common.h index 7792d29c3..0f570d31e 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/tests_common.h +++ b/src/lib/orderman/orders/spreader_orders/tests/tests_common.h @@ -390,7 +390,7 @@ void fire_book_update (double* prices, uint16_t* sizes, api::Side side, size_t l bts::orderman::Book book; fill_book (book, prices, sizes, side); sm.set_book (book, leg_index); - PerfTrace trace; + trace::CorID trace; quoter.on_book (leg_index, book,trace); } void verify_leg_data (SpreaderLegData& l, bts::orderman::OrderKey, size_t leg_index, uint32_t sec_key, uint32_t exp_yr, uint32_t exp_m, uint32_t exp_day, const std::string& symbol, double leg_mult, double price_mult, api::Side side) @@ -441,7 +441,7 @@ void fire_book_update_hedger (double* prices, uint16_t* sizes, api::Side side, S { bts::orderman::Book book; fill_book (book, prices, sizes, side); - PerfTrace trace; + trace::CorID trace; hedger.on_book (book,trace); } void verify_complete_hedger_state (const SingleFillHedger& hedger, HedgerState state, Price target_price, Quantity target_quantity, Quantity aggregated_filled_quantity, @@ -525,11 +525,11 @@ void set_spreader_orders (SpreaderOrder& spreader, double* leg_1_bid_prices, uin bts::orderman::Book book_leg_1 = get_book (SecurityKey (leg_1_id), 5, leg_1_bid_prices, leg_1_bid_sizes, leg_1_ask_prices, leg_1_ask_sizes, true); - spreader.test_only_on_book_update (bts::orderman::BookUpdateEvent(book_leg_1, PerfTrace())); + spreader.test_only_on_book_update (bts::orderman::BookUpdateEvent(book_leg_1, trace::CorID())); bts::orderman::Book book_leg_2 = get_book (SecurityKey (leg_2_id), 5, leg_2_bid_prices, leg_2_bid_sizes, leg_2_ask_prices, leg_2_ask_sizes, true); - spreader.test_only_on_book_update (bts::orderman::BookUpdateEvent(book_leg_2,PerfTrace())); + spreader.test_only_on_book_update (bts::orderman::BookUpdateEvent(book_leg_2,trace::CorID())); spreader.test_only_on_child_order_update (leg_data_1.order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (leg_1_fills), Price (leg_1_filled_price)); spreader.test_only_on_child_order_update (leg_data_2.order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (leg_2_fills), Price (leg_2_filled_price)); } diff --git a/src/lib/orderman/server/OrderServiceServer.cpp b/src/lib/orderman/server/OrderServiceServer.cpp index 9eb1abb06..9259a2a7c 100644 --- a/src/lib/orderman/server/OrderServiceServer.cpp +++ b/src/lib/orderman/server/OrderServiceServer.cpp @@ -9,7 +9,6 @@ #include "lib/mercury/executor/Executor.h" #include "lib/metrics/metrics.h" #include "lib/orderman/actors/AsyncFactory.h" -#include "lib/orderman/actors/ExecutionGateway.h" #include "lib/orderman/actors/FillStore.h" #include "lib/orderman/actors/MDSource.h" #include "lib/orderman/actors/MDSupplementarySource.h" @@ -18,12 +17,12 @@ #include "lib/orderman/actors/ServiceBridge.h" #include "lib/orderman/actors/order_manager/OrderManager.h" #include "lib/orderman/order_factory/DynamicOrderRegistry.h" -#include "lib/utils/bts_chrono.h" -#include "lib/plugin/plugin.h" #include "lib/plugin/SparkServices.h" +#include "lib/plugin/plugin.h" +#include "lib/utils/bts_chrono.h" #include "lib/utils/thread_manager.h" #include "lib/utils/type_name.h" - + #include namespace bts { @@ -90,12 +89,11 @@ ActorThread *find_thread_for_actor( struct OrderServiceServer::PImpl { PImpl(bts::api::ServiceContext &ctx, std::shared_ptr &ss, - DynamicOrderRegistry const &d, - metrics::MetricsContainer &stats) + DynamicOrderRegistry const &d, metrics::MetricsContainer &stats, trace::PerfLog &log) : service_bridge(), service_ready(false), known_orders(), known_fills(), publish_orders(), publish_fills(), admin_service(ctx.locate()), md_consumer(ss), - stats(stats), dyn_order_registry(d) {} + stats(stats), dyn_order_registry(d),log(log) {} ServiceBridge *service_bridge; @@ -111,15 +109,16 @@ struct OrderServiceServer::PImpl { bts::md::MDConsumer md_consumer; metrics::MetricsContainer &stats; DynamicOrderRegistry const &dyn_order_registry; + trace::PerfLog &log; }; OrderServiceServer::OrderServiceServer( bts::api::ServiceContext &ctx, std::shared_ptr &ss, - DynamicOrderRegistry const&d, - metrics::MetricsContainer &stats, PerfTraceLog &log) - : api::orderman::OrderServiceBase(ctx), me(new PImpl(ctx, ss, d,stats)) { - + DynamicOrderRegistry const &d, metrics::MetricsContainer &stats, + trace::PerfLog &log) + : api::orderman::OrderServiceBase(ctx), me(new PImpl(ctx, ss, d, stats,log)) { + me->publish_orders = make_orders_publisher(); me->publish_fills = make_fills_publisher(); @@ -138,23 +137,14 @@ OrderServiceServer::OrderServiceServer( bts_assert_msg(thread, "Could not find a configured thread for MDSource. See the " "OrdermanCfg key"); - thread->executor.spawn(me->md_consumer, me->stats); + thread->executor.spawn(me->md_consumer, me->stats,log); // OrderManager thread = find_thread_for_actor("OrderManager", me->actor_threads); bts_assert_msg(thread, "Could not find a configured thread for OrderManager. See " "the OrdermanCfg key"); - thread->executor.spawn(d); - - // ExecutionGateway's - thread = find_thread_for_actor("ExecutionGateway", me->actor_threads); - bts_assert_msg(thread, - "Could not find a configured thread for ExecutionGateway " - "instances. See the OrdermanCfg key"); - auto &all_connections = config::get().connection(); - for (auto const &c : all_connections) - thread->executor.spawn(c, log); + thread->executor.spawn(d,me->log); // Timer thread = find_thread_for_actor("Timer", me->actor_threads); @@ -214,9 +204,7 @@ OrderServiceServer::OrderServiceServer( [this, &ctx](auto const &fill) { ctx.post([this, fill] { this->on_fills(fill); }); }, - me->dyn_order_registry, - thread->executor.make_proxy()); - + me->dyn_order_registry, thread->executor.make_proxy()); thread->executor.activate(me->service_bridge); diff --git a/src/lib/orderman/server/OrderServiceServer.h b/src/lib/orderman/server/OrderServiceServer.h index 526a63b2a..4c23c13f9 100644 --- a/src/lib/orderman/server/OrderServiceServer.h +++ b/src/lib/orderman/server/OrderServiceServer.h @@ -6,7 +6,7 @@ #include namespace bts { -class PerfTraceLog; +namespace trace {class PerfLog;} namespace api { class ISyntheticSecurityService; } @@ -22,7 +22,7 @@ class OrderServiceServer : public api::orderman::OrderServiceBase { std::shared_ptr &, DynamicOrderRegistry const&, metrics::MetricsContainer &, - PerfTraceLog &); + trace::PerfLog &); ~OrderServiceServer(); void create_order(const api::orderman::Create &, diff --git a/src/lib/orderman/tests/fat_wrapper_tests.cpp b/src/lib/orderman/tests/fat_wrapper_tests.cpp index 0472ca363..b3a45dc12 100644 --- a/src/lib/orderman/tests/fat_wrapper_tests.cpp +++ b/src/lib/orderman/tests/fat_wrapper_tests.cpp @@ -6,16 +6,14 @@ namespace mercury { struct A { std::string s; - bool operator==(const A&src) const {return src.s == s;} + bool operator==(const A &src) const { return src.s == s; } }; -TEST_CASE ("FatWrapperTests" , "[mercury]") -{ +TEST_CASE("FatWrapperTests", "[mercury]") { - SECTION("fat_wrapper_works_small") - { - mercury::FatWrapper <128> fw; - A a {"hello"}; + SECTION("fat_wrapper_works_small") { + mercury::FatWrapper<128> fw; + A a{"hello"}; fw.wrap(a); REQUIRE(a == fw.unwrap()); @@ -23,14 +21,13 @@ TEST_CASE ("FatWrapperTests" , "[mercury]") fw2 = fw; REQUIRE(a == fw2.unwrap()); - auto fw3 (fw); + auto fw3(fw); REQUIRE(a == fw3.unwrap()); } - SECTION("fat_wrapper_works_big") - { - mercury::FatWrapper <32> fw; - A a {"hello"}; + SECTION("fat_wrapper_works_big") { + mercury::FatWrapper<32> fw; + A a{"hello"}; fw.wrap(a); REQUIRE(a == fw.unwrap()); @@ -38,16 +35,16 @@ TEST_CASE ("FatWrapperTests" , "[mercury]") fw2 = fw; REQUIRE(a == fw2.unwrap()); - auto fw3 (fw); + auto fw3(fw); REQUIRE(a == fw3.unwrap()); } - SECTION("empty_can_be_copied") - { - mercury::FatWrapper <64> fw; - mercury::FatWrapper <64> fw2; - fw2=fw; + SECTION("empty_can_be_copied") { + mercury::FatWrapper<64> fw; + mercury::FatWrapper<64> fw2; + fw2 = fw; } } -}} +} // namespace mercury +} // namespace bts diff --git a/src/lib/orderman2/IOrderManagerObserver.h b/src/lib/orderman2/IOrderManagerObserver.h deleted file mode 100644 index f5596b663..000000000 --- a/src/lib/orderman2/IOrderManagerObserver.h +++ /dev/null @@ -1,28 +0,0 @@ -#pragma once - -#include "lib/config/protos/jetfix.pb.h" -#include "lib/domain_model/SecurityKey.h" -#include "orderman_utils/orderman_utils.h" - -namespace bts { -namespace api { -namespace orderman { -class OrderDefinition; -} -} // namespace api -namespace orderman2 { - -class OrderState; - -class IOrderManagerObserver { - public: - void subscribe_book(SecurityKey, void *sub); - void request_new_fill_buffers(config::JetFIX::Connection const &, - size_t n_buffers, void *sub); - void request_new_orders(api::orderman::OrderDefinition const &, - OrderKey parent_key, size_t n_orders, void *sub); - void send_fix(size_t gw_idx, jetfix::OutFIXPtr const &); -}; - -} // namespace orderman2 -} // namespace bts diff --git a/src/lib/orderman2/OrderManager2.cpp b/src/lib/orderman2/OrderManager2.cpp deleted file mode 100644 index 44949ac83..000000000 --- a/src/lib/orderman2/OrderManager2.cpp +++ /dev/null @@ -1,7 +0,0 @@ -#include "OrderManager2.h" -#include "IOrderManagerObserver.h" - -namespace bts { -namespace orderman2 { - -}} diff --git a/src/lib/orderman2/OrderManager2.h b/src/lib/orderman2/OrderManager2.h deleted file mode 100644 index 1f761b75b..000000000 --- a/src/lib/orderman2/OrderManager2.h +++ /dev/null @@ -1,37 +0,0 @@ -#pragma once - -#include "orderman_utils/orderman_utils.h" -#include "orderman_utils/Book.h" -#include "lib/jetfix/common/OutFIXPtr.h" - -#include - -namespace bts { -namespace api { class Security;} -namespace orderman2 { - -class Order; -class IOrderManagerObserver; -class ExecutionReport; - -class OrderManager { - OrderManager(); - - void init(IOrderManagerObserver &observer); - - void on_activate(Order &, Price , Quantity); - void on_update(Order&, Price , Quantity); - void on_cancel(Order&); - void on_book_update(Book const&b,void*sub); - void on_execution_report(ExecutionReport &); - - void on_securities(std::vector const&); - void on_new_fill_buffers(std::vector const&,void*sub); - void on_new_orders(std::vector const&,void*sub); - -private: - struct PImpl; - std::unique_ptr me; -}; - -}} diff --git a/src/lib/orderman2/orders/NativeOrder.cpp b/src/lib/orderman2/orders/NativeOrder.cpp new file mode 100644 index 000000000..96e505504 --- /dev/null +++ b/src/lib/orderman2/orders/NativeOrder.cpp @@ -0,0 +1,2 @@ +#include "NativeOrder.h" + diff --git a/src/lib/orderman2/orders/NativeOrder.h b/src/lib/orderman2/orders/NativeOrder.h new file mode 100644 index 000000000..3e03df4de --- /dev/null +++ b/src/lib/orderman2/orders/NativeOrder.h @@ -0,0 +1,57 @@ +#pragma once +#include "Order.h" + + +namespace bts { +namespace orderman { + + +struct PermissionQueryResult { + bool can_send; + std::string error_msg; +}; + +struct RouteQueryResult { + bool has_route; + std::string error_msg; + api::orderman::RoutingRecord routing_record; +}; + +class NativeOrder2 : public Order2 { +public: + virtual void on_execution_report(std::string const &, OrderKey, + ExecutionReport const &){}; + virtual void on_cancel_reject(std::string const &, OrderKey, + std::string const & /*msg*/){}; + virtual void on_gateway_status(std::string const &, bool /*is_connected*/){}; + + void subscribe_execution_report(std::string const &gw, OrderKey k); + void unsubscribe_execution_report(std::string const &gw, OrderKey k); + void subscribe_cancel_reject(std::string const &gw, OrderKey k); + void unsubscribe_cancel_reject(std::string const &gw, OrderKey k); + void subscribe_gateway_status(std::string const &); + void unsubscribe_gateway_status(std::string const &); + + RouteQueryResult get_route(AccountID, UserID, api::Security const &); + PermissionRec + get_permission_record(api::orderman::RoutingRecord const &routing, AccountID, + UserID, api::Security const &, api::Side); + + PermissionQueryResult can_send_new_order(PermissionRec const &, Quantity, + Price); + + PermissionQueryResult can_update_order(PermissionRec const &, Quantity from, + Quantity to, Price p); + + bool is_route_connected(api::orderman::RoutingRecord const &); + void send_fix(api::orderman::RoutingRecord const &rr, + jetfix::MessageTypes mt, jetfix::FIXFragment const &f); + + TimeStamp time() const; + mercury::TimeStampStr time_str() const; + private: + struct PImpl; + std::unique_ptr me; +}; + +}} diff --git a/src/lib/orderman2/orders/Order.cpp b/src/lib/orderman2/orders/Order.cpp new file mode 100644 index 000000000..a14ec8bed --- /dev/null +++ b/src/lib/orderman2/orders/Order.cpp @@ -0,0 +1,2 @@ +#include "Order.h" + diff --git a/src/lib/orderman2/orders/Order.h b/src/lib/orderman2/orders/Order.h new file mode 100644 index 000000000..24c10b533 --- /dev/null +++ b/src/lib/orderman2/orders/Order.h @@ -0,0 +1,70 @@ +#pragma once + +#include "lib/api/services/OrderService.pb.h" +#include "lib/domain_model/common.h" +#include "lib/jetfix/common/OutFIX.h" +#include "lib/mercury/common/mercury_common.h" +#include "lib/orderman/orderman_utils/Book.h" +#include "lib/orderman/orderman_utils/ExecutionReport.h" +#include "lib/orderman/orderman_utils/orderman_common.h" + +#include + +namespace bts { +namespace api { +namespace orderman { +class OrderDefinition; +class OrderRecord; +} // namespace orderman +} // namespace api +} // namespace bts + +namespace bts { +namespace orderman { + +struct ChildOrderDescriptor {}; +struct ChildOrder {}; + +class PermissionRec {}; + +class Order2 { + public: + virtual ~Order2(); + + virtual void on_init_new(api::orderman::OrderDefinition const &) = 0; + virtual void on_init_recovered(api::orderman::OrderRecord const &) = 0; + + virtual void on_activate(Price, Quantity) = 0; + virtual void on_update(Price, Quantity) = 0; + virtual void on_cancel() = 0; + virtual void on_child_order_update(OrderKey, api::orderman::OrderState const &){}; + virtual void on_book(SecurityKey, Book const &) {} + virtual void on_settlement(SecurityKey, Book const &) {} + virtual void on_time(TimeStamp const &) {} + + void subscribe_child_updates(OrderKey child); + void unsubscribe_child_updates(OrderKey child); + void subscribe_book(SecurityKey); + void unsubscribe_book(SecurityKey); + void subscribe_settlement(SecurityKey); + void unsubscribe_settlement(SecurityKey); + void subscribe_time(); + void unsubscribe_time(); + + api::Security const *resolve_security(SecurityKey const &k) const; + void report_state(const api::orderman::OrderState &state); + + ChildOrderDescriptor const & + make_child_order_descriptor(api::orderman::OrderDefinition const &, + size_t hint = 1); + ChildOrder make_child_order(ChildOrderDescriptor const &desc); + void send_child(ChildOrder ch, Price, Quantity); + void update_child(ChildOrder ch, Price, Quantity); + void cancel_child(ChildOrder ch); + + private: + struct PImpl; + std::unique_ptr me; +}; +} // namespace orderman +} // namespace bts diff --git a/src/sdk/examples/order_plugin_example.cpp b/src/sdk/examples/order_plugin_example.cpp index 8949c21f9..3202d102a 100644 --- a/src/sdk/examples/order_plugin_example.cpp +++ b/src/sdk/examples/order_plugin_example.cpp @@ -24,10 +24,10 @@ class DynamicIcebergOrder : public DynamicOrder { void on_init_recovered(OrderRecord const &, const PreActivationOrderServices &) override; void on_activate(Price, Quantity, OrderServices &, - PerfTrace const &) override; - void on_update(Price, Quantity, PerfTrace const &) override; - void on_crack(PerfTrace const &) override; - void on_cancel(PerfTrace const &) override; + trace::CorID const&) override; + void on_update(Price, Quantity, trace::CorID const&) override; + void on_crack(trace::CorID const &) override; + void on_cancel(trace::CorID const &) override; private: void report_state(); @@ -127,7 +127,7 @@ void DynamicIcebergOrder::on_init_recovered( void DynamicIcebergOrder::on_activate(Price p, Quantity q, OrderServices &services, - PerfTrace const &) { + trace::CorID const &) { bts_assert(!me->services); me->services = &services; me->child_builder.activate(services); @@ -136,8 +136,8 @@ void DynamicIcebergOrder::on_activate(Price p, Quantity q, case ORDER_STATUS_INACTIVE: me->state.set_price(p.value()); me->state.set_quantity(q.value()); - services.child_updates.sub( - key(), [this](auto const &os) { this->on_child_order_update(os); }); + services.subscribe_to_child_updates( + [this](auto const &os) { this->on_child_order_update(os); }); transition(ORDER_STATUS_WORKING); send_next_child_order(); break; @@ -164,7 +164,7 @@ void DynamicIcebergOrder::on_activate(Price p, Quantity q, report_state(); } -void DynamicIcebergOrder::on_update(Price p, Quantity q, PerfTrace const &) { +void DynamicIcebergOrder::on_update(Price p, Quantity q, trace::CorID const &) { switch (me->state.status()) { case ORDER_STATUS_WORKING: case ORDER_STATUS_PENDING_WORKING: @@ -191,9 +191,9 @@ void DynamicIcebergOrder::on_update(Price p, Quantity q, PerfTrace const &) { report_state(); } -void DynamicIcebergOrder::on_crack(PerfTrace const &) {} +void DynamicIcebergOrder::on_crack(trace::CorID const &) {} -void DynamicIcebergOrder::on_cancel(PerfTrace const &) { +void DynamicIcebergOrder::on_cancel(trace::CorID const &) { switch (me->state.status()) { case ORDER_STATUS_WORKING: LOG(Plugin, Info, "Canceling DynamicIceberg Order {}", key().value()); diff --git a/src/sdk/sdk_shell.sh b/src/sdk/sdk_shell.sh index d6c65969e..70da324f4 100644 --- a/src/sdk/sdk_shell.sh +++ b/src/sdk/sdk_shell.sh @@ -12,7 +12,6 @@ docker run \ -w $PWD \ -u root \ -v /home:/home \ - -e DISPLAY=$DISPLAY \ --name bts_sdk \ -d \ -t bluetradingsystems/linux_docker \ diff --git a/src/server/sparkd/CMakeDeps.cmake b/src/server/sparkd/CMakeDeps.cmake index d000a7103..ccc96400e 100644 --- a/src/server/sparkd/CMakeDeps.cmake +++ b/src/server/sparkd/CMakeDeps.cmake @@ -1 +1 @@ -set(sources bts_trace.cpp;cmds/AutoCert.cpp;cmds/Benchmark.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/Md.cpp;cmds/PrintHedgeOrders.cpp;cmds/QuickTest.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Span.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/Web.cpp;dspark/mirage/quick_queue/quick_queue.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/book/Book.cpp;exchange_sim/book/ExchangeSim.proto;exchange_sim/book/Order.cpp;exchange_sim/book/OrderMatcher.cpp;exchange_sim/book/book_transform.cpp;exchange_sim/tests/test_book_transform.cpp;http/ApiGateway.cpp;http/WebServer.cpp;main.cpp;md/ChannelVolume.cpp;md/MarketDataAuxiliaryServiceServer.cpp;md/VolumeAtPriceState.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/tests/mdp3_tests.cpp;md/run_md.cpp;position/IMarginObserver.cpp;position/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/PositionServiceCore.cpp;position/PositionServiceServer.cpp;position/tests/PositionTests.cpp;support/ErrorReportService.cpp;support/ShellLatencyServer.cpp;user/AdminServiceServer.cpp;user/UserServiceServer.cpp;user/tests/admin_service_tests.cpp) \ No newline at end of file +set(sources cmds/AdminReport.cpp;cmds/AutoCert.cpp;cmds/Benchmark.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/Md.cpp;cmds/PrintHedgeOrders.cpp;cmds/QuickTest.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Span.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/Web.cpp;dspark/mirage/quick_queue/quick_queue.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/book/Book.cpp;exchange_sim/book/ExchangeSim.proto;exchange_sim/book/Order.cpp;exchange_sim/book/OrderMatcher.cpp;exchange_sim/book/book_transform.cpp;exchange_sim/tests/test_book_transform.cpp;http/ApiGateway.cpp;http/WebServer.cpp;main.cpp;md/ChannelVolume.cpp;md/MarketDataAuxiliaryServiceServer.cpp;md/VolumeAtPriceState.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/tests/mdp3_tests.cpp;md/run_md.cpp;position/IMarginObserver.cpp;position/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/PositionServiceCore.cpp;position/PositionServiceServer.cpp;position/tests/PositionTests.cpp;support/ErrorReportService.cpp;support/ShellLatencyServer.cpp;user/AdminServiceServer.cpp;user/UserServiceServer.cpp;user/tests/admin_service_tests.cpp) \ No newline at end of file diff --git a/src/server/sparkd/cmds/Benchmark.cpp b/src/server/sparkd/cmds/Benchmark.cpp index e25268b4c..eb35d3ce8 100644 --- a/src/server/sparkd/cmds/Benchmark.cpp +++ b/src/server/sparkd/cmds/Benchmark.cpp @@ -32,6 +32,7 @@ #include #include #include +#include "lib/tracing/PerfLog.h" #include @@ -270,18 +271,6 @@ static void init_with_clean_os(benchmark::State &state) { } BENCHMARK(init_with_clean_os); -static void init_with_old_order_update(benchmark::State &state) { - api::orderman::OrderDefinition def; - auto order_state = - utils::pb::from_string(order_state_str); - PerfTrace trace; - OrderKey k(1); - for (auto _ : state) - benchmark::DoNotOptimize( - orderman::OrderStateUpdateEvent(k, k, def, order_state, trace)); -} -BENCHMARK(init_with_old_order_update); - static void serialize_update(benchmark::State &state) { api::orderman::Update update; update.set_order_key(1); @@ -835,6 +824,13 @@ static void fix_time_stamp(benchmark::State &state) { } BENCHMARK(fix_time_stamp); +static void perf_log(benchmark::State &state) { + trace::PerfLog l; + for (auto _ : state) + l.log(trace::CorID{"sim", 0}, "this", 1, 2, "txt", 3); +} +BENCHMARK(perf_log); + std::string Benchmark::help() { return "Run micro-benchmarks. Use --benchmark_filter=regex to run only " "specific benchmarks."; diff --git a/src/server/sparkd/cmds/QuickTest.cpp b/src/server/sparkd/cmds/QuickTest.cpp index 84d9931e1..0489920c7 100644 --- a/src/server/sparkd/cmds/QuickTest.cpp +++ b/src/server/sparkd/cmds/QuickTest.cpp @@ -1,30 +1,16 @@ #include "QuickTest.h" #include "ICmd.h" - -#include "lib/api/services/OrderService.server.pb.h" -#include "lib/mercury/actors/PingPong.h" -#include "lib/mercury/broker/BrokerProxy.h" -#include "lib/mercury/common/mercury_common.h" -#include "lib/mercury/executor/Executor.h" -#include "lib/utils/PBUtils.h" -#include "lib/utils/thread_manager.h" -#include "lib/orderman/events/OrderStateUpdateEvent.h" +#include "lib/tracing/PerfLog.h" #include namespace bts { namespace cmd { -using namespace bts::mercury; -using namespace bts::orderman; - int QuickTest::execute(std::vector const &) { - sleep_for(10s); - for (int i = 0; i < 100; i++) { - auto t = utils::TimeStamp::now(); - LOG(OrderMan,Info,"Now: {}", (utils::TimeStamp::now() - t).nanoseconds()); - } - sleep_for(10s); + trace::PerfLog l; + l.log(trace::CorID{"sim", 0}, "this", 1, 2, "txt", 3); + l.store_log_entries(); return 0; } diff --git a/src/server/sparkd/cmds/Run.cpp b/src/server/sparkd/cmds/Run.cpp index 516980043..701148644 100644 --- a/src/server/sparkd/cmds/Run.cpp +++ b/src/server/sparkd/cmds/Run.cpp @@ -10,26 +10,27 @@ #include "lib/quickbus/quickbus.h" #include "lib/utils/Dispatcher.h" +#include "lib/config/protos/toggles.pb.h" #include "lib/md/SyntheticSecurityService.h" #include "lib/md/relay/QueryServer.h" #include "lib/metrics/metrics.h" #include "lib/metrics/system_metrics.h" -#include "lib/orderman/orderman_utils/PerfTraceLog.h" +#include "lib/orderman/order_factory/DynamicOrderRegistry.h" #include "lib/orderman/server/OrderServiceServer.h" #include "lib/persistence/PersistenceServiceServer.h" +#include "lib/plugin/SparkServices.h" +#include "lib/plugin/plugin.h" +#include "lib/tracing/PerfLog.h" #include "lib/utils/thread_manager.h" #include "server/sparkd/http/WebServer.h" +#include "server/sparkd/md/MarketDataAuxiliaryServiceServer.h" #include "server/sparkd/md/run_md.h" #include "server/sparkd/position/PositionServiceServer.h" #include "server/sparkd/support/ErrorReportService.h" #include "server/sparkd/support/ShellLatencyServer.h" #include "server/sparkd/user/AdminServiceServer.h" -#include "server/sparkd/md/MarketDataAuxiliaryServiceServer.h" #include "server/sparkd/user/UserServiceServer.h" -#include "lib/orderman/order_factory/DynamicOrderRegistry.h" -#include "lib/plugin/SparkServices.h" -#include "lib/plugin/plugin.h" -#include "lib/config/protos/toggles.pb.h" + #include namespace bts { @@ -41,17 +42,16 @@ int Run::execute(std::vector const &) { "------------------------------------ Sparkd launched " "--------------------------------"); - config::QuickbusNodeCfg qb_cfg; auto &ports = config::get(); qb_cfg.set_my_port(ports.qbus_port()); qbus::Quickbus quickbus(qb_cfg); api::ServiceContext sc(&quickbus); - PerfTraceLog perf_log; + trace::PerfLog perf_log; metrics::MetricsContainer stats; metrics::publish_system_metrics(stats); - http::SparkWebServer webserver(sc, stats, perf_log,ports.config_port()); + http::SparkWebServer webserver(sc, stats, perf_log, ports.config_port()); persistence::PersistenceServiceServer settings_saver(sc, "settings"); user::UserServiceServer login_server(sc); @@ -67,10 +67,10 @@ int Run::execute(std::vector const &) { plugin::init_plugins(plugin_services); // finished initializing order plugins - orderman::OrderServiceServer order_service_server(sc, synthetic_service,dyn_order_registry, - stats, perf_log); + orderman::OrderServiceServer order_service_server( + sc, synthetic_service, dyn_order_registry, stats, perf_log); support::ErrorReportServer error_report_service(sc); - admin::AdminServiceServer admin_service(sc); + admin::AdminServiceServer admin_service(sc); md::auxiliary::MarketDataAuxiliaryServiceServer md_aux_server(sc); position::PositionServiceServer position_service(sc); metrics::ShellLatencyServer shell_latency_service( @@ -79,12 +79,11 @@ int Run::execute(std::vector const &) { auto bg_health = std::make_shared("spark_background_thread"); utils::DispatcherTimer timer(utils::Dispatcher::background(), 5000, - [=]() {bg_health->increment(); }); + [=]() { bg_health->increment(); }); timer.start(); - utils::DispatcherTimer timer2(utils::Dispatcher::background(), 1000, - [&]() {perf_log.persist_traces();}); + [&]() { perf_log.store_log_entries(); }); timer2.start(); stats.publish(bg_health); diff --git a/src/server/sparkd/cmds/Web.cpp b/src/server/sparkd/cmds/Web.cpp index 09bda5c6e..9ba90c72b 100644 --- a/src/server/sparkd/cmds/Web.cpp +++ b/src/server/sparkd/cmds/Web.cpp @@ -14,7 +14,7 @@ #include "server/sparkd/user/AdminServiceServer.h" #include "server/sparkd/user/UserServiceServer.h" #include "server/sparkd/md/run_md.h" -#include "lib/orderman/orderman_utils/PerfTraceLog.h" +#include "lib/tracing/PerfLog.h" #include #include @@ -31,7 +31,7 @@ int Web::execute(const std::vector& args) { metrics::MetricsContainer stats; metrics::publish_system_metrics(stats); - PerfTraceLog perf_log; + trace::PerfLog perf_log; http::SparkWebServer webserver(sc, stats, perf_log,ports.config_port()); user::UserServiceServer login_server(sc); diff --git a/src/server/sparkd/http/WebServer.cpp b/src/server/sparkd/http/WebServer.cpp index e72ffcebe..e2c34cd17 100644 --- a/src/server/sparkd/http/WebServer.cpp +++ b/src/server/sparkd/http/WebServer.cpp @@ -6,7 +6,7 @@ #include "lib/logging/logging.h" #include "lib/os/os.h" #include "lib/utils/TimeStamp.h" -#include "lib/orderman/orderman_utils/PerfTraceLog.h" +#include "lib/tracing/PerfLog.h" #include #include @@ -54,9 +54,9 @@ namespace http { const api::ServiceContext& _ctx; metrics::MetricsContainer& _metrics; std::shared_ptr> _mtimer; - PerfTraceLog &_trace_log; + trace::PerfLog &_perf_log; - ServerState(const api::ServiceContext& ctx, metrics::MetricsContainer& metrics, PerfTraceLog &l,int port) : + ServerState(const api::ServiceContext& ctx, metrics::MetricsContainer& metrics, trace::PerfLog &l,int port) : _m(), _dispatcher(utils::Dispatcher::get_named("Webserver")), _session(), @@ -67,7 +67,7 @@ namespace http { _metrics(metrics), _mtimer(std::make_shared>("spark_metrics_query_duration_ms", std::array({ 0.5, 1.0, 5.0, 10.0 }))), - _trace_log(l) + _perf_log(l) { _www = os::sparkdata_path("www"); _conf = os::sparkdata_path("conf"); @@ -168,7 +168,7 @@ namespace http { void return_perf_trace_data(connection_ptr& con,size_t max_rows) { utils::TimeStamp start = utils::TimeStamp::now(); std::stringstream ss; - _trace_log.print_latest_traces(ss,max_rows); + _perf_log.print_latest_traces(ss,max_rows); con->set_body(ss.str()); con->set_status(websocketpp::http::status_code::ok); _mtimer->observe((utils::TimeStamp::now() - start).microseconds() / 1000.0); @@ -359,7 +359,7 @@ namespace http { -SparkWebServer::SparkWebServer(const api::ServiceContext& ctx, metrics::MetricsContainer& metrics, PerfTraceLog &l,int port) : +SparkWebServer::SparkWebServer(const api::ServiceContext& ctx, metrics::MetricsContainer& metrics, trace::PerfLog &l,int port) : _me(std::make_shared(ctx, metrics, l,port)) { } diff --git a/src/server/sparkd/http/WebServer.h b/src/server/sparkd/http/WebServer.h index 2414a4f8b..b9bb981df 100644 --- a/src/server/sparkd/http/WebServer.h +++ b/src/server/sparkd/http/WebServer.h @@ -4,7 +4,7 @@ #include namespace bts { -class PerfTraceLog; +namespace trace {class PerfLog;} namespace http { struct ServerState; @@ -12,7 +12,7 @@ namespace http { class SparkWebServer { std::shared_ptr _me; public: - SparkWebServer(const api::ServiceContext& ctx, metrics::MetricsContainer& metrics, PerfTraceLog &,int port); + SparkWebServer(const api::ServiceContext& ctx, metrics::MetricsContainer& metrics, trace::PerfLog &,int port); }; }} diff --git a/src/web/CMakeDeps.cmake b/src/web/CMakeDeps.cmake index d404bc862..050dc8062 100644 --- a/src/web/CMakeDeps.cmake +++ b/src/web/CMakeDeps.cmake @@ -1 +1 @@ -set(sources ../../externals/linux/include/google/protobuf/descriptor.proto;../../externals/linux/include/google/protobuf/timestamp.proto;../lib/api/apicore.proto;../lib/api/apigateway.proto;../lib/api/apioptions.proto;../lib/api/services/AdminService.proto;../lib/api/services/ApiUnitTestService.proto;../lib/api/services/ErrorReportService.proto;../lib/api/services/HelloService.proto;../lib/api/services/MarketDataAuxiliaryService.proto;../lib/api/services/MarketDataRelay.proto;../lib/api/services/OrderService.proto;../lib/api/services/OutOfProcessURLListener.proto;../lib/api/services/PersistenceService.proto;../lib/api/services/PositionService.proto;../lib/api/services/ShellDiagnosticService.proto;../lib/api/services/ShellLatencyService.proto;../lib/api/services/SyntheticSecurityService.proto;../lib/api/services/UserService.proto;../lib/domain_model/Security.proto;../lib/md/protos/co2.proto;../lib/sparkproto/SparkProtos.proto;api/build.sh;api/node_modules/cssstyle/scripts/run_tests.sh;api/node_modules/exit/test/fixtures/create-files.sh;api/node_modules/protobufjs/cli/node_modules/acorn-jsx/node_modules/acorn/bin/update_authors.sh;api/node_modules/watch/release.sh;api/quiet_build.sh;api/src/DynamicService.ts;api/src/ServiceContext.ts;api/src/bts_assert.ts;ui/src/Access.fs;ui/src/Accounts/ClipLimits.fs;ui/src/Accounts/ProductLimits.fs;ui/src/Accounts/SecurityLimits.fs;ui/src/Accounts/State.fs;ui/src/Accounts/Types.fs;ui/src/Accounts/View.fs;ui/src/App.fs;ui/src/Cmd.fs;ui/src/Controls/Button.fs;ui/src/Controls/DataGrid.fs;ui/src/Controls/Fields.fs;ui/src/Controls/Modal.fs;ui/src/Controls/ReactGrid.fs;ui/src/Controls/Table.fs;ui/src/Controls/nbsp.fs;ui/src/Global.fs;ui/src/Imports.fs;ui/src/Lens.fs;ui/src/Login/Login.fs;ui/src/Nav.fs;ui/src/State.fs;ui/src/Types.fs;ui/src/Users/State.fs;ui/src/Users/Types.fs;ui/src/Users/View.fs;ui/src/Util/EnumUtils.fs;ui/src/Util/JSMap.fs;ui/src/obj/Debug/netstandard2.0/ui.AssemblyInfo.fs) \ No newline at end of file +set(sources ../../externals/linux/include/google/protobuf/descriptor.proto;../../externals/linux/include/google/protobuf/timestamp.proto;../lib/api/apicore.proto;../lib/api/apigateway.proto;../lib/api/apioptions.proto;../lib/api/services/AdminService.proto;../lib/api/services/ApiUnitTestService.proto;../lib/api/services/ErrorReportService.proto;../lib/api/services/HelloService.proto;../lib/api/services/MarketDataAuxiliaryService.proto;../lib/api/services/MarketDataRelay.proto;../lib/api/services/OrderService.proto;../lib/api/services/OutOfProcessURLListener.proto;../lib/api/services/PersistenceService.proto;../lib/api/services/PositionService.proto;../lib/api/services/ShellDiagnosticService.proto;../lib/api/services/ShellLatencyService.proto;../lib/api/services/SyntheticSecurityService.proto;../lib/api/services/UserService.proto;../lib/domain_model/Security.proto;../lib/md/protos/co2.proto;../lib/sparkproto/SparkProtos.proto;api/build.sh;api/node_modules/cssstyle/scripts/run_tests.sh;api/node_modules/exit/test/fixtures/create-files.sh;api/node_modules/protobufjs/cli/node_modules/acorn-jsx/node_modules/acorn/bin/update_authors.sh;api/node_modules/watch/release.sh;api/quiet_build.sh;api/src/DynamicService.ts;api/src/ServiceContext.ts;api/src/bts_assert.ts;ui/src/Access.fs;ui/src/Accounts/ClipLimits.fs;ui/src/Accounts/ProductLimits.fs;ui/src/Accounts/SecurityLimits.fs;ui/src/Accounts/State.fs;ui/src/Accounts/Types.fs;ui/src/Accounts/View.fs;ui/src/App.fs;ui/src/Cmd.fs;ui/src/Controls/Button.fs;ui/src/Controls/DataGrid.fs;ui/src/Controls/Fields.fs;ui/src/Controls/Modal.fs;ui/src/Controls/ReactGrid.fs;ui/src/Controls/Table.fs;ui/src/Controls/nbsp.fs;ui/src/Global.fs;ui/src/Imports.fs;ui/src/Lens.fs;ui/src/Login/Login.fs;ui/src/Nav.fs;ui/src/State.fs;ui/src/Types.fs;ui/src/Users/State.fs;ui/src/Users/Types.fs;ui/src/Users/View.fs;ui/src/Util/EnumUtils.fs;ui/src/Util/JSMap.fs) \ No newline at end of file From 807f8b58766ab72fb62144a8a8bf317698007570 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Wed, 5 Dec 2018 22:03:39 +0000 Subject: [PATCH 037/107] Retrofied new perf log to stats web page. --- src/lib/CMakeDeps.cmake | 2 +- src/lib/tracing/PerfLog.cpp | 431 ++++++++++++++++++++++++++++++++---- src/lib/tracing/PerfLog.h | 44 ++-- 3 files changed, 419 insertions(+), 58 deletions(-) diff --git a/src/lib/CMakeDeps.cmake b/src/lib/CMakeDeps.cmake index f4f65e19d..4c370f0e6 100644 --- a/src/lib/CMakeDeps.cmake +++ b/src/lib/CMakeDeps.cmake @@ -1 +1 @@ -set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/services/UserService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/PerfTraceLog.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/IcebergOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/CoverOrder.cpp;orderman/orders/book_algos/JoinOrder.cpp;orderman/orders/book_algos/LeanOrder.cpp;orderman/orders/book_algos/OffsetOrder.cpp;orderman/orders/book_algos/TickOrder.cpp;orderman/orders/book_algos/TopOrder.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;orderman2/OrderManager2.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;tracing/PerfLog.cpp;tracing/bts_trace.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/thread_manager.cpp) \ No newline at end of file +set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/services/UserService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/PerfTraceLog.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/IcebergOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/CoverOrder.cpp;orderman/orders/book_algos/JoinOrder.cpp;orderman/orders/book_algos/LeanOrder.cpp;orderman/orders/book_algos/OffsetOrder.cpp;orderman/orders/book_algos/TickOrder.cpp;orderman/orders/book_algos/TopOrder.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;orderman2/orders/NativeOrder.cpp;orderman2/orders/Order.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;tracing/PerfLog.cpp;tracing/bts_trace.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/thread_manager.cpp) \ No newline at end of file diff --git a/src/lib/tracing/PerfLog.cpp b/src/lib/tracing/PerfLog.cpp index 849020d85..b2cc04839 100644 --- a/src/lib/tracing/PerfLog.cpp +++ b/src/lib/tracing/PerfLog.cpp @@ -1,27 +1,28 @@ - - #include "lib/tracing/PerfLog.h" -#include "lib/persistence/persistence_utils.h" -#include "lib/utils/datetime.h" #include "lib/config/config.h" #include "lib/config/protos/system.pb.h" - +#include "lib/persistence/persistence_utils.h" +#include "lib/utils/datetime.h" +#include "lib/utils/stats.h" + #include #include #include +#include +#include #include #include - + namespace bts { namespace trace { - + auto create_session = "create table session (" "version TEXT, " "host TEXT, " "build_type TEXT, " "session_start TIMESTAMP PRIMARY KEY" ")"; - + auto create_trace = "create table trace (" "session_start TIMESTAMP," "ts INTEGER," @@ -35,7 +36,7 @@ auto create_trace = "create table trace (" "uint64_1 INTEGER," "thread TEXT" ")"; - + auto insert_trace = "insert into trace (" "session_start," "ts," @@ -61,7 +62,7 @@ auto insert_trace = "insert into trace (" ":uint64_1," ":thread" ")"; - + auto insert_session = "insert into session (" "version," "host," @@ -73,27 +74,122 @@ auto insert_session = "insert into session (" ":build_type," ":session_start" ")"; - + +auto hedge_events_view = + "drop view if exists hedge_events; create view hedge_events as " + "select " + " trace.session_start, " + " channel, " + " sn, " + " min(hts) hts, " + " (max(ts)-min(ts))/1000 t " + "from " + " trace, " + " session " + "where " + " trace.session_start = session.session_start and " + " (entry_kind='fix_socket_r' or entry_kind='before_fix_socket_w') " + "group by " + " trace.session_start, " + " channel, " + " sn " + "having " + " count(*) = 2 and " + " min(entry_kind)<>max(entry_kind)"; + +auto hedge_trace_view = + "drop view if exists hedge_trace; create view hedge_trace as " + "select " + " session.version, " + " session.host, " + " session.build_type, " + " session.session_start, " + " trace.hts trace_time, " + " trace.uint32_1 order_key, " + " hedge_events.t total " + "from " + " trace, " + " hedge_events, " + " session " + "where " + " entry_kind='on_activate_start' and " + " trace.channel = hedge_events.channel and " + " trace.session_start = hedge_events.session_start and " + " trace.sn = hedge_events.sn and " + " trace.session_start = session.session_start "; + +auto requote_events_view = + "drop view if exists requote_events; create view requote_events as " + "select " + " trace.session_start, " + " channel, " + " sn, " + " min(hts) hts, " + " (max(ts)-min(ts))/1000 t " + "from " + " trace, " + " session " + "where " + " trace.session_start = session.session_start and " + " (entry_kind='md' or entry_kind='before_fix_socket_w') " + "group by " + " trace.session_start, " + " channel, " + " sn " + "having " + " count(*) = 2 and " + " min(entry_kind)<>max(entry_kind) "; + +auto requote_trace_view = + "drop view if exists requote_trace; create view requote_trace as " + "select " + " session.version, " + " session.host, " + " session.build_type, " + " session.session_start, " + " trace.hts trace_time, " + " trace.uint32_1 order_key, " + " requote_events.t total " + "from " + " trace, " + " requote_events, " + " session " + "where " + " entry_kind='order_update' and " + " trace.channel = requote_events.channel and " + " trace.session_start = requote_events.session_start and " + " trace.sn = requote_events.sn and " + " trace.session_start = session.session_start "; + +auto requote_query = + "select * from requote_trace order by trace_time desc limit ?"; + +auto hedge_query = "select * from hedge_trace order by trace_time desc limit ?"; + struct PerfLog::PImpl { PImpl(std::string const &loc) : db(loc, SQLite::OPEN_READWRITE | SQLite::OPEN_CREATE), - insert_trace_statement(), insert_session_statement(), session_start() {} - + insert_trace_statement(), insert_session_statement(), session_start(), + disabled(false), lock() {} + SQLite::Database db; std::unique_ptr insert_trace_statement; std::unique_ptr insert_session_statement; + std::unique_ptr requote_query_statement; + std::unique_ptr hedge_query_statement; std::string session_start; bool disabled; + std::mutex lock; }; - + PerfLog::PerfLog() : _pending(), _disabled(false), me() { auto loc = init_storage_location(); - + if (loc.empty()) { _disabled = true; return; } - + try { me = std::make_unique(loc); if (!me->db.tableExists("session")) { @@ -102,17 +198,26 @@ PerfLog::PerfLog() : _pending(), _disabled(false), me() { me->db.exec(create_session); me->db.exec(create_trace); } - + + me->db.exec(hedge_events_view); + me->db.exec(hedge_trace_view); + me->db.exec(requote_events_view); + me->db.exec(requote_trace_view); + me->insert_trace_statement = std::make_unique(me->db, insert_trace); me->insert_session_statement = std::make_unique(me->db, insert_session); + me->requote_query_statement = + std::make_unique(me->db, requote_query); + me->hedge_query_statement = + std::make_unique(me->db, hedge_query); me->session_start = datetime::FIX_timestamp(datetime::local_now()); - - me->insert_session_statement->bind(":version", - config::get().version()); - me->insert_session_statement->bind(":host", - config::get().host_name()); + + me->insert_session_statement->bind( + ":version", config::get().version()); + me->insert_session_statement->bind( + ":host", config::get().host_name()); #ifdef DEBUG me->insert_session_statement->bind(":build_type", "debug"); #else @@ -127,30 +232,29 @@ PerfLog::PerfLog() : _pending(), _disabled(false), me() { _disabled = true; } } - + PerfLog::~PerfLog() {} - + std::string PerfLog::init_storage_location() { auto loc = persistence::storage_location("perf_trace2"); auto parent = boost::filesystem::path(loc).parent_path(); - + if (!boost::filesystem::is_directory(parent)) { if (boost::filesystem::create_directories(parent)) return loc; else return ""; - } - else + } else return loc; } - + size_t PerfLog::store_log_entries() { if (_disabled) return 0; - + PerfLogEntry ev; size_t count = 0; - while (_pending.try_pop(ev)) + while (_pending.try_pop(ev)) try { me->insert_trace_statement->bind(":session_start", me->session_start); me->insert_trace_statement->bind(":ts", (long long)ev.ts.to_uint64()); @@ -164,21 +268,274 @@ size_t PerfLog::store_log_entries() { me->insert_trace_statement->bind(":uint32_1", ev.uint32_1); me->insert_trace_statement->bind(":uint32_2", ev.uint32_2); me->insert_trace_statement->bind(":uint64_1", (long long)ev.uint64_1); - + char tn[17]; - pthread_getname_np(pthread_self(), tn,16); + pthread_getname_np(ev.thread_id, tn, 16); me->insert_trace_statement->bind(":thread", tn); me->insert_trace_statement->exec(); me->insert_trace_statement->reset(); - count ++; + count++; } catch (SQLite::Exception const &e) { LOG(persist, Error, "Unable to insert perf trace in {}. Error: {}", std::string(me->db.getFilename()), std::string(e.getErrorStr())); - - _disabled = true; + + _disabled = true; } return count; } - -} // namespace trace + +std::string encode_string(SQLite::Column const &c) { + return fmt::format("\"{}\"", std::string(c)); +} + +std::string encode_number(SQLite::Column const &c) { + return fmt::format("{}", (long long)c); +} + +std::vector> +PerfLog::get_latest_requote_traces(size_t n) { + std::vector> result; + + std::lock_guard l(me->lock); + try { + me->requote_query_statement->bind(1, (long long)n); + + while (me->requote_query_statement->executeStep()) { + auto &row = result.emplace_back(); + row["version"] = + encode_string(me->requote_query_statement->getColumn("version")); + row["host"] = + encode_string(me->requote_query_statement->getColumn("host")); + row["build_type"] = encode_string( + me->requote_query_statement->getColumn("build_type")); + row["session_start"] = encode_string( + me->requote_query_statement->getColumn("session_start")); + row["trace_time"] = encode_string( + me->requote_query_statement->getColumn("trace_time")); + + row["order_key"] = + encode_number(me->requote_query_statement->getColumn("order_key")); + row["total"] = + encode_number(me->requote_query_statement->getColumn("total")); + } + me->requote_query_statement->reset(); + } catch (SQLite::Exception const &e) { + LOG(persist, Error, "Unable to retrieve quote traces {}. Error: {}", + std::string(me->db.getFilename()), std::string(e.getErrorStr())); + } + return result; +} + +std::vector> +PerfLog::get_latest_hedge_traces(size_t n) { + std::vector> result; + + std::lock_guard l(me->lock); + try { + me->hedge_query_statement->bind(1, (long long)n); + + while (me->hedge_query_statement->executeStep()) { + auto &row = result.emplace_back(); + row["version"] = + encode_string(me->hedge_query_statement->getColumn("version")); + row["host"] = + encode_string(me->hedge_query_statement->getColumn("host")); + row["build_type"] = + encode_string(me->hedge_query_statement->getColumn("build_type")); + row["session_start"] = encode_string( + me->hedge_query_statement->getColumn("session_start")); + row["trace_time"] = + encode_string(me->hedge_query_statement->getColumn("trace_time")); + + row["order_key"] = + encode_number(me->hedge_query_statement->getColumn("order_key")); + row["total"] = + encode_number(me->hedge_query_statement->getColumn("total")); + } + me->hedge_query_statement->reset(); + } catch (SQLite::Exception const &e) { + LOG(persist,Error,"Unable to retrieve hedge traces. Error: {}", + std::string(e.getErrorStr())); + } + return result; +} + +namespace perf_stat { + +using Row = std::map; + +struct Summary { + std::string name; + double min; + double max; + double median; + double ninenty_nine; + double stddev; + std::vector values; +}; + +struct Session { + std::string start; + std::string host; + std::string version; + std::string build_type; + uint32_t n_rows; + std::map summaries; + std::vector rows; +}; + +} // namespace perf_stat + +std::map structure_quote_traces( + std::vector> "es) { + + std::map result; + + for (auto &q : quotes) { + auto &session = result[q["session_start"]]; + if (session.start.empty()) { + session.start = q["session_start"]; + session.host = q["host"]; + session.version = q["version"]; + session.build_type = q["build_type"]; + } + for (auto st : {"total"}) { + auto &summary = session.summaries[st]; + if (summary.name.empty()) + summary.name = st; + summary.values.push_back(std::stod(q[st])); + } + session.rows.push_back(q); + session.n_rows++; + } + + for (auto &session_kvp : result) + for (auto &stat_kvp : session_kvp.second.summaries) { + auto &summary = stat_kvp.second; + summary.min = stats::min(summary.values); + summary.max = stats::max(summary.values); + summary.median = stats::percentile(summary.values, 0.5); + summary.ninenty_nine = stats::percentile(summary.values, 0.99); + summary.stddev = stats::stdev(summary.values); + } + + return result; +} + +std::map structure_hedge_traces( + std::vector> "es) { + + std::map result; + + for (auto &q : quotes) { + auto &session = result[q["session_start"]]; + if (session.start.empty()) { + session.start = q["session_start"]; + session.host = q["host"]; + session.version = q["version"]; + session.build_type = q["build_type"]; + } + for (auto st : {"total"}) { + auto &summary = session.summaries[st]; + if (summary.name.empty()) + summary.name = st; + summary.values.push_back(std::stod(q[st])); + } + session.rows.push_back(q); + session.n_rows++; + } + + for (auto &session_kvp : result) + for (auto &stat_kvp : session_kvp.second.summaries) { + auto &summary = stat_kvp.second; + summary.min = stats::min(summary.values); + summary.max = stats::max(summary.values); + summary.median = stats::percentile(summary.values, 0.5); + summary.ninenty_nine = stats::percentile(summary.values, 0.99); + summary.stddev = stats::stdev(summary.values); + } + + return result; +} + +void print_summary(std::ostream &ss, perf_stat::Summary const &s, bool last) { + ss << " { " + << "\"value\":" + << " \"" << s.name << "\"" + << ", \"min\":" << s.min << ", \"max\":" << s.max + << ", \"median\":" << s.median << ", \"ninenty_nine\":" << s.ninenty_nine + << ", \"stdev\":" << s.stddev; + if (!last) + ss << " },\n"; + else + ss << " }\n"; +} + +void print_row(std::ostream &ss, perf_stat::Row const &r, bool last) { + ss << " { "; + size_t i = 0; + for (auto const &kvp : r) + if (kvp.first != "version" && kvp.first != "host" && + kvp.first != "build_type" && kvp.first != "session_start") { + ss << "\"" << kvp.first << "\":" << kvp.second; + if (++i != r.size() - 4) + ss << ","; + } + if (!last) + ss << " },\n"; + else + ss << " }\n"; +} + +void print_session(std::ostream &ss, perf_stat::Session const &s, bool last) { + ss << "{\n" + << " \"session_name\": " << s.start << ",\n" + << " \"host\": " << s.host << ",\n" + << " \"version\": " << s.version << ",\n" + << " \"build_type\": " << s.build_type << ",\n" + << " \"n_rows\": " << s.n_rows << ",\n"; + + ss << " \"summaries\":\n [\n"; + size_t i = 0; + for (auto &summaries_kvp : s.summaries) + print_summary(ss, summaries_kvp.second, ++i == s.summaries.size()); + ss << " ],\n"; + + ss << " \"rows\":\n [\n"; + i = 0; + for (auto &r : s.rows) + print_row(ss, r, ++i == s.rows.size()); + ss << " ]\n"; + if (!last) + ss << "},\n"; + else + ss << "}\n"; +} + +void PerfLog::print_latest_traces(std::ostream &ss, size_t n) { + { + auto rows = get_latest_requote_traces(n); + auto structured = structure_quote_traces(rows); + + ss << "{\n\"requotes\": [\n"; + size_t i = 0; + for (auto &session_kvp : boost::adaptors::reverse(structured)) + print_session(ss, session_kvp.second, ++i == structured.size()); + ss << "],\n"; + } + + { + auto rows = get_latest_hedge_traces(n); + auto structured = structure_hedge_traces(rows); + + ss << "\"hedges\": [\n"; + + size_t i = 0; + for (auto &session_kvp : boost::adaptors::reverse(structured)) + print_session(ss, session_kvp.second, ++i == structured.size()); + ss << "]\n}\n"; + } +} + } // namespace trace +} // namespace bts diff --git a/src/lib/tracing/PerfLog.h b/src/lib/tracing/PerfLog.h index cc0f31ad8..c1bd7a012 100644 --- a/src/lib/tracing/PerfLog.h +++ b/src/lib/tracing/PerfLog.h @@ -1,18 +1,18 @@ - #pragma once - + #include "lib/utils/TimeStamp.h" -#include #include - +#include +#include + namespace bts { namespace trace { - + struct CorID { const char *channel = ""; uint32_t sn = 0; }; - + struct PerfLogEntry { utils::TimeStamp ts; const char *channel; @@ -22,39 +22,43 @@ struct PerfLogEntry { uint32_t uint32_1; uint32_t uint32_2; uint64_t uint64_1; - std::thread::id thread_id; + pthread_t thread_id; }; - + class PerfLog { tbb::concurrent_queue _pending; bool _disabled; struct PImpl; std::unique_ptr me; - + public: - PerfLog() ; + PerfLog(); ~PerfLog(); size_t store_log_entries(); - + void log(CorID cid, const char *entry_kind, uint32_t uint32_1 = 0, uint32_t uint32_2 = 0, const char *txt_1 = "", uint64_t uint64_1 = 0) { _pending.push({utils::TimeStamp::now(), cid.channel, entry_kind, txt_1, - cid.sn, uint32_1, uint32_2, uint64_1, - std::this_thread::get_id()}); + cid.sn, uint32_1, uint32_2, uint64_1, pthread_self()}); } - + void log(CorID cid, utils::TimeStamp ts, const char *entry_kind, uint32_t uint32_1 = 0, uint32_t uint32_2 = 0, - const char *txt_1 = nullptr, uint64_t uint64_1 = 0) { - _pending.push({ts,cid.channel, entry_kind, txt_1, - cid.sn, uint32_1, uint32_2, uint64_1, - std::this_thread::get_id()}); + const char *txt_1 = "", uint64_t uint64_1 = 0) { + _pending.push({ts, cid.channel, entry_kind, txt_1, cid.sn, uint32_1, + uint32_2, uint64_1, pthread_self()}); } - + + // return the N last traces + std::vector> get_latest_requote_traces(size_t n=0); + std::vector> get_latest_hedge_traces(size_t n=0); + + void print_latest_traces(std::ostream &,size_t n = 0); + private: std::string init_storage_location(); }; - + } // namespace trace } // namespace bts From 5f12e2f1b27ed3d8772ce66a23ca144adcb996bd Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Wed, 5 Dec 2018 22:03:39 +0000 Subject: [PATCH 038/107] Retrofied new perf log to stats web page. --- src/lib/CMakeDeps.cmake | 2 +- src/lib/tracing/PerfLog.cpp | 433 ++++++++++++++++++++++++++++++++---- src/lib/tracing/PerfLog.h | 44 ++-- 3 files changed, 420 insertions(+), 59 deletions(-) diff --git a/src/lib/CMakeDeps.cmake b/src/lib/CMakeDeps.cmake index f4f65e19d..4c370f0e6 100644 --- a/src/lib/CMakeDeps.cmake +++ b/src/lib/CMakeDeps.cmake @@ -1 +1 @@ -set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/services/UserService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/PerfTraceLog.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/IcebergOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/CoverOrder.cpp;orderman/orders/book_algos/JoinOrder.cpp;orderman/orders/book_algos/LeanOrder.cpp;orderman/orders/book_algos/OffsetOrder.cpp;orderman/orders/book_algos/TickOrder.cpp;orderman/orders/book_algos/TopOrder.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;orderman2/OrderManager2.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;tracing/PerfLog.cpp;tracing/bts_trace.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/thread_manager.cpp) \ No newline at end of file +set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/services/UserService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/PerfTraceLog.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/IcebergOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/CoverOrder.cpp;orderman/orders/book_algos/JoinOrder.cpp;orderman/orders/book_algos/LeanOrder.cpp;orderman/orders/book_algos/OffsetOrder.cpp;orderman/orders/book_algos/TickOrder.cpp;orderman/orders/book_algos/TopOrder.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;orderman2/orders/NativeOrder.cpp;orderman2/orders/Order.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;tracing/PerfLog.cpp;tracing/bts_trace.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/thread_manager.cpp) \ No newline at end of file diff --git a/src/lib/tracing/PerfLog.cpp b/src/lib/tracing/PerfLog.cpp index 849020d85..34b21909a 100644 --- a/src/lib/tracing/PerfLog.cpp +++ b/src/lib/tracing/PerfLog.cpp @@ -1,27 +1,28 @@ - - #include "lib/tracing/PerfLog.h" -#include "lib/persistence/persistence_utils.h" -#include "lib/utils/datetime.h" #include "lib/config/config.h" #include "lib/config/protos/system.pb.h" - +#include "lib/persistence/persistence_utils.h" +#include "lib/utils/datetime.h" +#include "lib/utils/stats.h" + #include #include #include +#include +#include #include #include - + namespace bts { namespace trace { - + auto create_session = "create table session (" "version TEXT, " "host TEXT, " "build_type TEXT, " "session_start TIMESTAMP PRIMARY KEY" ")"; - + auto create_trace = "create table trace (" "session_start TIMESTAMP," "ts INTEGER," @@ -35,7 +36,7 @@ auto create_trace = "create table trace (" "uint64_1 INTEGER," "thread TEXT" ")"; - + auto insert_trace = "insert into trace (" "session_start," "ts," @@ -61,7 +62,7 @@ auto insert_trace = "insert into trace (" ":uint64_1," ":thread" ")"; - + auto insert_session = "insert into session (" "version," "host," @@ -73,27 +74,122 @@ auto insert_session = "insert into session (" ":build_type," ":session_start" ")"; - + +auto hedge_events_view = + "drop view if exists hedge_events; create view hedge_events as " + "select " + " trace.session_start, " + " channel, " + " sn, " + " min(hts) hts, " + " (max(ts)-min(ts))/1000 t " + "from " + " trace, " + " session " + "where " + " trace.session_start = session.session_start and " + " (entry_kind='fix_socket_r' or entry_kind='before_fix_socket_w') " + "group by " + " trace.session_start, " + " channel, " + " sn " + "having " + " count(*) = 2 and " + " min(entry_kind)<>max(entry_kind)"; + +auto hedge_trace_view = + "drop view if exists hedge_trace; create view hedge_trace as " + "select " + " session.version, " + " session.host, " + " session.build_type, " + " session.session_start, " + " trace.hts trace_time, " + " trace.uint32_1 order_key, " + " hedge_events.t total " + "from " + " trace, " + " hedge_events, " + " session " + "where " + " entry_kind='on_activate_start' and " + " trace.channel = hedge_events.channel and " + " trace.session_start = hedge_events.session_start and " + " trace.sn = hedge_events.sn and " + " trace.session_start = session.session_start "; + +auto requote_events_view = + "drop view if exists requote_events; create view requote_events as " + "select " + " trace.session_start, " + " channel, " + " sn, " + " min(hts) hts, " + " (max(ts)-min(ts))/1000 t " + "from " + " trace, " + " session " + "where " + " trace.session_start = session.session_start and " + " (entry_kind='md' or entry_kind='before_fix_socket_w') " + "group by " + " trace.session_start, " + " channel, " + " sn " + "having " + " count(*) = 2 and " + " min(entry_kind)<>max(entry_kind) "; + +auto requote_trace_view = + "drop view if exists requote_trace; create view requote_trace as " + "select " + " session.version, " + " session.host, " + " session.build_type, " + " session.session_start, " + " trace.hts trace_time, " + " trace.uint32_1 order_key, " + " requote_events.t total " + "from " + " trace, " + " requote_events, " + " session " + "where " + " entry_kind='order_update' and " + " trace.channel = requote_events.channel and " + " trace.session_start = requote_events.session_start and " + " trace.sn = requote_events.sn and " + " trace.session_start = session.session_start "; + +auto requote_query = + "select * from requote_trace order by trace_time desc limit ?"; + +auto hedge_query = "select * from hedge_trace order by trace_time desc limit ?"; + struct PerfLog::PImpl { PImpl(std::string const &loc) : db(loc, SQLite::OPEN_READWRITE | SQLite::OPEN_CREATE), - insert_trace_statement(), insert_session_statement(), session_start() {} - + insert_trace_statement(), insert_session_statement(), session_start(), + disabled(false), lock() {} + SQLite::Database db; std::unique_ptr insert_trace_statement; std::unique_ptr insert_session_statement; + std::unique_ptr requote_query_statement; + std::unique_ptr hedge_query_statement; std::string session_start; bool disabled; + std::mutex lock; }; - + PerfLog::PerfLog() : _pending(), _disabled(false), me() { auto loc = init_storage_location(); - + if (loc.empty()) { _disabled = true; return; } - + try { me = std::make_unique(loc); if (!me->db.tableExists("session")) { @@ -102,17 +198,26 @@ PerfLog::PerfLog() : _pending(), _disabled(false), me() { me->db.exec(create_session); me->db.exec(create_trace); } - + + me->db.exec(hedge_events_view); + me->db.exec(hedge_trace_view); + me->db.exec(requote_events_view); + me->db.exec(requote_trace_view); + me->insert_trace_statement = std::make_unique(me->db, insert_trace); me->insert_session_statement = std::make_unique(me->db, insert_session); + me->requote_query_statement = + std::make_unique(me->db, requote_query); + me->hedge_query_statement = + std::make_unique(me->db, hedge_query); me->session_start = datetime::FIX_timestamp(datetime::local_now()); - - me->insert_session_statement->bind(":version", - config::get().version()); - me->insert_session_statement->bind(":host", - config::get().host_name()); + + me->insert_session_statement->bind( + ":version", config::get().version()); + me->insert_session_statement->bind( + ":host", config::get().host_name()); #ifdef DEBUG me->insert_session_statement->bind(":build_type", "debug"); #else @@ -127,30 +232,29 @@ PerfLog::PerfLog() : _pending(), _disabled(false), me() { _disabled = true; } } - + PerfLog::~PerfLog() {} - + std::string PerfLog::init_storage_location() { - auto loc = persistence::storage_location("perf_trace2"); + auto loc = persistence::storage_location("perf_log"); auto parent = boost::filesystem::path(loc).parent_path(); - + if (!boost::filesystem::is_directory(parent)) { if (boost::filesystem::create_directories(parent)) return loc; else return ""; - } - else + } else return loc; } - + size_t PerfLog::store_log_entries() { if (_disabled) return 0; - + PerfLogEntry ev; size_t count = 0; - while (_pending.try_pop(ev)) + while (_pending.try_pop(ev)) try { me->insert_trace_statement->bind(":session_start", me->session_start); me->insert_trace_statement->bind(":ts", (long long)ev.ts.to_uint64()); @@ -164,21 +268,274 @@ size_t PerfLog::store_log_entries() { me->insert_trace_statement->bind(":uint32_1", ev.uint32_1); me->insert_trace_statement->bind(":uint32_2", ev.uint32_2); me->insert_trace_statement->bind(":uint64_1", (long long)ev.uint64_1); - + char tn[17]; - pthread_getname_np(pthread_self(), tn,16); + pthread_getname_np(ev.thread_id, tn, 16); me->insert_trace_statement->bind(":thread", tn); me->insert_trace_statement->exec(); me->insert_trace_statement->reset(); - count ++; + count++; } catch (SQLite::Exception const &e) { LOG(persist, Error, "Unable to insert perf trace in {}. Error: {}", std::string(me->db.getFilename()), std::string(e.getErrorStr())); - - _disabled = true; + + _disabled = true; } return count; } - -} // namespace trace + +std::string encode_string(SQLite::Column const &c) { + return fmt::format("\"{}\"", std::string(c)); +} + +std::string encode_number(SQLite::Column const &c) { + return fmt::format("{}", (long long)c); +} + +std::vector> +PerfLog::get_latest_requote_traces(size_t n) { + std::vector> result; + + std::lock_guard l(me->lock); + try { + me->requote_query_statement->bind(1, (long long)n); + + while (me->requote_query_statement->executeStep()) { + auto &row = result.emplace_back(); + row["version"] = + encode_string(me->requote_query_statement->getColumn("version")); + row["host"] = + encode_string(me->requote_query_statement->getColumn("host")); + row["build_type"] = encode_string( + me->requote_query_statement->getColumn("build_type")); + row["session_start"] = encode_string( + me->requote_query_statement->getColumn("session_start")); + row["trace_time"] = encode_string( + me->requote_query_statement->getColumn("trace_time")); + + row["order_key"] = + encode_number(me->requote_query_statement->getColumn("order_key")); + row["total"] = + encode_number(me->requote_query_statement->getColumn("total")); + } + me->requote_query_statement->reset(); + } catch (SQLite::Exception const &e) { + LOG(persist, Error, "Unable to retrieve quote traces {}. Error: {}", + std::string(me->db.getFilename()), std::string(e.getErrorStr())); + } + return result; +} + +std::vector> +PerfLog::get_latest_hedge_traces(size_t n) { + std::vector> result; + + std::lock_guard l(me->lock); + try { + me->hedge_query_statement->bind(1, (long long)n); + + while (me->hedge_query_statement->executeStep()) { + auto &row = result.emplace_back(); + row["version"] = + encode_string(me->hedge_query_statement->getColumn("version")); + row["host"] = + encode_string(me->hedge_query_statement->getColumn("host")); + row["build_type"] = + encode_string(me->hedge_query_statement->getColumn("build_type")); + row["session_start"] = encode_string( + me->hedge_query_statement->getColumn("session_start")); + row["trace_time"] = + encode_string(me->hedge_query_statement->getColumn("trace_time")); + + row["order_key"] = + encode_number(me->hedge_query_statement->getColumn("order_key")); + row["total"] = + encode_number(me->hedge_query_statement->getColumn("total")); + } + me->hedge_query_statement->reset(); + } catch (SQLite::Exception const &e) { + LOG(persist,Error,"Unable to retrieve hedge traces. Error: {}", + std::string(e.getErrorStr())); + } + return result; +} + +namespace perf_stat { + +using Row = std::map; + +struct Summary { + std::string name; + double min; + double max; + double median; + double ninenty_nine; + double stddev; + std::vector values; +}; + +struct Session { + std::string start; + std::string host; + std::string version; + std::string build_type; + uint32_t n_rows; + std::map summaries; + std::vector rows; +}; + +} // namespace perf_stat + +std::map structure_quote_traces( + std::vector> "es) { + + std::map result; + + for (auto &q : quotes) { + auto &session = result[q["session_start"]]; + if (session.start.empty()) { + session.start = q["session_start"]; + session.host = q["host"]; + session.version = q["version"]; + session.build_type = q["build_type"]; + } + for (auto st : {"total"}) { + auto &summary = session.summaries[st]; + if (summary.name.empty()) + summary.name = st; + summary.values.push_back(std::stod(q[st])); + } + session.rows.push_back(q); + session.n_rows++; + } + + for (auto &session_kvp : result) + for (auto &stat_kvp : session_kvp.second.summaries) { + auto &summary = stat_kvp.second; + summary.min = stats::min(summary.values); + summary.max = stats::max(summary.values); + summary.median = stats::percentile(summary.values, 0.5); + summary.ninenty_nine = stats::percentile(summary.values, 0.99); + summary.stddev = stats::stdev(summary.values); + } + + return result; +} + +std::map structure_hedge_traces( + std::vector> "es) { + + std::map result; + + for (auto &q : quotes) { + auto &session = result[q["session_start"]]; + if (session.start.empty()) { + session.start = q["session_start"]; + session.host = q["host"]; + session.version = q["version"]; + session.build_type = q["build_type"]; + } + for (auto st : {"total"}) { + auto &summary = session.summaries[st]; + if (summary.name.empty()) + summary.name = st; + summary.values.push_back(std::stod(q[st])); + } + session.rows.push_back(q); + session.n_rows++; + } + + for (auto &session_kvp : result) + for (auto &stat_kvp : session_kvp.second.summaries) { + auto &summary = stat_kvp.second; + summary.min = stats::min(summary.values); + summary.max = stats::max(summary.values); + summary.median = stats::percentile(summary.values, 0.5); + summary.ninenty_nine = stats::percentile(summary.values, 0.99); + summary.stddev = stats::stdev(summary.values); + } + + return result; +} + +void print_summary(std::ostream &ss, perf_stat::Summary const &s, bool last) { + ss << " { " + << "\"value\":" + << " \"" << s.name << "\"" + << ", \"min\":" << s.min << ", \"max\":" << s.max + << ", \"median\":" << s.median << ", \"ninenty_nine\":" << s.ninenty_nine + << ", \"stdev\":" << s.stddev; + if (!last) + ss << " },\n"; + else + ss << " }\n"; +} + +void print_row(std::ostream &ss, perf_stat::Row const &r, bool last) { + ss << " { "; + size_t i = 0; + for (auto const &kvp : r) + if (kvp.first != "version" && kvp.first != "host" && + kvp.first != "build_type" && kvp.first != "session_start") { + ss << "\"" << kvp.first << "\":" << kvp.second; + if (++i != r.size() - 4) + ss << ","; + } + if (!last) + ss << " },\n"; + else + ss << " }\n"; +} + +void print_session(std::ostream &ss, perf_stat::Session const &s, bool last) { + ss << "{\n" + << " \"session_name\": " << s.start << ",\n" + << " \"host\": " << s.host << ",\n" + << " \"version\": " << s.version << ",\n" + << " \"build_type\": " << s.build_type << ",\n" + << " \"n_rows\": " << s.n_rows << ",\n"; + + ss << " \"summaries\":\n [\n"; + size_t i = 0; + for (auto &summaries_kvp : s.summaries) + print_summary(ss, summaries_kvp.second, ++i == s.summaries.size()); + ss << " ],\n"; + + ss << " \"rows\":\n [\n"; + i = 0; + for (auto &r : s.rows) + print_row(ss, r, ++i == s.rows.size()); + ss << " ]\n"; + if (!last) + ss << "},\n"; + else + ss << "}\n"; +} + +void PerfLog::print_latest_traces(std::ostream &ss, size_t n) { + { + auto rows = get_latest_requote_traces(n); + auto structured = structure_quote_traces(rows); + + ss << "{\n\"requotes\": [\n"; + size_t i = 0; + for (auto &session_kvp : boost::adaptors::reverse(structured)) + print_session(ss, session_kvp.second, ++i == structured.size()); + ss << "],\n"; + } + + { + auto rows = get_latest_hedge_traces(n); + auto structured = structure_hedge_traces(rows); + + ss << "\"hedges\": [\n"; + + size_t i = 0; + for (auto &session_kvp : boost::adaptors::reverse(structured)) + print_session(ss, session_kvp.second, ++i == structured.size()); + ss << "]\n}\n"; + } +} + } // namespace trace +} // namespace bts diff --git a/src/lib/tracing/PerfLog.h b/src/lib/tracing/PerfLog.h index cc0f31ad8..c1bd7a012 100644 --- a/src/lib/tracing/PerfLog.h +++ b/src/lib/tracing/PerfLog.h @@ -1,18 +1,18 @@ - #pragma once - + #include "lib/utils/TimeStamp.h" -#include #include - +#include +#include + namespace bts { namespace trace { - + struct CorID { const char *channel = ""; uint32_t sn = 0; }; - + struct PerfLogEntry { utils::TimeStamp ts; const char *channel; @@ -22,39 +22,43 @@ struct PerfLogEntry { uint32_t uint32_1; uint32_t uint32_2; uint64_t uint64_1; - std::thread::id thread_id; + pthread_t thread_id; }; - + class PerfLog { tbb::concurrent_queue _pending; bool _disabled; struct PImpl; std::unique_ptr me; - + public: - PerfLog() ; + PerfLog(); ~PerfLog(); size_t store_log_entries(); - + void log(CorID cid, const char *entry_kind, uint32_t uint32_1 = 0, uint32_t uint32_2 = 0, const char *txt_1 = "", uint64_t uint64_1 = 0) { _pending.push({utils::TimeStamp::now(), cid.channel, entry_kind, txt_1, - cid.sn, uint32_1, uint32_2, uint64_1, - std::this_thread::get_id()}); + cid.sn, uint32_1, uint32_2, uint64_1, pthread_self()}); } - + void log(CorID cid, utils::TimeStamp ts, const char *entry_kind, uint32_t uint32_1 = 0, uint32_t uint32_2 = 0, - const char *txt_1 = nullptr, uint64_t uint64_1 = 0) { - _pending.push({ts,cid.channel, entry_kind, txt_1, - cid.sn, uint32_1, uint32_2, uint64_1, - std::this_thread::get_id()}); + const char *txt_1 = "", uint64_t uint64_1 = 0) { + _pending.push({ts, cid.channel, entry_kind, txt_1, cid.sn, uint32_1, + uint32_2, uint64_1, pthread_self()}); } - + + // return the N last traces + std::vector> get_latest_requote_traces(size_t n=0); + std::vector> get_latest_hedge_traces(size_t n=0); + + void print_latest_traces(std::ostream &,size_t n = 0); + private: std::string init_storage_location(); }; - + } // namespace trace } // namespace bts From 631158ebbc9503e542e201eab20b2164131330eb Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Wed, 5 Dec 2018 16:07:44 -0600 Subject: [PATCH 039/107] PR suggestions --- .../Market/MarketView/MarketViewRow.cs | 36 +++++++++---------- .../view/Controls/DIYGrid/CellProperty.cs | 14 +++++--- .../spark/view/Spark/PAndL/PnLSummaryRow.cs | 14 ++++---- 3 files changed, 34 insertions(+), 30 deletions(-) diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs b/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs index 73a84082c..e4e5e6e9b 100644 --- a/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs +++ b/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs @@ -45,28 +45,28 @@ namespace mbts.spark { _security_text = smd.security.ToString(); _security_key_text = security_key.ToString(); string format_price(double price) => security.ContractSpec.format(price); - _position = new CellProperty(0); + _position = new CellProperty(this, nameof(position), 0); _bid_price = backing(nameof(bid_price), double.NaN); _ask_price = backing(nameof(ask_price), double.NaN); _last_price = backing(nameof(last_price), double.NaN); - _last_size = new CellProperty(0); + _last_size = new CellProperty(this, nameof(last_size), 0); _day_change = backing(nameof(day_change), double.NaN); _session_low = backing(nameof(session_low), double.NaN); _session_high = backing(nameof(session_high), double.NaN); _settlement = backing(nameof(settlement), double.NaN); - _volume = new CellProperty(0); - _inside_bids = new CellProperty(); - _inside_asks = new CellProperty(); - _working_bid_volume = new CellProperty(); - _working_ask_volume = new CellProperty(); + _volume = new CellProperty(this, nameof(volume), 0); + _inside_bids = new CellProperty(this, nameof(inside_bids)); + _inside_asks = new CellProperty(this, nameof(inside_asks)); + _working_bid_volume = new CellProperty(this, nameof(working_bid_volume)); + _working_ask_volume = new CellProperty(this, nameof(working_ask_volume)); // _working_orders = new ObservableFilterCollection(_orders, o => o.is_active()); _working_bids = new ObservableFilterCollection(_working_orders, o => o.Def.Side == Side.Buy); _working_asks = new ObservableFilterCollection(_working_orders, o => o.Def.Side == Side.Sell); - _working_best_bid = new CellProperty(format_price, double.NaN); - _working_best_ask = new CellProperty(format_price, double.NaN); - _working_bids_text = new CellProperty(string.Empty); - _working_asks_text = new CellProperty(string.Empty); + _working_best_bid = new CellProperty(this, nameof(working_best_bid), format_price, double.NaN); + _working_best_ask = new CellProperty(this, nameof(working_best_ask), format_price, double.NaN); + _working_bids_text = new CellProperty(this, nameof(working_bids_text), string.Empty); + _working_asks_text = new CellProperty(this, nameof(working_asks_text), string.Empty); // default_command = new DelegateCommand(_show_ladder); bid_price_click = new DelegateCommand(() => _show_order_ticket(MarketViewView.Columns.Bid)); @@ -267,17 +267,17 @@ namespace mbts.spark { _inside_bids.on_next_distinct(_order_summarizer.best_working_bid >= bid_price, ref dirty); _inside_asks.on_next_distinct(_order_summarizer.best_working_ask <= ask_price, ref dirty); - // Here we need to RaisePropertyChanged for the non-Property<> cols that are bound to a filter - // (Property implements INotifyPropretyChanged, so this is taken for us autmagically) + // Here we need to RaisePropertyChanged for the non-Property/CellProperty<> cols that are bound to a filter + // (Property and CellProperty implement INotifyPropretyChanged and/or IRaiseNotifyPropertyChanged, so this is taken care of for us autmagically) // This is so that when the data changes behind the filter, the filter runs again for evaulation // on whether to show or hide the row RaisePropertyChanged( nameof(security), - nameof(volume), + // volume is a CellProperty<> // last price is a Property<> - nameof(last_size), - nameof(position), - nameof(working_bid_volume), + // last_size is a CellProperty<> + // position is a CellProperty<> + // working_bid_volume is a CellProperty<> nameof(bid_implied_size), nameof(bid_direct_size), nameof(bid_merged_size), @@ -286,7 +286,7 @@ namespace mbts.spark { nameof(ask_merged_size), nameof(ask_direct_size), nameof(ask_implied_size), - nameof(working_ask_volume), + // working_ask_volume is a CellProperty // setlltement is a Property<> // change is a Property<> // low is a Property<> diff --git a/src/client/spark/view/Controls/DIYGrid/CellProperty.cs b/src/client/spark/view/Controls/DIYGrid/CellProperty.cs index 758d0474d..754ee552d 100644 --- a/src/client/spark/view/Controls/DIYGrid/CellProperty.cs +++ b/src/client/spark/view/Controls/DIYGrid/CellProperty.cs @@ -1,16 +1,21 @@ -using System; +using mbts.ui.shell; +using System; using System.Reactive.Linq; using System.Reactive.Subjects; namespace mbts.spark { class CellProperty : ISubject { readonly Func _format; + readonly IRaiseNotifyPropertyChanged _owner; + readonly string _prop_name; string _text; - public CellProperty(T initial_value = default) - : this(t => t.ToString(), initial_value) { } + public CellProperty(IRaiseNotifyPropertyChanged owner, string prop_name, T initial_value = default) + : this(owner, prop_name, t => t.ToString(), initial_value) { } - public CellProperty(Func format, T initial_value = default) { + public CellProperty(IRaiseNotifyPropertyChanged owner, string prop_name, Func format, T initial_value = default) { + _owner = owner; + _prop_name = prop_name; _format = format; value = initial_value; } @@ -24,6 +29,7 @@ namespace mbts.spark { if (!value.Equals(this.value)) { OnNext(value); dirty = true; + _owner.raise_notify_property_changed(_prop_name); } } diff --git a/src/client/spark/view/Spark/PAndL/PnLSummaryRow.cs b/src/client/spark/view/Spark/PAndL/PnLSummaryRow.cs index c571fbd3b..a107179d3 100644 --- a/src/client/spark/view/Spark/PAndL/PnLSummaryRow.cs +++ b/src/client/spark/view/Spark/PAndL/PnLSummaryRow.cs @@ -15,7 +15,7 @@ namespace mbts.spark { class PnLSummaryRow : ViewModelBase, IEquatable, DIYGrid.IRowVM { static readonly SignedDataStore _brushes; readonly PnLDoubleBrushCell _start_pnl, _day_pnl, _total_pnl; - readonly PnLPriceCell _pnl_price, _weighted_average_buy, _weighted_average_sell; + readonly CellProperty _pnl_price, _weighted_average_buy, _weighted_average_sell; (string account, Venue? exchange, string symbol, SecurityImmutable? security, SecurityMD? sec_md, SecurityType? sec_type) key; IEnumerable _fills; double _driver; @@ -38,9 +38,9 @@ namespace mbts.spark { day_short_quantity = day_sell_quant; total_net_position = net_pos; start_net_position = sod_pos; - _pnl_price = new PnLPriceCell(this, nameof(pnl_price)); - _weighted_average_buy = new PnLPriceCell(this, nameof(weighted_average_buy), wavg_buy); - _weighted_average_sell = new PnLPriceCell(this, nameof(weighted_average_sell), wavg_sell); + _pnl_price = new CellProperty(this, nameof(pnl_price), price => this.security.spec_or_default().format(price), 0); + _weighted_average_buy = new CellProperty(this, nameof(weighted_average_buy), price => this.security.spec_or_default().format(price), wavg_buy); + _weighted_average_sell = new CellProperty(this, nameof(weighted_average_sell), price => this.security.spec_or_default().format(price), wavg_sell); _fills = fills; // set the initial pnl and pnl_price when there has been a @@ -193,10 +193,9 @@ namespace mbts.spark { class PnLDoubleBrushCell : CellProperty { Brush _background; - public PnLDoubleBrushCell(PnLSummaryRow owner, string prop) : base(d => double.IsNaN(d) ? string.Empty : d.ToString("N2"), double.NaN) => + public PnLDoubleBrushCell(PnLSummaryRow owner, string prop) : base(owner, prop, d => double.IsNaN(d) ? string.Empty : d.ToString("N2"), double.NaN) => _value_set += _ => { _background = null; - owner.RaisePropertyChanged(prop); }; public Brush background => _background ?? (_background = _brushes.get(value)); @@ -204,8 +203,7 @@ namespace mbts.spark { class PnLPriceCell : CellProperty { public PnLPriceCell(PnLSummaryRow owner, string prop, double init = 0) - : base(price => owner.security.spec_or_default().format(price), init) => - _value_set += _ => owner.RaisePropertyChanged(prop); + : base(owner, prop, price => owner.security.spec_or_default().format(price), init) { } } } } \ No newline at end of file From fba8233c639683481c7eba2271fd2bff9ec6451e Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Wed, 5 Dec 2018 16:09:53 -0600 Subject: [PATCH 040/107] Removing PnLPriceCell which is no longer used after previous PR edits --- src/client/spark/view/Spark/PAndL/PnLSummaryRow.cs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/client/spark/view/Spark/PAndL/PnLSummaryRow.cs b/src/client/spark/view/Spark/PAndL/PnLSummaryRow.cs index a107179d3..0b276cc26 100644 --- a/src/client/spark/view/Spark/PAndL/PnLSummaryRow.cs +++ b/src/client/spark/view/Spark/PAndL/PnLSummaryRow.cs @@ -201,9 +201,5 @@ namespace mbts.spark { public Brush background => _background ?? (_background = _brushes.get(value)); } - class PnLPriceCell : CellProperty { - public PnLPriceCell(PnLSummaryRow owner, string prop, double init = 0) - : base(owner, prop, price => owner.security.spec_or_default().format(price), init) { } - } } } \ No newline at end of file From 8cfca8e40ef011bbf1708c470ed29fc029f2d2b3 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Wed, 5 Dec 2018 23:31:26 +0000 Subject: [PATCH 041/107] Corrected channel in correlation id. --- src/lib/jetfix/connection/AsyncReader.cpp | 10 ++++- src/lib/orderman/actors/MDSource.h | 41 ++++++++++++++----- .../actors/order_manager/OrderServices.h | 31 +++++++++++--- 3 files changed, 64 insertions(+), 18 deletions(-) diff --git a/src/lib/jetfix/connection/AsyncReader.cpp b/src/lib/jetfix/connection/AsyncReader.cpp index 93129e2d0..1b564bb3c 100644 --- a/src/lib/jetfix/connection/AsyncReader.cpp +++ b/src/lib/jetfix/connection/AsyncReader.cpp @@ -84,7 +84,8 @@ struct AsyncReader::PImpl sink (sink), perf_log(l), high_water_mark (high_water_mark), - connection_name(connection_name) + connection_name(connection_name), + channel(new std::string(connection_name)) {} // abstraction for source of raw bytes @@ -106,6 +107,11 @@ struct AsyncReader::PImpl // need to increase the buffer size uint32_t high_water_mark; const std::string connection_name; + + // we leak this because we do not have a good way to pass a pointer + // to the perf_log object and guarantee that pointer is valid by + // the time the string is written to disk + const std::string *channel; }; AsyncReader::AsyncReader (IConnection &connection, @@ -144,7 +150,7 @@ void AsyncReader::dispatch () auto read_count = me->connection.read (cursor (),free_bytes ()); auto read_time = utils::TimeStamp::now(); trace::CorID trace; - trace.channel = "fix"; + trace.channel = me->channel->c_str(); // signal a disconnect if the connection broke if (read_count <= 0) { diff --git a/src/lib/orderman/actors/MDSource.h b/src/lib/orderman/actors/MDSource.h index 83f58a387..03a527495 100644 --- a/src/lib/orderman/actors/MDSource.h +++ b/src/lib/orderman/actors/MDSource.h @@ -3,14 +3,15 @@ #include "lib/logging/logging.h" #include "lib/md/MDConsumer.h" #include "lib/md/MDConsumerHandle.h" +#include "lib/md/cme/MDP3Utils.h" #include "lib/mercury/actors/Actor.h" #include "lib/mercury/actors/IPollableActor.h" #include "lib/mercury/events/TimerEvent.h" #include "lib/orderman/events/BookUpdateEvent.h" #include "lib/orderman/events/MDRequestEvent.h" +#include "lib/tracing/PerfLog.h" #include "lib/tracing/bts_trace.h" #include "lib/utils/TimeStamp.h" -#include "lib/tracing/PerfLog.h" namespace bts { namespace orderman { @@ -22,11 +23,23 @@ namespace orderman { class MDSource : public mercury::Actor, public mercury::IPollableActor { public: - MDSource(md::MDConsumer &consumer, metrics::MetricsContainer &stats, trace::PerfLog &log) - : _handles(), _md_consumer(consumer), _book_update(), _perf_log(log),_stats(stats), _loop_timer() {} + MDSource(md::MDConsumer &consumer, metrics::MetricsContainer &stats, + trace::PerfLog &log) + : _handles(), _md_consumer(consumer), _book_update(), _perf_log(log), + _stats(stats), _loop_timer() { + + auto cme_channels = md::get_configured_cme_channels(); + for (auto const &c : cme_channels) + for (auto const &s : c.symbols) + _symbol_to_channel[s] = c.id; + } + void init() override { LOG(OrderMan, Warn, "Starting MDSource actor"); - bts_assert_msg(_md_consumer.all_heartbeats_ok(), "Marketdata heartbeats are bad. MDConsumer will not recover from this condition. Please run 'sparkd md cleanup' and restart sparkd"); + bts_assert_msg( + _md_consumer.all_heartbeats_ok(), + "Marketdata heartbeats are bad. MDConsumer will not recover from " + "this condition. Please run 'sparkd md cleanup' and restart sparkd"); std::array buckets; auto i = 1; @@ -64,7 +77,13 @@ class MDSource : public mercury::Actor, public mercury::IPollableActor { LOG(OrderMan, Warn, "Starting to publish book updates for security key: {}", k); auto handle = _md_consumer.get_handle(k); - _handles.push_back({utils::TimeStamp(), handle}); + + auto &channel = _symbol_to_channel[handle.get_usersymbol()]; + if (channel.empty()) + channel = "sim"; + + _handles.push_back( + {utils::TimeStamp(), handle, channel.c_str()}); if (handle.is_synthetic()) { synthetic_count_metric->increment(); } @@ -82,21 +101,22 @@ class MDSource : public mercury::Actor, public mercury::IPollableActor { for (auto &h : _handles) { auto &handle = h.handle; if (handle.get_book(h.last, std::tuple_size(), - &book.bid()[0], &book.ask()[0]) == - md::HandleReadResult::SUCCESS) { + &book.bid()[0], + &book.ask()[0]) == md::HandleReadResult::SUCCESS) { book._security_key = SecurityKey(handle.key()); - trace::CorID trace {"md",handle.sequence()}; - _perf_log.log(trace,h.last,"md",handle.key()); + trace::CorID trace{h.channel, handle.sequence()}; + _perf_log.log(trace, h.last, "md", handle.key()); publish(_book_update, book, trace); } } auto stop = utils::TimeStamp::now(); - _loop_timer->observe((start-stop).nanoseconds()); + _loop_timer->observe((start - stop).nanoseconds()); } struct HandleRecord { utils::TimeStamp last; md::MDConsumerHandle handle; + const char *channel; }; std::vector _handles; @@ -105,6 +125,7 @@ class MDSource : public mercury::Actor, public mercury::IPollableActor { trace::PerfLog &_perf_log; metrics::MetricsContainer &_stats; std::shared_ptr> _loop_timer; + std::map _symbol_to_channel; }; } // namespace orderman } // namespace bts diff --git a/src/lib/orderman/actors/order_manager/OrderServices.h b/src/lib/orderman/actors/order_manager/OrderServices.h index d80f5c274..74c098a36 100644 --- a/src/lib/orderman/actors/order_manager/OrderServices.h +++ b/src/lib/orderman/actors/order_manager/OrderServices.h @@ -134,7 +134,7 @@ class OrderServices { void log(trace::CorID cid, const char *entry_kind, uint32_t uint32_1 = 0, uint32_t uint32_2 = 0, const char *txt_1 = "", uint64_t uint64_1 = 0) { - _data->log.log(cid,entry_kind,uint32_1,uint32_2,txt_1,uint64_1); + _data->log.log(cid, entry_kind, uint32_1, uint32_2, txt_1, uint64_1); } void report_state(const api::orderman::OrderState &state, @@ -154,9 +154,9 @@ class OrderServices { self._book_updates.unsub_all(); self._settlement_updates.unsub_all(); self._time_change.unsub_all(); - self._create_order_reply.unsub_all(); + self._create_order_reply.unsub_all(); } - if (self._parent) + if (self._parent) self._parent->_child_update_cb(ev); }); } @@ -173,21 +173,28 @@ class OrderServices { // Subscriptions ------------------------------ using BookSubID = EventStream::SubID; template BookSubID subscribe_to_book(SecurityKey k, CB &&cb) { - return _book_updates.sub(k, std::forward(cb)); + return _book_updates.sub(k, [this,cb] (auto const &ev) { + this->on_external_event(ev,cb); + }); } + void unsubscribe_from_book(BookSubID sid) { _book_updates.unsub(sid); } using SettlementSubID = EventStream::SubID; template SettlementSubID subscribe_to_settlements(SecurityKey k, CB &&cb) { - return _settlement_updates.sub(k, std::forward(cb)); + return _settlement_updates.sub(k, [this,cb] (auto const&ev) { + this->on_external_event(ev,cb); + }); } void unsubscribe_from_settlements(SettlementSubID sid) { _settlement_updates.unsub(sid); } template void subscribe_to_time(CB &&cb) { - _time_change_sub = _time_change.sub(std::forward(cb)); + _time_change_sub = _time_change.sub([this,cb] (auto const&ev) { + this->on_external_event(ev,cb); + }); } void unsubscribe_from_time() { _time_change.unsub(_time_change_sub); } @@ -202,6 +209,18 @@ class OrderServices { private: friend class OrderBuilder; + template void on_external_event(EV const &ev, C const &c) { + bts_assert(!_busy); + _busy = true; + c(ev); + for (size_t i = 0; i < _pending_calls.size(); i++) { + auto c = _pending_calls[i]; + c(*this); + } + _pending_calls.clear(); + _busy = false; + } + template void on_inter_order_call(C const &c) { if (_busy) _pending_calls.emplace_back(c); From 91dab2c8419cf06204af344a444eabc712ade505 Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Thu, 6 Dec 2018 10:22:53 -0500 Subject: [PATCH 042/107] Add timeout to perf trace ui --- src/data_files/files/perf_trace/main.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/data_files/files/perf_trace/main.js b/src/data_files/files/perf_trace/main.js index c22293406..6d6e6e4f1 100644 --- a/src/data_files/files/perf_trace/main.js +++ b/src/data_files/files/perf_trace/main.js @@ -1,4 +1,6 @@ $( document ).ready(function (){ + $.ajaxSetup({ timeout: 30000 }); + let urlParams = new URLSearchParams(window.location.search); num_rows = urlParams.get('r'); let show_rows = urlParams.get('showrows'); @@ -111,6 +113,9 @@ function ajax_err (jqXHR, textStatus,errorThrown) { console.log(textStatus); console.log(errorThrown); + + console.log(jqXHR); + } function first_upper (str) From 9c5ddba7f7275ca2b48cfd983155a7619760558b Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Thu, 6 Dec 2018 12:07:16 -0500 Subject: [PATCH 043/107] SPARK-1901 'real' aes --- .vscode/launch.json | 2 +- src/lib/utils/AuthToken.cpp | 68 +++++++++++++++++++++----- src/lib/utils/AuthToken.h | 1 + src/lib/utils/tests/AuthTokenTests.cpp | 4 +- 4 files changed, 60 insertions(+), 15 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 163cad3eb..fd21a1f69 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -209,7 +209,7 @@ "type": "cppdbg", "request": "launch", "program": "/home/bts/spark/build/ninja_debug/src/server/sparkd/sparkd", - "args": ["test","Co2Tests"], + "args": ["test","AuthToken"], "stopAtEntry": false, "cwd": "/home/bts/spark/build/ninja_debug/src/server/sparkd/", "environment": [], diff --git a/src/lib/utils/AuthToken.cpp b/src/lib/utils/AuthToken.cpp index 43f1290ec..e4cb116ea 100644 --- a/src/lib/utils/AuthToken.cpp +++ b/src/lib/utils/AuthToken.cpp @@ -1,14 +1,46 @@ #include "AuthToken.h" +#ifndef _WIN32 #include "lib/utils/base64.hpp" #include "lib/utils/bts_assert.h" #include "datetime.h" #include "base64.hpp" +// cryptopp +#include //temp +#include +#include +#include +#include +#include +#include + namespace bts { namespace api { namespace auth { -#ifndef _WIN32 +using namespace CryptoPP; +// chosen by fair dice roll. +// guaranteed to be random. +constexpr byte raw_key[AES::DEFAULT_KEYLENGTH] = { 75, 22, 52, 77, 93, 194, 234, 176, 155, 181, 215, 7, 185, 211, 20, 43 }; +const SecByteBlock bts_key(raw_key, AES::DEFAULT_KEYLENGTH); +constexpr byte raw_ivector[16] = { 182, 169, 236, 110, 146, 158, 187, 4, 5, 160, 205, 242, 174, 92, 127, 175 }; +const SecByteBlock bts_iv(raw_ivector, sizeof(raw_ivector)); + +std::string encrypt(const std::string& buffer) { + CFB_Mode::Encryption enc(bts_key, bts_key.size(), bts_iv); + std::string result; + result.resize(buffer.size()); + enc.ProcessData((byte*)result.c_str(), (byte*)buffer.c_str(), buffer.size()); + return result; +} + +std::string decrypt(const std::string& buffer) { + CFB_Mode::Decryption dec(bts_key, bts_key.size(), bts_iv); + std::string result; + result.resize(buffer.size()); + dec.ProcessData((byte*)result.c_str(), (byte*)buffer.c_str(), buffer.size()); + return result; +} AuthToken generate_token(const admin::BTSUser& user) { api::user::TokenPayload payload; @@ -17,7 +49,7 @@ AuthToken generate_token(const admin::BTSUser& user) { if(user.name() == "bts") { payload.set_wheel(true); } - auto token = websocketpp::base64_encode(payload.SerializeAsString()); + auto token = encrypt(payload.SerializeAsString()); bts_assert_d(token.size() < 255-8); AuthToken result; result.set_token(token); @@ -28,28 +60,40 @@ AuthToken generate_wheel_token() { payload.set_date(datetime::ll_now()); payload.set_id(99999); payload.set_wheel(true); - auto token = websocketpp::base64_encode(payload.SerializeAsString()); + auto token = encrypt(payload.SerializeAsString()); AuthToken result; result.set_token(token); return result; } -#else -AuthToken generate_wheel_token() { - return AuthToken(); -} -#endif - bool decode_token(const std::string& token, user::TokenPayload* payload) { if (token.empty()) return false; - std::string temp = websocketpp::base64_decode(token); + std::string temp = decrypt(token); if (payload) { - return payload->ParseFromString(temp); + return payload->ParseFromString(temp) && !is_expired(*payload); } else { // validate the token but don't return it user::TokenPayload payload; - return payload.ParseFromString(temp); + return payload.ParseFromString(temp) && !is_expired(payload); } } +bool is_expired(const user::TokenPayload&) { + return false; +} + + +#else +namespace bts { +namespace api { +namespace auth { + +AuthToken generate_wheel_token() { + return AuthToken(); +} +bool decode_token(const std::string& token, user::TokenPayload* payload) { + return false; +} +#endif + }}} diff --git a/src/lib/utils/AuthToken.h b/src/lib/utils/AuthToken.h index d9043939a..e0b330b41 100644 --- a/src/lib/utils/AuthToken.h +++ b/src/lib/utils/AuthToken.h @@ -10,6 +10,7 @@ namespace auth { AuthToken generate_token(const admin::BTSUser&); AuthToken generate_wheel_token(); bool decode_token(const std::string& token, user::TokenPayload* payload); +bool is_expired(const user::TokenPayload&); }}} diff --git a/src/lib/utils/tests/AuthTokenTests.cpp b/src/lib/utils/tests/AuthTokenTests.cpp index 779f53f07..18c098b3f 100644 --- a/src/lib/utils/tests/AuthTokenTests.cpp +++ b/src/lib/utils/tests/AuthTokenTests.cpp @@ -11,6 +11,8 @@ TEST_CASE("AuthToken", "[security]") { SECTION("round trip") { auto token = api::auth::generate_token(user); + // We use 1 byte for api header size + REQUIRE(token.ByteSize() <= 240); api::user::TokenPayload payload; REQUIRE(api::auth::decode_token(token.token(), &payload)); REQUIRE(payload.id() == user.id()); @@ -32,8 +34,6 @@ TEST_CASE("AuthToken", "[security]") { REQUIRE(payload.id() == user.id()); REQUIRE(payload.wheel()); } - - } }}//ns From bdbf7e53e884dcd3e2a7e0a5018416bbc3b0fe68 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Thu, 6 Dec 2018 12:48:32 -0600 Subject: [PATCH 044/107] more PR edits --- .../Market/MarketView/MarketViewRow.cs | 64 +++++++------------ 1 file changed, 24 insertions(+), 40 deletions(-) diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs b/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs index e4e5e6e9b..4dce5ec3a 100644 --- a/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs +++ b/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs @@ -35,7 +35,7 @@ namespace mbts.spark { readonly CellProperty _working_bids_text, _working_asks_text; readonly MyOrderSummarizer _order_summarizer = new MyOrderSummarizer(); readonly MDDisplayHelper.SizeFormatter _size_formatter = MDDisplayHelper.get_formatter(MarketSizeDisplay.get_default()); - uint _bid_direct_size, _bid_merged_size, _ask_direct_size, _ask_merged_size; + Property _bid_direct_size, _bid_merged_size, _ask_direct_size, _ask_merged_size; string _bid_merged_size_text, _ask_merged_size_text; ulong _bbo_ref, _last_ref; @@ -60,6 +60,11 @@ namespace mbts.spark { _working_bid_volume = new CellProperty(this, nameof(working_bid_volume)); _working_ask_volume = new CellProperty(this, nameof(working_ask_volume)); // + _bid_direct_size = backing(nameof(bid_direct_size), default(uint)); + _bid_merged_size = backing(nameof(bid_merged_size), default(uint)); + _ask_direct_size = backing(nameof(ask_direct_size), default(uint)); + _ask_merged_size = backing(nameof(ask_merged_size), default(uint)); + // _working_orders = new ObservableFilterCollection(_orders, o => o.is_active()); _working_bids = new ObservableFilterCollection(_working_orders, o => o.Def.Side == Side.Buy); _working_asks = new ObservableFilterCollection(_working_orders, o => o.Def.Side == Side.Sell); @@ -100,15 +105,15 @@ namespace mbts.spark { public double last_price => _last_price.Value; public uint last_size => _last_size.value; public double bid_price => _bid_price.Value; - public uint bid_direct_size => _bid_direct_size; - public uint bid_implied_size => _bid_merged_size - _bid_direct_size; - public uint bid_merged_size => _bid_merged_size; - public string bid_merged_size_text => _bid_merged_size_text ?? (_bid_merged_size_text = _size_formatter(_bid_merged_size, bid_implied_size)); + public uint bid_direct_size => _bid_direct_size.Value; + public uint bid_implied_size => _bid_merged_size.Value - _bid_direct_size.Value; + public uint bid_merged_size => _bid_merged_size.Value; + public string bid_merged_size_text => _bid_merged_size_text ?? (_bid_merged_size_text = _size_formatter(_bid_merged_size.Value, bid_implied_size)); public double ask_price => _ask_price.Value; - public uint ask_direct_size => _ask_direct_size; - public uint ask_implied_size => _ask_merged_size - _ask_direct_size; - public uint ask_merged_size => _ask_merged_size; - public string ask_merged_size_text => _ask_merged_size_text ?? (_ask_merged_size_text = _size_formatter(_ask_merged_size, ask_implied_size)); + public uint ask_direct_size => _ask_direct_size.Value; + public uint ask_implied_size => _ask_merged_size.Value - _ask_direct_size.Value; + public uint ask_merged_size => _ask_merged_size.Value; + public string ask_merged_size_text => _ask_merged_size_text ?? (_ask_merged_size_text = _size_formatter(_ask_merged_size.Value, ask_implied_size)); public ulong volume => _volume.value; public double settlement => _settlement.Value; public double day_change => _day_change.Value; @@ -144,9 +149,9 @@ namespace mbts.spark { bool dirty = false; if (md.md.get_bbo(ref _bbo_ref, out NativePriceSize b, out NativePriceSize a)) { _bid_price.set(b.price); - refresh_size(ref b, ref _bid_direct_size, ref _bid_merged_size, ref _bid_merged_size_text, nameof(bid_merged_size_text)); + refresh_size(ref b, _bid_direct_size, _bid_merged_size, ref _bid_merged_size_text, nameof(bid_merged_size_text)); _ask_price.set(a.price); - refresh_size(ref a, ref _ask_direct_size, ref _ask_merged_size, ref _ask_merged_size_text, nameof(ask_merged_size_text)); + refresh_size(ref a, _ask_direct_size, _ask_merged_size, ref _ask_merged_size_text, nameof(ask_merged_size_text)); _inside_bids.on_next_distinct(_bid_price.Value >= _working_best_bid.value, ref dirty); _inside_asks.on_next_distinct(_ask_price.Value <= _working_best_ask.value, ref dirty); } @@ -162,10 +167,10 @@ namespace mbts.spark { if (dirty) invalidated?.Invoke(); - void refresh_size(ref NativePriceSize nps, ref uint direct, ref uint merged, ref string text, string text_prop) { - if (nps.size != merged || nps.direct_size != direct) { - merged = nps.size; - direct = nps.direct_size; + void refresh_size(ref NativePriceSize nps, Property direct, Property merged, ref string text, string text_prop) { + if (nps.size != merged.Value || nps.direct_size != direct.Value) { + merged.set(nps.size); + direct.set(nps.direct_size); text = null; dirty = true; RaisePropertyChanged(text_prop); @@ -267,32 +272,11 @@ namespace mbts.spark { _inside_bids.on_next_distinct(_order_summarizer.best_working_bid >= bid_price, ref dirty); _inside_asks.on_next_distinct(_order_summarizer.best_working_ask <= ask_price, ref dirty); - // Here we need to RaisePropertyChanged for the non-Property/CellProperty<> cols that are bound to a filter - // (Property and CellProperty implement INotifyPropretyChanged and/or IRaiseNotifyPropertyChanged, so this is taken care of for us autmagically) - // This is so that when the data changes behind the filter, the filter runs again for evaulation - // on whether to show or hide the row RaisePropertyChanged( - nameof(security), - // volume is a CellProperty<> - // last price is a Property<> - // last_size is a CellProperty<> - // position is a CellProperty<> - // working_bid_volume is a CellProperty<> - nameof(bid_implied_size), - nameof(bid_direct_size), - nameof(bid_merged_size), - // bid price is a Property<> - // ask price is a Property<> - nameof(ask_merged_size), - nameof(ask_direct_size), - nameof(ask_implied_size), - // working_ask_volume is a CellProperty - // setlltement is a Property<> - // change is a Property<> - // low is a Property<> - // high is a Property<> - nameof(security_key), - + // Implied might not be ever set, so it probably does not RaisePropertyChanged either + // This might be part of the filter funk? + //nameof(bid_implied_size), + //nameof(ask_implied_size), nameof(working_bids_text), nameof(working_asks_text) ); From 09d4d1f9073c5174cdc0785f211ded4f8bd461fa Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Thu, 6 Dec 2018 14:09:50 -0500 Subject: [PATCH 045/107] SPARK-1901 ServiceContext.login( existing token). --- .../api/Channels/QuickBusClientChannel.cs | 60 +++++++++---------- src/client/spark_api/api/ServiceContext.cs | 8 ++- src/lib/api/public/ServiceContext.cpp | 3 + src/lib/api/public/ServiceContext.h | 1 + 4 files changed, 40 insertions(+), 32 deletions(-) diff --git a/src/client/spark_api/api/Channels/QuickBusClientChannel.cs b/src/client/spark_api/api/Channels/QuickBusClientChannel.cs index 937ac10b8..c22bf583d 100644 --- a/src/client/spark_api/api/Channels/QuickBusClientChannel.cs +++ b/src/client/spark_api/api/Channels/QuickBusClientChannel.cs @@ -35,7 +35,7 @@ namespace bts.api.core { var header = new RequestHeader() { Method = method_id, RequestId = id, - Token = _context.token + Token = _context.token.HasValue ? new AuthToken() { Token = _context.token?.Token } : null }; var buffer = header.serialize(request); var tcs = new TaskCompletionSource>(); @@ -60,44 +60,44 @@ namespace bts.api.core { public override IObservable> subscribe(int method_id, string method, string qualifier, MessageParser parser, Func converter) { var result = Observable.Create>(async observer => { IntPtr temp_subscription = IntPtr.Zero; - void unsubscribe_temp_sub() { - // Unsubscribe late to keep qb refcount > 0 continuously + void unsubscribe_temp_sub() { + // Unsubscribe late to keep qb refcount > 0 continuously if (temp_subscription != IntPtr.Zero) ApiNativeMethods.api_client_unsubscribe(_client, temp_subscription); } while (true) { - var response = await check_stream_access(method_id, qualifier); - if (response.success) { - if (response.value.Authorized) { - // success. Break loop and subscribe - break; - } - else { - // Not authorized. return empty stream - unsubscribe_temp_sub(); - observer.OnCompleted(); - return Disposable.Empty; - } - } - else { - // Wait for stream to fire once before trying again - unsubscribe_temp_sub(); - var tcs = new TaskCompletionSource(); - ApiNativeMethods.raw_subscription_callback cb = (event_type, changes, change_count, unused) => { - tcs.TrySetResult(true); - }; - temp_subscription = ApiNativeMethods.api_client_subscribe(_client, method, qualifier, cb, IntPtr.Zero); - await tcs.Task; - GC.KeepAlive(cb); - } + var response = await check_stream_access(method_id, qualifier); + if (response.success) { + if (response.value.Authorized) { + // success. Break loop and subscribe + break; + } + else { + // Not authorized. return empty stream + unsubscribe_temp_sub(); + observer.OnCompleted(); + return Disposable.Empty; + } + } + else { + // Wait for stream to fire once before trying again + unsubscribe_temp_sub(); + var tcs = new TaskCompletionSource(); + ApiNativeMethods.raw_subscription_callback cb = (event_type, changes, change_count, unused) => { + tcs.TrySetResult(true); + }; + temp_subscription = ApiNativeMethods.api_client_subscribe(_client, method, qualifier, cb, IntPtr.Zero); + await tcs.Task; + GC.KeepAlive(cb); + } } // Authorized. Stream events - unsubscribe_temp_sub(); - return SubscribeNative(method, qualifier, parser, converter, observer); + unsubscribe_temp_sub(); + return SubscribeNative(method, qualifier, parser, converter, observer); }); return result; } - private Task> check_stream_access(int method_id, string qualifier) { + private Task> check_stream_access(int method_id, string qualifier) { var request = new StreamAccessRequest() { Qualifier = qualifier ?? "" }; return send(method_id, request); } diff --git a/src/client/spark_api/api/ServiceContext.cs b/src/client/spark_api/api/ServiceContext.cs index 3f2ce048e..978b85957 100644 --- a/src/client/spark_api/api/ServiceContext.cs +++ b/src/client/spark_api/api/ServiceContext.cs @@ -10,6 +10,7 @@ namespace bts.api.core { public class ServiceContext : IDisposable { IntPtr _qbus; + AuthToken _token; public ServiceContext() { _qbus = ApiNativeMethods.api_create_quickbus(null, 0); @@ -31,7 +32,7 @@ namespace bts.api.core { return ch; } - public AuthToken token { get; private set; } + public AuthTokenImmutable? token => _token; public string user { get; private set; } public async Task login(string username, string password) { @@ -41,12 +42,15 @@ namespace bts.api.core { Password = password }); if (result.success) { - token = result.value.Token; + _token = result.value.Token; user = username; return true; } return false; } + public void login(AuthTokenImmutable token) { + this._token = token.CloneToMutable(); + } #region IDisposable Support diff --git a/src/lib/api/public/ServiceContext.cpp b/src/lib/api/public/ServiceContext.cpp index 3fafa77f0..26c333f34 100644 --- a/src/lib/api/public/ServiceContext.cpp +++ b/src/lib/api/public/ServiceContext.cpp @@ -54,6 +54,9 @@ bool ServiceContext::login(const std::string& username, const std::string& passw } return false; } +void ServiceContext::login(const AuthToken& token) { + _self->_token = token; +} void ServiceContext::post(const Action& action, uint64_t delay) { api_post(_self->_qbus, action, delay); diff --git a/src/lib/api/public/ServiceContext.h b/src/lib/api/public/ServiceContext.h index e434affe1..be886666d 100644 --- a/src/lib/api/public/ServiceContext.h +++ b/src/lib/api/public/ServiceContext.h @@ -36,6 +36,7 @@ public: const AuthToken token() const; const std::string& user() const; bool login(const std::string& username, const std::string& password); + void login(const AuthToken& token); typedef std::function Action; void post(const Action&, uint64_t delayms=0); From 0419d084f417387c52845857c8032fff3814986c Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Thu, 6 Dec 2018 15:01:40 -0500 Subject: [PATCH 046/107] moved co2 stuff down to spark_api to refactor or remove MarketDataClient.cs --- src/client/spark/Daemons/MDDaemon.cs | 3 +- .../Co2/AtomicPriceSize.cs | 0 .../Co2/Co2NativeMethods.cs | 11 ++----- .../Co2/Co2RelayControl.cs | 6 ++-- .../{spark_core => spark_api}/Co2/IntPrice.cs | 0 .../Co2/MDConsumer.cs | 1 + .../Co2/MDConsumerChannel.cs | 0 .../Co2/MDConsumerHandle.cs | 0 .../Co2/NativePriceHelpers.cs | 0 .../Co2/PriceSize.cs | 0 .../api/Channels/QuickBusClientChannel.cs | 2 +- src/client/spark_api/utils/APIExtensions.cs | 31 +++++++++++++++++++ .../utils/AnonymousDisposable.cs | 0 .../utils/EqualityComparer.cs | 0 .../utils/LLDateTime.cs | 0 .../utils/MathUtils.cs | 0 .../spark_core/utils/GlobalExtensions.cs | 19 +----------- 17 files changed, 41 insertions(+), 32 deletions(-) rename src/client/{spark_core => spark_api}/Co2/AtomicPriceSize.cs (100%) rename src/client/{spark_core => spark_api}/Co2/Co2NativeMethods.cs (93%) rename src/client/{spark_core => spark_api}/Co2/Co2RelayControl.cs (84%) rename src/client/{spark_core => spark_api}/Co2/IntPrice.cs (100%) rename src/client/{spark_core => spark_api}/Co2/MDConsumer.cs (96%) rename src/client/{spark_core => spark_api}/Co2/MDConsumerChannel.cs (100%) rename src/client/{spark_core => spark_api}/Co2/MDConsumerHandle.cs (100%) rename src/client/{spark_core => spark_api}/Co2/NativePriceHelpers.cs (100%) rename src/client/{spark_core => spark_api}/Co2/PriceSize.cs (100%) create mode 100644 src/client/spark_api/utils/APIExtensions.cs rename src/client/{spark_core => spark_api}/utils/AnonymousDisposable.cs (100%) rename src/client/{spark_core => spark_api}/utils/EqualityComparer.cs (100%) rename src/client/{spark_core => spark_api}/utils/LLDateTime.cs (100%) rename src/client/{spark_core => spark_api}/utils/MathUtils.cs (100%) diff --git a/src/client/spark/Daemons/MDDaemon.cs b/src/client/spark/Daemons/MDDaemon.cs index 76c89157f..4529156e4 100644 --- a/src/client/spark/Daemons/MDDaemon.cs +++ b/src/client/spark/Daemons/MDDaemon.cs @@ -36,7 +36,8 @@ namespace bts { _bus = bus; _token = token; _ss = ss; - _relay = new Co2RelayControl(_consumer); + uint naggle_ms = mbts.config.Configuration.get().naggle_ms; + _relay = new Co2RelayControl(_consumer, naggle_ms); _relay.preload_securities((co2.MDRequest.Types.Flags)0xff).ignore(); _dispose.Add(_consumer.on_security.Subscribe(this)); } diff --git a/src/client/spark_core/Co2/AtomicPriceSize.cs b/src/client/spark_api/Co2/AtomicPriceSize.cs similarity index 100% rename from src/client/spark_core/Co2/AtomicPriceSize.cs rename to src/client/spark_api/Co2/AtomicPriceSize.cs diff --git a/src/client/spark_core/Co2/Co2NativeMethods.cs b/src/client/spark_api/Co2/Co2NativeMethods.cs similarity index 93% rename from src/client/spark_core/Co2/Co2NativeMethods.cs rename to src/client/spark_api/Co2/Co2NativeMethods.cs index 1276d1ca9..03bb18f20 100644 --- a/src/client/spark_core/Co2/Co2NativeMethods.cs +++ b/src/client/spark_api/Co2/Co2NativeMethods.cs @@ -13,14 +13,9 @@ namespace mbts.co2 { internal static unsafe T deserialize(byte* buffer, ulong length) where T : new() { var stream = new System.IO.UnmanagedMemoryStream(buffer, (long)length); - if (typeof(IMessage).IsAssignableFrom(typeof(T))) { - IMessage result = (IMessage)new T(); - result.MergeFrom(stream); - return (T)result; - } - else { - return ProtoBuf.Serializer.Deserialize(stream); - } + IMessage result = (IMessage)new T(); + result.MergeFrom(stream); + return (T)result; } [DllImport("libspark")] diff --git a/src/client/spark_core/Co2/Co2RelayControl.cs b/src/client/spark_api/Co2/Co2RelayControl.cs similarity index 84% rename from src/client/spark_core/Co2/Co2RelayControl.cs rename to src/client/spark_api/Co2/Co2RelayControl.cs index 9adef0694..dbc8f9060 100644 --- a/src/client/spark_core/Co2/Co2RelayControl.cs +++ b/src/client/spark_api/Co2/Co2RelayControl.cs @@ -14,12 +14,10 @@ namespace mbts.co2 { MDConsumer _consumer; IntPtr _relay; - public Co2RelayControl(MDConsumer consumer) { + public Co2RelayControl(MDConsumer consumer, uint naggle_ms) { _consumer = consumer; Log.assert(consumer.native_pointer() != IntPtr.Zero); - _relay = - Co2NativeMethods.start_private_relay(consumer.native_pointer(), - config.Configuration.get().naggle_ms); + _relay = Co2NativeMethods.start_private_relay(consumer.native_pointer(), naggle_ms); Log.assert(_relay != IntPtr.Zero); } diff --git a/src/client/spark_core/Co2/IntPrice.cs b/src/client/spark_api/Co2/IntPrice.cs similarity index 100% rename from src/client/spark_core/Co2/IntPrice.cs rename to src/client/spark_api/Co2/IntPrice.cs diff --git a/src/client/spark_core/Co2/MDConsumer.cs b/src/client/spark_api/Co2/MDConsumer.cs similarity index 96% rename from src/client/spark_core/Co2/MDConsumer.cs rename to src/client/spark_api/Co2/MDConsumer.cs index d8f7b7304..439d65af0 100644 --- a/src/client/spark_core/Co2/MDConsumer.cs +++ b/src/client/spark_api/Co2/MDConsumer.cs @@ -9,6 +9,7 @@ using System.Runtime.InteropServices; using System.Text; using System.Threading.Tasks; using security_key = System.UInt32; +using bts; namespace mbts.co2 { diff --git a/src/client/spark_core/Co2/MDConsumerChannel.cs b/src/client/spark_api/Co2/MDConsumerChannel.cs similarity index 100% rename from src/client/spark_core/Co2/MDConsumerChannel.cs rename to src/client/spark_api/Co2/MDConsumerChannel.cs diff --git a/src/client/spark_core/Co2/MDConsumerHandle.cs b/src/client/spark_api/Co2/MDConsumerHandle.cs similarity index 100% rename from src/client/spark_core/Co2/MDConsumerHandle.cs rename to src/client/spark_api/Co2/MDConsumerHandle.cs diff --git a/src/client/spark_core/Co2/NativePriceHelpers.cs b/src/client/spark_api/Co2/NativePriceHelpers.cs similarity index 100% rename from src/client/spark_core/Co2/NativePriceHelpers.cs rename to src/client/spark_api/Co2/NativePriceHelpers.cs diff --git a/src/client/spark_core/Co2/PriceSize.cs b/src/client/spark_api/Co2/PriceSize.cs similarity index 100% rename from src/client/spark_core/Co2/PriceSize.cs rename to src/client/spark_api/Co2/PriceSize.cs diff --git a/src/client/spark_api/api/Channels/QuickBusClientChannel.cs b/src/client/spark_api/api/Channels/QuickBusClientChannel.cs index c22bf583d..ac054c2c8 100644 --- a/src/client/spark_api/api/Channels/QuickBusClientChannel.cs +++ b/src/client/spark_api/api/Channels/QuickBusClientChannel.cs @@ -75,7 +75,7 @@ namespace bts.api.core { // Not authorized. return empty stream unsubscribe_temp_sub(); observer.OnCompleted(); - return Disposable.Empty; + return System.Reactive.Disposables.Disposable.Empty; } } else { diff --git a/src/client/spark_api/utils/APIExtensions.cs b/src/client/spark_api/utils/APIExtensions.cs new file mode 100644 index 000000000..d1300fab5 --- /dev/null +++ b/src/client/spark_api/utils/APIExtensions.cs @@ -0,0 +1,31 @@ +using System; +using System.Collections.Generic; + +namespace mbts +{ + public static class APIExtensions + { + public static T? TryFirst(this IEnumerable src) where T : struct + { + foreach (var v in src) + return v; + return null; + } + + public static DateTime lldatetime(this ulong ll) + { + // Warning: Do not remove these consts, or try to simplify this method. + // System.DateTime() requires bits 63-64 to be empty in the "DateTime(long ticks)" constructor. + // The only way to set the DateTimeKind is through the "DateTime(long ticks, DateTimeKind kind)" constructor. + // (Yes, it is annoying. Internally, System.DateTime stores the DateTimeKind in bits 63-64 - in the exact format we already have!!!) + const ulong ticks_mask = 0x3FFFFFFFFFFFFFFF; + const int kind_shift = 62; + return new DateTime((long)(ll & ticks_mask), (DateTimeKind)(ll >> kind_shift)); + } + + public static string fmt(this string input, params object[] vals) + { + return string.Format(input, vals); + } + } +} \ No newline at end of file diff --git a/src/client/spark_core/utils/AnonymousDisposable.cs b/src/client/spark_api/utils/AnonymousDisposable.cs similarity index 100% rename from src/client/spark_core/utils/AnonymousDisposable.cs rename to src/client/spark_api/utils/AnonymousDisposable.cs diff --git a/src/client/spark_core/utils/EqualityComparer.cs b/src/client/spark_api/utils/EqualityComparer.cs similarity index 100% rename from src/client/spark_core/utils/EqualityComparer.cs rename to src/client/spark_api/utils/EqualityComparer.cs diff --git a/src/client/spark_core/utils/LLDateTime.cs b/src/client/spark_api/utils/LLDateTime.cs similarity index 100% rename from src/client/spark_core/utils/LLDateTime.cs rename to src/client/spark_api/utils/LLDateTime.cs diff --git a/src/client/spark_core/utils/MathUtils.cs b/src/client/spark_api/utils/MathUtils.cs similarity index 100% rename from src/client/spark_core/utils/MathUtils.cs rename to src/client/spark_api/utils/MathUtils.cs diff --git a/src/client/spark_core/utils/GlobalExtensions.cs b/src/client/spark_core/utils/GlobalExtensions.cs index 0f231a633..ee6769ee7 100644 --- a/src/client/spark_core/utils/GlobalExtensions.cs +++ b/src/client/spark_core/utils/GlobalExtensions.cs @@ -6,9 +6,6 @@ using System.Text; namespace mbts { public static class GlobalExtensions { - public static string fmt(this string input, params object[] vals) { - return string.Format(input, vals); - } public static string Repeat(this string s, uint count) { if (count == 0) return ""; if (count == 1) return s; @@ -27,15 +24,6 @@ namespace mbts { return range.Skip(index).First(); } - public static DateTime lldatetime(this ulong ll) { - // Warning: Do not remove these consts, or try to simplify this method. - // System.DateTime() requires bits 63-64 to be empty in the "DateTime(long ticks)" constructor. - // The only way to set the DateTimeKind is through the "DateTime(long ticks, DateTimeKind kind)" constructor. - // (Yes, it is annoying. Internally, System.DateTime stores the DateTimeKind in bits 63-64 - in the exact format we already have!!!) - const ulong ticks_mask = 0x3FFFFFFFFFFFFFFF; - const int kind_shift = 62; - return new DateTime((long)(ll & ticks_mask), (DateTimeKind)(ll >> kind_shift)); - } //this overloaded declaration, (as opposed to one function with comp = null) allows observable_collection.sync_with to be passed into functions as a parameterless Action public static void sync_with(this IList dest, IEnumerable src) { dest.sync_with(src, EqualityComparer.Default); } @@ -70,11 +58,6 @@ namespace mbts { } } - public static T? TryFirst(this IEnumerable src) where T : struct - { - foreach(var v in src) - return v; - return null; - } + } } \ No newline at end of file From b80fe1e748c4b03e5bad521d91cf44a9cbbfa330 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Thu, 6 Dec 2018 15:07:24 -0500 Subject: [PATCH 047/107] moved admin model down for some changes upstream --- src/client/spark/Admin/AdminModel.cs | 1 + src/client/spark/Orders/OrdersModel.cs | 6 ++--- .../admin}/AdminModelWrapper.cs | 4 ++-- .../admin}/PermissionFilters.cs | 24 +++++++++---------- 4 files changed, 17 insertions(+), 18 deletions(-) rename src/client/{spark/Admin => spark_core/admin}/AdminModelWrapper.cs (97%) rename src/client/{spark/Admin => spark_core/admin}/PermissionFilters.cs (66%) diff --git a/src/client/spark/Admin/AdminModel.cs b/src/client/spark/Admin/AdminModel.cs index da1ae42f4..af7cf9499 100644 --- a/src/client/spark/Admin/AdminModel.cs +++ b/src/client/spark/Admin/AdminModel.cs @@ -6,6 +6,7 @@ using System.ComponentModel.Composition; using System.Linq; using System.Reactive.Linq; using System.Reactive.Subjects; +using bts.api.core; namespace mbts.spark { [Export] diff --git a/src/client/spark/Orders/OrdersModel.cs b/src/client/spark/Orders/OrdersModel.cs index 7e470f842..bf24da63c 100644 --- a/src/client/spark/Orders/OrdersModel.cs +++ b/src/client/spark/Orders/OrdersModel.cs @@ -44,8 +44,8 @@ namespace mbts.spark { _dynamic_helper = dynamic_helper; var scheduler = ThreadPoolScheduler.Instance; var interval = TimeSpan.FromMilliseconds(100); - on_orders = _service.subscribei_orders().Naggle(interval, scheduler).PermissionFilter(admin_model).Table().Cache(); - on_positions = _position_service.subscribei_position_data().Naggle(interval, scheduler).PermissionFilter(admin_model).Table().Cache(); + on_orders = _service.subscribei_orders().Naggle(interval, scheduler).PermissionFilter(admin_model.on_admin_data).Table().Cache(); + on_positions = _position_service.subscribei_position_data().Naggle(interval, scheduler).PermissionFilter(admin_model.on_admin_data).Table().Cache(); working_orders = on_orders.Scan( ImmutableDictionary.Empty, @@ -55,7 +55,7 @@ namespace mbts.spark { on_order_tuples = order_record_tuple_source.subscribe_incremental_update(); on_order_tuples_table = order_record_tuple_source.subscribe_incremental_table_update(); on_order_securities = order_record_tuple_source.subscribe_order_securities(); - on_fills = _service.subscribei_fills().Naggle(interval, scheduler).PermissionFilter(admin_model).Table().Cache(); + on_fills = _service.subscribei_fills().Naggle(interval, scheduler).PermissionFilter(admin_model.on_admin_data).Table().Cache(); _activity = new OrderActivitySummarizer(bus, on_orders); on_fill_tuples = FillTupleSource.create_observable(bus.subscribe(SparkTags.SecuritiesTag), on_orders, on_fills); _security_orders_demuxer = new TableUpdateDemuxer(o => o.Key, o => o.security_key()); diff --git a/src/client/spark/Admin/AdminModelWrapper.cs b/src/client/spark_core/admin/AdminModelWrapper.cs similarity index 97% rename from src/client/spark/Admin/AdminModelWrapper.cs rename to src/client/spark_core/admin/AdminModelWrapper.cs index 62895933c..f52f016c5 100644 --- a/src/client/spark/Admin/AdminModelWrapper.cs +++ b/src/client/spark_core/admin/AdminModelWrapper.cs @@ -4,9 +4,9 @@ using System; using System.Collections.Generic; using System.Linq; -namespace mbts.spark +namespace bts.api.core { - class AdminModelWrapper + public class AdminModelWrapper { readonly AdminDataImmutable? _admin_data; readonly string _user_name; diff --git a/src/client/spark/Admin/PermissionFilters.cs b/src/client/spark_core/admin/PermissionFilters.cs similarity index 66% rename from src/client/spark/Admin/PermissionFilters.cs rename to src/client/spark_core/admin/PermissionFilters.cs index 115187a45..3da6a137c 100644 --- a/src/client/spark/Admin/PermissionFilters.cs +++ b/src/client/spark_core/admin/PermissionFilters.cs @@ -4,10 +4,6 @@ using bts.api.core; using bts.api.orderman; using bts.api.position; using bts.spark; -using mbts.collections; -using mbts.spark; -using mbts.spark.utilities; -using mbts.utils; using System; using System.Collections.Generic; using System.Collections.Immutable; @@ -18,14 +14,14 @@ using System.Reactive.Linq; namespace bts.api.core { - - static class PermissionFilters + public static class PermissionFilters { - public static IObservable> PermissionFilter(this IObservable> source, AdminModel am) + public static IObservable> + PermissionFilter(this IObservable> source, IObservable am) { var pred = Observable.Create>( observer => { - return am.on_admin_data.Subscribe(x => + return am.Subscribe(x => { Func filter = (z => x.can_view_account(z.Account)); observer.OnNext(filter); @@ -35,13 +31,14 @@ namespace bts.api.core return source.Filter(pred); } - public static IObservable> PermissionFilter(this IObservable> source, AdminModel am) + public static IObservable> + PermissionFilter(this IObservable> source, IObservable am) { var pred = Observable.Create>(observer => { - return am.on_admin_data.Subscribe(x => + return am.Subscribe(x => { - Func filter = (z => x.can_view_account(z.account())); + Func filter = (z => x.can_view_account(z.Def.Account ?? string.Empty)); observer.OnNext(filter); }); }); @@ -49,11 +46,12 @@ namespace bts.api.core return source.Filter(pred); } - public static IObservable> PermissionFilter(this IObservable> source, AdminModel am) + public static IObservable> + PermissionFilter(this IObservable> source, IObservable am) { var pred = Observable.Create>(observer => { - return am.on_admin_data.Subscribe(x => + return am.Subscribe(x => { Func filter = (z => x.can_view_account(z.Account)); observer.OnNext(filter); From e1b638a4b6568c959d88e532a8d3a56d4ab3af65 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Fri, 7 Dec 2018 08:55:35 -0500 Subject: [PATCH 048/107] ServiceContext.login() needs to return more information --- src/client/spark_api/api/ServiceContext.cs | 30 +++++++++++++++++----- src/lib/api/public/ServiceContext.cpp | 26 ++++++++++++++++--- src/lib/api/public/ServiceContext.h | 9 ++++++- 3 files changed, 53 insertions(+), 12 deletions(-) diff --git a/src/client/spark_api/api/ServiceContext.cs b/src/client/spark_api/api/ServiceContext.cs index 0b2da3fae..b27ea9412 100644 --- a/src/client/spark_api/api/ServiceContext.cs +++ b/src/client/spark_api/api/ServiceContext.cs @@ -34,19 +34,28 @@ namespace bts.api.core { public AuthTokenImmutable? token => _token ?? (AuthTokenImmutable?)null; public string user { get; private set; } + public uint user_id { get; private set; } - public async Task login(string username, string password) { + public async Task login(string username, string password) { var auth_service = locate(); var result = await auth_service.authenticate_login_async(new AuthenticateLoginRequest() { - Login = username, - Password = password + Login = username ?? "", + Password = password ?? "" }); if (result.success) { - _token = result.value.Token; - user = username; - return true; + if (result.value.IsValid) { + _token = result.value.Token; + user = username; + user_id = result.value.UserId; + return new LoginResult(); + } + else { + return new LoginResult(result.value.Reason); + } + } + else { + return new LoginResult(result.error_message); } - return false; } public void login(AuthTokenImmutable token) { this._token = token.CloneToMutable(); @@ -73,4 +82,11 @@ namespace bts.api.core { } #endregion } + + public class LoginResult { + public LoginResult() { success = true; } + public LoginResult(string reason) { success = false; this.reason = reason; } + public bool success { get; } + public string reason { get; } + } } diff --git a/src/lib/api/public/ServiceContext.cpp b/src/lib/api/public/ServiceContext.cpp index 26c333f34..cef9c3d4c 100644 --- a/src/lib/api/public/ServiceContext.cpp +++ b/src/lib/api/public/ServiceContext.cpp @@ -8,6 +8,16 @@ namespace bts { namespace api { +LoginResult::LoginResult(): + success(true), + reason() + {} + +LoginResult::LoginResult(const std::string& why): + success(true), + reason(why) + {} + struct ServiceContextImpl { ServiceContextImpl(Quickbus* maybe_bus): _qbus(maybe_bus ? *maybe_bus : *api_create_quickbus(nullptr, 0)), @@ -42,17 +52,25 @@ ServerChannel ServiceContext::publish(ApiServer& service, const std::string& ser return ServerChannel(_self->_qbus, service_type, qualifier, service); } -bool ServiceContext::login(const std::string& username, const std::string& password) { +const LoginResult ServiceContext::login(const std::string& username, const std::string& password) { auto auth = locate(); user::AuthenticateLoginRequest request; request.set_login(username); request.set_password(password); auto result = auth.authenticate_login(request); if (result.success()) { - _self->_token = result.value()->token(); //.CopyFrom(result.value()->token()); - _self->_user = username; + if (result.value()->is_valid()) { + _self->_token = result.value()->token(); + _self->_user = username; + return {}; + } + else { + return {result.value()->reason()}; + } + } + else { + return {result.error_message()}; } - return false; } void ServiceContext::login(const AuthToken& token) { _self->_token = token; diff --git a/src/lib/api/public/ServiceContext.h b/src/lib/api/public/ServiceContext.h index be886666d..4ee20db78 100644 --- a/src/lib/api/public/ServiceContext.h +++ b/src/lib/api/public/ServiceContext.h @@ -18,6 +18,13 @@ namespace api { class ClientChannel; struct ServiceContextImpl; +struct LoginResult { + LoginResult(); + LoginResult(const std::string&); + bool success; + std::string reason; +}; + class BTS_EXPORT ServiceContext { std::shared_ptr _self; @@ -35,7 +42,7 @@ public: Quickbus& bus() const; const AuthToken token() const; const std::string& user() const; - bool login(const std::string& username, const std::string& password); + const LoginResult login(const std::string& username, const std::string& password); void login(const AuthToken& token); typedef std::function Action; From 38edcb27f1e986f6a5b0ac040f9071730bfe4537 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Fri, 7 Dec 2018 11:44:34 -0500 Subject: [PATCH 049/107] Token must not be treated as null terminated string --- src/client/spark_core/Co2/Co2NativeMethods.cs | 2 +- src/lib/md/MDConsumerInterop.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/client/spark_core/Co2/Co2NativeMethods.cs b/src/client/spark_core/Co2/Co2NativeMethods.cs index 1276d1ca9..54126de6a 100644 --- a/src/client/spark_core/Co2/Co2NativeMethods.cs +++ b/src/client/spark_core/Co2/Co2NativeMethods.cs @@ -81,7 +81,7 @@ namespace mbts.co2 [DllImport("libspark")] internal unsafe static extern IntPtr add_relay_symbol(IntPtr relay, UserSymbol symbol, bts.co2.MDRequest.Types.Flags flags); [DllImport("libspark")] - internal unsafe static extern IntPtr set_relay_token(IntPtr relay, string user_name); + internal unsafe static extern IntPtr set_relay_token(IntPtr relay, byte[] token, long token_size); [DllImport("libspark")] internal unsafe static extern void post_on_scan_security_thread(Action callback); diff --git a/src/lib/md/MDConsumerInterop.cpp b/src/lib/md/MDConsumerInterop.cpp index b526ebc28..01b0616bb 100644 --- a/src/lib/md/MDConsumerInterop.cpp +++ b/src/lib/md/MDConsumerInterop.cpp @@ -162,8 +162,8 @@ CAPI void add_relay_symbol(md::RelayControl* prelay, BlitUserSymbol& symbol, uin } } -CAPI void set_relay_token(md::RelayControl* prelay, const char* token) { - md::set_relay_token(prelay, std::string(token)); +CAPI void set_relay_token(md::RelayControl* prelay, const char* token, size_t token_size) { + md::set_relay_token(prelay, std::string(token,token_size)); } From 601eec3ddbaaae18bebea3bd04392b7715447855 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Fri, 7 Dec 2018 11:44:43 -0500 Subject: [PATCH 050/107] Convert shell to log into the context --- src/client/spark/Daemons/MDDaemon.cs | 4 +- src/client/spark/Daemons/ShellServices.cs | 5 +- .../spark/view/Shell/Login/LoginModel.cs | 113 +++++++----------- .../spark/view/Shell/Login/LoginViewModel.cs | 13 +- src/client/spark_api/md/MarketDataClient.cs | 5 +- src/client/spark_core/Co2/Co2RelayControl.cs | 5 +- .../rtd/subscriptions/MDSubscribe.cs | 2 +- src/lib/api/apicore.proto | 2 +- src/lib/md/protos/co2.proto | 2 +- src/server/sparkd/http/ApiGateway.cpp | 1 + 10 files changed, 63 insertions(+), 89 deletions(-) diff --git a/src/client/spark/Daemons/MDDaemon.cs b/src/client/spark/Daemons/MDDaemon.cs index 76c89157f..c673f0854 100644 --- a/src/client/spark/Daemons/MDDaemon.cs +++ b/src/client/spark/Daemons/MDDaemon.cs @@ -19,7 +19,7 @@ namespace bts { [Export(typeof(IInitializable))] class MDSource : IObserver>, IInitializable, IDisposable { readonly Lazy _bus; - readonly Lazy _token; + readonly Lazy _token; readonly Lazy _ss; readonly MDConsumer _consumer = new MDConsumer(); readonly Co2RelayControl _relay; @@ -31,7 +31,7 @@ namespace bts { [ImportingConstructor] public MDSource( Lazy bus, - Lazy token, + Lazy token, Lazy ss) { _bus = bus; _token = token; diff --git a/src/client/spark/Daemons/ShellServices.cs b/src/client/spark/Daemons/ShellServices.cs index 23ab2c1ca..eb9deee90 100644 --- a/src/client/spark/Daemons/ShellServices.cs +++ b/src/client/spark/Daemons/ShellServices.cs @@ -13,10 +13,7 @@ using System.ComponentModel.Composition; namespace Spark { public class ShellServices { [Export] - public static ServiceContext context { get; } = new ServiceContext(); - - [Export] - public AuthService user_service => context.locate(); + public ServiceContext context { get; } = new ServiceContext(); [Export("settings")] public PersistenceService settings_service => context.locate("settings"); diff --git a/src/client/spark/view/Shell/Login/LoginModel.cs b/src/client/spark/view/Shell/Login/LoginModel.cs index 3df06a379..20e770318 100644 --- a/src/client/spark/view/Shell/Login/LoginModel.cs +++ b/src/client/spark/view/Shell/Login/LoginModel.cs @@ -1,40 +1,29 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.Composition; -using System.Diagnostics; -using System.Linq; -using System.Text; -using System.Threading; -using System.Threading.Tasks; -using System.Windows; -using System.Windows.Threading; -using mbts.config; -using mbts.ui.native; -using mbts.utils; -using bts.co2; +using bts; using bts.api; -using bts.api.user; +using bts.api.core; using bts.api.persistence; -using bts; +using bts.api.user; +using mbts.config; +using System; +using System.Collections.Generic; +using System.ComponentModel.Composition; +using System.Linq; +using System.Threading.Tasks; +using System.Windows.Threading; -namespace mbts.ui.shell -{ +namespace mbts.ui.shell { // The LoginContainer participates in the startup Import/Export dependency system // Since the login form should not depend on *anything* it will be shown before this is created // Once this is created it access the global LoginModel and retrieves the username internal class LoginContainer { [ImportingConstructor] - public LoginContainer(AuthService user, [Import("settings")] PersistenceService persist) { + public LoginContainer(ServiceContext context) { var model = LoginModel.instance; - model.provide_services(user, persist); + model.provide_services(context); // await_login pumps the dispatcher but doesn't allow control to return to MEF until the username and workspace are available model.await_login(); - var u = model.get_user(); - UserName = u.name; - UserId = u.id; - Token = u.token; + (UserName,UserId,Token) = model.get_user(); Workspace = model.get_workspace(); model.Dispose(); } @@ -45,21 +34,19 @@ namespace mbts.ui.shell [Export("userid")] public uint UserId { get; private set; } [Export] - public AuthToken Token { get; private set; } + public AuthTokenImmutable Token { get; private set; } [Export("workspace")] public string Workspace { get; private set; } } public struct User { - public User(string name, uint id, AuthToken token) { + public User(string name, uint id) { this.name = name; this.id = id; - this.token = token; } public readonly string name; public readonly UInt32 id; - public readonly AuthToken token; } public class LoginModel : IDisposable @@ -67,11 +54,10 @@ namespace mbts.ui.shell // Singleton to help bootstrap the system private static LoginModel _instance = new LoginModel(); public static LoginModel instance { get { return _instance; } } - private User _user; private string _workspace; private PreloginWorkspaceEnumerator _enum_workspace; - - AuthService _logon; + + ServiceContext _ctx; DispatcherFrame _frame = new DispatcherFrame(); private LoginModel() { @@ -83,13 +69,14 @@ namespace mbts.ui.shell public string ErrorMessage { get; private set; } public bool HasFatalError { get; set; } public User[] Users { get; private set; } - - + + // The final username - public User get_user() { - Log.assert_d(!string.IsNullOrEmpty(_user.name)); - return _user; + public (string, uint, AuthTokenImmutable) get_user() { + Log.assert_d(!string.IsNullOrEmpty(_ctx.user)); + return (_ctx.user, _ctx.user_id, _ctx.token.Value); } + public string get_workspace() { return _workspace ?? ""; } @@ -113,13 +100,13 @@ namespace mbts.ui.shell } // Wait for the hub to create the login doodad - (var users, var persist) = await _hub_src.Task; - _logon = users; + _ctx = await _hub_src.Task; // Populate the UI - _enum_workspace = new PreloginWorkspaceEnumerator(persist); - var response = await _logon.get_users_async(new GetUsersRequest()); + _enum_workspace = new PreloginWorkspaceEnumerator(_ctx.locate("settings")); + var auth = _ctx.locate(); + var response = await auth.get_users_async(new GetUsersRequest()); if (response.success) { - Users = response.value.Users.Select(x => new User(x.Login,x.Id, null)).OrderBy(u => u.name).ToArray(); + Users = response.value.Users.Select(x => new User(x.Login,x.Id)).OrderBy(u => u.name).ToArray(); } else { ErrorMessage = "Logon: " + response.error_message; @@ -130,49 +117,37 @@ namespace mbts.ui.shell #endregion - public async Task<(bool success,string info)> do_login(string username, string workspace, string password) { + public async Task do_login(string username, string workspace, string password) { if (Users.Select(u => u.name).Contains(username)) { - var response = await _logon.authenticate_login_async(new AuthenticateLoginRequest() { - Login = username, - Password = password ??"" - }); - if (response.success) { - if (response.value.IsValid) { - _workspace = workspace; - set_authenticated_user(new User(username, response.value.UserId, response.value.Token)); - return (true, ""); - } - else { - return (false, response.value.Reason); - } - } - else { - return (false, response.error_message); + var result = await _ctx.login(username, password); + if (result.success) { + _workspace = workspace; + on_user_authenticated(_ctx.user, _ctx.token); } + return result; } - return (false, "Invalid username"); + return new LoginResult("Invalid username"); } - private void set_authenticated_user(User user) { - Log.assert(!string.IsNullOrEmpty(user.name)); - Log.assert(Users.Select(u => u.name).Contains(user.name)); - _user = user; - Environment.SetEnvironmentVariable("BTS_USER", user.name); + private void on_user_authenticated(string username, AuthTokenImmutable? token) { + Log.assert(!string.IsNullOrEmpty(username)); + Log.assert(Users.Select(u => u.name).Contains(username)); + Environment.SetEnvironmentVariable("BTS_USER", username); _frame.Continue = false; } public void await_login() { - if (string.IsNullOrEmpty(_user.name)) { + if (!_ctx.token.HasValue) { Dispatcher.PushFrame(_frame); } } #region provide hub - public void provide_services(AuthService u, PersistenceService p) { - _hub_src.TrySetResult((u,p)); + internal void provide_services(ServiceContext ctx) { + _hub_src.TrySetResult(ctx); } - private TaskCompletionSource<(AuthService, PersistenceService)> _hub_src = new TaskCompletionSource<(AuthService, PersistenceService)>(); + private TaskCompletionSource _hub_src = new TaskCompletionSource(); #endregion #region Dispose diff --git a/src/client/spark/view/Shell/Login/LoginViewModel.cs b/src/client/spark/view/Shell/Login/LoginViewModel.cs index c2140dc91..b9994863d 100644 --- a/src/client/spark/view/Shell/Login/LoginViewModel.cs +++ b/src/client/spark/view/Shell/Login/LoginViewModel.cs @@ -138,14 +138,15 @@ namespace mbts.ui.shell if (selected_workspace == "New workspace...") { selected_workspace = null; } - (bool success, string message) = await _model.do_login(Name, selected_workspace, Password); - if (success) { VisualState = "Loading"; } - if (!success && !string.IsNullOrEmpty(message)) { - WarningMessage = message; + var result = await _model.do_login(Name, selected_workspace, Password); + if (result.success) { VisualState = "Loading"; } + if (!result.success && !string.IsNullOrEmpty(result.reason)) { + WarningMessage = result.reason; VisualState = "BadPassword"; } - else if (!string.IsNullOrEmpty(message)) { - BTSMessageBox.Show(message, "Login Message", BTSMessageBoxButtons.OK, MessageBoxImage.Information); + else if (!string.IsNullOrEmpty(result.reason)) { + // Login was successful but we have a message for the user + BTSMessageBox.Show(result.reason, "Login Message", BTSMessageBoxButtons.OK, MessageBoxImage.Information); } } private void OnCancel(object unused) { diff --git a/src/client/spark_api/md/MarketDataClient.cs b/src/client/spark_api/md/MarketDataClient.cs index 2512c2b72..d6d8664ab 100644 --- a/src/client/spark_api/md/MarketDataClient.cs +++ b/src/client/spark_api/md/MarketDataClient.cs @@ -61,14 +61,13 @@ namespace bts.api.md _subscription = load_request(exchange, token); } - public void set_auth_token(AuthToken toke) + public void set_auth_token(AuthToken token) { - _subscription.Token = toke?.Token ?? string.Empty; } MDRequest load_request(bts.api.Venue exchange, AuthToken token) { - var req = new MDRequest() { Token = token?.Token ?? string.Empty } ; + var req = new MDRequest() {} ; var prods = _all_products.Where(x=>x.Exchange == exchange || exchange == bts.api.Venue.Unset); foreach(var prod in prods) req.Channels.Add(new SecurityChannel() { Exchange = prod.Exchange, Type = prod.Type, Symbol = prod.Symbol, Flags = 0 }); diff --git a/src/client/spark_core/Co2/Co2RelayControl.cs b/src/client/spark_core/Co2/Co2RelayControl.cs index 9adef0694..86d8005b7 100644 --- a/src/client/spark_core/Co2/Co2RelayControl.cs +++ b/src/client/spark_core/Co2/Co2RelayControl.cs @@ -23,8 +23,9 @@ namespace mbts.co2 Log.assert(_relay != IntPtr.Zero); } - public void set_token(AuthToken token) { - Co2NativeMethods.set_relay_token(_relay, token.Token); + public void set_token(AuthTokenImmutable token) { + var buffer = token.Token.ToByteArray(); + Co2NativeMethods.set_relay_token(_relay, buffer, buffer.LongLength); } public async Task preload_securities(MDRequest.Types.Flags flags=MDRequest.Types.Flags.Security) { diff --git a/src/client/spark_excel/rtd/subscriptions/MDSubscribe.cs b/src/client/spark_excel/rtd/subscriptions/MDSubscribe.cs index cdfc364b4..47fb6f446 100644 --- a/src/client/spark_excel/rtd/subscriptions/MDSubscribe.cs +++ b/src/client/spark_excel/rtd/subscriptions/MDSubscribe.cs @@ -26,7 +26,7 @@ namespace bts.excel.rtd MarketDataClient.create_or_get(ven, out MarketDataClient md); md?.set_auth_token(toke); } - handle.SetResult(toke?.Token ?? "Could not log in check user/pass"); + handle.SetResult((object)toke?.Token ?? "Could not log in check user/pass"); } catch(Exception ex) { diff --git a/src/lib/api/apicore.proto b/src/lib/api/apicore.proto index c22e023cf..4da2a780d 100644 --- a/src/lib/api/apicore.proto +++ b/src/lib/api/apicore.proto @@ -13,7 +13,7 @@ message PingPong { // T Request message AuthToken { - string token = 1; + bytes token = 1; } message RequestHeader { diff --git a/src/lib/md/protos/co2.proto b/src/lib/md/protos/co2.proto index ce3fbf608..e255a7106 100644 --- a/src/lib/md/protos/co2.proto +++ b/src/lib/md/protos/co2.proto @@ -62,7 +62,7 @@ message MDRequest { IMPLIED = 0x40; } string host = 2; - string token = 3; + bytes token = 3; } message ChannelUpdate { diff --git a/src/server/sparkd/http/ApiGateway.cpp b/src/server/sparkd/http/ApiGateway.cpp index a1ebf346f..2d74e8ea9 100644 --- a/src/server/sparkd/http/ApiGateway.cpp +++ b/src/server/sparkd/http/ApiGateway.cpp @@ -47,6 +47,7 @@ struct ApiGatewayImpl { resp.mutable_logon()->set_is_valid(true); resp.mutable_logon()->set_token(logon_response.value()->token().token()); resp.mutable_logon()->set_can_create(logon_response.value()->can_create()); + // Do NOT log in _ctx as it is shared across all web clients } else { resp.mutable_logon()->set_reason(logon_response.value()->reason()); From ad8e803a8c22898b5db9f96acc6cd5648c808835 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Fri, 7 Dec 2018 13:20:31 -0500 Subject: [PATCH 051/107] SPARK-1901 C++ AuthToken* is unwieldy. Replace with empty token --- src/lib/api/public/ServiceContext.cpp | 2 +- src/lib/api/public/ServiceContext.h | 2 +- src/lib/api/service_compiler/templates/cpp/server.pb.cc | 6 +++--- src/lib/api/service_compiler/templates/cpp/server.pb.h | 6 +++--- src/lib/utils/AuthToken.cpp | 8 ++++---- src/lib/utils/AuthToken.h | 2 +- src/lib/utils/tests/AuthTokenTests.cpp | 7 ++++--- src/server/sparkd/user/AdminServiceServer.cpp | 4 +++- src/server/sparkd/user/AuthServiceServer.cpp | 2 +- 9 files changed, 21 insertions(+), 18 deletions(-) diff --git a/src/lib/api/public/ServiceContext.cpp b/src/lib/api/public/ServiceContext.cpp index cef9c3d4c..bcb22faac 100644 --- a/src/lib/api/public/ServiceContext.cpp +++ b/src/lib/api/public/ServiceContext.cpp @@ -81,7 +81,7 @@ void ServiceContext::post(const Action& action, uint64_t delay) { } Quickbus& ServiceContext::bus() const { return _self->_qbus; } -const AuthToken ServiceContext::token() const { return _self->_token; } +const AuthToken& ServiceContext::token() const { return _self->_token; } const std::string& ServiceContext::user() const { return _self->_user; } }}//namespace diff --git a/src/lib/api/public/ServiceContext.h b/src/lib/api/public/ServiceContext.h index 4ee20db78..11a685a70 100644 --- a/src/lib/api/public/ServiceContext.h +++ b/src/lib/api/public/ServiceContext.h @@ -40,7 +40,7 @@ public: } Quickbus& bus() const; - const AuthToken token() const; + const AuthToken& token() const; const std::string& user() const; const LoginResult login(const std::string& username, const std::string& password); void login(const AuthToken& token); diff --git a/src/lib/api/service_compiler/templates/cpp/server.pb.cc b/src/lib/api/service_compiler/templates/cpp/server.pb.cc index 9c83b25c4..4635e7803 100644 --- a/src/lib/api/service_compiler/templates/cpp/server.pb.cc +++ b/src/lib/api/service_compiler/templates/cpp/server.pb.cc @@ -41,7 +41,7 @@ void Authenticated{{name}}Base::dispatch(const bts::api::RequestHeader& header, bts::api::StreamAccessRequest msg; if (msg.ParsePartialFromZeroCopyStream(&stream)) { allow_{{name}}( - header.has_token() ? &header.token() : nullptr, + header.token(), msg.qualifier(), [this,id,on_response](const bts::api::StreamAccessResponse& result) { respond(id,result,on_response); @@ -51,7 +51,7 @@ void Authenticated{{name}}Base::dispatch(const bts::api::RequestHeader& header, {{input_type_cpp}} msg; if (msg.ParsePartialFromZeroCopyStream(&stream)) { auto id = header.request_id(); - {{name}}(header.has_token() ? &header.token() : nullptr, msg, [this,id,on_response](const {{output_type_cpp}}& result) { + {{name}}(header.token(), msg, [this,id,on_response](const {{output_type_cpp}}& result) { respond(id, result, on_response); }); } @@ -175,7 +175,7 @@ void Authenticated{{name}}Base::dispatch(const bts::api::RequestHeader& header, return bts::api::StatefulPublisher<{{output_type_cpp}},{{key_type.cpptype}}>(make_{{name}}_publisher(qualifier), {{name}}_key); } -void Authenticated{{../name}}Base::allow_{{name}}(const bts::api::AuthToken*, const std::string&, const api::Response& reply) { +void Authenticated{{../name}}Base::allow_{{name}}(const bts::api::AuthToken&, const std::string&, const api::Response& reply) { bts::api::StreamAccessResponse r; r.set_authorized(true); reply(r); diff --git a/src/lib/api/service_compiler/templates/cpp/server.pb.h b/src/lib/api/service_compiler/templates/cpp/server.pb.h index 90aec631c..aa6d2627c 100644 --- a/src/lib/api/service_compiler/templates/cpp/server.pb.h +++ b/src/lib/api/service_compiler/templates/cpp/server.pb.h @@ -41,13 +41,13 @@ protected: {{cap name}}Publisher make_{{name}}_publisher(const char* qualifier=nullptr) const; {{cap name}}StatefulPublisher make_{{name}}_stateful_publisher(const char* qualifier=nullptr) const; - virtual void allow_{{name}}(const bts::api::AuthToken* token, const std::string& qualifier, const api::Response& reply); + virtual void allow_{{name}}(const bts::api::AuthToken& token, const std::string& qualifier, const api::Response& reply); {{else}} // {{comment}} virtual void {{name}}( - const api::AuthToken* token, + const api::AuthToken& token, const {{input_type_cpp}}& request, const api::Response<{{output_type_cpp}}>& reply) = 0; {{/if}} @@ -76,7 +76,7 @@ public: {{#each method}} {{#unless server_streaming}} void {{name}}( - const api::AuthToken*, + const api::AuthToken&, const {{input_type_cpp}}& request, const api::Response<{{output_type_cpp}}>& reply) override { {{name}}(request, reply); diff --git a/src/lib/utils/AuthToken.cpp b/src/lib/utils/AuthToken.cpp index e4cb116ea..6d70a1c93 100644 --- a/src/lib/utils/AuthToken.cpp +++ b/src/lib/utils/AuthToken.cpp @@ -65,9 +65,9 @@ AuthToken generate_wheel_token() { result.set_token(token); return result; } -bool decode_token(const std::string& token, user::TokenPayload* payload) { - if (token.empty()) return false; - std::string temp = decrypt(token); +bool decode_token(const api::AuthToken& token, user::TokenPayload* payload) { + if (token.token().empty()) return false; + std::string temp = decrypt(token.token()); if (payload) { return payload->ParseFromString(temp) && !is_expired(*payload); } @@ -90,7 +90,7 @@ namespace auth { AuthToken generate_wheel_token() { return AuthToken(); } -bool decode_token(const std::string& token, user::TokenPayload* payload) { +bool decode_token(const api::AuthToken& token, user::TokenPayload* payload) { return false; } #endif diff --git a/src/lib/utils/AuthToken.h b/src/lib/utils/AuthToken.h index e0b330b41..cc704696c 100644 --- a/src/lib/utils/AuthToken.h +++ b/src/lib/utils/AuthToken.h @@ -9,7 +9,7 @@ namespace auth { AuthToken generate_token(const admin::BTSUser&); AuthToken generate_wheel_token(); -bool decode_token(const std::string& token, user::TokenPayload* payload); +bool decode_token(const api::AuthToken& token, user::TokenPayload* payload); bool is_expired(const user::TokenPayload&); }}} diff --git a/src/lib/utils/tests/AuthTokenTests.cpp b/src/lib/utils/tests/AuthTokenTests.cpp index 18c098b3f..51de507f7 100644 --- a/src/lib/utils/tests/AuthTokenTests.cpp +++ b/src/lib/utils/tests/AuthTokenTests.cpp @@ -14,14 +14,15 @@ TEST_CASE("AuthToken", "[security]") { // We use 1 byte for api header size REQUIRE(token.ByteSize() <= 240); api::user::TokenPayload payload; - REQUIRE(api::auth::decode_token(token.token(), &payload)); + REQUIRE(api::auth::decode_token(token, &payload)); REQUIRE(payload.id() == user.id()); REQUIRE(payload.wheel() == false); } SECTION("empty token") { api::user::TokenPayload payload; - REQUIRE(!api::auth::decode_token("", &payload)); + api::AuthToken empty; + REQUIRE(!api::auth::decode_token(empty, &payload)); REQUIRE(payload.id() == 0); REQUIRE(!payload.wheel()); } @@ -30,7 +31,7 @@ TEST_CASE("AuthToken", "[security]") { user.set_name("bts"); auto token = api::auth::generate_token(user); api::user::TokenPayload payload; - REQUIRE(api::auth::decode_token(token.token(), &payload)); + REQUIRE(api::auth::decode_token(token, &payload)); REQUIRE(payload.id() == user.id()); REQUIRE(payload.wheel()); } diff --git a/src/server/sparkd/user/AdminServiceServer.cpp b/src/server/sparkd/user/AdminServiceServer.cpp index a3f705ba9..e84cd722b 100644 --- a/src/server/sparkd/user/AdminServiceServer.cpp +++ b/src/server/sparkd/user/AdminServiceServer.cpp @@ -143,7 +143,9 @@ void AdminServiceServer::get_filtered_admin_data(const bts::api::admin::Filtered const api::Response& reply) { bts::api::user::TokenPayload toke; - if(bts::api::auth::decode_token(req.token(), &toke)) + api::AuthToken token; + token.set_token(req.token()); + if(bts::api::auth::decode_token(token, &toke)) { if(toke.wheel()) reply(_state); diff --git a/src/server/sparkd/user/AuthServiceServer.cpp b/src/server/sparkd/user/AuthServiceServer.cpp index 8be24cf67..48bb5cc64 100644 --- a/src/server/sparkd/user/AuthServiceServer.cpp +++ b/src/server/sparkd/user/AuthServiceServer.cpp @@ -70,7 +70,7 @@ void AuthServiceServer::authenticate_login(const api::user::AuthenticateLoginReq resp.mutable_token()->CopyFrom(api::auth::generate_token(user)); api::user::TokenPayload payload; - api::auth::decode_token(resp.token().token(), &payload); + api::auth::decode_token(resp.token(), &payload); resp.set_can_create(payload.wheel() || user.can_create()); respond(resp); return; From ba4b6aa1ff088f765cbe180d6e98c9bf436dbaed Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Fri, 7 Dec 2018 13:39:58 -0500 Subject: [PATCH 052/107] Update QueryServer to use AuthenticatedMarketDataRelayBase --- src/lib/md/protos/co2.proto | 3 ++- src/lib/md/relay/QueryServer.cpp | 14 +++++++------- src/lib/md/relay/RelayClient.cpp | 23 ++++++++++++----------- 3 files changed, 21 insertions(+), 19 deletions(-) diff --git a/src/lib/md/protos/co2.proto b/src/lib/md/protos/co2.proto index e255a7106..a93fc1505 100644 --- a/src/lib/md/protos/co2.proto +++ b/src/lib/md/protos/co2.proto @@ -62,7 +62,8 @@ message MDRequest { IMPLIED = 0x40; } string host = 2; - bytes token = 3; +// bytes token = 3; + reserved 3; } message ChannelUpdate { diff --git a/src/lib/md/relay/QueryServer.cpp b/src/lib/md/relay/QueryServer.cpp index 2c6d692bb..53d7886d5 100644 --- a/src/lib/md/relay/QueryServer.cpp +++ b/src/lib/md/relay/QueryServer.cpp @@ -387,7 +387,7 @@ public: }; -struct MDRelayServer : bts::co2::MarketDataRelayBase { +struct MDRelayServer : bts::co2::AuthenticatedMarketDataRelayBase { const QueryServerImpl& _db; utils::Dispatcher& _threadpool; std::shared_ptr> _entitlements; @@ -396,7 +396,7 @@ struct MDRelayServer : bts::co2::MarketDataRelayBase { #endif MDRelayServer(const QueryServerImpl& db, utils::Dispatcher& threadpool, bts::api::ServiceContext ctx, metrics::MetricsContainer& stats) : - bts::co2::MarketDataRelayBase(ctx), + bts::co2::AuthenticatedMarketDataRelayBase(ctx), _db(db), _threadpool(threadpool), _entitlements() #ifndef _WIN32 , _time(std::make_shared>("spark_qserver_response_time_ms", std::array({ 5.0, 10.0, 20.0, 50.0, 100.0 }))), @@ -412,6 +412,7 @@ struct MDRelayServer : bts::co2::MarketDataRelayBase { void update_entitlements(std::shared_ptr>& entitlements) { _entitlements = entitlements; } + static const Entitlements* get_entitlements(uint32_t user_id, std::shared_ptr>& entitlements) { if (entitlements) { auto iter = entitlements->find(user_id); @@ -422,7 +423,7 @@ struct MDRelayServer : bts::co2::MarketDataRelayBase { return nullptr; } - virtual void requestmd(const MDRequest& request, const std::function& reply) override { + virtual void requestmd(const api::AuthToken& token, const MDRequest& request, const std::function& reply) override { TimeStamp start = TimeStamp::now(); _threadpool.post([=]() { google::protobuf::Arena arena; @@ -432,13 +433,12 @@ struct MDRelayServer : bts::co2::MarketDataRelayBase { auto ents = _entitlements; const Entitlements* user_entitlement = nullptr; bool bypass_entitlement = false; - if (api::auth::decode_token(request.token(), &payload)) { + if (api::auth::decode_token(token, &payload)) { bypass_entitlement = payload.wheel(); if (!bypass_entitlement) { user_entitlement = get_entitlements(payload.id(), ents); } } - // Temporarily bypass all entitlements _db.query(request, preply, user_entitlement, bypass_entitlement); reply(*preply); #ifndef _WIN32 @@ -449,7 +449,7 @@ struct MDRelayServer : bts::co2::MarketDataRelayBase { }); } - virtual void request_products(const api::VoidMessage&, const std::function& reply) override { + virtual void request_products(const api::AuthToken&, const api::VoidMessage&, const std::function& reply) override { ProductListReply list; std::set syms; get_system_md_symbols(syms); @@ -463,7 +463,7 @@ struct MDRelayServer : bts::co2::MarketDataRelayBase { reply(list); } - virtual void request_names(const api::VoidMessage&, const std::function& reply) override { + virtual void request_names(const api::AuthToken&, const api::VoidMessage&, const std::function& reply) override { _threadpool.post([=]() { google::protobuf::Arena arena; ExpirationNameListReply* preply = google::protobuf::Arena::CreateMessage(&arena); diff --git a/src/lib/md/relay/RelayClient.cpp b/src/lib/md/relay/RelayClient.cpp index cd3b696a4..ca9bf5030 100644 --- a/src/lib/md/relay/RelayClient.cpp +++ b/src/lib/md/relay/RelayClient.cpp @@ -219,14 +219,9 @@ public: } } - void set_token(const std::string& token) { - _request.set_token(token); - } - std::string compact_log_format() const { ostringstream log; log << "{"; - log << std::endl << "token: " << _request.token(); for (const auto& ch : _request.channels()) { log << std::endl; log << ch.symbol() << " "; @@ -315,11 +310,15 @@ struct RelayScheduler { } }; +api::ServiceContext elevated_relay_context() { + api::ServiceContext ctx; + ctx.login(api::auth::generate_wheel_token()); + return ctx; +} void relay_selected(api::ServiceContext& ctx, const std::set& symbols, IRelayWriter& writer) { auto relay = ctx.locate(); RelayClient client(relay, nullptr, symbols, writer); - client.set_token(api::auth::generate_wheel_token().token()); RelayScheduler scheduler(ctx, config::get().naggle_ms(), client); ctx.post([&]() { scheduler.run(); }); @@ -328,7 +327,7 @@ void relay_selected(api::ServiceContext& ctx, const std::set& symbol } void relay_everything() { - api::ServiceContext ctx; + api::ServiceContext ctx = elevated_relay_context(); std::set system_symbols; get_system_md_symbols(system_symbols); RelayProducer producer(true); @@ -336,7 +335,8 @@ void relay_everything() { } void local_relay(IRelayWriter& writer) { - api::ServiceContext ctx; + api::ServiceContext ctx = elevated_relay_context(); + ctx.login(api::auth::generate_wheel_token()); auto relay = ctx.locate(); std::set symbols; { @@ -378,14 +378,13 @@ void record_everything(std::string path, std::string filename) { auto naggle_ms = config::get().naggle_ms(); RelayRecorder recorder(path, filename, naggle_ms); - api::ServiceContext ctx; + api::ServiceContext ctx = elevated_relay_context(); auto relay = ctx.locate(); std::set system_symbols; get_system_md_symbols(system_symbols); RelayClient client(relay, nullptr, system_symbols, recorder); - client.set_token(api::auth::generate_wheel_token().token()); RelayScheduler scheduler(ctx, naggle_ms, client); scheduler.run(); @@ -435,7 +434,9 @@ void add_relay_symbol(RelayControl* relay, const SecurityChannel& chan) { void set_relay_token(RelayControl* relay, const std::string& token) { bts_assert(relay); relay->context.post([=]() { - relay->client.set_token(token); + api::AuthToken auth_token; + auth_token.set_token(token); + relay->context.login(auth_token); }); } From 5e1c4143db91d589d6a00aedd9e05df96237b2ce Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Fri, 7 Dec 2018 19:16:41 +0000 Subject: [PATCH 053/107] Improved speed and robustness of perf log. --- src/lib/CMakeDeps.cmake | 2 +- src/lib/config/protos/perflog_cfg.proto | 8 + src/lib/tracing/PerfLog.cpp | 225 ++++++++++++++---------- src/server/sparkd/cmds/Benchmark.cpp | 7 +- 4 files changed, 142 insertions(+), 100 deletions(-) create mode 100644 src/lib/config/protos/perflog_cfg.proto diff --git a/src/lib/CMakeDeps.cmake b/src/lib/CMakeDeps.cmake index 4c370f0e6..6db8a3a76 100644 --- a/src/lib/CMakeDeps.cmake +++ b/src/lib/CMakeDeps.cmake @@ -1 +1 @@ -set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/services/UserService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/PerfTraceLog.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/IcebergOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/CoverOrder.cpp;orderman/orders/book_algos/JoinOrder.cpp;orderman/orders/book_algos/LeanOrder.cpp;orderman/orders/book_algos/OffsetOrder.cpp;orderman/orders/book_algos/TickOrder.cpp;orderman/orders/book_algos/TopOrder.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;orderman2/orders/NativeOrder.cpp;orderman2/orders/Order.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;tracing/PerfLog.cpp;tracing/bts_trace.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/thread_manager.cpp) \ No newline at end of file +set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/services/UserService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/PerfTraceLog.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/IcebergOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/CoverOrder.cpp;orderman/orders/book_algos/JoinOrder.cpp;orderman/orders/book_algos/LeanOrder.cpp;orderman/orders/book_algos/OffsetOrder.cpp;orderman/orders/book_algos/TickOrder.cpp;orderman/orders/book_algos/TopOrder.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;orderman2/orders/NativeOrder.cpp;orderman2/orders/Order.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;tracing/PerfLog.cpp;tracing/bts_trace.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/thread_manager.cpp) \ No newline at end of file diff --git a/src/lib/config/protos/perflog_cfg.proto b/src/lib/config/protos/perflog_cfg.proto new file mode 100644 index 000000000..7ee97dcb0 --- /dev/null +++ b/src/lib/config/protos/perflog_cfg.proto @@ -0,0 +1,8 @@ +syntax='proto2'; +package bts.config; + +message PerfLogCfg { + optional bool active = 1 [default=true]; + optional uint32 max_rows_for_query = 2 [default=140000]; + optional uint32 max_rows = 3 [default=10000000]; +} diff --git a/src/lib/tracing/PerfLog.cpp b/src/lib/tracing/PerfLog.cpp index 34b21909a..0b2acee0b 100644 --- a/src/lib/tracing/PerfLog.cpp +++ b/src/lib/tracing/PerfLog.cpp @@ -1,28 +1,30 @@ #include "lib/tracing/PerfLog.h" #include "lib/config/config.h" +#include "lib/config/protos/perflog_cfg.pb.h" #include "lib/config/protos/system.pb.h" #include "lib/persistence/persistence_utils.h" #include "lib/utils/datetime.h" #include "lib/utils/stats.h" - + #include #include #include #include +#include #include #include #include - + namespace bts { namespace trace { - + auto create_session = "create table session (" "version TEXT, " "host TEXT, " "build_type TEXT, " "session_start TIMESTAMP PRIMARY KEY" ")"; - + auto create_trace = "create table trace (" "session_start TIMESTAMP," "ts INTEGER," @@ -36,7 +38,7 @@ auto create_trace = "create table trace (" "uint64_1 INTEGER," "thread TEXT" ")"; - + auto insert_trace = "insert into trace (" "session_start," "ts," @@ -62,7 +64,7 @@ auto insert_trace = "insert into trace (" ":uint64_1," ":thread" ")"; - + auto insert_session = "insert into session (" "version," "host," @@ -74,29 +76,37 @@ auto insert_session = "insert into session (" ":build_type," ":session_start" ")"; - + +auto create_recent_trace_view = + "drop view if exists recent_trace; create view recent_trace as " + "select * from trace order by rowid desc limit {}"; + +auto delete_old_records = + "delete from trace where " + "rowid in (select rowid from trace order by rowid desc limit -1 offset {})"; + auto hedge_events_view = "drop view if exists hedge_events; create view hedge_events as " "select " - " trace.session_start, " + " recent_trace.session_start, " " channel, " " sn, " " min(hts) hts, " " (max(ts)-min(ts))/1000 t " "from " - " trace, " + " recent_trace, " " session " "where " - " trace.session_start = session.session_start and " + " recent_trace.session_start = session.session_start and " " (entry_kind='fix_socket_r' or entry_kind='before_fix_socket_w') " "group by " - " trace.session_start, " + " recent_trace.session_start, " " channel, " " sn " "having " " count(*) = 2 and " " min(entry_kind)<>max(entry_kind)"; - + auto hedge_trace_view = "drop view if exists hedge_trace; create view hedge_trace as " "select " @@ -104,42 +114,42 @@ auto hedge_trace_view = " session.host, " " session.build_type, " " session.session_start, " - " trace.hts trace_time, " - " trace.uint32_1 order_key, " + " recent_trace.hts trace_time, " + " recent_trace.uint32_1 order_key, " " hedge_events.t total " "from " - " trace, " + " recent_trace, " " hedge_events, " " session " "where " " entry_kind='on_activate_start' and " - " trace.channel = hedge_events.channel and " - " trace.session_start = hedge_events.session_start and " - " trace.sn = hedge_events.sn and " - " trace.session_start = session.session_start "; - + " recent_trace.channel = hedge_events.channel and " + " recent_trace.session_start = hedge_events.session_start and " + " recent_trace.sn = hedge_events.sn and " + " recent_trace.session_start = session.session_start "; + auto requote_events_view = "drop view if exists requote_events; create view requote_events as " "select " - " trace.session_start, " + " recent_trace.session_start, " " channel, " " sn, " " min(hts) hts, " " (max(ts)-min(ts))/1000 t " "from " - " trace, " + " recent_trace, " " session " "where " - " trace.session_start = session.session_start and " + " recent_trace.session_start = session.session_start and " " (entry_kind='md' or entry_kind='before_fix_socket_w') " "group by " - " trace.session_start, " + " recent_trace.session_start, " " channel, " " sn " "having " " count(*) = 2 and " " min(entry_kind)<>max(entry_kind) "; - + auto requote_trace_view = "drop view if exists requote_trace; create view requote_trace as " "select " @@ -147,49 +157,53 @@ auto requote_trace_view = " session.host, " " session.build_type, " " session.session_start, " - " trace.hts trace_time, " - " trace.uint32_1 order_key, " + " recent_trace.hts trace_time, " + " recent_trace.uint32_1 order_key, " " requote_events.t total " "from " - " trace, " + " recent_trace, " " requote_events, " " session " "where " " entry_kind='order_update' and " - " trace.channel = requote_events.channel and " - " trace.session_start = requote_events.session_start and " - " trace.sn = requote_events.sn and " - " trace.session_start = session.session_start "; - + " recent_trace.channel = requote_events.channel and " + " recent_trace.session_start = requote_events.session_start and " + " recent_trace.sn = requote_events.sn and " + " recent_trace.session_start = session.session_start "; + auto requote_query = "select * from requote_trace order by trace_time desc limit ?"; - + auto hedge_query = "select * from hedge_trace order by trace_time desc limit ?"; - + struct PerfLog::PImpl { PImpl(std::string const &loc) : db(loc, SQLite::OPEN_READWRITE | SQLite::OPEN_CREATE), insert_trace_statement(), insert_session_statement(), session_start(), - disabled(false), lock() {} - + lock() {} + SQLite::Database db; std::unique_ptr insert_trace_statement; std::unique_ptr insert_session_statement; std::unique_ptr requote_query_statement; std::unique_ptr hedge_query_statement; std::string session_start; - bool disabled; std::mutex lock; }; - + PerfLog::PerfLog() : _pending(), _disabled(false), me() { + _disabled = !config::get().active(); + + if (_disabled) + return; + auto loc = init_storage_location(); - + if (loc.empty()) { _disabled = true; return; } - + try { me = std::make_unique(loc); if (!me->db.tableExists("session")) { @@ -198,12 +212,17 @@ PerfLog::PerfLog() : _pending(), _disabled(false), me() { me->db.exec(create_session); me->db.exec(create_trace); } - + + me->db.exec(fmt::format(delete_old_records, + config::get().max_rows())); + me->db.exec( + fmt::format(create_recent_trace_view, + config::get().max_rows_for_query())); me->db.exec(hedge_events_view); me->db.exec(hedge_trace_view); me->db.exec(requote_events_view); me->db.exec(requote_trace_view); - + me->insert_trace_statement = std::make_unique(me->db, insert_trace); me->insert_session_statement = @@ -213,7 +232,7 @@ PerfLog::PerfLog() : _pending(), _disabled(false), me() { me->hedge_query_statement = std::make_unique(me->db, hedge_query); me->session_start = datetime::FIX_timestamp(datetime::local_now()); - + me->insert_session_statement->bind( ":version", config::get().version()); me->insert_session_statement->bind( @@ -232,13 +251,13 @@ PerfLog::PerfLog() : _pending(), _disabled(false), me() { _disabled = true; } } - + PerfLog::~PerfLog() {} - + std::string PerfLog::init_storage_location() { auto loc = persistence::storage_location("perf_log"); auto parent = boost::filesystem::path(loc).parent_path(); - + if (!boost::filesystem::is_directory(parent)) { if (boost::filesystem::create_directories(parent)) return loc; @@ -247,15 +266,19 @@ std::string PerfLog::init_storage_location() { } else return loc; } - + size_t PerfLog::store_log_entries() { - if (_disabled) + if (_disabled) { + _pending.clear(); return 0; - - PerfLogEntry ev; + } + size_t count = 0; - while (_pending.try_pop(ev)) - try { + try { + PerfLogEntry ev; + while (_pending.try_pop(ev)) { + if (count == 0) + me->db.exec("begin"); me->insert_trace_statement->bind(":session_start", me->session_start); me->insert_trace_statement->bind(":ts", (long long)ev.ts.to_uint64()); me->insert_trace_statement->bind( @@ -268,38 +291,43 @@ size_t PerfLog::store_log_entries() { me->insert_trace_statement->bind(":uint32_1", ev.uint32_1); me->insert_trace_statement->bind(":uint32_2", ev.uint32_2); me->insert_trace_statement->bind(":uint64_1", (long long)ev.uint64_1); - + char tn[17]; pthread_getname_np(ev.thread_id, tn, 16); me->insert_trace_statement->bind(":thread", tn); me->insert_trace_statement->exec(); - me->insert_trace_statement->reset(); count++; - } catch (SQLite::Exception const &e) { - LOG(persist, Error, "Unable to insert perf trace in {}. Error: {}", - std::string(me->db.getFilename()), std::string(e.getErrorStr())); - - _disabled = true; + me->insert_trace_statement->reset(); } + if (count) + me->db.exec("commit"); + } catch (SQLite::Exception const &e) { + if (count) + try {me->db.exec("rollback");} + catch (SQLite::Exception const &e2) {} + LOG(persist, Error, "Unable to insert perf trace in. Error: {}", + std::string(e.getErrorStr())); + _pending.clear(); + } return count; } - + std::string encode_string(SQLite::Column const &c) { return fmt::format("\"{}\"", std::string(c)); } - + std::string encode_number(SQLite::Column const &c) { return fmt::format("{}", (long long)c); } - + std::vector> PerfLog::get_latest_requote_traces(size_t n) { std::vector> result; - + std::lock_guard l(me->lock); try { me->requote_query_statement->bind(1, (long long)n); - + while (me->requote_query_statement->executeStep()) { auto &row = result.emplace_back(); row["version"] = @@ -312,7 +340,7 @@ PerfLog::get_latest_requote_traces(size_t n) { me->requote_query_statement->getColumn("session_start")); row["trace_time"] = encode_string( me->requote_query_statement->getColumn("trace_time")); - + row["order_key"] = encode_number(me->requote_query_statement->getColumn("order_key")); row["total"] = @@ -325,15 +353,15 @@ PerfLog::get_latest_requote_traces(size_t n) { } return result; } - + std::vector> PerfLog::get_latest_hedge_traces(size_t n) { std::vector> result; - + std::lock_guard l(me->lock); try { me->hedge_query_statement->bind(1, (long long)n); - + while (me->hedge_query_statement->executeStep()) { auto &row = result.emplace_back(); row["version"] = @@ -346,7 +374,7 @@ PerfLog::get_latest_hedge_traces(size_t n) { me->hedge_query_statement->getColumn("session_start")); row["trace_time"] = encode_string(me->hedge_query_statement->getColumn("trace_time")); - + row["order_key"] = encode_number(me->hedge_query_statement->getColumn("order_key")); row["total"] = @@ -354,16 +382,16 @@ PerfLog::get_latest_hedge_traces(size_t n) { } me->hedge_query_statement->reset(); } catch (SQLite::Exception const &e) { - LOG(persist,Error,"Unable to retrieve hedge traces. Error: {}", + LOG(persist, Error, "Unable to retrieve hedge traces. Error: {}", std::string(e.getErrorStr())); } return result; } - + namespace perf_stat { - + using Row = std::map; - + struct Summary { std::string name; double min; @@ -373,7 +401,7 @@ struct Summary { double stddev; std::vector values; }; - + struct Session { std::string start; std::string host; @@ -383,14 +411,14 @@ struct Session { std::map summaries; std::vector rows; }; - + } // namespace perf_stat - + std::map structure_quote_traces( std::vector> "es) { - + std::map result; - + for (auto &q : quotes) { auto &session = result[q["session_start"]]; if (session.start.empty()) { @@ -408,7 +436,7 @@ std::map structure_quote_traces( session.rows.push_back(q); session.n_rows++; } - + for (auto &session_kvp : result) for (auto &stat_kvp : session_kvp.second.summaries) { auto &summary = stat_kvp.second; @@ -418,15 +446,15 @@ std::map structure_quote_traces( summary.ninenty_nine = stats::percentile(summary.values, 0.99); summary.stddev = stats::stdev(summary.values); } - + return result; } - + std::map structure_hedge_traces( std::vector> "es) { - + std::map result; - + for (auto &q : quotes) { auto &session = result[q["session_start"]]; if (session.start.empty()) { @@ -444,7 +472,7 @@ std::map structure_hedge_traces( session.rows.push_back(q); session.n_rows++; } - + for (auto &session_kvp : result) for (auto &stat_kvp : session_kvp.second.summaries) { auto &summary = stat_kvp.second; @@ -454,10 +482,10 @@ std::map structure_hedge_traces( summary.ninenty_nine = stats::percentile(summary.values, 0.99); summary.stddev = stats::stdev(summary.values); } - + return result; } - + void print_summary(std::ostream &ss, perf_stat::Summary const &s, bool last) { ss << " { " << "\"value\":" @@ -470,7 +498,7 @@ void print_summary(std::ostream &ss, perf_stat::Summary const &s, bool last) { else ss << " }\n"; } - + void print_row(std::ostream &ss, perf_stat::Row const &r, bool last) { ss << " { "; size_t i = 0; @@ -486,7 +514,7 @@ void print_row(std::ostream &ss, perf_stat::Row const &r, bool last) { else ss << " }\n"; } - + void print_session(std::ostream &ss, perf_stat::Session const &s, bool last) { ss << "{\n" << " \"session_name\": " << s.start << ",\n" @@ -494,13 +522,13 @@ void print_session(std::ostream &ss, perf_stat::Session const &s, bool last) { << " \"version\": " << s.version << ",\n" << " \"build_type\": " << s.build_type << ",\n" << " \"n_rows\": " << s.n_rows << ",\n"; - + ss << " \"summaries\":\n [\n"; size_t i = 0; for (auto &summaries_kvp : s.summaries) print_summary(ss, summaries_kvp.second, ++i == s.summaries.size()); ss << " ],\n"; - + ss << " \"rows\":\n [\n"; i = 0; for (auto &r : s.rows) @@ -511,31 +539,34 @@ void print_session(std::ostream &ss, perf_stat::Session const &s, bool last) { else ss << "}\n"; } - + void PerfLog::print_latest_traces(std::ostream &ss, size_t n) { + if (_disabled) + return; + { auto rows = get_latest_requote_traces(n); auto structured = structure_quote_traces(rows); - + ss << "{\n\"requotes\": [\n"; size_t i = 0; for (auto &session_kvp : boost::adaptors::reverse(structured)) print_session(ss, session_kvp.second, ++i == structured.size()); ss << "],\n"; } - + { auto rows = get_latest_hedge_traces(n); auto structured = structure_hedge_traces(rows); - + ss << "\"hedges\": [\n"; - + size_t i = 0; for (auto &session_kvp : boost::adaptors::reverse(structured)) print_session(ss, session_kvp.second, ++i == structured.size()); ss << "]\n}\n"; } } - + } // namespace trace } // namespace bts diff --git a/src/server/sparkd/cmds/Benchmark.cpp b/src/server/sparkd/cmds/Benchmark.cpp index eb35d3ce8..030489938 100644 --- a/src/server/sparkd/cmds/Benchmark.cpp +++ b/src/server/sparkd/cmds/Benchmark.cpp @@ -826,8 +826,11 @@ BENCHMARK(fix_time_stamp); static void perf_log(benchmark::State &state) { trace::PerfLog l; - for (auto _ : state) - l.log(trace::CorID{"sim", 0}, "this", 1, 2, "txt", 3); + for (auto _ : state) { + for (int i = 0; i < 10000; i++) + l.log(trace::CorID{"sim", 0}, "this", i, 2, "txt", 3); + l.store_log_entries(); + } } BENCHMARK(perf_log); From 04dadc46d5f30486632508cc2bb1fa763fc6ff12 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Fri, 7 Dec 2018 14:33:34 -0500 Subject: [PATCH 054/107] ServiceContext.token needs more atomic --- src/client/spark_api/api/ServiceContext.cs | 29 ++++++++++++---------- src/lib/api/public/ClientChannel.h | 3 ++- src/lib/api/public/ServiceContext.cpp | 19 ++++++++++---- src/lib/api/public/ServiceContext.h | 4 +-- 4 files changed, 34 insertions(+), 21 deletions(-) diff --git a/src/client/spark_api/api/ServiceContext.cs b/src/client/spark_api/api/ServiceContext.cs index b27ea9412..89d53f482 100644 --- a/src/client/spark_api/api/ServiceContext.cs +++ b/src/client/spark_api/api/ServiceContext.cs @@ -35,6 +35,7 @@ namespace bts.api.core { public AuthTokenImmutable? token => _token ?? (AuthTokenImmutable?)null; public string user { get; private set; } public uint user_id { get; private set; } + public bool is_authenticated => token.HasValue; public async Task login(string username, string password) { var auth_service = locate(); @@ -43,21 +44,23 @@ namespace bts.api.core { Password = password ?? "" }); if (result.success) { - if (result.value.IsValid) { - _token = result.value.Token; - user = username; - user_id = result.value.UserId; + if (result.value.IsValid) { + _token = result.value.Token; + user = username; + user_id = result.value.UserId; return new LoginResult(); } - else { - return new LoginResult(result.value.Reason); + else { + return new LoginResult(result.value.Reason); } } - else { - return new LoginResult(result.error_message); + else { + return new LoginResult(result.error_message); } } public void login(AuthTokenImmutable token) { + this.user = ""; + this.user_id = 0; this._token = token.CloneToMutable(); } @@ -83,10 +86,10 @@ namespace bts.api.core { #endregion } - public class LoginResult { - public LoginResult() { success = true; } - public LoginResult(string reason) { success = false; this.reason = reason; } - public bool success { get; } - public string reason { get; } + public class LoginResult { + public LoginResult() { success = true; } + public LoginResult(string reason) { success = false; this.reason = reason; } + public bool success { get; } + public string reason { get; } } } diff --git a/src/lib/api/public/ClientChannel.h b/src/lib/api/public/ClientChannel.h index 46266a1e9..3918f3f05 100644 --- a/src/lib/api/public/ClientChannel.h +++ b/src/lib/api/public/ClientChannel.h @@ -25,7 +25,8 @@ public: RequestHeader header; header.set_method(method_id); header.set_request_id(++_id); - header.mutable_token()->set_token(_context.token().token()); + auto ptoken = _context.token(); + if (ptoken) header.mutable_token()->CopyFrom(*ptoken); int header_size = header.ByteSize()+1; assert(header_size < 128); diff --git a/src/lib/api/public/ServiceContext.cpp b/src/lib/api/public/ServiceContext.cpp index bcb22faac..39de8b4fa 100644 --- a/src/lib/api/public/ServiceContext.cpp +++ b/src/lib/api/public/ServiceContext.cpp @@ -4,6 +4,7 @@ #include "ApiServer.h" #include "lib/logging/logging.h" #include "lib/api/services/AuthService.client.pb.h" +#include namespace bts { namespace api { @@ -30,9 +31,14 @@ struct ServiceContextImpl { api_destroy_quickbus(&_qbus); } } + void set_token(const AuthToken& t) { + auto st = std::make_shared(); + st->CopyFrom(t); + _token = st; + } Quickbus& _qbus; bool _owns_qb; - AuthToken _token; + std::shared_ptr _token; std::string _user; }; @@ -60,7 +66,7 @@ const LoginResult ServiceContext::login(const std::string& username, const std:: auto result = auth.authenticate_login(request); if (result.success()) { if (result.value()->is_valid()) { - _self->_token = result.value()->token(); + _self->set_token(result.value()->token()); _self->_user = username; return {}; } @@ -73,7 +79,8 @@ const LoginResult ServiceContext::login(const std::string& username, const std:: } } void ServiceContext::login(const AuthToken& token) { - _self->_token = token; + _self->set_token(token); + _self->_user.clear(); } void ServiceContext::post(const Action& action, uint64_t delay) { @@ -81,8 +88,10 @@ void ServiceContext::post(const Action& action, uint64_t delay) { } Quickbus& ServiceContext::bus() const { return _self->_qbus; } -const AuthToken& ServiceContext::token() const { return _self->_token; } -const std::string& ServiceContext::user() const { return _self->_user; } +bool ServiceContext::is_authenticated() const { return _self->_token != nullptr; } +const std::shared_ptr ServiceContext::token() const { + return _self->_token; +} }}//namespace #endif diff --git a/src/lib/api/public/ServiceContext.h b/src/lib/api/public/ServiceContext.h index 11a685a70..181e673f3 100644 --- a/src/lib/api/public/ServiceContext.h +++ b/src/lib/api/public/ServiceContext.h @@ -40,8 +40,8 @@ public: } Quickbus& bus() const; - const AuthToken& token() const; - const std::string& user() const; + bool is_authenticated() const; + const std::shared_ptr token() const; const LoginResult login(const std::string& username, const std::string& password); void login(const AuthToken& token); From c4393637e7a10a6f28d25e4e4572af957159b2ae Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Fri, 7 Dec 2018 15:33:12 -0500 Subject: [PATCH 055/107] Update ApiGateway to copy input token --- src/lib/api/apigateway.proto | 5 +++-- src/server/sparkd/http/ApiGateway.cpp | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/lib/api/apigateway.proto b/src/lib/api/apigateway.proto index f55413bba..47b44c838 100644 --- a/src/lib/api/apigateway.proto +++ b/src/lib/api/apigateway.proto @@ -1,6 +1,7 @@ syntax="proto3"; package bts.api.gateway; option csharp_namespace="bts.api.gateway"; +import "lib/api/apicore.proto"; message GatewayLogin { string username = 1; @@ -9,13 +10,13 @@ message GatewayLogin { message GatewayLoginResult { bool is_valid = 1; string reason = 2; - string token = 3; + api.AuthToken token = 3; bool can_create = 4; } message GatewayCallHeader { int32 request_id = 1; int32 method = 2; - string token = 3; + api.AuthToken token = 3; string service_type = 4; string service_qualifier = 5; } diff --git a/src/server/sparkd/http/ApiGateway.cpp b/src/server/sparkd/http/ApiGateway.cpp index 2d74e8ea9..a242fe3c1 100644 --- a/src/server/sparkd/http/ApiGateway.cpp +++ b/src/server/sparkd/http/ApiGateway.cpp @@ -45,7 +45,7 @@ struct ApiGatewayImpl { if (logon_response) { if (logon_response.value()->is_valid()) { resp.mutable_logon()->set_is_valid(true); - resp.mutable_logon()->set_token(logon_response.value()->token().token()); + resp.mutable_logon()->mutable_token()->CopyFrom(logon_response.value()->token()); resp.mutable_logon()->set_can_create(logon_response.value()->can_create()); // Do NOT log in _ctx as it is shared across all web clients } @@ -87,7 +87,7 @@ struct ApiGatewayImpl { api::RequestHeader api_header; api_header.set_method(header.method()); api_header.set_request_id(header.request_id()); - //todo: token + api_header.mutable_token()->CopyFrom(header.token()); int header_size = 1 + api_header.ByteSize(); bts_assert(header_size < 128); std::string buffer; From 1b2aeee069ccacdee61e86a264c7cf643be2cc99 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Fri, 7 Dec 2018 15:33:28 -0500 Subject: [PATCH 056/107] Update AdminServiceServer to use AuthenticatedAdminServiceBase --- .../extensions/OrderService_Excel.cs | 2 +- src/lib/api/services/AdminService.proto | 4 +- src/server/sparkd/user/AdminServiceServer.cpp | 24 +++++++--- src/server/sparkd/user/AdminServiceServer.h | 45 ++++++++++++------- src/web/ui/src/Access.fs | 4 +- src/web/ui/src/Accounts/State.fs | 8 ++-- src/web/ui/src/Users/State.fs | 6 +-- 7 files changed, 57 insertions(+), 36 deletions(-) diff --git a/src/client/spark_excel/extensions/OrderService_Excel.cs b/src/client/spark_excel/extensions/OrderService_Excel.cs index 853d3227d..09ba73298 100644 --- a/src/client/spark_excel/extensions/OrderService_Excel.cs +++ b/src/client/spark_excel/extensions/OrderService_Excel.cs @@ -26,7 +26,7 @@ namespace bts.api.orderman try { List accts = new List(); - var admin = await _admin.Value.get_filtered_admin_data_async(new FilteredAdminDataRequest { Token = login_token }); + var admin = await _admin.Value.get_filtered_admin_data_async(new FilteredAdminDataRequest()); if (admin.success) { foreach (var acc in admin.value.Accounts) diff --git a/src/lib/api/services/AdminService.proto b/src/lib/api/services/AdminService.proto index c671fb4d0..23ae7337a 100644 --- a/src/lib/api/services/AdminService.proto +++ b/src/lib/api/services/AdminService.proto @@ -459,9 +459,7 @@ message AdminServiceCreateAccountResult { uint32 new_id = 30; } -message FilteredAdminDataRequest { - string token = 1; -} +message FilteredAdminDataRequest { } service AdminService { option (bts.api.service_description) = "Provides a management interface to the user model"; diff --git a/src/server/sparkd/user/AdminServiceServer.cpp b/src/server/sparkd/user/AdminServiceServer.cpp index e84cd722b..09b33068d 100644 --- a/src/server/sparkd/user/AdminServiceServer.cpp +++ b/src/server/sparkd/user/AdminServiceServer.cpp @@ -21,7 +21,7 @@ namespace admin{ AdminServiceServer::AdminServiceServer(bts::api::ServiceContext& context) : - bts::api::admin::AdminServiceBase (context), + bts::api::admin::AuthenticatedAdminServiceBase (context), _db_name("admin"), _table_name("admin_data"), _unique_key("0"), @@ -73,6 +73,7 @@ AdminServiceServer::AdminServiceServer(bts::api::ServiceContext& context) } AdminServiceServer::~AdminServiceServer() {} void AdminServiceServer::create_account( + const api::AuthToken&, const AccountCreateAPIArgument& request, const api::Response& reply){ bts::api::admin::AdminServiceCreateAccountResult result; @@ -102,6 +103,7 @@ void AdminServiceServer::create_account( reply(result); } void AdminServiceServer::update_account( + const api::AuthToken&, const AccountUpdateAPIArgument& request, const api::Response& reply){ bts::api::admin::AdminServiceOperationResult result; @@ -110,6 +112,7 @@ void AdminServiceServer::update_account( reply(result); } void AdminServiceServer::create_user( + const api::AuthToken&, const UserCreateAPIArgument& request, const api::Response& reply){ AdminServiceCreateEntityResult result; @@ -127,6 +130,7 @@ void AdminServiceServer::create_user( reply(result); } void AdminServiceServer::update_user( + const api::AuthToken&, const UserUpdateAPIArgument& request, const api::Response& reply){ AdminServiceOperationResult result; @@ -134,17 +138,19 @@ void AdminServiceServer::update_user( _update_and_publish(false); reply(result); } -void AdminServiceServer::get_admin_data(const bts::api::VoidMessage&, - const api::Response& reply){ +void AdminServiceServer::get_admin_data( + const api::AuthToken&, + const bts::api::VoidMessage&, + const api::Response& reply){ reply(_state); } -void AdminServiceServer::get_filtered_admin_data(const bts::api::admin::FilteredAdminDataRequest& req, - const api::Response& reply) +void AdminServiceServer::get_filtered_admin_data( + const api::AuthToken& token, + const bts::api::admin::FilteredAdminDataRequest&, + const api::Response& reply) { bts::api::user::TokenPayload toke; - api::AuthToken token; - token.set_token(req.token()); if(bts::api::auth::decode_token(token, &toke)) { if(toke.wheel()) @@ -215,6 +221,7 @@ void AdminServiceServer::get_filtered_admin_data(const bts::api::admin::Filtered void AdminServiceServer::delete_user( + const api::AuthToken&, const IDAPIArgument& id, const api::Response& reply){ AdminServiceOperationResult result; result.set_is_success(true); @@ -223,6 +230,7 @@ void AdminServiceServer::delete_user( reply(result); } void AdminServiceServer::delete_account( + const api::AuthToken&, const IDAPIArgument& id, const api::Response& reply){ AdminServiceOperationResult result; result.set_is_success(true); @@ -252,6 +260,7 @@ void AdminServiceServer::_update_and_publish(bool is_insert){ } void AdminServiceServer::get_order_summary( + const api::AuthToken&, const bts::api::VoidMessage&, const api::Response& reply){ std::map> agg; @@ -273,6 +282,7 @@ void AdminServiceServer::get_order_summary( reply(rv); } void AdminServiceServer::cancel_orders( + const api::AuthToken&, const OrderCancelRequest& req, const api::Response&){ vector accts, users; diff --git a/src/server/sparkd/user/AdminServiceServer.h b/src/server/sparkd/user/AdminServiceServer.h index ec1363032..cd19fc4b8 100644 --- a/src/server/sparkd/user/AdminServiceServer.h +++ b/src/server/sparkd/user/AdminServiceServer.h @@ -15,7 +15,7 @@ using namespace bts::api::orderman; using namespace bts::api::admin; using namespace std; -class AdminServiceServer : public api::admin::AdminServiceBase +class AdminServiceServer : public api::admin::AuthenticatedAdminServiceBase { private: const std::string _db_name; @@ -34,41 +34,54 @@ public: ~AdminServiceServer(); void create_account( - const AccountCreateAPIArgument& request, - const api::Response& reply) override; + const api::AuthToken&, + const AccountCreateAPIArgument& request, + const api::Response& reply) override; void update_account( - const AccountUpdateAPIArgument& request, - const api::Response& reply) override; - + const api::AuthToken&, + const AccountUpdateAPIArgument& request, + const api::Response& reply) override; + void create_user( - const UserCreateAPIArgument& request, - const api::Response& reply) override; + const api::AuthToken&, + const UserCreateAPIArgument& request, + const api::Response& reply) override; void update_user( + const api::AuthToken&, const UserUpdateAPIArgument& request, const api::Response& reply) override; - void get_admin_data(const bts::api::VoidMessage& request, - const api::Response& reply) override; + void get_admin_data( + const api::AuthToken&, + const bts::api::VoidMessage& request, + const api::Response& reply) override; - void get_filtered_admin_data(const bts::api::admin::FilteredAdminDataRequest& request, - const api::Response& reply) override; + void get_filtered_admin_data( + const api::AuthToken&, + const bts::api::admin::FilteredAdminDataRequest& request, + const api::Response& reply) override; void delete_user( + const api::AuthToken&, const IDAPIArgument& request, const api::Response& reply) override; void delete_account( + const api::AuthToken&, const IDAPIArgument& request, const api::Response& reply) override; - void get_order_summary(const bts::api::VoidMessage& request, - const api::Response& reply) override; + void get_order_summary( + const api::AuthToken&, + const bts::api::VoidMessage& request, + const api::Response& reply) override; void cancel_orders( - const OrderCancelRequest& request, - const api::Response& reply) override; + const api::AuthToken&, + const OrderCancelRequest& request, + const api::Response& reply) override; private: // this is mainly does 2 things : diff --git a/src/web/ui/src/Access.fs b/src/web/ui/src/Access.fs index f625884e9..3de9afcff 100644 --- a/src/web/ui/src/Access.fs +++ b/src/web/ui/src/Access.fs @@ -7,9 +7,9 @@ open bts.api.orderman let superuser = "bts" -let getAdminData (admin:IAdminService) (token) (fsuc) (ffail) = +let getAdminData (admin:IAdminService) (fsuc) (ffail) = Cmd.ofPromise - admin.get_filtered_admin_data { token = token } + admin.get_filtered_admin_data () fsuc (fun e -> ffail e.Message) diff --git a/src/web/ui/src/Accounts/State.fs b/src/web/ui/src/Accounts/State.fs index 9be77a425..23158a82a 100644 --- a/src/web/ui/src/Accounts/State.fs +++ b/src/web/ui/src/Accounts/State.fs @@ -37,7 +37,7 @@ let init (context:ServiceContext.ServiceContext) = can_create = context.can_create this_username = context.username ShowLoading = false - }, Access.getAdminData admin context.token UpdateAdminData NoAdminData + }, Access.getAdminData admin UpdateAdminData NoAdminData let existingSelection (scratch:BTSAccount) (previousScratch:BTSAccount) (data:AdminData) = List.choose id [ @@ -76,7 +76,7 @@ let applySIMUpdate (data:SIMAccountData) = function let saveAccount (admin:IAdminService) (account:BTSAccount) (model:Model) = promise { let! result = admin.update_account { completeData = account } if result.isSuccess then - let! data = admin.get_filtered_admin_data {token = model.token} + let! data = admin.get_filtered_admin_data () return UpdateAdminData data else return ErrorOccured (sprintf "Error saving account: %s" result.errorText) @@ -94,7 +94,7 @@ let createAccount (admin:IAdminService) (account:BTSAccount) (model:Model) = pro let deleteAccount (admin:IAdminService) (account:BTSAccount) (model:Model) = promise { let! result = admin.delete_account { id = account.id } if result.isSuccess then - let! data = admin.get_filtered_admin_data {token = model.token} + let! data = admin.get_filtered_admin_data () return UpdateAdminData data else return ErrorOccured (sprintf "Error deleting account: %s" result.errorText) @@ -105,7 +105,7 @@ let cancelOrders (admin:IAdminService) (accountName:string) (orders:OrdersSummar let accounts = [| accountName |] let! result = admin.cancel_orders {accounts = accounts; users = users } - let! data = admin.get_filtered_admin_data {token = model.token} + let! data = admin.get_filtered_admin_data () return UpdateAdminData data } diff --git a/src/web/ui/src/Users/State.fs b/src/web/ui/src/Users/State.fs index 6e288c739..f7103039a 100644 --- a/src/web/ui/src/Users/State.fs +++ b/src/web/ui/src/Users/State.fs @@ -28,7 +28,7 @@ let isNewUser (user:BTSUser) = let getAdminData (admin:IAdminService) (token:string) = Cmd.ofPromise - admin.get_filtered_admin_data { token = token } + admin.get_filtered_admin_data () UpdateAdminData (fun _ -> RpcResponse "Error getting admin data") @@ -156,7 +156,7 @@ let userIsSelected (initialState:BTSUser) (scratch:BTSUser) = scratch <> initial let saveUser (admin:IAdminService) (user:BTSUser) (model:Model) = promise { let! result = admin.update_user { completeData = user } if (result.isSuccess) then - let! data = admin.get_filtered_admin_data {token = model.token} + let! data = admin.get_filtered_admin_data () return UpdateAdminData data else return ErrorOccured (sprintf "Error saving user: %s" result.errorText) @@ -165,7 +165,7 @@ let saveUser (admin:IAdminService) (user:BTSUser) (model:Model) = promise { let deleteUser (admin:IAdminService) (user:BTSUser) (model:Model) = promise { let! result = admin.delete_user { id = user.id } if (result.isSuccess) then - let! data = admin.get_filtered_admin_data {token = model.token} + let! data = admin.get_filtered_admin_data () return UpdateAdminData data else return ErrorOccured (sprintf "Error deleting user: %s" result.errorText) From dcee2930f5715bf5d6bf501148d7a056630309d4 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Fri, 7 Dec 2018 15:47:43 -0500 Subject: [PATCH 057/107] Fix F# warnings --- src/web/ui/src/Accounts/State.fs | 2 +- src/web/ui/src/Controls/Fields.fs | 7 +++-- src/web/ui/src/Nav.fs | 3 +- src/web/ui/src/Users/State.fs | 48 +++++++++++++------------------ 4 files changed, 27 insertions(+), 33 deletions(-) diff --git a/src/web/ui/src/Accounts/State.fs b/src/web/ui/src/Accounts/State.fs index 23158a82a..fcbaac147 100644 --- a/src/web/ui/src/Accounts/State.fs +++ b/src/web/ui/src/Accounts/State.fs @@ -191,7 +191,7 @@ let update msg (model:Model) : Model * Cmd = | true, h::m::tail -> orders | true, h::_ -> h::model.SelectedOrders | false, h::_ -> List.filter (fun elm -> (orderIsEqual elm h) |> not) model.SelectedOrders - | false, _ -> [] + | _ -> [] {model with SelectedOrders = so}, Cmd.Empty | SelectAccount account -> { (clearSelection model) with previousScratch = model.scratch; scratch = account }, Cmd.Empty diff --git a/src/web/ui/src/Controls/Fields.fs b/src/web/ui/src/Controls/Fields.fs index 20cd5876e..2fbd6cd2f 100644 --- a/src/web/ui/src/Controls/Fields.fs +++ b/src/web/ui/src/Controls/Fields.fs @@ -194,9 +194,10 @@ let radioButton (lbl:string) (description:string) (dv:bool) (attrs:IHTMLProp lis let mapSelectEx (lbl:string) (options:Map) (defaultText:string option) (defaultValue:string option) (onchange:'a->unit) (is_disabled:bool option) = - let dis = match is_disabled with - | None -> false - | Some a -> a + let dis = + match is_disabled with + | None -> false + | Some a -> a let optList:ReactElement list = match defaultText with diff --git a/src/web/ui/src/Nav.fs b/src/web/ui/src/Nav.fs index d272169e6..c156bc27d 100644 --- a/src/web/ui/src/Nav.fs +++ b/src/web/ui/src/Nav.fs @@ -59,4 +59,5 @@ let root (currentPage:Page) (sc:ServiceContext) dispatch = ] ] -let (navRoot: 'a -> ServiceContext -> Dispatch -> ReactElement) = lazyView3With (fun b c -> isCurrentPage (fst b) (fst c)) root \ No newline at end of file +let (navRoot: Page -> ServiceContext -> Dispatch -> ReactElement) = + lazyView3With (fun b c -> isCurrentPage (fst b) (fst c)) root \ No newline at end of file diff --git a/src/web/ui/src/Users/State.fs b/src/web/ui/src/Users/State.fs index f7103039a..d59dd43a1 100644 --- a/src/web/ui/src/Users/State.fs +++ b/src/web/ui/src/Users/State.fs @@ -20,12 +20,6 @@ let SMPInstructionMap:Map = Map.empty let isNewUser (user:BTSUser) = user.id = 0u && user.isPresent -// let getUserData (user:IUserService) username password = -// Cmd.ofPromise -// user.authenticate_login { login = username; password = password} -// (fun u -> UpdateAdminAuthData u.adminData) -// (fun _ -> RpcResponse "Error getting admin auth data") - let getAdminData (admin:IAdminService) (token:string) = Cmd.ofPromise admin.get_filtered_admin_data () @@ -109,13 +103,13 @@ let init (context:ServiceContext.ServiceContext) : Model * Cmd = accountsList = [] scratchUser = defaultScratchUser PreviousScratchUser = defaultScratchUser - currentTab = Tab.General + currentTab = Tab.General admin = admin adminData = None OptionsMenuOpen = "" ConfirmModal = "", (Msg.SwitchTab Tab.General) token = context.token - can_create = context.can_create + can_create = context.can_create this_username = context.username }, getAdminData admin context.token @@ -180,7 +174,7 @@ let createUser (admin:IAdminService) (user:BTSUser) (model:Model)= promise { company = user.company licenseData = user.licenseData licenseEntitlements = user.licenseEntitlements - } + } let! result = admin.create_user args if result.isSuccess then return! saveUser admin { user with id = result.newId } model @@ -189,26 +183,24 @@ let createUser (admin:IAdminService) (user:BTSUser) (model:Model)= promise { } let updateExchangeMdEntitlementDataCMEData user dta :BTSUser = { user with userData = { user.userData with exchangeMdEntitlementData = { user.userData.exchangeMdEntitlementData with cmeData = dta}}} -let updateCMEExchangeUserData user dta = { user with userData = { user.userData with exchangeUserData = { user.userData.exchangeUserData with cmeData = dta }}} -let updateSIMExchangeUserData user dta = { user with userData = { user.userData with exchangeUserData = { user.userData.exchangeUserData with simData = dta }}} +let updateCMEExchangeUserData (user:BTSUser) dta = { user with userData = { user.userData with exchangeUserData = { user.userData.exchangeUserData with cmeData = dta }}} +let updateSIMExchangeUserData (user:BTSUser) dta = { user with userData = { user.userData with exchangeUserData = { user.userData.exchangeUserData with simData = dta }}} -let default_user_account = { - tradingPermission = { - hasPermissions = false - submitMarketOrders = false - submitGtcOrders = false - algoTradingPermission = { - submitIcebergOrders = false - submitTimeBoxOrders = false - submitSpreaderOrders = false - } - } - adminPermission = { - hasPermissions = false - hasMdPermissions = false - } +let default_user_account = { + tradingPermission = + { hasPermissions = false + submitMarketOrders = false + submitGtcOrders = false + algoTradingPermission = + { submitIcebergOrders = false + submitTimeBoxOrders = false + submitSpreaderOrders = false } + } + adminPermission = + { hasPermissions = false + hasMdPermissions = false } } - + let applyUpdate (field:UserField) (user:BTSUser) = match field with @@ -293,7 +285,7 @@ let update msg (model:Users.Types.Model) : Model * Cmd = company = usrDest.company isActive = usrDest.isActive } - { model with scratchUser = nusr }, Cmd.Empty + { model with scratchUser = nusr }, Cmd.Empty | Delete usr -> let mdl = { model with OptionsMenuOpen = "" } From b7a620d30e994c5da45bf2f136c74365dfe3cc88 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Fri, 7 Dec 2018 16:07:13 -0500 Subject: [PATCH 058/107] added logs and new test --- .../orders/spreader_orders/SpreaderOrder.cpp | 6 +- .../orders/spreader_orders/SpreaderOrder.h | 8 +++ .../SpreaderWorkingStateWorker.cpp | 10 ++- .../spreader_orders/tests/spreader_tests.cpp | 68 +++++++++++++++++++ .../spreader_orders/tests/tests_common.h | 30 ++++++++ 5 files changed, 120 insertions(+), 2 deletions(-) diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp index cccba1190..3b41a9f35 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp @@ -149,8 +149,10 @@ void SpreaderOrder::_on_child_order_update(const OrderStateUpdateEvent& ord_ev){ ord_ev.last_msg, static_cast(order_error)); leg_data.order_update_message().on_order_update(ord_ev); if (order_error == ChildOrderError::NONE){ - if (leg_data.order_update_message().last_update_filled_quantity().value() > 0) + if (leg_data.order_update_message().last_update_filled_quantity().value() > 0){ + LOG(OrderMan,Info,"h_p child update {0}",_since_order_update(trace)); _state_worker->on_quoter_order_fill (leg_data,trace); + } else _state_worker->on_quoter_order_status_update (leg_data); } @@ -184,8 +186,10 @@ void SpreaderOrder::_on_child_order_update(const OrderStateUpdateEvent& ord_ev){ key(), sec_key, order_key, status, filled_qty, last_price, ord_ev.last_msg); } + LOG(OrderMan,Info,"h_p fill done {0}",_since_order_update(trace)); _send_check_termination(true); _report_state(); + LOG(OrderMan, Info,"h_p end {0}",_since_order_update(trace)); LOG(Latency,Diag, "_on_child_order_update k:{} t:{}us", key().value(), (utils::TimeStamp::now() - trace.spreader_on_child_order_update).microseconds()); } diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h index 9b377d948..f29b32dd9 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h @@ -240,6 +240,14 @@ private: // (if settlements are not available returns nan) // Otherwise effectiv_price==order_price. Price _compute_effective_price (Price order_price); + // retuns the nano seconds from last + // order callback + double _since_order_update(bts::PerfTrace& trace){ + double rv = (utils::TimeStamp::now()- + trace.spreader_on_child_order_update).nanoseconds(); + trace.spreader_on_child_order_update = utils::TimeStamp::now(); + return rv; + } // testing only ////////////////// // this provides direct way to inject // data into the spreader, as well as diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp index 4a32b5451..16f4d9d79 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp @@ -79,6 +79,7 @@ void SpreaderWorkingStateWorker::on_quoter_order_error(SpreaderLegData& leg_data } void SpreaderWorkingStateWorker::on_quoter_order_fill(SpreaderLegData& leg_data, PerfTrace &trace){ + LOG(OrderMan, Info,"h_p w start {0}",_spreader->_since_order_update(trace)); // this is the most complex part of the spreader. the following needs to be done // 1. tell other quoters about it (so they reduce their sizes) // 2. launch a new hedger @@ -112,17 +113,23 @@ void SpreaderWorkingStateWorker::on_quoter_order_fill(SpreaderLegData& leg_data, UnhedgedDelta& leg_unhedged_delta = other_leg_data.unhedged_delta(); leg_unhedged_delta.add_unhedged(hedge_price.value(), hedge_qty); uint32_t total_unhedged_qty=leg_unhedged_delta.subtract_hedge_if_available(); + LOG(OrderMan, Info,"h_p comp {0} {1}", q_idx, _spreader->_since_order_update(trace)); if (total_unhedged_qty != 0){ // if it is an actively quoting leg, inform the quoter about it // so it can decrease the proportional size - if (other_leg_data.leg_property_data().is_active_quoting()) + if (other_leg_data.leg_property_data().is_active_quoting()){ other_leg_data.quoter().update_other_leg_fills(leg_data.leg_property_data().leg_index(), Quantity(total_unhedged_qty)); + LOG(OrderMan, Info,"h_p q minus {0} {1}", + q_idx, _spreader->_since_order_update(trace)); + } // a hedge is sent regardless _spreader->_send_hedge(other_leg_data.leg_property_data().leg_index(), hedge_price, Quantity(total_unhedged_qty), trace); + LOG(OrderMan, Info,"h_p send hedge {0} {1}", + q_idx, _spreader->_since_order_update(trace)); } } } @@ -133,6 +140,7 @@ void SpreaderWorkingStateWorker::on_quoter_order_fill(SpreaderLegData& leg_data, // earlier too) // todo:this needs to be addressed, its confusing leg_data.quoter().update_order_status (order_update_message); + LOG(OrderMan, Info,"h_p update q {0}", _spreader->_since_order_update(trace)); } void SpreaderWorkingStateWorker::on_quoter_order_status_update(SpreaderLegData& leg_data){ bts_assert (leg_data.order_update_message().last_update_filled_quantity().value() == 0); diff --git a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp index b3bd2bbef..78a299e3f 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp +++ b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp @@ -2796,12 +2796,26 @@ TEST_CASE ("spreader_perf_4legs", "[spreader]") new double[5] {20.035, 20.040, 20.045, 20.050, 20.055}, new uint16_t[5] {250,275,100,5,15}, true), + book_2_alt = get_book(SecurityKey (leg_2.security().id()), + 5, + new double[5] {20.050,20.035,20.030,20.035,20.030}, + new uint16_t[5] {10, 10, 20, 250, 75}, + new double[5] {20.055, 20.060, 20.065, 20.070, 20.085}, + new uint16_t[5] {25,275,100,5,15}, + true), book_3 = get_book(SecurityKey (leg_3.security().id()), 5, new double[5] {19.985,19.980,19.975,19.970,19.965}, new uint16_t[5] {75,250,125,100,300}, new double[5] {19.990,19.995,20.000,20.005,20.010}, new uint16_t[5] {100,150,250,25,125}, + true), + book_3_alt = get_book(SecurityKey (leg_3.security().id()), + 5, + new double[5] {19.885,19.875,19.870,19.765,19.760}, + new uint16_t[5] {75,25,125,100,300}, + new double[5] {19.890,19.895,19.900,19.910,19.915}, + new uint16_t[5] {100,50,50,125,125}, true); spreader.test_only_on_book_update (BookUpdateEvent(book_1, PerfTrace())); @@ -2871,6 +2885,60 @@ TEST_CASE ("spreader_perf_4legs", "[spreader]") LOG(OrderMan, Info, "n leg hedges:{} unit time(u_secs):{}",n_hedges,hedge_time); std::cout << "4 leg hedges:" << n_hedges << " unit time(usecs):" << hedge_time << std::endl; } + SECTION ("N_requotes_1_hedge_M_times"){ + // N book updates followed by M fills + // (does the hedge time stays the same as + // in a tight loop in the "hedges" test ?) + uint32_t n_runs=5, + n_book_updates=100, + n_hedges = 5; + // since its the same quoting order we are filling + // and the code downstream expects accumulated filled qty + uint32_t total_filled_qty = 0, hi = 0; + for (uint32_t i=0; i hedge_perfs; + hedge_perfs.reserve(n_hedges); + auto t0=utils::TimeStamp::now(); + for (uint32_t b=0; b& p, + double& min, + double& max, + double& mean, + double& median){ + if(p.size()>0){ + std::sort(p.begin(),p.end()); + min=p[0]; + max=p[p.size()-1]; + median=p[p.size()/2]; + mean=0.0; + for(double d : p) + mean += d; + mean /= p.size(); + } +} +void spin_ms (int64_t ms) +{ + if (ms > 0) { + auto now = Timer::now(); + while (ns_diff(Timer::now(),now) < ms * 1000 * 1000) + ; + } +} +void test_sleep (int64_t ms, bool is_spin){ + if (is_spin) + spin_ms(ms); + else + sleep_for(std::chrono::milliseconds(ms)); +} }} From 30ed5b296e9ef29c793383668a080075ae392ba4 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Fri, 7 Dec 2018 22:52:48 +0000 Subject: [PATCH 059/107] Fixed reentrancy issues with new direct order interaction. --- .../actors/order_manager/OrderServices.h | 131 +++++++++++++----- src/lib/orderman/orders/NativeOrder.cpp | 95 +++++++------ 2 files changed, 151 insertions(+), 75 deletions(-) diff --git a/src/lib/orderman/actors/order_manager/OrderServices.h b/src/lib/orderman/actors/order_manager/OrderServices.h index 74c098a36..badf97244 100644 --- a/src/lib/orderman/actors/order_manager/OrderServices.h +++ b/src/lib/orderman/actors/order_manager/OrderServices.h @@ -16,7 +16,15 @@ namespace bts { namespace orderman { +class OrderServices; class SessionServices { + friend class OrderServices; + EventStream _exe_reports; + EventStream _cancel_rejects; + EventStream _gateway_status; + SessionServicesData *_session_data; + EventStream::SubID + _gateway_status_sub; public: SessionServices(SessionServices &&ss) { operator=(std::move(ss)); } @@ -48,6 +56,7 @@ class SessionServices { return *this; } + protected: std::string const &session_name() const { return _session_data->session; } config::JetFIX::Connection const &session_cfg() const { @@ -92,14 +101,6 @@ class SessionServices { void unsubscribe_from_gateway_status() { _gateway_status.unsub(_gateway_status_sub); } - - private: - EventStream _exe_reports; - EventStream _cancel_rejects; - EventStream _gateway_status; - SessionServicesData *_session_data; - EventStream::SubID - _gateway_status_sub; }; class OrderServices { @@ -131,6 +132,21 @@ class OrderServices { return _data->last_timer_ev.ts_str; } + int price_encoding_precision(SessionServices &ss) { + return ss.session_cfg().price_encoding_precision(); + } + + bool is_gateway_connected(SessionServices &ss) { + return ss.is_gateway_connected(); + } + + Governor &governor(SessionServices &ss) { return ss.governor(); } + + void queue_fix(SessionServices &ss, jetfix::MessageTypes mt, + jetfix::FIXFragment const &f, trace::CorID const &trace) { + ss.queue_fix(mt, f, trace); + } + void log(trace::CorID cid, const char *entry_kind, uint32_t uint32_1 = 0, uint32_t uint32_2 = 0, const char *txt_1 = "", uint64_t uint64_1 = 0) { @@ -142,23 +158,22 @@ class OrderServices { OrderStateUpdateEvent ev(_owner->key(), _owner->parent_key(), _owner->definition(), state, trace); + _data->owner.publish(_data->report_order_state_pub, ev); - on_inter_order_call([ev](OrderServices &self) { - self._data->owner.publish(self._data->report_order_state_pub, ev); - if (orderman::in_terminal_state(ev.status)) { - LOG(OrderMan, Info, - "Order {} transitioned to a terminal state. Canceling all " - "subscriptions", - self._owner->key().value()); - self.unsubscribe_from_child_updates(); - self._book_updates.unsub_all(); - self._settlement_updates.unsub_all(); - self._time_change.unsub_all(); - self._create_order_reply.unsub_all(); - } - if (self._parent) - self._parent->_child_update_cb(ev); - }); + if (orderman::in_terminal_state(state.status())) { + LOG(OrderMan, Info, + "Order {} transitioned to a terminal state. Canceling all " + "subscriptions", + _owner->key().value()); + unsubscribe_from_child_updates(); + _book_updates.unsub_all(); + _settlement_updates.unsub_all(); + _time_change.unsub_all(); + _create_order_reply.unsub_all(); + } + + if (_parent) + _parent->on_child_update(ev); } Limiter &limiter() { return _data->limiter; } @@ -171,32 +186,71 @@ class OrderServices { } // Subscriptions ------------------------------ + + // Book using BookSubID = EventStream::SubID; template BookSubID subscribe_to_book(SecurityKey k, CB &&cb) { - return _book_updates.sub(k, [this,cb] (auto const &ev) { - this->on_external_event(ev,cb); - }); + return _book_updates.sub( + k, [this, cb](auto const &ev) { this->on_external_event(ev, cb); }); } - void unsubscribe_from_book(BookSubID sid) { _book_updates.unsub(sid); } + // Settlement using SettlementSubID = EventStream::SubID; template SettlementSubID subscribe_to_settlements(SecurityKey k, CB &&cb) { - return _settlement_updates.sub(k, [this,cb] (auto const&ev) { - this->on_external_event(ev,cb); - }); + return _settlement_updates.sub( + k, [this, cb](auto const &ev) { this->on_external_event(ev, cb); }); } void unsubscribe_from_settlements(SettlementSubID sid) { _settlement_updates.unsub(sid); } + // Settlement + // Time template void subscribe_to_time(CB &&cb) { - _time_change_sub = _time_change.sub([this,cb] (auto const&ev) { - this->on_external_event(ev,cb); - }); + _time_change_sub = _time_change.sub( + [this, cb](auto const &ev) { this->on_external_event(ev, cb); }); } void unsubscribe_from_time() { _time_change.unsub(_time_change_sub); } + // Time + + // Execution Reports + using ExeReportSubID = EventStream::SubID; + template + void subscribe_to_exe_report(SessionServices &ss, OrderKey k, CB &&cb) { + ss.subscribe_to_exe_report( + k, [this, cb](auto const &ev) { this->on_external_event(ev, cb); }); + } + void unsubscribe_from_exe_report(SessionServices &ss, ExeReportSubID sid) { + ss.unsubscribe_from_exe_report(sid); + } + // Execution Reports + + // Cancel Reject + using CancelRejectSubID = EventStream::SubID; + template + CancelRejectSubID subscribe_to_cancel_reject(SessionServices &ss, OrderKey k, + CB &&cb) { + return ss.subscribe_to_cancel_reject( + k, [this, cb](auto const &ev) { this->on_external_event(ev, cb); }); + } + void unsubscribe_from_cancel_reject(SessionServices &ss, + CancelRejectSubID sid) { + ss.unsubscribe_from_cancel_reject(sid); + } + // Cancel Reject + + // Gateway Status + template + void subscribe_to_gateway_status(SessionServices &ss, CB &&cb) { + ss.subscribe_to_gateway_status( + [this, cb](auto const &ev) { this->on_external_event(ev, cb); }); + } + void unsubscribe_from_gateway_status(SessionServices &ss) { + ss.unsubscribe_from_gateway_status(); + } + // Gateway Status template void subscribe_to_child_updates(CB &&cb) { _child_update_cb = cb; @@ -204,12 +258,14 @@ class OrderServices { void unsubscribe_from_child_updates() { _child_update_cb = [](auto const &) {}; } + // End Subscriptions ------------------------------ private: friend class OrderBuilder; - template void on_external_event(EV const &ev, C const &c) { + template + void on_external_event(EV const &ev, C const &c) { bts_assert(!_busy); _busy = true; c(ev); @@ -276,6 +332,11 @@ class OrderServices { [trace](OrderServices &self) { self._owner->on_cancel(trace); }); } + void on_child_update(OrderStateUpdateEvent const &ev) { + on_inter_order_call( + [ev](OrderServices &self) { self._child_update_cb(ev); }); + } + bool _busy; boost::container::small_vector, 10> _pending_calls; diff --git a/src/lib/orderman/orders/NativeOrder.cpp b/src/lib/orderman/orders/NativeOrder.cpp index 33b89aadd..9824a71e0 100644 --- a/src/lib/orderman/orders/NativeOrder.cpp +++ b/src/lib/orderman/orders/NativeOrder.cpp @@ -275,8 +275,8 @@ NativeOrder::~NativeOrder() {} void NativeOrder::on_activate(Price p, Quantity q, bts::orderman::OrderServices &services, trace::CorID const &trace) { - services.log(trace,"on_activate_start",key().value()); - + services.log(trace, "on_activate_start", key().value()); + bts_assert(!me->services); me->services = &services; @@ -294,10 +294,10 @@ void NativeOrder::on_activate(Price p, Quantity q, me->session_services = &me->services->get_session_services( get_native_state(me->state).routing_record().session()); me->price_encoding_precision = - me->session_services->session_cfg().price_encoding_precision(); + me->services->price_encoding_precision(*me->session_services); // is our gateway connected? - if (!me->session_services->is_gateway_connected()) { + if (!me->services->is_gateway_connected(*me->session_services)) { LOG(OrderMan, Warn, "Attempt to send order to a disconnected gateway. " "Dropping order {}", @@ -340,7 +340,7 @@ void NativeOrder::on_activate(Price p, Quantity q, } // are we under the messaging threshold? - if (!me->session_services->governor().can_send()) { + if (!me->services->governor(*me->session_services).can_send()) { LOG(OrderMan, Warn, "New order would cause breach of messaging " "limits. Dropping order {}", @@ -353,11 +353,14 @@ void NativeOrder::on_activate(Price p, Quantity q, // if we are here we are good. // subscribe to usefull events - me->session_services->subscribe_to_exe_report( - key(), [this](auto const &r) { this->on_exe_report(r); }); - me->session_services->subscribe_to_cancel_reject( - key(), [this](auto const &cr) { this->on_cancel_reject(cr); }); - me->session_services->subscribe_to_gateway_status( + me->services->subscribe_to_exe_report( + *me->session_services, key(), + [this](auto const &r) { this->on_exe_report(r); }); + me->services->subscribe_to_cancel_reject( + *me->session_services, key(), + [this](auto const &cr) { this->on_cancel_reject(cr); }); + me->services->subscribe_to_gateway_status( + *me->session_services, [this](auto const &gw) { this->on_gateway_status(gw); }); // send out order @@ -384,13 +387,14 @@ void NativeOrder::on_activate(Price p, Quantity q, auto const &ts = services.get_time_str(); me->create_transact_time_bm = encoding.overwrite( me->create_transact_time_bm, &ts.value()[0], ts.value().size()); - services.log(trace,"send_fix_buffer",key().value()); - me->session_services->queue_fix(jetfix::MessageTypes::NewOrderSingle, - me->create_encoding, trace); - me->session_services->governor().record_sent(); + services.log(trace, "send_fix_buffer", key().value()); + me->services->queue_fix(*me->session_services, + jetfix::MessageTypes::NewOrderSingle, + me->create_encoding, trace); + me->services->governor(*me->session_services).record_sent(); me->state.set_status(ORDER_STATUS_PENDING_WORKING); - services.log(trace,"on_activate_done",key().value()); + services.log(trace, "on_activate_done", key().value()); LOG(OrderMan, Info, "Sent new order with key {} to gateway", key().value()); // early return so we skip the expensive report_state() call @@ -401,39 +405,48 @@ void NativeOrder::on_activate(Price p, Quantity q, case ORDER_STATUS_WORKING: me->session_services = &me->services->get_session_services( get_native_state(me->state).routing_record().session()); - me->session_services->subscribe_to_exe_report( - key(), [this](auto const &r) { this->on_exe_report(r); }); - me->session_services->subscribe_to_cancel_reject( - key(), [this](auto const &cr) { this->on_cancel_reject(cr); }); - me->session_services->subscribe_to_gateway_status( + me->services->subscribe_to_exe_report( + *me->session_services, key(), + [this](auto const &r) { this->on_exe_report(r); }); + me->services->subscribe_to_cancel_reject( + *me->session_services, key(), + [this](auto const &cr) { this->on_cancel_reject(cr); }); + me->services->subscribe_to_gateway_status( + *me->session_services, [this](auto const &gw) { this->on_gateway_status(gw); }); - if (!me->session_services->is_gateway_connected()) + if (!me->services->is_gateway_connected(*me->session_services)) transition(ORDER_STATUS_DISCONNECTED); break; case ORDER_STATUS_DISCONNECTED: me->session_services = &me->services->get_session_services( get_native_state(me->state).routing_record().session()); - me->session_services->subscribe_to_exe_report( - key(), [this](auto const &r) { this->on_exe_report(r); }); - me->session_services->subscribe_to_cancel_reject( - key(), [this](auto const &cr) { this->on_cancel_reject(cr); }); - me->session_services->subscribe_to_gateway_status( + me->services->subscribe_to_exe_report( + *me->session_services, key(), + [this](auto const &r) { this->on_exe_report(r); }); + me->services->subscribe_to_cancel_reject( + *me->session_services, key(), + [this](auto const &cr) { this->on_cancel_reject(cr); }); + me->services->subscribe_to_gateway_status( + *me->session_services, [this](auto const &gw) { this->on_gateway_status(gw); }); - if (me->session_services->is_gateway_connected()) + if (me->services->is_gateway_connected(*me->session_services)) transition(ORDER_STATUS_WORKING); break; case ORDER_STATUS_PENDING_WORKING: me->session_services = &me->services->get_session_services( get_native_state(me->state).routing_record().session()); - me->session_services->subscribe_to_exe_report( - key(), [this](auto const &r) { this->on_exe_report(r); }); - me->session_services->subscribe_to_cancel_reject( - key(), [this](auto const &cr) { this->on_cancel_reject(cr); }); - me->session_services->subscribe_to_gateway_status( + me->services->subscribe_to_exe_report( + *me->session_services, key(), + [this](auto const &r) { this->on_exe_report(r); }); + me->services->subscribe_to_cancel_reject( + *me->session_services, key(), + [this](auto const &cr) { this->on_cancel_reject(cr); }); + me->services->subscribe_to_gateway_status( + *me->session_services, [this](auto const &gw) { this->on_gateway_status(gw); }); break; @@ -453,7 +466,7 @@ void NativeOrder::on_activate(Price p, Quantity q, void NativeOrder::on_update(Price p, Quantity q, trace::CorID const &trace) { - me->services->log(trace,"order_update",key().value()); + me->services->log(trace, "order_update", key().value()); switch (me->state.status()) { @@ -491,7 +504,7 @@ void NativeOrder::on_update(Price p, Quantity q, trace::CorID const &trace) { } // are we under the messaging threshold? - if (!me->session_services->governor().can_send()) { + if (!me->services->governor(*me->session_services).can_send()) { LOG(OrderMan, Warn, "Cannot update order {} because of messaging limits. ", key().value()); @@ -518,10 +531,11 @@ void NativeOrder::on_update(Price p, Quantity q, trace::CorID const &trace) { me->update_transact_time_bm = encoding.overwrite( me->update_transact_time_bm, &ts.value()[0], ts.value().size()); - me->session_services->queue_fix(jetfix::MessageTypes::CancelReplace, - me->update_encoding, trace); + me->services->queue_fix(*me->session_services, + jetfix::MessageTypes::CancelReplace, + me->update_encoding, trace); - me->session_services->governor().record_sent(); + me->services->governor(*me->session_services).record_sent(); update_working_position(); if (me->state.last_msg().size()) me->state.set_last_msg(""); @@ -559,8 +573,9 @@ void NativeOrder::on_cancel(trace::CorID const &trace) { me->cancel_transact_time_bm = encoding.overwrite( me->cancel_transact_time_bm, &ts.value()[0], ts.value().size()); - me->session_services->queue_fix(jetfix::MessageTypes::Cancel, - me->cancel_encoding, trace); + me->services->queue_fix(*me->session_services, + jetfix::MessageTypes::Cancel, me->cancel_encoding, + trace); break; } @@ -681,7 +696,7 @@ void NativeOrder::on_exe_report(const NewExecutionReportEvent &er) { case ORDER_STATUS_PENDING_WORKING: if (external_status == ORDER_STATUS_WORKING && - !me->session_services->is_gateway_connected()) + !me->services->is_gateway_connected(*me->session_services)) transition(ORDER_STATUS_DISCONNECTED); else transition(external_status); From 24f0b48f9d0b559ee328409d3045d1659475a211 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Fri, 7 Dec 2018 18:13:57 -0500 Subject: [PATCH 060/107] revamp MarketDataClient to use same MD as shell --- src/client/spark/Daemons/MDDaemon.cs | 57 +-- src/client/spark/core/Bus/SparkCommands.cs | 1 + .../core/GlobalExtensions/GlobalExtensions.cs | 4 +- .../spark/view/Spark/Ladder/LadderVM.cs | 1 + src/client/spark_api/md/MDBook.cs | 50 +++ src/client/spark_api/md/MDCombined.cs | 63 +++ src/client/spark_api/md/MDLast.cs | 39 ++ src/client/spark_api/md/MDMisc.cs | 67 +++ src/client/spark_api/md/MDSource.cs | 87 ++++ src/client/spark_api/md/MarketDataClient.cs | 385 +++++++----------- src/client/spark_api/md/PriceSize.cs | 20 + .../Spark/Core => spark_api/md}/SecurityMD.cs | 2 +- src/client/spark_api/utils/APIExtensions.cs | 5 +- .../spark_api/{md => utils}/Authenticator.cs | 0 .../spark_api/{md => utils}/LazyAsync.cs | 2 +- src/client/spark_api/{md => utils}/Locator.cs | 0 .../rtd/subscriptions/MDSubscribe.cs | 14 +- 17 files changed, 484 insertions(+), 313 deletions(-) create mode 100644 src/client/spark_api/md/MDBook.cs create mode 100644 src/client/spark_api/md/MDCombined.cs create mode 100644 src/client/spark_api/md/MDLast.cs create mode 100644 src/client/spark_api/md/MDMisc.cs create mode 100644 src/client/spark_api/md/MDSource.cs create mode 100644 src/client/spark_api/md/PriceSize.cs rename src/client/{spark/view/Spark/Core => spark_api/md}/SecurityMD.cs (94%) rename src/client/spark_api/{md => utils}/Authenticator.cs (100%) rename src/client/spark_api/{md => utils}/LazyAsync.cs (90%) rename src/client/spark_api/{md => utils}/Locator.cs (100%) diff --git a/src/client/spark/Daemons/MDDaemon.cs b/src/client/spark/Daemons/MDDaemon.cs index 4529156e4..faa7ef36f 100644 --- a/src/client/spark/Daemons/MDDaemon.cs +++ b/src/client/spark/Daemons/MDDaemon.cs @@ -17,32 +17,22 @@ using bts.api.user; namespace bts { [Export(typeof(IInitializable))] - class MDSource : IObserver>, IInitializable, IDisposable { + class MDDaemon : bts.md.MDSource, IObserver>, IInitializable, IDisposable { readonly Lazy _bus; readonly Lazy _token; readonly Lazy _ss; - readonly MDConsumer _consumer = new MDConsumer(); - readonly Co2RelayControl _relay; readonly Dictionary _deleted_synthetics = new Dictionary(); - long _version = 0; - readonly ConcurrentDictionary _exchange_sec_map = new ConcurrentDictionary(); - List _dispose = new List(); + + static uint get_naggle() => mbts.config.Configuration.get().naggle_ms; [ImportingConstructor] - public MDSource( - Lazy bus, - Lazy token, - Lazy ss) { + public MDDaemon(Lazy bus, Lazy token, Lazy ss) : base(get_naggle()) { _bus = bus; _token = token; - _ss = ss; - uint naggle_ms = mbts.config.Configuration.get().naggle_ms; - _relay = new Co2RelayControl(_consumer, naggle_ms); - _relay.preload_securities((co2.MDRequest.Types.Flags)0xff).ignore(); - _dispose.Add(_consumer.on_security.Subscribe(this)); + _ss = ss; } - public void initialize() { + override public void initialize() { _relay.set_token(_token.Value); _dispose.Add( _ss.Value.subscribei_metadata() @@ -67,6 +57,9 @@ namespace bts { // Post full dictionary of syntheics here bus.post(SparkTags.SyntheticstrategiesTag, t); })); + _dispose.Add( this.on_securities.Subscribe( (md) => { + bus.post(SparkTags.SecuritiesTag, md); + })); Task.Run(run); } @@ -75,37 +68,5 @@ namespace bts { public int priority => 55; IBus bus => _bus.Value; - - public void OnCompleted() { } - public void OnError(Exception error) => Log.Md.error(error.ToString()); - public void OnNext(List values) { - if (values.Count > 0) { - foreach (var v in values) { - var smd = new SecurityMD(v.security, v.handle); - _exchange_sec_map.AddOrUpdate(smd.security.Id, smd, (_, __) => smd); - } - _version += 1; - } - } - - public void Dispose() => Disposable.dispose(_dispose); - async Task run() { - long run_version = 0; - while (true) { - var exch = _exchange_sec_map; - long current_version = _version; - if (current_version > run_version) { - run_version = current_version; - try { - Log.Md.info($"MDSource publishing {exch.Count} securities"); - bus.post(SparkTags.SecuritiesTag, exch); - } catch (Exception e) { - Log.Md.error($"Error in publish_securities: {e}"); - } - } - await Task.Delay(TimeSpan.FromSeconds(1)); - } - } - } } \ No newline at end of file diff --git a/src/client/spark/core/Bus/SparkCommands.cs b/src/client/spark/core/Bus/SparkCommands.cs index 64f73fb9c..3d801d483 100644 --- a/src/client/spark/core/Bus/SparkCommands.cs +++ b/src/client/spark/core/Bus/SparkCommands.cs @@ -3,6 +3,7 @@ using bts.api.orderman; using bts.shell; using mbts.spark; using mbts.ui; +using mbts; using System; using System.Collections.Generic; diff --git a/src/client/spark/core/GlobalExtensions/GlobalExtensions.cs b/src/client/spark/core/GlobalExtensions/GlobalExtensions.cs index 018261cc7..93ba83022 100644 --- a/src/client/spark/core/GlobalExtensions/GlobalExtensions.cs +++ b/src/client/spark/core/GlobalExtensions/GlobalExtensions.cs @@ -218,9 +218,7 @@ namespace mbts private Func _comparer_func; public DelegateComparer(Func comparer_func) { _comparer_func = comparer_func; } public int Compare(T x, T y) { return _comparer_func(x, y); } - } - - public static void ignore(this Task t) { } + } public static Google.Protobuf.WellKnownTypes.Timestamp ToGoogleTime(this DateTime self) { return Google.Protobuf.WellKnownTypes.Timestamp.FromDateTime(self); diff --git a/src/client/spark/view/Spark/Ladder/LadderVM.cs b/src/client/spark/view/Spark/Ladder/LadderVM.cs index 905b5c072..f7f62b888 100644 --- a/src/client/spark/view/Spark/Ladder/LadderVM.cs +++ b/src/client/spark/view/Spark/Ladder/LadderVM.cs @@ -299,6 +299,7 @@ namespace mbts.spark { _change.set(mid - md.settlement_price); } _volume.set(volume); + _misc_time = _model.md.misc_timestamp; } } diff --git a/src/client/spark_api/md/MDBook.cs b/src/client/spark_api/md/MDBook.cs new file mode 100644 index 000000000..4f9498810 --- /dev/null +++ b/src/client/spark_api/md/MDBook.cs @@ -0,0 +1,50 @@ +using System; +using System.Collections.Generic; +using System.Linq; + +using bts.api; +using mbts; +using mbts.co2; + +namespace bts.md +{ + interface IMDUpdate + { + bool update(SecurityMD smd, ref ulong last_update_time); + } + + public interface IMDData + { + SecurityImmutable security { get; } + } + + public interface IMDBook : IMDData + { + List bids { get; } + List asks { get; } + } + + class MDBook : IMDBook, IMDUpdate + { + public MDBook() + { + } + public SecurityImmutable security { get; private set; } + + public List bids { get; private set; } + public List asks { get; private set; } + + bool IMDUpdate.update(SecurityMD smd, ref ulong last_update_time) + { + NativePriceSize[] bids = null, asks = null; + if (smd.md.get_depth(ref last_update_time, ref bids, ref asks, NativePriceHelpers.COCONUT_MAX_DEPTH)) + { + this.security = smd.security; + this.bids = bids.Select(x => new PriceSize(x.size, x.direct_size, x.implied_size, x.price)).ToList(); + this.asks = asks.Select(x => new PriceSize(x.size, x.direct_size, x.implied_size, x.price)).ToList(); + return true; + } + return false; + } + } +} \ No newline at end of file diff --git a/src/client/spark_api/md/MDCombined.cs b/src/client/spark_api/md/MDCombined.cs new file mode 100644 index 000000000..741a8c62f --- /dev/null +++ b/src/client/spark_api/md/MDCombined.cs @@ -0,0 +1,63 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using bts.api; +using mbts; + +namespace bts.md +{ + public interface IMDCombined : IMDData, IMDMisc, IMDLast, IMDBook + { + } + + class MDCombined : IMDCombined, IMDUpdate + { + MDBook _book = new MDBook(); + MDLast _last = new MDLast(); + MDMisc _misc = new MDMisc(); + public MDCombined() + { + } + public SecurityImmutable security { get; private set; } + + public ulong total_volume => _misc.total_volume; + public double settlement_price => _misc.settlement_price; + public DateTime settlement_date => _misc.settlement_date; + public double previous_settlement_price => _misc.previous_settlement_price; + public DateTime previous_settlement_date => _misc.previous_settlement_date; + + public double open_price => _misc.open_price; + public DateTime open_date => _misc.open_date; + public double close_price => _misc.close_price; + public DateTime close_date => _misc.close_date; + public double session_high => _misc.session_high; + public double session_low => _misc.session_low; + public double fixing_price => _misc.fixing_price; + + public PriceSize last => _last.last; + public ulong total_volume2 => _last.total_volume; + public DateTime last_time => _last.last_time; + + public List bids => _book.bids; + public List asks => _book.asks; + + + bool IMDUpdate.update(SecurityMD smd, ref ulong last_update_time) + { + var bl = last_update_time; + bool b = (_book as IMDUpdate).update(smd, ref bl); + + var ll = last_update_time; + bool l = (_last as IMDUpdate).update(smd, ref ll); + + var ml = last_update_time; + bool m = (_misc as IMDUpdate).update(smd, ref ml); + + last_update_time = new[] { bl, ll, ml }.Min(); + if (smd.md.market_timestamp > last_update_time) + { + } + return b || l || m; + } + } +} \ No newline at end of file diff --git a/src/client/spark_api/md/MDLast.cs b/src/client/spark_api/md/MDLast.cs new file mode 100644 index 000000000..bb785afb5 --- /dev/null +++ b/src/client/spark_api/md/MDLast.cs @@ -0,0 +1,39 @@ +using System; +using bts.api; +using mbts; +using mbts.co2; + +namespace bts.md +{ + public interface IMDLast : IMDData + { + PriceSize last{ get; } + ulong total_volume { get; } + DateTime last_time { get; } + } + + class MDLast : IMDLast, IMDUpdate + { + public MDLast() + { + } + public SecurityImmutable security { get; private set; } + + public PriceSize last { get; private set; } + public ulong total_volume { get; private set; } + public DateTime last_time { get; private set; } + + bool IMDUpdate.update(SecurityMD smd, ref ulong last_update_time) + { + NativePriceSize x; DateTime ts; ulong vol; + if (smd.md.get_last_trade(ref last_update_time, out x, out ts, out vol)) + { + last = new PriceSize(x.size, x.direct_size, x.implied_size, x.price); + total_volume = vol; + last_time = ts; + return true; + } + return false; + } + } +} \ No newline at end of file diff --git a/src/client/spark_api/md/MDMisc.cs b/src/client/spark_api/md/MDMisc.cs new file mode 100644 index 000000000..41e728f01 --- /dev/null +++ b/src/client/spark_api/md/MDMisc.cs @@ -0,0 +1,67 @@ +using System; +using bts.api; +using mbts; + +namespace bts.md +{ + public interface IMDMisc : IMDData + { + ulong total_volume { get; } + double settlement_price { get; } + DateTime settlement_date { get; } + double previous_settlement_price { get; } + DateTime previous_settlement_date { get; } + + double open_price { get; } + DateTime open_date { get; } + double close_price { get; } + DateTime close_date { get; } + double session_high { get; } + double session_low { get; } + double fixing_price { get; } + } + + class MDMisc : IMDMisc, IMDUpdate + { + public MDMisc() + { + } + public SecurityImmutable security { get; private set; } + + public ulong total_volume { get; private set; } + public double settlement_price { get; private set; } + public DateTime settlement_date { get; private set; } + public double previous_settlement_price { get; private set; } + public DateTime previous_settlement_date { get; private set; } + + public double open_price { get; private set; } + public DateTime open_date { get; private set; } + public double close_price { get; private set; } + public DateTime close_date { get; private set; } + public double session_high { get; private set; } + public double session_low { get; private set; } + public double fixing_price { get; private set; } + + bool IMDUpdate.update(SecurityMD smd, ref ulong last_update_time) + { + if (smd.md.misc_timestamp > last_update_time) + { + this.security = smd.security; + total_volume = smd.md.total_volume; + settlement_price = smd.md.settlement_price; + settlement_date = smd.md.settlement_date; + previous_settlement_price = smd.md.previous_settlement_price; + previous_settlement_date = smd.md.previous_settlement_date; + + open_price = smd.md.open_price; + open_date = smd.md.open_date; + close_price = smd.md.close_price; + close_date = smd.md.close_date; + session_high = smd.md.session_high; + session_low = smd.md.session_low; + fixing_price = smd.md.fixing_price; + } + return false; + } + } +} \ No newline at end of file diff --git a/src/client/spark_api/md/MDSource.cs b/src/client/spark_api/md/MDSource.cs new file mode 100644 index 000000000..e9ae6f208 --- /dev/null +++ b/src/client/spark_api/md/MDSource.cs @@ -0,0 +1,87 @@ +using bts.api; +using bts.api.synthetic; +using mbts; +using mbts.co2; +using System; +using System.Collections.Generic; +using System.Reactive.Linq; +using System.Threading.Tasks; +using System.Linq; +using SecurityKey = System.UInt32; +using System.Collections.Concurrent; +using System.Threading; +using bts.api.user; +using System.Reactive.Subjects; + +namespace bts.md +{ + class MDSource : IObserver>, IDisposable + { + protected readonly MDConsumer _consumer = new MDConsumer(); + protected readonly Co2RelayControl _relay; + protected long _version = 0; + protected readonly ConcurrentDictionary _exchange_sec_map = new ConcurrentDictionary(); + protected List _dispose = new List(); + + public MDSource(uint naggle_ms) + { + _relay = new Co2RelayControl(_consumer, naggle_ms); + _relay.preload_securities((co2.MDRequest.Types.Flags)0xff).ignore(); + _dispose.Add(_consumer.on_security.Subscribe(this)); + } + + readonly Subject> _on_securities = new Subject>(); + public IObservable> on_securities => _on_securities; + + virtual public void initialize() + { + Task.Run(run); + } + + public void set_token(AuthToken token) + { + _relay.set_token(token); + } + + public void OnCompleted() { } + public void OnError(Exception error) => Log.Md.error(error.ToString()); + public void OnNext(List values) + { + if (values.Count > 0) + { + foreach (var v in values) + { + var smd = new SecurityMD(v.security, v.handle); + _exchange_sec_map.AddOrUpdate(smd.security.Id, smd, (_, __) => smd); + } + _version += 1; + } + } + + public void Dispose() => Disposable.dispose(_dispose); + async protected Task run() + { + long run_version = 0; + while (true) + { + var exch = _exchange_sec_map; + long current_version = _version; + if (current_version > run_version) + { + run_version = current_version; + try + { + Log.Md.info($"MDSource publishing {exch.Count} securities"); + _on_securities.OnNext(exch); + } + catch (Exception e) + { + Log.Md.error($"Error in publish_securities: {e}"); + } + } + await Task.Delay(TimeSpan.FromSeconds(1)); + } + } + + } +} \ No newline at end of file diff --git a/src/client/spark_api/md/MarketDataClient.cs b/src/client/spark_api/md/MarketDataClient.cs index 2512c2b72..3f469db8a 100644 --- a/src/client/spark_api/md/MarketDataClient.cs +++ b/src/client/spark_api/md/MarketDataClient.cs @@ -11,103 +11,174 @@ using System.Reactive.Subjects; using bts.api; using bts.api.core; using bts.co2; +using mbts; +using SecurityKey = System.UInt32; -namespace bts.api.md +namespace bts.md { - using security_key = System.UInt32; - public class MarketDataClient : IDisposable + + public class MarketDataClient : IDisposable { - class Data - { - public long last_update_time; - public ChannelUpdate data; - } - - const UInt32 _all_flags = (uint)( - MDRequest.Types.Flags.Security | - MDRequest.Types.Flags.Bbo | - MDRequest.Types.Flags.Direct | - MDRequest.Types.Flags.Implied | - MDRequest.Types.Flags.LastTrade); + static uint naggle_ms = 100; + readonly static bts.md.MDSource _subscription = new MDSource(naggle_ms); - readonly ConcurrentDictionary _data = new ConcurrentDictionary(); - readonly ConcurrentDictionary _security_key_to_desc= new ConcurrentDictionary(); - readonly ConcurrentDictionary _security_desc_to_key = new ConcurrentDictionary(); - readonly MDRequest _subscription; - readonly Venue _venue; - - readonly static Lazy _md = new Lazy(() => Locator.locate(), true); - readonly static ConcurrentDictionary _venue_cache = new ConcurrentDictionary(); - static readonly List _all_products; - static MarketDataClient() + readonly ConcurrentDictionary _data = new ConcurrentDictionary(); + readonly List _disp = new List(); + public MarketDataClient(AuthToken token = null) { - _all_products = _md.Value.request_products(new VoidMessage()).Products.ToList(); - } + if (token != null) + set_auth_token(token); - public static IEnumerable cached_exchanges => _venue_cache.Keys; - public static bool create_or_get(api.Venue exchange, out MarketDataClient md, AuthToken token = null) - { - if (!_venue_cache.TryGetValue(exchange, out md)) + _disp.Add(_subscription.on_securities.Subscribe( md => { - _venue_cache[exchange] = md = new MarketDataClient(exchange, token); - return true; - } - return false; - } - - public MarketDataClient(bts.api.Venue exchange = Venue.Unset, AuthToken token = null) - { - _venue = exchange; - _subscription = load_request(exchange, token); + foreach (var entry in md) + _data.AddOrUpdate(entry.Key, entry.Value, (_, __) => entry.Value); + })); } public void set_auth_token(AuthToken toke) { - _subscription.Token = toke?.Token ?? string.Empty; + _subscription.set_token(toke); } - MDRequest load_request(bts.api.Venue exchange, AuthToken token) + public IEnumerable securities => _data.Values.Select(x => x.security); + public IObservable> on_securities { - var req = new MDRequest() { Token = token?.Token ?? string.Empty } ; - var prods = _all_products.Where(x=>x.Exchange == exchange || exchange == bts.api.Venue.Unset); - foreach(var prod in prods) - req.Channels.Add(new SecurityChannel() { Exchange = prod.Exchange, Type = prod.Type, Symbol = prod.Symbol, Flags = 0 }); - return req; + get { return _subscription.on_securities.Select(x => x.Values.Select(xx => xx.security)); } } - public Security lookup(security_key key) + public IObservable subscribe_combined(Product product) { - Data value; - if(_data.TryGetValue(key, out value)) - return value.data.Security; + Func where = (x => x.Exchange == product.Exchange && + x.Symbol == product.Symbol && x.security_type() == product.Type); + return subscribe_combined(where); + } + + public IObservable subscribe_book(Func filter) + { + return _subscribe(filter); + } + public IObservable subscribe_last(Func filter) + { + return _subscribe(filter); + } + public IObservable subscribe_misc(Func filter) + { + return _subscribe(filter); + } + public IObservable subscribe_combined(Func filter) + { + return _subscribe(filter); + } + + IObservable _subscribe(Func filter, + TimeSpan? update_interval = null, IScheduler scheduler = null) where T : IMDData, IMDUpdate, new() + { + List> slots = new List>(); + return timer_pump((last_timer_tick, observer) => + { + //if the number of securities has changed, or this is the first call + if (slots.Count == 0 || slots.Count != _data.Count) + slots = _data.Values.Where(x=> filter(x.security)).Select(xx => new Slot(xx)).ToList(); + foreach (var slot in slots) + { + bool did_update = slot.data.update(slot.secmd, ref slot.last_update_time); + if (slot.last_update_time > last_timer_tick) + observer.OnNext(slot.data); + } + }, + update_interval, scheduler); + } + + class Slot where T : IMDData, IMDUpdate, new() + { + public Slot(SecurityMD md) + { + secmd = md; + last_update_time = 0; + data = new T(); + } + public SecurityMD secmd; + public ulong last_update_time; + public T data; + } + + IObservable timer_pump(Action> tick, TimeSpan? interval, IScheduler scheduler = null) + { + if(!interval.HasValue) + interval = TimeSpan.FromMilliseconds(100); + ulong last_update_time = 0; + return Observable.Create(observer => + { + return Observable.Timer(interval.Value, interval.Value, scheduler ?? Scheduler.Default).Subscribe(_ => + { + tick(last_update_time, observer); + last_update_time = (ulong)DateTime.UtcNow.Ticks; + }); + }); + } + + public void Dispose() + { + _disp.ForEach(x => x.Dispose()); + } + + #region security search + + public SecurityImmutable? lookup(SecurityKey key) + { + if (_data.TryGetValue(key, out SecurityMD value)) + return value.security; else return null; } - public bool lookup_security_desc(security_key key, out string security_desc) + public bool lookup_security_desc(SecurityKey key, out string security_desc) { - return _security_key_to_desc.TryGetValue(key, out security_desc); + security_desc = null; + var sec = lookup(key); + if (sec.HasValue) + { + security_desc = sec.Value.glbx_desc(); + return true; + } + return false; } - public bool lookup_security_key_from_desc(string security_desc, out security_key key) + public bool lookup_security_key_from_desc(string security_desc, out SecurityKey key) { - return _security_desc_to_key.TryGetValue(security_desc, out key); + key = 0; + var fnd = find(x => x.glbx_desc() == security_desc).TryFirst(); + if (fnd.HasValue) + { + key = fnd.Value.security.Id; + return true; + } + return false; } - public Security find_security(Func filter) + IEnumerable find(Func filter) { - return _data.Values.Select(x => x.data.Security).Where(xx => filter(xx)).FirstOrDefault(); + Func filt = (SecurityMD secmd) => filter(secmd.security); + return _data.Values.Where(filt); } - public async Task find_security_async(Func filter, TimeSpan? timeout = null) + public SecurityImmutable? find_security(Func filter) { - if(!timeout.HasValue) { - timeout = TimeSpan.FromMilliseconds(int.MaxValue-1); + var fnd = find(filter).TryFirst(); + return fnd?.security; + } + + public async Task find_security_async(Func filter, TimeSpan? timeout = null) + { + if (!timeout.HasValue) + { + timeout = TimeSpan.FromMilliseconds(10000); } CancellationTokenSource src = new CancellationTokenSource(timeout.Value); - Security security = await Task.Run(async () => + SecurityImmutable? security = await Task.Run(async () => { - Security sec = null; + SecurityImmutable? sec = null; do { sec = find_security(filter); @@ -117,195 +188,11 @@ namespace bts.api.md while (sec == null); return sec; }, src.Token); - + return security ?? throw new KeyNotFoundException("Can't find security for filter"); ; } - public IObservable subscribe(Product product, - TimeSpan? update_interval = null, IScheduler scheduler = null) - { - return subscribe(product, _all_flags, update_interval, scheduler); - } - - public IObservable subscribe(Product product, uint flags, - TimeSpan? update_interval = null, IScheduler scheduler = null) - { - check_subscriptions(flags, x => - (x.Exchange == product.Exchange && x.Type == product.Type && x.Symbol == product.Symbol)); - return _subscribe( - x => (x.Exchange == product.Exchange && ((SecurityImmutable)x).security_type() == product.Type && x.Symbol == product.Symbol), - update_interval, - scheduler); - } - - IObservable _subscribe(Func filter, - TimeSpan? update_interval = null, IScheduler scheduler = null) - { - Data[] slots = new Data[0]; long local_security_count = 0; - return timer_pump((last_update, observer) => - { - //if the number of securities has changed, or this is the first call - if (slots.Length == 0 || local_security_count != _data.Count) - slots = _data.Values.Where(xx => filter(xx.data.Security)).ToArray(); - foreach (var slot in slots) - { - Data data; - if (_data.TryGetValue(slot.data.Security.Id, out data)) - { - if (data.last_update_time > last_update) - observer.OnNext(data); - } - } - }, - update_interval, scheduler).Select(x => x.data); - } - - /// - /// Poll for updates for a security on a specified update_interval, on the specified scheduler with default flags - /// - /// - /// - /// - /// - public IObservable subscribe(Security security, - TimeSpan? update_interval = null, IScheduler scheduler = null) - { - return subscribe(security, _all_flags, update_interval, scheduler); - } - - /// - /// Poll for updates for a security on a specified update_interval, on the specified scheduler - /// - /// - /// - /// - /// - /// - public IObservable subscribe(Security security, uint flags, - TimeSpan? update_interval = null, IScheduler scheduler = null) - { - check_subscriptions(flags, x => - (x.Exchange == security.Exchange && x.Type == ((SecurityImmutable)security).security_type() && security.Symbol == security.Symbol)); - return timer_pump( (last_update, observer) => - { - Data data; - if (_data.TryGetValue(security.Id, out data)) - { - if (data.last_update_time > last_update) - observer.OnNext(data); - } - }, - update_interval, scheduler).Select(x => x.data); - } - - IObservable timer_pump(Action> tick, TimeSpan? interval, IScheduler scheduler = null) - { - if(!interval.HasValue) - interval = TimeSpan.FromMilliseconds(25); - long last_update_time = 0; - return Observable.Create(observer => - { - return Observable.Timer(interval.Value, interval.Value, scheduler ?? Scheduler.Default).Subscribe(_ => - { - tick(last_update_time, observer); - last_update_time = DateTime.UtcNow.Ticks; - }); - }); - } - - bool check_subscriptions(uint flags, Func selector) - { - foreach (var sub in _subscription.Channels) - { - if (selector(sub)) - { - sub.Flags |= flags; - return true; - } - } - return false; - } - - /// - /// Start pumping market data for all subscribed channels and securities. Call this without await - /// - /// - /// - public async Task start_pump(TimeSpan? interval = null) - { - var rep = await _md.Value.request_names_async(new VoidMessage()); - int count = 0; - do - { - foreach (var s in rep.value.Securities) - { - foreach (var ss in s.Names) - { - _security_desc_to_key[ss.Value] = ss.Key; - _security_key_to_desc[ss.Key] = ss.Value; - } - } - } - while (!rep.success && count++ < 5); - while (true) - { - var reply = await _md.Value.requestmd_async(_subscription); - if (reply.success) - { - foreach (var channel in reply.value.Channels) - { - long now = DateTime.UtcNow.Ticks; - foreach (var update in channel.Updates) - { - Data data; - if (_data.TryGetValue(update.Security.Id, out data)) - { - //mergefrom concats repeated fields - if (update.Direct != null) - data.data.Direct = null; - //this can tear, but the book won't tear, so maybe it's ok - data.data.MergeFrom(update); - data.last_update_time = now; - } - else - { - _data[update.Security.Id] = new Data() { last_update_time = now, data = update }; - } - } - } - await Task.Delay(interval ?? TimeSpan.FromMilliseconds(100), _cts.Token); - } - } - } - - Task _pump_task; - public void run_pump(TimeSpan? interval = null) - { - if (_pump_task == null) - { - _pump_task = this.start_pump(interval) - .ContinueWith(ex => - { - System.Diagnostics.Debug.Assert(ex == null, ex.ToString()); - } - , TaskContinuationOptions.OnlyOnFaulted); - } - } - - public async void run_pump_async(TimeSpan? interval = null) - { - await this.start_pump(interval); - } - - - readonly CancellationTokenSource _cts = new CancellationTokenSource(); - public void Dispose() - { - _cts.Cancel(); - _cts.Dispose(); - if (_md.IsValueCreated) - _md.Value.Dispose(); - } + #endregion } } diff --git a/src/client/spark_api/md/PriceSize.cs b/src/client/spark_api/md/PriceSize.cs new file mode 100644 index 000000000..451b64d7f --- /dev/null +++ b/src/client/spark_api/md/PriceSize.cs @@ -0,0 +1,20 @@ +using bts.api; +using mbts.co2; + +namespace bts.md +{ + public class PriceSize + { + public uint size { get; } + public uint direct_size { get; } + public uint implied_size { get; } + public double price { get; } + public PriceSize(uint sz, uint direct_sz, uint implied_sz, double prx) + { + size = sz; + direct_size = direct_sz; + implied_size = implied_sz; + price = prx; + } + } +} \ No newline at end of file diff --git a/src/client/spark/view/Spark/Core/SecurityMD.cs b/src/client/spark_api/md/SecurityMD.cs similarity index 94% rename from src/client/spark/view/Spark/Core/SecurityMD.cs rename to src/client/spark_api/md/SecurityMD.cs index d059f7d07..d4ce00c1b 100644 --- a/src/client/spark/view/Spark/Core/SecurityMD.cs +++ b/src/client/spark_api/md/SecurityMD.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace mbts.spark { +namespace mbts { struct SecurityMD : IEquatable { public SecurityImmutable security { get; } public MDConsumerHandle md { get; } diff --git a/src/client/spark_api/utils/APIExtensions.cs b/src/client/spark_api/utils/APIExtensions.cs index d1300fab5..f5382b424 100644 --- a/src/client/spark_api/utils/APIExtensions.cs +++ b/src/client/spark_api/utils/APIExtensions.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Threading.Tasks; namespace mbts { @@ -26,6 +27,8 @@ namespace mbts public static string fmt(this string input, params object[] vals) { return string.Format(input, vals); - } + } + + public static void ignore(this Task t) { } } } \ No newline at end of file diff --git a/src/client/spark_api/md/Authenticator.cs b/src/client/spark_api/utils/Authenticator.cs similarity index 100% rename from src/client/spark_api/md/Authenticator.cs rename to src/client/spark_api/utils/Authenticator.cs diff --git a/src/client/spark_api/md/LazyAsync.cs b/src/client/spark_api/utils/LazyAsync.cs similarity index 90% rename from src/client/spark_api/md/LazyAsync.cs rename to src/client/spark_api/utils/LazyAsync.cs index c83dd4095..6203dacd9 100644 --- a/src/client/spark_api/md/LazyAsync.cs +++ b/src/client/spark_api/utils/LazyAsync.cs @@ -2,7 +2,7 @@ using System; using System.Threading.Tasks; -namespace bts +namespace bts.utils { public class AsyncLazy : Lazy> { diff --git a/src/client/spark_api/md/Locator.cs b/src/client/spark_api/utils/Locator.cs similarity index 100% rename from src/client/spark_api/md/Locator.cs rename to src/client/spark_api/utils/Locator.cs diff --git a/src/client/spark_excel/rtd/subscriptions/MDSubscribe.cs b/src/client/spark_excel/rtd/subscriptions/MDSubscribe.cs index cdfc364b4..712cc5e91 100644 --- a/src/client/spark_excel/rtd/subscriptions/MDSubscribe.cs +++ b/src/client/spark_excel/rtd/subscriptions/MDSubscribe.cs @@ -7,7 +7,7 @@ using ExcelDna.Integration.Rtd; using ExcelDna.Registration.Utils; using System.Reactive.Linq; using bts.api; -using bts.api.md; +using bts.md; using bts.api.orderman; namespace bts.excel.rtd @@ -21,11 +21,7 @@ namespace bts.excel.rtd try { var toke = await _auth.login(login, password); - foreach (var ven in MarketDataClient.cached_exchanges) - { - MarketDataClient.create_or_get(ven, out MarketDataClient md); - md?.set_auth_token(toke); - } + _md.set_auth_token(toke); handle.SetResult(toke?.Token ?? "Could not log in check user/pass"); } catch(Exception ex) @@ -34,12 +30,10 @@ namespace bts.excel.rtd } } + static MarketDataClient _md = new MarketDataClient(); public static MarketDataClient market_data(api.Venue exchange) { - var newc = MarketDataClient.create_or_get(exchange, out MarketDataClient md); - if(newc) - md.run_pump_async(TimeSpan.FromMilliseconds(333)); - return md; + return _md; } static public object spark_lookup_security_desc(string exchange, long security_key) From fd85f0507cab969a3a202dff0ac8077a37b2dd15 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Sat, 8 Dec 2018 10:54:28 -0500 Subject: [PATCH 061/107] added _keep_hedging_path_hot to keep calling compute hedge on book update --- .../orders/spreader_orders/SpreaderOrder.cpp | 44 +- .../orders/spreader_orders/SpreaderOrder.h | 1 + .../spreader/hedger/UnhedgedDelta.cpp | 4 +- .../spreader/hedger/UnhedgedDelta.h | 2 +- .../spreader_orders/tests/spreader_tests.cpp | 5920 ++++++++--------- 5 files changed, 3002 insertions(+), 2969 deletions(-) diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp index 3b41a9f35..f27d818d7 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp @@ -104,6 +104,7 @@ void SpreaderOrder::_on_book_update(const BookUpdateEvent& book_event){ auto trace = book_event.trace; trace.spreader_on_book = utils::TimeStamp::now(); _state_worker->on_book (book_event.book,trace); + _keep_hedging_path_hot (); } void SpreaderOrder::_on_settlement_update(const SettlementUpdateEvent& settlement_event){ @@ -323,12 +324,14 @@ void SpreaderOrder::_send_hedge(size_t hedge_leg_index, LOG(OrderMan, Info, "SpreaderOrder::_send_hedge key:{} hedge_leg_index:{} " "hedge_price:{} hedge_qty:{} cid:{}", key(), hedge_leg_index, hedge_price, hedge_qty, trace.md_sn); - SingleFillHedger& hedger = _bookkeeping_data().add_new_hedger (*this, - hedge_leg_index, - hedge_price, - hedge_qty, - trace); - hedger.init (); + if (hedge_qty.value() > 0){ + SingleFillHedger& hedger = _bookkeeping_data().add_new_hedger (*this, + hedge_leg_index, + hedge_price, + hedge_qty, + trace); + hedger.init (); + } } void SpreaderOrder::_compute_hedge_price_quantity(size_t filled_leg_index, Price fill_price, @@ -444,4 +447,33 @@ Price SpreaderOrder::_compute_effective_price (Price input_price){ else return input_price; } +void SpreaderOrder::_keep_hedging_path_hot(){ + if (_inited()){ + SpreaderBookkeepingData& d=_bookkeeping_data(); + for (size_t i=0; i 0){ + for(size_t j=0; j= 1){ rv = std::floor(qty); - _qty = qty-rv; + _qty = qty-mult*rv; } return rv; } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.h index 5f4bf2638..06bddd97c 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.h @@ -20,6 +20,6 @@ public: // if >= 1 unhedged delta is available, it // subtracts the integer part and returns it. // else returns 0 - uint32_t subtract_hedge_if_available(); + uint32_t subtract_hedge_if_available(double mult=1); }; }} \ No newline at end of file diff --git a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp index 78a299e3f..d783ed598 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp +++ b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp @@ -10,2693 +10,2693 @@ namespace orderman { // filled qty // reduced quantity due to other legs // output price, qty -TEST_CASE ("quoter price quantity state", "[spreader]") -{ - // construction - ContractLeg leg_1; - fill_future_contract_leg (leg_1, 0, "ES", bts::api::Venue::VENUE_GLBX, 2017, 12, 15, 1, 1, api::Side::SIDE_BUY, 1.0, 0.25); - LegPropertyData leg_prop_data_1 = create_leg_property_data (leg_1, 0, 1.0, true, 2.0); - ChildOrder empty_order; - SpreaderChildOrderState order(empty_order, leg_prop_data_1.leg_security_key(),false,true); - QuoteLegPriceQuantityState s (Price (-1.0), Quantity (200), order); - REQUIRE (s.target_spread_price() == Price (-1.0)); - REQUIRE (s.target_leg_quantity() == Quantity (200)); - REQUIRE (s.aggregated_filled_quantity() == Quantity (0)); - REQUIRE (s.aggregated_hedged_reduction() == Quantity (0)); - REQUIRE (s.remaining_to_fill() == Quantity (200)); - REQUIRE (s.out_price() == Price (0.0)); - REQUIRE (s.out_quantity() == Quantity (0)); - // add fills - on_order_update (order, api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (25), Price (2000)); - REQUIRE (s.target_spread_price() == Price (-1.0)); - REQUIRE (s.target_leg_quantity() == Quantity (200)); - REQUIRE (s.aggregated_filled_quantity() == Quantity (25)); - REQUIRE (s.aggregated_hedged_reduction() == Quantity (0)); - REQUIRE (s.remaining_to_fill() == Quantity (175)); - REQUIRE (s.out_price() == Price (0.0)); - REQUIRE (s.out_quantity() == Quantity (0)); - // // add hedged reduction - s.add_hedged_reduction (Quantity(15)); - s.add_hedged_reduction (Quantity(5)); - s.add_hedged_reduction (Quantity(30)); - REQUIRE (s.target_spread_price() == Price (-1.0)); - REQUIRE (s.target_leg_quantity() == Quantity (200)); - REQUIRE (s.aggregated_filled_quantity() == Quantity (25)); - REQUIRE (s.aggregated_hedged_reduction() == Quantity (50)); - REQUIRE (s.remaining_to_fill() == Quantity (125)); - REQUIRE (s.out_price() == Price (0.0)); - REQUIRE (s.out_quantity() == Quantity (0)); - // set out price and quantity - PerfTrace dont_care; - bts::TimeStamp ts; - order.place_order(Price (-0.35), Quantity (123),ts,dont_care); - REQUIRE (s.target_spread_price() == Price (-1.0)); - REQUIRE (s.target_leg_quantity() == Quantity (200)); - REQUIRE (s.aggregated_filled_quantity() == Quantity (25)); - REQUIRE (s.aggregated_hedged_reduction() == Quantity (50)); - REQUIRE (s.remaining_to_fill() == Quantity (125)); - REQUIRE (s.out_price() == Price (-0.35)); - REQUIRE (s.out_quantity() == Quantity (123)); - // change target price / quantity - s.update_target_price_quantity (s.target_spread_price(), Quantity (105)); - REQUIRE (s.target_spread_price() == Price (-1.0)); - REQUIRE (s.target_leg_quantity() == Quantity (105)); - REQUIRE (s.aggregated_filled_quantity() == Quantity (25)); - REQUIRE (s.aggregated_hedged_reduction() == Quantity (50)); - REQUIRE (s.remaining_to_fill() == Quantity (30)); - REQUIRE (s.out_price() == Price (-0.35)); - REQUIRE (s.out_quantity() == Quantity (123)); - // make the hedges go over - s.add_hedged_reduction (Quantity(35)); - REQUIRE (s.target_spread_price() == Price (-1.0)); - REQUIRE (s.target_leg_quantity() == Quantity (105)); - REQUIRE (s.aggregated_filled_quantity() == Quantity (25)); - REQUIRE (s.aggregated_hedged_reduction() == Quantity (85)); - REQUIRE (s.remaining_to_fill() == Quantity (0)); - REQUIRE (s.out_price() == Price (-0.35)); - REQUIRE (s.out_quantity() == Quantity (123)); - // make the fills go over - //s.add_filled_quantity (Quantity(15)); - on_order_update (order, api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (40), Price (2000)); - REQUIRE (s.target_spread_price() == Price (-1.0)); - REQUIRE (s.target_leg_quantity() == Quantity (105)); - REQUIRE (s.aggregated_filled_quantity() == Quantity (40)); - REQUIRE (s.aggregated_hedged_reduction() == Quantity (85)); - REQUIRE (s.remaining_to_fill() == Quantity (0)); - REQUIRE (s.out_price() == Price (-0.35)); - REQUIRE (s.out_quantity() == Quantity (123)); - SECTION("test cycle_back") - { - SpreaderChildOrderState order_2(empty_order, leg_prop_data_1.leg_security_key(),false,true); - QuoteLegPriceQuantityState s (Price (-1.0), Quantity (200),order_2); - REQUIRE (s.target_spread_price() == Price (-1.0)); - REQUIRE (s.target_leg_quantity() == Quantity (200)); - REQUIRE (s.aggregated_filled_quantity() == Quantity (0)); - REQUIRE (s.aggregated_hedged_reduction() == Quantity (0)); - REQUIRE (s.remaining_to_fill() == Quantity (200)); - REQUIRE (s.out_price() == Price (0.0)); - REQUIRE (s.out_quantity() == Quantity (0)); - // add fills - on_order_update (order_2, api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (40), Price (2000)); - // add hedge reductions - s.add_hedged_reduction (Quantity(5)); - s.add_hedged_reduction (Quantity(15)); - // set out values - PerfTrace dont_care; - bts::TimeStamp ts; - order_2.place_order (Price(1), Quantity (50),ts,dont_care); - REQUIRE (s.target_spread_price() == Price (-1.0)); - REQUIRE (s.target_leg_quantity() == Quantity (200)); - REQUIRE (s.aggregated_filled_quantity() == Quantity (40)); - REQUIRE (s.aggregated_hedged_reduction() == Quantity (20)); - REQUIRE (s.remaining_to_fill() == Quantity (140)); - REQUIRE (s.out_price() == Price (1.0)); - REQUIRE (s.out_quantity() == Quantity (50)); - // // now cycle it back - order_2.re_init(); - REQUIRE (s.target_spread_price() == Price (-1.0)); - REQUIRE (s.target_leg_quantity() == Quantity (200)); - REQUIRE (s.aggregated_filled_quantity() == Quantity (0)); - REQUIRE (s.aggregated_hedged_reduction() == Quantity (20)); - REQUIRE (s.remaining_to_fill() == Quantity (140)); - REQUIRE (s.out_price() == Price (0.0)); - REQUIRE (s.out_quantity() == Quantity (0)); - // // now make sure everything is good after the cycle_back - on_order_update (order_2, api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (10), Price (2000)); - s.add_hedged_reduction (Quantity(3)); - s.add_hedged_reduction (Quantity(7)); - order_2.place_order (Price(0.75), Quantity (50),ts,dont_care); - REQUIRE (s.target_spread_price() == Price (-1.0)); - REQUIRE (s.target_leg_quantity() == Quantity (200)); - REQUIRE (s.aggregated_filled_quantity() == Quantity (10)); - REQUIRE (s.aggregated_hedged_reduction() == Quantity (30)); - REQUIRE (s.remaining_to_fill() == Quantity (120)); - REQUIRE (s.out_price() == Price (0.75)); - REQUIRE (s.out_quantity() == Quantity (50)); - } -} -// tests spread_qty -> leg_qty and leg_2_qty -> leg_1_qty -TEST_CASE ("test_leg_quantity_normalization", "[spreader]") -{ - int n_runs = 20; - for (int i = 0; i < n_runs; i++) - { - double leg_mult = gen_rand(-5.0, 2.0); - uint32_t spr_qty = gen_rand(0, 100); - std::string symbol = "ES"; - ContractLeg leg; - fill_future_contract_leg (leg, 0, symbol, bts::api::Venue::VENUE_GLBX, 2018, 12, 15, leg_mult, leg_mult, api::Side::SIDE_BUY, 1.0, 0.25); - QuoteParams qp; - fill_quote_params(qp, 1.0); - LegSpreaderParams lsp; - fill_leg_spreader_params (lsp, 1.0, true, qp); - bts::api::orderman::OrderDefinition order_def; - LegPropertyData leg_prop_data (0, leg, lsp, api::Side::SIDE_BUY, order_def, order_def); - Quantity calc_value = SpreaderUtils::get_leg_quantity_from_spreader_quantity (leg_prop_data, Quantity (spr_qty)), - expected_value = Quantity(static_cast (std::round(std::abs(leg_mult * spr_qty)))); - REQUIRE (calc_value == expected_value); - } - for (int i = 0; i < n_runs; i++) - { - double leg_mult_1 = gen_rand(-5.0, 2.0), - leg_mult_2 = gen_rand(-5.0, 2.0); - uint32_t leg_qty = gen_rand(0, 100); - std::string symbol = "ES"; - ContractLeg leg_1, leg_2; - fill_future_contract_leg (leg_1, 0, symbol, bts::api::Venue::VENUE_GLBX, 2017, 12, 15, leg_mult_1, leg_mult_1, api::Side::SIDE_BUY, 1.0, 0.25); - fill_future_contract_leg (leg_2, 1, symbol, bts::api::Venue::VENUE_GLBX, 2018, 3, 15, leg_mult_2, leg_mult_2, api::Side::SIDE_SELL, 1.0, 0.25); - QuoteParams qp_1, qp_2; - fill_quote_params(qp_1, 1.0); - fill_quote_params(qp_2, 1.0); - LegSpreaderParams lsp_1, lsp_2; - fill_leg_spreader_params (lsp_1, 1.0, true, qp_1); - fill_leg_spreader_params (lsp_2, 1.0, true, qp_2); - bts::api::orderman::OrderDefinition order_def; - LegPropertyData leg_prop_data_1 (0, leg_1, lsp_1, api::Side::SIDE_BUY,order_def,order_def); - LegPropertyData leg_prop_data_2 (1, leg_2, lsp_2, api::Side::SIDE_BUY,order_def,order_def); - Quantity calc_value = SpreaderUtils::get_leg_quantity_from_another_leg_quantity (leg_prop_data_1, Quantity(leg_qty), leg_prop_data_2), - expected_value = Quantity(static_cast (std::round(std::abs(leg_qty * leg_mult_2 / leg_mult_1)))); - REQUIRE (calc_value == expected_value); - } -} -// given a qty, traverses the book to find the level -// where the accumulated qty >= given qty -TEST_CASE ("book traversal", "[spreader]") -{ - Price calc_price; - Quantity calc_quantity; - SECTION("test level 1 sell") - { - bts::orderman::Book book; - uint16_t sizes[] = { 11, 13, 17, 19, 23 }; - double prices[] = { 2500.25, 2500.50, 2501, 2502, 2503 }; - fill_book (book, prices, sizes, bts::api::Side::SIDE_SELL); - SpreaderUtils::traverse_depth_for_quantity (book, bts::api::Side::SIDE_SELL, Quantity (7), calc_price, calc_quantity); - REQUIRE (calc_price == Price (2500.25)); - REQUIRE (calc_quantity == Quantity (7)); - SpreaderUtils::traverse_depth_for_quantity (book, bts::api::Side::SIDE_BUY, Quantity (7), calc_price, calc_quantity); - REQUIRE (calc_quantity == Quantity (0)); - } - SECTION("test level 2 sell") - { - bts::orderman::Book book; - uint16_t sizes[] = { 23, 1, 17, 19, 23 }; - double prices[] = { 2500.25, 2500.75, 2501, 2502, 2503 }; - fill_book (book, prices, sizes, bts::api::Side::SIDE_SELL); - SpreaderUtils::traverse_depth_for_quantity (book, bts::api::Side::SIDE_SELL, Quantity (24), calc_price, calc_quantity); - REQUIRE (calc_price == Price (2500.75)); - REQUIRE (calc_quantity == Quantity (24)); - SpreaderUtils::traverse_depth_for_quantity (book, bts::api::Side::SIDE_BUY, Quantity (7), calc_price, calc_quantity); - REQUIRE (calc_quantity == Quantity (0)); - } - SECTION("test req_qty == book sell") - { - bts::orderman::Book book; - uint16_t sizes[] = { 23, 1, 16, 33, 27 }; - double prices[] = { 2500.25, 2500.75, 2501, 2502, 2503 }; - fill_book (book, prices, sizes, bts::api::Side::SIDE_SELL); - SpreaderUtils::traverse_depth_for_quantity (book, bts::api::Side::SIDE_SELL, Quantity (100), calc_price, calc_quantity); - REQUIRE (calc_price == Price (2503)); - REQUIRE (calc_quantity == Quantity (100)); - SpreaderUtils::traverse_depth_for_quantity (book, bts::api::Side::SIDE_BUY, Quantity (7), calc_price, calc_quantity); - REQUIRE (calc_quantity == Quantity (0)); - } - SECTION("test req_qty > book buy") - { - bts::orderman::Book book; - uint16_t sizes[] = { 13, 11, 16, 33, 27 }; - double prices[] = { 2500.25, 2500, 2499, 2498, 2497}; - fill_book (book, prices, sizes, bts::api::Side::SIDE_BUY); - SpreaderUtils::traverse_depth_for_quantity (book, bts::api::Side::SIDE_BUY, Quantity (200), calc_price, calc_quantity); - REQUIRE (calc_price == Price (2497)); - REQUIRE (calc_quantity == Quantity (100)); - SpreaderUtils::traverse_depth_for_quantity (book, bts::api::Side::SIDE_SELL, Quantity (7), calc_price, calc_quantity); - REQUIRE (calc_quantity == Quantity (0)); - } - SECTION("test_5 buy") - { - // empty book - bts::orderman::Book book; - uint16_t sizes[] = { 0, 0, 0, 0, 0 }; - double prices[] = { 2500.00, 2500.25, 2500.50, 2500.75, 2501 }; - fill_book (book, prices, sizes, bts::api::Side::SIDE_BUY); - SpreaderUtils::traverse_depth_for_quantity (book, bts::api::Side::SIDE_BUY, Quantity (1), calc_price, calc_quantity); - REQUIRE (calc_quantity == Quantity (0)); - SpreaderUtils::traverse_depth_for_quantity (book, bts::api::Side::SIDE_SELL, Quantity (7), calc_price, calc_quantity); - REQUIRE (calc_quantity == Quantity (0)); - } -} -//this is how the spreader organizes the data -TEST_CASE ("spreader bookkeeping data", "[spreader]") -{ - bts::orderman::OrderKey order_key(0); - // constants - double leg_mult_1 = -1.25, leg_mult_2 = 3.33, leg_mult_3 = -1.75; - std::string symbol_1 = "ES", symbol_2 = "ZN", symbol_3 = "GC"; - uint32_t sec_key_1 = 1111, sec_key_2 = 2222, sec_key_3 = 3333; - double lean_ratio_1 = 1.33, lean_ratio_2 = 5.0, lean_ratio_3 = 2.75; - double price_mult_1 = -2.5, price_mult_2 = 5.0, price_mult_3 = -3.33; - Price spread_price (-0.35); - Quantity spread_quantity (125); - OrderKey order_key_1 (4), order_key_2 (22), order_key_3 (2007); - // security - ContractLeg leg_1, leg_2, leg_3; - fill_future_contract_leg (leg_1, sec_key_1, symbol_1, bts::api::Venue::VENUE_GLBX, 2017, 12, 15, leg_mult_1, price_mult_1, api::Side::SIDE_SELL, 1.0, 0.25); - fill_future_contract_leg (leg_2, sec_key_2, symbol_2, bts::api::Venue::VENUE_GLBX, 2018, 3, 15, leg_mult_2, price_mult_2, api::Side::SIDE_BUY, 1.0, 0.03125); - fill_future_contract_leg (leg_3, sec_key_3, symbol_3, bts::api::Venue::VENUE_GLBX, 2018, 6, 15, leg_mult_3, price_mult_3, api::Side::SIDE_SELL, 1.0, 0.05); - std::vector contract_legs; - contract_legs.push_back(leg_1);contract_legs.push_back(leg_2);contract_legs.push_back(leg_3); - Security synthetic_security; - fill_synthetic_security (synthetic_security, 2000, "synthetic_security", contract_legs); - // execution params/order def - LegSpreaderParams lsp_1, lsp_2, lsp_3; - fill_leg_spreader_params(lsp_1, price_mult_1, true, lean_ratio_1);fill_leg_spreader_params(lsp_2, price_mult_2, true, lean_ratio_2);fill_leg_spreader_params(lsp_3, price_mult_3, true, lean_ratio_3); - std::vector spreader_params; - spreader_params.push_back(lsp_1);spreader_params.push_back(lsp_2);spreader_params.push_back(lsp_3); - bts::api::orderman::OrderDefinition order_def; - fill_spreader_order_definition(order_def, Side::SIDE_BUY, synthetic_security, spreader_params); - // putting it together in SpreaderBookkeepingData - SpreaderPreActivationOrderServices::TestOnlySpreaderPreActivationOrderServices testonly_spreader_pao_services = _create_spreader_pao_services(synthetic_security); - SpreaderPreActivationOrderServices pao_services (&testonly_spreader_pao_services); - std::vector leg_props; - SpreaderUtils::resolve_synthetic_spread(pao_services, order_def, leg_props); - SpreaderManagerForTest spreader_manager (order_key, order_def, pao_services, leg_props); - SpreaderBookkeepingData& bookkeeping_data = spreader_manager.bookkeeping_data(); - SECTION("verify security key access") - { - SpreaderLegData& res_3 = bookkeeping_data.get_leg_data (SecurityKey (sec_key_3)); - verify_leg_data (res_3, order_key, 2, sec_key_3, 2018, 6, 15, symbol_3, leg_mult_3, price_mult_3, api::Side::SIDE_SELL); - SpreaderLegData& res_2 = bookkeeping_data.get_leg_data (SecurityKey (sec_key_2)); - verify_leg_data (res_2, order_key, 1, sec_key_2, 2018, 3, 15, symbol_2, leg_mult_2, price_mult_2, api::Side::SIDE_BUY); - SpreaderLegData& res_1 = bookkeeping_data.get_leg_data (SecurityKey (sec_key_1)); - verify_leg_data (res_1, order_key, 0, sec_key_1, 2017, 12, 15, symbol_1, leg_mult_1, price_mult_1, api::Side::SIDE_SELL); - } - SECTION("verify index access") - { - SpreaderLegData& res_3 = bookkeeping_data.get_leg_data (2); - verify_leg_data (res_3, bts::orderman::OrderKey(0), 2, sec_key_3, 2018, 6, 15, symbol_3, leg_mult_3, price_mult_3, api::Side::SIDE_SELL); - SpreaderLegData& res_2 = bookkeeping_data.get_leg_data (1); - verify_leg_data (res_2, bts::orderman::OrderKey(0), 1, sec_key_2, 2018, 3, 15, symbol_2, leg_mult_2, price_mult_2, api::Side::SIDE_BUY); - SpreaderLegData& res_1 = bookkeeping_data.get_leg_data (0); - verify_leg_data (res_1, bts::orderman::OrderKey(0), 0, sec_key_1, 2017, 12, 15, symbol_1, leg_mult_1, price_mult_1, api::Side::SIDE_SELL); - } - // // SECTION("verify order key access") - // // { - // // SpreaderLegData* res_3 = bookkeeping_data.find_leg_from_quoter_orderkey (order_key_3); - // // REQUIRE (res_3 != nullptr); - // // verify_leg_data (*res_3, order_key_3, 2, sec_key_3, 2018, 6, 15, symbol_3, leg_mult_3, price_mult_3, api::Side::SIDE_SELL); - // // SpreaderLegData* res_2 = bookkeeping_data.find_leg_from_quoter_orderkey (order_key_2); - // // REQUIRE (res_2 != nullptr); - // // verify_leg_data (*res_2, order_key_2, 1, sec_key_2, 2018, 3, 15, symbol_2, leg_mult_2, price_mult_2, api::Side::SIDE_BUY); - // // SpreaderLegData* res_1 = bookkeeping_data.find_leg_from_quoter_orderkey (order_key_1); - // // REQUIRE (res_1 != nullptr); - // // verify_leg_data (*res_1, order_key_1, 0, sec_key_1, 2017, 12, 15, symbol_1, leg_mult_1, price_mult_1, api::Side::SIDE_SELL); - // // } -} -// // quote price and quantity for a 2 legged spread -TEST_CASE ("compute quoting price quantity 2 legs", "[spreader]") -{ - Price spreader_price (1.0); Quantity spreader_quantity (10); - Price out_price; Quantity out_quantity; - // simple buy 1 sell 1 spreader (same ratio) - ContractLeg leg_1, leg_2; - SECTION("basic ") - { - fill_future_contract_leg (leg_1, 0, "ES", bts::api::Venue::VENUE_GLBX, 2017, 12, 15, 1, 1, api::Side::SIDE_BUY, 1.0, 0.25); - fill_future_contract_leg (leg_2, 0, "ES", bts::api::Venue::VENUE_GLBX, 2017, 3, 15, -1, -1, api::Side::SIDE_SELL, 1.0, 0.25); - LegPropertyData leg_prop_data_1 = create_leg_property_data (leg_1, 0, 1.0, true, 2.0); - LegPropertyData leg_prop_data_2 = create_leg_property_data (leg_2, 1, -1.0, true, 2.0); - // md - bts::orderman::Book book_1, book_2; - double bid_prices_1[] = {2500.0, 2499.75, 2499.5, 2499, 2498}; - uint16_t bid_sizes_1[] = {11, 25, 45, 6, 99}; - double ask_prices_1[] = {2500.25, 2500.50, 2500.75, 2501, 2502}; - uint16_t ask_sizes_1[] = {13, 12, 45, 5, 15}; +// TEST_CASE ("quoter price quantity state", "[spreader]") +// { +// // construction +// ContractLeg leg_1; +// fill_future_contract_leg (leg_1, 0, "ES", bts::api::Venue::VENUE_GLBX, 2017, 12, 15, 1, 1, api::Side::SIDE_BUY, 1.0, 0.25); +// LegPropertyData leg_prop_data_1 = create_leg_property_data (leg_1, 0, 1.0, true, 2.0); +// ChildOrder empty_order; +// SpreaderChildOrderState order(empty_order, leg_prop_data_1.leg_security_key(),false,true); +// QuoteLegPriceQuantityState s (Price (-1.0), Quantity (200), order); +// REQUIRE (s.target_spread_price() == Price (-1.0)); +// REQUIRE (s.target_leg_quantity() == Quantity (200)); +// REQUIRE (s.aggregated_filled_quantity() == Quantity (0)); +// REQUIRE (s.aggregated_hedged_reduction() == Quantity (0)); +// REQUIRE (s.remaining_to_fill() == Quantity (200)); +// REQUIRE (s.out_price() == Price (0.0)); +// REQUIRE (s.out_quantity() == Quantity (0)); +// // add fills +// on_order_update (order, api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (25), Price (2000)); +// REQUIRE (s.target_spread_price() == Price (-1.0)); +// REQUIRE (s.target_leg_quantity() == Quantity (200)); +// REQUIRE (s.aggregated_filled_quantity() == Quantity (25)); +// REQUIRE (s.aggregated_hedged_reduction() == Quantity (0)); +// REQUIRE (s.remaining_to_fill() == Quantity (175)); +// REQUIRE (s.out_price() == Price (0.0)); +// REQUIRE (s.out_quantity() == Quantity (0)); +// // // add hedged reduction +// s.add_hedged_reduction (Quantity(15)); +// s.add_hedged_reduction (Quantity(5)); +// s.add_hedged_reduction (Quantity(30)); +// REQUIRE (s.target_spread_price() == Price (-1.0)); +// REQUIRE (s.target_leg_quantity() == Quantity (200)); +// REQUIRE (s.aggregated_filled_quantity() == Quantity (25)); +// REQUIRE (s.aggregated_hedged_reduction() == Quantity (50)); +// REQUIRE (s.remaining_to_fill() == Quantity (125)); +// REQUIRE (s.out_price() == Price (0.0)); +// REQUIRE (s.out_quantity() == Quantity (0)); +// // set out price and quantity +// PerfTrace dont_care; +// bts::TimeStamp ts; +// order.place_order(Price (-0.35), Quantity (123),ts,dont_care); +// REQUIRE (s.target_spread_price() == Price (-1.0)); +// REQUIRE (s.target_leg_quantity() == Quantity (200)); +// REQUIRE (s.aggregated_filled_quantity() == Quantity (25)); +// REQUIRE (s.aggregated_hedged_reduction() == Quantity (50)); +// REQUIRE (s.remaining_to_fill() == Quantity (125)); +// REQUIRE (s.out_price() == Price (-0.35)); +// REQUIRE (s.out_quantity() == Quantity (123)); +// // change target price / quantity +// s.update_target_price_quantity (s.target_spread_price(), Quantity (105)); +// REQUIRE (s.target_spread_price() == Price (-1.0)); +// REQUIRE (s.target_leg_quantity() == Quantity (105)); +// REQUIRE (s.aggregated_filled_quantity() == Quantity (25)); +// REQUIRE (s.aggregated_hedged_reduction() == Quantity (50)); +// REQUIRE (s.remaining_to_fill() == Quantity (30)); +// REQUIRE (s.out_price() == Price (-0.35)); +// REQUIRE (s.out_quantity() == Quantity (123)); +// // make the hedges go over +// s.add_hedged_reduction (Quantity(35)); +// REQUIRE (s.target_spread_price() == Price (-1.0)); +// REQUIRE (s.target_leg_quantity() == Quantity (105)); +// REQUIRE (s.aggregated_filled_quantity() == Quantity (25)); +// REQUIRE (s.aggregated_hedged_reduction() == Quantity (85)); +// REQUIRE (s.remaining_to_fill() == Quantity (0)); +// REQUIRE (s.out_price() == Price (-0.35)); +// REQUIRE (s.out_quantity() == Quantity (123)); +// // make the fills go over +// //s.add_filled_quantity (Quantity(15)); +// on_order_update (order, api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (40), Price (2000)); +// REQUIRE (s.target_spread_price() == Price (-1.0)); +// REQUIRE (s.target_leg_quantity() == Quantity (105)); +// REQUIRE (s.aggregated_filled_quantity() == Quantity (40)); +// REQUIRE (s.aggregated_hedged_reduction() == Quantity (85)); +// REQUIRE (s.remaining_to_fill() == Quantity (0)); +// REQUIRE (s.out_price() == Price (-0.35)); +// REQUIRE (s.out_quantity() == Quantity (123)); +// SECTION("test cycle_back") +// { +// SpreaderChildOrderState order_2(empty_order, leg_prop_data_1.leg_security_key(),false,true); +// QuoteLegPriceQuantityState s (Price (-1.0), Quantity (200),order_2); +// REQUIRE (s.target_spread_price() == Price (-1.0)); +// REQUIRE (s.target_leg_quantity() == Quantity (200)); +// REQUIRE (s.aggregated_filled_quantity() == Quantity (0)); +// REQUIRE (s.aggregated_hedged_reduction() == Quantity (0)); +// REQUIRE (s.remaining_to_fill() == Quantity (200)); +// REQUIRE (s.out_price() == Price (0.0)); +// REQUIRE (s.out_quantity() == Quantity (0)); +// // add fills +// on_order_update (order_2, api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (40), Price (2000)); +// // add hedge reductions +// s.add_hedged_reduction (Quantity(5)); +// s.add_hedged_reduction (Quantity(15)); +// // set out values +// PerfTrace dont_care; +// bts::TimeStamp ts; +// order_2.place_order (Price(1), Quantity (50),ts,dont_care); +// REQUIRE (s.target_spread_price() == Price (-1.0)); +// REQUIRE (s.target_leg_quantity() == Quantity (200)); +// REQUIRE (s.aggregated_filled_quantity() == Quantity (40)); +// REQUIRE (s.aggregated_hedged_reduction() == Quantity (20)); +// REQUIRE (s.remaining_to_fill() == Quantity (140)); +// REQUIRE (s.out_price() == Price (1.0)); +// REQUIRE (s.out_quantity() == Quantity (50)); +// // // now cycle it back +// order_2.re_init(); +// REQUIRE (s.target_spread_price() == Price (-1.0)); +// REQUIRE (s.target_leg_quantity() == Quantity (200)); +// REQUIRE (s.aggregated_filled_quantity() == Quantity (0)); +// REQUIRE (s.aggregated_hedged_reduction() == Quantity (20)); +// REQUIRE (s.remaining_to_fill() == Quantity (140)); +// REQUIRE (s.out_price() == Price (0.0)); +// REQUIRE (s.out_quantity() == Quantity (0)); +// // // now make sure everything is good after the cycle_back +// on_order_update (order_2, api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (10), Price (2000)); +// s.add_hedged_reduction (Quantity(3)); +// s.add_hedged_reduction (Quantity(7)); +// order_2.place_order (Price(0.75), Quantity (50),ts,dont_care); +// REQUIRE (s.target_spread_price() == Price (-1.0)); +// REQUIRE (s.target_leg_quantity() == Quantity (200)); +// REQUIRE (s.aggregated_filled_quantity() == Quantity (10)); +// REQUIRE (s.aggregated_hedged_reduction() == Quantity (30)); +// REQUIRE (s.remaining_to_fill() == Quantity (120)); +// REQUIRE (s.out_price() == Price (0.75)); +// REQUIRE (s.out_quantity() == Quantity (50)); +// } +// } +// // tests spread_qty -> leg_qty and leg_2_qty -> leg_1_qty +// TEST_CASE ("test_leg_quantity_normalization", "[spreader]") +// { +// int n_runs = 20; +// for (int i = 0; i < n_runs; i++) +// { +// double leg_mult = gen_rand(-5.0, 2.0); +// uint32_t spr_qty = gen_rand(0, 100); +// std::string symbol = "ES"; +// ContractLeg leg; +// fill_future_contract_leg (leg, 0, symbol, bts::api::Venue::VENUE_GLBX, 2018, 12, 15, leg_mult, leg_mult, api::Side::SIDE_BUY, 1.0, 0.25); +// QuoteParams qp; +// fill_quote_params(qp, 1.0); +// LegSpreaderParams lsp; +// fill_leg_spreader_params (lsp, 1.0, true, qp); +// bts::api::orderman::OrderDefinition order_def; +// LegPropertyData leg_prop_data (0, leg, lsp, api::Side::SIDE_BUY, order_def, order_def); +// Quantity calc_value = SpreaderUtils::get_leg_quantity_from_spreader_quantity (leg_prop_data, Quantity (spr_qty)), +// expected_value = Quantity(static_cast (std::round(std::abs(leg_mult * spr_qty)))); +// REQUIRE (calc_value == expected_value); +// } +// for (int i = 0; i < n_runs; i++) +// { +// double leg_mult_1 = gen_rand(-5.0, 2.0), +// leg_mult_2 = gen_rand(-5.0, 2.0); +// uint32_t leg_qty = gen_rand(0, 100); +// std::string symbol = "ES"; +// ContractLeg leg_1, leg_2; +// fill_future_contract_leg (leg_1, 0, symbol, bts::api::Venue::VENUE_GLBX, 2017, 12, 15, leg_mult_1, leg_mult_1, api::Side::SIDE_BUY, 1.0, 0.25); +// fill_future_contract_leg (leg_2, 1, symbol, bts::api::Venue::VENUE_GLBX, 2018, 3, 15, leg_mult_2, leg_mult_2, api::Side::SIDE_SELL, 1.0, 0.25); +// QuoteParams qp_1, qp_2; +// fill_quote_params(qp_1, 1.0); +// fill_quote_params(qp_2, 1.0); +// LegSpreaderParams lsp_1, lsp_2; +// fill_leg_spreader_params (lsp_1, 1.0, true, qp_1); +// fill_leg_spreader_params (lsp_2, 1.0, true, qp_2); +// bts::api::orderman::OrderDefinition order_def; +// LegPropertyData leg_prop_data_1 (0, leg_1, lsp_1, api::Side::SIDE_BUY,order_def,order_def); +// LegPropertyData leg_prop_data_2 (1, leg_2, lsp_2, api::Side::SIDE_BUY,order_def,order_def); +// Quantity calc_value = SpreaderUtils::get_leg_quantity_from_another_leg_quantity (leg_prop_data_1, Quantity(leg_qty), leg_prop_data_2), +// expected_value = Quantity(static_cast (std::round(std::abs(leg_qty * leg_mult_2 / leg_mult_1)))); +// REQUIRE (calc_value == expected_value); +// } +// } +// // given a qty, traverses the book to find the level +// // where the accumulated qty >= given qty +// TEST_CASE ("book traversal", "[spreader]") +// { +// Price calc_price; +// Quantity calc_quantity; +// SECTION("test level 1 sell") +// { +// bts::orderman::Book book; +// uint16_t sizes[] = { 11, 13, 17, 19, 23 }; +// double prices[] = { 2500.25, 2500.50, 2501, 2502, 2503 }; +// fill_book (book, prices, sizes, bts::api::Side::SIDE_SELL); +// SpreaderUtils::traverse_depth_for_quantity (book, bts::api::Side::SIDE_SELL, Quantity (7), calc_price, calc_quantity); +// REQUIRE (calc_price == Price (2500.25)); +// REQUIRE (calc_quantity == Quantity (7)); +// SpreaderUtils::traverse_depth_for_quantity (book, bts::api::Side::SIDE_BUY, Quantity (7), calc_price, calc_quantity); +// REQUIRE (calc_quantity == Quantity (0)); +// } +// SECTION("test level 2 sell") +// { +// bts::orderman::Book book; +// uint16_t sizes[] = { 23, 1, 17, 19, 23 }; +// double prices[] = { 2500.25, 2500.75, 2501, 2502, 2503 }; +// fill_book (book, prices, sizes, bts::api::Side::SIDE_SELL); +// SpreaderUtils::traverse_depth_for_quantity (book, bts::api::Side::SIDE_SELL, Quantity (24), calc_price, calc_quantity); +// REQUIRE (calc_price == Price (2500.75)); +// REQUIRE (calc_quantity == Quantity (24)); +// SpreaderUtils::traverse_depth_for_quantity (book, bts::api::Side::SIDE_BUY, Quantity (7), calc_price, calc_quantity); +// REQUIRE (calc_quantity == Quantity (0)); +// } +// SECTION("test req_qty == book sell") +// { +// bts::orderman::Book book; +// uint16_t sizes[] = { 23, 1, 16, 33, 27 }; +// double prices[] = { 2500.25, 2500.75, 2501, 2502, 2503 }; +// fill_book (book, prices, sizes, bts::api::Side::SIDE_SELL); +// SpreaderUtils::traverse_depth_for_quantity (book, bts::api::Side::SIDE_SELL, Quantity (100), calc_price, calc_quantity); +// REQUIRE (calc_price == Price (2503)); +// REQUIRE (calc_quantity == Quantity (100)); +// SpreaderUtils::traverse_depth_for_quantity (book, bts::api::Side::SIDE_BUY, Quantity (7), calc_price, calc_quantity); +// REQUIRE (calc_quantity == Quantity (0)); +// } +// SECTION("test req_qty > book buy") +// { +// bts::orderman::Book book; +// uint16_t sizes[] = { 13, 11, 16, 33, 27 }; +// double prices[] = { 2500.25, 2500, 2499, 2498, 2497}; +// fill_book (book, prices, sizes, bts::api::Side::SIDE_BUY); +// SpreaderUtils::traverse_depth_for_quantity (book, bts::api::Side::SIDE_BUY, Quantity (200), calc_price, calc_quantity); +// REQUIRE (calc_price == Price (2497)); +// REQUIRE (calc_quantity == Quantity (100)); +// SpreaderUtils::traverse_depth_for_quantity (book, bts::api::Side::SIDE_SELL, Quantity (7), calc_price, calc_quantity); +// REQUIRE (calc_quantity == Quantity (0)); +// } +// SECTION("test_5 buy") +// { +// // empty book +// bts::orderman::Book book; +// uint16_t sizes[] = { 0, 0, 0, 0, 0 }; +// double prices[] = { 2500.00, 2500.25, 2500.50, 2500.75, 2501 }; +// fill_book (book, prices, sizes, bts::api::Side::SIDE_BUY); +// SpreaderUtils::traverse_depth_for_quantity (book, bts::api::Side::SIDE_BUY, Quantity (1), calc_price, calc_quantity); +// REQUIRE (calc_quantity == Quantity (0)); +// SpreaderUtils::traverse_depth_for_quantity (book, bts::api::Side::SIDE_SELL, Quantity (7), calc_price, calc_quantity); +// REQUIRE (calc_quantity == Quantity (0)); +// } +// } +// //this is how the spreader organizes the data +// TEST_CASE ("spreader bookkeeping data", "[spreader]") +// { +// bts::orderman::OrderKey order_key(0); +// // constants +// double leg_mult_1 = -1.25, leg_mult_2 = 3.33, leg_mult_3 = -1.75; +// std::string symbol_1 = "ES", symbol_2 = "ZN", symbol_3 = "GC"; +// uint32_t sec_key_1 = 1111, sec_key_2 = 2222, sec_key_3 = 3333; +// double lean_ratio_1 = 1.33, lean_ratio_2 = 5.0, lean_ratio_3 = 2.75; +// double price_mult_1 = -2.5, price_mult_2 = 5.0, price_mult_3 = -3.33; +// Price spread_price (-0.35); +// Quantity spread_quantity (125); +// OrderKey order_key_1 (4), order_key_2 (22), order_key_3 (2007); +// // security +// ContractLeg leg_1, leg_2, leg_3; +// fill_future_contract_leg (leg_1, sec_key_1, symbol_1, bts::api::Venue::VENUE_GLBX, 2017, 12, 15, leg_mult_1, price_mult_1, api::Side::SIDE_SELL, 1.0, 0.25); +// fill_future_contract_leg (leg_2, sec_key_2, symbol_2, bts::api::Venue::VENUE_GLBX, 2018, 3, 15, leg_mult_2, price_mult_2, api::Side::SIDE_BUY, 1.0, 0.03125); +// fill_future_contract_leg (leg_3, sec_key_3, symbol_3, bts::api::Venue::VENUE_GLBX, 2018, 6, 15, leg_mult_3, price_mult_3, api::Side::SIDE_SELL, 1.0, 0.05); +// std::vector contract_legs; +// contract_legs.push_back(leg_1);contract_legs.push_back(leg_2);contract_legs.push_back(leg_3); +// Security synthetic_security; +// fill_synthetic_security (synthetic_security, 2000, "synthetic_security", contract_legs); +// // execution params/order def +// LegSpreaderParams lsp_1, lsp_2, lsp_3; +// fill_leg_spreader_params(lsp_1, price_mult_1, true, lean_ratio_1);fill_leg_spreader_params(lsp_2, price_mult_2, true, lean_ratio_2);fill_leg_spreader_params(lsp_3, price_mult_3, true, lean_ratio_3); +// std::vector spreader_params; +// spreader_params.push_back(lsp_1);spreader_params.push_back(lsp_2);spreader_params.push_back(lsp_3); +// bts::api::orderman::OrderDefinition order_def; +// fill_spreader_order_definition(order_def, Side::SIDE_BUY, synthetic_security, spreader_params); +// // putting it together in SpreaderBookkeepingData +// SpreaderPreActivationOrderServices::TestOnlySpreaderPreActivationOrderServices testonly_spreader_pao_services = _create_spreader_pao_services(synthetic_security); +// SpreaderPreActivationOrderServices pao_services (&testonly_spreader_pao_services); +// std::vector leg_props; +// SpreaderUtils::resolve_synthetic_spread(pao_services, order_def, leg_props); +// SpreaderManagerForTest spreader_manager (order_key, order_def, pao_services, leg_props); +// SpreaderBookkeepingData& bookkeeping_data = spreader_manager.bookkeeping_data(); +// SECTION("verify security key access") +// { +// SpreaderLegData& res_3 = bookkeeping_data.get_leg_data (SecurityKey (sec_key_3)); +// verify_leg_data (res_3, order_key, 2, sec_key_3, 2018, 6, 15, symbol_3, leg_mult_3, price_mult_3, api::Side::SIDE_SELL); +// SpreaderLegData& res_2 = bookkeeping_data.get_leg_data (SecurityKey (sec_key_2)); +// verify_leg_data (res_2, order_key, 1, sec_key_2, 2018, 3, 15, symbol_2, leg_mult_2, price_mult_2, api::Side::SIDE_BUY); +// SpreaderLegData& res_1 = bookkeeping_data.get_leg_data (SecurityKey (sec_key_1)); +// verify_leg_data (res_1, order_key, 0, sec_key_1, 2017, 12, 15, symbol_1, leg_mult_1, price_mult_1, api::Side::SIDE_SELL); +// } +// SECTION("verify index access") +// { +// SpreaderLegData& res_3 = bookkeeping_data.get_leg_data (2); +// verify_leg_data (res_3, bts::orderman::OrderKey(0), 2, sec_key_3, 2018, 6, 15, symbol_3, leg_mult_3, price_mult_3, api::Side::SIDE_SELL); +// SpreaderLegData& res_2 = bookkeeping_data.get_leg_data (1); +// verify_leg_data (res_2, bts::orderman::OrderKey(0), 1, sec_key_2, 2018, 3, 15, symbol_2, leg_mult_2, price_mult_2, api::Side::SIDE_BUY); +// SpreaderLegData& res_1 = bookkeeping_data.get_leg_data (0); +// verify_leg_data (res_1, bts::orderman::OrderKey(0), 0, sec_key_1, 2017, 12, 15, symbol_1, leg_mult_1, price_mult_1, api::Side::SIDE_SELL); +// } +// // // SECTION("verify order key access") +// // // { +// // // SpreaderLegData* res_3 = bookkeeping_data.find_leg_from_quoter_orderkey (order_key_3); +// // // REQUIRE (res_3 != nullptr); +// // // verify_leg_data (*res_3, order_key_3, 2, sec_key_3, 2018, 6, 15, symbol_3, leg_mult_3, price_mult_3, api::Side::SIDE_SELL); +// // // SpreaderLegData* res_2 = bookkeeping_data.find_leg_from_quoter_orderkey (order_key_2); +// // // REQUIRE (res_2 != nullptr); +// // // verify_leg_data (*res_2, order_key_2, 1, sec_key_2, 2018, 3, 15, symbol_2, leg_mult_2, price_mult_2, api::Side::SIDE_BUY); +// // // SpreaderLegData* res_1 = bookkeeping_data.find_leg_from_quoter_orderkey (order_key_1); +// // // REQUIRE (res_1 != nullptr); +// // // verify_leg_data (*res_1, order_key_1, 0, sec_key_1, 2017, 12, 15, symbol_1, leg_mult_1, price_mult_1, api::Side::SIDE_SELL); +// // // } +// } +// // // quote price and quantity for a 2 legged spread +// TEST_CASE ("compute quoting price quantity 2 legs", "[spreader]") +// { +// Price spreader_price (1.0); Quantity spreader_quantity (10); +// Price out_price; Quantity out_quantity; +// // simple buy 1 sell 1 spreader (same ratio) +// ContractLeg leg_1, leg_2; +// SECTION("basic ") +// { +// fill_future_contract_leg (leg_1, 0, "ES", bts::api::Venue::VENUE_GLBX, 2017, 12, 15, 1, 1, api::Side::SIDE_BUY, 1.0, 0.25); +// fill_future_contract_leg (leg_2, 0, "ES", bts::api::Venue::VENUE_GLBX, 2017, 3, 15, -1, -1, api::Side::SIDE_SELL, 1.0, 0.25); +// LegPropertyData leg_prop_data_1 = create_leg_property_data (leg_1, 0, 1.0, true, 2.0); +// LegPropertyData leg_prop_data_2 = create_leg_property_data (leg_2, 1, -1.0, true, 2.0); +// // md +// bts::orderman::Book book_1, book_2; +// double bid_prices_1[] = {2500.0, 2499.75, 2499.5, 2499, 2498}; +// uint16_t bid_sizes_1[] = {11, 25, 45, 6, 99}; +// double ask_prices_1[] = {2500.25, 2500.50, 2500.75, 2501, 2502}; +// uint16_t ask_sizes_1[] = {13, 12, 45, 5, 15}; - double bid_prices_2[] = {2505.0, 2504.75, 2504, 2503.00, 2502.75}; - uint16_t bid_sizes_2[] = {1, 4, 5, 20, 20}; - double ask_prices_2[] = {2505.25, 2506.50, 2507, 2507.5, 2508}; - uint16_t ask_sizes_2[] = {10, 4, 6, 20, 15}; - fill_book (book_1, bid_prices_1, bid_sizes_1, ask_prices_1, ask_sizes_1); - fill_book (book_2, bid_prices_2, bid_sizes_2, ask_prices_2, ask_sizes_2); +// double bid_prices_2[] = {2505.0, 2504.75, 2504, 2503.00, 2502.75}; +// uint16_t bid_sizes_2[] = {1, 4, 5, 20, 20}; +// double ask_prices_2[] = {2505.25, 2506.50, 2507, 2507.5, 2508}; +// uint16_t ask_sizes_2[] = {10, 4, 6, 20, 15}; +// fill_book (book_1, bid_prices_1, bid_sizes_1, ask_prices_1, ask_sizes_1); +// fill_book (book_2, bid_prices_2, bid_sizes_2, ask_prices_2, ask_sizes_2); - SpreaderUtils::compute_price_quantity_2_legs (spreader_price, spreader_quantity, leg_prop_data_1, leg_prop_data_2, book_2, out_price, out_quantity); - REQUIRE (out_price.value() == 2504.00); - REQUIRE (out_quantity.value() == 10); - } - SECTION("lean mult") - { - spreader_quantity = Quantity(5); - spreader_price = Price (-0.5); - double lean_mult = 1.0; - fill_future_contract_leg (leg_1, 0, "ES", bts::api::Venue::VENUE_GLBX, 2017, 12, 15, 1, 1, api::Side::SIDE_BUY, 1.0, 0.25); - fill_future_contract_leg (leg_2, 0, "ES", bts::api::Venue::VENUE_GLBX, 2017, 3, 15, -1, -1, api::Side::SIDE_SELL, 1.0, 0.25); - LegPropertyData leg_prop_data_1 = create_leg_property_data (leg_1, 0, 1.0, true, 1.0); - LegPropertyData leg_prop_data_2 = create_leg_property_data (leg_2, 1, -1.0, true, lean_mult); - // md - bts::orderman::Book book_2; - double bid_prices_2[] = {2505.0, 2504.75, 2504, 2503.00, 2502.75}; uint16_t bid_sizes_2[] = {5, 10, 5, 10, 20}; - double ask_prices_2[] = {2505.25, 2506.50, 2507, 2507.5, 2508}; uint16_t ask_sizes_2[] = {0, 0, 0, 0, 0}; - fill_book (book_2, bid_prices_2, bid_sizes_2, ask_prices_2, ask_sizes_2); +// SpreaderUtils::compute_price_quantity_2_legs (spreader_price, spreader_quantity, leg_prop_data_1, leg_prop_data_2, book_2, out_price, out_quantity); +// REQUIRE (out_price.value() == 2504.00); +// REQUIRE (out_quantity.value() == 10); +// } +// SECTION("lean mult") +// { +// spreader_quantity = Quantity(5); +// spreader_price = Price (-0.5); +// double lean_mult = 1.0; +// fill_future_contract_leg (leg_1, 0, "ES", bts::api::Venue::VENUE_GLBX, 2017, 12, 15, 1, 1, api::Side::SIDE_BUY, 1.0, 0.25); +// fill_future_contract_leg (leg_2, 0, "ES", bts::api::Venue::VENUE_GLBX, 2017, 3, 15, -1, -1, api::Side::SIDE_SELL, 1.0, 0.25); +// LegPropertyData leg_prop_data_1 = create_leg_property_data (leg_1, 0, 1.0, true, 1.0); +// LegPropertyData leg_prop_data_2 = create_leg_property_data (leg_2, 1, -1.0, true, lean_mult); +// // md +// bts::orderman::Book book_2; +// double bid_prices_2[] = {2505.0, 2504.75, 2504, 2503.00, 2502.75}; uint16_t bid_sizes_2[] = {5, 10, 5, 10, 20}; +// double ask_prices_2[] = {2505.25, 2506.50, 2507, 2507.5, 2508}; uint16_t ask_sizes_2[] = {0, 0, 0, 0, 0}; +// fill_book (book_2, bid_prices_2, bid_sizes_2, ask_prices_2, ask_sizes_2); - SpreaderUtils::compute_price_quantity_2_legs (spreader_price, spreader_quantity, leg_prop_data_1, leg_prop_data_2, book_2, out_price, out_quantity); - REQUIRE (out_price.value() == 2504.5); - REQUIRE (out_quantity.value() == 5); - // changing lean mult - lean_mult = 2.0; - LegPropertyData leg_prop_data_2_lm_2 = create_leg_property_data (leg_2, 1, -1.0, true, lean_mult); - SpreaderUtils::compute_price_quantity_2_legs (spreader_price, spreader_quantity, leg_prop_data_1, leg_prop_data_2_lm_2, book_2, out_price, out_quantity); - REQUIRE (out_price.value() == 2504.25); - REQUIRE (out_quantity.value() == 5); +// SpreaderUtils::compute_price_quantity_2_legs (spreader_price, spreader_quantity, leg_prop_data_1, leg_prop_data_2, book_2, out_price, out_quantity); +// REQUIRE (out_price.value() == 2504.5); +// REQUIRE (out_quantity.value() == 5); +// // changing lean mult +// lean_mult = 2.0; +// LegPropertyData leg_prop_data_2_lm_2 = create_leg_property_data (leg_2, 1, -1.0, true, lean_mult); +// SpreaderUtils::compute_price_quantity_2_legs (spreader_price, spreader_quantity, leg_prop_data_1, leg_prop_data_2_lm_2, book_2, out_price, out_quantity); +// REQUIRE (out_price.value() == 2504.25); +// REQUIRE (out_quantity.value() == 5); - lean_mult = 5.0; - LegPropertyData leg_prop_data_2_lm_5 = create_leg_property_data (leg_2, 1, -1.0, true, lean_mult); - SpreaderUtils::compute_price_quantity_2_legs (spreader_price, spreader_quantity, leg_prop_data_1, leg_prop_data_2_lm_5, book_2, out_price, out_quantity); - REQUIRE (out_price.value() == 2502.5); - REQUIRE (out_quantity.value() == 5); +// lean_mult = 5.0; +// LegPropertyData leg_prop_data_2_lm_5 = create_leg_property_data (leg_2, 1, -1.0, true, lean_mult); +// SpreaderUtils::compute_price_quantity_2_legs (spreader_price, spreader_quantity, leg_prop_data_1, leg_prop_data_2_lm_5, book_2, out_price, out_quantity); +// REQUIRE (out_price.value() == 2502.5); +// REQUIRE (out_quantity.value() == 5); - lean_mult = 9.0; - LegPropertyData leg_prop_data_2_lm_9 = create_leg_property_data (leg_2, 1, -1.0, true, lean_mult); - SpreaderUtils::compute_price_quantity_2_legs (spreader_price, spreader_quantity, leg_prop_data_1, leg_prop_data_2_lm_9, book_2, out_price, out_quantity); - REQUIRE (out_price.value() == 2502.25); - REQUIRE (out_quantity.value() == 5); +// lean_mult = 9.0; +// LegPropertyData leg_prop_data_2_lm_9 = create_leg_property_data (leg_2, 1, -1.0, true, lean_mult); +// SpreaderUtils::compute_price_quantity_2_legs (spreader_price, spreader_quantity, leg_prop_data_1, leg_prop_data_2_lm_9, book_2, out_price, out_quantity); +// REQUIRE (out_price.value() == 2502.25); +// REQUIRE (out_quantity.value() == 5); - lean_mult = 10.0; - LegPropertyData leg_prop_data_2_lm_10 = create_leg_property_data (leg_2, 1, -1.0, true, lean_mult); - SpreaderUtils::compute_price_quantity_2_legs (spreader_price, spreader_quantity, leg_prop_data_1, leg_prop_data_2_lm_10, book_2, out_price, out_quantity); - REQUIRE (out_price.value() == 2502.25); - REQUIRE (out_quantity.value() == 5); - // with a large lean mult, make the leg 2 qty req exhaust the book - lean_mult = 20.0; - LegPropertyData leg_prop_data_2_lm_20 = create_leg_property_data (leg_2, 1, -1.0, true, lean_mult); - SpreaderUtils::compute_price_quantity_2_legs (spreader_price, spreader_quantity, leg_prop_data_1, leg_prop_data_2_lm_20, book_2, out_price, out_quantity); - REQUIRE (out_price.value() == 2502.25); - REQUIRE (out_quantity.value() == 2); // TODO:check - // fractional leg mults - lean_mult = 1.5; - LegPropertyData leg_prop_data_2_lm_1_5 = create_leg_property_data (leg_2, 1, -1.0, true, lean_mult); - SpreaderUtils::compute_price_quantity_2_legs (spreader_price, spreader_quantity, leg_prop_data_1, leg_prop_data_2_lm_1_5, book_2, out_price, out_quantity); - REQUIRE (out_price.value() == 2504.25); - REQUIRE (out_quantity.value() == 5); +// lean_mult = 10.0; +// LegPropertyData leg_prop_data_2_lm_10 = create_leg_property_data (leg_2, 1, -1.0, true, lean_mult); +// SpreaderUtils::compute_price_quantity_2_legs (spreader_price, spreader_quantity, leg_prop_data_1, leg_prop_data_2_lm_10, book_2, out_price, out_quantity); +// REQUIRE (out_price.value() == 2502.25); +// REQUIRE (out_quantity.value() == 5); +// // with a large lean mult, make the leg 2 qty req exhaust the book +// lean_mult = 20.0; +// LegPropertyData leg_prop_data_2_lm_20 = create_leg_property_data (leg_2, 1, -1.0, true, lean_mult); +// SpreaderUtils::compute_price_quantity_2_legs (spreader_price, spreader_quantity, leg_prop_data_1, leg_prop_data_2_lm_20, book_2, out_price, out_quantity); +// REQUIRE (out_price.value() == 2502.25); +// REQUIRE (out_quantity.value() == 2); // TODO:check +// // fractional leg mults +// lean_mult = 1.5; +// LegPropertyData leg_prop_data_2_lm_1_5 = create_leg_property_data (leg_2, 1, -1.0, true, lean_mult); +// SpreaderUtils::compute_price_quantity_2_legs (spreader_price, spreader_quantity, leg_prop_data_1, leg_prop_data_2_lm_1_5, book_2, out_price, out_quantity); +// REQUIRE (out_price.value() == 2504.25); +// REQUIRE (out_quantity.value() == 5); - lean_mult = 4.3333; - LegPropertyData leg_prop_data_2_lm_3_33 = create_leg_property_data (leg_2, 1, -1.0, true, lean_mult); - SpreaderUtils::compute_price_quantity_2_legs (spreader_price, spreader_quantity, leg_prop_data_1, leg_prop_data_2_lm_3_33, book_2, out_price, out_quantity); - REQUIRE (out_price.value() == 2502.5); - REQUIRE (out_quantity.value() == 5); - } - SECTION("fractional leg mult ") - { - spreader_quantity = Quantity(10); - spreader_price = Price (0.5); - double mult_1 = 0.25, mult_2 = -1.1; // same used for price and qty - double lean_mult = 1.0; - fill_future_contract_leg (leg_1, 0, "ES", bts::api::Venue::VENUE_GLBX, 2017, 12, 15, mult_1, mult_1, api::Side::SIDE_BUY, 1.0, 0.25); - fill_future_contract_leg (leg_2, 0, "ES", bts::api::Venue::VENUE_GLBX, 2017, 3, 15, mult_2, mult_2, api::Side::SIDE_SELL, 1.0, 0.25); - LegPropertyData leg_prop_data_1 = create_leg_property_data (leg_1, 0, mult_1, true, lean_mult); - LegPropertyData leg_prop_data_2 = create_leg_property_data (leg_2, 1, mult_2, true, lean_mult); - // md - bts::orderman::Book book_1, book_2; - double bid_prices_2[] = {2500.0, 2499.75, 2499.5, 2499, 2498};uint16_t bid_sizes_2[] = {5, 4, 1, 6, 99}; - double ask_prices_2[] = {2500.25, 2500.50, 2500.75, 2501, 2502};uint16_t ask_sizes_2[] = {13, 12, 45, 5, 15}; +// lean_mult = 4.3333; +// LegPropertyData leg_prop_data_2_lm_3_33 = create_leg_property_data (leg_2, 1, -1.0, true, lean_mult); +// SpreaderUtils::compute_price_quantity_2_legs (spreader_price, spreader_quantity, leg_prop_data_1, leg_prop_data_2_lm_3_33, book_2, out_price, out_quantity); +// REQUIRE (out_price.value() == 2502.5); +// REQUIRE (out_quantity.value() == 5); +// } +// SECTION("fractional leg mult ") +// { +// spreader_quantity = Quantity(10); +// spreader_price = Price (0.5); +// double mult_1 = 0.25, mult_2 = -1.1; // same used for price and qty +// double lean_mult = 1.0; +// fill_future_contract_leg (leg_1, 0, "ES", bts::api::Venue::VENUE_GLBX, 2017, 12, 15, mult_1, mult_1, api::Side::SIDE_BUY, 1.0, 0.25); +// fill_future_contract_leg (leg_2, 0, "ES", bts::api::Venue::VENUE_GLBX, 2017, 3, 15, mult_2, mult_2, api::Side::SIDE_SELL, 1.0, 0.25); +// LegPropertyData leg_prop_data_1 = create_leg_property_data (leg_1, 0, mult_1, true, lean_mult); +// LegPropertyData leg_prop_data_2 = create_leg_property_data (leg_2, 1, mult_2, true, lean_mult); +// // md +// bts::orderman::Book book_1, book_2; +// double bid_prices_2[] = {2500.0, 2499.75, 2499.5, 2499, 2498};uint16_t bid_sizes_2[] = {5, 4, 1, 6, 99}; +// double ask_prices_2[] = {2500.25, 2500.50, 2500.75, 2501, 2502};uint16_t ask_sizes_2[] = {13, 12, 45, 5, 15}; - fill_book (book_2, bid_prices_2, bid_sizes_2, ask_prices_2, ask_sizes_2); - SpreaderUtils::compute_price_quantity_2_legs (spreader_price, Quantity(3), leg_prop_data_1, leg_prop_data_2, book_2, out_price, out_quantity); - REQUIRE (out_price.value() == 10997.5); - REQUIRE (out_quantity.value() == 3); - } - SECTION("fractional leg mult 2") - { - spreader_quantity = Quantity(10); - spreader_price = Price (62.740); - double mult_1 = 1.1, mult_2 = 2.3; // same used for price and qty - double lean_mult = 1.0; - fill_future_contract_leg (leg_1, 0, "SI", bts::api::Venue::VENUE_GLBX, 2018, 6, 15, mult_1, mult_1, api::Side::SIDE_BUY, 1.0, 0.05); - fill_future_contract_leg (leg_2, 1, "SI", bts::api::Venue::VENUE_GLBX, 2018, 7, 15, mult_2, mult_2, api::Side::SIDE_SELL, 1.0, 0.05); - LegPropertyData leg_prop_data_1 = create_leg_property_data (leg_1, 0, mult_1, true, lean_mult); - LegPropertyData leg_prop_data_2 = create_leg_property_data (leg_2, 1, mult_2, true, lean_mult); - // md - bts::orderman::Book book_1, book_2; - double bid_prices_1[] = {18.5}; uint16_t bid_sizes_1[] = {100}; - double ask_prices_1[] = {18.525}; uint16_t ask_sizes_1[] = {100}; - fill_book (book_1, bid_prices_1, bid_sizes_1, ask_prices_1, ask_sizes_1); - SpreaderUtils::compute_price_quantity_2_legs (spreader_price, Quantity(23), leg_prop_data_2, leg_prop_data_1, book_1, out_price, out_quantity); - REQUIRE (out_price.value() == 18.45); - REQUIRE (out_quantity.value() == 23); - //lower qty - SpreaderUtils::compute_price_quantity_2_legs (spreader_price, Quantity(12), leg_prop_data_2, leg_prop_data_1, book_1, out_price, out_quantity); - REQUIRE (out_price.value() == 18.45); - REQUIRE (out_quantity.value() == 12); - } - SECTION("price mult") - { - spreader_quantity = Quantity(10); - spreader_price = Price (0.5); - double size_mult_1 = 0.25, size_mult_2 = -1.1, // same used for price and qty - price_mult_1 = 0.35, price_mult_2 = -1.5; - double lean_mult = 1.0; - fill_future_contract_leg (leg_1, 0, "ES", bts::api::Venue::VENUE_GLBX, 2017, 12, 15, size_mult_1, price_mult_1, api::Side::SIDE_BUY, 1.0, 0.25); - fill_future_contract_leg (leg_2, 0, "ES", bts::api::Venue::VENUE_GLBX, 2017, 3, 15, size_mult_2, price_mult_2, api::Side::SIDE_SELL, 1.0, 0.25); - LegPropertyData leg_prop_data_1 = create_leg_property_data (leg_1, 0, price_mult_1, true, lean_mult); - LegPropertyData leg_prop_data_2 = create_leg_property_data (leg_2, 1, price_mult_2, true, lean_mult); - // md - bts::orderman::Book book_1, book_2; - double bid_prices_2[] = {2500.0, 2499.75, 2499.5, 2499, 2498};uint16_t bid_sizes_2[] = {5, 4, 1, 6, 99}; - double ask_prices_2[] = {2500.25, 2500.50, 2500.75, 2501, 2502};uint16_t ask_sizes_2[] = {13, 12, 45, 5, 15}; +// fill_book (book_2, bid_prices_2, bid_sizes_2, ask_prices_2, ask_sizes_2); +// SpreaderUtils::compute_price_quantity_2_legs (spreader_price, Quantity(3), leg_prop_data_1, leg_prop_data_2, book_2, out_price, out_quantity); +// REQUIRE (out_price.value() == 10997.5); +// REQUIRE (out_quantity.value() == 3); +// } +// SECTION("fractional leg mult 2") +// { +// spreader_quantity = Quantity(10); +// spreader_price = Price (62.740); +// double mult_1 = 1.1, mult_2 = 2.3; // same used for price and qty +// double lean_mult = 1.0; +// fill_future_contract_leg (leg_1, 0, "SI", bts::api::Venue::VENUE_GLBX, 2018, 6, 15, mult_1, mult_1, api::Side::SIDE_BUY, 1.0, 0.05); +// fill_future_contract_leg (leg_2, 1, "SI", bts::api::Venue::VENUE_GLBX, 2018, 7, 15, mult_2, mult_2, api::Side::SIDE_SELL, 1.0, 0.05); +// LegPropertyData leg_prop_data_1 = create_leg_property_data (leg_1, 0, mult_1, true, lean_mult); +// LegPropertyData leg_prop_data_2 = create_leg_property_data (leg_2, 1, mult_2, true, lean_mult); +// // md +// bts::orderman::Book book_1, book_2; +// double bid_prices_1[] = {18.5}; uint16_t bid_sizes_1[] = {100}; +// double ask_prices_1[] = {18.525}; uint16_t ask_sizes_1[] = {100}; +// fill_book (book_1, bid_prices_1, bid_sizes_1, ask_prices_1, ask_sizes_1); +// SpreaderUtils::compute_price_quantity_2_legs (spreader_price, Quantity(23), leg_prop_data_2, leg_prop_data_1, book_1, out_price, out_quantity); +// REQUIRE (out_price.value() == 18.45); +// REQUIRE (out_quantity.value() == 23); +// //lower qty +// SpreaderUtils::compute_price_quantity_2_legs (spreader_price, Quantity(12), leg_prop_data_2, leg_prop_data_1, book_1, out_price, out_quantity); +// REQUIRE (out_price.value() == 18.45); +// REQUIRE (out_quantity.value() == 12); +// } +// SECTION("price mult") +// { +// spreader_quantity = Quantity(10); +// spreader_price = Price (0.5); +// double size_mult_1 = 0.25, size_mult_2 = -1.1, // same used for price and qty +// price_mult_1 = 0.35, price_mult_2 = -1.5; +// double lean_mult = 1.0; +// fill_future_contract_leg (leg_1, 0, "ES", bts::api::Venue::VENUE_GLBX, 2017, 12, 15, size_mult_1, price_mult_1, api::Side::SIDE_BUY, 1.0, 0.25); +// fill_future_contract_leg (leg_2, 0, "ES", bts::api::Venue::VENUE_GLBX, 2017, 3, 15, size_mult_2, price_mult_2, api::Side::SIDE_SELL, 1.0, 0.25); +// LegPropertyData leg_prop_data_1 = create_leg_property_data (leg_1, 0, price_mult_1, true, lean_mult); +// LegPropertyData leg_prop_data_2 = create_leg_property_data (leg_2, 1, price_mult_2, true, lean_mult); +// // md +// bts::orderman::Book book_1, book_2; +// double bid_prices_2[] = {2500.0, 2499.75, 2499.5, 2499, 2498};uint16_t bid_sizes_2[] = {5, 4, 1, 6, 99}; +// double ask_prices_2[] = {2500.25, 2500.50, 2500.75, 2501, 2502};uint16_t ask_sizes_2[] = {13, 12, 45, 5, 15}; - fill_book (book_2, bid_prices_2, bid_sizes_2, ask_prices_2, ask_sizes_2); - SpreaderUtils::compute_price_quantity_2_legs (spreader_price, Quantity(3), leg_prop_data_1, leg_prop_data_2, book_2, out_price, out_quantity); - REQUIRE (out_price.value() == 10711.25); - REQUIRE (out_quantity.value() == 3); - } -} -TEST_CASE ("compute quoting price quantity 3 legs", "[spreader]") -{ - Price spreader_price (-0.05); Quantity spreader_quantity (2); - Price out_price; Quantity out_quantity; - // simple buy 1 sell 1 spreader (same ratio) - ContractLeg leg_1, leg_2, leg_3; - LegSpreaderParams leg_params_1, leg_params_2, leg_params_3; - fill_future_contract_leg (leg_1, 0, "SI", bts::api::Venue::VENUE_GLBX, 2018, 3, 15, 1, 1, api::Side::SIDE_BUY, 1.0, 0.005); - fill_future_contract_leg (leg_2, 1, "SI", bts::api::Venue::VENUE_GLBX, 2018, 4, 15, -2, -2, api::Side::SIDE_SELL, 1.0, 0.005); - fill_future_contract_leg (leg_3, 2, "SI", bts::api::Venue::VENUE_GLBX, 2018, 5, 15, 1, 1, api::Side::SIDE_BUY, 1.0, 0.005); - std::vector legs; legs.push_back(leg_1);legs.push_back(leg_2);legs.push_back(leg_3); +// fill_book (book_2, bid_prices_2, bid_sizes_2, ask_prices_2, ask_sizes_2); +// SpreaderUtils::compute_price_quantity_2_legs (spreader_price, Quantity(3), leg_prop_data_1, leg_prop_data_2, book_2, out_price, out_quantity); +// REQUIRE (out_price.value() == 10711.25); +// REQUIRE (out_quantity.value() == 3); +// } +// } +// TEST_CASE ("compute quoting price quantity 3 legs", "[spreader]") +// { +// Price spreader_price (-0.05); Quantity spreader_quantity (2); +// Price out_price; Quantity out_quantity; +// // simple buy 1 sell 1 spreader (same ratio) +// ContractLeg leg_1, leg_2, leg_3; +// LegSpreaderParams leg_params_1, leg_params_2, leg_params_3; +// fill_future_contract_leg (leg_1, 0, "SI", bts::api::Venue::VENUE_GLBX, 2018, 3, 15, 1, 1, api::Side::SIDE_BUY, 1.0, 0.005); +// fill_future_contract_leg (leg_2, 1, "SI", bts::api::Venue::VENUE_GLBX, 2018, 4, 15, -2, -2, api::Side::SIDE_SELL, 1.0, 0.005); +// fill_future_contract_leg (leg_3, 2, "SI", bts::api::Venue::VENUE_GLBX, 2018, 5, 15, 1, 1, api::Side::SIDE_BUY, 1.0, 0.005); +// std::vector legs; legs.push_back(leg_1);legs.push_back(leg_2);legs.push_back(leg_3); - fill_leg_spreader_params (leg_params_1, 0, true, 1); - fill_leg_spreader_params (leg_params_2, 0, true, 1); - fill_leg_spreader_params (leg_params_3, 0, true, 1); - std::vector params; params.push_back(leg_params_1);params.push_back(leg_params_2);params.push_back(leg_params_3); +// fill_leg_spreader_params (leg_params_1, 0, true, 1); +// fill_leg_spreader_params (leg_params_2, 0, true, 1); +// fill_leg_spreader_params (leg_params_3, 0, true, 1); +// std::vector params; params.push_back(leg_params_1);params.push_back(leg_params_2);params.push_back(leg_params_3); - SpreaderManagerForTest* sm = create_spreader_manager_n_legs (OrderKey(), legs, params); - std::vector driver_vector; - for(size_t i = 0; i < legs.size(); i++) driver_vector.emplace_back(); +// SpreaderManagerForTest* sm = create_spreader_manager_n_legs (OrderKey(), legs, params); +// std::vector driver_vector; +// for(size_t i = 0; i < legs.size(); i++) driver_vector.emplace_back(); - SECTION("basic joining") - { - // md - bts::orderman::Book book_1 = get_book(SecurityKey(0), 1, new double[1]{18.25}, new uint16_t[1]{5}, new double[1]{18.275}, new uint16_t[1]{5}, true), - book_2 = get_book(SecurityKey(1), 1, new double[1]{18.375}, new uint16_t[1]{5}, new double[1]{18.4}, new uint16_t[1]{5}, true), - book_3 = get_book(SecurityKey(2), 1, new double[1]{18.5}, new uint16_t[1]{5}, new double[1]{18.525}, new uint16_t[1]{5}, true); - sm->set_book(book_1, 0);sm->set_book(book_2, 1);sm->set_book(book_3, 2); - // leg 1 quoting price - SpreaderUtils::compute_quoting_price_size_n_legs(spreader_price, spreader_quantity, 0, *sm, driver_vector, out_price, out_quantity); - REQUIRE (out_price.value() == 18.175); - REQUIRE (out_quantity.value() == 2); - // leg 2 quoting price - SpreaderUtils::compute_quoting_price_size_n_legs(spreader_price, Quantity(2 * spreader_quantity.value()), 1, *sm, driver_vector, out_price, out_quantity); - REQUIRE (out_price.value() == 18.425); - REQUIRE (out_quantity.value() == 4); - // leg 3 quoting - SpreaderUtils::compute_quoting_price_size_n_legs(spreader_price, spreader_quantity, 2, *sm, driver_vector, out_price, out_quantity); - REQUIRE (out_price.value() == 18.425); - REQUIRE (out_quantity.value() == 2); - } - SECTION("basic crossing") - { - spreader_price = Price(0.05); spreader_quantity = Quantity(2); - // md (same market as before) - bts::orderman::Book book_1 = get_book(SecurityKey(0), 1, new double[1]{18.25}, new uint16_t[1]{5}, new double[1]{18.275}, new uint16_t[1]{5}, true), - book_2 = get_book(SecurityKey(1), 1, new double[1]{18.375}, new uint16_t[1]{5}, new double[1]{18.4}, new uint16_t[1]{5}, true), - book_3 = get_book(SecurityKey(2), 1, new double[1]{18.5}, new uint16_t[1]{5}, new double[1]{18.525}, new uint16_t[1]{5}, true); - sm->set_book(book_1, 0);sm->set_book(book_2, 1);sm->set_book(book_3, 2); - // leg 1 quoting price - SpreaderUtils::compute_quoting_price_size_n_legs(spreader_price, spreader_quantity, 0, *sm, driver_vector, out_price, out_quantity); - REQUIRE (out_price.value() == 18.275); - REQUIRE (out_quantity.value() == 2); - // leg 2 quoting price - SpreaderUtils::compute_quoting_price_size_n_legs(spreader_price, Quantity(2 * spreader_quantity.value()), 1, *sm, driver_vector, out_price, out_quantity); - REQUIRE (out_price.value() == 18.375); - REQUIRE (out_quantity.value() == 4); - // leg 3 quoting - SpreaderUtils::compute_quoting_price_size_n_legs(spreader_price, spreader_quantity, 2, *sm, driver_vector, out_price, out_quantity); - REQUIRE (out_price.value() == 18.525); - REQUIRE (out_quantity.value() == 2); - } - SECTION("reduced to minimum leg") - { - spreader_price = Price(-0.05); spreader_quantity = Quantity(100); - // md (same market as before) - bts::orderman::Book book_1 = get_book(SecurityKey(0), 1, new double[1]{18.25}, new uint16_t[1]{10}, new double[1]{18.275}, new uint16_t[1]{10}, true), - book_2 = get_book(SecurityKey(1), 1, new double[1]{18.375}, new uint16_t[1]{5}, new double[1]{18.4}, new uint16_t[1]{5}, true), - book_3 = get_book(SecurityKey(2), 1, new double[2]{18.5}, new uint16_t[1]{2}, new double[1]{18.525}, new uint16_t[1]{2}, true); - sm->set_book(book_1, 0);sm->set_book(book_2, 1);sm->set_book(book_3, 2); - // leg 2 quoting price - SpreaderUtils::compute_quoting_price_size_n_legs(spreader_price, Quantity(2 * spreader_quantity.value()), 1, *sm, driver_vector, out_price, out_quantity); - REQUIRE (out_price.value() == 18.425); - REQUIRE (out_quantity.value() == 4); - } - SECTION("reduced to minimum leg stagger") - { - spreader_price = Price(-0.05); spreader_quantity = Quantity(100); - // md (same market as before) - bts::orderman::Book book_1 = get_book(SecurityKey(0), 1, new double[1]{18.25}, new uint16_t[1]{10}, 3, new double[3]{18.265, 18.270, 18.275}, new uint16_t[3]{2, 5, 3}, true), - book_2 = get_book(SecurityKey(1), 1, new double[1]{18.375}, new uint16_t[1]{5}, 1, new double[1]{18.4}, new uint16_t[1]{5}, true), - book_3 = get_book(SecurityKey(2), 1, new double[1]{18.5}, new uint16_t[1]{2}, 1, new double[1]{18.525}, new uint16_t[1]{2}, true); - sm->set_book(book_1, 0);sm->set_book(book_2, 1);sm->set_book(book_3, 2); - // leg 2 quoting price - SpreaderUtils::compute_quoting_price_size_n_legs(spreader_price, Quantity(2 * spreader_quantity.value()), 1, *sm, driver_vector, out_price, out_quantity); - REQUIRE (out_price.value() == 18.42); - REQUIRE (out_quantity.value() == 4); - } - SECTION("reduced to minimum leg stagger multiple levels") - { - spreader_price = Price(-0.05); spreader_quantity = Quantity(100); - // md (same market as before) - bts::orderman::Book book_1 = get_book(SecurityKey(0), 1, new double[1]{18.25}, new uint16_t[1]{10}, 4, new double[4]{18.260, 18.265, 18.270, 18.275}, new uint16_t[4]{1, 1, 5, 3}, true), - book_2 = get_book(SecurityKey(1), 1, new double[1]{18.375}, new uint16_t[1]{5}, 1, new double[1]{18.4}, new uint16_t[1]{5}, true), - book_3 = get_book(SecurityKey(2), 1, new double[1]{18.5}, new uint16_t[1]{2}, 2, new double[2]{18.520, 18.525}, new uint16_t[2]{1,1}, true); - sm->set_book(book_1, 0);sm->set_book(book_2, 1);sm->set_book(book_3, 2); - // leg 2 quoting price - SpreaderUtils::compute_quoting_price_size_n_legs(spreader_price, Quantity(2 * spreader_quantity.value()), 1, *sm, driver_vector, out_price, out_quantity); - REQUIRE (out_price.value() == 18.42); - REQUIRE (out_quantity.value() == 4); - } -} -TEST_CASE ("compute hedge price quantity 2 legs", "[spreader]") -{ - ContractLeg leg_1, leg_2; - Price out_hedge_price; - double out_hedge_quantity; - Price spreader_price = Price(0.35); - double size_mult_1 = 0.25, size_mult_2 = -1.1, // same used for price and qty - price_mult_1 = 0.35, price_mult_2 = -1.5; - double lean_mult = 1.0; - fill_future_contract_leg (leg_1, 0, "ES", bts::api::Venue::VENUE_GLBX, 2017, 12, 15, size_mult_1, price_mult_1, api::Side::SIDE_BUY, 1.0, 0.25); - fill_future_contract_leg (leg_2, 0, "ES", bts::api::Venue::VENUE_GLBX, 2017, 3, 15, size_mult_2, price_mult_2, api::Side::SIDE_SELL, 1.0, 0.25); - LegPropertyData leg_prop_data_1 = create_leg_property_data (leg_1, 0, price_mult_1, true, lean_mult); - LegPropertyData leg_prop_data_2 = create_leg_property_data (leg_2, 1, price_mult_2, true, lean_mult); - // md - SpreaderUtils::compute_hedge_price_size_2_legs (spreader_price, leg_prop_data_2, Price(2500.5), 3, - leg_prop_data_1, out_hedge_price, out_hedge_quantity); - REQUIRE (std::abs(out_hedge_quantity - 0.6818181818181818181) < 0.000000001); - REQUIRE (out_hedge_price.value() == 10717.25); +// SECTION("basic joining") +// { +// // md +// bts::orderman::Book book_1 = get_book(SecurityKey(0), 1, new double[1]{18.25}, new uint16_t[1]{5}, new double[1]{18.275}, new uint16_t[1]{5}, true), +// book_2 = get_book(SecurityKey(1), 1, new double[1]{18.375}, new uint16_t[1]{5}, new double[1]{18.4}, new uint16_t[1]{5}, true), +// book_3 = get_book(SecurityKey(2), 1, new double[1]{18.5}, new uint16_t[1]{5}, new double[1]{18.525}, new uint16_t[1]{5}, true); +// sm->set_book(book_1, 0);sm->set_book(book_2, 1);sm->set_book(book_3, 2); +// // leg 1 quoting price +// SpreaderUtils::compute_quoting_price_size_n_legs(spreader_price, spreader_quantity, 0, *sm, driver_vector, out_price, out_quantity); +// REQUIRE (out_price.value() == 18.175); +// REQUIRE (out_quantity.value() == 2); +// // leg 2 quoting price +// SpreaderUtils::compute_quoting_price_size_n_legs(spreader_price, Quantity(2 * spreader_quantity.value()), 1, *sm, driver_vector, out_price, out_quantity); +// REQUIRE (out_price.value() == 18.425); +// REQUIRE (out_quantity.value() == 4); +// // leg 3 quoting +// SpreaderUtils::compute_quoting_price_size_n_legs(spreader_price, spreader_quantity, 2, *sm, driver_vector, out_price, out_quantity); +// REQUIRE (out_price.value() == 18.425); +// REQUIRE (out_quantity.value() == 2); +// } +// SECTION("basic crossing") +// { +// spreader_price = Price(0.05); spreader_quantity = Quantity(2); +// // md (same market as before) +// bts::orderman::Book book_1 = get_book(SecurityKey(0), 1, new double[1]{18.25}, new uint16_t[1]{5}, new double[1]{18.275}, new uint16_t[1]{5}, true), +// book_2 = get_book(SecurityKey(1), 1, new double[1]{18.375}, new uint16_t[1]{5}, new double[1]{18.4}, new uint16_t[1]{5}, true), +// book_3 = get_book(SecurityKey(2), 1, new double[1]{18.5}, new uint16_t[1]{5}, new double[1]{18.525}, new uint16_t[1]{5}, true); +// sm->set_book(book_1, 0);sm->set_book(book_2, 1);sm->set_book(book_3, 2); +// // leg 1 quoting price +// SpreaderUtils::compute_quoting_price_size_n_legs(spreader_price, spreader_quantity, 0, *sm, driver_vector, out_price, out_quantity); +// REQUIRE (out_price.value() == 18.275); +// REQUIRE (out_quantity.value() == 2); +// // leg 2 quoting price +// SpreaderUtils::compute_quoting_price_size_n_legs(spreader_price, Quantity(2 * spreader_quantity.value()), 1, *sm, driver_vector, out_price, out_quantity); +// REQUIRE (out_price.value() == 18.375); +// REQUIRE (out_quantity.value() == 4); +// // leg 3 quoting +// SpreaderUtils::compute_quoting_price_size_n_legs(spreader_price, spreader_quantity, 2, *sm, driver_vector, out_price, out_quantity); +// REQUIRE (out_price.value() == 18.525); +// REQUIRE (out_quantity.value() == 2); +// } +// SECTION("reduced to minimum leg") +// { +// spreader_price = Price(-0.05); spreader_quantity = Quantity(100); +// // md (same market as before) +// bts::orderman::Book book_1 = get_book(SecurityKey(0), 1, new double[1]{18.25}, new uint16_t[1]{10}, new double[1]{18.275}, new uint16_t[1]{10}, true), +// book_2 = get_book(SecurityKey(1), 1, new double[1]{18.375}, new uint16_t[1]{5}, new double[1]{18.4}, new uint16_t[1]{5}, true), +// book_3 = get_book(SecurityKey(2), 1, new double[2]{18.5}, new uint16_t[1]{2}, new double[1]{18.525}, new uint16_t[1]{2}, true); +// sm->set_book(book_1, 0);sm->set_book(book_2, 1);sm->set_book(book_3, 2); +// // leg 2 quoting price +// SpreaderUtils::compute_quoting_price_size_n_legs(spreader_price, Quantity(2 * spreader_quantity.value()), 1, *sm, driver_vector, out_price, out_quantity); +// REQUIRE (out_price.value() == 18.425); +// REQUIRE (out_quantity.value() == 4); +// } +// SECTION("reduced to minimum leg stagger") +// { +// spreader_price = Price(-0.05); spreader_quantity = Quantity(100); +// // md (same market as before) +// bts::orderman::Book book_1 = get_book(SecurityKey(0), 1, new double[1]{18.25}, new uint16_t[1]{10}, 3, new double[3]{18.265, 18.270, 18.275}, new uint16_t[3]{2, 5, 3}, true), +// book_2 = get_book(SecurityKey(1), 1, new double[1]{18.375}, new uint16_t[1]{5}, 1, new double[1]{18.4}, new uint16_t[1]{5}, true), +// book_3 = get_book(SecurityKey(2), 1, new double[1]{18.5}, new uint16_t[1]{2}, 1, new double[1]{18.525}, new uint16_t[1]{2}, true); +// sm->set_book(book_1, 0);sm->set_book(book_2, 1);sm->set_book(book_3, 2); +// // leg 2 quoting price +// SpreaderUtils::compute_quoting_price_size_n_legs(spreader_price, Quantity(2 * spreader_quantity.value()), 1, *sm, driver_vector, out_price, out_quantity); +// REQUIRE (out_price.value() == 18.42); +// REQUIRE (out_quantity.value() == 4); +// } +// SECTION("reduced to minimum leg stagger multiple levels") +// { +// spreader_price = Price(-0.05); spreader_quantity = Quantity(100); +// // md (same market as before) +// bts::orderman::Book book_1 = get_book(SecurityKey(0), 1, new double[1]{18.25}, new uint16_t[1]{10}, 4, new double[4]{18.260, 18.265, 18.270, 18.275}, new uint16_t[4]{1, 1, 5, 3}, true), +// book_2 = get_book(SecurityKey(1), 1, new double[1]{18.375}, new uint16_t[1]{5}, 1, new double[1]{18.4}, new uint16_t[1]{5}, true), +// book_3 = get_book(SecurityKey(2), 1, new double[1]{18.5}, new uint16_t[1]{2}, 2, new double[2]{18.520, 18.525}, new uint16_t[2]{1,1}, true); +// sm->set_book(book_1, 0);sm->set_book(book_2, 1);sm->set_book(book_3, 2); +// // leg 2 quoting price +// SpreaderUtils::compute_quoting_price_size_n_legs(spreader_price, Quantity(2 * spreader_quantity.value()), 1, *sm, driver_vector, out_price, out_quantity); +// REQUIRE (out_price.value() == 18.42); +// REQUIRE (out_quantity.value() == 4); +// } +// } +// TEST_CASE ("compute hedge price quantity 2 legs", "[spreader]") +// { +// ContractLeg leg_1, leg_2; +// Price out_hedge_price; +// double out_hedge_quantity; +// Price spreader_price = Price(0.35); +// double size_mult_1 = 0.25, size_mult_2 = -1.1, // same used for price and qty +// price_mult_1 = 0.35, price_mult_2 = -1.5; +// double lean_mult = 1.0; +// fill_future_contract_leg (leg_1, 0, "ES", bts::api::Venue::VENUE_GLBX, 2017, 12, 15, size_mult_1, price_mult_1, api::Side::SIDE_BUY, 1.0, 0.25); +// fill_future_contract_leg (leg_2, 0, "ES", bts::api::Venue::VENUE_GLBX, 2017, 3, 15, size_mult_2, price_mult_2, api::Side::SIDE_SELL, 1.0, 0.25); +// LegPropertyData leg_prop_data_1 = create_leg_property_data (leg_1, 0, price_mult_1, true, lean_mult); +// LegPropertyData leg_prop_data_2 = create_leg_property_data (leg_2, 1, price_mult_2, true, lean_mult); +// // md +// SpreaderUtils::compute_hedge_price_size_2_legs (spreader_price, leg_prop_data_2, Price(2500.5), 3, +// leg_prop_data_1, out_hedge_price, out_hedge_quantity); +// REQUIRE (std::abs(out_hedge_quantity - 0.6818181818181818181) < 0.000000001); +// REQUIRE (out_hedge_price.value() == 10717.25); - SpreaderUtils::compute_hedge_price_size_2_legs (spreader_price, leg_prop_data_2, Price(2500.5), 2, - leg_prop_data_1, out_hedge_price, out_hedge_quantity); - REQUIRE (std::abs(out_hedge_quantity - 0.45454545454545454545) < 0.000000001); - REQUIRE (out_hedge_price.value() == 10717.25); - // reversing the side of the quote fill - SpreaderUtils::compute_hedge_price_size_2_legs (spreader_price, leg_prop_data_1, Price(10000.5), 2, - leg_prop_data_2, out_hedge_price, out_hedge_quantity); - REQUIRE (std::abs(out_hedge_quantity - 8.8)<0.000000001); - REQUIRE (out_hedge_price.value() == 2333.25); - SpreaderUtils::compute_hedge_price_size_2_legs (spreader_price, leg_prop_data_1, Price(9997), 6, - leg_prop_data_2, out_hedge_price, out_hedge_quantity); - REQUIRE (std::abs(out_hedge_quantity - 26.40) < 0.000000001); - REQUIRE (out_hedge_price.value() == 2332.5); -} -/************************************************************************************************************/ -/*********************************************Quoter State Tests*********************************************/ -/************************************************************************************************************/ -TEST_CASE ("quoter_START_state", "[spreader]") -{ - bts::orderman::OrderKey spreader_order_key(0); - Price spreader_price = Price (0.35); Quantity spreader_quantity (100); - SpreaderManagerForTest* sm = create_spreader_manager_2_legs (spreader_order_key, - bts::api::Venue::VENUE_GLBX, "ES", 2017, 12, 15, 1.0, 1.0, 1.0, api::Side::SIDE_BUY, 1.0, 0.25, - bts::api::Venue::VENUE_GLBX, "ES", 2017, 3, 15, 1.0, -1.0, 1.0, api::Side::SIDE_SELL, 1.0, 0.25); - SpreaderBookkeepingData& bookeeping_data = sm->bookkeeping_data(); - SingleLegQuoter& quoter = bookeeping_data.get_leg_data(1).quoter(); - SECTION("0. transition_to_start") - { - verify_complete_quoter_state (quoter, QuoterState::START, false, Price(0), Quantity(0), Quantity(0), Quantity(0), Price(0), Quantity(0), Quantity (0), true); - LOG(OrderMan, Diag, "quoter_START_state.transition_to_start"); - } - SECTION("1. one_time_activate") - { - verify_complete_quoter_state (quoter, QuoterState::START, false, Price(0), Quantity(0), Quantity(0), Quantity(0), Price(0), Quantity(0), Quantity (0), true); - quoter.one_time_activate (spreader_price, spreader_quantity); - verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_SIZE, false, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(0), Quantity(0), Quantity (100), false); - LOG(OrderMan, Diag, "quoter_START_state.init"); - } - SECTION("4. cancel_order") - { - verify_complete_quoter_state (quoter, QuoterState::START, false, Price(0), Quantity(0), Quantity(0), Quantity(0), Price(0), Quantity(0), Quantity (0), true); - quoter.cancel_order(); - verify_complete_quoter_state (quoter, QuoterState::END, true, Price(0), Quantity(0), Quantity(0), Quantity(0), Price(0), Quantity(0), Quantity (0), true); - LOG(OrderMan, Diag, "quoter_START_state.cancel_order"); - } - SECTION("5. terminate") - { - verify_complete_quoter_state (quoter, QuoterState::START, false, Price(0), Quantity(0), Quantity(0), Quantity(0), Price(0), Quantity(0), Quantity (0), true); - quoter.terminate(); - verify_complete_quoter_state (quoter, QuoterState::END, true, Price(0), Quantity(0), Quantity(0), Quantity(0), Price(0), Quantity(0), Quantity (0), true); - LOG(OrderMan, Diag, "quoter_START_state.terminate"); - } - SECTION("7. update_other_leg_fills") - { - verify_complete_quoter_state (quoter, QuoterState::START, false, Price(0), Quantity(0), Quantity(0), Quantity(0), Price(0), Quantity(0), Quantity (0), true); - quoter.update_other_leg_fills (0, Quantity(50)); - verify_complete_quoter_state (quoter, QuoterState::START, false, Price(0), Quantity(0), Quantity(0), Quantity(50), Price(0), Quantity(0), Quantity (0), true); - // another fill - quoter.update_other_leg_fills (0, Quantity(25)); - verify_complete_quoter_state (quoter, QuoterState::START, false, Price(0), Quantity(0), Quantity(0), Quantity(75), Price(0), Quantity(0), Quantity (0), true); - } - SECTION("8. update_order_price_quantity") - { - verify_complete_quoter_state (quoter, QuoterState::START, false, Price(0), Quantity(0), Quantity(0), Quantity(0), Price(0), Quantity(0), Quantity (0), true); - spreader_price = Price (0.5); spreader_quantity = Quantity (200); - quoter.update_order_price_quantity (spreader_price, spreader_quantity); - verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_SIZE, false, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(0), Quantity(0), Quantity (200), false); - LOG(OrderMan, Diag, "quoter_START_state.update_order_price_quantity"); - } -} +// SpreaderUtils::compute_hedge_price_size_2_legs (spreader_price, leg_prop_data_2, Price(2500.5), 2, +// leg_prop_data_1, out_hedge_price, out_hedge_quantity); +// REQUIRE (std::abs(out_hedge_quantity - 0.45454545454545454545) < 0.000000001); +// REQUIRE (out_hedge_price.value() == 10717.25); +// // reversing the side of the quote fill +// SpreaderUtils::compute_hedge_price_size_2_legs (spreader_price, leg_prop_data_1, Price(10000.5), 2, +// leg_prop_data_2, out_hedge_price, out_hedge_quantity); +// REQUIRE (std::abs(out_hedge_quantity - 8.8)<0.000000001); +// REQUIRE (out_hedge_price.value() == 2333.25); +// SpreaderUtils::compute_hedge_price_size_2_legs (spreader_price, leg_prop_data_1, Price(9997), 6, +// leg_prop_data_2, out_hedge_price, out_hedge_quantity); +// REQUIRE (std::abs(out_hedge_quantity - 26.40) < 0.000000001); +// REQUIRE (out_hedge_price.value() == 2332.5); +// } +// /************************************************************************************************************/ +// /*********************************************Quoter State Tests*********************************************/ +// /************************************************************************************************************/ +// TEST_CASE ("quoter_START_state", "[spreader]") +// { +// bts::orderman::OrderKey spreader_order_key(0); +// Price spreader_price = Price (0.35); Quantity spreader_quantity (100); +// SpreaderManagerForTest* sm = create_spreader_manager_2_legs (spreader_order_key, +// bts::api::Venue::VENUE_GLBX, "ES", 2017, 12, 15, 1.0, 1.0, 1.0, api::Side::SIDE_BUY, 1.0, 0.25, +// bts::api::Venue::VENUE_GLBX, "ES", 2017, 3, 15, 1.0, -1.0, 1.0, api::Side::SIDE_SELL, 1.0, 0.25); +// SpreaderBookkeepingData& bookeeping_data = sm->bookkeeping_data(); +// SingleLegQuoter& quoter = bookeeping_data.get_leg_data(1).quoter(); +// SECTION("0. transition_to_start") +// { +// verify_complete_quoter_state (quoter, QuoterState::START, false, Price(0), Quantity(0), Quantity(0), Quantity(0), Price(0), Quantity(0), Quantity (0), true); +// LOG(OrderMan, Diag, "quoter_START_state.transition_to_start"); +// } +// SECTION("1. one_time_activate") +// { +// verify_complete_quoter_state (quoter, QuoterState::START, false, Price(0), Quantity(0), Quantity(0), Quantity(0), Price(0), Quantity(0), Quantity (0), true); +// quoter.one_time_activate (spreader_price, spreader_quantity); +// verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_SIZE, false, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(0), Quantity(0), Quantity (100), false); +// LOG(OrderMan, Diag, "quoter_START_state.init"); +// } +// SECTION("4. cancel_order") +// { +// verify_complete_quoter_state (quoter, QuoterState::START, false, Price(0), Quantity(0), Quantity(0), Quantity(0), Price(0), Quantity(0), Quantity (0), true); +// quoter.cancel_order(); +// verify_complete_quoter_state (quoter, QuoterState::END, true, Price(0), Quantity(0), Quantity(0), Quantity(0), Price(0), Quantity(0), Quantity (0), true); +// LOG(OrderMan, Diag, "quoter_START_state.cancel_order"); +// } +// SECTION("5. terminate") +// { +// verify_complete_quoter_state (quoter, QuoterState::START, false, Price(0), Quantity(0), Quantity(0), Quantity(0), Price(0), Quantity(0), Quantity (0), true); +// quoter.terminate(); +// verify_complete_quoter_state (quoter, QuoterState::END, true, Price(0), Quantity(0), Quantity(0), Quantity(0), Price(0), Quantity(0), Quantity (0), true); +// LOG(OrderMan, Diag, "quoter_START_state.terminate"); +// } +// SECTION("7. update_other_leg_fills") +// { +// verify_complete_quoter_state (quoter, QuoterState::START, false, Price(0), Quantity(0), Quantity(0), Quantity(0), Price(0), Quantity(0), Quantity (0), true); +// quoter.update_other_leg_fills (0, Quantity(50)); +// verify_complete_quoter_state (quoter, QuoterState::START, false, Price(0), Quantity(0), Quantity(0), Quantity(50), Price(0), Quantity(0), Quantity (0), true); +// // another fill +// quoter.update_other_leg_fills (0, Quantity(25)); +// verify_complete_quoter_state (quoter, QuoterState::START, false, Price(0), Quantity(0), Quantity(0), Quantity(75), Price(0), Quantity(0), Quantity (0), true); +// } +// SECTION("8. update_order_price_quantity") +// { +// verify_complete_quoter_state (quoter, QuoterState::START, false, Price(0), Quantity(0), Quantity(0), Quantity(0), Price(0), Quantity(0), Quantity (0), true); +// spreader_price = Price (0.5); spreader_quantity = Quantity (200); +// quoter.update_order_price_quantity (spreader_price, spreader_quantity); +// verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_SIZE, false, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(0), Quantity(0), Quantity (200), false); +// LOG(OrderMan, Diag, "quoter_START_state.update_order_price_quantity"); +// } +// } -TEST_CASE ("quoter_WAITING_FOR_SIZE_state", "[spreader]") -{ - bts::orderman::OrderKey spreader_order_key(0); - Price spreader_price = Price (0.35); Quantity spreader_quantity (100); - SpreaderManagerForTest* sm_ptr = create_spreader_manager_2_legs (spreader_order_key, - bts::api::Venue::VENUE_GLBX, "ES", 2017, 12, 15, 1.0, 1.0, 1.0, api::Side::SIDE_BUY, 1.0, 0.25, - bts::api::Venue::VENUE_GLBX, "ES", 2017, 3, 15, 1.0, -1.0, 1.0, api::Side::SIDE_SELL, 1.0, 0.25); - SpreaderBookkeepingData& bookeeping_data = sm_ptr->bookkeeping_data(); - SpreaderManagerForTest& sm = *sm_ptr; - SingleLegQuoter& quoter = bookeeping_data.get_leg_data(1).quoter(); - quoter.one_time_activate (spreader_price, spreader_quantity); - verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_SIZE, false, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(0), Quantity(0), Quantity (100), false); +// TEST_CASE ("quoter_WAITING_FOR_SIZE_state", "[spreader]") +// { +// bts::orderman::OrderKey spreader_order_key(0); +// Price spreader_price = Price (0.35); Quantity spreader_quantity (100); +// SpreaderManagerForTest* sm_ptr = create_spreader_manager_2_legs (spreader_order_key, +// bts::api::Venue::VENUE_GLBX, "ES", 2017, 12, 15, 1.0, 1.0, 1.0, api::Side::SIDE_BUY, 1.0, 0.25, +// bts::api::Venue::VENUE_GLBX, "ES", 2017, 3, 15, 1.0, -1.0, 1.0, api::Side::SIDE_SELL, 1.0, 0.25); +// SpreaderBookkeepingData& bookeeping_data = sm_ptr->bookkeeping_data(); +// SpreaderManagerForTest& sm = *sm_ptr; +// SingleLegQuoter& quoter = bookeeping_data.get_leg_data(1).quoter(); +// quoter.one_time_activate (spreader_price, spreader_quantity); +// verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_SIZE, false, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(0), Quantity(0), Quantity (100), false); - SECTION("3. on_book_zero") - { - // 0 size md update, it should keep waiting - // buying the spread => sell leg 2 => buy leg 1 => leg 1's sell market - double prices[] = {0, 0, 0, 0, 0}; uint16_t sizes[] = {0, 0, 0, 0, 0}; - fire_book_update (prices, sizes, api::Side::SIDE_SELL, 0, sm, quoter); - verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_SIZE, false, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(0), Quantity(0), Quantity (100), false); - LOG(OrderMan, Diag, "quoter_WAITING_FOR_SIZE_state.on_book_zero success"); - } - SECTION("3. on_book_less_size_than_total") - { - double prices[] = {2000, 2000.25, 2000.5, 2000.75, 2002}; uint16_t sizes[] = {10, 5, 15, 5, 25}; //60 - fire_book_update (prices, sizes, api::Side::SIDE_SELL, 0, sm, quoter); - verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_FIRST_ACK, false, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(2001.75), Quantity(60), Quantity (100), false); - LOG(OrderMan, Diag, "quoter_WAITING_FOR_SIZE_state.on_book_less_size_than_total"); - } - SECTION("3. on_book_more_size_than_total") - { - double prices[] = {2000, 2001, 0, 0, 0}; uint16_t sizes[] = {60, 55, 0, 0, 0}; - fire_book_update (prices, sizes, api::Side::SIDE_SELL, 0, sm, quoter); - verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_FIRST_ACK, false, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(2000.75), Quantity(100), Quantity (100), false); - LOG(OrderMan, Diag, "quoter_WAITING_FOR_SIZE_state.on_book_more_size_than_total"); - } - SECTION("4. cancel_order") - { - quoter.cancel_order(); - verify_complete_quoter_state (quoter, QuoterState::END, true, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(0), Quantity(0), spreader_quantity, false); - LOG(OrderMan, Diag, "quoter_WAITING_FOR_SIZE_state.cancel_order"); - } - SECTION("5. terminate") - { - quoter.terminate(); - verify_complete_quoter_state (quoter, QuoterState::END, true, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(0), Quantity(0), spreader_quantity, false); - LOG(OrderMan, Diag, "quoter_WAITING_FOR_SIZE_state.cancel_order"); - } - SECTION("7. update_other_leg_fills") - { - quoter.update_other_leg_fills (0, Quantity(50)); - verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_SIZE, false, spreader_price, spreader_quantity, Quantity(0), Quantity(50), Price(0), Quantity(0), Quantity(50), false); - // another fill - quoter.update_other_leg_fills (0, Quantity(25)); - verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_SIZE, false, spreader_price, spreader_quantity, Quantity(0), Quantity(75), Price(0), Quantity(0), Quantity(25), false); - // completely fill the other side - quoter.update_other_leg_fills (0, Quantity(25)); - verify_complete_quoter_state (quoter, QuoterState::END, false, spreader_price, spreader_quantity, Quantity(0), Quantity(100), Price(0), Quantity(0), Quantity(0), true); - LOG(OrderMan, Diag, "quoter_WAITING_FOR_SIZE_state.update_other_leg_fills"); - } - SECTION("8. update_order_price_quantity") - { - spreader_price = Price (0.5); spreader_quantity = Quantity (200); - quoter.update_order_price_quantity (spreader_price, spreader_quantity); - verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_SIZE, false, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(0), Quantity(0), spreader_quantity, false); - // on zero size, it should go to end state - spreader_price = Price (0.5); spreader_quantity = Quantity (0); - quoter.update_order_price_quantity (spreader_price, spreader_quantity); - verify_complete_quoter_state (quoter, QuoterState::END, false, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(0), Quantity(0), Quantity(0), true); - LOG(OrderMan, Diag, "quoter_WAITING_FOR_SIZE_state.update_order_price_quantity"); - } -} -TEST_CASE ("quoter_WAITING_FOR_FIRST_ACK", "[spreader]") -{ - bts::orderman::OrderKey spreader_order_key(0); - Price spreader_price = Price (0.35); Quantity spreader_quantity (100); - SpreaderManagerForTest* sm_ptr = create_spreader_manager_2_legs (spreader_order_key, - bts::api::Venue::VENUE_GLBX, "ES", 2017, 12, 15, 1.0, 1.0, 1.0, api::Side::SIDE_BUY, 1.0, 0.25, - bts::api::Venue::VENUE_GLBX, "ES", 2017, 3, 15, 1.0, -1.0, 1.0, api::Side::SIDE_SELL, 1.0, 0.25); - SpreaderBookkeepingData& bookeeping_data = sm_ptr->bookkeeping_data(); - SpreaderManagerForTest& sm = *sm_ptr; - SingleLegQuoter& quoter = bookeeping_data.get_leg_data(1).quoter(); - quoter.one_time_activate(spreader_price, spreader_quantity); - double prices[] = {2000, 2001, 0, 0, 0}; uint16_t sizes[] = {60, 55, 0, 0, 0}; - fire_book_update (prices, sizes, api::Side::SIDE_SELL, 0, sm, quoter); - verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_FIRST_ACK, false, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(2000.75), Quantity(100), Quantity (100), false); - SECTION("2. update_order_status_non_terminal") - { - SpreaderChildOrderState& u = bookeeping_data.get_leg_data(1).order_update_message(); - on_order_update (u, api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (70), Price (2000)); - quoter.update_order_status(u); - verify_complete_quoter_state (quoter, QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity(70), Quantity(0), Price(1999.75), Quantity(100), Quantity (30), false); - LOG(OrderMan, Diag, "quoter_WAITING_FOR_FIRT_ACK.update_order_status_non_terminal"); - } - SECTION("3. update_order_status_terminal") - { - SpreaderChildOrderState& u = bookeeping_data.get_leg_data(1).order_update_message(); - on_order_update (u, api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (100), Price (2000)); - quoter.update_order_status(u); - verify_complete_quoter_state (quoter, QuoterState::END, false, spreader_price, spreader_quantity, Quantity(100), Quantity(0), Price(2000.75), Quantity(100), Quantity (0), true); - LOG(OrderMan, Diag, "quoter_WAITING_FOR_FIRT_ACK.update_order_status_terminal"); - } - SECTION("3. on_book") - { - // orders are not updated in this state - double prices[] = {0, 0, 0, 0, 0}; uint16_t sizes[] = {0, 0, 0, 0, 0}; - fire_book_update (prices, sizes, api::Side::SIDE_SELL, 0, sm, quoter); - verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_FIRST_ACK_CANCELLED, false, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(2000.75), Quantity(100), Quantity (100), false); - LOG(OrderMan, Diag, "quoter_WAITING_FOR_FIRT_ACK.on_book"); - } - SECTION("4. cancel_order") - { - quoter.cancel_order(); - verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_FIRST_ACK_CANCELLED, true, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(2000.75), Quantity(100), Quantity (100), false); - LOG(OrderMan, Diag, "quoter_WAITING_FOR_FIRT_ACK.cancel_order"); - } - SECTION("5. terminate") - { - quoter.terminate (); - verify_complete_quoter_state (quoter, QuoterState::END, true, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(2000.75), Quantity(100), Quantity (100), false); - LOG(OrderMan, Diag, "quoter_WAITING_FOR_FIRT_ACK.terminate"); - } - SECTION("7. update_other_leg_fills") - { - quoter.update_other_leg_fills (0, Quantity(50)); - verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_FIRST_ACK, false, spreader_price, spreader_quantity, Quantity(0), Quantity(50), Price(2000.75), Quantity(100), Quantity (50), false); - // another fill - quoter.update_other_leg_fills (0, Quantity(25)); - verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_FIRST_ACK, false, spreader_price, spreader_quantity, Quantity(0), Quantity(75), Price(2000.75), Quantity(100), Quantity (25), false); - // completely fill the other side - quoter.update_other_leg_fills (0, Quantity(25)); - verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_FIRST_ACK_CANCELLED, false, spreader_price, spreader_quantity, Quantity(0), Quantity(100), Price(2000.75), Quantity(100), Quantity (0), true); - LOG(OrderMan, Diag, "quoter_WAITING_FOR_FIRT_ACK.update_other_leg_fills"); - } - SECTION("8. update_order_price_quantity") - { - spreader_price = Price(0.5); spreader_quantity = Quantity (125); - quoter.update_order_price_quantity (spreader_price, spreader_quantity); - verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_FIRST_ACK, false, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(2000.75), Quantity(100), spreader_quantity, false); - // other leg fill - quoter.update_other_leg_fills (0, Quantity(50)); - verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_FIRST_ACK, false, spreader_price, spreader_quantity, Quantity(0), Quantity(50), Price(2000.75), Quantity(100), Quantity (75), false); - // on zero size, it should go to end state - spreader_price = Price (0.5); spreader_quantity = Quantity (50); - quoter.update_order_price_quantity (spreader_price, spreader_quantity); - verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_FIRST_ACK_CANCELLED, false, spreader_price, spreader_quantity, Quantity(0), Quantity(50), Price(2000.75), Quantity(100), Quantity (0), true); - LOG(OrderMan, Diag, "quoter_WAITING_FOR_FIRT_ACK.update_order_price_quantity"); - } -} -TEST_CASE ("quoter_WAITING_FOR_FIRT_ACK_CANCELLED", "[spreader]") -{ - bts::orderman::OrderKey spreader_order_key(0); - Price spreader_price = Price (0.35); Quantity spreader_quantity (100); - SpreaderManagerForTest* sm_ptr = create_spreader_manager_2_legs (spreader_order_key, - bts::api::Venue::VENUE_GLBX, "ES", 2017, 12, 15, 1.0, 1.0, 1.0, api::Side::SIDE_BUY, 1.0, 0.25, - bts::api::Venue::VENUE_GLBX, "ES", 2017, 3, 15, 1.0, -1.0, 1.0, api::Side::SIDE_SELL, 1.0, 0.25); - SpreaderBookkeepingData& bookeeping_data = sm_ptr->bookkeeping_data(); - SpreaderManagerForTest& sm = *sm_ptr; - SingleLegQuoter& quoter = bookeeping_data.get_leg_data(1).quoter(); - quoter.one_time_activate(spreader_price, spreader_quantity); - double prices[] = {2000, 2001, 0, 0, 0}; uint16_t sizes[] = {60, 55, 0, 0, 0}; - fire_book_update (prices, sizes, api::Side::SIDE_SELL, 0, sm, quoter); - quoter.cancel_order (); - verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_FIRST_ACK_CANCELLED, true, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(2000.75), Quantity(100), Quantity (100), false); - SECTION("2. update_order_status_non_terminal") - { - SpreaderChildOrderState& u = bookeeping_data.get_leg_data(1).order_update_message(); - on_order_update (u, api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (70), Price (2000)); - quoter.update_order_status(u); - verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_CANCEL_ACK, true, spreader_price, spreader_quantity, Quantity(70), Quantity(0), Price(2000.75), Quantity(100), Quantity(30), false); - LOG(OrderMan, Diag, "quoter_WAITING_FOR_FIRT_ACK_CANCELLED.update_order_status_non_terminal"); - } - SECTION("2. update_order_status_terminal") - { - SpreaderChildOrderState& u = bookeeping_data.get_leg_data(1).order_update_message(); - on_order_update (u, api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (100), Price (2000)); - quoter.update_order_status(u); - verify_complete_quoter_state (quoter, QuoterState::END, true, spreader_price, spreader_quantity, Quantity(100), Quantity(0), Price(2000.75), Quantity(100), Quantity(0), true); - LOG(OrderMan, Diag, "quoter_WAITING_FOR_FIRT_ACK_CANCELLED.update_order_status_terminal"); - } - SECTION("3. on_book") - { - double prices[] = {0, 0, 0, 0, 0}; uint16_t sizes[] = {0, 0, 0, 0, 0}; - fire_book_update (prices, sizes, api::Side::SIDE_SELL, 0, sm, quoter); - verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_FIRST_ACK_CANCELLED, true, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(2000.75), Quantity(100), Quantity (100), false); - LOG(OrderMan, Diag, "quoter_WAITING_FOR_FIRT_ACK_CANCELLED.on_book"); - } - SECTION("4. cancel_order") - { - quoter.cancel_order(); - verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_FIRST_ACK_CANCELLED, true, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(2000.75), Quantity(100), Quantity (100), false); - LOG(OrderMan, Diag, "quoter_WAITING_FOR_FIRT_ACK_CANCELLED.cancel_order"); - } - SECTION("5. terminate") - { - quoter.terminate (); - verify_complete_quoter_state (quoter, QuoterState::END, true, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(2000.75), Quantity(100), Quantity (100), false); - LOG(OrderMan, Diag, "quoter_WAITING_FOR_FIRT_ACK_CANCELLED.terminate"); - } - SECTION("7. update_other_leg_fills") - { - quoter.update_other_leg_fills (0, Quantity(50)); - verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_FIRST_ACK_CANCELLED, true, spreader_price, spreader_quantity, Quantity(0), Quantity(50), Price(2000.75), Quantity(100), Quantity (50), false); - // another fill - quoter.update_other_leg_fills (0, Quantity(25)); - verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_FIRST_ACK_CANCELLED, true, spreader_price, spreader_quantity, Quantity(0), Quantity(75), Price(2000.75), Quantity(100), Quantity (25), false); - // completely fill the other side - quoter.update_other_leg_fills (0, Quantity(25)); - verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_FIRST_ACK_CANCELLED, true, spreader_price, spreader_quantity, Quantity(0), Quantity(100), Price(2000.75), Quantity(100), Quantity (0), true); - LOG(OrderMan, Diag, "quoter_WAITING_FOR_FIRT_ACK_CANCELLED.update_other_leg_fills"); - } - SECTION("8. update_order_price_quantity") - { - spreader_price = Price (0.5); spreader_quantity = Quantity (200); - quoter.update_order_price_quantity (spreader_price, spreader_quantity); - verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_FIRST_ACK_CANCELLED, true, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(2000.75), Quantity(100), Quantity (200), false); - spreader_price = Price (0.5); spreader_quantity = Quantity (0); - quoter.update_order_price_quantity (spreader_price, spreader_quantity); - verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_FIRST_ACK_CANCELLED, true, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(2000.75), Quantity(100), Quantity (0), true); - LOG(OrderMan, Diag, "quoter_WAITING_FOR_FIRT_ACK_CANCELLED.update_order_price_quantity"); - } -} -TEST_CASE ("quoter_WAITING_FOR_CANCEL_ACK", "[spreader]") -{ - bts::orderman::OrderKey spreader_order_key(0); - Price spreader_price = Price (0.35); Quantity spreader_quantity (100); - SpreaderManagerForTest* sm_ptr = create_spreader_manager_2_legs (spreader_order_key, - bts::api::Venue::VENUE_GLBX, "ES", 2017, 12, 15, 1.0, 1.0, 1.0, api::Side::SIDE_BUY, 1.0, 0.25, - bts::api::Venue::VENUE_GLBX, "ES", 2017, 3, 15, 1.0, -1.0, 1.0, api::Side::SIDE_SELL, 1.0, 0.25); - SpreaderBookkeepingData& bookeeping_data = sm_ptr->bookkeeping_data(); - SpreaderManagerForTest& sm = *sm_ptr; - SingleLegQuoter& quoter = bookeeping_data.get_leg_data(1).quoter(); - quoter.one_time_activate(spreader_price, spreader_quantity); - double prices[] = {2000, 2001, 0, 0, 0}; uint16_t sizes[] = {60, 55, 0, 0, 0}; - fire_book_update (prices, sizes, api::Side::SIDE_SELL, 0, sm, quoter); - quoter.cancel_order (); - SpreaderChildOrderState& u = bookeeping_data.get_leg_data(1).order_update_message(); - on_order_update (u, api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); - quoter.update_order_status(u); - verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_CANCEL_ACK, true, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(2000.75), Quantity(100), Quantity(100), false); - SECTION("2. update_order_status_non_terminal") - { - on_order_update (u, api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (70), Price (2000)); - quoter.update_order_status(u); - verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_CANCEL_ACK, true, spreader_price, spreader_quantity, Quantity(70), Quantity(0), Price(2000.75), Quantity(100), Quantity(30), false); - LOG(OrderMan, Diag, "quoter_WAITING_FOR_CANCEL_ACK.update_order_status_non_terminal"); - } - SECTION("2. update_order_status_terminal") - { - on_order_update (u, api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (100), Price (2000)); - quoter.update_order_status(u); - verify_complete_quoter_state (quoter, QuoterState::END, true, spreader_price, spreader_quantity, Quantity(100), Quantity(0), Price(2000.75), Quantity(100), Quantity(0), true); - LOG(OrderMan, Diag, "quoter_WAITING_FOR_CANCEL_ACK.update_order_status_terminal"); - } - SECTION("3. on_book") - { - double zero_prices[] = {0, 0, 0, 0, 0}; uint16_t zero_sizes[] = {0, 0, 0, 0, 0}; - fire_book_update (prices, sizes, api::Side::SIDE_SELL, 1, sm, quoter); - // any - REQUIRE (quoter.test_only_func_quoter_state () == QuoterState::WAITING_FOR_CANCEL_ACK); - verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_CANCEL_ACK, true, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(2000.75), Quantity(100), Quantity(100), false); - LOG(OrderMan, Diag, "quoter_WAITING_FOR_CANCEL_ACK.on_book"); - } - SECTION("4. cancel_order") - { - quoter.cancel_order(); - verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_CANCEL_ACK, true, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(2000.75), Quantity(100), Quantity(100), false); - LOG(OrderMan, Diag, "quoter_WAITING_FOR_CANCEL_ACK.cancel_order"); - } - SECTION("5. terminate") - { - quoter.terminate (); - verify_complete_quoter_state (quoter, QuoterState::END, true, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(2000.75), Quantity(100), Quantity(100), false); - LOG(OrderMan, Diag, "quoter_WAITING_FOR_CANCEL_ACK.terminate"); - } - SECTION("7. update_other_leg_fills") - { - quoter.update_other_leg_fills (0, Quantity(10)); - verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_CANCEL_ACK, true, spreader_price, spreader_quantity, Quantity(0), Quantity(10), Price(2000.75), Quantity(100), Quantity(90), false); - // another fill - quoter.update_other_leg_fills (0, Quantity(50)); - verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_CANCEL_ACK, true, spreader_price, spreader_quantity, Quantity(0), Quantity(60), Price(2000.75), Quantity(100), Quantity(40), false); - // completely fill - quoter.update_other_leg_fills (0, Quantity(40)); - verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_CANCEL_ACK, true, spreader_price, spreader_quantity, Quantity(0), Quantity(100), Price(2000.75), Quantity(100), Quantity(0), true); - LOG(OrderMan, Diag, "quoter_WAITING_FOR_CANCEL_ACK.update_other_leg_fills"); - } - SECTION("8. update_order_price_quantity") - { - spreader_price = Price (0.5); spreader_quantity = Quantity (200); - quoter.update_order_price_quantity (spreader_price, spreader_quantity); - verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_CANCEL_ACK, true, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(2000.75), Quantity(100), spreader_quantity, false); - // on zero size, it should go to end state - spreader_price = Price (0.5); spreader_quantity = Quantity (0); - quoter.update_order_price_quantity (spreader_price, spreader_quantity); - verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_CANCEL_ACK, true, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(2000.75), Quantity(100), spreader_quantity, true); - LOG(OrderMan, Diag, "quoter_WAITING_FOR_CANCEL_ACK.update_order_price_quantity"); - } -} -TEST_CASE ("quoter_END", "[spreader]") -{ - bts::orderman::OrderKey spreader_order_key(0); - Price spreader_price = Price (0.35); Quantity spreader_quantity (100); - SpreaderManagerForTest* sm_ptr = create_spreader_manager_2_legs (spreader_order_key, - bts::api::Venue::VENUE_GLBX, "ES", 2017, 12, 15, 1.0, 1.0, 1.0, api::Side::SIDE_BUY, 1.0, 0.25, - bts::api::Venue::VENUE_GLBX, "ES", 2017, 3, 15, 1.0, -1.0, 1.0, api::Side::SIDE_SELL, 1.0, 0.25); - SpreaderBookkeepingData& bookeeping_data = sm_ptr->bookkeeping_data(); - SpreaderManagerForTest& sm = *sm_ptr; - SingleLegQuoter& quoter = bookeeping_data.get_leg_data(1).quoter(); - quoter.one_time_activate(spreader_price, spreader_quantity); - double prices[] = {2000, 2001, 0, 0, 0}; uint16_t sizes[] = {50, 25, 0, 0, 0}; - fire_book_update (prices, sizes, api::Side::SIDE_SELL, 0, sm, quoter); - // the end state is different than the others. it takes action - // on entry, and either goes back to WAITING_FOR_SIZE or stays - // in END permenantly - SECTION("partially_filled_terminal_state") - { - // this should go back to waiting for size - // since the 75 lot of filled but the - // target is 100 - verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_FIRST_ACK, false, spreader_price, spreader_quantity, Quantity(0), Quantity (0), Price (2000.75), Quantity (75), spreader_quantity, false); - // setting md to 0, so it doesnt submit an order immediatly - double zero_prices[] = {2000, 2001, 0, 0, 0}; uint16_t zero_sizes[] = {0, 0, 0, 0, 0}; - fire_book_update (zero_prices, zero_sizes, api::Side::SIDE_SELL, 0, sm, quoter); - // fill the working lot - SpreaderChildOrderState& u = bookeeping_data.get_leg_data(1).order_update_message(); - on_order_update (u, api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (75), Price (2000)); - quoter.update_order_status(u); - verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_SIZE, false, spreader_price, spreader_quantity, Quantity(0), Quantity (0), Price (0), Quantity (0), Quantity(25), false); - LOG(OrderMan, Diag, "quoter_END.partially_filled_terminal_state"); - } - SECTION("completely_filled_terminal_state") - { - // this should back to waiting for size - // since the 75 lot of filled but the - // target is 100 - verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_FIRST_ACK, false, spreader_price, spreader_quantity, Quantity(0), Quantity (0), Price (2000.75), Quantity (75), spreader_quantity, false); - // changing size to 75, so that a fill on the order can completely fill it - // setting md to 0, so it doesnt submit an order immediatly - spreader_quantity = Quantity (75); - quoter.update_order_price_quantity (spreader_price, spreader_quantity); - verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_FIRST_ACK, false, spreader_price, spreader_quantity, Quantity(0), Quantity (0), Price (2000.75), Quantity (75), spreader_quantity, false); - SpreaderChildOrderState& u = bookeeping_data.get_leg_data(1).order_update_message(); - on_order_update (u, api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (75), Price (2000)); - quoter.update_order_status(u); - verify_complete_quoter_state (quoter, QuoterState::END, false, spreader_price, spreader_quantity, Quantity(75), Quantity (0), Price (2000.75), Quantity (75), Quantity(0), true); - LOG(OrderMan, Diag, "quoter_END.completely_filled_terminal_state"); - } - SECTION("terminate_terminal_state") - { - // this should back to waiting for size - // since the 75 lot of filled but the - // target is 100 - verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_FIRST_ACK, false, spreader_price, spreader_quantity, Quantity(0), Quantity (0), Price (2000.75), Quantity (75), spreader_quantity, false); - quoter.terminate (); - //verify_complete_quoter_state (quoter, QuoterState::END, true, spreader_price, spreader_quantity, Quantity(0), Quantity (0), Price (2000.75), Quantity (75), spreader_quantity, false); - verify_complete_quoter_state (quoter, QuoterState::END, true, spreader_price, spreader_quantity, Quantity(0), Quantity (0), Price (2000.75), Quantity (75), spreader_quantity, false); - LOG(OrderMan, Diag, "quoter_END.terminate_terminal_state"); - } -} -TEST_CASE ("quoter_WORKING", "[spreader]") -{ - bts::orderman::OrderKey spreader_order_key(0); - Price spreader_price = Price (0.5); Quantity spreader_quantity (100); - SpreaderManagerForTest* sm_ptr = create_spreader_manager_2_legs (spreader_order_key, - bts::api::Venue::VENUE_GLBX, "ES", 2017, 12, 15, 1.0, 1.0, 1.0, api::Side::SIDE_BUY, 1.0, 0.25, - bts::api::Venue::VENUE_GLBX, "ES", 2017, 3, 15, 1.0, -1.0, 1.0, api::Side::SIDE_SELL, 1.0, 0.25); - SpreaderBookkeepingData& bookeeping_data = sm_ptr->bookkeeping_data(); - SpreaderManagerForTest& sm = *sm_ptr; - SingleLegQuoter& quoter = bookeeping_data.get_leg_data(1).quoter(); - quoter.one_time_activate(spreader_price, spreader_quantity); - double prices[] = {2000.0, 2000.25, 2000.5, 2000.75, 2001.0}; uint16_t sizes[] = {5, 10, 4, 6, 15}; - fire_book_update (prices, sizes, api::Side::SIDE_SELL, 0, sm, quoter); - SpreaderChildOrderState& u = bookeeping_data.get_leg_data(1).order_update_message(); - on_order_update (u, api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); - quoter.update_order_status (u); - verify_complete_quoter_state (quoter, QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(2000.5), Quantity(40), Quantity (100), false); - SECTION("2. reduced_size_update_order_status_non_terminal") - { - // partial fills - on_order_update (u, api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (15), Price (2000)); - quoter.update_order_status (u); - verify_complete_quoter_state (quoter, QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity(15), Quantity(0), Price(2000.5), Quantity(55), Quantity (85), false); - LOG(OrderMan, Diag, "quoter_WORKING.reduced_size_update_order_status_non_terminal"); - } - SECTION("2. reduced_size_update_order_status_terminal") - { - // complete fill, should go to end, and then to waiting_for_size. - // a tick here would make it send an order - on_order_update (u, api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (40), Price (2000)); - quoter.update_order_status (u); - verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_SIZE, false, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(0), Quantity(0), Quantity (60), false); - LOG(OrderMan, Diag, "quoter_WORKING.reduced_size_update_order_status_terminal"); - } - SECTION("2. full_size_update_order_status_non_terminal") - { - // change book to accomodate full size - double prices_full[] = {2000.0, 2000.25, 2000.5, 2000.75, 2001.0}; uint16_t sizes_full[] = {10, 30, 25, 15, 20}; - fire_book_update (prices_full, sizes_full, api::Side::SIDE_SELL, 0, sm, quoter); - verify_complete_quoter_state (quoter, QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(2000.50), Quantity(100), Quantity (100), false); - // send out a fill - on_order_update (u, api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (20), Price (2000)); - quoter.update_order_status (u); - verify_complete_quoter_state (quoter, QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity(20), Quantity(0), Price(2000.25), Quantity(100), Quantity (80), false); - LOG(OrderMan, Diag, "quoter_WORKING.full_size_update_order_status_non_terminal"); - } - SECTION("3. on_book") - { - // to piggy back on the book test, the base - // is set as a partial fill of 10, and a hedge - // reduction of 15 - on_order_update (u, api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (10), Price (2000)); - quoter.update_order_status (u); - quoter.update_other_leg_fills (0, Quantity (15)); - double prices_full_0[] = {2000.0, 2000.25, 2000.5, 2000.75, 2001.0}; uint16_t sizes_full_0[] = {10, 30, 25, 15, 20}; - fire_book_update (prices_full_0, sizes_full_0, api::Side::SIDE_SELL, 0, sm, quoter); - verify_complete_quoter_state (quoter, QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity(10), Quantity(15), Price(2000.25), Quantity(85), Quantity (75), false); - // change the book and validate the price (full qty) - double prices_full_1[] = {2000.0, 2000.25, 2000.5, 2000.75, 2001.0}; uint16_t sizes_full_1[] = {75, 0, 0, 0, 0}; - fire_book_update (prices_full_1, sizes_full_1, api::Side::SIDE_SELL, 0, sm, quoter); - verify_complete_quoter_state (quoter, QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity(10), Quantity(15), Price(1999.5), Quantity(85), Quantity (75), false); - // change the book and validate the price again (full qty) - double prices_full_2[] = {2005.0, 2006, 2007, 2008, 2009}; uint16_t sizes_full_2[] = {1, 1, 1, 1, 71}; - fire_book_update (prices_full_2, sizes_full_2, api::Side::SIDE_SELL, 0, sm, quoter); - verify_complete_quoter_state (quoter, QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity(10), Quantity(15), Price(2008.5), Quantity(85), Quantity (75), false); - LOG(OrderMan, Diag, "quoter_WORKING.on_book"); - // and again - double prices_full_3[] = {2000.0, 2001, 2002, 2003, 2004}; uint16_t sizes_full_3[] = {1, 1, 70, 2, 1}; - fire_book_update (prices_full_3, sizes_full_3, api::Side::SIDE_SELL, 0, sm, quoter); - verify_complete_quoter_state (quoter, QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity(10), Quantity(15), Price(2003.5), Quantity(85), Quantity (75), false); - LOG(OrderMan, Diag, "quoter_WORKING.on_book"); - // now decrease the size in book so the full - // target remaining (75) is not there, this should - // result in a reduced order - double prices_full_4[] = {2000.0, 2001, 2002, 2003, 2004}; uint16_t sizes_full_4[] = {1, 1, 1, 1, 26}; - fire_book_update (prices_full_4, sizes_full_4, api::Side::SIDE_SELL, 0, sm, quoter); - verify_complete_quoter_state (quoter, QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity(10), Quantity(15), Price(2003.5), Quantity(40), Quantity (75), false); - LOG(OrderMan, Diag, "quoter_WORKING.on_book"); - // another reduced size - double prices_full_5[] = {2000.0, 2001, 2002, 2003, 2004}; uint16_t sizes_full_5[] = {1, 0, 0, 0, 0}; - fire_book_update (prices_full_5, sizes_full_5, api::Side::SIDE_SELL, 0, sm, quoter); - verify_complete_quoter_state (quoter, QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity(10), Quantity(15), Price(1999.5), Quantity(11), Quantity (75), false); - LOG(OrderMan, Diag, "quoter_WORKING.on_book"); - // and another ... - double prices_full_6[] = {2000.0, 2001, 2002, 2003, 2004}; uint16_t sizes_full_6[] = {1, 1, 1, 1, 1}; - fire_book_update (prices_full_6, sizes_full_6, api::Side::SIDE_SELL, 0, sm, quoter); - verify_complete_quoter_state (quoter, QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity(10), Quantity(15), Price(2003.5), Quantity(15), Quantity (75), false); - LOG(OrderMan, Diag, "quoter_WORKING.on_book"); - // blank out the book, this should result in cxl'ing the order - double prices_full_7[] = {2000.0, 2001, 2002, 2003, 2004}; uint16_t sizes_full_7[] = {0, 0, 0, 0, 0}; - fire_book_update (prices_full_7, sizes_full_7, api::Side::SIDE_SELL, 0, sm, quoter); - verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_CANCEL_ACK, false, spreader_price, spreader_quantity, Quantity(10), Quantity(15), Price(2003.5), Quantity(15), Quantity (75), false); - LOG(OrderMan, Diag, "quoter_WORKING.on_book"); - } - SECTION("4. cancel_order") - { - quoter.cancel_order(); - verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_CANCEL_ACK, true, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(2000.50), Quantity(40), Quantity (100), false); - LOG(OrderMan, Diag, "quoter_WORKING.cancel_order"); - } - SECTION("5. terminate") - { - quoter.terminate (); - verify_complete_quoter_state (quoter, QuoterState::END, true, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(2000.5), Quantity(40), Quantity (100), false); - LOG(OrderMan, Diag, "quoter_WORKING.terminate"); - } - SECTION("7. update_other_leg_fills") - { - // base set with full market and a partial fill of 10 - double prices_full_0[] = {2000.0, 2000.25, 2000.5, 2000.75, 2001.0}; uint16_t sizes_full_0[] = {10, 30, 25, 15, 20}; - fire_book_update (prices_full_0, sizes_full_0, api::Side::SIDE_SELL, 0, sm, quoter); - on_order_update (u, api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (10), Price (2000)); - quoter.update_order_status (u); - verify_complete_quoter_state (quoter, QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity(10), Quantity(0), Price(2000.5), Quantity(100), Quantity (90), false); - // hedge reduction by 10 - quoter.update_other_leg_fills (0, Quantity (10)); - verify_complete_quoter_state (quoter, QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity(10), Quantity(10), Price(2000.25), Quantity(90), Quantity (80), false); - LOG(OrderMan, Diag, "quoter_WORKING.update_other_leg_fills"); - // hedge reduction by another 15 - quoter.update_other_leg_fills (0, Quantity (15)); - verify_complete_quoter_state (quoter, QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity(10), Quantity(25), Price(2000.00), Quantity(75), Quantity (65), false); - LOG(OrderMan, Diag, "quoter_WORKING.update_other_leg_fills"); - // hedge reduction by another 55 - quoter.update_other_leg_fills (0, Quantity (55)); - verify_complete_quoter_state (quoter, QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity(10), Quantity(80), Price(1999.5), Quantity(20), Quantity (10), false); - LOG(OrderMan, Diag, "quoter_WORKING.update_other_leg_fills"); - // this hedge reduction should completely cancel the quoting side - quoter.update_other_leg_fills (0, Quantity (10)); - verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_CANCEL_ACK, false, spreader_price, spreader_quantity, Quantity(10), Quantity(90), Price(1999.5), Quantity(20), Quantity (0), true); - LOG(OrderMan, Diag, "quoter_WORKING.update_other_leg_fills"); - } - SECTION("8. update_order_price_quantity") - { - // change price, qty - spreader_price = Price (0.0); spreader_quantity = Quantity(200); - quoter.update_order_price_quantity (spreader_price, spreader_quantity); - verify_complete_quoter_state (quoter, QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(2001.0), Quantity(40), Quantity (200), false); - // decrease the qty - spreader_price = Price (0.0); spreader_quantity = Quantity(40); - quoter.update_order_price_quantity (spreader_price, spreader_quantity); - verify_complete_quoter_state (quoter, QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(2001.0), Quantity(40), Quantity (40), false); - // other leg fill and then decrease the size - quoter.update_other_leg_fills (0, Quantity (25)); - verify_complete_quoter_state (quoter, QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity(0), Quantity(25), Price(2000.25), Quantity(15), Quantity (15), false); - // change the quantity to beyond what was filled in the other leg - spreader_price = Price (0.0); spreader_quantity = Quantity(25); - quoter.update_order_price_quantity (spreader_price, spreader_quantity); - verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_CANCEL_ACK, false, spreader_price, spreader_quantity, Quantity(0), Quantity(25), Price(2000.25), Quantity(15), Quantity (0), true); - LOG(OrderMan, Diag, "quoter_WORKING.update_order_price_quantity"); - } -} -TEST_CASE ("cycle", "[spreader]") -{ - bts::orderman::OrderKey spreader_order_key(0); - Price spreader_price = Price (0.5); Quantity spreader_quantity (100); - SpreaderManagerForTest* sm_ptr = create_spreader_manager_2_legs (spreader_order_key, - bts::api::Venue::VENUE_GLBX, "ES", 2017, 12, 15, 1.0, 1.0, 1.0, api::Side::SIDE_BUY, 1.0, 0.25, - bts::api::Venue::VENUE_GLBX, "ES", 2017, 3, 15, 1.0, -1.0, 1.0, api::Side::SIDE_SELL, 1.0, 0.25); - SpreaderBookkeepingData& bookeeping_data = sm_ptr->bookkeeping_data(); - SpreaderManagerForTest& sm = *sm_ptr; - SingleLegQuoter& quoter = bookeeping_data.get_leg_data(1).quoter(); - quoter.one_time_activate(spreader_price, spreader_quantity); - double prices[] = {2000.0, 2000.25, 2000.5, 2000.75, 2001.0}; uint16_t sizes[] = {5, 10, 4, 6, 15}; - fire_book_update (prices, sizes, api::Side::SIDE_SELL, 0, sm, quoter); - SpreaderChildOrderState& u = bookeeping_data.get_leg_data(1).order_update_message(); - on_order_update (u, api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); - quoter.update_order_status (u); - verify_complete_quoter_state (quoter, QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(2000.5), Quantity(40), Quantity (100), false); - // so we have a working order of 40 - // fill of 40 -> another order of 40 - // fill of 10 -> order size should go up to 50 (since the book can satisfy 40 lots) - // fill of 10 -> order size should go up to 60 (...) - // fill the remainder -> end - // fill the working 40 - on_order_update (u, api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (40), Price (2000)); - quoter.update_order_status (u); - // cycles back, to waiting for size - verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_SIZE, false, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(0), Quantity(0), Quantity (60), false); - // fire the book, this will fire the order - fire_book_update (prices, sizes, api::Side::SIDE_SELL, 0, sm, quoter); - verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_FIRST_ACK, false, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(2000.50), Quantity(40), Quantity (60), false); - // send ack to make it go to working - //SpreaderChildOrderState u2 = create_order_update (sm.get_leg_data(0)); - SpreaderChildOrderState& u2 = u; - on_order_update (u2, api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); - quoter.update_order_status (u2); - verify_complete_quoter_state (quoter, QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(2000.50), Quantity(40), Quantity (60), false); - // fill 5, this should increase the order size to 45 - on_order_update (u2, api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (5), Price (2000)); - quoter.update_order_status (u2); - verify_complete_quoter_state (quoter, QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity(5), Quantity(0), Price(2000.50), Quantity(45), Quantity (55), false); - // fill it all - on_order_update (u2, api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (45), Price (2000)); - quoter.update_order_status (u2); - verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_SIZE, false, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(0), Quantity(0), Quantity (15), false); - // fire the book, this will fire the order - fire_book_update (prices, sizes, api::Side::SIDE_SELL, 0, sm, quoter); - verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_FIRST_ACK, false, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(1999.75), Quantity(15), Quantity (15), false); - // send an ack - //SpreaderChildOrderState u3 = create_order_update (sm.get_leg_data(0)); - SpreaderChildOrderState& u3 = u; - on_order_update (u3, api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); - quoter.update_order_status (u3); - verify_complete_quoter_state (quoter, QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(1999.75), Quantity(15), Quantity (15), false); - // fill it all, should go to end - on_order_update (u3, api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (15), Price (2000)); - quoter.update_order_status (u3); - verify_complete_quoter_state (quoter, QuoterState::END, false, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(1999.75), Quantity(15), Quantity (0), true); - LOG(OrderMan, Diag, "cycle"); -} -/************************************************************************************************************/ -/*********************************************Hedger State Tests*********************************************/ -/************************************************************************************************************/ -TEST_CASE ("hedger_START_state", "[spreader]") -{ - bts::orderman::OrderKey spreader_order_key(0); - Price hedger_price = Price (0.5); Quantity hedger_quantity (20); - SpreaderManagerForTest* sm_ptr = create_spreader_manager_2_legs (spreader_order_key, - bts::api::Venue::VENUE_GLBX, "ES", 2017, 12, 15, 1.0, 1.0, 1.0, api::Side::SIDE_BUY, 1.0, 0.25, - bts::api::Venue::VENUE_GLBX, "ES", 2017, 3, 15, 1.0, -1.0, 1.0, api::Side::SIDE_SELL, 1.0, 0.25); - SpreaderBookkeepingData& bookeeping_data = sm_ptr->bookkeeping_data(); - SpreaderManagerForTest& sm = *sm_ptr; +// SECTION("3. on_book_zero") +// { +// // 0 size md update, it should keep waiting +// // buying the spread => sell leg 2 => buy leg 1 => leg 1's sell market +// double prices[] = {0, 0, 0, 0, 0}; uint16_t sizes[] = {0, 0, 0, 0, 0}; +// fire_book_update (prices, sizes, api::Side::SIDE_SELL, 0, sm, quoter); +// verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_SIZE, false, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(0), Quantity(0), Quantity (100), false); +// LOG(OrderMan, Diag, "quoter_WAITING_FOR_SIZE_state.on_book_zero success"); +// } +// SECTION("3. on_book_less_size_than_total") +// { +// double prices[] = {2000, 2000.25, 2000.5, 2000.75, 2002}; uint16_t sizes[] = {10, 5, 15, 5, 25}; //60 +// fire_book_update (prices, sizes, api::Side::SIDE_SELL, 0, sm, quoter); +// verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_FIRST_ACK, false, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(2001.75), Quantity(60), Quantity (100), false); +// LOG(OrderMan, Diag, "quoter_WAITING_FOR_SIZE_state.on_book_less_size_than_total"); +// } +// SECTION("3. on_book_more_size_than_total") +// { +// double prices[] = {2000, 2001, 0, 0, 0}; uint16_t sizes[] = {60, 55, 0, 0, 0}; +// fire_book_update (prices, sizes, api::Side::SIDE_SELL, 0, sm, quoter); +// verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_FIRST_ACK, false, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(2000.75), Quantity(100), Quantity (100), false); +// LOG(OrderMan, Diag, "quoter_WAITING_FOR_SIZE_state.on_book_more_size_than_total"); +// } +// SECTION("4. cancel_order") +// { +// quoter.cancel_order(); +// verify_complete_quoter_state (quoter, QuoterState::END, true, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(0), Quantity(0), spreader_quantity, false); +// LOG(OrderMan, Diag, "quoter_WAITING_FOR_SIZE_state.cancel_order"); +// } +// SECTION("5. terminate") +// { +// quoter.terminate(); +// verify_complete_quoter_state (quoter, QuoterState::END, true, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(0), Quantity(0), spreader_quantity, false); +// LOG(OrderMan, Diag, "quoter_WAITING_FOR_SIZE_state.cancel_order"); +// } +// SECTION("7. update_other_leg_fills") +// { +// quoter.update_other_leg_fills (0, Quantity(50)); +// verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_SIZE, false, spreader_price, spreader_quantity, Quantity(0), Quantity(50), Price(0), Quantity(0), Quantity(50), false); +// // another fill +// quoter.update_other_leg_fills (0, Quantity(25)); +// verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_SIZE, false, spreader_price, spreader_quantity, Quantity(0), Quantity(75), Price(0), Quantity(0), Quantity(25), false); +// // completely fill the other side +// quoter.update_other_leg_fills (0, Quantity(25)); +// verify_complete_quoter_state (quoter, QuoterState::END, false, spreader_price, spreader_quantity, Quantity(0), Quantity(100), Price(0), Quantity(0), Quantity(0), true); +// LOG(OrderMan, Diag, "quoter_WAITING_FOR_SIZE_state.update_other_leg_fills"); +// } +// SECTION("8. update_order_price_quantity") +// { +// spreader_price = Price (0.5); spreader_quantity = Quantity (200); +// quoter.update_order_price_quantity (spreader_price, spreader_quantity); +// verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_SIZE, false, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(0), Quantity(0), spreader_quantity, false); +// // on zero size, it should go to end state +// spreader_price = Price (0.5); spreader_quantity = Quantity (0); +// quoter.update_order_price_quantity (spreader_price, spreader_quantity); +// verify_complete_quoter_state (quoter, QuoterState::END, false, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(0), Quantity(0), Quantity(0), true); +// LOG(OrderMan, Diag, "quoter_WAITING_FOR_SIZE_state.update_order_price_quantity"); +// } +// } +// TEST_CASE ("quoter_WAITING_FOR_FIRST_ACK", "[spreader]") +// { +// bts::orderman::OrderKey spreader_order_key(0); +// Price spreader_price = Price (0.35); Quantity spreader_quantity (100); +// SpreaderManagerForTest* sm_ptr = create_spreader_manager_2_legs (spreader_order_key, +// bts::api::Venue::VENUE_GLBX, "ES", 2017, 12, 15, 1.0, 1.0, 1.0, api::Side::SIDE_BUY, 1.0, 0.25, +// bts::api::Venue::VENUE_GLBX, "ES", 2017, 3, 15, 1.0, -1.0, 1.0, api::Side::SIDE_SELL, 1.0, 0.25); +// SpreaderBookkeepingData& bookeeping_data = sm_ptr->bookkeeping_data(); +// SpreaderManagerForTest& sm = *sm_ptr; +// SingleLegQuoter& quoter = bookeeping_data.get_leg_data(1).quoter(); +// quoter.one_time_activate(spreader_price, spreader_quantity); +// double prices[] = {2000, 2001, 0, 0, 0}; uint16_t sizes[] = {60, 55, 0, 0, 0}; +// fire_book_update (prices, sizes, api::Side::SIDE_SELL, 0, sm, quoter); +// verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_FIRST_ACK, false, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(2000.75), Quantity(100), Quantity (100), false); +// SECTION("2. update_order_status_non_terminal") +// { +// SpreaderChildOrderState& u = bookeeping_data.get_leg_data(1).order_update_message(); +// on_order_update (u, api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (70), Price (2000)); +// quoter.update_order_status(u); +// verify_complete_quoter_state (quoter, QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity(70), Quantity(0), Price(1999.75), Quantity(100), Quantity (30), false); +// LOG(OrderMan, Diag, "quoter_WAITING_FOR_FIRT_ACK.update_order_status_non_terminal"); +// } +// SECTION("3. update_order_status_terminal") +// { +// SpreaderChildOrderState& u = bookeeping_data.get_leg_data(1).order_update_message(); +// on_order_update (u, api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (100), Price (2000)); +// quoter.update_order_status(u); +// verify_complete_quoter_state (quoter, QuoterState::END, false, spreader_price, spreader_quantity, Quantity(100), Quantity(0), Price(2000.75), Quantity(100), Quantity (0), true); +// LOG(OrderMan, Diag, "quoter_WAITING_FOR_FIRT_ACK.update_order_status_terminal"); +// } +// SECTION("3. on_book") +// { +// // orders are not updated in this state +// double prices[] = {0, 0, 0, 0, 0}; uint16_t sizes[] = {0, 0, 0, 0, 0}; +// fire_book_update (prices, sizes, api::Side::SIDE_SELL, 0, sm, quoter); +// verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_FIRST_ACK_CANCELLED, false, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(2000.75), Quantity(100), Quantity (100), false); +// LOG(OrderMan, Diag, "quoter_WAITING_FOR_FIRT_ACK.on_book"); +// } +// SECTION("4. cancel_order") +// { +// quoter.cancel_order(); +// verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_FIRST_ACK_CANCELLED, true, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(2000.75), Quantity(100), Quantity (100), false); +// LOG(OrderMan, Diag, "quoter_WAITING_FOR_FIRT_ACK.cancel_order"); +// } +// SECTION("5. terminate") +// { +// quoter.terminate (); +// verify_complete_quoter_state (quoter, QuoterState::END, true, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(2000.75), Quantity(100), Quantity (100), false); +// LOG(OrderMan, Diag, "quoter_WAITING_FOR_FIRT_ACK.terminate"); +// } +// SECTION("7. update_other_leg_fills") +// { +// quoter.update_other_leg_fills (0, Quantity(50)); +// verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_FIRST_ACK, false, spreader_price, spreader_quantity, Quantity(0), Quantity(50), Price(2000.75), Quantity(100), Quantity (50), false); +// // another fill +// quoter.update_other_leg_fills (0, Quantity(25)); +// verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_FIRST_ACK, false, spreader_price, spreader_quantity, Quantity(0), Quantity(75), Price(2000.75), Quantity(100), Quantity (25), false); +// // completely fill the other side +// quoter.update_other_leg_fills (0, Quantity(25)); +// verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_FIRST_ACK_CANCELLED, false, spreader_price, spreader_quantity, Quantity(0), Quantity(100), Price(2000.75), Quantity(100), Quantity (0), true); +// LOG(OrderMan, Diag, "quoter_WAITING_FOR_FIRT_ACK.update_other_leg_fills"); +// } +// SECTION("8. update_order_price_quantity") +// { +// spreader_price = Price(0.5); spreader_quantity = Quantity (125); +// quoter.update_order_price_quantity (spreader_price, spreader_quantity); +// verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_FIRST_ACK, false, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(2000.75), Quantity(100), spreader_quantity, false); +// // other leg fill +// quoter.update_other_leg_fills (0, Quantity(50)); +// verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_FIRST_ACK, false, spreader_price, spreader_quantity, Quantity(0), Quantity(50), Price(2000.75), Quantity(100), Quantity (75), false); +// // on zero size, it should go to end state +// spreader_price = Price (0.5); spreader_quantity = Quantity (50); +// quoter.update_order_price_quantity (spreader_price, spreader_quantity); +// verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_FIRST_ACK_CANCELLED, false, spreader_price, spreader_quantity, Quantity(0), Quantity(50), Price(2000.75), Quantity(100), Quantity (0), true); +// LOG(OrderMan, Diag, "quoter_WAITING_FOR_FIRT_ACK.update_order_price_quantity"); +// } +// } +// TEST_CASE ("quoter_WAITING_FOR_FIRT_ACK_CANCELLED", "[spreader]") +// { +// bts::orderman::OrderKey spreader_order_key(0); +// Price spreader_price = Price (0.35); Quantity spreader_quantity (100); +// SpreaderManagerForTest* sm_ptr = create_spreader_manager_2_legs (spreader_order_key, +// bts::api::Venue::VENUE_GLBX, "ES", 2017, 12, 15, 1.0, 1.0, 1.0, api::Side::SIDE_BUY, 1.0, 0.25, +// bts::api::Venue::VENUE_GLBX, "ES", 2017, 3, 15, 1.0, -1.0, 1.0, api::Side::SIDE_SELL, 1.0, 0.25); +// SpreaderBookkeepingData& bookeeping_data = sm_ptr->bookkeeping_data(); +// SpreaderManagerForTest& sm = *sm_ptr; +// SingleLegQuoter& quoter = bookeeping_data.get_leg_data(1).quoter(); +// quoter.one_time_activate(spreader_price, spreader_quantity); +// double prices[] = {2000, 2001, 0, 0, 0}; uint16_t sizes[] = {60, 55, 0, 0, 0}; +// fire_book_update (prices, sizes, api::Side::SIDE_SELL, 0, sm, quoter); +// quoter.cancel_order (); +// verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_FIRST_ACK_CANCELLED, true, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(2000.75), Quantity(100), Quantity (100), false); +// SECTION("2. update_order_status_non_terminal") +// { +// SpreaderChildOrderState& u = bookeeping_data.get_leg_data(1).order_update_message(); +// on_order_update (u, api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (70), Price (2000)); +// quoter.update_order_status(u); +// verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_CANCEL_ACK, true, spreader_price, spreader_quantity, Quantity(70), Quantity(0), Price(2000.75), Quantity(100), Quantity(30), false); +// LOG(OrderMan, Diag, "quoter_WAITING_FOR_FIRT_ACK_CANCELLED.update_order_status_non_terminal"); +// } +// SECTION("2. update_order_status_terminal") +// { +// SpreaderChildOrderState& u = bookeeping_data.get_leg_data(1).order_update_message(); +// on_order_update (u, api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (100), Price (2000)); +// quoter.update_order_status(u); +// verify_complete_quoter_state (quoter, QuoterState::END, true, spreader_price, spreader_quantity, Quantity(100), Quantity(0), Price(2000.75), Quantity(100), Quantity(0), true); +// LOG(OrderMan, Diag, "quoter_WAITING_FOR_FIRT_ACK_CANCELLED.update_order_status_terminal"); +// } +// SECTION("3. on_book") +// { +// double prices[] = {0, 0, 0, 0, 0}; uint16_t sizes[] = {0, 0, 0, 0, 0}; +// fire_book_update (prices, sizes, api::Side::SIDE_SELL, 0, sm, quoter); +// verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_FIRST_ACK_CANCELLED, true, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(2000.75), Quantity(100), Quantity (100), false); +// LOG(OrderMan, Diag, "quoter_WAITING_FOR_FIRT_ACK_CANCELLED.on_book"); +// } +// SECTION("4. cancel_order") +// { +// quoter.cancel_order(); +// verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_FIRST_ACK_CANCELLED, true, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(2000.75), Quantity(100), Quantity (100), false); +// LOG(OrderMan, Diag, "quoter_WAITING_FOR_FIRT_ACK_CANCELLED.cancel_order"); +// } +// SECTION("5. terminate") +// { +// quoter.terminate (); +// verify_complete_quoter_state (quoter, QuoterState::END, true, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(2000.75), Quantity(100), Quantity (100), false); +// LOG(OrderMan, Diag, "quoter_WAITING_FOR_FIRT_ACK_CANCELLED.terminate"); +// } +// SECTION("7. update_other_leg_fills") +// { +// quoter.update_other_leg_fills (0, Quantity(50)); +// verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_FIRST_ACK_CANCELLED, true, spreader_price, spreader_quantity, Quantity(0), Quantity(50), Price(2000.75), Quantity(100), Quantity (50), false); +// // another fill +// quoter.update_other_leg_fills (0, Quantity(25)); +// verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_FIRST_ACK_CANCELLED, true, spreader_price, spreader_quantity, Quantity(0), Quantity(75), Price(2000.75), Quantity(100), Quantity (25), false); +// // completely fill the other side +// quoter.update_other_leg_fills (0, Quantity(25)); +// verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_FIRST_ACK_CANCELLED, true, spreader_price, spreader_quantity, Quantity(0), Quantity(100), Price(2000.75), Quantity(100), Quantity (0), true); +// LOG(OrderMan, Diag, "quoter_WAITING_FOR_FIRT_ACK_CANCELLED.update_other_leg_fills"); +// } +// SECTION("8. update_order_price_quantity") +// { +// spreader_price = Price (0.5); spreader_quantity = Quantity (200); +// quoter.update_order_price_quantity (spreader_price, spreader_quantity); +// verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_FIRST_ACK_CANCELLED, true, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(2000.75), Quantity(100), Quantity (200), false); +// spreader_price = Price (0.5); spreader_quantity = Quantity (0); +// quoter.update_order_price_quantity (spreader_price, spreader_quantity); +// verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_FIRST_ACK_CANCELLED, true, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(2000.75), Quantity(100), Quantity (0), true); +// LOG(OrderMan, Diag, "quoter_WAITING_FOR_FIRT_ACK_CANCELLED.update_order_price_quantity"); +// } +// } +// TEST_CASE ("quoter_WAITING_FOR_CANCEL_ACK", "[spreader]") +// { +// bts::orderman::OrderKey spreader_order_key(0); +// Price spreader_price = Price (0.35); Quantity spreader_quantity (100); +// SpreaderManagerForTest* sm_ptr = create_spreader_manager_2_legs (spreader_order_key, +// bts::api::Venue::VENUE_GLBX, "ES", 2017, 12, 15, 1.0, 1.0, 1.0, api::Side::SIDE_BUY, 1.0, 0.25, +// bts::api::Venue::VENUE_GLBX, "ES", 2017, 3, 15, 1.0, -1.0, 1.0, api::Side::SIDE_SELL, 1.0, 0.25); +// SpreaderBookkeepingData& bookeeping_data = sm_ptr->bookkeeping_data(); +// SpreaderManagerForTest& sm = *sm_ptr; +// SingleLegQuoter& quoter = bookeeping_data.get_leg_data(1).quoter(); +// quoter.one_time_activate(spreader_price, spreader_quantity); +// double prices[] = {2000, 2001, 0, 0, 0}; uint16_t sizes[] = {60, 55, 0, 0, 0}; +// fire_book_update (prices, sizes, api::Side::SIDE_SELL, 0, sm, quoter); +// quoter.cancel_order (); +// SpreaderChildOrderState& u = bookeeping_data.get_leg_data(1).order_update_message(); +// on_order_update (u, api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); +// quoter.update_order_status(u); +// verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_CANCEL_ACK, true, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(2000.75), Quantity(100), Quantity(100), false); +// SECTION("2. update_order_status_non_terminal") +// { +// on_order_update (u, api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (70), Price (2000)); +// quoter.update_order_status(u); +// verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_CANCEL_ACK, true, spreader_price, spreader_quantity, Quantity(70), Quantity(0), Price(2000.75), Quantity(100), Quantity(30), false); +// LOG(OrderMan, Diag, "quoter_WAITING_FOR_CANCEL_ACK.update_order_status_non_terminal"); +// } +// SECTION("2. update_order_status_terminal") +// { +// on_order_update (u, api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (100), Price (2000)); +// quoter.update_order_status(u); +// verify_complete_quoter_state (quoter, QuoterState::END, true, spreader_price, spreader_quantity, Quantity(100), Quantity(0), Price(2000.75), Quantity(100), Quantity(0), true); +// LOG(OrderMan, Diag, "quoter_WAITING_FOR_CANCEL_ACK.update_order_status_terminal"); +// } +// SECTION("3. on_book") +// { +// double zero_prices[] = {0, 0, 0, 0, 0}; uint16_t zero_sizes[] = {0, 0, 0, 0, 0}; +// fire_book_update (prices, sizes, api::Side::SIDE_SELL, 1, sm, quoter); +// // any +// REQUIRE (quoter.test_only_func_quoter_state () == QuoterState::WAITING_FOR_CANCEL_ACK); +// verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_CANCEL_ACK, true, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(2000.75), Quantity(100), Quantity(100), false); +// LOG(OrderMan, Diag, "quoter_WAITING_FOR_CANCEL_ACK.on_book"); +// } +// SECTION("4. cancel_order") +// { +// quoter.cancel_order(); +// verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_CANCEL_ACK, true, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(2000.75), Quantity(100), Quantity(100), false); +// LOG(OrderMan, Diag, "quoter_WAITING_FOR_CANCEL_ACK.cancel_order"); +// } +// SECTION("5. terminate") +// { +// quoter.terminate (); +// verify_complete_quoter_state (quoter, QuoterState::END, true, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(2000.75), Quantity(100), Quantity(100), false); +// LOG(OrderMan, Diag, "quoter_WAITING_FOR_CANCEL_ACK.terminate"); +// } +// SECTION("7. update_other_leg_fills") +// { +// quoter.update_other_leg_fills (0, Quantity(10)); +// verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_CANCEL_ACK, true, spreader_price, spreader_quantity, Quantity(0), Quantity(10), Price(2000.75), Quantity(100), Quantity(90), false); +// // another fill +// quoter.update_other_leg_fills (0, Quantity(50)); +// verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_CANCEL_ACK, true, spreader_price, spreader_quantity, Quantity(0), Quantity(60), Price(2000.75), Quantity(100), Quantity(40), false); +// // completely fill +// quoter.update_other_leg_fills (0, Quantity(40)); +// verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_CANCEL_ACK, true, spreader_price, spreader_quantity, Quantity(0), Quantity(100), Price(2000.75), Quantity(100), Quantity(0), true); +// LOG(OrderMan, Diag, "quoter_WAITING_FOR_CANCEL_ACK.update_other_leg_fills"); +// } +// SECTION("8. update_order_price_quantity") +// { +// spreader_price = Price (0.5); spreader_quantity = Quantity (200); +// quoter.update_order_price_quantity (spreader_price, spreader_quantity); +// verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_CANCEL_ACK, true, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(2000.75), Quantity(100), spreader_quantity, false); +// // on zero size, it should go to end state +// spreader_price = Price (0.5); spreader_quantity = Quantity (0); +// quoter.update_order_price_quantity (spreader_price, spreader_quantity); +// verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_CANCEL_ACK, true, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(2000.75), Quantity(100), spreader_quantity, true); +// LOG(OrderMan, Diag, "quoter_WAITING_FOR_CANCEL_ACK.update_order_price_quantity"); +// } +// } +// TEST_CASE ("quoter_END", "[spreader]") +// { +// bts::orderman::OrderKey spreader_order_key(0); +// Price spreader_price = Price (0.35); Quantity spreader_quantity (100); +// SpreaderManagerForTest* sm_ptr = create_spreader_manager_2_legs (spreader_order_key, +// bts::api::Venue::VENUE_GLBX, "ES", 2017, 12, 15, 1.0, 1.0, 1.0, api::Side::SIDE_BUY, 1.0, 0.25, +// bts::api::Venue::VENUE_GLBX, "ES", 2017, 3, 15, 1.0, -1.0, 1.0, api::Side::SIDE_SELL, 1.0, 0.25); +// SpreaderBookkeepingData& bookeeping_data = sm_ptr->bookkeeping_data(); +// SpreaderManagerForTest& sm = *sm_ptr; +// SingleLegQuoter& quoter = bookeeping_data.get_leg_data(1).quoter(); +// quoter.one_time_activate(spreader_price, spreader_quantity); +// double prices[] = {2000, 2001, 0, 0, 0}; uint16_t sizes[] = {50, 25, 0, 0, 0}; +// fire_book_update (prices, sizes, api::Side::SIDE_SELL, 0, sm, quoter); +// // the end state is different than the others. it takes action +// // on entry, and either goes back to WAITING_FOR_SIZE or stays +// // in END permenantly +// SECTION("partially_filled_terminal_state") +// { +// // this should go back to waiting for size +// // since the 75 lot of filled but the +// // target is 100 +// verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_FIRST_ACK, false, spreader_price, spreader_quantity, Quantity(0), Quantity (0), Price (2000.75), Quantity (75), spreader_quantity, false); +// // setting md to 0, so it doesnt submit an order immediatly +// double zero_prices[] = {2000, 2001, 0, 0, 0}; uint16_t zero_sizes[] = {0, 0, 0, 0, 0}; +// fire_book_update (zero_prices, zero_sizes, api::Side::SIDE_SELL, 0, sm, quoter); +// // fill the working lot +// SpreaderChildOrderState& u = bookeeping_data.get_leg_data(1).order_update_message(); +// on_order_update (u, api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (75), Price (2000)); +// quoter.update_order_status(u); +// verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_SIZE, false, spreader_price, spreader_quantity, Quantity(0), Quantity (0), Price (0), Quantity (0), Quantity(25), false); +// LOG(OrderMan, Diag, "quoter_END.partially_filled_terminal_state"); +// } +// SECTION("completely_filled_terminal_state") +// { +// // this should back to waiting for size +// // since the 75 lot of filled but the +// // target is 100 +// verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_FIRST_ACK, false, spreader_price, spreader_quantity, Quantity(0), Quantity (0), Price (2000.75), Quantity (75), spreader_quantity, false); +// // changing size to 75, so that a fill on the order can completely fill it +// // setting md to 0, so it doesnt submit an order immediatly +// spreader_quantity = Quantity (75); +// quoter.update_order_price_quantity (spreader_price, spreader_quantity); +// verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_FIRST_ACK, false, spreader_price, spreader_quantity, Quantity(0), Quantity (0), Price (2000.75), Quantity (75), spreader_quantity, false); +// SpreaderChildOrderState& u = bookeeping_data.get_leg_data(1).order_update_message(); +// on_order_update (u, api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (75), Price (2000)); +// quoter.update_order_status(u); +// verify_complete_quoter_state (quoter, QuoterState::END, false, spreader_price, spreader_quantity, Quantity(75), Quantity (0), Price (2000.75), Quantity (75), Quantity(0), true); +// LOG(OrderMan, Diag, "quoter_END.completely_filled_terminal_state"); +// } +// SECTION("terminate_terminal_state") +// { +// // this should back to waiting for size +// // since the 75 lot of filled but the +// // target is 100 +// verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_FIRST_ACK, false, spreader_price, spreader_quantity, Quantity(0), Quantity (0), Price (2000.75), Quantity (75), spreader_quantity, false); +// quoter.terminate (); +// //verify_complete_quoter_state (quoter, QuoterState::END, true, spreader_price, spreader_quantity, Quantity(0), Quantity (0), Price (2000.75), Quantity (75), spreader_quantity, false); +// verify_complete_quoter_state (quoter, QuoterState::END, true, spreader_price, spreader_quantity, Quantity(0), Quantity (0), Price (2000.75), Quantity (75), spreader_quantity, false); +// LOG(OrderMan, Diag, "quoter_END.terminate_terminal_state"); +// } +// } +// TEST_CASE ("quoter_WORKING", "[spreader]") +// { +// bts::orderman::OrderKey spreader_order_key(0); +// Price spreader_price = Price (0.5); Quantity spreader_quantity (100); +// SpreaderManagerForTest* sm_ptr = create_spreader_manager_2_legs (spreader_order_key, +// bts::api::Venue::VENUE_GLBX, "ES", 2017, 12, 15, 1.0, 1.0, 1.0, api::Side::SIDE_BUY, 1.0, 0.25, +// bts::api::Venue::VENUE_GLBX, "ES", 2017, 3, 15, 1.0, -1.0, 1.0, api::Side::SIDE_SELL, 1.0, 0.25); +// SpreaderBookkeepingData& bookeeping_data = sm_ptr->bookkeeping_data(); +// SpreaderManagerForTest& sm = *sm_ptr; +// SingleLegQuoter& quoter = bookeeping_data.get_leg_data(1).quoter(); +// quoter.one_time_activate(spreader_price, spreader_quantity); +// double prices[] = {2000.0, 2000.25, 2000.5, 2000.75, 2001.0}; uint16_t sizes[] = {5, 10, 4, 6, 15}; +// fire_book_update (prices, sizes, api::Side::SIDE_SELL, 0, sm, quoter); +// SpreaderChildOrderState& u = bookeeping_data.get_leg_data(1).order_update_message(); +// on_order_update (u, api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); +// quoter.update_order_status (u); +// verify_complete_quoter_state (quoter, QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(2000.5), Quantity(40), Quantity (100), false); +// SECTION("2. reduced_size_update_order_status_non_terminal") +// { +// // partial fills +// on_order_update (u, api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (15), Price (2000)); +// quoter.update_order_status (u); +// verify_complete_quoter_state (quoter, QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity(15), Quantity(0), Price(2000.5), Quantity(55), Quantity (85), false); +// LOG(OrderMan, Diag, "quoter_WORKING.reduced_size_update_order_status_non_terminal"); +// } +// SECTION("2. reduced_size_update_order_status_terminal") +// { +// // complete fill, should go to end, and then to waiting_for_size. +// // a tick here would make it send an order +// on_order_update (u, api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (40), Price (2000)); +// quoter.update_order_status (u); +// verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_SIZE, false, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(0), Quantity(0), Quantity (60), false); +// LOG(OrderMan, Diag, "quoter_WORKING.reduced_size_update_order_status_terminal"); +// } +// SECTION("2. full_size_update_order_status_non_terminal") +// { +// // change book to accomodate full size +// double prices_full[] = {2000.0, 2000.25, 2000.5, 2000.75, 2001.0}; uint16_t sizes_full[] = {10, 30, 25, 15, 20}; +// fire_book_update (prices_full, sizes_full, api::Side::SIDE_SELL, 0, sm, quoter); +// verify_complete_quoter_state (quoter, QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(2000.50), Quantity(100), Quantity (100), false); +// // send out a fill +// on_order_update (u, api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (20), Price (2000)); +// quoter.update_order_status (u); +// verify_complete_quoter_state (quoter, QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity(20), Quantity(0), Price(2000.25), Quantity(100), Quantity (80), false); +// LOG(OrderMan, Diag, "quoter_WORKING.full_size_update_order_status_non_terminal"); +// } +// SECTION("3. on_book") +// { +// // to piggy back on the book test, the base +// // is set as a partial fill of 10, and a hedge +// // reduction of 15 +// on_order_update (u, api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (10), Price (2000)); +// quoter.update_order_status (u); +// quoter.update_other_leg_fills (0, Quantity (15)); +// double prices_full_0[] = {2000.0, 2000.25, 2000.5, 2000.75, 2001.0}; uint16_t sizes_full_0[] = {10, 30, 25, 15, 20}; +// fire_book_update (prices_full_0, sizes_full_0, api::Side::SIDE_SELL, 0, sm, quoter); +// verify_complete_quoter_state (quoter, QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity(10), Quantity(15), Price(2000.25), Quantity(85), Quantity (75), false); +// // change the book and validate the price (full qty) +// double prices_full_1[] = {2000.0, 2000.25, 2000.5, 2000.75, 2001.0}; uint16_t sizes_full_1[] = {75, 0, 0, 0, 0}; +// fire_book_update (prices_full_1, sizes_full_1, api::Side::SIDE_SELL, 0, sm, quoter); +// verify_complete_quoter_state (quoter, QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity(10), Quantity(15), Price(1999.5), Quantity(85), Quantity (75), false); +// // change the book and validate the price again (full qty) +// double prices_full_2[] = {2005.0, 2006, 2007, 2008, 2009}; uint16_t sizes_full_2[] = {1, 1, 1, 1, 71}; +// fire_book_update (prices_full_2, sizes_full_2, api::Side::SIDE_SELL, 0, sm, quoter); +// verify_complete_quoter_state (quoter, QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity(10), Quantity(15), Price(2008.5), Quantity(85), Quantity (75), false); +// LOG(OrderMan, Diag, "quoter_WORKING.on_book"); +// // and again +// double prices_full_3[] = {2000.0, 2001, 2002, 2003, 2004}; uint16_t sizes_full_3[] = {1, 1, 70, 2, 1}; +// fire_book_update (prices_full_3, sizes_full_3, api::Side::SIDE_SELL, 0, sm, quoter); +// verify_complete_quoter_state (quoter, QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity(10), Quantity(15), Price(2003.5), Quantity(85), Quantity (75), false); +// LOG(OrderMan, Diag, "quoter_WORKING.on_book"); +// // now decrease the size in book so the full +// // target remaining (75) is not there, this should +// // result in a reduced order +// double prices_full_4[] = {2000.0, 2001, 2002, 2003, 2004}; uint16_t sizes_full_4[] = {1, 1, 1, 1, 26}; +// fire_book_update (prices_full_4, sizes_full_4, api::Side::SIDE_SELL, 0, sm, quoter); +// verify_complete_quoter_state (quoter, QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity(10), Quantity(15), Price(2003.5), Quantity(40), Quantity (75), false); +// LOG(OrderMan, Diag, "quoter_WORKING.on_book"); +// // another reduced size +// double prices_full_5[] = {2000.0, 2001, 2002, 2003, 2004}; uint16_t sizes_full_5[] = {1, 0, 0, 0, 0}; +// fire_book_update (prices_full_5, sizes_full_5, api::Side::SIDE_SELL, 0, sm, quoter); +// verify_complete_quoter_state (quoter, QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity(10), Quantity(15), Price(1999.5), Quantity(11), Quantity (75), false); +// LOG(OrderMan, Diag, "quoter_WORKING.on_book"); +// // and another ... +// double prices_full_6[] = {2000.0, 2001, 2002, 2003, 2004}; uint16_t sizes_full_6[] = {1, 1, 1, 1, 1}; +// fire_book_update (prices_full_6, sizes_full_6, api::Side::SIDE_SELL, 0, sm, quoter); +// verify_complete_quoter_state (quoter, QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity(10), Quantity(15), Price(2003.5), Quantity(15), Quantity (75), false); +// LOG(OrderMan, Diag, "quoter_WORKING.on_book"); +// // blank out the book, this should result in cxl'ing the order +// double prices_full_7[] = {2000.0, 2001, 2002, 2003, 2004}; uint16_t sizes_full_7[] = {0, 0, 0, 0, 0}; +// fire_book_update (prices_full_7, sizes_full_7, api::Side::SIDE_SELL, 0, sm, quoter); +// verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_CANCEL_ACK, false, spreader_price, spreader_quantity, Quantity(10), Quantity(15), Price(2003.5), Quantity(15), Quantity (75), false); +// LOG(OrderMan, Diag, "quoter_WORKING.on_book"); +// } +// SECTION("4. cancel_order") +// { +// quoter.cancel_order(); +// verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_CANCEL_ACK, true, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(2000.50), Quantity(40), Quantity (100), false); +// LOG(OrderMan, Diag, "quoter_WORKING.cancel_order"); +// } +// SECTION("5. terminate") +// { +// quoter.terminate (); +// verify_complete_quoter_state (quoter, QuoterState::END, true, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(2000.5), Quantity(40), Quantity (100), false); +// LOG(OrderMan, Diag, "quoter_WORKING.terminate"); +// } +// SECTION("7. update_other_leg_fills") +// { +// // base set with full market and a partial fill of 10 +// double prices_full_0[] = {2000.0, 2000.25, 2000.5, 2000.75, 2001.0}; uint16_t sizes_full_0[] = {10, 30, 25, 15, 20}; +// fire_book_update (prices_full_0, sizes_full_0, api::Side::SIDE_SELL, 0, sm, quoter); +// on_order_update (u, api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (10), Price (2000)); +// quoter.update_order_status (u); +// verify_complete_quoter_state (quoter, QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity(10), Quantity(0), Price(2000.5), Quantity(100), Quantity (90), false); +// // hedge reduction by 10 +// quoter.update_other_leg_fills (0, Quantity (10)); +// verify_complete_quoter_state (quoter, QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity(10), Quantity(10), Price(2000.25), Quantity(90), Quantity (80), false); +// LOG(OrderMan, Diag, "quoter_WORKING.update_other_leg_fills"); +// // hedge reduction by another 15 +// quoter.update_other_leg_fills (0, Quantity (15)); +// verify_complete_quoter_state (quoter, QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity(10), Quantity(25), Price(2000.00), Quantity(75), Quantity (65), false); +// LOG(OrderMan, Diag, "quoter_WORKING.update_other_leg_fills"); +// // hedge reduction by another 55 +// quoter.update_other_leg_fills (0, Quantity (55)); +// verify_complete_quoter_state (quoter, QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity(10), Quantity(80), Price(1999.5), Quantity(20), Quantity (10), false); +// LOG(OrderMan, Diag, "quoter_WORKING.update_other_leg_fills"); +// // this hedge reduction should completely cancel the quoting side +// quoter.update_other_leg_fills (0, Quantity (10)); +// verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_CANCEL_ACK, false, spreader_price, spreader_quantity, Quantity(10), Quantity(90), Price(1999.5), Quantity(20), Quantity (0), true); +// LOG(OrderMan, Diag, "quoter_WORKING.update_other_leg_fills"); +// } +// SECTION("8. update_order_price_quantity") +// { +// // change price, qty +// spreader_price = Price (0.0); spreader_quantity = Quantity(200); +// quoter.update_order_price_quantity (spreader_price, spreader_quantity); +// verify_complete_quoter_state (quoter, QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(2001.0), Quantity(40), Quantity (200), false); +// // decrease the qty +// spreader_price = Price (0.0); spreader_quantity = Quantity(40); +// quoter.update_order_price_quantity (spreader_price, spreader_quantity); +// verify_complete_quoter_state (quoter, QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(2001.0), Quantity(40), Quantity (40), false); +// // other leg fill and then decrease the size +// quoter.update_other_leg_fills (0, Quantity (25)); +// verify_complete_quoter_state (quoter, QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity(0), Quantity(25), Price(2000.25), Quantity(15), Quantity (15), false); +// // change the quantity to beyond what was filled in the other leg +// spreader_price = Price (0.0); spreader_quantity = Quantity(25); +// quoter.update_order_price_quantity (spreader_price, spreader_quantity); +// verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_CANCEL_ACK, false, spreader_price, spreader_quantity, Quantity(0), Quantity(25), Price(2000.25), Quantity(15), Quantity (0), true); +// LOG(OrderMan, Diag, "quoter_WORKING.update_order_price_quantity"); +// } +// } +// TEST_CASE ("cycle", "[spreader]") +// { +// bts::orderman::OrderKey spreader_order_key(0); +// Price spreader_price = Price (0.5); Quantity spreader_quantity (100); +// SpreaderManagerForTest* sm_ptr = create_spreader_manager_2_legs (spreader_order_key, +// bts::api::Venue::VENUE_GLBX, "ES", 2017, 12, 15, 1.0, 1.0, 1.0, api::Side::SIDE_BUY, 1.0, 0.25, +// bts::api::Venue::VENUE_GLBX, "ES", 2017, 3, 15, 1.0, -1.0, 1.0, api::Side::SIDE_SELL, 1.0, 0.25); +// SpreaderBookkeepingData& bookeeping_data = sm_ptr->bookkeeping_data(); +// SpreaderManagerForTest& sm = *sm_ptr; +// SingleLegQuoter& quoter = bookeeping_data.get_leg_data(1).quoter(); +// quoter.one_time_activate(spreader_price, spreader_quantity); +// double prices[] = {2000.0, 2000.25, 2000.5, 2000.75, 2001.0}; uint16_t sizes[] = {5, 10, 4, 6, 15}; +// fire_book_update (prices, sizes, api::Side::SIDE_SELL, 0, sm, quoter); +// SpreaderChildOrderState& u = bookeeping_data.get_leg_data(1).order_update_message(); +// on_order_update (u, api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); +// quoter.update_order_status (u); +// verify_complete_quoter_state (quoter, QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(2000.5), Quantity(40), Quantity (100), false); +// // so we have a working order of 40 +// // fill of 40 -> another order of 40 +// // fill of 10 -> order size should go up to 50 (since the book can satisfy 40 lots) +// // fill of 10 -> order size should go up to 60 (...) +// // fill the remainder -> end +// // fill the working 40 +// on_order_update (u, api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (40), Price (2000)); +// quoter.update_order_status (u); +// // cycles back, to waiting for size +// verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_SIZE, false, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(0), Quantity(0), Quantity (60), false); +// // fire the book, this will fire the order +// fire_book_update (prices, sizes, api::Side::SIDE_SELL, 0, sm, quoter); +// verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_FIRST_ACK, false, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(2000.50), Quantity(40), Quantity (60), false); +// // send ack to make it go to working +// //SpreaderChildOrderState u2 = create_order_update (sm.get_leg_data(0)); +// SpreaderChildOrderState& u2 = u; +// on_order_update (u2, api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); +// quoter.update_order_status (u2); +// verify_complete_quoter_state (quoter, QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(2000.50), Quantity(40), Quantity (60), false); +// // fill 5, this should increase the order size to 45 +// on_order_update (u2, api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (5), Price (2000)); +// quoter.update_order_status (u2); +// verify_complete_quoter_state (quoter, QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity(5), Quantity(0), Price(2000.50), Quantity(45), Quantity (55), false); +// // fill it all +// on_order_update (u2, api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (45), Price (2000)); +// quoter.update_order_status (u2); +// verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_SIZE, false, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(0), Quantity(0), Quantity (15), false); +// // fire the book, this will fire the order +// fire_book_update (prices, sizes, api::Side::SIDE_SELL, 0, sm, quoter); +// verify_complete_quoter_state (quoter, QuoterState::WAITING_FOR_FIRST_ACK, false, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(1999.75), Quantity(15), Quantity (15), false); +// // send an ack +// //SpreaderChildOrderState u3 = create_order_update (sm.get_leg_data(0)); +// SpreaderChildOrderState& u3 = u; +// on_order_update (u3, api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); +// quoter.update_order_status (u3); +// verify_complete_quoter_state (quoter, QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(1999.75), Quantity(15), Quantity (15), false); +// // fill it all, should go to end +// on_order_update (u3, api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (15), Price (2000)); +// quoter.update_order_status (u3); +// verify_complete_quoter_state (quoter, QuoterState::END, false, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(1999.75), Quantity(15), Quantity (0), true); +// LOG(OrderMan, Diag, "cycle"); +// } +// /************************************************************************************************************/ +// /*********************************************Hedger State Tests*********************************************/ +// /************************************************************************************************************/ +// TEST_CASE ("hedger_START_state", "[spreader]") +// { +// bts::orderman::OrderKey spreader_order_key(0); +// Price hedger_price = Price (0.5); Quantity hedger_quantity (20); +// SpreaderManagerForTest* sm_ptr = create_spreader_manager_2_legs (spreader_order_key, +// bts::api::Venue::VENUE_GLBX, "ES", 2017, 12, 15, 1.0, 1.0, 1.0, api::Side::SIDE_BUY, 1.0, 0.25, +// bts::api::Venue::VENUE_GLBX, "ES", 2017, 3, 15, 1.0, -1.0, 1.0, api::Side::SIDE_SELL, 1.0, 0.25); +// SpreaderBookkeepingData& bookeeping_data = sm_ptr->bookkeeping_data(); +// SpreaderManagerForTest& sm = *sm_ptr; - ChildOrder co; - SingleFillHedger& hedger = bookeeping_data.add_new_hedger(sm, - 1, - hedger_price, - hedger_quantity, - PerfTrace()); - verify_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); +// ChildOrder co; +// SingleFillHedger& hedger = bookeeping_data.add_new_hedger(sm, +// 1, +// hedger_price, +// hedger_quantity, +// PerfTrace()); +// verify_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); - SECTION("0. transition_to_start") - { - verify_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); - LOG(OrderMan, Diag, "hedger_START_state.transition_to_start"); - } - SECTION("1. init") - { - hedger.init (); - verify_complete_hedger_state (hedger, HedgerState::WAITING_FOR_FIRST_ACK, hedger_price, hedger_quantity, Quantity (0), hedger_price, hedger_quantity, hedger_quantity); - LOG(OrderMan, Diag, "hedger_START_state.init"); - } - // SECTION("3. on_book") - // { - // double prices[] = {2000, 2000.25, 2000.5, 2000.75, 2002}; uint16_t sizes[] = {10, 5, 15, 5, 25}; - // fire_book_update_hedger (prices, sizes, api::Side::SIDE_SELL, hedger); - // verify_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), hedger_price, hedger_quantity, hedger_quantity); - // LOG(OrderMan, Diag, "hedger_START_state.on_book"); - // } - SECTION("4. cancel_hedge") - { - hedger.cancel_hedge(); - verify_complete_hedger_state (hedger, HedgerState::END, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); - LOG(OrderMan, Diag, "hedger_START_state.cancel_hedge"); - } - SECTION("5. terminate") - { - hedger.terminate (); - verify_complete_hedger_state (hedger, HedgerState::END, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); - LOG(OrderMan, Diag, "hedger_START_state.terminate"); - } -} -TEST_CASE ("hedger_WAITING_FOR_FIRST_ACK_state", "[spreader]") -{ - bts::orderman::OrderKey spreader_order_key(0); - Price hedger_price = Price (0.5); Quantity hedger_quantity (20); - SpreaderManagerForTest* sm_ptr = create_spreader_manager_2_legs (spreader_order_key, - bts::api::Venue::VENUE_GLBX, "ES", 2017, 12, 15, 1.0, 1.0, 1.0, api::Side::SIDE_BUY, 1.0, 0.25, - bts::api::Venue::VENUE_GLBX, "ES", 2017, 3, 15, 1.0, -1.0, 1.0, api::Side::SIDE_SELL, 1.0, 0.25); - SpreaderBookkeepingData& bookeeping_data = sm_ptr->bookkeeping_data(); - SpreaderManagerForTest& sm = *sm_ptr; +// SECTION("0. transition_to_start") +// { +// verify_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); +// LOG(OrderMan, Diag, "hedger_START_state.transition_to_start"); +// } +// SECTION("1. init") +// { +// hedger.init (); +// verify_complete_hedger_state (hedger, HedgerState::WAITING_FOR_FIRST_ACK, hedger_price, hedger_quantity, Quantity (0), hedger_price, hedger_quantity, hedger_quantity); +// LOG(OrderMan, Diag, "hedger_START_state.init"); +// } +// // SECTION("3. on_book") +// // { +// // double prices[] = {2000, 2000.25, 2000.5, 2000.75, 2002}; uint16_t sizes[] = {10, 5, 15, 5, 25}; +// // fire_book_update_hedger (prices, sizes, api::Side::SIDE_SELL, hedger); +// // verify_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), hedger_price, hedger_quantity, hedger_quantity); +// // LOG(OrderMan, Diag, "hedger_START_state.on_book"); +// // } +// SECTION("4. cancel_hedge") +// { +// hedger.cancel_hedge(); +// verify_complete_hedger_state (hedger, HedgerState::END, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); +// LOG(OrderMan, Diag, "hedger_START_state.cancel_hedge"); +// } +// SECTION("5. terminate") +// { +// hedger.terminate (); +// verify_complete_hedger_state (hedger, HedgerState::END, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); +// LOG(OrderMan, Diag, "hedger_START_state.terminate"); +// } +// } +// TEST_CASE ("hedger_WAITING_FOR_FIRST_ACK_state", "[spreader]") +// { +// bts::orderman::OrderKey spreader_order_key(0); +// Price hedger_price = Price (0.5); Quantity hedger_quantity (20); +// SpreaderManagerForTest* sm_ptr = create_spreader_manager_2_legs (spreader_order_key, +// bts::api::Venue::VENUE_GLBX, "ES", 2017, 12, 15, 1.0, 1.0, 1.0, api::Side::SIDE_BUY, 1.0, 0.25, +// bts::api::Venue::VENUE_GLBX, "ES", 2017, 3, 15, 1.0, -1.0, 1.0, api::Side::SIDE_SELL, 1.0, 0.25); +// SpreaderBookkeepingData& bookeeping_data = sm_ptr->bookkeeping_data(); +// SpreaderManagerForTest& sm = *sm_ptr; - ChildOrder co; - //SingleFillHedger hedger (sm, sm.get_leg_data (1), co, hedger_price, hedger_quantity,false); - SingleFillHedger& hedger = bookeeping_data.add_new_hedger(sm, - 1, - hedger_price, - hedger_quantity, - PerfTrace()); - verify_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); +// ChildOrder co; +// //SingleFillHedger hedger (sm, sm.get_leg_data (1), co, hedger_price, hedger_quantity,false); +// SingleFillHedger& hedger = bookeeping_data.add_new_hedger(sm, +// 1, +// hedger_price, +// hedger_quantity, +// PerfTrace()); +// verify_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); - hedger.init (); - verify_complete_hedger_state (hedger, HedgerState::WAITING_FOR_FIRST_ACK, hedger_price, hedger_quantity, Quantity (0), hedger_price, hedger_quantity, hedger_quantity); - SECTION("1. init") - { - } - SECTION ("2. on_order_update_non_terminal") - { - SpreaderChildOrderState& u = hedger.order_state(); - on_order_update (u, api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (5), Price (2000)); - hedger.on_order_update(u); - verify_complete_hedger_state (hedger, HedgerState::WORKING, hedger_price, hedger_quantity, Quantity (5), hedger_price, hedger_quantity, Quantity(15)); - LOG(OrderMan, Diag, "hedger_WAITING_FOR_FIRST_ACK_state.on_order_update_non_terminal"); - } - SECTION ("2. on_order_update_terminal") - { - SpreaderChildOrderState& u = hedger.order_state(); - on_order_update (u, api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (20), Price (2000)); - hedger.on_order_update (u); - verify_complete_hedger_state (hedger, HedgerState::END, hedger_price, hedger_quantity, Quantity (20), Price(0), Quantity(0), Quantity(0)); - LOG(OrderMan, Diag, "hedger_WAITING_FOR_FIRST_ACK_state.on_order_update_terminal"); - } - SECTION("3. on_book") - { - double prices[] = {2000, 2000.25, 2000.5, 2000.75, 2002}; uint16_t sizes[] = {10, 5, 15, 5, 25}; - fire_book_update_hedger (prices, sizes, api::Side::SIDE_SELL, hedger); - verify_complete_hedger_state (hedger, HedgerState::WAITING_FOR_FIRST_ACK, hedger_price, hedger_quantity, Quantity (0), hedger_price, hedger_quantity, hedger_quantity); - LOG(OrderMan, Diag, "hedger_WAITING_FOR_FIRST_ACK_state.on_book"); - } - SECTION("4. cancel_hedge") - { - hedger.cancel_hedge(); - verify_complete_hedger_state (hedger, HedgerState::WAITING_FOR_FIRST_ACK_CANCELLED, hedger_price, hedger_quantity, Quantity (0), hedger_price, hedger_quantity, hedger_quantity); - LOG(OrderMan, Diag, "hedger_START_state.cancel_hedge"); - } - SECTION("5. terminate") - { - hedger.terminate(); - verify_complete_hedger_state (hedger, HedgerState::END, hedger_price, hedger_quantity, Quantity (0), hedger_price, hedger_quantity, hedger_quantity); - LOG(OrderMan, Diag, "hedger_START_state.terminate"); - } -} -TEST_CASE ("hedger_WAITING_FOR_FIRST_ACK_CANCELLED_state", "[spreader]") -{ - bts::orderman::OrderKey spreader_order_key(0); - Price hedger_price = Price (0.5); Quantity hedger_quantity (20); - SpreaderManagerForTest* sm_ptr = create_spreader_manager_2_legs (spreader_order_key, - bts::api::Venue::VENUE_GLBX, "ES", 2017, 12, 15, 1.0, 1.0, 1.0, api::Side::SIDE_BUY, 1.0, 0.25, - bts::api::Venue::VENUE_GLBX, "ES", 2017, 3, 15, 1.0, -1.0, 1.0, api::Side::SIDE_SELL, 1.0, 0.25); - SpreaderBookkeepingData& bookeeping_data = sm_ptr->bookkeeping_data(); - SpreaderManagerForTest& sm = *sm_ptr; +// hedger.init (); +// verify_complete_hedger_state (hedger, HedgerState::WAITING_FOR_FIRST_ACK, hedger_price, hedger_quantity, Quantity (0), hedger_price, hedger_quantity, hedger_quantity); +// SECTION("1. init") +// { +// } +// SECTION ("2. on_order_update_non_terminal") +// { +// SpreaderChildOrderState& u = hedger.order_state(); +// on_order_update (u, api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (5), Price (2000)); +// hedger.on_order_update(u); +// verify_complete_hedger_state (hedger, HedgerState::WORKING, hedger_price, hedger_quantity, Quantity (5), hedger_price, hedger_quantity, Quantity(15)); +// LOG(OrderMan, Diag, "hedger_WAITING_FOR_FIRST_ACK_state.on_order_update_non_terminal"); +// } +// SECTION ("2. on_order_update_terminal") +// { +// SpreaderChildOrderState& u = hedger.order_state(); +// on_order_update (u, api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (20), Price (2000)); +// hedger.on_order_update (u); +// verify_complete_hedger_state (hedger, HedgerState::END, hedger_price, hedger_quantity, Quantity (20), Price(0), Quantity(0), Quantity(0)); +// LOG(OrderMan, Diag, "hedger_WAITING_FOR_FIRST_ACK_state.on_order_update_terminal"); +// } +// SECTION("3. on_book") +// { +// double prices[] = {2000, 2000.25, 2000.5, 2000.75, 2002}; uint16_t sizes[] = {10, 5, 15, 5, 25}; +// fire_book_update_hedger (prices, sizes, api::Side::SIDE_SELL, hedger); +// verify_complete_hedger_state (hedger, HedgerState::WAITING_FOR_FIRST_ACK, hedger_price, hedger_quantity, Quantity (0), hedger_price, hedger_quantity, hedger_quantity); +// LOG(OrderMan, Diag, "hedger_WAITING_FOR_FIRST_ACK_state.on_book"); +// } +// SECTION("4. cancel_hedge") +// { +// hedger.cancel_hedge(); +// verify_complete_hedger_state (hedger, HedgerState::WAITING_FOR_FIRST_ACK_CANCELLED, hedger_price, hedger_quantity, Quantity (0), hedger_price, hedger_quantity, hedger_quantity); +// LOG(OrderMan, Diag, "hedger_START_state.cancel_hedge"); +// } +// SECTION("5. terminate") +// { +// hedger.terminate(); +// verify_complete_hedger_state (hedger, HedgerState::END, hedger_price, hedger_quantity, Quantity (0), hedger_price, hedger_quantity, hedger_quantity); +// LOG(OrderMan, Diag, "hedger_START_state.terminate"); +// } +// } +// TEST_CASE ("hedger_WAITING_FOR_FIRST_ACK_CANCELLED_state", "[spreader]") +// { +// bts::orderman::OrderKey spreader_order_key(0); +// Price hedger_price = Price (0.5); Quantity hedger_quantity (20); +// SpreaderManagerForTest* sm_ptr = create_spreader_manager_2_legs (spreader_order_key, +// bts::api::Venue::VENUE_GLBX, "ES", 2017, 12, 15, 1.0, 1.0, 1.0, api::Side::SIDE_BUY, 1.0, 0.25, +// bts::api::Venue::VENUE_GLBX, "ES", 2017, 3, 15, 1.0, -1.0, 1.0, api::Side::SIDE_SELL, 1.0, 0.25); +// SpreaderBookkeepingData& bookeeping_data = sm_ptr->bookkeeping_data(); +// SpreaderManagerForTest& sm = *sm_ptr; - ChildOrder co; - SingleFillHedger& hedger = bookeeping_data.add_new_hedger(sm, - 1, - hedger_price, - hedger_quantity, - PerfTrace()); - verify_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); +// ChildOrder co; +// SingleFillHedger& hedger = bookeeping_data.add_new_hedger(sm, +// 1, +// hedger_price, +// hedger_quantity, +// PerfTrace()); +// verify_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); - hedger.init (); - hedger.cancel_hedge(); - verify_complete_hedger_state (hedger, HedgerState::WAITING_FOR_FIRST_ACK_CANCELLED, hedger_price, hedger_quantity, Quantity (0), hedger_price, hedger_quantity, hedger_quantity); +// hedger.init (); +// hedger.cancel_hedge(); +// verify_complete_hedger_state (hedger, HedgerState::WAITING_FOR_FIRST_ACK_CANCELLED, hedger_price, hedger_quantity, Quantity (0), hedger_price, hedger_quantity, hedger_quantity); - SECTION("1. init") - { - } - SECTION ("2. on_order_update_non_terminal") - { - SpreaderChildOrderState& u = hedger.order_state(); - on_order_update (u, api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (5), Price (2000)); - hedger.on_order_update(u); - verify_complete_hedger_state (hedger, HedgerState::WAITING_FOR_CANCEL_ACK, hedger_price, hedger_quantity, Quantity (5), hedger_price, hedger_quantity, Quantity(15)); - LOG(OrderMan, Diag, "hedger_WAITING_FOR_FIRST_ACK_CANCELLED_state.on_order_update_non_terminal"); - } - SECTION ("2. on_order_update.terminal") - { - SpreaderChildOrderState& u = hedger.order_state(); - on_order_update (u, api::orderman::OrderStatus::ORDER_STATUS_CANCELED, Quantity (0), Price (0)); - hedger.on_order_update (u); - verify_complete_hedger_state (hedger, HedgerState::END, hedger_price, hedger_quantity, Quantity (0), Price(0), Quantity(0), Quantity(20)); - LOG(OrderMan, Diag, "hedger_WAITING_FOR_FIRST_ACK_state.on_order_update"); - } - SECTION("3. on_book") - { - double prices[] = {2000, 2000.25, 2000.5, 2000.75, 2002}; uint16_t sizes[] = {10, 5, 15, 5, 25}; - fire_book_update_hedger (prices, sizes, api::Side::SIDE_SELL, hedger); - verify_complete_hedger_state (hedger, HedgerState::WAITING_FOR_FIRST_ACK_CANCELLED, hedger_price, hedger_quantity, Quantity (0), hedger_price, hedger_quantity, hedger_quantity); - LOG(OrderMan, Diag, "hedger_WAITING_FOR_FIRST_ACK_CANCELLED_state.on_book"); - } - SECTION("4. cancel_hedge") - { - hedger.cancel_hedge(); - verify_complete_hedger_state (hedger, HedgerState::WAITING_FOR_FIRST_ACK_CANCELLED, hedger_price, hedger_quantity, Quantity (0), hedger_price, hedger_quantity, hedger_quantity); - LOG(OrderMan, Diag, "hedger_WAITING_FOR_FIRST_ACK_CANCELLED_state.cancel_hedge"); - } - SECTION("5. terminate") - { - hedger.terminate(); - verify_complete_hedger_state (hedger, HedgerState::END, hedger_price, hedger_quantity, Quantity (0), hedger_price, hedger_quantity, hedger_quantity); - LOG(OrderMan, Diag, "hedger_WAITING_FOR_FIRST_ACK_CANCELLED_state.terminate"); - } -} -TEST_CASE ("hedger_WAITING_FOR_CANCEL_ACK_state", "[spreader]") -{ - bts::orderman::OrderKey spreader_order_key(0); - Price hedger_price = Price (0.5); Quantity hedger_quantity (20); - SpreaderManagerForTest* sm_ptr = create_spreader_manager_2_legs (spreader_order_key, - bts::api::Venue::VENUE_GLBX, "ES", 2017, 12, 15, 1.0, 1.0, 1.0, api::Side::SIDE_BUY, 1.0, 0.25, - bts::api::Venue::VENUE_GLBX, "ES", 2017, 3, 15, 1.0, -1.0, 1.0, api::Side::SIDE_SELL, 1.0, 0.25); - SpreaderBookkeepingData& bookeeping_data = sm_ptr->bookkeeping_data(); - SpreaderManagerForTest& sm = *sm_ptr; +// SECTION("1. init") +// { +// } +// SECTION ("2. on_order_update_non_terminal") +// { +// SpreaderChildOrderState& u = hedger.order_state(); +// on_order_update (u, api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (5), Price (2000)); +// hedger.on_order_update(u); +// verify_complete_hedger_state (hedger, HedgerState::WAITING_FOR_CANCEL_ACK, hedger_price, hedger_quantity, Quantity (5), hedger_price, hedger_quantity, Quantity(15)); +// LOG(OrderMan, Diag, "hedger_WAITING_FOR_FIRST_ACK_CANCELLED_state.on_order_update_non_terminal"); +// } +// SECTION ("2. on_order_update.terminal") +// { +// SpreaderChildOrderState& u = hedger.order_state(); +// on_order_update (u, api::orderman::OrderStatus::ORDER_STATUS_CANCELED, Quantity (0), Price (0)); +// hedger.on_order_update (u); +// verify_complete_hedger_state (hedger, HedgerState::END, hedger_price, hedger_quantity, Quantity (0), Price(0), Quantity(0), Quantity(20)); +// LOG(OrderMan, Diag, "hedger_WAITING_FOR_FIRST_ACK_state.on_order_update"); +// } +// SECTION("3. on_book") +// { +// double prices[] = {2000, 2000.25, 2000.5, 2000.75, 2002}; uint16_t sizes[] = {10, 5, 15, 5, 25}; +// fire_book_update_hedger (prices, sizes, api::Side::SIDE_SELL, hedger); +// verify_complete_hedger_state (hedger, HedgerState::WAITING_FOR_FIRST_ACK_CANCELLED, hedger_price, hedger_quantity, Quantity (0), hedger_price, hedger_quantity, hedger_quantity); +// LOG(OrderMan, Diag, "hedger_WAITING_FOR_FIRST_ACK_CANCELLED_state.on_book"); +// } +// SECTION("4. cancel_hedge") +// { +// hedger.cancel_hedge(); +// verify_complete_hedger_state (hedger, HedgerState::WAITING_FOR_FIRST_ACK_CANCELLED, hedger_price, hedger_quantity, Quantity (0), hedger_price, hedger_quantity, hedger_quantity); +// LOG(OrderMan, Diag, "hedger_WAITING_FOR_FIRST_ACK_CANCELLED_state.cancel_hedge"); +// } +// SECTION("5. terminate") +// { +// hedger.terminate(); +// verify_complete_hedger_state (hedger, HedgerState::END, hedger_price, hedger_quantity, Quantity (0), hedger_price, hedger_quantity, hedger_quantity); +// LOG(OrderMan, Diag, "hedger_WAITING_FOR_FIRST_ACK_CANCELLED_state.terminate"); +// } +// } +// TEST_CASE ("hedger_WAITING_FOR_CANCEL_ACK_state", "[spreader]") +// { +// bts::orderman::OrderKey spreader_order_key(0); +// Price hedger_price = Price (0.5); Quantity hedger_quantity (20); +// SpreaderManagerForTest* sm_ptr = create_spreader_manager_2_legs (spreader_order_key, +// bts::api::Venue::VENUE_GLBX, "ES", 2017, 12, 15, 1.0, 1.0, 1.0, api::Side::SIDE_BUY, 1.0, 0.25, +// bts::api::Venue::VENUE_GLBX, "ES", 2017, 3, 15, 1.0, -1.0, 1.0, api::Side::SIDE_SELL, 1.0, 0.25); +// SpreaderBookkeepingData& bookeeping_data = sm_ptr->bookkeeping_data(); +// SpreaderManagerForTest& sm = *sm_ptr; - ChildOrder co; - SingleFillHedger& hedger = bookeeping_data.add_new_hedger(sm, - 1, - hedger_price, - hedger_quantity, - PerfTrace()); - verify_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); +// ChildOrder co; +// SingleFillHedger& hedger = bookeeping_data.add_new_hedger(sm, +// 1, +// hedger_price, +// hedger_quantity, +// PerfTrace()); +// verify_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); - hedger.init (); - hedger.cancel_hedge(); - verify_complete_hedger_state (hedger, HedgerState::WAITING_FOR_FIRST_ACK_CANCELLED, hedger_price, hedger_quantity, Quantity (0), hedger_price, hedger_quantity, hedger_quantity); +// hedger.init (); +// hedger.cancel_hedge(); +// verify_complete_hedger_state (hedger, HedgerState::WAITING_FOR_FIRST_ACK_CANCELLED, hedger_price, hedger_quantity, Quantity (0), hedger_price, hedger_quantity, hedger_quantity); - SpreaderChildOrderState& u1 = hedger.order_state(); - on_order_update (u1, api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); - hedger.on_order_update (u1); - verify_complete_hedger_state (hedger, HedgerState::WAITING_FOR_CANCEL_ACK, hedger_price, hedger_quantity, Quantity (0), hedger_price, hedger_quantity, Quantity(20)); - SECTION("1. init") - { - } - SECTION ("2. on_order_update") - { - // eventhough the order was cancelled, non terminal updates - // can keep coming in - SpreaderChildOrderState& u = hedger.order_state(); - on_order_update (u, api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (5), Price (2000)); - hedger.on_order_update(u); - verify_complete_hedger_state (hedger, HedgerState::WAITING_FOR_CANCEL_ACK, hedger_price, hedger_quantity, Quantity (5), hedger_price, hedger_quantity, Quantity(15)); - on_order_update (u, api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (10), Price (2000)); - hedger.on_order_update(u); - verify_complete_hedger_state (hedger, HedgerState::WAITING_FOR_CANCEL_ACK, hedger_price, hedger_quantity, Quantity (10), hedger_price, hedger_quantity, Quantity(10)); - on_order_update (u, api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (15), Price (2000)); - hedger.on_order_update(u); - verify_complete_hedger_state (hedger, HedgerState::WAITING_FOR_CANCEL_ACK, hedger_price, hedger_quantity, Quantity (15), hedger_price, hedger_quantity, Quantity(5)); - // cancel the order now - on_order_update (u, api::orderman::OrderStatus::ORDER_STATUS_CANCELED, Quantity (15), Price (2000)); - hedger.on_order_update(u); - verify_complete_hedger_state (hedger, HedgerState::END, hedger_price, hedger_quantity, Quantity (15), Price(0), Quantity(0), Quantity(5)); - LOG(OrderMan, Diag, "hedger_WAITING_FOR_CANCEL_ACK_state.on_order_update"); - } - SECTION("3. on_book") - { - // no change - double prices[] = {2000, 2000.25, 2000.5, 2000.75, 2002}; uint16_t sizes[] = {10, 5, 15, 5, 25}; - fire_book_update_hedger (prices, sizes, api::Side::SIDE_SELL, hedger); - verify_complete_hedger_state (hedger, HedgerState::WAITING_FOR_CANCEL_ACK, hedger_price, hedger_quantity, Quantity (0), hedger_price, hedger_quantity, Quantity(20)); - LOG(OrderMan, Diag, "hedger_WAITING_FOR_CANCEL_ACK_state.on_book"); - } - SECTION("4. cancel_hedge") - { - // no change - hedger.cancel_hedge(); - verify_complete_hedger_state (hedger, HedgerState::WAITING_FOR_CANCEL_ACK, hedger_price, hedger_quantity, Quantity (0), hedger_price, hedger_quantity, Quantity(20)); - LOG(OrderMan, Diag, "hedger_WAITING_FOR_CANCEL_ACK_state.cancel_hedge"); - } - SECTION("5. terminate") - { - hedger.terminate(); - verify_complete_hedger_state (hedger, HedgerState::END, hedger_price, hedger_quantity, Quantity (0), hedger_price, hedger_quantity, hedger_quantity); - LOG(OrderMan, Diag, "hedger_WAITING_FOR_CANCEL_ACK_state.terminate"); - } -} -TEST_CASE ("hedger_END_state", "[spreader]") -{ - bts::orderman::OrderKey spreader_order_key(0); - Price hedger_price = Price (0.5); Quantity hedger_quantity (20); - SpreaderManagerForTest* sm_ptr = create_spreader_manager_2_legs (spreader_order_key, - bts::api::Venue::VENUE_GLBX, "ES", 2017, 12, 15, 1.0, 1.0, 1.0, api::Side::SIDE_BUY, 1.0, 0.25, - bts::api::Venue::VENUE_GLBX, "ES", 2017, 3, 15, 1.0, -1.0, 1.0, api::Side::SIDE_SELL, 1.0, 0.25); - SpreaderBookkeepingData& bookeeping_data = sm_ptr->bookkeeping_data(); - SpreaderManagerForTest& sm = *sm_ptr; +// SpreaderChildOrderState& u1 = hedger.order_state(); +// on_order_update (u1, api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); +// hedger.on_order_update (u1); +// verify_complete_hedger_state (hedger, HedgerState::WAITING_FOR_CANCEL_ACK, hedger_price, hedger_quantity, Quantity (0), hedger_price, hedger_quantity, Quantity(20)); +// SECTION("1. init") +// { +// } +// SECTION ("2. on_order_update") +// { +// // eventhough the order was cancelled, non terminal updates +// // can keep coming in +// SpreaderChildOrderState& u = hedger.order_state(); +// on_order_update (u, api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (5), Price (2000)); +// hedger.on_order_update(u); +// verify_complete_hedger_state (hedger, HedgerState::WAITING_FOR_CANCEL_ACK, hedger_price, hedger_quantity, Quantity (5), hedger_price, hedger_quantity, Quantity(15)); +// on_order_update (u, api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (10), Price (2000)); +// hedger.on_order_update(u); +// verify_complete_hedger_state (hedger, HedgerState::WAITING_FOR_CANCEL_ACK, hedger_price, hedger_quantity, Quantity (10), hedger_price, hedger_quantity, Quantity(10)); +// on_order_update (u, api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (15), Price (2000)); +// hedger.on_order_update(u); +// verify_complete_hedger_state (hedger, HedgerState::WAITING_FOR_CANCEL_ACK, hedger_price, hedger_quantity, Quantity (15), hedger_price, hedger_quantity, Quantity(5)); +// // cancel the order now +// on_order_update (u, api::orderman::OrderStatus::ORDER_STATUS_CANCELED, Quantity (15), Price (2000)); +// hedger.on_order_update(u); +// verify_complete_hedger_state (hedger, HedgerState::END, hedger_price, hedger_quantity, Quantity (15), Price(0), Quantity(0), Quantity(5)); +// LOG(OrderMan, Diag, "hedger_WAITING_FOR_CANCEL_ACK_state.on_order_update"); +// } +// SECTION("3. on_book") +// { +// // no change +// double prices[] = {2000, 2000.25, 2000.5, 2000.75, 2002}; uint16_t sizes[] = {10, 5, 15, 5, 25}; +// fire_book_update_hedger (prices, sizes, api::Side::SIDE_SELL, hedger); +// verify_complete_hedger_state (hedger, HedgerState::WAITING_FOR_CANCEL_ACK, hedger_price, hedger_quantity, Quantity (0), hedger_price, hedger_quantity, Quantity(20)); +// LOG(OrderMan, Diag, "hedger_WAITING_FOR_CANCEL_ACK_state.on_book"); +// } +// SECTION("4. cancel_hedge") +// { +// // no change +// hedger.cancel_hedge(); +// verify_complete_hedger_state (hedger, HedgerState::WAITING_FOR_CANCEL_ACK, hedger_price, hedger_quantity, Quantity (0), hedger_price, hedger_quantity, Quantity(20)); +// LOG(OrderMan, Diag, "hedger_WAITING_FOR_CANCEL_ACK_state.cancel_hedge"); +// } +// SECTION("5. terminate") +// { +// hedger.terminate(); +// verify_complete_hedger_state (hedger, HedgerState::END, hedger_price, hedger_quantity, Quantity (0), hedger_price, hedger_quantity, hedger_quantity); +// LOG(OrderMan, Diag, "hedger_WAITING_FOR_CANCEL_ACK_state.terminate"); +// } +// } +// TEST_CASE ("hedger_END_state", "[spreader]") +// { +// bts::orderman::OrderKey spreader_order_key(0); +// Price hedger_price = Price (0.5); Quantity hedger_quantity (20); +// SpreaderManagerForTest* sm_ptr = create_spreader_manager_2_legs (spreader_order_key, +// bts::api::Venue::VENUE_GLBX, "ES", 2017, 12, 15, 1.0, 1.0, 1.0, api::Side::SIDE_BUY, 1.0, 0.25, +// bts::api::Venue::VENUE_GLBX, "ES", 2017, 3, 15, 1.0, -1.0, 1.0, api::Side::SIDE_SELL, 1.0, 0.25); +// SpreaderBookkeepingData& bookeeping_data = sm_ptr->bookkeeping_data(); +// SpreaderManagerForTest& sm = *sm_ptr; - ChildOrder co; - SingleFillHedger& hedger = bookeeping_data.add_new_hedger(sm, - 1, - hedger_price, - hedger_quantity, - PerfTrace()); - verify_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); +// ChildOrder co; +// SingleFillHedger& hedger = bookeeping_data.add_new_hedger(sm, +// 1, +// hedger_price, +// hedger_quantity, +// PerfTrace()); +// verify_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); - hedger.init (); - SpreaderChildOrderState& u1 = hedger.order_state(); - on_order_update (u1, api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); - hedger.on_order_update (u1); - hedger.cancel_hedge (); - on_order_update (u1, api::orderman::OrderStatus::ORDER_STATUS_CANCELED, Quantity (0), Price (0)); - hedger.on_order_update (u1); - verify_complete_hedger_state (hedger, HedgerState::END, hedger_price, hedger_quantity, Quantity (0), Price(0), Quantity (0), Quantity(20)); - SECTION("1. init") - { - } - SECTION ("2. on_order_update") - { - on_order_update (u1, api::orderman::OrderStatus::ORDER_STATUS_CANCELED, Quantity (0), Price (0)); - hedger.on_order_update (u1); - verify_complete_hedger_state (hedger, HedgerState::END, hedger_price, hedger_quantity, Quantity (0), Price(0), Quantity (0), Quantity(20)); - LOG(OrderMan, Diag, "hedger_END_state.on_order_update"); - } - SECTION("3. on_book") - { - double prices[] = {2000, 2000.25, 2000.5, 2000.75, 2002}; uint16_t sizes[] = {10, 5, 15, 5, 25}; - fire_book_update_hedger (prices, sizes, api::Side::SIDE_SELL, hedger); - verify_complete_hedger_state (hedger, HedgerState::END, hedger_price, hedger_quantity, Quantity (0), Price(0), Quantity (0), Quantity(20)); - LOG(OrderMan, Diag, "hedger_END_state.on_book"); - } - SECTION("4. cancel_hedge") - { - hedger.cancel_hedge (); - verify_complete_hedger_state (hedger, HedgerState::END, hedger_price, hedger_quantity, Quantity (0), Price(0), Quantity (0), Quantity(20)); - LOG(OrderMan, Diag, "hedger_END_state.cancel_hedge"); - } - SECTION("5. terminate") - { - hedger.terminate(); - verify_complete_hedger_state (hedger, HedgerState::END, hedger_price, hedger_quantity, Quantity (0), Price(0), Quantity (0), Quantity(20)); - LOG(OrderMan, Diag, "hedger_END_state.terminate"); - } -} +// hedger.init (); +// SpreaderChildOrderState& u1 = hedger.order_state(); +// on_order_update (u1, api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); +// hedger.on_order_update (u1); +// hedger.cancel_hedge (); +// on_order_update (u1, api::orderman::OrderStatus::ORDER_STATUS_CANCELED, Quantity (0), Price (0)); +// hedger.on_order_update (u1); +// verify_complete_hedger_state (hedger, HedgerState::END, hedger_price, hedger_quantity, Quantity (0), Price(0), Quantity (0), Quantity(20)); +// SECTION("1. init") +// { +// } +// SECTION ("2. on_order_update") +// { +// on_order_update (u1, api::orderman::OrderStatus::ORDER_STATUS_CANCELED, Quantity (0), Price (0)); +// hedger.on_order_update (u1); +// verify_complete_hedger_state (hedger, HedgerState::END, hedger_price, hedger_quantity, Quantity (0), Price(0), Quantity (0), Quantity(20)); +// LOG(OrderMan, Diag, "hedger_END_state.on_order_update"); +// } +// SECTION("3. on_book") +// { +// double prices[] = {2000, 2000.25, 2000.5, 2000.75, 2002}; uint16_t sizes[] = {10, 5, 15, 5, 25}; +// fire_book_update_hedger (prices, sizes, api::Side::SIDE_SELL, hedger); +// verify_complete_hedger_state (hedger, HedgerState::END, hedger_price, hedger_quantity, Quantity (0), Price(0), Quantity (0), Quantity(20)); +// LOG(OrderMan, Diag, "hedger_END_state.on_book"); +// } +// SECTION("4. cancel_hedge") +// { +// hedger.cancel_hedge (); +// verify_complete_hedger_state (hedger, HedgerState::END, hedger_price, hedger_quantity, Quantity (0), Price(0), Quantity (0), Quantity(20)); +// LOG(OrderMan, Diag, "hedger_END_state.cancel_hedge"); +// } +// SECTION("5. terminate") +// { +// hedger.terminate(); +// verify_complete_hedger_state (hedger, HedgerState::END, hedger_price, hedger_quantity, Quantity (0), Price(0), Quantity (0), Quantity(20)); +// LOG(OrderMan, Diag, "hedger_END_state.terminate"); +// } +// } -TEST_CASE ("hedger_WORKING", "[spreader]") -{ - bts::orderman::OrderKey spreader_order_key(0); - Price hedger_price = Price (0.5); Quantity hedger_quantity (20); - SpreaderManagerForTest* sm_ptr = create_spreader_manager_2_legs (spreader_order_key, - bts::api::Venue::VENUE_GLBX, "ES", 2017, 12, 15, 1.0, 1.0, 1.0, api::Side::SIDE_BUY, 1.0, 0.25, - bts::api::Venue::VENUE_GLBX, "ES", 2017, 3, 15, 1.0, -1.0, 1.0, api::Side::SIDE_SELL, 1.0, 0.25); - SpreaderBookkeepingData& bookeeping_data = sm_ptr->bookkeeping_data(); - SpreaderManagerForTest& sm = *sm_ptr; +// TEST_CASE ("hedger_WORKING", "[spreader]") +// { +// bts::orderman::OrderKey spreader_order_key(0); +// Price hedger_price = Price (0.5); Quantity hedger_quantity (20); +// SpreaderManagerForTest* sm_ptr = create_spreader_manager_2_legs (spreader_order_key, +// bts::api::Venue::VENUE_GLBX, "ES", 2017, 12, 15, 1.0, 1.0, 1.0, api::Side::SIDE_BUY, 1.0, 0.25, +// bts::api::Venue::VENUE_GLBX, "ES", 2017, 3, 15, 1.0, -1.0, 1.0, api::Side::SIDE_SELL, 1.0, 0.25); +// SpreaderBookkeepingData& bookeeping_data = sm_ptr->bookkeeping_data(); +// SpreaderManagerForTest& sm = *sm_ptr; - ChildOrder co; - SingleFillHedger& hedger = bookeeping_data.add_new_hedger(sm, - 1, - hedger_price, - hedger_quantity, - PerfTrace()); - verify_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); +// ChildOrder co; +// SingleFillHedger& hedger = bookeeping_data.add_new_hedger(sm, +// 1, +// hedger_price, +// hedger_quantity, +// PerfTrace()); +// verify_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); - SpreaderChildOrderState& u = hedger.order_state(); - hedger.init (); - on_order_update (u, api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); - hedger.on_order_update (u); - verify_complete_hedger_state (hedger, HedgerState::WORKING, hedger_price, hedger_quantity, Quantity (0), hedger_price, hedger_quantity, Quantity(20)); +// SpreaderChildOrderState& u = hedger.order_state(); +// hedger.init (); +// on_order_update (u, api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); +// hedger.on_order_update (u); +// verify_complete_hedger_state (hedger, HedgerState::WORKING, hedger_price, hedger_quantity, Quantity (0), hedger_price, hedger_quantity, Quantity(20)); - SECTION("1. init") - { - } - SECTION ("2. on_order_update") - { - // partial fill 1 - on_order_update (u, api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (7), Price (2000)); - hedger.on_order_update (u); - verify_complete_hedger_state (hedger, HedgerState::WORKING, hedger_price, hedger_quantity, Quantity (7), hedger_price, hedger_quantity, Quantity(13)); - // partial fill 2 - on_order_update (u, api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (15), Price (2000)); - hedger.on_order_update (u); - verify_complete_hedger_state (hedger, HedgerState::WORKING, hedger_price, hedger_quantity, Quantity (15), hedger_price, hedger_quantity, Quantity(5)); - // complete fill - on_order_update (u, api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (20), Price (2000)); - hedger.on_order_update (u); - verify_complete_hedger_state (hedger, HedgerState::END, hedger_price, hedger_quantity, Quantity (20), Price(0), Quantity(0), Quantity(0)); - LOG(OrderMan, Diag, "hedger_WORKING.on_order_update"); - } - SECTION("3. on_book_no_post_hedge") - { - double prices[] = {2000, 2000.25, 2000.5, 2000.75, 2002}; uint16_t sizes[] = {10, 5, 15, 5, 25}; - fire_book_update_hedger (prices, sizes, api::Side::SIDE_SELL, hedger); - verify_complete_hedger_state (hedger, HedgerState::WORKING, hedger_price, hedger_quantity, Quantity (0), hedger_price, hedger_quantity, Quantity(20)); - LOG(OrderMan, Diag, "hedger_WORKING.on_book_no_post_hedge"); - } - SECTION("4. cancel_hedge") - { - hedger.cancel_hedge (); - verify_complete_hedger_state (hedger, HedgerState::WAITING_FOR_CANCEL_ACK, hedger_price, hedger_quantity, Quantity (0), hedger_price, hedger_quantity, Quantity(20)); - LOG(OrderMan, Diag, "hedger_WORKING.cancel_hedge"); - } - SECTION("5. terminate") - { - hedger.terminate(); - verify_complete_hedger_state (hedger, HedgerState::END, hedger_price, hedger_quantity, Quantity (0), hedger_price, hedger_quantity, Quantity(20)); - LOG(OrderMan, Diag, "hedger_WORKING.terminate"); - } -} -/************************************************************************************************************/ -/*********************************************Spreader State Tests*********************************************/ -/************************************************************************************************************/ -TEST_CASE ("spreader_START", "[spreader]") -{ - bts::orderman::OrderKey order_key(0); - Price spreader_price = Price (0); Quantity spreader_quantity = Quantity (100); - ContractLeg leg_1, leg_2; - fill_future_contract_leg (leg_1, 2468, "ES", bts::api::Venue::VENUE_GLBX, 2017, 12, 15, 1.0, 1.0, api::Side::SIDE_BUY, 1.0, 0.25); - fill_future_contract_leg (leg_2, 13579, "ES", bts::api::Venue::VENUE_GLBX, 2018, 3, 15, -1.0, -1.0, api::Side::SIDE_SELL, 1.0, 0.25); - std::vector contract_legs; - contract_legs.push_back(leg_1);contract_legs.push_back(leg_2); - Security synthetic_security; - fill_synthetic_security (synthetic_security, 2000, "synthetic_security", contract_legs); - // execution params/order def - LegSpreaderParams lsp_1, lsp_2, lsp_3; - fill_leg_spreader_params(lsp_1, 1.0, true, 1.0);fill_leg_spreader_params(lsp_2, -1.0, true, 1.0); - std::vector spreader_params; - spreader_params.push_back(lsp_1);spreader_params.push_back(lsp_2); - bts::api::orderman::OrderDefinition order_def; - fill_spreader_order_definition(order_def, Side::SIDE_BUY, synthetic_security, spreader_params); - // putting it together in SpreaderBookkeepingData - SpreaderPreActivationOrderServices::TestOnlySpreaderPreActivationOrderServices testonly_spreader_pao_services = _create_spreader_pao_services(synthetic_security); - SpreaderPreActivationOrderServices pao_services (&testonly_spreader_pao_services); - std::vector leg_props; - SpreaderUtils::resolve_synthetic_spread(pao_services, order_def, leg_props); - SpreaderManagerForTest spreader_manager (order_key, order_def, pao_services, leg_props); - SpreaderBookkeepingData& bookkeeping_data = spreader_manager.bookkeeping_data(); - SpreaderOrder spreader; - REQUIRE(spreader.test_only_func_spreader_state() == SpreaderState::START); +// SECTION("1. init") +// { +// } +// SECTION ("2. on_order_update") +// { +// // partial fill 1 +// on_order_update (u, api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (7), Price (2000)); +// hedger.on_order_update (u); +// verify_complete_hedger_state (hedger, HedgerState::WORKING, hedger_price, hedger_quantity, Quantity (7), hedger_price, hedger_quantity, Quantity(13)); +// // partial fill 2 +// on_order_update (u, api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (15), Price (2000)); +// hedger.on_order_update (u); +// verify_complete_hedger_state (hedger, HedgerState::WORKING, hedger_price, hedger_quantity, Quantity (15), hedger_price, hedger_quantity, Quantity(5)); +// // complete fill +// on_order_update (u, api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (20), Price (2000)); +// hedger.on_order_update (u); +// verify_complete_hedger_state (hedger, HedgerState::END, hedger_price, hedger_quantity, Quantity (20), Price(0), Quantity(0), Quantity(0)); +// LOG(OrderMan, Diag, "hedger_WORKING.on_order_update"); +// } +// SECTION("3. on_book_no_post_hedge") +// { +// double prices[] = {2000, 2000.25, 2000.5, 2000.75, 2002}; uint16_t sizes[] = {10, 5, 15, 5, 25}; +// fire_book_update_hedger (prices, sizes, api::Side::SIDE_SELL, hedger); +// verify_complete_hedger_state (hedger, HedgerState::WORKING, hedger_price, hedger_quantity, Quantity (0), hedger_price, hedger_quantity, Quantity(20)); +// LOG(OrderMan, Diag, "hedger_WORKING.on_book_no_post_hedge"); +// } +// SECTION("4. cancel_hedge") +// { +// hedger.cancel_hedge (); +// verify_complete_hedger_state (hedger, HedgerState::WAITING_FOR_CANCEL_ACK, hedger_price, hedger_quantity, Quantity (0), hedger_price, hedger_quantity, Quantity(20)); +// LOG(OrderMan, Diag, "hedger_WORKING.cancel_hedge"); +// } +// SECTION("5. terminate") +// { +// hedger.terminate(); +// verify_complete_hedger_state (hedger, HedgerState::END, hedger_price, hedger_quantity, Quantity (0), hedger_price, hedger_quantity, Quantity(20)); +// LOG(OrderMan, Diag, "hedger_WORKING.terminate"); +// } +// } +// /************************************************************************************************************/ +// /*********************************************Spreader State Tests*********************************************/ +// /************************************************************************************************************/ +// TEST_CASE ("spreader_START", "[spreader]") +// { +// bts::orderman::OrderKey order_key(0); +// Price spreader_price = Price (0); Quantity spreader_quantity = Quantity (100); +// ContractLeg leg_1, leg_2; +// fill_future_contract_leg (leg_1, 2468, "ES", bts::api::Venue::VENUE_GLBX, 2017, 12, 15, 1.0, 1.0, api::Side::SIDE_BUY, 1.0, 0.25); +// fill_future_contract_leg (leg_2, 13579, "ES", bts::api::Venue::VENUE_GLBX, 2018, 3, 15, -1.0, -1.0, api::Side::SIDE_SELL, 1.0, 0.25); +// std::vector contract_legs; +// contract_legs.push_back(leg_1);contract_legs.push_back(leg_2); +// Security synthetic_security; +// fill_synthetic_security (synthetic_security, 2000, "synthetic_security", contract_legs); +// // execution params/order def +// LegSpreaderParams lsp_1, lsp_2, lsp_3; +// fill_leg_spreader_params(lsp_1, 1.0, true, 1.0);fill_leg_spreader_params(lsp_2, -1.0, true, 1.0); +// std::vector spreader_params; +// spreader_params.push_back(lsp_1);spreader_params.push_back(lsp_2); +// bts::api::orderman::OrderDefinition order_def; +// fill_spreader_order_definition(order_def, Side::SIDE_BUY, synthetic_security, spreader_params); +// // putting it together in SpreaderBookkeepingData +// SpreaderPreActivationOrderServices::TestOnlySpreaderPreActivationOrderServices testonly_spreader_pao_services = _create_spreader_pao_services(synthetic_security); +// SpreaderPreActivationOrderServices pao_services (&testonly_spreader_pao_services); +// std::vector leg_props; +// SpreaderUtils::resolve_synthetic_spread(pao_services, order_def, leg_props); +// SpreaderManagerForTest spreader_manager (order_key, order_def, pao_services, leg_props); +// SpreaderBookkeepingData& bookkeeping_data = spreader_manager.bookkeeping_data(); +// SpreaderOrder spreader; +// REQUIRE(spreader.test_only_func_spreader_state() == SpreaderState::START); - SECTION("1. on_init_new.resolved") - { - spreader.test_only_on_init_new (order_def, pao_services); - REQUIRE(spreader.test_only_func_spreader_state() == SpreaderState::START); - SpreaderBookkeepingData& bookeeping_data = spreader.test_only_func_spreader_full_data(); - REQUIRE(bookkeeping_data.get_leg_data(0).leg_property_data().security_key() == 2468); - REQUIRE(bookkeeping_data.get_leg_data(1).leg_property_data().security_key() == 13579); - } - SECTION("1. on_init_new.not_resolved") - { - testonly_spreader_pao_services.set_resolve_flag(false); - spreader.test_only_on_init_new (order_def, pao_services); - REQUIRE(spreader.test_only_func_spreader_state() == SpreaderState::END); - } - SECTION("2. on_activate") - { - spreader.test_only_on_init_new (order_def, pao_services); - SpreaderOrderServices order_services (nullptr); - spreader.test_only_on_activate(spreader_price, spreader_quantity, order_services); - verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); - } - SECTION("5. on_cancel") - { - spreader.on_cancel(PerfTrace()); - REQUIRE(spreader.test_only_func_spreader_state() == SpreaderState::END); - LOG(OrderMan, Diag, "spreader_START.on_cancel"); - } -} -TEST_CASE ("spreader_WORKING", "[spreader]") -{ - bts::orderman::OrderKey order_key(0); - Price spreader_price = Price (1); Quantity spreader_quantity = Quantity (100); - ContractLeg leg_1, leg_2; - fill_future_contract_leg (leg_1, 2468, "ES", bts::api::Venue::VENUE_GLBX, 2017, 12, 15, 1.0, 1.0, api::Side::SIDE_BUY, 1.0, 0.25); - fill_future_contract_leg (leg_2, 13579, "ES", bts::api::Venue::VENUE_GLBX, 2018, 3, 15, -1.0, -1.0, api::Side::SIDE_SELL, 1.0, 0.25); - std::vector contract_legs; - contract_legs.push_back(leg_1);contract_legs.push_back(leg_2); - Security synthetic_security; - fill_synthetic_security (synthetic_security, 2000, "synthetic_security", contract_legs); - // execution params/order def - LegSpreaderParams lsp_1, lsp_2, lsp_3; - fill_leg_spreader_params(lsp_1, 1.0, true, 1.0);fill_leg_spreader_params(lsp_2, -1.0, true, 1.0); - std::vector spreader_params; - spreader_params.push_back(lsp_1);spreader_params.push_back(lsp_2); - bts::api::orderman::OrderDefinition order_def; - fill_spreader_order_definition(order_def, Side::SIDE_BUY, synthetic_security, spreader_params); - // putting it together in SpreaderBookkeepingData - SpreaderPreActivationOrderServices::TestOnlySpreaderPreActivationOrderServices testonly_spreader_pao_services = _create_spreader_pao_services(synthetic_security); - SpreaderPreActivationOrderServices pao_services (&testonly_spreader_pao_services); - std::vector leg_props; - SpreaderUtils::resolve_synthetic_spread(pao_services, order_def, leg_props); - SpreaderManagerForTest spreader_manager (order_key, order_def, pao_services, leg_props); - SpreaderOrder spreader; - REQUIRE(spreader.test_only_func_spreader_state() == SpreaderState::START); - // on_init_new and activate - spreader.test_only_on_init_new (order_def, pao_services); - SpreaderOrderServices order_services (nullptr); - spreader.test_only_on_activate(spreader_price, spreader_quantity, order_services); - SpreaderBookkeepingData& bookkeeping_data = spreader.test_only_func_spreader_full_data(); - verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); - SpreaderLegData& leg_data_1 = bookkeeping_data.get_leg_data (0); SpreaderLegData& leg_data_2 = bookkeeping_data.get_leg_data (1); - verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WAITING_FOR_SIZE, false, spreader_price, Quantity (100), Quantity (0), Quantity(0), Price(0), Quantity(0), Quantity(100), false); - verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WAITING_FOR_SIZE, false, spreader_price, Quantity (100), Quantity (0), Quantity(0), Price(0), Quantity(0), Quantity(100), false); +// SECTION("1. on_init_new.resolved") +// { +// spreader.test_only_on_init_new (order_def, pao_services); +// REQUIRE(spreader.test_only_func_spreader_state() == SpreaderState::START); +// SpreaderBookkeepingData& bookeeping_data = spreader.test_only_func_spreader_full_data(); +// REQUIRE(bookkeeping_data.get_leg_data(0).leg_property_data().security_key() == 2468); +// REQUIRE(bookkeeping_data.get_leg_data(1).leg_property_data().security_key() == 13579); +// } +// SECTION("1. on_init_new.not_resolved") +// { +// testonly_spreader_pao_services.set_resolve_flag(false); +// spreader.test_only_on_init_new (order_def, pao_services); +// REQUIRE(spreader.test_only_func_spreader_state() == SpreaderState::END); +// } +// SECTION("2. on_activate") +// { +// spreader.test_only_on_init_new (order_def, pao_services); +// SpreaderOrderServices order_services (nullptr); +// spreader.test_only_on_activate(spreader_price, spreader_quantity, order_services); +// verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); +// } +// SECTION("5. on_cancel") +// { +// spreader.on_cancel(PerfTrace()); +// REQUIRE(spreader.test_only_func_spreader_state() == SpreaderState::END); +// LOG(OrderMan, Diag, "spreader_START.on_cancel"); +// } +// } +// TEST_CASE ("spreader_WORKING", "[spreader]") +// { +// bts::orderman::OrderKey order_key(0); +// Price spreader_price = Price (1); Quantity spreader_quantity = Quantity (100); +// ContractLeg leg_1, leg_2; +// fill_future_contract_leg (leg_1, 2468, "ES", bts::api::Venue::VENUE_GLBX, 2017, 12, 15, 1.0, 1.0, api::Side::SIDE_BUY, 1.0, 0.25); +// fill_future_contract_leg (leg_2, 13579, "ES", bts::api::Venue::VENUE_GLBX, 2018, 3, 15, -1.0, -1.0, api::Side::SIDE_SELL, 1.0, 0.25); +// std::vector contract_legs; +// contract_legs.push_back(leg_1);contract_legs.push_back(leg_2); +// Security synthetic_security; +// fill_synthetic_security (synthetic_security, 2000, "synthetic_security", contract_legs); +// // execution params/order def +// LegSpreaderParams lsp_1, lsp_2, lsp_3; +// fill_leg_spreader_params(lsp_1, 1.0, true, 1.0);fill_leg_spreader_params(lsp_2, -1.0, true, 1.0); +// std::vector spreader_params; +// spreader_params.push_back(lsp_1);spreader_params.push_back(lsp_2); +// bts::api::orderman::OrderDefinition order_def; +// fill_spreader_order_definition(order_def, Side::SIDE_BUY, synthetic_security, spreader_params); +// // putting it together in SpreaderBookkeepingData +// SpreaderPreActivationOrderServices::TestOnlySpreaderPreActivationOrderServices testonly_spreader_pao_services = _create_spreader_pao_services(synthetic_security); +// SpreaderPreActivationOrderServices pao_services (&testonly_spreader_pao_services); +// std::vector leg_props; +// SpreaderUtils::resolve_synthetic_spread(pao_services, order_def, leg_props); +// SpreaderManagerForTest spreader_manager (order_key, order_def, pao_services, leg_props); +// SpreaderOrder spreader; +// REQUIRE(spreader.test_only_func_spreader_state() == SpreaderState::START); +// // on_init_new and activate +// spreader.test_only_on_init_new (order_def, pao_services); +// SpreaderOrderServices order_services (nullptr); +// spreader.test_only_on_activate(spreader_price, spreader_quantity, order_services); +// SpreaderBookkeepingData& bookkeeping_data = spreader.test_only_func_spreader_full_data(); +// verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); +// SpreaderLegData& leg_data_1 = bookkeeping_data.get_leg_data (0); SpreaderLegData& leg_data_2 = bookkeeping_data.get_leg_data (1); +// verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WAITING_FOR_SIZE, false, spreader_price, Quantity (100), Quantity (0), Quantity(0), Price(0), Quantity(0), Quantity(100), false); +// verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WAITING_FOR_SIZE, false, spreader_price, Quantity (100), Quantity (0), Quantity(0), Price(0), Quantity(0), Quantity(100), false); - set_spreader_orders (spreader, new double[5] {1999, 1998, 1997, 1996, 1995}, new uint16_t[5] {50, 50, 10, 10, 30}, - new double[5] {2000, 2001, 2002, 2003, 2004}, new uint16_t[5] {10, 15, 25, 50, 10}, - new double[5] {2002, 2001, 2000, 1999, 1998}, new uint16_t[5] {20, 20, 20, 20, 20}, - new double[5] {2003, 2004, 2005, 2006, 2007}, new uint16_t[5] {25, 25, 20, 20, 10}, 0, 0, 0, 0); - // verify working orders - verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (0), Quantity(0), Price(1999), Quantity(100), Quantity(100), false); - verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (0), Quantity(0), Price(2002), Quantity(100), Quantity(100), false); - // send fill on leg 1 (20) - spreader.test_only_on_child_order_update (leg_data_1.order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (20), Price (2000)); - verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (20), Quantity(0), Price(2000), Quantity(100), Quantity(80), false); - verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (0), Quantity(20), Price(2002), Quantity(80), Quantity(80), false); - // send another fill on leg 1 (10) - spreader.test_only_on_child_order_update (leg_data_1.order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (30), Price (2000)); - verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(0), Price(2000), Quantity(100), Quantity(70), false); - verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (0), Quantity(30), Price(2002), Quantity(70), Quantity(70), false); - // send fill on leg 2 (15) - spreader.test_only_on_child_order_update (leg_data_2.order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (15), Price (2001)); - verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(15), Price(2001), Quantity(85), Quantity(55), false); - verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (15), Quantity(30), Price(2002), Quantity(70), Quantity(55), false); - // send another fill on leg 2 (30) - spreader.test_only_on_child_order_update (leg_data_2.order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (45), Price (2001)); - verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(45), Price(2002), Quantity(55), Quantity(25), false); - verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (45), Quantity(30), Price(2000), Quantity(70), Quantity(25), false); - // send another fill on leg 2 (10) - spreader.test_only_on_child_order_update (leg_data_2.order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (55), Price (2001)); - verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2003), Quantity(45), Quantity(15), false); - verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); - // verify the hedgers - // leg 1 should have 3 hedgers, for each of the 3 fills - for (size_t i = 0; i < leg_data_1.n_hedgers(); i++) - spreader.test_only_on_child_order_update (leg_data_1.get_hedger(i).order_state().order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); - for (size_t i = 0; i < leg_data_2.n_hedgers(); i++) - spreader.test_only_on_child_order_update (leg_data_2.get_hedger(i).order_state().order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); - REQUIRE (leg_data_1.n_hedgers () == 3); - REQUIRE (leg_data_2.n_hedgers () == 2); - verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2003), Quantity(45), Quantity(15), false); - verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); - verify_complete_hedger_state (leg_data_1.get_hedger(0), HedgerState::WORKING, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); - verify_complete_hedger_state (leg_data_1.get_hedger(1), HedgerState::WORKING, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); - verify_complete_hedger_state (leg_data_1.get_hedger(2), HedgerState::WORKING, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); - verify_complete_hedger_state (leg_data_2.get_hedger(0), HedgerState::WORKING, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); - verify_complete_hedger_state (leg_data_2.get_hedger(1), HedgerState::WORKING, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); +// set_spreader_orders (spreader, new double[5] {1999, 1998, 1997, 1996, 1995}, new uint16_t[5] {50, 50, 10, 10, 30}, +// new double[5] {2000, 2001, 2002, 2003, 2004}, new uint16_t[5] {10, 15, 25, 50, 10}, +// new double[5] {2002, 2001, 2000, 1999, 1998}, new uint16_t[5] {20, 20, 20, 20, 20}, +// new double[5] {2003, 2004, 2005, 2006, 2007}, new uint16_t[5] {25, 25, 20, 20, 10}, 0, 0, 0, 0); +// // verify working orders +// verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (0), Quantity(0), Price(1999), Quantity(100), Quantity(100), false); +// verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (0), Quantity(0), Price(2002), Quantity(100), Quantity(100), false); +// // send fill on leg 1 (20) +// spreader.test_only_on_child_order_update (leg_data_1.order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (20), Price (2000)); +// verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (20), Quantity(0), Price(2000), Quantity(100), Quantity(80), false); +// verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (0), Quantity(20), Price(2002), Quantity(80), Quantity(80), false); +// // send another fill on leg 1 (10) +// spreader.test_only_on_child_order_update (leg_data_1.order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (30), Price (2000)); +// verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(0), Price(2000), Quantity(100), Quantity(70), false); +// verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (0), Quantity(30), Price(2002), Quantity(70), Quantity(70), false); +// // send fill on leg 2 (15) +// spreader.test_only_on_child_order_update (leg_data_2.order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (15), Price (2001)); +// verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(15), Price(2001), Quantity(85), Quantity(55), false); +// verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (15), Quantity(30), Price(2002), Quantity(70), Quantity(55), false); +// // send another fill on leg 2 (30) +// spreader.test_only_on_child_order_update (leg_data_2.order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (45), Price (2001)); +// verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(45), Price(2002), Quantity(55), Quantity(25), false); +// verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (45), Quantity(30), Price(2000), Quantity(70), Quantity(25), false); +// // send another fill on leg 2 (10) +// spreader.test_only_on_child_order_update (leg_data_2.order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (55), Price (2001)); +// verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2003), Quantity(45), Quantity(15), false); +// verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); +// // verify the hedgers +// // leg 1 should have 3 hedgers, for each of the 3 fills +// for (size_t i = 0; i < leg_data_1.n_hedgers(); i++) +// spreader.test_only_on_child_order_update (leg_data_1.get_hedger(i).order_state().order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); +// for (size_t i = 0; i < leg_data_2.n_hedgers(); i++) +// spreader.test_only_on_child_order_update (leg_data_2.get_hedger(i).order_state().order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); +// REQUIRE (leg_data_1.n_hedgers () == 3); +// REQUIRE (leg_data_2.n_hedgers () == 2); +// verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2003), Quantity(45), Quantity(15), false); +// verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); +// verify_complete_hedger_state (leg_data_1.get_hedger(0), HedgerState::WORKING, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); +// verify_complete_hedger_state (leg_data_1.get_hedger(1), HedgerState::WORKING, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); +// verify_complete_hedger_state (leg_data_1.get_hedger(2), HedgerState::WORKING, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); +// verify_complete_hedger_state (leg_data_2.get_hedger(0), HedgerState::WORKING, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); +// verify_complete_hedger_state (leg_data_2.get_hedger(1), HedgerState::WORKING, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); - auto generic_validate_quoters = [&](QuoterState quoter_state, bool quoter_cancelled_by_spreader) -> void - { - verify_complete_quoter_state (leg_data_1.quoter(), quoter_state, quoter_cancelled_by_spreader, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2003), Quantity(45), Quantity(15), false); - verify_complete_quoter_state (leg_data_2.quoter(), quoter_state, quoter_cancelled_by_spreader, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); - }; - auto generic_validate_hedgers = [&](HedgerState hedger_state) -> void - { - REQUIRE (leg_data_1.n_hedgers () == 3); - REQUIRE (leg_data_2.n_hedgers () == 2); - verify_complete_hedger_state (leg_data_1.get_hedger(0), hedger_state, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); - verify_complete_hedger_state (leg_data_1.get_hedger(1), hedger_state, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); - verify_complete_hedger_state (leg_data_1.get_hedger(2), hedger_state, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); - verify_complete_hedger_state (leg_data_2.get_hedger(0), hedger_state, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); - verify_complete_hedger_state (leg_data_2.get_hedger(1), hedger_state, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); - }; - SECTION("1. init") - { - } - SECTION("2. on_connect") - { - } - SECTION("4. on_update") - { - // updating the spreader order should cause - // the quoters to requote. hedgers should - // be as is - spreader_price = Price (0); - spreader_quantity = Quantity (200); - spreader.on_update (spreader_price, spreader_quantity,PerfTrace()); - verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); - verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity (30), Quantity(55), Price(1998), Quantity(130), Quantity(115), false); - verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity (55), Quantity(30), Price(2004), Quantity(165), Quantity(115), false); - // nothing changes with the hedgers - generic_validate_hedgers (HedgerState::WORKING); - LOG(OrderMan, Diag, "spreader_WORKING.on_update"); - } - SECTION("5. on_cancel") - { - spreader.on_cancel(PerfTrace()); - verify_basic_spreader_state (spreader, SpreaderState::WAITING_FOR_CANCEL_ALL, spreader_price, spreader_quantity); - generic_validate_quoters (QuoterState::WAITING_FOR_CANCEL_ACK, true); - generic_validate_hedgers (HedgerState::WAITING_FOR_CANCEL_ACK); - LOG(OrderMan, Diag, "spreader_WORKING.on_cancel"); - } - SECTION("6. on_book") - { - // 1. change the market such that it translates to no changes in order - // leg 1 needs 15 more to get filled. the 15 cumulative size level in leg2 - // comes out to be at 2002, which gives leg1 = spreader_price + leg2 = 1 + 2002 = 2003. - // changing leg 2's books such that 15 still comes at 2002 +// auto generic_validate_quoters = [&](QuoterState quoter_state, bool quoter_cancelled_by_spreader) -> void +// { +// verify_complete_quoter_state (leg_data_1.quoter(), quoter_state, quoter_cancelled_by_spreader, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2003), Quantity(45), Quantity(15), false); +// verify_complete_quoter_state (leg_data_2.quoter(), quoter_state, quoter_cancelled_by_spreader, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); +// }; +// auto generic_validate_hedgers = [&](HedgerState hedger_state) -> void +// { +// REQUIRE (leg_data_1.n_hedgers () == 3); +// REQUIRE (leg_data_2.n_hedgers () == 2); +// verify_complete_hedger_state (leg_data_1.get_hedger(0), hedger_state, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); +// verify_complete_hedger_state (leg_data_1.get_hedger(1), hedger_state, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); +// verify_complete_hedger_state (leg_data_1.get_hedger(2), hedger_state, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); +// verify_complete_hedger_state (leg_data_2.get_hedger(0), hedger_state, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); +// verify_complete_hedger_state (leg_data_2.get_hedger(1), hedger_state, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); +// }; +// SECTION("1. init") +// { +// } +// SECTION("2. on_connect") +// { +// } +// SECTION("4. on_update") +// { +// // updating the spreader order should cause +// // the quoters to requote. hedgers should +// // be as is +// spreader_price = Price (0); +// spreader_quantity = Quantity (200); +// spreader.on_update (spreader_price, spreader_quantity,PerfTrace()); +// verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); +// verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity (30), Quantity(55), Price(1998), Quantity(130), Quantity(115), false); +// verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity (55), Quantity(30), Price(2004), Quantity(165), Quantity(115), false); +// // nothing changes with the hedgers +// generic_validate_hedgers (HedgerState::WORKING); +// LOG(OrderMan, Diag, "spreader_WORKING.on_update"); +// } +// SECTION("5. on_cancel") +// { +// spreader.on_cancel(PerfTrace()); +// verify_basic_spreader_state (spreader, SpreaderState::WAITING_FOR_CANCEL_ALL, spreader_price, spreader_quantity); +// generic_validate_quoters (QuoterState::WAITING_FOR_CANCEL_ACK, true); +// generic_validate_hedgers (HedgerState::WAITING_FOR_CANCEL_ACK); +// LOG(OrderMan, Diag, "spreader_WORKING.on_cancel"); +// } +// SECTION("6. on_book") +// { +// // 1. change the market such that it translates to no changes in order +// // leg 1 needs 15 more to get filled. the 15 cumulative size level in leg2 +// // comes out to be at 2002, which gives leg1 = spreader_price + leg2 = 1 + 2002 = 2003. +// // changing leg 2's books such that 15 still comes at 2002 - uint32_t leg_1_id = leg_data_1.leg_property_data().security_key(), - leg_2_id = leg_data_2.leg_property_data().security_key(); - bts::orderman::Book modified_book = get_book (SecurityKey (leg_2_id), 5, - new double[5] {2004, 2003, 2002, 2001, 2000}, - new uint16_t[5] {5, 5, 5, 0, 0}, - new double[5] {2005, 2006, 2007, 2008, 2009}, - new uint16_t[5] {0, 0, 0, 0, 0}, - true); - spreader.test_only_on_book_update (modified_book, PerfTrace()); - verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); - generic_validate_quoters (QuoterState::WORKING, false); - generic_validate_hedgers (HedgerState::WORKING); - LOG(OrderMan, Diag, "spreader_WORKING.on_book"); - // 2. change the market to induce a price change - // we will go back to the prevoius market but make it thinner - // to force leg 1's quoter to go deeper into leg 2's book - modified_book = get_book (SecurityKey (leg_2_id), 5, - new double[5] {2002, 2001, 2000, 1999, 1998}, - new uint16_t[5] {1, 1, 1, 1, 11}, - new double[5] {2003, 2004, 2005, 2006, 2007}, - new uint16_t[5] {25, 25, 20, 20, 10}, - true); - //spreader.on_book (bts::orderman::PerfTrace(), modified_book); - spreader.test_only_on_book_update (modified_book,PerfTrace()); - verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); - verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(1999), Quantity(45), Quantity(15), false); - verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); - generic_validate_hedgers (HedgerState::WORKING); - LOG(OrderMan, Diag, "spreader_WORKING.on_book"); - // 3. shrink to market to force a size change - // the remaining target is 15, so we'll make the total - // less than 15 - modified_book = get_book (SecurityKey (leg_2_id), 5, - new double[5] {2002, 2001, 2000, 1999, 1998}, - new uint16_t[5] {1, 1, 1, 1, 0}, - new double[5] {2003, 2004, 2005, 2006, 2007}, - new uint16_t[5] {25, 25, 20, 20, 10}, - true); - //spreader.on_book (bts::orderman::PerfTrace(), modified_book); - spreader.test_only_on_book_update (modified_book,PerfTrace()); - verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); - verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2000), Quantity(34), Quantity(15), false); - verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); - generic_validate_hedgers (HedgerState::WORKING); - LOG(OrderMan, Diag, "spreader_WORKING.on_book"); - // 4. change the market to force both a price and size change - modified_book = get_book (SecurityKey (leg_2_id), 5, - new double[5] {2002, 2001, 2000, 1999, 1998}, - new uint16_t[5] {1, 1, 13, 1, 1}, - new double[5] {2003, 2004, 2005, 2006, 2007}, - new uint16_t[5] {25, 25, 20, 20, 10}, - true); - //spreader.on_book (bts::orderman::PerfTrace(), modified_book); - spreader.test_only_on_book_update (modified_book, PerfTrace()); - verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); - verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2001), Quantity(45), Quantity(15), false); - verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); - generic_validate_hedgers (HedgerState::WORKING); - LOG(OrderMan, Diag, "spreader_WORKING.on_book"); - // 5. remove the market - // this should pull the order - modified_book = get_book (SecurityKey (leg_2_id), 5, - new double[5] {2002, 2001, 2000, 1999, 1998}, - new uint16_t[5] {0, 0, 0, 0, 0}, - new double[5] {2003, 2004, 2005, 2006, 2007}, - new uint16_t[5] {25, 25, 20, 20, 10}, - true); - //spreader.on_book (bts::orderman::PerfTrace(), modified_book); - spreader.test_only_on_book_update (modified_book, PerfTrace()); - verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); - verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WAITING_FOR_CANCEL_ACK, false, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2001), Quantity(45), Quantity(15), false); - verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); - generic_validate_hedgers (HedgerState::WORKING); - LOG(OrderMan, Diag, "spreader_WORKING.on_book"); - } - SECTION("7. on_time") - { - } - SECTION("8. on_quoter_order_error") - { - spreader.test_only_on_child_order_update (leg_data_1.order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_ERROR, Quantity (30), Price (2000)); - verify_basic_spreader_state (spreader, SpreaderState::WAITING_FOR_CANCEL_ALL, spreader_price, spreader_quantity); - // the one that has an error goes to the end, the others are waiting on cancel ack's - REQUIRE(spreader.test_only_func_spreader_full_data().get_leg_data(0).quoter().test_only_func_quoter_state() == QuoterState::END); - REQUIRE(spreader.test_only_func_spreader_full_data().get_leg_data(1).quoter().test_only_func_quoter_state() == QuoterState::WAITING_FOR_CANCEL_ACK); - generic_validate_hedgers (HedgerState::WAITING_FOR_CANCEL_ACK); - LOG(OrderMan, Diag, "spreader_WORKING.on_quoter_order_error"); - } - SECTION("9. on_quoter_order_fill") - { - // add one more hedge - spreader.test_only_on_child_order_update (leg_data_2.order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (65), Price (2001)); - for (size_t i = 0; i < leg_data_1.n_hedgers(); i++) - spreader.test_only_on_child_order_update (leg_data_1.get_hedger(i).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); - for (size_t i = 0; i < leg_data_2.n_hedgers(); i++) - spreader.test_only_on_child_order_update (leg_data_2.get_hedger(i).order_state().order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); - REQUIRE (leg_data_1.n_hedgers () == 4); - REQUIRE (leg_data_2.n_hedgers () == 2); - verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(65), Price(2003), Quantity(35), Quantity(5), false); - verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (65), Quantity(30), Price(1999), Quantity(70), Quantity(5), false); - verify_complete_hedger_state (leg_data_1.get_hedger (0), HedgerState::WORKING, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); - verify_complete_hedger_state (leg_data_1.get_hedger (1), HedgerState::WORKING, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); - verify_complete_hedger_state (leg_data_1.get_hedger (2), HedgerState::WORKING, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); - verify_complete_hedger_state (leg_data_1.get_hedger (3), HedgerState::WORKING, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); - verify_complete_hedger_state (leg_data_2.get_hedger (0), HedgerState::WORKING, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); - verify_complete_hedger_state (leg_data_2.get_hedger (1), HedgerState::WORKING, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); - LOG(OrderMan, Diag, "spreader_WORKING.on_quoter_order_fill"); - } - SECTION("10. on_quoter_order_status_update") - { - // since order update has already been done in 9, lets fill - // it completely - spreader.test_only_on_child_order_update (leg_data_2.order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (70), Price (2001)); - for (size_t i = 0; i < leg_data_1.n_hedgers(); i++) - spreader.test_only_on_child_order_update (leg_data_1.get_hedger(i).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); - for (size_t i = 0; i < leg_data_2.n_hedgers(); i++) - spreader.test_only_on_child_order_update (leg_data_2.get_hedger(i).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); - REQUIRE (leg_data_1.n_hedgers () == 4); - REQUIRE (leg_data_2.n_hedgers () == 2); - verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WAITING_FOR_CANCEL_ACK, false, spreader_price, Quantity (100), Quantity (30), Quantity(70), Price(2003), Quantity(45), Quantity(0), true); - verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::END, false, spreader_price, Quantity (100), Quantity (0), Quantity(30), Price(0), Quantity(0), Quantity(0), true); - verify_complete_hedger_state (leg_data_1.get_hedger(0), HedgerState::WORKING, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); - verify_complete_hedger_state (leg_data_1.get_hedger(1), HedgerState::WORKING, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); - verify_complete_hedger_state (leg_data_1.get_hedger(2), HedgerState::WORKING, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); - verify_complete_hedger_state (leg_data_1.get_hedger(3), HedgerState::WORKING, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); - verify_complete_hedger_state (leg_data_2.get_hedger(0), HedgerState::WORKING, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); - verify_complete_hedger_state (leg_data_2.get_hedger(1), HedgerState::WORKING, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); - LOG(OrderMan, Diag, "spreader_WORKING.on_quoter_order_fill"); - } - SECTION("11. on_hedger_order_error") - { - spreader.test_only_on_child_order_update (leg_data_1.get_hedger(0).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_ERROR, Quantity (0), Price (0)); - verify_basic_spreader_state (spreader, SpreaderState::WAITING_FOR_CANCEL_ALL, spreader_price, spreader_quantity); - generic_validate_quoters (QuoterState::WAITING_FOR_CANCEL_ACK, true); - REQUIRE(leg_data_1.get_hedger(0).test_only_func_hedger_state() == HedgerState::END); - REQUIRE(leg_data_1.get_hedger(1).test_only_func_hedger_state() == HedgerState::WAITING_FOR_CANCEL_ACK); - REQUIRE(leg_data_1.get_hedger(2).test_only_func_hedger_state() == HedgerState::WAITING_FOR_CANCEL_ACK); - REQUIRE(leg_data_2.get_hedger(0).test_only_func_hedger_state() == HedgerState::WAITING_FOR_CANCEL_ACK); - REQUIRE(leg_data_2.get_hedger(1).test_only_func_hedger_state() == HedgerState::WAITING_FOR_CANCEL_ACK); - LOG(OrderMan, Diag, "spreader_WORKING.on_hedger_order_error"); - } - SECTION("12. on_hedger_order_update") - { - // send as fill for the hedger - spreader.test_only_on_child_order_update (leg_data_1.get_hedger(0).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (10), Price (2002)); - verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); - generic_validate_quoters (QuoterState::WORKING, false); - REQUIRE (leg_data_1.n_hedgers () == 3); - REQUIRE (leg_data_2.n_hedgers () == 2); - verify_complete_hedger_state (leg_data_1.get_hedger (0), HedgerState::WORKING, Price (2002), Quantity(15), Quantity (10), Price(2002), Quantity (15), Quantity (5)); - verify_complete_hedger_state (leg_data_1.get_hedger (1), HedgerState::WORKING, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); - verify_complete_hedger_state (leg_data_1.get_hedger (2), HedgerState::WORKING, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); - verify_complete_hedger_state (leg_data_2.get_hedger (0), HedgerState::WORKING, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); - verify_complete_hedger_state (leg_data_2.get_hedger (1), HedgerState::WORKING, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); - LOG(OrderMan, Diag, "spreader_WORKING.on_hedger_order_update"); - } - SECTION("14. on_check_termination") - { - // the only way to do a termination and transit - // to END is if the orders get filled. If we cancel - // it leaves this state; if we send terminal status - // on the quoters, and its not fully filled, the quoters - // resubmit and continue - // leg has 30 hedge deduction, and 55 filled, another 15 will fill it completely - spreader.test_only_on_child_order_update (leg_data_2.order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (70), Price (2001)); - REQUIRE (leg_data_1.n_hedgers () == 4); - REQUIRE (leg_data_2.n_hedgers () == 2); - verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WAITING_FOR_CANCEL_ACK, false, spreader_price, Quantity (100), Quantity (30), Quantity(70), Price(2003), Quantity(45), Quantity(0), true); - verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::END, false, spreader_price, Quantity (100), Quantity (0), Quantity(30), Price(0), Quantity(0), Quantity(0), true); - verify_complete_hedger_state (leg_data_1.get_hedger (0), HedgerState::WORKING, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); - verify_complete_hedger_state (leg_data_1.get_hedger (1), HedgerState::WORKING, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); - verify_complete_hedger_state (leg_data_1.get_hedger (2), HedgerState::WORKING, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); - verify_complete_hedger_state (leg_data_1.get_hedger (3), HedgerState::WAITING_FOR_FIRST_ACK, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15));//new hedger - verify_complete_hedger_state (leg_data_2.get_hedger (0), HedgerState::WORKING, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); - verify_complete_hedger_state (leg_data_2.get_hedger (1), HedgerState::WORKING, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); - verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); - // now bring the quoter and hedgers to their end states - // when all of them are at the end state, the spreader - // should also go to end - spreader.test_only_on_child_order_update (leg_data_1.order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_CANCELED, Quantity (30), Price (2001)); - verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::END, false, spreader_price, Quantity (100), Quantity (0), Quantity(70), Price(0), Quantity(0), Quantity(0), true); - verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); - // // all the quoters are done now - spreader.test_only_on_child_order_update (leg_data_1.get_hedger (0).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (15), Price (2002)); - verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); - spreader.test_only_on_child_order_update (leg_data_1.get_hedger (1).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (30), Price (2002)); - verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); - spreader.test_only_on_child_order_update (leg_data_1.get_hedger (2).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (10), Price (2002)); - verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); - spreader.test_only_on_child_order_update (leg_data_1.get_hedger (3).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (15), Price (2002)); - verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); - spreader.test_only_on_child_order_update (leg_data_2.get_hedger (0).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (20), Price (1999)); - verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); - spreader.test_only_on_child_order_update (leg_data_2.get_hedger (1).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (10), Price (1999)); - verify_basic_spreader_state (spreader, SpreaderState::END, spreader_price, spreader_quantity); - LOG(OrderMan, Diag, "spreader_WORKING.on_quoter_order_fill"); - } -} -TEST_CASE ("spreader_WAITING_FOR_CANCEL_ACK", "[spreader]") -{ - bts::orderman::OrderKey order_key(0); - Price spreader_price = Price (1); Quantity spreader_quantity = Quantity (100); - ContractLeg leg_1, leg_2; - fill_future_contract_leg (leg_1, 2468, "ES", bts::api::Venue::VENUE_GLBX, 2017, 12, 15, 1.0, 1.0, api::Side::SIDE_BUY, 1.0, 0.25); - fill_future_contract_leg (leg_2, 13579, "ES", bts::api::Venue::VENUE_GLBX, 2018, 3, 15, -1.0, -1.0, api::Side::SIDE_SELL, 1.0, 0.25); - std::vector contract_legs; - contract_legs.push_back(leg_1);contract_legs.push_back(leg_2); - Security synthetic_security; - fill_synthetic_security (synthetic_security, 2000, "synthetic_security", contract_legs); - // execution params/order def - LegSpreaderParams lsp_1, lsp_2, lsp_3; - fill_leg_spreader_params(lsp_1, 1.0, true, 1.0);fill_leg_spreader_params(lsp_2, -1.0, true, 1.0); - // post hedge time out here - std::vector spreader_params; - spreader_params.push_back(lsp_1);spreader_params.push_back(lsp_2); - bts::api::orderman::OrderDefinition order_def; - fill_spreader_order_definition(order_def, Side::SIDE_BUY, synthetic_security, spreader_params); - // putting it together in SpreaderBookkeepingData - SpreaderPreActivationOrderServices::TestOnlySpreaderPreActivationOrderServices testonly_spreader_pao_services = _create_spreader_pao_services(synthetic_security); - SpreaderPreActivationOrderServices pao_services (&testonly_spreader_pao_services); - std::vector leg_props; - SpreaderUtils::resolve_synthetic_spread(pao_services, order_def, leg_props); - SpreaderManagerForTest spreader_manager (order_key, order_def, pao_services, leg_props); - SpreaderOrder spreader; - REQUIRE(spreader.test_only_func_spreader_state() == SpreaderState::START); - // on_init_new and activate - spreader.test_only_on_init_new (order_def, pao_services); - SpreaderOrderServices order_services (nullptr); - spreader.test_only_on_activate(spreader_price, spreader_quantity, order_services); - SpreaderBookkeepingData& bookkeeping_data = spreader.test_only_func_spreader_full_data(); - verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); - SpreaderLegData& leg_data_1 = bookkeeping_data.get_leg_data (0); SpreaderLegData& leg_data_2 = bookkeeping_data.get_leg_data (1); - verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WAITING_FOR_SIZE, false, spreader_price, Quantity (100), Quantity (0), Quantity(0), Price(0), Quantity(0), Quantity(100), false); - verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WAITING_FOR_SIZE, false, spreader_price, Quantity (100), Quantity (0), Quantity(0), Price(0), Quantity(0), Quantity(100), false); +// uint32_t leg_1_id = leg_data_1.leg_property_data().security_key(), +// leg_2_id = leg_data_2.leg_property_data().security_key(); +// bts::orderman::Book modified_book = get_book (SecurityKey (leg_2_id), 5, +// new double[5] {2004, 2003, 2002, 2001, 2000}, +// new uint16_t[5] {5, 5, 5, 0, 0}, +// new double[5] {2005, 2006, 2007, 2008, 2009}, +// new uint16_t[5] {0, 0, 0, 0, 0}, +// true); +// spreader.test_only_on_book_update (modified_book, PerfTrace()); +// verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); +// generic_validate_quoters (QuoterState::WORKING, false); +// generic_validate_hedgers (HedgerState::WORKING); +// LOG(OrderMan, Diag, "spreader_WORKING.on_book"); +// // 2. change the market to induce a price change +// // we will go back to the prevoius market but make it thinner +// // to force leg 1's quoter to go deeper into leg 2's book +// modified_book = get_book (SecurityKey (leg_2_id), 5, +// new double[5] {2002, 2001, 2000, 1999, 1998}, +// new uint16_t[5] {1, 1, 1, 1, 11}, +// new double[5] {2003, 2004, 2005, 2006, 2007}, +// new uint16_t[5] {25, 25, 20, 20, 10}, +// true); +// //spreader.on_book (bts::orderman::PerfTrace(), modified_book); +// spreader.test_only_on_book_update (modified_book,PerfTrace()); +// verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); +// verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(1999), Quantity(45), Quantity(15), false); +// verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); +// generic_validate_hedgers (HedgerState::WORKING); +// LOG(OrderMan, Diag, "spreader_WORKING.on_book"); +// // 3. shrink to market to force a size change +// // the remaining target is 15, so we'll make the total +// // less than 15 +// modified_book = get_book (SecurityKey (leg_2_id), 5, +// new double[5] {2002, 2001, 2000, 1999, 1998}, +// new uint16_t[5] {1, 1, 1, 1, 0}, +// new double[5] {2003, 2004, 2005, 2006, 2007}, +// new uint16_t[5] {25, 25, 20, 20, 10}, +// true); +// //spreader.on_book (bts::orderman::PerfTrace(), modified_book); +// spreader.test_only_on_book_update (modified_book,PerfTrace()); +// verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); +// verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2000), Quantity(34), Quantity(15), false); +// verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); +// generic_validate_hedgers (HedgerState::WORKING); +// LOG(OrderMan, Diag, "spreader_WORKING.on_book"); +// // 4. change the market to force both a price and size change +// modified_book = get_book (SecurityKey (leg_2_id), 5, +// new double[5] {2002, 2001, 2000, 1999, 1998}, +// new uint16_t[5] {1, 1, 13, 1, 1}, +// new double[5] {2003, 2004, 2005, 2006, 2007}, +// new uint16_t[5] {25, 25, 20, 20, 10}, +// true); +// //spreader.on_book (bts::orderman::PerfTrace(), modified_book); +// spreader.test_only_on_book_update (modified_book, PerfTrace()); +// verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); +// verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2001), Quantity(45), Quantity(15), false); +// verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); +// generic_validate_hedgers (HedgerState::WORKING); +// LOG(OrderMan, Diag, "spreader_WORKING.on_book"); +// // 5. remove the market +// // this should pull the order +// modified_book = get_book (SecurityKey (leg_2_id), 5, +// new double[5] {2002, 2001, 2000, 1999, 1998}, +// new uint16_t[5] {0, 0, 0, 0, 0}, +// new double[5] {2003, 2004, 2005, 2006, 2007}, +// new uint16_t[5] {25, 25, 20, 20, 10}, +// true); +// //spreader.on_book (bts::orderman::PerfTrace(), modified_book); +// spreader.test_only_on_book_update (modified_book, PerfTrace()); +// verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); +// verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WAITING_FOR_CANCEL_ACK, false, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2001), Quantity(45), Quantity(15), false); +// verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); +// generic_validate_hedgers (HedgerState::WORKING); +// LOG(OrderMan, Diag, "spreader_WORKING.on_book"); +// } +// SECTION("7. on_time") +// { +// } +// SECTION("8. on_quoter_order_error") +// { +// spreader.test_only_on_child_order_update (leg_data_1.order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_ERROR, Quantity (30), Price (2000)); +// verify_basic_spreader_state (spreader, SpreaderState::WAITING_FOR_CANCEL_ALL, spreader_price, spreader_quantity); +// // the one that has an error goes to the end, the others are waiting on cancel ack's +// REQUIRE(spreader.test_only_func_spreader_full_data().get_leg_data(0).quoter().test_only_func_quoter_state() == QuoterState::END); +// REQUIRE(spreader.test_only_func_spreader_full_data().get_leg_data(1).quoter().test_only_func_quoter_state() == QuoterState::WAITING_FOR_CANCEL_ACK); +// generic_validate_hedgers (HedgerState::WAITING_FOR_CANCEL_ACK); +// LOG(OrderMan, Diag, "spreader_WORKING.on_quoter_order_error"); +// } +// SECTION("9. on_quoter_order_fill") +// { +// // add one more hedge +// spreader.test_only_on_child_order_update (leg_data_2.order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (65), Price (2001)); +// for (size_t i = 0; i < leg_data_1.n_hedgers(); i++) +// spreader.test_only_on_child_order_update (leg_data_1.get_hedger(i).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); +// for (size_t i = 0; i < leg_data_2.n_hedgers(); i++) +// spreader.test_only_on_child_order_update (leg_data_2.get_hedger(i).order_state().order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); +// REQUIRE (leg_data_1.n_hedgers () == 4); +// REQUIRE (leg_data_2.n_hedgers () == 2); +// verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(65), Price(2003), Quantity(35), Quantity(5), false); +// verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (65), Quantity(30), Price(1999), Quantity(70), Quantity(5), false); +// verify_complete_hedger_state (leg_data_1.get_hedger (0), HedgerState::WORKING, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); +// verify_complete_hedger_state (leg_data_1.get_hedger (1), HedgerState::WORKING, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); +// verify_complete_hedger_state (leg_data_1.get_hedger (2), HedgerState::WORKING, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); +// verify_complete_hedger_state (leg_data_1.get_hedger (3), HedgerState::WORKING, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); +// verify_complete_hedger_state (leg_data_2.get_hedger (0), HedgerState::WORKING, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); +// verify_complete_hedger_state (leg_data_2.get_hedger (1), HedgerState::WORKING, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); +// LOG(OrderMan, Diag, "spreader_WORKING.on_quoter_order_fill"); +// } +// SECTION("10. on_quoter_order_status_update") +// { +// // since order update has already been done in 9, lets fill +// // it completely +// spreader.test_only_on_child_order_update (leg_data_2.order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (70), Price (2001)); +// for (size_t i = 0; i < leg_data_1.n_hedgers(); i++) +// spreader.test_only_on_child_order_update (leg_data_1.get_hedger(i).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); +// for (size_t i = 0; i < leg_data_2.n_hedgers(); i++) +// spreader.test_only_on_child_order_update (leg_data_2.get_hedger(i).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); +// REQUIRE (leg_data_1.n_hedgers () == 4); +// REQUIRE (leg_data_2.n_hedgers () == 2); +// verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WAITING_FOR_CANCEL_ACK, false, spreader_price, Quantity (100), Quantity (30), Quantity(70), Price(2003), Quantity(45), Quantity(0), true); +// verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::END, false, spreader_price, Quantity (100), Quantity (0), Quantity(30), Price(0), Quantity(0), Quantity(0), true); +// verify_complete_hedger_state (leg_data_1.get_hedger(0), HedgerState::WORKING, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); +// verify_complete_hedger_state (leg_data_1.get_hedger(1), HedgerState::WORKING, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); +// verify_complete_hedger_state (leg_data_1.get_hedger(2), HedgerState::WORKING, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); +// verify_complete_hedger_state (leg_data_1.get_hedger(3), HedgerState::WORKING, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); +// verify_complete_hedger_state (leg_data_2.get_hedger(0), HedgerState::WORKING, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); +// verify_complete_hedger_state (leg_data_2.get_hedger(1), HedgerState::WORKING, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); +// LOG(OrderMan, Diag, "spreader_WORKING.on_quoter_order_fill"); +// } +// SECTION("11. on_hedger_order_error") +// { +// spreader.test_only_on_child_order_update (leg_data_1.get_hedger(0).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_ERROR, Quantity (0), Price (0)); +// verify_basic_spreader_state (spreader, SpreaderState::WAITING_FOR_CANCEL_ALL, spreader_price, spreader_quantity); +// generic_validate_quoters (QuoterState::WAITING_FOR_CANCEL_ACK, true); +// REQUIRE(leg_data_1.get_hedger(0).test_only_func_hedger_state() == HedgerState::END); +// REQUIRE(leg_data_1.get_hedger(1).test_only_func_hedger_state() == HedgerState::WAITING_FOR_CANCEL_ACK); +// REQUIRE(leg_data_1.get_hedger(2).test_only_func_hedger_state() == HedgerState::WAITING_FOR_CANCEL_ACK); +// REQUIRE(leg_data_2.get_hedger(0).test_only_func_hedger_state() == HedgerState::WAITING_FOR_CANCEL_ACK); +// REQUIRE(leg_data_2.get_hedger(1).test_only_func_hedger_state() == HedgerState::WAITING_FOR_CANCEL_ACK); +// LOG(OrderMan, Diag, "spreader_WORKING.on_hedger_order_error"); +// } +// SECTION("12. on_hedger_order_update") +// { +// // send as fill for the hedger +// spreader.test_only_on_child_order_update (leg_data_1.get_hedger(0).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (10), Price (2002)); +// verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); +// generic_validate_quoters (QuoterState::WORKING, false); +// REQUIRE (leg_data_1.n_hedgers () == 3); +// REQUIRE (leg_data_2.n_hedgers () == 2); +// verify_complete_hedger_state (leg_data_1.get_hedger (0), HedgerState::WORKING, Price (2002), Quantity(15), Quantity (10), Price(2002), Quantity (15), Quantity (5)); +// verify_complete_hedger_state (leg_data_1.get_hedger (1), HedgerState::WORKING, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); +// verify_complete_hedger_state (leg_data_1.get_hedger (2), HedgerState::WORKING, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); +// verify_complete_hedger_state (leg_data_2.get_hedger (0), HedgerState::WORKING, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); +// verify_complete_hedger_state (leg_data_2.get_hedger (1), HedgerState::WORKING, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); +// LOG(OrderMan, Diag, "spreader_WORKING.on_hedger_order_update"); +// } +// SECTION("14. on_check_termination") +// { +// // the only way to do a termination and transit +// // to END is if the orders get filled. If we cancel +// // it leaves this state; if we send terminal status +// // on the quoters, and its not fully filled, the quoters +// // resubmit and continue +// // leg has 30 hedge deduction, and 55 filled, another 15 will fill it completely +// spreader.test_only_on_child_order_update (leg_data_2.order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (70), Price (2001)); +// REQUIRE (leg_data_1.n_hedgers () == 4); +// REQUIRE (leg_data_2.n_hedgers () == 2); +// verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WAITING_FOR_CANCEL_ACK, false, spreader_price, Quantity (100), Quantity (30), Quantity(70), Price(2003), Quantity(45), Quantity(0), true); +// verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::END, false, spreader_price, Quantity (100), Quantity (0), Quantity(30), Price(0), Quantity(0), Quantity(0), true); +// verify_complete_hedger_state (leg_data_1.get_hedger (0), HedgerState::WORKING, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); +// verify_complete_hedger_state (leg_data_1.get_hedger (1), HedgerState::WORKING, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); +// verify_complete_hedger_state (leg_data_1.get_hedger (2), HedgerState::WORKING, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); +// verify_complete_hedger_state (leg_data_1.get_hedger (3), HedgerState::WAITING_FOR_FIRST_ACK, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15));//new hedger +// verify_complete_hedger_state (leg_data_2.get_hedger (0), HedgerState::WORKING, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); +// verify_complete_hedger_state (leg_data_2.get_hedger (1), HedgerState::WORKING, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); +// verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); +// // now bring the quoter and hedgers to their end states +// // when all of them are at the end state, the spreader +// // should also go to end +// spreader.test_only_on_child_order_update (leg_data_1.order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_CANCELED, Quantity (30), Price (2001)); +// verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::END, false, spreader_price, Quantity (100), Quantity (0), Quantity(70), Price(0), Quantity(0), Quantity(0), true); +// verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); +// // // all the quoters are done now +// spreader.test_only_on_child_order_update (leg_data_1.get_hedger (0).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (15), Price (2002)); +// verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); +// spreader.test_only_on_child_order_update (leg_data_1.get_hedger (1).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (30), Price (2002)); +// verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); +// spreader.test_only_on_child_order_update (leg_data_1.get_hedger (2).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (10), Price (2002)); +// verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); +// spreader.test_only_on_child_order_update (leg_data_1.get_hedger (3).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (15), Price (2002)); +// verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); +// spreader.test_only_on_child_order_update (leg_data_2.get_hedger (0).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (20), Price (1999)); +// verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); +// spreader.test_only_on_child_order_update (leg_data_2.get_hedger (1).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_COMPLETED, Quantity (10), Price (1999)); +// verify_basic_spreader_state (spreader, SpreaderState::END, spreader_price, spreader_quantity); +// LOG(OrderMan, Diag, "spreader_WORKING.on_quoter_order_fill"); +// } +// } +// TEST_CASE ("spreader_WAITING_FOR_CANCEL_ACK", "[spreader]") +// { +// bts::orderman::OrderKey order_key(0); +// Price spreader_price = Price (1); Quantity spreader_quantity = Quantity (100); +// ContractLeg leg_1, leg_2; +// fill_future_contract_leg (leg_1, 2468, "ES", bts::api::Venue::VENUE_GLBX, 2017, 12, 15, 1.0, 1.0, api::Side::SIDE_BUY, 1.0, 0.25); +// fill_future_contract_leg (leg_2, 13579, "ES", bts::api::Venue::VENUE_GLBX, 2018, 3, 15, -1.0, -1.0, api::Side::SIDE_SELL, 1.0, 0.25); +// std::vector contract_legs; +// contract_legs.push_back(leg_1);contract_legs.push_back(leg_2); +// Security synthetic_security; +// fill_synthetic_security (synthetic_security, 2000, "synthetic_security", contract_legs); +// // execution params/order def +// LegSpreaderParams lsp_1, lsp_2, lsp_3; +// fill_leg_spreader_params(lsp_1, 1.0, true, 1.0);fill_leg_spreader_params(lsp_2, -1.0, true, 1.0); +// // post hedge time out here +// std::vector spreader_params; +// spreader_params.push_back(lsp_1);spreader_params.push_back(lsp_2); +// bts::api::orderman::OrderDefinition order_def; +// fill_spreader_order_definition(order_def, Side::SIDE_BUY, synthetic_security, spreader_params); +// // putting it together in SpreaderBookkeepingData +// SpreaderPreActivationOrderServices::TestOnlySpreaderPreActivationOrderServices testonly_spreader_pao_services = _create_spreader_pao_services(synthetic_security); +// SpreaderPreActivationOrderServices pao_services (&testonly_spreader_pao_services); +// std::vector leg_props; +// SpreaderUtils::resolve_synthetic_spread(pao_services, order_def, leg_props); +// SpreaderManagerForTest spreader_manager (order_key, order_def, pao_services, leg_props); +// SpreaderOrder spreader; +// REQUIRE(spreader.test_only_func_spreader_state() == SpreaderState::START); +// // on_init_new and activate +// spreader.test_only_on_init_new (order_def, pao_services); +// SpreaderOrderServices order_services (nullptr); +// spreader.test_only_on_activate(spreader_price, spreader_quantity, order_services); +// SpreaderBookkeepingData& bookkeeping_data = spreader.test_only_func_spreader_full_data(); +// verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); +// SpreaderLegData& leg_data_1 = bookkeeping_data.get_leg_data (0); SpreaderLegData& leg_data_2 = bookkeeping_data.get_leg_data (1); +// verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WAITING_FOR_SIZE, false, spreader_price, Quantity (100), Quantity (0), Quantity(0), Price(0), Quantity(0), Quantity(100), false); +// verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WAITING_FOR_SIZE, false, spreader_price, Quantity (100), Quantity (0), Quantity(0), Price(0), Quantity(0), Quantity(100), false); - set_spreader_orders (spreader, new double[5] {1999, 1998, 1997, 1996, 1995}, new uint16_t[5] {50, 50, 10, 10, 30}, - new double[5] {2000, 2001, 2002, 2003, 2004}, new uint16_t[5] {10, 15, 25, 50, 10}, - new double[5] {2002, 2001, 2000, 1999, 1998}, new uint16_t[5] {20, 20, 20, 20, 20}, - new double[5] {2003, 2004, 2005, 2006, 2007}, new uint16_t[5] {25, 25, 20, 20, 10}, 0, 0, 0, 0); - // verify working orders - verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (0), Quantity(0), Price(1999), Quantity(100), Quantity(100), false); - verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (0), Quantity(0), Price(2002), Quantity(100), Quantity(100), false); - // send fill on leg 1 (20) - spreader.test_only_on_child_order_update (leg_data_1.order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (20), Price (2000)); - verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (20), Quantity(0), Price(2000), Quantity(100), Quantity(80), false); - verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (0), Quantity(20), Price(2002), Quantity(80), Quantity(80), false); - // send another fill on leg 1 (10) - spreader.test_only_on_child_order_update (leg_data_1.order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (30), Price (2000)); - verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(0), Price(2000), Quantity(100), Quantity(70), false); - verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (0), Quantity(30), Price(2002), Quantity(70), Quantity(70), false); - // send fill on leg 2 (15) - spreader.test_only_on_child_order_update (leg_data_2.order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (15), Price (2001)); - verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(15), Price(2001), Quantity(85), Quantity(55), false); - verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (15), Quantity(30), Price(2002), Quantity(70), Quantity(55), false); - // send another fill on leg 2 (30) - spreader.test_only_on_child_order_update (leg_data_2.order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (45), Price (2001)); - verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(45), Price(2002), Quantity(55), Quantity(25), false); - verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (45), Quantity(30), Price(2000), Quantity(70), Quantity(25), false); - // send another fill on leg 2 (10) - spreader.test_only_on_child_order_update (leg_data_2.order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (55), Price (2001)); - verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2003), Quantity(45), Quantity(15), false); - verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); - // verify the hedgers - // leg 1 should have 3 hedgers, for each of the 3 fills - for (size_t i = 0; i < leg_data_1.n_hedgers(); i++) - spreader.test_only_on_child_order_update (leg_data_1.get_hedger(i).order_state().order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); - for (size_t i = 0; i < leg_data_2.n_hedgers(); i++) - spreader.test_only_on_child_order_update (leg_data_2.get_hedger(i).order_state().order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); - REQUIRE (leg_data_1.n_hedgers () == 3); - REQUIRE (leg_data_2.n_hedgers () == 2); - verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2003), Quantity(45), Quantity(15), false); - verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); - verify_complete_hedger_state (leg_data_1.get_hedger (0), HedgerState::WORKING, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); - verify_complete_hedger_state (leg_data_1.get_hedger (1), HedgerState::WORKING, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); - verify_complete_hedger_state (leg_data_1.get_hedger (2), HedgerState::WORKING, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); - verify_complete_hedger_state (leg_data_2.get_hedger (0), HedgerState::WORKING, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); - verify_complete_hedger_state (leg_data_2.get_hedger (1), HedgerState::WORKING, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); +// set_spreader_orders (spreader, new double[5] {1999, 1998, 1997, 1996, 1995}, new uint16_t[5] {50, 50, 10, 10, 30}, +// new double[5] {2000, 2001, 2002, 2003, 2004}, new uint16_t[5] {10, 15, 25, 50, 10}, +// new double[5] {2002, 2001, 2000, 1999, 1998}, new uint16_t[5] {20, 20, 20, 20, 20}, +// new double[5] {2003, 2004, 2005, 2006, 2007}, new uint16_t[5] {25, 25, 20, 20, 10}, 0, 0, 0, 0); +// // verify working orders +// verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (0), Quantity(0), Price(1999), Quantity(100), Quantity(100), false); +// verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (0), Quantity(0), Price(2002), Quantity(100), Quantity(100), false); +// // send fill on leg 1 (20) +// spreader.test_only_on_child_order_update (leg_data_1.order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (20), Price (2000)); +// verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (20), Quantity(0), Price(2000), Quantity(100), Quantity(80), false); +// verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (0), Quantity(20), Price(2002), Quantity(80), Quantity(80), false); +// // send another fill on leg 1 (10) +// spreader.test_only_on_child_order_update (leg_data_1.order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (30), Price (2000)); +// verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(0), Price(2000), Quantity(100), Quantity(70), false); +// verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (0), Quantity(30), Price(2002), Quantity(70), Quantity(70), false); +// // send fill on leg 2 (15) +// spreader.test_only_on_child_order_update (leg_data_2.order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (15), Price (2001)); +// verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(15), Price(2001), Quantity(85), Quantity(55), false); +// verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (15), Quantity(30), Price(2002), Quantity(70), Quantity(55), false); +// // send another fill on leg 2 (30) +// spreader.test_only_on_child_order_update (leg_data_2.order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (45), Price (2001)); +// verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(45), Price(2002), Quantity(55), Quantity(25), false); +// verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (45), Quantity(30), Price(2000), Quantity(70), Quantity(25), false); +// // send another fill on leg 2 (10) +// spreader.test_only_on_child_order_update (leg_data_2.order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (55), Price (2001)); +// verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2003), Quantity(45), Quantity(15), false); +// verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); +// // verify the hedgers +// // leg 1 should have 3 hedgers, for each of the 3 fills +// for (size_t i = 0; i < leg_data_1.n_hedgers(); i++) +// spreader.test_only_on_child_order_update (leg_data_1.get_hedger(i).order_state().order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); +// for (size_t i = 0; i < leg_data_2.n_hedgers(); i++) +// spreader.test_only_on_child_order_update (leg_data_2.get_hedger(i).order_state().order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (0), Price (0)); +// REQUIRE (leg_data_1.n_hedgers () == 3); +// REQUIRE (leg_data_2.n_hedgers () == 2); +// verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2003), Quantity(45), Quantity(15), false); +// verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); +// verify_complete_hedger_state (leg_data_1.get_hedger (0), HedgerState::WORKING, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); +// verify_complete_hedger_state (leg_data_1.get_hedger (1), HedgerState::WORKING, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); +// verify_complete_hedger_state (leg_data_1.get_hedger (2), HedgerState::WORKING, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); +// verify_complete_hedger_state (leg_data_2.get_hedger (0), HedgerState::WORKING, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); +// verify_complete_hedger_state (leg_data_2.get_hedger (1), HedgerState::WORKING, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); - LOG(OrderMan, Diag, "spreader_WAITING_FOR_CANCEL_ACK.initializing"); - // now cancel the spreader - bts::TimeStamp cancel_timestamp = std::chrono::system_clock::now(); - spreader.test_only_on_time (cancel_timestamp); - spreader.on_cancel (PerfTrace()); - auto validate_state = [&]() -> void - { - verify_basic_spreader_state (spreader, SpreaderState::WAITING_FOR_CANCEL_ALL, spreader_price, spreader_quantity); - REQUIRE (leg_data_1.n_hedgers () == 3); - REQUIRE (leg_data_2.n_hedgers () == 2); - verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WAITING_FOR_CANCEL_ACK, true, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2003), Quantity(45), Quantity(15), false); - verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WAITING_FOR_CANCEL_ACK, true, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); - verify_complete_hedger_state (leg_data_1.get_hedger (0), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); - verify_complete_hedger_state (leg_data_1.get_hedger (1), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); - verify_complete_hedger_state (leg_data_1.get_hedger (2), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); - verify_complete_hedger_state (leg_data_2.get_hedger (0), HedgerState::WAITING_FOR_CANCEL_ACK, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); - verify_complete_hedger_state (leg_data_2.get_hedger (1), HedgerState::WAITING_FOR_CANCEL_ACK, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); - }; - validate_state (); - SECTION("1. init") - { - } - SECTION("2. on_connect") - { - } - SECTION("4. on_update") - { - spreader.on_update (Price(-0.05), Quantity(200),PerfTrace()); - validate_state(); - // order changes dont go through - validate_state(); - LOG(OrderMan, Diag, "spreader_WAITING_FOR_CANCEL_ACK.on_update"); - } - SECTION("5. on_cancel") - { - spreader.on_cancel(PerfTrace()); - // already in cancel state, no change - validate_state(); - LOG(OrderMan, Diag, "spreader_WAITING_FOR_CANCEL_ACK.on_cancel"); - } - SECTION("6. on_book") - { - // like 4 and 5, should have no effect - set_spreader_orders (spreader, new double[5] {1999, 1998, 1997, 1996, 1995}, new uint16_t[5] {1, 0, 0, 0, 0}, - new double[5] {2000, 2001, 2002, 2003, 2004}, new uint16_t[5] {1, 1, 2, 0, 0}, - new double[5] {2002, 2001, 2000, 1999, 1998}, new uint16_t[5] {1, 0, 0, 0, 0}, - new double[5] {2003, 2004, 2005, 2006, 2007}, new uint16_t[5] {1, 0, 0, 0, 0}, 30, 2000, 55, 2001); - validate_state (); - LOG(OrderMan, Diag, "spreader_WAITING_FOR_CANCEL_ACK.on_book"); - } - // SECTION("7. on_time") - // { - // while (spreader.test_only_func_spreader_state () != SpreaderState::END) - // { - // spreader.on_time (std::chrono::system_clock::now()); - // std::this_thread::sleep_for(std::chrono::milliseconds(1)); - // } - // int64_t time_since_cxl = ms_diff (std::chrono::system_clock::now(), cancel_timestamp); - // REQUIRE (time_since_cxl >= spreader.test_cancel_timeout()); - // verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::END, true, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2003), Quantity(45), Quantity(15), false); - // verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::END, true, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); - // verify_complete_hedger_state (leg_data_1.get_hedger (0).hedger(), HedgerState::END, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); - // verify_complete_hedger_state (leg_data_1.get_hedger (1).hedger(), HedgerState::END, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); - // verify_complete_hedger_state (leg_data_1.get_hedger (2).hedger(), HedgerState::END, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); - // verify_complete_hedger_state (leg_data_2.get_hedger (0).hedger(), HedgerState::END, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); - // verify_complete_hedger_state (leg_data_2.get_hedger (1).hedger(), HedgerState::END, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); - // LOG(OrderMan, Diag, "spreader_WAITING_FOR_CANCEL_ACK.on_time"); - // } - SECTION("8. on_quoter_order_error") - { - spreader.test_only_on_child_order_update (leg_data_1.order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_DISCONNECTED, Quantity (30), Price (2000)); - validate_state(); - LOG(OrderMan, Diag, "spreader_WAITING_FOR_CANCEL_ACK.on_quoter_order_error"); - } - SECTION("9. on_quoter_order_fill") - { - // send another fill on leg 1, this will update the filled - // state of leg 1, but no other action will take place - spreader.test_only_on_child_order_update (leg_data_1.order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (40), Price (2000.5)); - verify_basic_spreader_state (spreader, SpreaderState::WAITING_FOR_CANCEL_ALL, spreader_price, spreader_quantity); - REQUIRE (leg_data_1.n_hedgers () == 3); - REQUIRE (leg_data_2.n_hedgers () == 2); - verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WAITING_FOR_CANCEL_ACK, true, spreader_price, Quantity (100), Quantity (40), Quantity(55), Price(2003), Quantity(45), Quantity(5), false); - verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WAITING_FOR_CANCEL_ACK, true, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); - verify_complete_hedger_state (leg_data_1.get_hedger (0), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); - verify_complete_hedger_state (leg_data_1.get_hedger (1), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); - verify_complete_hedger_state (leg_data_1.get_hedger (2), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); - verify_complete_hedger_state (leg_data_2.get_hedger (0), HedgerState::WAITING_FOR_CANCEL_ACK, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); - verify_complete_hedger_state (leg_data_2.get_hedger (1), HedgerState::WAITING_FOR_CANCEL_ACK, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); - LOG(OrderMan, Diag, "spreader_WAITING_FOR_CANCEL_ACK.on_quoter_order_fill"); - } - SECTION("10. on_quoter_order_status_update") - { - // cancelled update - spreader.test_only_on_child_order_update (leg_data_1.order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_CANCELED, Quantity (30), Price (2000)); - verify_basic_spreader_state (spreader, SpreaderState::WAITING_FOR_CANCEL_ALL, spreader_price, spreader_quantity); - REQUIRE (leg_data_1.n_hedgers () == 3); - REQUIRE (leg_data_2.n_hedgers () == 2); - verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::END, true, spreader_price, Quantity (100), Quantity (0), Quantity(55), Price(0), Quantity(0), Quantity(15), false); - verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WAITING_FOR_CANCEL_ACK, true, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); - verify_complete_hedger_state (leg_data_1.get_hedger (0), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); - verify_complete_hedger_state (leg_data_1.get_hedger (1), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); - verify_complete_hedger_state (leg_data_1.get_hedger (2), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); - verify_complete_hedger_state (leg_data_2.get_hedger (0), HedgerState::WAITING_FOR_CANCEL_ACK, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); - verify_complete_hedger_state (leg_data_2.get_hedger (1), HedgerState::WAITING_FOR_CANCEL_ACK, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); - LOG(OrderMan, Diag, "spreader_WAITING_FOR_CANCEL_ACK.on_quoter_order_status_update"); - } - SECTION("11. on_hedger_order_error") - { - std::string err_msg = "error"; - spreader.test_only_on_child_order_update (leg_data_1.get_hedger (0).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_DISCONNECTED, Quantity (0), Price (0)); - validate_state (); - LOG(OrderMan, Diag, "spreader_WAITING_FOR_CANCEL_ACK.on_hedger_order_error"); - } - SECTION("12. on_hedger_order_update") - { - // send a fill - spreader.test_only_on_child_order_update (leg_data_1.get_hedger(0).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (10), Price (2000)); - verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WAITING_FOR_CANCEL_ACK, true, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2003), Quantity(45), Quantity(15), false); - verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WAITING_FOR_CANCEL_ACK, true, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); - verify_complete_hedger_state (leg_data_1.get_hedger(0), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(15), Quantity (10), Price(2002), Quantity (15), Quantity (5)); - verify_complete_hedger_state (leg_data_1.get_hedger(1), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); - verify_complete_hedger_state (leg_data_1.get_hedger(2), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); - verify_complete_hedger_state (leg_data_2.get_hedger(0), HedgerState::WAITING_FOR_CANCEL_ACK, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); - verify_complete_hedger_state (leg_data_2.get_hedger(1), HedgerState::WAITING_FOR_CANCEL_ACK, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); - LOG(OrderMan, Diag, "spreader_WAITING_FOR_CANCEL_ACK.on_hedger_order_update"); - } - SECTION("14. on_check_termination") - { - // send cancel for orders, once all quoters and hedgers - // are cancelled, spreader should come to end - spreader.test_only_on_child_order_update (leg_data_1.order_update_message().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_CANCELED, Quantity (30), Price (2000)); - verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::END, true, spreader_price, Quantity (100), Quantity (0), Quantity(55), Price(0), Quantity(0), Quantity(15), false); - spreader.test_only_on_child_order_update (leg_data_2.order_update_message().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_CANCELED, Quantity (55), Price (2000)); - verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::END, true, spreader_price, Quantity (100), Quantity (0), Quantity(30), Price(0), Quantity(0), Quantity(15), false); - verify_basic_spreader_state (spreader, SpreaderState::WAITING_FOR_CANCEL_ALL, spreader_price, spreader_quantity); - spreader.test_only_on_child_order_update (leg_data_1.get_hedger (0).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_CANCELED, Quantity (0), Price (0)); - verify_complete_hedger_state (leg_data_1.get_hedger(0), HedgerState::END, Price (2002), Quantity(15), Quantity (0), Price(0), Quantity (0), Quantity (15)); - spreader.test_only_on_child_order_update (leg_data_1.get_hedger (1).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_CANCELED, Quantity (0), Price (0)); - verify_complete_hedger_state (leg_data_1.get_hedger(1), HedgerState::END, Price (2002), Quantity(30), Quantity (0), Price(0), Quantity (0), Quantity (30)); - spreader.test_only_on_child_order_update (leg_data_1.get_hedger (2).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_CANCELED, Quantity (0), Price (0)); - verify_complete_hedger_state (leg_data_1.get_hedger(2), HedgerState::END, Price (2002), Quantity(10), Quantity (0), Price(0), Quantity (0), Quantity (10)); - spreader.test_only_on_child_order_update (leg_data_2.get_hedger (0).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_CANCELED, Quantity (0), Price (0)); - verify_complete_hedger_state (leg_data_2.get_hedger(0), HedgerState::END, Price (1999), Quantity(20), Quantity (0), Price(0), Quantity (0), Quantity (20)); - verify_basic_spreader_state (spreader, SpreaderState::WAITING_FOR_CANCEL_ALL, spreader_price, spreader_quantity); - spreader.test_only_on_child_order_update (leg_data_2.get_hedger (1).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_CANCELED, Quantity (0), Price (0)); - verify_complete_hedger_state (leg_data_2.get_hedger(1), HedgerState::END, Price (1999), Quantity(10), Quantity (0), Price(0), Quantity (0), Quantity (10)); - verify_basic_spreader_state (spreader, SpreaderState::END, spreader_price, spreader_quantity); - LOG(OrderMan, Diag, "spreader_WAITING_FOR_CANCEL_ACK.on_check_termination"); - } -} -TEST_CASE ("find_target_price_in_book", "[spreader]"){ - SECTION("0.05"){ - Quantity out_level_qty, out_cum_qty; - bts::orderman::Book book; - uint16_t sizes[] = { 11, 13, 17, 19, 23 }; - double prices[] = { 22, 21.15, 20.10, 20.05, 20.00 }; - fill_book (book, prices, sizes, bts::api::Side::SIDE_BUY); - // middle - bool res = SpreaderUtils::find_qty_at_price_level(book, bts::api::Side::SIDE_BUY, Price(20.10), 0.05, out_level_qty, out_cum_qty); - REQUIRE(res); - REQUIRE(out_level_qty.value()==17); - REQUIRE(out_cum_qty.value()==41); - // first - res = SpreaderUtils::find_qty_at_price_level(book, bts::api::Side::SIDE_BUY, Price(22.00), 0.05, out_level_qty, out_cum_qty); - REQUIRE(res); - REQUIRE(out_level_qty.value()==11); - REQUIRE(out_cum_qty.value()==11); - // last - res = SpreaderUtils::find_qty_at_price_level(book, bts::api::Side::SIDE_BUY, Price(20.00), 0.05, out_level_qty, out_cum_qty); - REQUIRE(res); - REQUIRE(out_level_qty.value()==23); - REQUIRE(out_cum_qty.value()==83); - // not found - res = SpreaderUtils::find_qty_at_price_level(book, bts::api::Side::SIDE_BUY, Price(21.00), 0.05, out_level_qty, out_cum_qty); - REQUIRE(!res); - // rounding error - res = SpreaderUtils::find_qty_at_price_level(book, bts::api::Side::SIDE_BUY, Price(20.04999999), 0.05, out_level_qty, out_cum_qty); - REQUIRE(res); - REQUIRE(out_level_qty.value()==19); - REQUIRE(out_cum_qty.value()==60); - } - SECTION("1/32"){ - Quantity out_level_qty, out_cum_qty; - bts::orderman::Book book; - uint16_t sizes[] = { 12, 91, 5, 24, 33 }; - double prices[] = { 100.21875, 100.28125, 101, 101.53125, 101.71875 }; - fill_book (book, prices, sizes, bts::api::Side::SIDE_SELL); - // first - bool res = SpreaderUtils::find_qty_at_price_level(book, bts::api::Side::SIDE_SELL, Price(100.21875), 0.03125, out_level_qty, out_cum_qty); - REQUIRE(res); - REQUIRE(out_level_qty.value()==12); - REQUIRE(out_cum_qty.value()==12); - // middle - res = SpreaderUtils::find_qty_at_price_level(book, bts::api::Side::SIDE_SELL, Price(101.53125), 0.03125, out_level_qty, out_cum_qty); - REQUIRE(res); - REQUIRE(out_level_qty.value()==24); - REQUIRE(out_cum_qty.value()==132); - // end - res = SpreaderUtils::find_qty_at_price_level(book, bts::api::Side::SIDE_SELL, Price(101.71875), 0.03125, out_level_qty, out_cum_qty); - REQUIRE(res); - REQUIRE(out_level_qty.value()==33); - REQUIRE(out_cum_qty.value()==165); - // absent - res = SpreaderUtils::find_qty_at_price_level(book, bts::api::Side::SIDE_SELL, Price(101.5625), 0.03125, out_level_qty, out_cum_qty); - REQUIRE(!res); - REQUIRE(out_level_qty.value()==0); - REQUIRE(out_cum_qty.value()==0); - res = SpreaderUtils::find_qty_at_price_level(book, bts::api::Side::SIDE_BUY, Price(101.71875), 0.03125, out_level_qty, out_cum_qty); - REQUIRE(!res); - REQUIRE(out_level_qty.value()==0); - REQUIRE(out_cum_qty.value()==0); - // rounding - res = SpreaderUtils::find_qty_at_price_level(book, bts::api::Side::SIDE_SELL, Price(101.531249999999), 0.03125, out_level_qty, out_cum_qty); - REQUIRE(res); - REQUIRE(out_level_qty.value()==24); - REQUIRE(out_cum_qty.value()==132); - } -} -TEST_CASE ("prehedge_payless", "[spreader]"){ - SECTION("payup_true_abs_threshold"){ - bts::orderman::Book book; - Price out_price; - uint16_t sizes[] = { 12, 14, 17, 19, 23 }; - double prices[] = { 21.00, 21.05, 21.10, 22, 23 }; - fill_book (book, prices, sizes, bts::api::Side::SIDE_SELL); - spark::PreHedgeQuantityBasedPayLessTicks payless_params; - payless_params.set_payless_ticks(1); - payless_params.mutable_quantity_threshold()->set_absolute(25); - auto res = SpreaderUtils::prehedge_quantity_base_payless_ticks_reprice(payless_params, book, api::Side::SIDE_BUY, - 0.05, Price(21.05), Quantity(5), out_price); - REQUIRE(res); - REQUIRE(out_price.value()==21.00); - } - SECTION("payup_false_abs_threshold"){ - bts::orderman::Book book; - Price out_price; - uint16_t sizes[] = { 10, 14, 17, 19, 23 }; - double prices[] = { 21.00, 21.05, 21.10, 22, 23 }; - fill_book (book, prices, sizes, bts::api::Side::SIDE_SELL); - spark::PreHedgeQuantityBasedPayLessTicks payless_params; - payless_params.set_payless_ticks(1); - payless_params.mutable_quantity_threshold()->set_absolute(25); - auto res = SpreaderUtils::prehedge_quantity_base_payless_ticks_reprice(payless_params, book, api::Side::SIDE_BUY, - 0.05, Price(21.05), Quantity(5), out_price); - REQUIRE(!res); - REQUIRE(out_price.value()==21.05); - } - SECTION("payup_true_ratio_threshold"){ - bts::orderman::Book book; - Price out_price; - uint16_t sizes[] = { 11, 14, 26, 19, 23 }; - double prices[] = { 21.00, 21.05, 21.10, 22, 23 }; - fill_book (book, prices, sizes, bts::api::Side::SIDE_SELL); - spark::PreHedgeQuantityBasedPayLessTicks payless_params; - payless_params.set_payless_ticks(2); - payless_params.mutable_quantity_threshold()->set_ratio(5); - auto res = SpreaderUtils::prehedge_quantity_base_payless_ticks_reprice(payless_params, book, api::Side::SIDE_BUY, - 0.05, Price(21.10), Quantity(10), out_price); - REQUIRE(res); - REQUIRE(out_price.value()==21.00); - } - SECTION("payup_true_ratio_threshold"){ - bts::orderman::Book book; - Price out_price; - uint16_t sizes[] = { 11, 14, 26, 19, 23 }; - double prices[] = { 21.00, 21.05, 21.10, 22, 23 }; - fill_book (book, prices, sizes, bts::api::Side::SIDE_SELL); - spark::PreHedgeQuantityBasedPayLessTicks payless_params; - payless_params.set_payless_ticks(2); - payless_params.mutable_quantity_threshold()->set_ratio(6); - auto res = SpreaderUtils::prehedge_quantity_base_payless_ticks_reprice(payless_params, book, api::Side::SIDE_BUY, - 0.05, Price(21.10), Quantity(10), out_price); - REQUIRE(!res); - REQUIRE(out_price.value()==21.10); - } -} -TEST_CASE ("prehedge_payup", "[spreader]"){ - SECTION("payup_true_abs_threshold"){ - bts::orderman::Book book; - Price out_price; - uint16_t sizes[] = { 12, 18, 20, 19, 23 }; - double prices[] = { 21.00, 21.05, 21.10, 22, 23 }; - fill_book (book, prices, sizes, bts::api::Side::SIDE_SELL); - spark::PreHedgeQuantityBasedPayupTicks payup_params; - payup_params.set_payup_ticks(1); - payup_params.mutable_quantity_threshold()->set_absolute(55); - auto res = SpreaderUtils::prehedge_quantity_base_payup_ticks_reprice(payup_params, book, api::Side::SIDE_BUY, - 0.05, Price(21.10), Quantity(5), out_price); - REQUIRE(res); - REQUIRE(bts::securities::test_price_equality(out_price.value(),21.15,0.05)); - } - SECTION("payup_false_abs_threshold"){ - bts::orderman::Book book; - Price out_price; - uint16_t sizes[] = { 12, 18, 20, 19, 23 }; - double prices[] = { 21.00, 21.05, 21.10, 22, 23 }; - fill_book (book, prices, sizes, bts::api::Side::SIDE_SELL); - spark::PreHedgeQuantityBasedPayupTicks payup_params; - payup_params.set_payup_ticks(1); - payup_params.mutable_quantity_threshold()->set_absolute(50); - auto res = SpreaderUtils::prehedge_quantity_base_payup_ticks_reprice(payup_params, book, api::Side::SIDE_BUY, - 0.05, Price(21.10), Quantity(5), out_price); - REQUIRE(!res); - REQUIRE(bts::securities::test_price_equality(out_price.value(),21.10,0.05)); - } -} -// n legged spreader price evaluation ///////////////////// -/////////////////////////////////////////////////////////// -TEST_CASE ("nlegs_compute_driver", "[spreader]"){ - bts::orderman::OrderKey order_key(1); - ContractLeg leg_1, leg_2, leg_3, leg_4; - fill_future_contract_leg (leg_1, 1, "CL", bts::api::Venue::VENUE_GLBX, 2018, 1, 15, 1.0, 1.0, api::Side::SIDE_BUY, 1.0, 0.01); - fill_future_contract_leg (leg_2, 2, "CL", bts::api::Venue::VENUE_GLBX, 2018, 2, 15, 1.0, 1.0, api::Side::SIDE_BUY, 1.0, 0.01); - fill_future_contract_leg (leg_3, 3, "CL", bts::api::Venue::VENUE_GLBX, 2018, 3, 15, 1.0, 1.0, api::Side::SIDE_BUY, 1.0, 0.01); - fill_future_contract_leg (leg_4, 4, "CL", bts::api::Venue::VENUE_GLBX, 2018, 4, 15, -3.0, -3.0, api::Side::SIDE_SELL, 1.0, 0.01); - std::vector legs; - legs.push_back(leg_1);legs.push_back(leg_2);legs.push_back(leg_3);legs.push_back(leg_4); - Security sec; - fill_synthetic_security (sec, 2000, "4legs", legs); - // execution params/order def - LegSpreaderParams lsp_1, lsp_2, lsp_3, lsp_4; - fill_leg_spreader_params(lsp_1, 1.0, false, 1.0);fill_leg_spreader_params(lsp_2, 1.0, false, 1.0); - fill_leg_spreader_params(lsp_3, 1.0, false, 1.0);fill_leg_spreader_params(lsp_4, -4.0, true, 1.0); - // // post hedge time out here - std::vector params; - params.push_back(lsp_1);params.push_back(lsp_2); - params.push_back(lsp_3);params.push_back(lsp_4); - bts::api::orderman::OrderDefinition order_def; - fill_spreader_order_definition(order_def, Side::SIDE_BUY, sec, params); - // putting it together in SpreaderBookkeepingData - SpreaderPreActivationOrderServices::TestOnlySpreaderPreActivationOrderServices - testonly_spreader_pao_services = _create_spreader_pao_services(sec); - SpreaderPreActivationOrderServices pao_services (&testonly_spreader_pao_services); - std::vector leg_props; - SpreaderUtils::resolve_synthetic_spread(pao_services, order_def, leg_props); - SpreaderManagerForTest spreader_manager (order_key, order_def, pao_services, leg_props); - SpreaderBookkeepingData& bookkeeping_data = spreader_manager.bookkeeping_data(); - SECTION("compute_1"){ - Quantity quoting_leg_target (300); - Price spread_price(0.25); - fill_book(spreader_manager, 0, new double[5]{65.31,65.32,65.34,65.36, 65.40}, - new uint16_t[5]{12,18,20,19,23},bts::api::Side::SIDE_SELL,true); - fill_book(spreader_manager, 1, new double[5]{64.40,64.41,64.43,64.45,64.50}, - new uint16_t[5]{1,5,20,12,15},bts::api::Side::SIDE_SELL,true); - fill_book(spreader_manager, 2, new double[5]{64.10,64.18,64.19,64.20,64.21}, - new uint16_t[5]{10,43,17,50,15},bts::api::Side::SIDE_SELL,true); - std::vector out_driver_vector; - for (int i=0; i<4; i++) - out_driver_vector.emplace_back(); - SpreaderUtils::compute_drivers(quoting_leg_target, 3, spreader_manager, out_driver_vector); - _verify_driver (out_driver_vector[0],92,65.40,276); - _verify_driver (out_driver_vector[1],53,64.50,159); - _verify_driver (out_driver_vector[2],100,64.20,300); - // size of the quoting leg - Quantity computed_quoted_qty=SpreaderUtils::compute_quoting_quantity_from_drivers(3,out_driver_vector); - REQUIRE(computed_quoted_qty.value()==159); - // 2nd pass drivers - SpreaderUtils::compute_drivers(computed_quoted_qty, 3, spreader_manager, out_driver_vector); - _verify_driver (out_driver_vector[0],53,65.36,159); - _verify_driver (out_driver_vector[1],53,64.50,159); - _verify_driver (out_driver_vector[2],53,64.18,159); - // price of the quoting leg - Price computed_price=SpreaderUtils::compute_quoting_price_from_drivers(spread_price,3,spreader_manager,out_driver_vector); - REQUIRE(computed_price.value()==64.60); - //hedging - Price hedge_price; double hedge_quantity; - SpreaderUtils::compute_hedge_price_size_n_legs(spreader_manager.get_leg_data(3), - Price(0), - 18, - spreader_manager.get_leg_data(0), - out_driver_vector[0], - hedge_price, - hedge_quantity); - REQUIRE(hedge_price.value()==65.36); - REQUIRE(hedge_quantity==6); - } - SECTION("compute_2_fractional"){ - Quantity quoting_leg_target (100); - Price spread_price(0.25); - fill_book(spreader_manager, 0, new double[5]{65.31,65.32,65.34,65.36, 65.40}, - new uint16_t[5]{12,18,20,19,23},bts::api::Side::SIDE_SELL,true); - fill_book(spreader_manager, 1, new double[5]{64.40,64.41,64.43,64.45,64.50}, - new uint16_t[5]{1,5,20,12,15},bts::api::Side::SIDE_SELL,true); - fill_book(spreader_manager, 2, new double[5]{64.10,64.18,64.19,64.20,64.21}, - new uint16_t[5]{11,1,1,5,1},bts::api::Side::SIDE_SELL,true); - std::vector out_driver_vector; - for (int i=0; i<4; i++) - out_driver_vector.emplace_back(); - SpreaderUtils::compute_drivers(quoting_leg_target, 3, spreader_manager, out_driver_vector); - _verify_driver (out_driver_vector[0],34,65.34,100); - _verify_driver (out_driver_vector[1],34,64.45,100); - _verify_driver (out_driver_vector[2],19,64.21,57); - // size of the quoting leg - Quantity computed_quoted_qty=SpreaderUtils::compute_quoting_quantity_from_drivers(3,out_driver_vector); - REQUIRE(computed_quoted_qty.value()==57); - // // 2nd pass drivers - SpreaderUtils::compute_drivers(computed_quoted_qty, 3, spreader_manager, out_driver_vector); - _verify_driver (out_driver_vector[0],19,65.32,57); - _verify_driver (out_driver_vector[1],19,64.43,57); - _verify_driver (out_driver_vector[2],19,64.21,57); - // // price of the quoting leg - Price computed_price=SpreaderUtils::compute_quoting_price_from_drivers(spread_price,3,spreader_manager,out_driver_vector); - REQUIRE(computed_price.value()==64.57); - // //hedging - Price hedge_price; double hedge_quantity; - SpreaderUtils::compute_hedge_price_size_n_legs(spreader_manager.get_leg_data(3), - Price(0), - 10.0, - spreader_manager.get_leg_data(0), - out_driver_vector[0], - hedge_price, - hedge_quantity); - REQUIRE(hedge_price.value()==65.32); - REQUIRE(std::abs(hedge_quantity - 3.333333) < 0.000001); - } -} -TEST_CASE ("quote driver caching", "[spreader]"){ - SECTION("zero_search"){ - QuoteDriverSetHistory driver_cache(5,10,0.05); - const QuoteLegDriver* driver_ptr=driver_cache.find_driver(Price(100),3); - REQUIRE(driver_ptr==nullptr); - } - SECTION("simple_search"){ - size_t n_legs=5, cache_sz=10; - QuoteDriverSetHistory driver_cache(n_legs,cache_sz,0.05); - Price p1(100); std::vector d1; - generate_driver_set(d1,n_legs); - driver_cache.add(d1,p1); - Price p2(100.05); std::vector d2; - generate_driver_set(d2,n_legs); - driver_cache.add(d2,p2); - Price p3(100.10); std::vector d3; - generate_driver_set(d3,n_legs); - driver_cache.add(d3,p3); - for(size_t i=0; i d; - generate_driver_set(d,n_legs); - driver_cache.add(d,p); - } - Price p1(100); std::vector d1; - generate_driver_set(d1,n_legs); - driver_cache.add(d1,p1); - Price p2(100.05); std::vector d2; - generate_driver_set(d2,n_legs); - driver_cache.add(d2,p2); - Price p3(100.10); std::vector d3; - generate_driver_set(d3,n_legs); - driver_cache.add(d3,p3); - Price p4(100); std::vector d4; - generate_driver_set(d4,n_legs); - driver_cache.add(d4,p4); - Price p5(100.15); std::vector d5; - generate_driver_set(d5,n_legs); - driver_cache.add(d5,p5); - for(size_t i=0; i void +// { +// verify_basic_spreader_state (spreader, SpreaderState::WAITING_FOR_CANCEL_ALL, spreader_price, spreader_quantity); +// REQUIRE (leg_data_1.n_hedgers () == 3); +// REQUIRE (leg_data_2.n_hedgers () == 2); +// verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WAITING_FOR_CANCEL_ACK, true, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2003), Quantity(45), Quantity(15), false); +// verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WAITING_FOR_CANCEL_ACK, true, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); +// verify_complete_hedger_state (leg_data_1.get_hedger (0), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); +// verify_complete_hedger_state (leg_data_1.get_hedger (1), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); +// verify_complete_hedger_state (leg_data_1.get_hedger (2), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); +// verify_complete_hedger_state (leg_data_2.get_hedger (0), HedgerState::WAITING_FOR_CANCEL_ACK, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); +// verify_complete_hedger_state (leg_data_2.get_hedger (1), HedgerState::WAITING_FOR_CANCEL_ACK, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); +// }; +// validate_state (); +// SECTION("1. init") +// { +// } +// SECTION("2. on_connect") +// { +// } +// SECTION("4. on_update") +// { +// spreader.on_update (Price(-0.05), Quantity(200),PerfTrace()); +// validate_state(); +// // order changes dont go through +// validate_state(); +// LOG(OrderMan, Diag, "spreader_WAITING_FOR_CANCEL_ACK.on_update"); +// } +// SECTION("5. on_cancel") +// { +// spreader.on_cancel(PerfTrace()); +// // already in cancel state, no change +// validate_state(); +// LOG(OrderMan, Diag, "spreader_WAITING_FOR_CANCEL_ACK.on_cancel"); +// } +// SECTION("6. on_book") +// { +// // like 4 and 5, should have no effect +// set_spreader_orders (spreader, new double[5] {1999, 1998, 1997, 1996, 1995}, new uint16_t[5] {1, 0, 0, 0, 0}, +// new double[5] {2000, 2001, 2002, 2003, 2004}, new uint16_t[5] {1, 1, 2, 0, 0}, +// new double[5] {2002, 2001, 2000, 1999, 1998}, new uint16_t[5] {1, 0, 0, 0, 0}, +// new double[5] {2003, 2004, 2005, 2006, 2007}, new uint16_t[5] {1, 0, 0, 0, 0}, 30, 2000, 55, 2001); +// validate_state (); +// LOG(OrderMan, Diag, "spreader_WAITING_FOR_CANCEL_ACK.on_book"); +// } +// // SECTION("7. on_time") +// // { +// // while (spreader.test_only_func_spreader_state () != SpreaderState::END) +// // { +// // spreader.on_time (std::chrono::system_clock::now()); +// // std::this_thread::sleep_for(std::chrono::milliseconds(1)); +// // } +// // int64_t time_since_cxl = ms_diff (std::chrono::system_clock::now(), cancel_timestamp); +// // REQUIRE (time_since_cxl >= spreader.test_cancel_timeout()); +// // verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::END, true, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2003), Quantity(45), Quantity(15), false); +// // verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::END, true, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); +// // verify_complete_hedger_state (leg_data_1.get_hedger (0).hedger(), HedgerState::END, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); +// // verify_complete_hedger_state (leg_data_1.get_hedger (1).hedger(), HedgerState::END, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); +// // verify_complete_hedger_state (leg_data_1.get_hedger (2).hedger(), HedgerState::END, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); +// // verify_complete_hedger_state (leg_data_2.get_hedger (0).hedger(), HedgerState::END, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); +// // verify_complete_hedger_state (leg_data_2.get_hedger (1).hedger(), HedgerState::END, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); +// // LOG(OrderMan, Diag, "spreader_WAITING_FOR_CANCEL_ACK.on_time"); +// // } +// SECTION("8. on_quoter_order_error") +// { +// spreader.test_only_on_child_order_update (leg_data_1.order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_DISCONNECTED, Quantity (30), Price (2000)); +// validate_state(); +// LOG(OrderMan, Diag, "spreader_WAITING_FOR_CANCEL_ACK.on_quoter_order_error"); +// } +// SECTION("9. on_quoter_order_fill") +// { +// // send another fill on leg 1, this will update the filled +// // state of leg 1, but no other action will take place +// spreader.test_only_on_child_order_update (leg_data_1.order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (40), Price (2000.5)); +// verify_basic_spreader_state (spreader, SpreaderState::WAITING_FOR_CANCEL_ALL, spreader_price, spreader_quantity); +// REQUIRE (leg_data_1.n_hedgers () == 3); +// REQUIRE (leg_data_2.n_hedgers () == 2); +// verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WAITING_FOR_CANCEL_ACK, true, spreader_price, Quantity (100), Quantity (40), Quantity(55), Price(2003), Quantity(45), Quantity(5), false); +// verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WAITING_FOR_CANCEL_ACK, true, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); +// verify_complete_hedger_state (leg_data_1.get_hedger (0), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); +// verify_complete_hedger_state (leg_data_1.get_hedger (1), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); +// verify_complete_hedger_state (leg_data_1.get_hedger (2), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); +// verify_complete_hedger_state (leg_data_2.get_hedger (0), HedgerState::WAITING_FOR_CANCEL_ACK, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); +// verify_complete_hedger_state (leg_data_2.get_hedger (1), HedgerState::WAITING_FOR_CANCEL_ACK, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); +// LOG(OrderMan, Diag, "spreader_WAITING_FOR_CANCEL_ACK.on_quoter_order_fill"); +// } +// SECTION("10. on_quoter_order_status_update") +// { +// // cancelled update +// spreader.test_only_on_child_order_update (leg_data_1.order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_CANCELED, Quantity (30), Price (2000)); +// verify_basic_spreader_state (spreader, SpreaderState::WAITING_FOR_CANCEL_ALL, spreader_price, spreader_quantity); +// REQUIRE (leg_data_1.n_hedgers () == 3); +// REQUIRE (leg_data_2.n_hedgers () == 2); +// verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::END, true, spreader_price, Quantity (100), Quantity (0), Quantity(55), Price(0), Quantity(0), Quantity(15), false); +// verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WAITING_FOR_CANCEL_ACK, true, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); +// verify_complete_hedger_state (leg_data_1.get_hedger (0), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); +// verify_complete_hedger_state (leg_data_1.get_hedger (1), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); +// verify_complete_hedger_state (leg_data_1.get_hedger (2), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); +// verify_complete_hedger_state (leg_data_2.get_hedger (0), HedgerState::WAITING_FOR_CANCEL_ACK, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); +// verify_complete_hedger_state (leg_data_2.get_hedger (1), HedgerState::WAITING_FOR_CANCEL_ACK, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); +// LOG(OrderMan, Diag, "spreader_WAITING_FOR_CANCEL_ACK.on_quoter_order_status_update"); +// } +// SECTION("11. on_hedger_order_error") +// { +// std::string err_msg = "error"; +// spreader.test_only_on_child_order_update (leg_data_1.get_hedger (0).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_DISCONNECTED, Quantity (0), Price (0)); +// validate_state (); +// LOG(OrderMan, Diag, "spreader_WAITING_FOR_CANCEL_ACK.on_hedger_order_error"); +// } +// SECTION("12. on_hedger_order_update") +// { +// // send a fill +// spreader.test_only_on_child_order_update (leg_data_1.get_hedger(0).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (10), Price (2000)); +// verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WAITING_FOR_CANCEL_ACK, true, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2003), Quantity(45), Quantity(15), false); +// verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WAITING_FOR_CANCEL_ACK, true, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); +// verify_complete_hedger_state (leg_data_1.get_hedger(0), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(15), Quantity (10), Price(2002), Quantity (15), Quantity (5)); +// verify_complete_hedger_state (leg_data_1.get_hedger(1), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); +// verify_complete_hedger_state (leg_data_1.get_hedger(2), HedgerState::WAITING_FOR_CANCEL_ACK, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); +// verify_complete_hedger_state (leg_data_2.get_hedger(0), HedgerState::WAITING_FOR_CANCEL_ACK, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); +// verify_complete_hedger_state (leg_data_2.get_hedger(1), HedgerState::WAITING_FOR_CANCEL_ACK, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); +// LOG(OrderMan, Diag, "spreader_WAITING_FOR_CANCEL_ACK.on_hedger_order_update"); +// } +// SECTION("14. on_check_termination") +// { +// // send cancel for orders, once all quoters and hedgers +// // are cancelled, spreader should come to end +// spreader.test_only_on_child_order_update (leg_data_1.order_update_message().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_CANCELED, Quantity (30), Price (2000)); +// verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::END, true, spreader_price, Quantity (100), Quantity (0), Quantity(55), Price(0), Quantity(0), Quantity(15), false); +// spreader.test_only_on_child_order_update (leg_data_2.order_update_message().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_CANCELED, Quantity (55), Price (2000)); +// verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::END, true, spreader_price, Quantity (100), Quantity (0), Quantity(30), Price(0), Quantity(0), Quantity(15), false); +// verify_basic_spreader_state (spreader, SpreaderState::WAITING_FOR_CANCEL_ALL, spreader_price, spreader_quantity); +// spreader.test_only_on_child_order_update (leg_data_1.get_hedger (0).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_CANCELED, Quantity (0), Price (0)); +// verify_complete_hedger_state (leg_data_1.get_hedger(0), HedgerState::END, Price (2002), Quantity(15), Quantity (0), Price(0), Quantity (0), Quantity (15)); +// spreader.test_only_on_child_order_update (leg_data_1.get_hedger (1).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_CANCELED, Quantity (0), Price (0)); +// verify_complete_hedger_state (leg_data_1.get_hedger(1), HedgerState::END, Price (2002), Quantity(30), Quantity (0), Price(0), Quantity (0), Quantity (30)); +// spreader.test_only_on_child_order_update (leg_data_1.get_hedger (2).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_CANCELED, Quantity (0), Price (0)); +// verify_complete_hedger_state (leg_data_1.get_hedger(2), HedgerState::END, Price (2002), Quantity(10), Quantity (0), Price(0), Quantity (0), Quantity (10)); +// spreader.test_only_on_child_order_update (leg_data_2.get_hedger (0).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_CANCELED, Quantity (0), Price (0)); +// verify_complete_hedger_state (leg_data_2.get_hedger(0), HedgerState::END, Price (1999), Quantity(20), Quantity (0), Price(0), Quantity (0), Quantity (20)); +// verify_basic_spreader_state (spreader, SpreaderState::WAITING_FOR_CANCEL_ALL, spreader_price, spreader_quantity); +// spreader.test_only_on_child_order_update (leg_data_2.get_hedger (1).order_state().order_key(), bts::api::orderman::OrderStatus::ORDER_STATUS_CANCELED, Quantity (0), Price (0)); +// verify_complete_hedger_state (leg_data_2.get_hedger(1), HedgerState::END, Price (1999), Quantity(10), Quantity (0), Price(0), Quantity (0), Quantity (10)); +// verify_basic_spreader_state (spreader, SpreaderState::END, spreader_price, spreader_quantity); +// LOG(OrderMan, Diag, "spreader_WAITING_FOR_CANCEL_ACK.on_check_termination"); +// } +// } +// TEST_CASE ("find_target_price_in_book", "[spreader]"){ +// SECTION("0.05"){ +// Quantity out_level_qty, out_cum_qty; +// bts::orderman::Book book; +// uint16_t sizes[] = { 11, 13, 17, 19, 23 }; +// double prices[] = { 22, 21.15, 20.10, 20.05, 20.00 }; +// fill_book (book, prices, sizes, bts::api::Side::SIDE_BUY); +// // middle +// bool res = SpreaderUtils::find_qty_at_price_level(book, bts::api::Side::SIDE_BUY, Price(20.10), 0.05, out_level_qty, out_cum_qty); +// REQUIRE(res); +// REQUIRE(out_level_qty.value()==17); +// REQUIRE(out_cum_qty.value()==41); +// // first +// res = SpreaderUtils::find_qty_at_price_level(book, bts::api::Side::SIDE_BUY, Price(22.00), 0.05, out_level_qty, out_cum_qty); +// REQUIRE(res); +// REQUIRE(out_level_qty.value()==11); +// REQUIRE(out_cum_qty.value()==11); +// // last +// res = SpreaderUtils::find_qty_at_price_level(book, bts::api::Side::SIDE_BUY, Price(20.00), 0.05, out_level_qty, out_cum_qty); +// REQUIRE(res); +// REQUIRE(out_level_qty.value()==23); +// REQUIRE(out_cum_qty.value()==83); +// // not found +// res = SpreaderUtils::find_qty_at_price_level(book, bts::api::Side::SIDE_BUY, Price(21.00), 0.05, out_level_qty, out_cum_qty); +// REQUIRE(!res); +// // rounding error +// res = SpreaderUtils::find_qty_at_price_level(book, bts::api::Side::SIDE_BUY, Price(20.04999999), 0.05, out_level_qty, out_cum_qty); +// REQUIRE(res); +// REQUIRE(out_level_qty.value()==19); +// REQUIRE(out_cum_qty.value()==60); +// } +// SECTION("1/32"){ +// Quantity out_level_qty, out_cum_qty; +// bts::orderman::Book book; +// uint16_t sizes[] = { 12, 91, 5, 24, 33 }; +// double prices[] = { 100.21875, 100.28125, 101, 101.53125, 101.71875 }; +// fill_book (book, prices, sizes, bts::api::Side::SIDE_SELL); +// // first +// bool res = SpreaderUtils::find_qty_at_price_level(book, bts::api::Side::SIDE_SELL, Price(100.21875), 0.03125, out_level_qty, out_cum_qty); +// REQUIRE(res); +// REQUIRE(out_level_qty.value()==12); +// REQUIRE(out_cum_qty.value()==12); +// // middle +// res = SpreaderUtils::find_qty_at_price_level(book, bts::api::Side::SIDE_SELL, Price(101.53125), 0.03125, out_level_qty, out_cum_qty); +// REQUIRE(res); +// REQUIRE(out_level_qty.value()==24); +// REQUIRE(out_cum_qty.value()==132); +// // end +// res = SpreaderUtils::find_qty_at_price_level(book, bts::api::Side::SIDE_SELL, Price(101.71875), 0.03125, out_level_qty, out_cum_qty); +// REQUIRE(res); +// REQUIRE(out_level_qty.value()==33); +// REQUIRE(out_cum_qty.value()==165); +// // absent +// res = SpreaderUtils::find_qty_at_price_level(book, bts::api::Side::SIDE_SELL, Price(101.5625), 0.03125, out_level_qty, out_cum_qty); +// REQUIRE(!res); +// REQUIRE(out_level_qty.value()==0); +// REQUIRE(out_cum_qty.value()==0); +// res = SpreaderUtils::find_qty_at_price_level(book, bts::api::Side::SIDE_BUY, Price(101.71875), 0.03125, out_level_qty, out_cum_qty); +// REQUIRE(!res); +// REQUIRE(out_level_qty.value()==0); +// REQUIRE(out_cum_qty.value()==0); +// // rounding +// res = SpreaderUtils::find_qty_at_price_level(book, bts::api::Side::SIDE_SELL, Price(101.531249999999), 0.03125, out_level_qty, out_cum_qty); +// REQUIRE(res); +// REQUIRE(out_level_qty.value()==24); +// REQUIRE(out_cum_qty.value()==132); +// } +// } +// TEST_CASE ("prehedge_payless", "[spreader]"){ +// SECTION("payup_true_abs_threshold"){ +// bts::orderman::Book book; +// Price out_price; +// uint16_t sizes[] = { 12, 14, 17, 19, 23 }; +// double prices[] = { 21.00, 21.05, 21.10, 22, 23 }; +// fill_book (book, prices, sizes, bts::api::Side::SIDE_SELL); +// spark::PreHedgeQuantityBasedPayLessTicks payless_params; +// payless_params.set_payless_ticks(1); +// payless_params.mutable_quantity_threshold()->set_absolute(25); +// auto res = SpreaderUtils::prehedge_quantity_base_payless_ticks_reprice(payless_params, book, api::Side::SIDE_BUY, +// 0.05, Price(21.05), Quantity(5), out_price); +// REQUIRE(res); +// REQUIRE(out_price.value()==21.00); +// } +// SECTION("payup_false_abs_threshold"){ +// bts::orderman::Book book; +// Price out_price; +// uint16_t sizes[] = { 10, 14, 17, 19, 23 }; +// double prices[] = { 21.00, 21.05, 21.10, 22, 23 }; +// fill_book (book, prices, sizes, bts::api::Side::SIDE_SELL); +// spark::PreHedgeQuantityBasedPayLessTicks payless_params; +// payless_params.set_payless_ticks(1); +// payless_params.mutable_quantity_threshold()->set_absolute(25); +// auto res = SpreaderUtils::prehedge_quantity_base_payless_ticks_reprice(payless_params, book, api::Side::SIDE_BUY, +// 0.05, Price(21.05), Quantity(5), out_price); +// REQUIRE(!res); +// REQUIRE(out_price.value()==21.05); +// } +// SECTION("payup_true_ratio_threshold"){ +// bts::orderman::Book book; +// Price out_price; +// uint16_t sizes[] = { 11, 14, 26, 19, 23 }; +// double prices[] = { 21.00, 21.05, 21.10, 22, 23 }; +// fill_book (book, prices, sizes, bts::api::Side::SIDE_SELL); +// spark::PreHedgeQuantityBasedPayLessTicks payless_params; +// payless_params.set_payless_ticks(2); +// payless_params.mutable_quantity_threshold()->set_ratio(5); +// auto res = SpreaderUtils::prehedge_quantity_base_payless_ticks_reprice(payless_params, book, api::Side::SIDE_BUY, +// 0.05, Price(21.10), Quantity(10), out_price); +// REQUIRE(res); +// REQUIRE(out_price.value()==21.00); +// } +// SECTION("payup_true_ratio_threshold"){ +// bts::orderman::Book book; +// Price out_price; +// uint16_t sizes[] = { 11, 14, 26, 19, 23 }; +// double prices[] = { 21.00, 21.05, 21.10, 22, 23 }; +// fill_book (book, prices, sizes, bts::api::Side::SIDE_SELL); +// spark::PreHedgeQuantityBasedPayLessTicks payless_params; +// payless_params.set_payless_ticks(2); +// payless_params.mutable_quantity_threshold()->set_ratio(6); +// auto res = SpreaderUtils::prehedge_quantity_base_payless_ticks_reprice(payless_params, book, api::Side::SIDE_BUY, +// 0.05, Price(21.10), Quantity(10), out_price); +// REQUIRE(!res); +// REQUIRE(out_price.value()==21.10); +// } +// } +// TEST_CASE ("prehedge_payup", "[spreader]"){ +// SECTION("payup_true_abs_threshold"){ +// bts::orderman::Book book; +// Price out_price; +// uint16_t sizes[] = { 12, 18, 20, 19, 23 }; +// double prices[] = { 21.00, 21.05, 21.10, 22, 23 }; +// fill_book (book, prices, sizes, bts::api::Side::SIDE_SELL); +// spark::PreHedgeQuantityBasedPayupTicks payup_params; +// payup_params.set_payup_ticks(1); +// payup_params.mutable_quantity_threshold()->set_absolute(55); +// auto res = SpreaderUtils::prehedge_quantity_base_payup_ticks_reprice(payup_params, book, api::Side::SIDE_BUY, +// 0.05, Price(21.10), Quantity(5), out_price); +// REQUIRE(res); +// REQUIRE(bts::securities::test_price_equality(out_price.value(),21.15,0.05)); +// } +// SECTION("payup_false_abs_threshold"){ +// bts::orderman::Book book; +// Price out_price; +// uint16_t sizes[] = { 12, 18, 20, 19, 23 }; +// double prices[] = { 21.00, 21.05, 21.10, 22, 23 }; +// fill_book (book, prices, sizes, bts::api::Side::SIDE_SELL); +// spark::PreHedgeQuantityBasedPayupTicks payup_params; +// payup_params.set_payup_ticks(1); +// payup_params.mutable_quantity_threshold()->set_absolute(50); +// auto res = SpreaderUtils::prehedge_quantity_base_payup_ticks_reprice(payup_params, book, api::Side::SIDE_BUY, +// 0.05, Price(21.10), Quantity(5), out_price); +// REQUIRE(!res); +// REQUIRE(bts::securities::test_price_equality(out_price.value(),21.10,0.05)); +// } +// } +// // n legged spreader price evaluation ///////////////////// +// /////////////////////////////////////////////////////////// +// TEST_CASE ("nlegs_compute_driver", "[spreader]"){ +// bts::orderman::OrderKey order_key(1); +// ContractLeg leg_1, leg_2, leg_3, leg_4; +// fill_future_contract_leg (leg_1, 1, "CL", bts::api::Venue::VENUE_GLBX, 2018, 1, 15, 1.0, 1.0, api::Side::SIDE_BUY, 1.0, 0.01); +// fill_future_contract_leg (leg_2, 2, "CL", bts::api::Venue::VENUE_GLBX, 2018, 2, 15, 1.0, 1.0, api::Side::SIDE_BUY, 1.0, 0.01); +// fill_future_contract_leg (leg_3, 3, "CL", bts::api::Venue::VENUE_GLBX, 2018, 3, 15, 1.0, 1.0, api::Side::SIDE_BUY, 1.0, 0.01); +// fill_future_contract_leg (leg_4, 4, "CL", bts::api::Venue::VENUE_GLBX, 2018, 4, 15, -3.0, -3.0, api::Side::SIDE_SELL, 1.0, 0.01); +// std::vector legs; +// legs.push_back(leg_1);legs.push_back(leg_2);legs.push_back(leg_3);legs.push_back(leg_4); +// Security sec; +// fill_synthetic_security (sec, 2000, "4legs", legs); +// // execution params/order def +// LegSpreaderParams lsp_1, lsp_2, lsp_3, lsp_4; +// fill_leg_spreader_params(lsp_1, 1.0, false, 1.0);fill_leg_spreader_params(lsp_2, 1.0, false, 1.0); +// fill_leg_spreader_params(lsp_3, 1.0, false, 1.0);fill_leg_spreader_params(lsp_4, -4.0, true, 1.0); +// // // post hedge time out here +// std::vector params; +// params.push_back(lsp_1);params.push_back(lsp_2); +// params.push_back(lsp_3);params.push_back(lsp_4); +// bts::api::orderman::OrderDefinition order_def; +// fill_spreader_order_definition(order_def, Side::SIDE_BUY, sec, params); +// // putting it together in SpreaderBookkeepingData +// SpreaderPreActivationOrderServices::TestOnlySpreaderPreActivationOrderServices +// testonly_spreader_pao_services = _create_spreader_pao_services(sec); +// SpreaderPreActivationOrderServices pao_services (&testonly_spreader_pao_services); +// std::vector leg_props; +// SpreaderUtils::resolve_synthetic_spread(pao_services, order_def, leg_props); +// SpreaderManagerForTest spreader_manager (order_key, order_def, pao_services, leg_props); +// SpreaderBookkeepingData& bookkeeping_data = spreader_manager.bookkeeping_data(); +// SECTION("compute_1"){ +// Quantity quoting_leg_target (300); +// Price spread_price(0.25); +// fill_book(spreader_manager, 0, new double[5]{65.31,65.32,65.34,65.36, 65.40}, +// new uint16_t[5]{12,18,20,19,23},bts::api::Side::SIDE_SELL,true); +// fill_book(spreader_manager, 1, new double[5]{64.40,64.41,64.43,64.45,64.50}, +// new uint16_t[5]{1,5,20,12,15},bts::api::Side::SIDE_SELL,true); +// fill_book(spreader_manager, 2, new double[5]{64.10,64.18,64.19,64.20,64.21}, +// new uint16_t[5]{10,43,17,50,15},bts::api::Side::SIDE_SELL,true); +// std::vector out_driver_vector; +// for (int i=0; i<4; i++) +// out_driver_vector.emplace_back(); +// SpreaderUtils::compute_drivers(quoting_leg_target, 3, spreader_manager, out_driver_vector); +// _verify_driver (out_driver_vector[0],92,65.40,276); +// _verify_driver (out_driver_vector[1],53,64.50,159); +// _verify_driver (out_driver_vector[2],100,64.20,300); +// // size of the quoting leg +// Quantity computed_quoted_qty=SpreaderUtils::compute_quoting_quantity_from_drivers(3,out_driver_vector); +// REQUIRE(computed_quoted_qty.value()==159); +// // 2nd pass drivers +// SpreaderUtils::compute_drivers(computed_quoted_qty, 3, spreader_manager, out_driver_vector); +// _verify_driver (out_driver_vector[0],53,65.36,159); +// _verify_driver (out_driver_vector[1],53,64.50,159); +// _verify_driver (out_driver_vector[2],53,64.18,159); +// // price of the quoting leg +// Price computed_price=SpreaderUtils::compute_quoting_price_from_drivers(spread_price,3,spreader_manager,out_driver_vector); +// REQUIRE(computed_price.value()==64.60); +// //hedging +// Price hedge_price; double hedge_quantity; +// SpreaderUtils::compute_hedge_price_size_n_legs(spreader_manager.get_leg_data(3), +// Price(0), +// 18, +// spreader_manager.get_leg_data(0), +// out_driver_vector[0], +// hedge_price, +// hedge_quantity); +// REQUIRE(hedge_price.value()==65.36); +// REQUIRE(hedge_quantity==6); +// } +// SECTION("compute_2_fractional"){ +// Quantity quoting_leg_target (100); +// Price spread_price(0.25); +// fill_book(spreader_manager, 0, new double[5]{65.31,65.32,65.34,65.36, 65.40}, +// new uint16_t[5]{12,18,20,19,23},bts::api::Side::SIDE_SELL,true); +// fill_book(spreader_manager, 1, new double[5]{64.40,64.41,64.43,64.45,64.50}, +// new uint16_t[5]{1,5,20,12,15},bts::api::Side::SIDE_SELL,true); +// fill_book(spreader_manager, 2, new double[5]{64.10,64.18,64.19,64.20,64.21}, +// new uint16_t[5]{11,1,1,5,1},bts::api::Side::SIDE_SELL,true); +// std::vector out_driver_vector; +// for (int i=0; i<4; i++) +// out_driver_vector.emplace_back(); +// SpreaderUtils::compute_drivers(quoting_leg_target, 3, spreader_manager, out_driver_vector); +// _verify_driver (out_driver_vector[0],34,65.34,100); +// _verify_driver (out_driver_vector[1],34,64.45,100); +// _verify_driver (out_driver_vector[2],19,64.21,57); +// // size of the quoting leg +// Quantity computed_quoted_qty=SpreaderUtils::compute_quoting_quantity_from_drivers(3,out_driver_vector); +// REQUIRE(computed_quoted_qty.value()==57); +// // // 2nd pass drivers +// SpreaderUtils::compute_drivers(computed_quoted_qty, 3, spreader_manager, out_driver_vector); +// _verify_driver (out_driver_vector[0],19,65.32,57); +// _verify_driver (out_driver_vector[1],19,64.43,57); +// _verify_driver (out_driver_vector[2],19,64.21,57); +// // // price of the quoting leg +// Price computed_price=SpreaderUtils::compute_quoting_price_from_drivers(spread_price,3,spreader_manager,out_driver_vector); +// REQUIRE(computed_price.value()==64.57); +// // //hedging +// Price hedge_price; double hedge_quantity; +// SpreaderUtils::compute_hedge_price_size_n_legs(spreader_manager.get_leg_data(3), +// Price(0), +// 10.0, +// spreader_manager.get_leg_data(0), +// out_driver_vector[0], +// hedge_price, +// hedge_quantity); +// REQUIRE(hedge_price.value()==65.32); +// REQUIRE(std::abs(hedge_quantity - 3.333333) < 0.000001); +// } +// } +// TEST_CASE ("quote driver caching", "[spreader]"){ +// SECTION("zero_search"){ +// QuoteDriverSetHistory driver_cache(5,10,0.05); +// const QuoteLegDriver* driver_ptr=driver_cache.find_driver(Price(100),3); +// REQUIRE(driver_ptr==nullptr); +// } +// SECTION("simple_search"){ +// size_t n_legs=5, cache_sz=10; +// QuoteDriverSetHistory driver_cache(n_legs,cache_sz,0.05); +// Price p1(100); std::vector d1; +// generate_driver_set(d1,n_legs); +// driver_cache.add(d1,p1); +// Price p2(100.05); std::vector d2; +// generate_driver_set(d2,n_legs); +// driver_cache.add(d2,p2); +// Price p3(100.10); std::vector d3; +// generate_driver_set(d3,n_legs); +// driver_cache.add(d3,p3); +// for(size_t i=0; i d; +// generate_driver_set(d,n_legs); +// driver_cache.add(d,p); +// } +// Price p1(100); std::vector d1; +// generate_driver_set(d1,n_legs); +// driver_cache.add(d1,p1); +// Price p2(100.05); std::vector d2; +// generate_driver_set(d2,n_legs); +// driver_cache.add(d2,p2); +// Price p3(100.10); std::vector d3; +// generate_driver_set(d3,n_legs); +// driver_cache.add(d3,p3); +// Price p4(100); std::vector d4; +// generate_driver_set(d4,n_legs); +// driver_cache.add(d4,p4); +// Price p5(100.15); std::vector d5; +// generate_driver_set(d5,n_legs); +// driver_cache.add(d5,p5); +// for(size_t i=0; i contract_legs; - contract_legs.push_back(leg_1); - contract_legs.push_back(leg_2); - Security synthetic_security; - fill_synthetic_security (synthetic_security, 2000, "synthetic_security", contract_legs); - // execution params/order def - LegSpreaderParams lsp_1, lsp_2, lsp_3; - fill_leg_spreader_params(lsp_1, 1.0, false, 1.0); - fill_leg_spreader_params(lsp_2, -1.0, true, 1.0); - std::vector spreader_params; - spreader_params.push_back(lsp_1); - spreader_params.push_back(lsp_2); - bts::api::orderman::OrderDefinition order_def; - fill_spreader_order_definition(order_def, Side::SIDE_BUY, - synthetic_security, - spreader_params); - // putting it together in SpreaderBookkeepingData - SpreaderPreActivationOrderServices::TestOnlySpreaderPreActivationOrderServices - testonly_spreader_pao_services = _create_spreader_pao_services(synthetic_security); - SpreaderPreActivationOrderServices pao_services (&testonly_spreader_pao_services); - std::vector leg_props; - SpreaderUtils::resolve_synthetic_spread(pao_services, order_def, leg_props); - SpreaderManagerForTest spreader_manager (order_key, order_def, pao_services, leg_props); - SpreaderOrder spreader; - REQUIRE(spreader.test_only_func_spreader_state() == SpreaderState::START); - // on_init_new and activate - spreader.test_only_on_init_new (order_def, pao_services); - SpreaderOrderServices order_services (nullptr); - spreader.test_only_on_activate(spreader_price, spreader_quantity, order_services); - SpreaderBookkeepingData& bookkeeping_data = spreader.test_only_func_spreader_full_data(); - verify_basic_spreader_state (spreader, - SpreaderState::WORKING, - spreader_price, - spreader_quantity); - SpreaderLegData& leg_data_1 = bookkeeping_data.get_leg_data (0); - SpreaderLegData& leg_data_2 = bookkeeping_data.get_leg_data (1); - verify_complete_quoter_state (leg_data_2.quoter(), - QuoterState::WAITING_FOR_SIZE, - false, - spreader_price, - Quantity (100), - Quantity (0), - Quantity(0), - Price(0), - Quantity(0), - Quantity(100), - false); +// TEST_CASE ("spreader_perf_2legs", "[spreader]") +// { +// bts::orderman::OrderKey order_key(0); +// Price spreader_price = Price (1); Quantity spreader_quantity = Quantity (100); +// ContractLeg leg_1, leg_2; +// fill_future_contract_leg (leg_1, 2468, "ES", bts::api::Venue::VENUE_GLBX, +// 2017, 12, 15, 1.0, 1.0, api::Side::SIDE_BUY, +// 1.0, 0.25); +// fill_future_contract_leg (leg_2, 13579, "ES", bts::api::Venue::VENUE_GLBX, +// 2018, 3, 15, -1.0, -1.0, api::Side::SIDE_SELL, +// 1.0, 0.25); +// std::vector contract_legs; +// contract_legs.push_back(leg_1); +// contract_legs.push_back(leg_2); +// Security synthetic_security; +// fill_synthetic_security (synthetic_security, 2000, "synthetic_security", contract_legs); +// // execution params/order def +// LegSpreaderParams lsp_1, lsp_2, lsp_3; +// fill_leg_spreader_params(lsp_1, 1.0, false, 1.0); +// fill_leg_spreader_params(lsp_2, -1.0, true, 1.0); +// std::vector spreader_params; +// spreader_params.push_back(lsp_1); +// spreader_params.push_back(lsp_2); +// bts::api::orderman::OrderDefinition order_def; +// fill_spreader_order_definition(order_def, Side::SIDE_BUY, +// synthetic_security, +// spreader_params); +// // putting it together in SpreaderBookkeepingData +// SpreaderPreActivationOrderServices::TestOnlySpreaderPreActivationOrderServices +// testonly_spreader_pao_services = _create_spreader_pao_services(synthetic_security); +// SpreaderPreActivationOrderServices pao_services (&testonly_spreader_pao_services); +// std::vector leg_props; +// SpreaderUtils::resolve_synthetic_spread(pao_services, order_def, leg_props); +// SpreaderManagerForTest spreader_manager (order_key, order_def, pao_services, leg_props); +// SpreaderOrder spreader; +// REQUIRE(spreader.test_only_func_spreader_state() == SpreaderState::START); +// // on_init_new and activate +// spreader.test_only_on_init_new (order_def, pao_services); +// SpreaderOrderServices order_services (nullptr); +// spreader.test_only_on_activate(spreader_price, spreader_quantity, order_services); +// SpreaderBookkeepingData& bookkeeping_data = spreader.test_only_func_spreader_full_data(); +// verify_basic_spreader_state (spreader, +// SpreaderState::WORKING, +// spreader_price, +// spreader_quantity); +// SpreaderLegData& leg_data_1 = bookkeeping_data.get_leg_data (0); +// SpreaderLegData& leg_data_2 = bookkeeping_data.get_leg_data (1); +// verify_complete_quoter_state (leg_data_2.quoter(), +// QuoterState::WAITING_FOR_SIZE, +// false, +// spreader_price, +// Quantity (100), +// Quantity (0), +// Quantity(0), +// Price(0), +// Quantity(0), +// Quantity(100), +// false); - set_spreader_orders (spreader, new double[5] {1999, 1998, 1997, 1996, 1995}, - new uint16_t[5] {50, 50, 10, 10, 30}, - new double[5] {2000, 2001, 2002, 2003, 2004}, - new uint16_t[5] {10, 15, 25, 50, 10}, - new double[5] {2002, 2001, 2000, 1999, 1998}, - new uint16_t[5] {20, 20, 20, 20, 20}, - new double[5] {2003, 2004, 2005, 2006, 2007}, - new uint16_t[5] {25, 25, 20, 20, 10}, - 0, 0, 0, 0); - // verify working orders - verify_complete_quoter_state (leg_data_2.quoter(), - QuoterState::WORKING, false, - spreader_price, - Quantity (100), - Quantity (0), - Quantity(0), - Price(2002), - Quantity(100), - Quantity(100), - false); - SECTION ("book updates"){ - Book book_1 = get_book(SecurityKey (leg_1.security().id()), - 5, - new double[10] {1999, 1998, 1997, 1996, 1995}, - new uint16_t[10] {50, 10, 10, 10, 30}, - new double[10] {2000, 2001, 2002, 2003, 2004}, - new uint16_t[10] {50, 10, 10, 10, 30}, - true), - book_2 = get_book(SecurityKey (leg_1.security().id()), - 5, - new double[10] {1999.5, 1998.5, 1997.5, 1996.5, 1995.5}, - new uint16_t[10] {5, 15, 20, 20, 30}, - new double[10] {2000.25, 2001.25, 2002.25, 2003.25, 2004.25}, - new uint16_t[10] {10, 5, 15, 25, 5}, - true); - uint32_t n_runs=10,n_iters = 100; - //alternate bw the book n_runs times - for (uint32_t i=0; i(us_diff (t1,t0))/n_iters; - auto n_requotes=n_iters;//leg_data_2.order_update_message().n_modifications(); - LOG(OrderMan, Info, "2 legs requotes:{} unit time(usecs):{}",n_requotes,requote_time); - std::cout << "2 legs requotes:" << n_requotes << " unit time(usecs):" << requote_time << std::endl; - } - } - SECTION ("hedges"){ - // send hedges - uint32_t n_hedges=20; - bts::TimeStamp t0=bts::Timer::now(); - for (uint32_t i=1; i<=n_hedges; i++) - spreader.test_only_on_child_order_update (leg_data_2.order_key(), - api::orderman::OrderStatus::ORDER_STATUS_WORKING, - Quantity (i), - Price (2001)); - bts::TimeStamp t1=bts::Timer::now(); - const auto& leg_data=bookkeeping_data.get_leg_data(0); - REQUIRE(leg_data.n_hedgers()==n_hedges); - double hedge_time=static_cast(us_diff (t1,t0))/n_hedges; - LOG(OrderMan, Info, "2 leg hedges:{} unit time(u_secs):{}",n_hedges,hedge_time); - std::cout << "2 leg hedges:" << n_hedges << " unit time(usecs):" << hedge_time << std::endl; - } -} +// set_spreader_orders (spreader, new double[5] {1999, 1998, 1997, 1996, 1995}, +// new uint16_t[5] {50, 50, 10, 10, 30}, +// new double[5] {2000, 2001, 2002, 2003, 2004}, +// new uint16_t[5] {10, 15, 25, 50, 10}, +// new double[5] {2002, 2001, 2000, 1999, 1998}, +// new uint16_t[5] {20, 20, 20, 20, 20}, +// new double[5] {2003, 2004, 2005, 2006, 2007}, +// new uint16_t[5] {25, 25, 20, 20, 10}, +// 0, 0, 0, 0); +// // verify working orders +// verify_complete_quoter_state (leg_data_2.quoter(), +// QuoterState::WORKING, false, +// spreader_price, +// Quantity (100), +// Quantity (0), +// Quantity(0), +// Price(2002), +// Quantity(100), +// Quantity(100), +// false); +// SECTION ("book updates"){ +// Book book_1 = get_book(SecurityKey (leg_1.security().id()), +// 5, +// new double[10] {1999, 1998, 1997, 1996, 1995}, +// new uint16_t[10] {50, 10, 10, 10, 30}, +// new double[10] {2000, 2001, 2002, 2003, 2004}, +// new uint16_t[10] {50, 10, 10, 10, 30}, +// true), +// book_2 = get_book(SecurityKey (leg_1.security().id()), +// 5, +// new double[10] {1999.5, 1998.5, 1997.5, 1996.5, 1995.5}, +// new uint16_t[10] {5, 15, 20, 20, 30}, +// new double[10] {2000.25, 2001.25, 2002.25, 2003.25, 2004.25}, +// new uint16_t[10] {10, 5, 15, 25, 5}, +// true); +// uint32_t n_runs=10,n_iters = 100; +// //alternate bw the book n_runs times +// for (uint32_t i=0; i(us_diff (t1,t0))/n_iters; +// auto n_requotes=n_iters;//leg_data_2.order_update_message().n_modifications(); +// LOG(OrderMan, Info, "2 legs requotes:{} unit time(usecs):{}",n_requotes,requote_time); +// std::cout << "2 legs requotes:" << n_requotes << " unit time(usecs):" << requote_time << std::endl; +// } +// } +// SECTION ("hedges"){ +// // send hedges +// uint32_t n_hedges=20; +// bts::TimeStamp t0=bts::Timer::now(); +// for (uint32_t i=1; i<=n_hedges; i++) +// spreader.test_only_on_child_order_update (leg_data_2.order_key(), +// api::orderman::OrderStatus::ORDER_STATUS_WORKING, +// Quantity (i), +// Price (2001)); +// bts::TimeStamp t1=bts::Timer::now(); +// const auto& leg_data=bookkeeping_data.get_leg_data(0); +// REQUIRE(leg_data.n_hedgers()==n_hedges); +// double hedge_time=static_cast(us_diff (t1,t0))/n_hedges; +// LOG(OrderMan, Info, "2 leg hedges:{} unit time(u_secs):{}",n_hedges,hedge_time); +// std::cout << "2 leg hedges:" << n_hedges << " unit time(usecs):" << hedge_time << std::endl; +// } +// } TEST_CASE ("spreader_perf_4legs", "[spreader]") { bts::orderman::OrderKey order_key(0); @@ -2849,42 +2849,42 @@ TEST_CASE ("spreader_perf_4legs", "[spreader]") spreader_quantity, spreader_quantity, false); - SECTION ("book updates"){ - uint32_t n_runs=10,n_iters = 100; - //alternate bw the book n_runs times - for (uint32_t i=0; i(us_diff (t1,t0))/n_iters; - auto n_requotes=n_iters;//qleg_data_4.order_update_message().n_modifications(); - LOG(OrderMan, Info, "4 legs requotes:{} unit time(usecs):{}",n_requotes,requote_time); - std::cout << "4 legs requotes:" << n_requotes << " unit time(usecs):" << requote_time << std::endl; - } - } - SECTION ("hedges"){ - // send hedges - uint32_t n_hedges=20; - bts::TimeStamp t0=bts::Timer::now(); - for (uint32_t i=1; i<=n_hedges; i++) - spreader.test_only_on_child_order_update (qleg_data_4.order_key(), - api::orderman::OrderStatus::ORDER_STATUS_WORKING, - Quantity (i), - Price (21.045)); - bts::TimeStamp t1=bts::Timer::now(); - const auto& leg_data=bookkeeping_data.get_leg_data(0); - REQUIRE(leg_data.n_hedgers()==n_hedges); - double hedge_time=static_cast(us_diff (t1,t0))/n_hedges; - LOG(OrderMan, Info, "n leg hedges:{} unit time(u_secs):{}",n_hedges,hedge_time); - std::cout << "4 leg hedges:" << n_hedges << " unit time(usecs):" << hedge_time << std::endl; - } + // SECTION ("book updates"){ + // uint32_t n_runs=10,n_iters = 100; + // //alternate bw the book n_runs times + // for (uint32_t i=0; i(us_diff (t1,t0))/n_iters; + // auto n_requotes=n_iters;//qleg_data_4.order_update_message().n_modifications(); + // LOG(OrderMan, Info, "4 legs requotes:{} unit time(usecs):{}",n_requotes,requote_time); + // std::cout << "4 legs requotes:" << n_requotes << " unit time(usecs):" << requote_time << std::endl; + // } + // } + // SECTION ("hedges"){ + // // send hedges + // uint32_t n_hedges=20; + // bts::TimeStamp t0=bts::Timer::now(); + // for (uint32_t i=1; i<=n_hedges; i++) + // spreader.test_only_on_child_order_update (qleg_data_4.order_key(), + // api::orderman::OrderStatus::ORDER_STATUS_WORKING, + // Quantity (i), + // Price (21.045)); + // bts::TimeStamp t1=bts::Timer::now(); + // const auto& leg_data=bookkeeping_data.get_leg_data(0); + // REQUIRE(leg_data.n_hedgers()==n_hedges); + // double hedge_time=static_cast(us_diff (t1,t0))/n_hedges; + // LOG(OrderMan, Info, "n leg hedges:{} unit time(u_secs):{}",n_hedges,hedge_time); + // std::cout << "4 leg hedges:" << n_hedges << " unit time(usecs):" << hedge_time << std::endl; + // } SECTION ("N_requotes_1_hedge_M_times"){ // N book updates followed by M fills // (does the hedge time stays the same as @@ -2940,289 +2940,289 @@ TEST_CASE ("spreader_perf_4legs", "[spreader]") } } } -TEST_CASE ("simple book addition", "[spreader]"){ - SECTION ("direct, book"){ - SecurityKey key(12345); - Book in_book (key); - fill_book(in_book, - new double[5] {2000, 2000.01, 2000.03, 2000.04, 2000.1}, - new uint16_t[5] {10, 1, 15, 14, 20}, - new uint16_t[5] {1, 12, 0, 0, 0}, - api::Side::SIDE_BUY, - true); - Book out_book(key); - SpreaderUtils::copy_book(in_book, - md::IntPrice_from_double<7>(1999.0), - bts::spark::LegSpreaderParams::DIRECT, - bts::spark::LegSpreaderParams::BOOK, - out_book); +// TEST_CASE ("simple book addition", "[spreader]"){ +// SECTION ("direct, book"){ +// SecurityKey key(12345); +// Book in_book (key); +// fill_book(in_book, +// new double[5] {2000, 2000.01, 2000.03, 2000.04, 2000.1}, +// new uint16_t[5] {10, 1, 15, 14, 20}, +// new uint16_t[5] {1, 12, 0, 0, 0}, +// api::Side::SIDE_BUY, +// true); +// Book out_book(key); +// SpreaderUtils::copy_book(in_book, +// md::IntPrice_from_double<7>(1999.0), +// bts::spark::LegSpreaderParams::DIRECT, +// bts::spark::LegSpreaderParams::BOOK, +// out_book); - validate_book(out_book, - key, - api::Side::SIDE_BUY, - 0.01, - new double[5] {2000, 2000.01, 2000.03, 2000.04, 2000.1}, - new uint16_t[5] {10, 1, 15, 14, 20}, - true); - } - SECTION ("direct, book_holes"){ - SecurityKey key(12345); - Book in_book (key); - fill_book(in_book, - new double[5] {2000, 2000.01, 2000.03, 2000.04, 2000.1}, - new uint16_t[5] {0, 1, 0, 14, 20}, //directs - new uint16_t[5] {1, 12, 0, 0, 0}, //implieds - api::Side::SIDE_BUY, - true); - Book out_book(key); - SpreaderUtils::copy_book(in_book, - md::IntPrice_from_double<7>(1999.0), - bts::spark::LegSpreaderParams::DIRECT, - bts::spark::LegSpreaderParams::BOOK, - out_book); +// validate_book(out_book, +// key, +// api::Side::SIDE_BUY, +// 0.01, +// new double[5] {2000, 2000.01, 2000.03, 2000.04, 2000.1}, +// new uint16_t[5] {10, 1, 15, 14, 20}, +// true); +// } +// SECTION ("direct, book_holes"){ +// SecurityKey key(12345); +// Book in_book (key); +// fill_book(in_book, +// new double[5] {2000, 2000.01, 2000.03, 2000.04, 2000.1}, +// new uint16_t[5] {0, 1, 0, 14, 20}, //directs +// new uint16_t[5] {1, 12, 0, 0, 0}, //implieds +// api::Side::SIDE_BUY, +// true); +// Book out_book(key); +// SpreaderUtils::copy_book(in_book, +// md::IntPrice_from_double<7>(1999.0), +// bts::spark::LegSpreaderParams::DIRECT, +// bts::spark::LegSpreaderParams::BOOK, +// out_book); - validate_book(out_book, - key, - api::Side::SIDE_BUY, - 0.01, - new double[5] {2000.01, 2000.04, 2000.10, os::nan(), os::nan()}, - new uint16_t[5] {1, 14, 20, 0, 0}, - true); - } - SECTION ("direct, net_change"){ - SecurityKey key(13579); - Book in_book (key); - fill_book(in_book, - new double[5] {2000, 2000.01, 2000.03, 2000.04, 2000.1}, - new uint16_t[5] {10, 1, 15, 14, 20}, - new uint16_t[5] {1, 12, 0, 0, 0}, - api::Side::SIDE_BUY, - true); - Book out_book(key); - SpreaderUtils::copy_book(in_book, - md::IntPrice_from_double<7>(1999.0), - bts::spark::LegSpreaderParams::DIRECT, - bts::spark::LegSpreaderParams::NET_CHANGE, - out_book); +// validate_book(out_book, +// key, +// api::Side::SIDE_BUY, +// 0.01, +// new double[5] {2000.01, 2000.04, 2000.10, os::nan(), os::nan()}, +// new uint16_t[5] {1, 14, 20, 0, 0}, +// true); +// } +// SECTION ("direct, net_change"){ +// SecurityKey key(13579); +// Book in_book (key); +// fill_book(in_book, +// new double[5] {2000, 2000.01, 2000.03, 2000.04, 2000.1}, +// new uint16_t[5] {10, 1, 15, 14, 20}, +// new uint16_t[5] {1, 12, 0, 0, 0}, +// api::Side::SIDE_BUY, +// true); +// Book out_book(key); +// SpreaderUtils::copy_book(in_book, +// md::IntPrice_from_double<7>(1999.0), +// bts::spark::LegSpreaderParams::DIRECT, +// bts::spark::LegSpreaderParams::NET_CHANGE, +// out_book); - validate_book(out_book, - key, - api::Side::SIDE_BUY, - 0.01, - new double[5] {1, 1.01, 1.03, 1.04, 1.1}, - new uint16_t[5] {10, 1, 15, 14, 20}, - true); - } - SECTION ("direct, net_change_nan"){ - SecurityKey key(13579); - Book in_book (key); - fill_book(in_book, - new double[5] {2000, 2000.01, 2000.03, 2000.04, 2000.1}, - new uint16_t[5] {10, 1, 15, 14, 20}, - new uint16_t[5] {1, 12, 0, 0, 0}, - api::Side::SIDE_BUY, - true); - Book out_book(key); - SpreaderUtils::copy_book(in_book, - md::INT_NAN, - bts::spark::LegSpreaderParams::DIRECT, - bts::spark::LegSpreaderParams::NET_CHANGE, - out_book); +// validate_book(out_book, +// key, +// api::Side::SIDE_BUY, +// 0.01, +// new double[5] {1, 1.01, 1.03, 1.04, 1.1}, +// new uint16_t[5] {10, 1, 15, 14, 20}, +// true); +// } +// SECTION ("direct, net_change_nan"){ +// SecurityKey key(13579); +// Book in_book (key); +// fill_book(in_book, +// new double[5] {2000, 2000.01, 2000.03, 2000.04, 2000.1}, +// new uint16_t[5] {10, 1, 15, 14, 20}, +// new uint16_t[5] {1, 12, 0, 0, 0}, +// api::Side::SIDE_BUY, +// true); +// Book out_book(key); +// SpreaderUtils::copy_book(in_book, +// md::INT_NAN, +// bts::spark::LegSpreaderParams::DIRECT, +// bts::spark::LegSpreaderParams::NET_CHANGE, +// out_book); - validate_book(out_book, - key, - api::Side::SIDE_BUY, - 0.01, - new double[5] {os::nan(), os::nan(), os::nan(), os::nan(), os::nan()}, - new uint16_t[5] {0, 0, 0, 0, 0}, - true); - } - SECTION ("merged, book"){ - SecurityKey key(24680); - Book in_book (key); - fill_book(in_book, - new double[5] {2000, 2000.01, 2000.03, 2000.04, 2000.1}, - new uint16_t[5] {10, 1, 15, 14, 20}, - new uint16_t[5] {1, 12, 0, 0, 0}, - api::Side::SIDE_BUY, - true); - Book out_book(key); - SpreaderUtils::copy_book(in_book, - md::IntPrice_from_double<7>(1999.0), - bts::spark::LegSpreaderParams::MERGED, - bts::spark::LegSpreaderParams::BOOK, - out_book); +// validate_book(out_book, +// key, +// api::Side::SIDE_BUY, +// 0.01, +// new double[5] {os::nan(), os::nan(), os::nan(), os::nan(), os::nan()}, +// new uint16_t[5] {0, 0, 0, 0, 0}, +// true); +// } +// SECTION ("merged, book"){ +// SecurityKey key(24680); +// Book in_book (key); +// fill_book(in_book, +// new double[5] {2000, 2000.01, 2000.03, 2000.04, 2000.1}, +// new uint16_t[5] {10, 1, 15, 14, 20}, +// new uint16_t[5] {1, 12, 0, 0, 0}, +// api::Side::SIDE_BUY, +// true); +// Book out_book(key); +// SpreaderUtils::copy_book(in_book, +// md::IntPrice_from_double<7>(1999.0), +// bts::spark::LegSpreaderParams::MERGED, +// bts::spark::LegSpreaderParams::BOOK, +// out_book); - validate_book(out_book, - key, - api::Side::SIDE_BUY, - 0.01, - new double[5] {2000, 2000.01, 2000.03, 2000.04, 2000.1}, - new uint16_t[5] {11, 13, 15, 14, 20}, - true); - } - SECTION ("merged, net_change"){ - SecurityKey key(54321); - Book in_book (key); - fill_book(in_book, - new double[5] {2000, 2000.01, 2000.03, 2000.04, 2000.1}, - new uint16_t[5] {10, 1, 15, 14, 20}, - new uint16_t[5] {1, 12, 0, 0, 0}, - api::Side::SIDE_BUY, - true); - Book out_book(key); - SpreaderUtils::copy_book(in_book, - md::IntPrice_from_double<7>(1999.0), - bts::spark::LegSpreaderParams::MERGED, - bts::spark::LegSpreaderParams::NET_CHANGE, - out_book); +// validate_book(out_book, +// key, +// api::Side::SIDE_BUY, +// 0.01, +// new double[5] {2000, 2000.01, 2000.03, 2000.04, 2000.1}, +// new uint16_t[5] {11, 13, 15, 14, 20}, +// true); +// } +// SECTION ("merged, net_change"){ +// SecurityKey key(54321); +// Book in_book (key); +// fill_book(in_book, +// new double[5] {2000, 2000.01, 2000.03, 2000.04, 2000.1}, +// new uint16_t[5] {10, 1, 15, 14, 20}, +// new uint16_t[5] {1, 12, 0, 0, 0}, +// api::Side::SIDE_BUY, +// true); +// Book out_book(key); +// SpreaderUtils::copy_book(in_book, +// md::IntPrice_from_double<7>(1999.0), +// bts::spark::LegSpreaderParams::MERGED, +// bts::spark::LegSpreaderParams::NET_CHANGE, +// out_book); - validate_book(out_book, - key, - api::Side::SIDE_BUY, - 0.01, - new double[5] {1, 1.01, 1.03, 1.04, 1.1}, - new uint16_t[5] {11, 13, 15, 14, 20}, - true); - } -} -TEST_CASE ("random book addition", "[spreader]"){ - size_t n_runs=100; - // generates random prices, with tick size=0.01 - size_t n_levels=5; - double* bid_prices=new double[n_levels], - *ask_prices=new double[n_levels]; - uint16_t* direct_bid_sizes=new uint16_t[n_levels], - *implied_bid_sizes=new uint16_t[n_levels], - *direct_ask_sizes=new uint16_t[n_levels], - *implied_ask_sizes=new uint16_t[n_levels]; - double* exp_bid_prices=new double[n_levels], - *exp_ask_prices=new double[n_levels]; - uint16_t* exp_bid_sizes=new uint16_t[n_levels], - *exp_ask_sizes=new uint16_t[n_levels]; - for(size_t i=0;i(settlement_price), - bts::spark::LegSpreaderParams::DIRECT, - bts::spark::LegSpreaderParams::BOOK, - out_book); - validate_book(out_book, - key, - api::Side::SIDE_BUY, - tick_size, - bid_prices, - direct_bid_sizes, - false); - validate_book(out_book, - key, - api::Side::SIDE_SELL, - tick_size, - ask_prices, - direct_ask_sizes, - false); - } - // "direct, net_change" - { - for(size_t i=0;i(settlement_price), - bts::spark::LegSpreaderParams::DIRECT, - bts::spark::LegSpreaderParams::NET_CHANGE, - out_book); - validate_book(out_book, - key, - api::Side::SIDE_BUY, - tick_size, - exp_bid_prices, - direct_bid_sizes, - false); - validate_book(out_book, - key, - api::Side::SIDE_SELL, - tick_size, - exp_ask_prices, - direct_ask_sizes, - false); - } - // merged, book - { - for(size_t i=0;i(settlement_price), - bts::spark::LegSpreaderParams::MERGED, - bts::spark::LegSpreaderParams::BOOK, - out_book); - validate_book(out_book, - key, - api::Side::SIDE_BUY, - tick_size, - bid_prices, - exp_bid_sizes, - false); - validate_book(out_book, - key, - api::Side::SIDE_SELL, - tick_size, - ask_prices, - exp_ask_sizes, - false); - } - // merged, net change - { - for(size_t i=0;i(settlement_price), - bts::spark::LegSpreaderParams::MERGED, - bts::spark::LegSpreaderParams::NET_CHANGE, - out_book); - validate_book(out_book, - key, - api::Side::SIDE_BUY, - tick_size, - exp_bid_prices, - exp_bid_sizes, - false); - validate_book(out_book, - key, - api::Side::SIDE_SELL, - tick_size, - exp_ask_prices, - exp_ask_sizes, - false); - } - } -} +// validate_book(out_book, +// key, +// api::Side::SIDE_BUY, +// 0.01, +// new double[5] {1, 1.01, 1.03, 1.04, 1.1}, +// new uint16_t[5] {11, 13, 15, 14, 20}, +// true); +// } +// } +// TEST_CASE ("random book addition", "[spreader]"){ +// size_t n_runs=100; +// // generates random prices, with tick size=0.01 +// size_t n_levels=5; +// double* bid_prices=new double[n_levels], +// *ask_prices=new double[n_levels]; +// uint16_t* direct_bid_sizes=new uint16_t[n_levels], +// *implied_bid_sizes=new uint16_t[n_levels], +// *direct_ask_sizes=new uint16_t[n_levels], +// *implied_ask_sizes=new uint16_t[n_levels]; +// double* exp_bid_prices=new double[n_levels], +// *exp_ask_prices=new double[n_levels]; +// uint16_t* exp_bid_sizes=new uint16_t[n_levels], +// *exp_ask_sizes=new uint16_t[n_levels]; +// for(size_t i=0;i(settlement_price), +// bts::spark::LegSpreaderParams::DIRECT, +// bts::spark::LegSpreaderParams::BOOK, +// out_book); +// validate_book(out_book, +// key, +// api::Side::SIDE_BUY, +// tick_size, +// bid_prices, +// direct_bid_sizes, +// false); +// validate_book(out_book, +// key, +// api::Side::SIDE_SELL, +// tick_size, +// ask_prices, +// direct_ask_sizes, +// false); +// } +// // "direct, net_change" +// { +// for(size_t i=0;i(settlement_price), +// bts::spark::LegSpreaderParams::DIRECT, +// bts::spark::LegSpreaderParams::NET_CHANGE, +// out_book); +// validate_book(out_book, +// key, +// api::Side::SIDE_BUY, +// tick_size, +// exp_bid_prices, +// direct_bid_sizes, +// false); +// validate_book(out_book, +// key, +// api::Side::SIDE_SELL, +// tick_size, +// exp_ask_prices, +// direct_ask_sizes, +// false); +// } +// // merged, book +// { +// for(size_t i=0;i(settlement_price), +// bts::spark::LegSpreaderParams::MERGED, +// bts::spark::LegSpreaderParams::BOOK, +// out_book); +// validate_book(out_book, +// key, +// api::Side::SIDE_BUY, +// tick_size, +// bid_prices, +// exp_bid_sizes, +// false); +// validate_book(out_book, +// key, +// api::Side::SIDE_SELL, +// tick_size, +// ask_prices, +// exp_ask_sizes, +// false); +// } +// // merged, net change +// { +// for(size_t i=0;i(settlement_price), +// bts::spark::LegSpreaderParams::MERGED, +// bts::spark::LegSpreaderParams::NET_CHANGE, +// out_book); +// validate_book(out_book, +// key, +// api::Side::SIDE_BUY, +// tick_size, +// exp_bid_prices, +// exp_bid_sizes, +// false); +// validate_book(out_book, +// key, +// api::Side::SIDE_SELL, +// tick_size, +// exp_ask_prices, +// exp_ask_sizes, +// false); +// } +// } +// } class RV { public: From 077505509a36aa18f9bea2c45e8653215cd255d2 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Sun, 9 Dec 2018 19:14:53 +0000 Subject: [PATCH 062/107] Improved perf logging. --- src/data_files/CMakeDeps.cmake | 2 +- .../files/perf_trace/perf_trace.sql | 170 ++++++ src/lib/CMakeDeps.cmake | 2 +- src/lib/config/protos/perflog_cfg.proto | 4 +- src/lib/jetfix/connection/AsyncReader.cpp | 1 - src/lib/orderman/actors/ExecutionGateway.cpp | 8 +- .../actors/order_manager/OrderServices.h | 13 +- .../orderman/events/OrderStateUpdateEvent.h | 1 - src/lib/orderman/orderman_utils/PerfTrace.h | 26 - .../orderman/orderman_utils/PerfTraceLog.cpp | 541 ------------------ .../orderman/orderman_utils/PerfTraceLog.h | 34 -- .../orderman/orderman_utils/orderman_common.h | 1 - src/lib/orderman/orders/NativeOrder.cpp | 30 +- .../orders/spreader_orders/SpreaderOrder.cpp | 10 +- src/lib/tracing/PerfLog.cpp | 187 ++---- src/lib/tracing/PerfLog.h | 111 +++- src/server/sparkd/cmds/Benchmark.cpp | 204 +------ src/server/sparkd/cmds/QuickTest.cpp | 17 +- src/web/CMakeDeps.cmake | 2 +- 19 files changed, 357 insertions(+), 1007 deletions(-) create mode 100644 src/data_files/files/perf_trace/perf_trace.sql delete mode 100644 src/lib/orderman/orderman_utils/PerfTrace.h delete mode 100644 src/lib/orderman/orderman_utils/PerfTraceLog.cpp delete mode 100644 src/lib/orderman/orderman_utils/PerfTraceLog.h diff --git a/src/data_files/CMakeDeps.cmake b/src/data_files/CMakeDeps.cmake index 5cdaa4e74..04885f949 100644 --- a/src/data_files/CMakeDeps.cmake +++ b/src/data_files/CMakeDeps.cmake @@ -1 +1 @@ -set(sources files/Onixs.BTS.lic;files/cert_secure_logon.txt;files/perf_trace/compiled.css;files/perf_trace/index.html;files/perf_trace/jquery-3.3.1.min.js;files/perf_trace/main.js;files/perf_trace/plotly-latest.min.js) \ No newline at end of file +set(sources files/Onixs.BTS.lic;files/cert_secure_logon.txt;files/perf_trace/compiled.css;files/perf_trace/index.html;files/perf_trace/jquery-3.3.1.min.js;files/perf_trace/main.js;files/perf_trace/perf_trace.sql;files/perf_trace/plotly-latest.min.js) \ No newline at end of file diff --git a/src/data_files/files/perf_trace/perf_trace.sql b/src/data_files/files/perf_trace/perf_trace.sql new file mode 100644 index 000000000..811d774cb --- /dev/null +++ b/src/data_files/files/perf_trace/perf_trace.sql @@ -0,0 +1,170 @@ +create table if not exists +session ( + version TEXT, + host TEXT, + build_type TEXT, + session_start TIMESTAMP PRIMARY KEY +); + +create table if not exists +trace ( + session_start TIMESTAMP, + ts INTEGER, + delta INTEGER, + hts timestamp, + channel TEXT, + entry_kind TEXT, + txt_1 TEXT, + uint64_1 INTEGER, + thread TEXT, + cor_event INTEGER, + sn INTEGER, + uint32_1 INTEGER +); + +drop view if exists recent_trace; +create view recent_trace as +select * from trace order by rowid desc limit 140123; + +drop view if exists hedge_events; +CREATE VIEW hedge_events as +select + recent_trace.session_start, + channel, + sn, + min(ts) ts, + min(hts) hts, + (max(ts)-min(ts))/1000.0 t +from + recent_trace, + session +where + recent_trace.session_start = session.session_start and + (entry_kind='fix_socket_r' or entry_kind='before_fix_socket_w') +group by + recent_trace.session_start, channel, sn +having + count(*) = 2 and min(entry_kind)<>max(entry_kind); + +drop view if exists requote_events; +CREATE VIEW requote_events as +select + recent_trace.session_start, + channel, + sn, + min(ts) ts, + min(hts) hts, + (max(ts)-min(ts))/1000.0 t +from + recent_trace, + session +where + recent_trace.session_start = session.session_start and + (entry_kind='md' or entry_kind='before_fix_socket_w') +group by + recent_trace.session_start, channel, sn having count(*) = 2 and + min(entry_kind)<>max(entry_kind); + +drop view if exists hedge_trace; +create view hedge_trace as +select + session.version, + session.host, + session.build_type, + session.session_start, + recent_trace.hts trace_time, + recent_trace.uint64_1 order_key, + hedge_events.t total +from + recent_trace, + hedge_events, + session +where + entry_kind='NativeOrder::on_activate' and + recent_trace.channel = hedge_events.channel and + recent_trace.session_start = hedge_events.session_start and + recent_trace.sn = hedge_events.sn and + recent_trace.session_start = session.session_start; + +drop view if exists requote_trace; +create view requote_trace as +select + session.version, + session.host, + session.build_type, + session.session_start, + recent_trace.hts trace_time, + recent_trace.uint64_1 order_key, + requote_events.t total +from + recent_trace, + requote_events, + session +where + entry_kind='NativeOrder::on_update' and + recent_trace.channel = requote_events.channel and + recent_trace.session_start = requote_events.session_start and + recent_trace.sn = requote_events.sn and + recent_trace.session_start = session.session_start ; + +drop view if exists events; +CREATE VIEW events as +select + "requote" event_type, + requote_events.* +from + requote_events +union +select + "hedge" event_type, + hedge_events.* +from + hedge_events; + +drop view if exists delta_trace; +CREATE VIEW delta_trace as +select + *, + (ts - (select ts from recent_trace previous_rows where + previous_rows.ts < recent_trace.ts order by ts desc limit 1))/1000.0 delta_from_previous, + case cor_event>0 when 1 then (ts-cor_event)/1000.0 else 0 end delta_from_pair, + case cor_event>0 when 1 then "end of " || entry_kind else entry_kind end paired_entry_kind +from + recent_trace ; + +drop view if exists event_log; +create view event_log as +select + delta_trace.*, + events.event_type, + events.ts event_start, + events.t event_duration, + events.rowid event_id +from + delta_trace, + events +where + delta_trace.session_start=events.session_start and + delta_trace.channel=events.channel and + delta_trace.sn = events.sn; + +drop view if exists pretty_log; +create view pretty_log as +select + event_id, + event_type, + event_duration, + delta_from_previous delta, + cast (delta_from_previous/event_duration*100 as integer) delta_p, + delta_from_pair pair_delta, + cast (delta_from_pair/event_duration*100 as integer) pair_p, + paired_entry_kind entry_kind, + hts +from + event_log +order by + session_start,ts; + +delete from trace where +rowid in (select rowid from trace order by rowid desc limit -1 offset 10000123; + diff --git a/src/lib/CMakeDeps.cmake b/src/lib/CMakeDeps.cmake index 6db8a3a76..f6aaba4f9 100644 --- a/src/lib/CMakeDeps.cmake +++ b/src/lib/CMakeDeps.cmake @@ -1 +1 @@ -set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/services/UserService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/PerfTraceLog.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/IcebergOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/CoverOrder.cpp;orderman/orders/book_algos/JoinOrder.cpp;orderman/orders/book_algos/LeanOrder.cpp;orderman/orders/book_algos/OffsetOrder.cpp;orderman/orders/book_algos/TickOrder.cpp;orderman/orders/book_algos/TopOrder.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;orderman2/orders/NativeOrder.cpp;orderman2/orders/Order.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;tracing/PerfLog.cpp;tracing/bts_trace.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/thread_manager.cpp) \ No newline at end of file +set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/services/UserService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/IcebergOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/CoverOrder.cpp;orderman/orders/book_algos/JoinOrder.cpp;orderman/orders/book_algos/LeanOrder.cpp;orderman/orders/book_algos/OffsetOrder.cpp;orderman/orders/book_algos/TickOrder.cpp;orderman/orders/book_algos/TopOrder.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;orderman2/orders/NativeOrder.cpp;orderman2/orders/Order.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;tracing/PerfLog.cpp;tracing/bts_trace.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/thread_manager.cpp) \ No newline at end of file diff --git a/src/lib/config/protos/perflog_cfg.proto b/src/lib/config/protos/perflog_cfg.proto index 7ee97dcb0..d0acc1a13 100644 --- a/src/lib/config/protos/perflog_cfg.proto +++ b/src/lib/config/protos/perflog_cfg.proto @@ -3,6 +3,6 @@ package bts.config; message PerfLogCfg { optional bool active = 1 [default=true]; - optional uint32 max_rows_for_query = 2 [default=140000]; - optional uint32 max_rows = 3 [default=10000000]; + optional uint32 recent_trades_size = 2 [default=140123]; + optional uint32 max_rows = 3 [default=10000123]; } diff --git a/src/lib/jetfix/connection/AsyncReader.cpp b/src/lib/jetfix/connection/AsyncReader.cpp index 1b564bb3c..bb839faaf 100644 --- a/src/lib/jetfix/connection/AsyncReader.cpp +++ b/src/lib/jetfix/connection/AsyncReader.cpp @@ -7,7 +7,6 @@ #include "lib/utils/bts_assert.h" #include "lib/os/os.h" #include "lib/tracing/bts_trace.h" -#include "lib/orderman/orderman_utils/PerfTrace.h" #include "lib/utils/thread_manager.h" #include diff --git a/src/lib/orderman/actors/ExecutionGateway.cpp b/src/lib/orderman/actors/ExecutionGateway.cpp index c50d75ad2..5436600a8 100644 --- a/src/lib/orderman/actors/ExecutionGateway.cpp +++ b/src/lib/orderman/actors/ExecutionGateway.cpp @@ -108,7 +108,7 @@ OnCancelReject &ExecutionGateway::on_cancel_reject() { void ExecutionGateway::on_exe_report( const jetfix::fix::ExecutionReportMsg &msg) { - auto start = Timer::now(); + trace::ScopedPerfLogEntry scoped_log(me->perf_log,msg.trace(), "ExecutionGateway::on_exe_report"); OrderKey ok; SecurityKey sk; decode_clorid(msg.get(), &ok, &sk); @@ -248,11 +248,7 @@ void ExecutionGateway::on_exe_report( str_to(msg.get(), &data->transact_time); data->cfg = &me->cfg; data->msg = text_msg; - me->perf_log.log(msg.trace(),"exe_gw"); me->on_exe_report(*data, msg.trace()); - LOG(Latency, Info, - "Finished handling of execution report for order {}. {}ns", - ok.value(), ns_diff(Timer::now(), start)); } } @@ -302,7 +298,7 @@ void ExecutionGateway::dispatch_incoming_fix_messages() { void ExecutionGateway::send_fix(jetfix::OutFIXPtr const &fix, trace::CorID trace) { - me->perf_log.log(trace,"exe_gw"); + trace::ScopedPerfLogEntry scoped_log (me->perf_log,trace,"ExecutionGateway::send_fix"); me->gw.send(fix,trace); me->gw.dispatch_events(); } diff --git a/src/lib/orderman/actors/order_manager/OrderServices.h b/src/lib/orderman/actors/order_manager/OrderServices.h index badf97244..8ec490563 100644 --- a/src/lib/orderman/actors/order_manager/OrderServices.h +++ b/src/lib/orderman/actors/order_manager/OrderServices.h @@ -147,12 +147,17 @@ class OrderServices { ss.queue_fix(mt, f, trace); } - void log(trace::CorID cid, const char *entry_kind, uint32_t uint32_1 = 0, - uint32_t uint32_2 = 0, const char *txt_1 = "", - uint64_t uint64_1 = 0) { - _data->log.log(cid, entry_kind, uint32_1, uint32_2, txt_1, uint64_1); + void log(trace::CorID cid, const char *entry_kind, + uint64_t uint64_1 = 0,const char *txt_1 = "",uint32_t uint32_1 = 0) { + _data->log.log(cid, entry_kind, uint64_1, txt_1, uint32_1); } + trace::ScopedPerfLogEntry log_scope(trace::CorID cid, const char *entry_kind, + uint64_t uint64_1 = 0,const char *txt_1 = "",uint32_t uint32_1 = 0) + { + return trace::ScopedPerfLogEntry(_data->log,cid,entry_kind,uint64_1,txt_1,uint32_1); + } + void report_state(const api::orderman::OrderState &state, trace::CorID const &trace = trace::CorID()) { diff --git a/src/lib/orderman/events/OrderStateUpdateEvent.h b/src/lib/orderman/events/OrderStateUpdateEvent.h index 1083866ba..678b5f9c9 100644 --- a/src/lib/orderman/events/OrderStateUpdateEvent.h +++ b/src/lib/orderman/events/OrderStateUpdateEvent.h @@ -1,7 +1,6 @@ #pragma once #include "lib/mercury/events/Event.h" -#include "lib/orderman/orderman_utils/PerfTrace.h" #include "lib/api/services/OrderService.pb.h" #include "lib/tracing/PerfLog.h" diff --git a/src/lib/orderman/orderman_utils/PerfTrace.h b/src/lib/orderman/orderman_utils/PerfTrace.h deleted file mode 100644 index de00a8200..000000000 --- a/src/lib/orderman/orderman_utils/PerfTrace.h +++ /dev/null @@ -1,26 +0,0 @@ -#pragma once - -#include -#include "lib/utils/TimeStamp.h" - -namespace bts { - -class PerfTrace { -public: - utils::TimeStamp do_work_begin; - utils::TimeStamp fix_socket_r; - utils::TimeStamp md ; - utils::TimeStamp md_src ; - utils::TimeStamp spreader_on_book ; - utils::TimeStamp spreader_on_child_order_update ; - utils::TimeStamp order_update ; - utils::TimeStamp exe_gw ; - utils::TimeStamp fix_socket_w ; - utils::TimeStamp spreader_modify_order ; - utils::TimeStamp send_fix_buffer ; - uint32_t order_key = 0; - uint16_t md_sn = 0; -}; - -} - diff --git a/src/lib/orderman/orderman_utils/PerfTraceLog.cpp b/src/lib/orderman/orderman_utils/PerfTraceLog.cpp deleted file mode 100644 index df38650a4..000000000 --- a/src/lib/orderman/orderman_utils/PerfTraceLog.cpp +++ /dev/null @@ -1,541 +0,0 @@ -#include "PerfTraceLog.h" - -#include "lib/config/config.h" -#include "lib/config/protos/system.pb.h" -#include "lib/orderman/orderman_utils/PerfTrace.h" -#include "lib/orderman/orderman_utils/PerfTraceLog.h" -#include "lib/persistence/persistence_utils.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/datetime.h" -#include "lib/utils/file_utils.h" -#include "lib/utils/stats.h" - -#include -#include -#include -#include -#include -#include -#include -#include - -namespace bts { - -auto current_schema_version = 3; - -auto insert_trace = "insert into trace (" - "version," - "host," - "build_type," - "session_start," - "trace_time," - "do_work_begin," - "fix_socket_r," - "md," - "md_src," - "spreader_on_book," - "spreader_on_child_order_update," - "order_update," - "exe_gw," - "fix_socket_w," - "spreader_modify_order," - "send_fix_buffer," - "order_key," - "md_sn" - ") values (" - ":version," - ":host," - ":build_type," - ":session_start," - ":trace_time," - ":do_work_begin," - ":fix_socket_r," - ":md," - ":md_src," - ":spreader_on_book," - ":spreader_on_child_order_update," - ":order_update," - ":exe_gw," - ":fix_socket_w," - ":spreader_modify_order," - ":send_fix_buffer," - ":order_key," - ":md_sn" - ")"; - -auto create_trace_table = "drop table if exists trace;create table trace (" - "version TEXT, " - "host TEXT, " - "build_type TEXT, " - "session_start TEXT," - "trace_time TEXT," - "do_work_begin INTEGER," - "fix_socket_r INTEGER," - "md INTEGER," - "md_src INTEGER," - "spreader_on_book INTEGER," - "spreader_on_child_order_update INTEGER," - "order_update INTEGER," - "exe_gw INTEGER," - "fix_socket_w INTEGER," - "spreader_modify_order INTEGER," - "send_fix_buffer INTEGER," - "order_key INTEGER," - "md_sn INTEGER );"; - -auto create_schema_version_table = - "create table schema_version(version INTEGER); insert into " - "schema_version(version) values(0);"; - -auto query_schema_version = "select version from schema_version limit 1"; -auto delete_version_record = "delete from schema_version;"; -auto update_version = "insert into schema_version(version) values(:version);"; - -auto requote_trace_view = "drop view if exists requote_trace; " - "create view requote_trace as select " - "version, " - "host, " - "build_type, " - "session_start," - "trace_time," - "order_key," - "(fix_socket_w-md) / 1000.0 total," - "0 md," - "0 spreader," - "0 fix " - "from " - "trace " - "where md<>0 and (md_src-md)<1000000"; - -auto hedge_trace_view = - "drop view if exists hedge_trace; " - "CREATE VIEW hedge_trace as " - "select version, host, build_type, session_start,trace_time,order_key, " - "(fix_socket_w-fix_socket_r) / 1000.0 total, " - "0 fix_in, " - "0 spreader, " - "0 fix_out " - "from trace where fix_socket_r<>0 "; - -auto requote_query = - "select * from requote_trace order by trace_time desc limit ?"; - -auto hedge_query = "select * from hedge_trace order by trace_time desc limit ?"; - -struct PerfTraceLog::PImpl { - PImpl(std::string const &loc) - : db(loc, SQLite::OPEN_READWRITE | SQLite::OPEN_CREATE), - insert_statement(), pending_traces() {} - SQLite::Database db; - std::unique_ptr insert_statement; - std::unique_ptr requote_query_statement; - std::unique_ptr hedge_query_statement; - tbb::concurrent_queue pending_traces; - std::string session_start; - std::mutex lock; -}; - -PerfTraceLog::PerfTraceLog() : me() { - auto loc = init_storage_location(); - try { - me = std::make_unique(loc); - if (!me->db.tableExists("schema_version")) { - LOG(persist, Warn, "{} database does not exist yet. Creating it ", - std::string(me->db.getFilename())); - me->db.exec(create_schema_version_table); - } - - if (schema_out_of_date()) { - me->db.exec(create_trace_table); - me->db.exec(requote_trace_view); - me->db.exec(hedge_trace_view); - - SQLite::Statement(me->db, delete_version_record).exec(); - SQLite::Statement update_version_statement(me->db, update_version); - update_version_statement.bind(":version", current_schema_version); - update_version_statement.exec(); - } - - me->insert_statement = - std::make_unique(me->db, insert_trace); - me->requote_query_statement = - std::make_unique(me->db, requote_query); - me->hedge_query_statement = - std::make_unique(me->db, hedge_query); - me->session_start = datetime::FIX_timestamp(datetime::local_now()); - } catch (SQLite::Exception const &e) { - auto msg = fmt::format("Unable to create {}. Error: {}", loc, - std::string(e.getErrorStr())); - bts_assert_msg(false, msg); - } -} - -PerfTraceLog::~PerfTraceLog() {} - -std::string PerfTraceLog::init_storage_location() { - auto loc = persistence::storage_location("perf_trace"); - auto parent = boost::filesystem::path(loc).parent_path(); - - if (!boost::filesystem::is_directory(parent)) - bts_assert(boost::filesystem::create_directories(parent)); - return loc; -} - -void PerfTraceLog::log(const PerfTrace &trace) { - me->pending_traces.push(trace); -} - -int PerfTraceLog::persist_traces() { - std::vector traces; - PerfTrace trace; - while (me->pending_traces.try_pop(trace)) - traces.push_back(trace); - store(traces); - return traces.size(); -} - -void PerfTraceLog::store(std::vector const &traces) { - std::lock_guard l(me->lock); - try { - for (auto const &t : traces) { - me->insert_statement->bind(":version", - config::get().version()); - me->insert_statement->bind(":host", - config::get().host_name()); -#ifdef DEBUG - me->insert_statement->bind(":build_type", "debug"); -#else - me->insert_statement->bind(":build_type", "release"); -#endif - me->insert_statement->bind(":session_start", me->session_start); - if (t.md_src.to_uint64()) - me->insert_statement->bind( - ":trace_time", datetime::FIX_timestamp( - datetime::timestamp_to_ptime(t.md_src))); - else - me->insert_statement->bind( - ":trace_time", - datetime::FIX_timestamp( - datetime::timestamp_to_ptime(t.fix_socket_r))); - - me->insert_statement->bind(":do_work_begin", - (long long)t.do_work_begin.to_uint64()); - me->insert_statement->bind(":fix_socket_r", - (long long)t.fix_socket_r.to_uint64()); - me->insert_statement->bind(":md", (long long)t.md.to_uint64()); - me->insert_statement->bind(":md_src", (long long)t.md_src.to_uint64()); - me->insert_statement->bind(":spreader_on_book", - (long long)t.spreader_on_book.to_uint64()); - me->insert_statement->bind( - ":spreader_on_child_order_update", - (long long)t.spreader_on_child_order_update.to_uint64()); - me->insert_statement->bind(":order_update", - (long long)t.order_update.to_uint64()); - me->insert_statement->bind(":exe_gw", (long long)t.exe_gw.to_uint64()); - me->insert_statement->bind(":fix_socket_w", - (long long)t.fix_socket_w.to_uint64()); - me->insert_statement->bind( - ":spreader_modify_order", - (long long)t.spreader_modify_order.to_uint64()); - me->insert_statement->bind(":send_fix_buffer", - (long long)t.send_fix_buffer.to_uint64()); - me->insert_statement->bind(":order_key", (long long)t.order_key); - me->insert_statement->bind(":md_sn", (long long)t.md_sn); - me->insert_statement->exec(); - me->insert_statement->reset(); - } - } catch (SQLite::Exception const &e) { - auto msg = fmt::format("Unable to insert {}. Error: {}", - std::string(me->db.getFilename()), - std::string(e.getErrorStr())); - bts_assert_msg(false, msg); - } -} - -bool PerfTraceLog::schema_out_of_date() { - try { - SQLite::Statement query_schema_version_statement(me->db, - query_schema_version); - - while (query_schema_version_statement.executeStep()) { - int version = query_schema_version_statement.getColumn("version"); - return version != current_schema_version; - } - } catch (SQLite::Exception const &e) { - auto msg = fmt::format("Unable to query schema version in {}. Error: {}", - std::string(me->db.getFilename()), - std::string(e.getErrorStr())); - bts_assert_msg(false, msg); - } - return true; -} - -std::string encode_string(SQLite::Column const &c) { - return fmt::format("\"{}\"", std::string(c)); -} - -std::string encode_number(SQLite::Column const &c) { - return fmt::format("{}", (long long)c); -} - -std::vector> -PerfTraceLog::get_latest_requote_traces(size_t n) { - std::vector> result; - - std::lock_guard l(me->lock); - try { - me->requote_query_statement->bind(1, (long long)n); - - while (me->requote_query_statement->executeStep()) { - auto &row = result.emplace_back(); - row["version"] = - encode_string(me->requote_query_statement->getColumn("version")); - row["host"] = - encode_string(me->requote_query_statement->getColumn("host")); - row["build_type"] = encode_string( - me->requote_query_statement->getColumn("build_type")); - row["session_start"] = encode_string( - me->requote_query_statement->getColumn("session_start")); - row["trace_time"] = encode_string( - me->requote_query_statement->getColumn("trace_time")); - - row["order_key"] = - encode_number(me->requote_query_statement->getColumn("order_key")); - row["total"] = - encode_number(me->requote_query_statement->getColumn("total")); - row["md"] = - encode_number(me->requote_query_statement->getColumn("md")); - row["spreader"] = - encode_number(me->requote_query_statement->getColumn("spreader")); - row["fix"] = - encode_number(me->requote_query_statement->getColumn("fix")); - } - me->requote_query_statement->reset(); - } catch (SQLite::Exception const &e) { - auto msg = fmt::format("Unable to quote_traces {}. Error: {}", - std::string(me->db.getFilename()), - std::string(e.getErrorStr())); - bts_assert_msg(false, msg); - } - return result; -} - -std::vector> -PerfTraceLog::get_latest_hedge_traces(size_t n) { - std::vector> result; - - std::lock_guard l(me->lock); - try { - me->hedge_query_statement->bind(1, (long long)n); - - while (me->hedge_query_statement->executeStep()) { - auto &row = result.emplace_back(); - row["version"] = - encode_string(me->hedge_query_statement->getColumn("version")); - row["host"] = - encode_string(me->hedge_query_statement->getColumn("host")); - row["build_type"] = - encode_string(me->hedge_query_statement->getColumn("build_type")); - row["session_start"] = encode_string( - me->hedge_query_statement->getColumn("session_start")); - row["trace_time"] = - encode_string(me->hedge_query_statement->getColumn("trace_time")); - - row["order_key"] = - encode_number(me->hedge_query_statement->getColumn("order_key")); - row["total"] = - encode_number(me->hedge_query_statement->getColumn("total")); - row["fix_in"] = - encode_number(me->hedge_query_statement->getColumn("fix_in")); - row["spreader"] = - encode_number(me->hedge_query_statement->getColumn("spreader")); - row["fix_out"] = - encode_number(me->hedge_query_statement->getColumn("fix_out")); - } - me->hedge_query_statement->reset(); - } catch (SQLite::Exception const &e) { - auto msg = fmt::format("Unable to query hedge_traces. Error: {}", - std::string(e.getErrorStr())); - bts_assert_msg(false, msg); - } - return result; -} - -namespace perf_stat { - -using Row = std::map; - -struct Summary { - std::string name; - double min; - double max; - double median; - double ninenty_nine; - double stddev; - std::vector values; -}; - -struct Session { - std::string start; - std::string host; - std::string version; - std::string build_type; - uint32_t n_rows; - std::map summaries; - std::vector rows; -}; - -} // namespace perf_stat - -std::map structure_quote_traces( - std::vector> "es) { - - std::map result; - - for (auto &q : quotes) { - auto &session = result[q["session_start"]]; - if (session.start.empty()) { - session.start = q["session_start"]; - session.host = q["host"]; - session.version = q["version"]; - session.build_type = q["build_type"]; - } - for (auto st : {"total", "md", "spreader", "fix"}) { - auto &summary = session.summaries[st]; - if (summary.name.empty()) - summary.name = st; - summary.values.push_back(std::stod(q[st])); - } - session.rows.push_back(q); - session.n_rows++; - } - - for (auto &session_kvp : result) - for (auto &stat_kvp : session_kvp.second.summaries) { - auto &summary = stat_kvp.second; - summary.min = stats::min(summary.values); - summary.max = stats::max(summary.values); - summary.median = stats::percentile(summary.values, 0.5); - summary.ninenty_nine = stats::percentile(summary.values, 0.99); - summary.stddev = stats::stdev(summary.values); - } - - return result; -} - -std::map structure_hedge_traces( - std::vector> "es) { - - std::map result; - - for (auto &q : quotes) { - auto &session = result[q["session_start"]]; - if (session.start.empty()) { - session.start = q["session_start"]; - session.host = q["host"]; - session.version = q["version"]; - session.build_type = q["build_type"]; - } - for (auto st : {"total", "fix_in", "spreader", "fix_out"}) { - auto &summary = session.summaries[st]; - if (summary.name.empty()) - summary.name = st; - summary.values.push_back(std::stod(q[st])); - } - session.rows.push_back(q); - session.n_rows++; - } - - for (auto &session_kvp : result) - for (auto &stat_kvp : session_kvp.second.summaries) { - auto &summary = stat_kvp.second; - summary.min = stats::min(summary.values); - summary.max = stats::max(summary.values); - summary.median = stats::percentile(summary.values, 0.5); - summary.ninenty_nine = stats::percentile(summary.values, 0.99); - summary.stddev = stats::stdev(summary.values); - } - - return result; -} - -void print_summary(std::ostream &ss, perf_stat::Summary const &s, bool last) { - ss << " { " - << "\"value\":" - << " \"" << s.name << "\"" - << ", \"min\":" << s.min << ", \"max\":" << s.max - << ", \"median\":" << s.median << ", \"ninenty_nine\":" << s.ninenty_nine - << ", \"stdev\":" << s.stddev; - if (!last) - ss << " },\n"; - else - ss << " }\n"; -} - -void print_row(std::ostream &ss, perf_stat::Row const &r, bool last) { - ss << " { "; - size_t i = 0; - for (auto const &kvp : r) - if (kvp.first != "version" && kvp.first != "host" && - kvp.first != "build_type" && kvp.first != "session_start") { - ss << "\"" << kvp.first << "\":" << kvp.second; - if (++i != r.size() - 4) - ss << ","; - } - if (!last) - ss << " },\n"; - else - ss << " }\n"; -} - -void print_session(std::ostream &ss, perf_stat::Session const &s, bool last) { - ss << "{\n" - << " \"session_name\": " << s.start << ",\n" - << " \"host\": " << s.host << ",\n" - << " \"version\": " << s.version << ",\n" - << " \"build_type\": " << s.build_type << ",\n" - << " \"n_rows\": " << s.n_rows << ",\n"; - - ss << " \"summaries\":\n [\n"; - size_t i = 0; - for (auto &summaries_kvp : s.summaries) - print_summary(ss, summaries_kvp.second, ++i == s.summaries.size()); - ss << " ],\n"; - - ss << " \"rows\":\n [\n"; - i = 0; - for (auto &r : s.rows) - print_row(ss, r, ++i == s.rows.size()); - ss << " ]\n"; - if (!last) - ss << "},\n"; - else - ss << "}\n"; -} - -void PerfTraceLog::print_latest_traces(std::ostream &ss, size_t n) { - { - auto rows = get_latest_requote_traces(n); - auto structured = structure_quote_traces(rows); - - ss << "{\n\"requotes\": [\n"; - size_t i = 0; - for (auto &session_kvp : boost::adaptors::reverse(structured)) - print_session(ss, session_kvp.second, ++i == structured.size()); - ss << "],\n"; - } - - { - auto rows = get_latest_hedge_traces(n); - auto structured = structure_hedge_traces(rows); - - ss << "\"hedges\": [\n"; - - size_t i = 0; - for (auto &session_kvp : boost::adaptors::reverse(structured)) - print_session(ss, session_kvp.second, ++i == structured.size()); - ss << "]\n}\n"; - } -} - -} // namespace bts diff --git a/src/lib/orderman/orderman_utils/PerfTraceLog.h b/src/lib/orderman/orderman_utils/PerfTraceLog.h deleted file mode 100644 index 8cb952fc7..000000000 --- a/src/lib/orderman/orderman_utils/PerfTraceLog.h +++ /dev/null @@ -1,34 +0,0 @@ -#pragma once - -#include -#include -#include - -namespace bts { -class PerfTrace; - -class PerfTraceLog { - public: - PerfTraceLog(); - ~PerfTraceLog(); - void log(const PerfTrace &); - - // returns number of persisted traces - int persist_traces(); - - // return the N last traces - std::vector> get_latest_requote_traces(size_t n=0); - std::vector> get_latest_hedge_traces(size_t n=0); - - void print_latest_traces(std::ostream &,size_t n = 0); - - private: - struct PImpl; - std::unique_ptr me; - - std::string init_storage_location(); - bool schema_out_of_date(); - void store(std::vector const &); -}; - -} // namespace bts diff --git a/src/lib/orderman/orderman_utils/orderman_common.h b/src/lib/orderman/orderman_utils/orderman_common.h index 3986e2bc8..4fa5f145b 100644 --- a/src/lib/orderman/orderman_utils/orderman_common.h +++ b/src/lib/orderman/orderman_utils/orderman_common.h @@ -6,7 +6,6 @@ #include #include "lib/domain_model/common.h" -#include "lib/orderman/orderman_utils/PerfTrace.h" #include "lib/utils/ValueWrapper.h" #include "lib/utils/bts_assert.h" #include "lib/utils/bts_chrono.h" diff --git a/src/lib/orderman/orders/NativeOrder.cpp b/src/lib/orderman/orders/NativeOrder.cpp index 9824a71e0..380a54d06 100644 --- a/src/lib/orderman/orders/NativeOrder.cpp +++ b/src/lib/orderman/orders/NativeOrder.cpp @@ -275,7 +275,8 @@ NativeOrder::~NativeOrder() {} void NativeOrder::on_activate(Price p, Quantity q, bts::orderman::OrderServices &services, trace::CorID const &trace) { - services.log(trace, "on_activate_start", key().value()); + auto scoped_log = + services.log_scope(trace, "NativeOrder::on_activate", key().value()); bts_assert(!me->services); me->services = &services; @@ -296,6 +297,9 @@ void NativeOrder::on_activate(Price p, Quantity q, me->price_encoding_precision = me->services->price_encoding_precision(*me->session_services); + auto checks_log = services.log_scope( + trace, "NativeOrder::on_activate::checks", key().value()); + // is our gateway connected? if (!me->services->is_gateway_connected(*me->session_services)) { LOG(OrderMan, Warn, @@ -350,8 +354,12 @@ void NativeOrder::on_activate(Price p, Quantity q, break; } + checks_log.finish(); + // if we are here we are good. + auto post_checks_log = services.log_scope( + trace, "NativeOrder::on_activate::post_checks", key().value()); // subscribe to usefull events me->services->subscribe_to_exe_report( *me->session_services, key(), @@ -387,14 +395,12 @@ void NativeOrder::on_activate(Price p, Quantity q, auto const &ts = services.get_time_str(); me->create_transact_time_bm = encoding.overwrite( me->create_transact_time_bm, &ts.value()[0], ts.value().size()); - services.log(trace, "send_fix_buffer", key().value()); me->services->queue_fix(*me->session_services, jetfix::MessageTypes::NewOrderSingle, me->create_encoding, trace); me->services->governor(*me->session_services).record_sent(); me->state.set_status(ORDER_STATUS_PENDING_WORKING); - services.log(trace, "on_activate_done", key().value()); LOG(OrderMan, Info, "Sent new order with key {} to gateway", key().value()); // early return so we skip the expensive report_state() call @@ -465,13 +471,15 @@ void NativeOrder::on_activate(Price p, Quantity q, } void NativeOrder::on_update(Price p, Quantity q, trace::CorID const &trace) { - - me->services->log(trace, "order_update", key().value()); + auto scoped_log = + me->services->log_scope(trace, "NativeOrder::on_update", key().value()); switch (me->state.status()) { case ORDER_STATUS_WORKING: { + auto checks_perf_log = me->services->log_scope( + trace, "NativeOrder::on_update::checks", key().value()); auto previous_working_qty = 0; if (me->state.quantity() > me->state.filled_quantity()) previous_working_qty = @@ -518,6 +526,10 @@ void NativeOrder::on_update(Price p, Quantity q, trace::CorID const &trace) { break; } + checks_perf_log.finish(); + + auto post_check = me->services->log_scope( + trace, "NativeOrder::on_update::post_check", key().value()); // all good auto &encoding = me->update_encoding; me->update_price_bm = encoding.overwrite( @@ -531,10 +543,13 @@ void NativeOrder::on_update(Price p, Quantity q, trace::CorID const &trace) { me->update_transact_time_bm = encoding.overwrite( me->update_transact_time_bm, &ts.value()[0], ts.value().size()); + post_check.finish(); me->services->queue_fix(*me->session_services, jetfix::MessageTypes::CancelReplace, me->update_encoding, trace); + auto post_sends = me->services->log_scope( + trace, "NativeOrder::on_update::post_send", key().value()); me->services->governor(*me->session_services).record_sent(); update_working_position(); if (me->state.last_msg().size()) @@ -565,6 +580,8 @@ void NativeOrder::on_update(Price p, Quantity q, trace::CorID const &trace) { void NativeOrder::on_crack(trace::CorID const &) {} void NativeOrder::on_cancel(trace::CorID const &trace) { + auto scoped_log = + me->services->log_scope(trace, "NativeOrder::on_cancel", key().value()); switch (me->state.status()) { case ORDER_STATUS_WORKING: { @@ -621,6 +638,9 @@ bool NativeOrder::is_old_exe_report( } void NativeOrder::on_exe_report(const NewExecutionReportEvent &er) { + auto scoped_log = me->services->log_scope( + er.trace, "NativeOrder::on_exe_report", key().value()); + auto &state = me->state; auto &native_state = get_native_state(state); diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp index 0737f204f..fdd107150 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp @@ -100,8 +100,9 @@ void SpreaderOrder::_on_time(const bts::mercury::TimerEvent& t_event){ } void SpreaderOrder::_on_book_update(const BookUpdateEvent& book_event){ if (!_active) return; - - _order_services->order_services().log(book_event.trace,"spreader_on_book", key().value()); + auto scoped_log = + _order_services->order_services().log_scope(book_event.trace, + "SpreaderOrder::_on_book_update", key().value()); _state_worker->on_book (book_event.book,book_event.trace); } void SpreaderOrder::_on_settlement_update(const SettlementUpdateEvent& @@ -116,7 +117,10 @@ void SpreaderOrder::_on_settlement_update(const SettlementUpdateEvent& } void SpreaderOrder::_on_child_order_update(const OrderStateUpdateEvent& ord_ev){ if (!_active) return; - _order_services->order_services().log(ord_ev.trace,"begin_on_child_order_update", key().value()); + auto scoped_log = + _order_services->order_services().log_scope(ord_ev.trace, + "SpreaderOrder::_on_child_order_update", + key().value()); SecurityKey sec_key = SecurityKey(ord_ev.definition->security_key()); OrderKey order_key = ord_ev.key; bts::api::orderman::OrderStatus status = ord_ev.status; diff --git a/src/lib/tracing/PerfLog.cpp b/src/lib/tracing/PerfLog.cpp index 0b2acee0b..602d8d31f 100644 --- a/src/lib/tracing/PerfLog.cpp +++ b/src/lib/tracing/PerfLog.cpp @@ -7,6 +7,7 @@ #include "lib/utils/stats.h" #include +#include #include #include #include @@ -18,51 +19,32 @@ namespace bts { namespace trace { -auto create_session = "create table session (" - "version TEXT, " - "host TEXT, " - "build_type TEXT, " - "session_start TIMESTAMP PRIMARY KEY" - ")"; - -auto create_trace = "create table trace (" - "session_start TIMESTAMP," - "ts INTEGER," - "hts timestamp," - "channel TEXT," - "entry_kind TEXT," - "txt_1 TEXT," - "sn INTEGER," - "uint32_1 INTEGER," - "uint32_2 INTEGER," - "uint64_1 INTEGER," - "thread TEXT" - ")"; - auto insert_trace = "insert into trace (" "session_start," "ts," + "delta," "hts," "channel," "entry_kind," "txt_1," - "sn," - "uint32_1," - "uint32_2," "uint64_1," - "thread" + "thread," + "cor_event," + "sn," + "uint32_1" ") values (" ":session_start," ":ts," + ":delta," ":hts," ":channel," ":entry_kind," ":txt_1," - ":sn," - ":uint32_1," - ":uint32_2," ":uint64_1," - ":thread" + ":thread," + ":cor_event," + ":sn," + ":uint32_1" ")"; auto insert_session = "insert into session (" @@ -77,100 +59,6 @@ auto insert_session = "insert into session (" ":session_start" ")"; -auto create_recent_trace_view = - "drop view if exists recent_trace; create view recent_trace as " - "select * from trace order by rowid desc limit {}"; - -auto delete_old_records = - "delete from trace where " - "rowid in (select rowid from trace order by rowid desc limit -1 offset {})"; - -auto hedge_events_view = - "drop view if exists hedge_events; create view hedge_events as " - "select " - " recent_trace.session_start, " - " channel, " - " sn, " - " min(hts) hts, " - " (max(ts)-min(ts))/1000 t " - "from " - " recent_trace, " - " session " - "where " - " recent_trace.session_start = session.session_start and " - " (entry_kind='fix_socket_r' or entry_kind='before_fix_socket_w') " - "group by " - " recent_trace.session_start, " - " channel, " - " sn " - "having " - " count(*) = 2 and " - " min(entry_kind)<>max(entry_kind)"; - -auto hedge_trace_view = - "drop view if exists hedge_trace; create view hedge_trace as " - "select " - " session.version, " - " session.host, " - " session.build_type, " - " session.session_start, " - " recent_trace.hts trace_time, " - " recent_trace.uint32_1 order_key, " - " hedge_events.t total " - "from " - " recent_trace, " - " hedge_events, " - " session " - "where " - " entry_kind='on_activate_start' and " - " recent_trace.channel = hedge_events.channel and " - " recent_trace.session_start = hedge_events.session_start and " - " recent_trace.sn = hedge_events.sn and " - " recent_trace.session_start = session.session_start "; - -auto requote_events_view = - "drop view if exists requote_events; create view requote_events as " - "select " - " recent_trace.session_start, " - " channel, " - " sn, " - " min(hts) hts, " - " (max(ts)-min(ts))/1000 t " - "from " - " recent_trace, " - " session " - "where " - " recent_trace.session_start = session.session_start and " - " (entry_kind='md' or entry_kind='before_fix_socket_w') " - "group by " - " recent_trace.session_start, " - " channel, " - " sn " - "having " - " count(*) = 2 and " - " min(entry_kind)<>max(entry_kind) "; - -auto requote_trace_view = - "drop view if exists requote_trace; create view requote_trace as " - "select " - " session.version, " - " session.host, " - " session.build_type, " - " session.session_start, " - " recent_trace.hts trace_time, " - " recent_trace.uint32_1 order_key, " - " requote_events.t total " - "from " - " recent_trace, " - " requote_events, " - " session " - "where " - " entry_kind='order_update' and " - " recent_trace.channel = requote_events.channel and " - " recent_trace.session_start = requote_events.session_start and " - " recent_trace.sn = requote_events.sn and " - " recent_trace.session_start = session.session_start "; - auto requote_query = "select * from requote_trace order by trace_time desc limit ?"; @@ -179,14 +67,16 @@ auto hedge_query = "select * from hedge_trace order by trace_time desc limit ?"; struct PerfLog::PImpl { PImpl(std::string const &loc) : db(loc, SQLite::OPEN_READWRITE | SQLite::OPEN_CREATE), - insert_trace_statement(), insert_session_statement(), session_start(), - lock() {} + insert_trace_statement(), insert_session_statement(), + requote_query_statement(), hedge_query_statement(), previous_ts(0), + session_start(), lock() {} SQLite::Database db; std::unique_ptr insert_trace_statement; std::unique_ptr insert_session_statement; std::unique_ptr requote_query_statement; std::unique_ptr hedge_query_statement; + utils::TimeStamp previous_ts; std::string session_start; std::mutex lock; }; @@ -206,22 +96,7 @@ PerfLog::PerfLog() : _pending(), _disabled(false), me() { try { me = std::make_unique(loc); - if (!me->db.tableExists("session")) { - LOG(persist, Warn, "{} database does not exist yet. Creating it ", - std::string(me->db.getFilename())); - me->db.exec(create_session); - me->db.exec(create_trace); - } - - me->db.exec(fmt::format(delete_old_records, - config::get().max_rows())); - me->db.exec( - fmt::format(create_recent_trace_view, - config::get().max_rows_for_query())); - me->db.exec(hedge_events_view); - me->db.exec(hedge_trace_view); - me->db.exec(requote_events_view); - me->db.exec(requote_trace_view); + init_db(); me->insert_trace_statement = std::make_unique(me->db, insert_trace); @@ -272,7 +147,7 @@ size_t PerfLog::store_log_entries() { _pending.clear(); return 0; } - + size_t count = 0; try { PerfLogEntry ev; @@ -281,6 +156,9 @@ size_t PerfLog::store_log_entries() { me->db.exec("begin"); me->insert_trace_statement->bind(":session_start", me->session_start); me->insert_trace_statement->bind(":ts", (long long)ev.ts.to_uint64()); + me->insert_trace_statement->bind( + ":delta", (long long)(ev.ts - me->previous_ts).nanoseconds()); + me->previous_ts = ev.ts; me->insert_trace_statement->bind( ":hts", datetime::FIX_timestamp(datetime::timestamp_to_ptime(ev.ts))); @@ -289,9 +167,9 @@ size_t PerfLog::store_log_entries() { me->insert_trace_statement->bind(":txt_1", ev.txt_1); me->insert_trace_statement->bind(":sn", ev.sn); me->insert_trace_statement->bind(":uint32_1", ev.uint32_1); - me->insert_trace_statement->bind(":uint32_2", ev.uint32_2); me->insert_trace_statement->bind(":uint64_1", (long long)ev.uint64_1); - + me->insert_trace_statement->bind(":cor_event", + (long long)ev.cor_event.to_uint64()); char tn[17]; pthread_getname_np(ev.thread_id, tn, 16); me->insert_trace_statement->bind(":thread", tn); @@ -303,8 +181,10 @@ size_t PerfLog::store_log_entries() { me->db.exec("commit"); } catch (SQLite::Exception const &e) { if (count) - try {me->db.exec("rollback");} - catch (SQLite::Exception const &e2) {} + try { + me->db.exec("rollback"); + } catch (SQLite::Exception const &e2) { + } LOG(persist, Error, "Unable to insert perf trace in. Error: {}", std::string(e.getErrorStr())); _pending.clear(); @@ -312,6 +192,21 @@ size_t PerfLog::store_log_entries() { return count; } +void PerfLog::init_db() { + auto sql_path = os::sparkd_wd() + "/data_files/perf_trace/perf_trace.sql"; + std::ifstream f(sql_path); + std::string str((std::istreambuf_iterator(f)), + (std::istreambuf_iterator())); + config::PerfLogCfg defaults; + boost::replace_all( + str, std::to_string(defaults.recent_trades_size()), + std::to_string(config::get().recent_trades_size())); + boost::replace_all( + str, std::to_string(defaults.max_rows()), + std::to_string(config::get().max_rows())); + me->db.exec(str); +} + std::string encode_string(SQLite::Column const &c) { return fmt::format("\"{}\"", std::string(c)); } diff --git a/src/lib/tracing/PerfLog.h b/src/lib/tracing/PerfLog.h index c1bd7a012..a36264b16 100644 --- a/src/lib/tracing/PerfLog.h +++ b/src/lib/tracing/PerfLog.h @@ -1,64 +1,119 @@ #pragma once - + #include "lib/utils/TimeStamp.h" -#include -#include #include - +#include +#include + namespace bts { namespace trace { - + struct CorID { const char *channel = ""; uint32_t sn = 0; }; - + struct PerfLogEntry { utils::TimeStamp ts; const char *channel; const char *entry_kind; const char *txt_1; - uint32_t sn; - uint32_t uint32_1; - uint32_t uint32_2; uint64_t uint64_1; pthread_t thread_id; + utils::TimeStamp cor_event; + uint32_t sn; + uint32_t uint32_1; }; - + class PerfLog { tbb::concurrent_queue _pending; bool _disabled; struct PImpl; std::unique_ptr me; - + public: PerfLog(); ~PerfLog(); size_t store_log_entries(); - - void log(CorID cid, const char *entry_kind, uint32_t uint32_1 = 0, - uint32_t uint32_2 = 0, const char *txt_1 = "", - uint64_t uint64_1 = 0) { + + void log(CorID cid, const char *entry_kind, uint64_t uint64_1 = 0, + const char *txt_1 = "", uint32_t uint32_1 = 0) { _pending.push({utils::TimeStamp::now(), cid.channel, entry_kind, txt_1, - cid.sn, uint32_1, uint32_2, uint64_1, pthread_self()}); + uint64_1, pthread_self(), utils::TimeStamp(), cid.sn, + uint32_1}); } - + void log(CorID cid, utils::TimeStamp ts, const char *entry_kind, - uint32_t uint32_1 = 0, uint32_t uint32_2 = 0, - const char *txt_1 = "", uint64_t uint64_1 = 0) { - _pending.push({ts, cid.channel, entry_kind, txt_1, cid.sn, uint32_1, - uint32_2, uint64_1, pthread_self()}); + uint64_t uint64_1 = 0, const char *txt_1 = "", + uint32_t uint32_1 = 0) { + _pending.push({ts, cid.channel, entry_kind, txt_1, uint64_1, + pthread_self(), utils::TimeStamp(), cid.sn, uint32_1}); } - + + void log(CorID cid, utils::TimeStamp ts, utils::TimeStamp ts2, + const char *entry_kind, uint64_t uint64_1 = 0, + const char *txt_1 = "", uint32_t uint32_1 = 0) { + _pending.push({ts, cid.channel, entry_kind, txt_1, uint64_1, + pthread_self(), ts2, cid.sn, uint32_1}); + } + + void log(PerfLogEntry const &e) { _pending.push(e); } + // return the N last traces - std::vector> get_latest_requote_traces(size_t n=0); - std::vector> get_latest_hedge_traces(size_t n=0); - - void print_latest_traces(std::ostream &,size_t n = 0); - + std::vector> + get_latest_requote_traces(size_t n = 0); + std::vector> + get_latest_hedge_traces(size_t n = 0); + + void print_latest_traces(std::ostream &, size_t n = 0); + private: std::string init_storage_location(); + void init_db(); }; - + +class ScopedPerfLogEntry { + public: + ScopedPerfLogEntry(PerfLog &l, CorID cid, const char *entry_kind, + uint64_t uint64_1 = 0, const char *txt_1 = "", + uint32_t uint32_1 = 0) + : _log(l), _begin{utils::TimeStamp::now(), + cid.channel, + entry_kind, + txt_1, + uint64_1, + pthread_self(), + utils::TimeStamp(), + cid.sn, + uint32_1} { + } + + ScopedPerfLogEntry(ScopedPerfLogEntry &&src) : _log(src._log), _begin(src._begin) { + src._begin.entry_kind = nullptr; + } + + void finish() { + if (_begin.entry_kind) { + _log.log(_begin); + _begin.cor_event = _begin.ts; + _begin.ts = utils::TimeStamp::now(); + _log.log(_begin); + discard(); + } + } + + void discard() { + _begin.entry_kind = nullptr; + } + + ~ScopedPerfLogEntry() { + finish(); + } + + private: + PerfLog &_log; + PerfLogEntry _begin; +}; // namespace trace + } // namespace trace } // namespace bts diff --git a/src/server/sparkd/cmds/Benchmark.cpp b/src/server/sparkd/cmds/Benchmark.cpp index 030489938..6062f5c55 100644 --- a/src/server/sparkd/cmds/Benchmark.cpp +++ b/src/server/sparkd/cmds/Benchmark.cpp @@ -41,172 +41,6 @@ namespace cmd { using namespace orderman; -api::orderman::NativeOrderState const * -get_native_state(api::orderman::OrderState const &st) { - switch (st.custom_case()) { - case api::orderman::OrderState::kMarket: - return &st.market().native_state(); - case api::orderman::OrderState::kLimit: - return &st.limit().native_state(); - case api::orderman::OrderState::kStop: - return &st.stop().native_state(); - case api::orderman::OrderState::kStopLimit: - return &st.stop_limit().native_state(); - default: - return nullptr; - }; -} - -class QuickOrderStateUpdateEvent { - public: - QuickOrderStateUpdateEvent(OrderKey key, OrderKey parent_key, - api::orderman::OrderDefinition const &def, - api::orderman::OrderState const &state, - PerfTrace const &trace = PerfTrace()) - : key(key), parent_key(parent_key), trace(trace), definition(&def) { - - status = state.status(); - price = state.price(); - quantity = state.quantity(); - filled_quantity = state.quantity(); - last_price = state.last_price(); - avg_price = state.avg_price(); - last_msg = state.last_msg(); - custom = state.custom_case(); - - auto native_state = get_native_state(state); - if (native_state) { - exchange_order_id = native_state->exchange_order_id(); - last_msg_seq_num = native_state->last_msg_seq_num(); - sub_error_code = native_state->sub_error_code(); - native_status = native_state->native_status(); - routing_record = native_state->routing_record(); - native_type = native_state->native_type(); - orderman::str_to(native_state->last_transact_time(),&last_transact_time); - } - } - - OrderKey key; - OrderKey parent_key; - - // common state - api::orderman::OrderStatus status; - double price; - uint32_t quantity; - uint32_t filled_quantity; - double last_price; - double avg_price; - std::string last_msg; - - PerfTrace trace; - api::orderman::OrderState::CustomCase custom; - - // native order state - std::string exchange_order_id; - uint64_t last_msg_seq_num; - api::orderman::NativeOrderState::SubError sub_error_code; - api::orderman::NativeOrderStatus native_status; - api::orderman::RoutingRecord routing_record; - api::orderman::NativeOrderType native_type; - mercury::TimeStampStr last_transact_time; - - api::orderman::OrderDefinition const *definition; -}; - -auto sec_str = " id: 3\n" - " symbol: \"ES\"\n" - " exchange: VENUE_GLBX\n" - " contract_spec {\n" - " low_tick: 0.25\n" - " high_tick: 0.25\n" - " cash_per_point: 50\n" - " price_multiplier: 0.01\n" - " }\n" - " future {\n" - " expiration_year: 2018\n" - " expiration_month: 9\n" - " expiration_day: 1\n" - " }\n" - " glbx {\n" - " exchange_id: 57287\n" - " security_desc: \"ESU8\"\n" - " cfi_code: \"FFIXSX\"\n" - " cme_symbol: \"ES\"\n" - " }\n"; - -auto order_str = " order_key: 189285\n" - " timestamp {\n" - " seconds: 1509644176\n" - " nanos: 717250000\n" - " }\n" - " native {\n" - " account_name: \"BTS \"\n" - " operator_id: \"BTS \"\n" - " security_key: 3\n" - " side: SIDE_BUY\n" - " time_in_force: TIF_DAY\n" - " manual_order_indicator: MOI_YES\n" - " order_type: OT_LIMIT\n" - " price: 2500\n" - " order_quantity: 12\n" - " }\n" - " customer_or_firm: COF_FIRM\n" - " cti_code: CTI_CTI1\n" - " order_status: OS_UNACKNOWLEDGED\n"; - -auto order_state_str = " status: ORDER_STATUS_WORKING\n" - " price: 73.42\n" - " quantity: 25\n" - " last_msg: \"\"\n" - " last_change {\n" - " seconds: 1541621138\n" - " nanos: 899901000\n" - " }\n" - " limit {\n" - " native_state {\n" - " exchange_order_id: \"12345678901234567\"\n" - " native_status: NATIVE_ORDER_STATUS_REPLACED\n" - " last_msg_seq_num: 31869\n" - " routing_record {\n" - " session: \"sim\"\n" - " account: \"ACC A\"\n" - " operator_id: \"op_id_bts\"\n" - " cti_code: CTI_CODE_CTI_CODE1\n" - " customer_or_firm: CUSTOMER_OR_FIRM_FIRM\n" - " location: \"us,nc\"\n" - " }\n" - " native_type: NATIVE_ORDER_TYPE_LIMIT\n" - " last_transact_time: \"20181107-20:00:46.000\"\n" - " }\n" - " }\n" - " created {\n" - " seconds: 1541619812\n" - " nanos: 895210000\n" - " }\n"; - -auto clean_os = - " status: ORDER_STATUS_WORKING\n" - " price: 73.42\n" - " quantity: 25\n" - " last_msg: \"\"\n" - " limit {\n" - " native_state {\n" - //" exchange_order_id: \"12345678901234567\"\n" - " native_status: NATIVE_ORDER_STATUS_REPLACED\n" - " last_msg_seq_num: 31869\n" - // " routing_record {\n" - // " session: \"sim\"\n" - // " account: \"ACC A\"\n" - // " operator_id: \"op_id_bts\"\n" - // " cti_code: CTI_CODE_CTI_CODE1\n" - // " customer_or_firm: CUSTOMER_OR_FIRM_FIRM\n" - // " location: \"us,nc\"\n" - // " }\n" - " native_type: NATIVE_ORDER_TYPE_LIMIT\n" - " last_transact_time: \"20181107-20:00:46.000\"\n" - " }\n" - " }\n"; - static void gen_id(benchmark::State &state) { std::string scope = "benchmark"; @@ -250,27 +84,6 @@ static void bts_spinlock_lock_unlock(benchmark::State &state) { } BENCHMARK(bts_spinlock_lock_unlock); -static void copy_perf_trace(benchmark::State &state) { - PerfTrace t; - for (auto _ : state) { - PerfTrace t2; - benchmark::DoNotOptimize(t2 = t); - } -} -BENCHMARK(copy_perf_trace); - -static void init_with_clean_os(benchmark::State &state) { - api::orderman::OrderDefinition def; - auto order_state = - utils::pb::from_string(clean_os); - PerfTrace trace; - OrderKey k(1); - for (auto _ : state) - benchmark::DoNotOptimize( - QuickOrderStateUpdateEvent(k, k, def, order_state, trace)); -} -BENCHMARK(init_with_clean_os); - static void serialize_update(benchmark::State &state) { api::orderman::Update update; update.set_order_key(1); @@ -287,19 +100,6 @@ static void serialize_update(benchmark::State &state) { } BENCHMARK(serialize_update); -static void serialize_order(benchmark::State &state) { - auto order_state = - utils::pb::from_string(order_state_str); - - std::string buffer; - buffer.resize(order_state.ByteSize()); - bts_assert(order_state.SerializeToArray(&buffer[0], buffer.size())); - for (auto _ : state) { - order_state.SerializeWithCachedSizesToArray((unsigned char *)&buffer[0]); - } -} -BENCHMARK(serialize_order); - struct IntId { IntId() { value = std::rand(); } @@ -827,9 +627,7 @@ BENCHMARK(fix_time_stamp); static void perf_log(benchmark::State &state) { trace::PerfLog l; for (auto _ : state) { - for (int i = 0; i < 10000; i++) - l.log(trace::CorID{"sim", 0}, "this", i, 2, "txt", 3); - l.store_log_entries(); + l.log(trace::CorID{"sim", 0}, "this", 1, "txt", 3); } } BENCHMARK(perf_log); diff --git a/src/server/sparkd/cmds/QuickTest.cpp b/src/server/sparkd/cmds/QuickTest.cpp index 0489920c7..2f0437d52 100644 --- a/src/server/sparkd/cmds/QuickTest.cpp +++ b/src/server/sparkd/cmds/QuickTest.cpp @@ -7,10 +7,21 @@ namespace bts { namespace cmd { +struct PerfLogEntry { + utils::TimeStamp ts; + const char *channel; + const char *entry_kind; + const char *txt_1; + uint64_t uint64_1; + pthread_t thread_id; + utils::TimeStamp ts2; + uint32_t sn; + uint32_t uint32_1; +}; + int QuickTest::execute(std::vector const &) { - trace::PerfLog l; - l.log(trace::CorID{"sim", 0}, "this", 1, 2, "txt", 3); - l.store_log_entries(); + std::cout << sizeof(pthread_t) << "\n"; + std::cout << sizeof(PerfLogEntry) << "\n"; return 0; } diff --git a/src/web/CMakeDeps.cmake b/src/web/CMakeDeps.cmake index 050dc8062..65f907171 100644 --- a/src/web/CMakeDeps.cmake +++ b/src/web/CMakeDeps.cmake @@ -1 +1 @@ -set(sources ../../externals/linux/include/google/protobuf/descriptor.proto;../../externals/linux/include/google/protobuf/timestamp.proto;../lib/api/apicore.proto;../lib/api/apigateway.proto;../lib/api/apioptions.proto;../lib/api/services/AdminService.proto;../lib/api/services/ApiUnitTestService.proto;../lib/api/services/ErrorReportService.proto;../lib/api/services/HelloService.proto;../lib/api/services/MarketDataAuxiliaryService.proto;../lib/api/services/MarketDataRelay.proto;../lib/api/services/OrderService.proto;../lib/api/services/OutOfProcessURLListener.proto;../lib/api/services/PersistenceService.proto;../lib/api/services/PositionService.proto;../lib/api/services/ShellDiagnosticService.proto;../lib/api/services/ShellLatencyService.proto;../lib/api/services/SyntheticSecurityService.proto;../lib/api/services/UserService.proto;../lib/domain_model/Security.proto;../lib/md/protos/co2.proto;../lib/sparkproto/SparkProtos.proto;api/build.sh;api/node_modules/cssstyle/scripts/run_tests.sh;api/node_modules/exit/test/fixtures/create-files.sh;api/node_modules/protobufjs/cli/node_modules/acorn-jsx/node_modules/acorn/bin/update_authors.sh;api/node_modules/watch/release.sh;api/quiet_build.sh;api/src/DynamicService.ts;api/src/ServiceContext.ts;api/src/bts_assert.ts;ui/src/Access.fs;ui/src/Accounts/ClipLimits.fs;ui/src/Accounts/ProductLimits.fs;ui/src/Accounts/SecurityLimits.fs;ui/src/Accounts/State.fs;ui/src/Accounts/Types.fs;ui/src/Accounts/View.fs;ui/src/App.fs;ui/src/Cmd.fs;ui/src/Controls/Button.fs;ui/src/Controls/DataGrid.fs;ui/src/Controls/Fields.fs;ui/src/Controls/Modal.fs;ui/src/Controls/ReactGrid.fs;ui/src/Controls/Table.fs;ui/src/Controls/nbsp.fs;ui/src/Global.fs;ui/src/Imports.fs;ui/src/Lens.fs;ui/src/Login/Login.fs;ui/src/Nav.fs;ui/src/State.fs;ui/src/Types.fs;ui/src/Users/State.fs;ui/src/Users/Types.fs;ui/src/Users/View.fs;ui/src/Util/EnumUtils.fs;ui/src/Util/JSMap.fs) \ No newline at end of file +set(sources ../../externals/linux/include/google/protobuf/descriptor.proto;../../externals/linux/include/google/protobuf/timestamp.proto;../lib/api/apicore.proto;../lib/api/apigateway.proto;../lib/api/apioptions.proto;../lib/api/services/AdminService.proto;../lib/api/services/ApiUnitTestService.proto;../lib/api/services/ErrorReportService.proto;../lib/api/services/HelloService.proto;../lib/api/services/MarketDataAuxiliaryService.proto;../lib/api/services/MarketDataRelay.proto;../lib/api/services/OrderService.proto;../lib/api/services/OutOfProcessURLListener.proto;../lib/api/services/PersistenceService.proto;../lib/api/services/PositionService.proto;../lib/api/services/ShellDiagnosticService.proto;../lib/api/services/ShellLatencyService.proto;../lib/api/services/SyntheticSecurityService.proto;../lib/api/services/UserService.proto;../lib/domain_model/Security.proto;../lib/md/protos/co2.proto;../lib/sparkproto/SparkProtos.proto;api/build.sh;api/node_modules/exit/test/fixtures/create-files.sh;api/node_modules/protobufjs/cli/node_modules/acorn-jsx/node_modules/acorn/bin/update_authors.sh;api/node_modules/watch/release.sh;api/quiet_build.sh;api/src/DynamicService.ts;api/src/ServiceContext.ts;api/src/bts_assert.ts;ui/src/Access.fs;ui/src/Accounts/ClipLimits.fs;ui/src/Accounts/ProductLimits.fs;ui/src/Accounts/SecurityLimits.fs;ui/src/Accounts/State.fs;ui/src/Accounts/Types.fs;ui/src/Accounts/View.fs;ui/src/App.fs;ui/src/Cmd.fs;ui/src/Controls/Button.fs;ui/src/Controls/DataGrid.fs;ui/src/Controls/Fields.fs;ui/src/Controls/Modal.fs;ui/src/Controls/ReactGrid.fs;ui/src/Controls/Table.fs;ui/src/Controls/nbsp.fs;ui/src/Global.fs;ui/src/Imports.fs;ui/src/Lens.fs;ui/src/Login/Login.fs;ui/src/Nav.fs;ui/src/State.fs;ui/src/Types.fs;ui/src/Users/State.fs;ui/src/Users/Types.fs;ui/src/Users/View.fs;ui/src/Util/EnumUtils.fs;ui/src/Util/JSMap.fs) \ No newline at end of file From e07d602cf5cd76176dfa2ec28408b50a2f6e225f Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Mon, 10 Dec 2018 12:13:11 -0500 Subject: [PATCH 063/107] client MD refactor --- src/client/spark_api/Co2/Co2RelayControl.cs | 4 + src/client/spark_api/md/MDCombined.cs | 3 - src/client/spark_api/md/MDSource.cs | 2 +- src/client/spark_api/md/MarketDataClient.cs | 84 ++++++++++++++----- src/client/spark_api/utils/Authenticator.cs | 23 ----- src/client/spark_api/utils/Locator.cs | 7 +- .../rtd/formatting/BookMDFormatter.cs | 29 +++---- .../rtd/formatting/FormatterFactory.cs | 3 +- .../rtd/formatting/MiscMDFormatter.cs | 10 ++- .../rtd/formatting/TopOfBookMDFormatter.cs | 29 ++++--- .../rtd/formatting/TopicMDFormatter.cs | 47 ++++++----- .../rtd/subscriptions/MDSubscribe.cs | 34 ++++---- .../spark_sdk/samples/MarketDataSample.cs | 19 +++-- src/client/spark_sdk/samples/OrderSample.cs | 4 +- src/client/spark_sdk/samples/SDKMain.cs | 22 +++-- src/client/spark_sdk/samples/UISample.cs | 2 +- src/client/spark_sdk/uisamples/SparkSDKUI.cs | 2 +- 17 files changed, 187 insertions(+), 137 deletions(-) delete mode 100644 src/client/spark_api/utils/Authenticator.cs diff --git a/src/client/spark_api/Co2/Co2RelayControl.cs b/src/client/spark_api/Co2/Co2RelayControl.cs index dbc8f9060..84e17ade0 100644 --- a/src/client/spark_api/Co2/Co2RelayControl.cs +++ b/src/client/spark_api/Co2/Co2RelayControl.cs @@ -25,6 +25,10 @@ namespace mbts.co2 Co2NativeMethods.set_relay_token(_relay, token.Token); } + public void set_token(AuthTokenImmutable token) { + Co2NativeMethods.set_relay_token(_relay, token.Token); + } + public async Task preload_securities(MDRequest.Types.Flags flags=MDRequest.Types.Flags.Security) { var securities = UserSymbol.get_all(); foreach (var future in securities.Where(s => s.type == SecurityType.Future)) { diff --git a/src/client/spark_api/md/MDCombined.cs b/src/client/spark_api/md/MDCombined.cs index 741a8c62f..9c92511e2 100644 --- a/src/client/spark_api/md/MDCombined.cs +++ b/src/client/spark_api/md/MDCombined.cs @@ -54,9 +54,6 @@ namespace bts.md bool m = (_misc as IMDUpdate).update(smd, ref ml); last_update_time = new[] { bl, ll, ml }.Min(); - if (smd.md.market_timestamp > last_update_time) - { - } return b || l || m; } } diff --git a/src/client/spark_api/md/MDSource.cs b/src/client/spark_api/md/MDSource.cs index e9ae6f208..2a0ba5698 100644 --- a/src/client/spark_api/md/MDSource.cs +++ b/src/client/spark_api/md/MDSource.cs @@ -38,7 +38,7 @@ namespace bts.md Task.Run(run); } - public void set_token(AuthToken token) + public void set_token(AuthTokenImmutable token) { _relay.set_token(token); } diff --git a/src/client/spark_api/md/MarketDataClient.cs b/src/client/spark_api/md/MarketDataClient.cs index 3f469db8a..424f11fc1 100644 --- a/src/client/spark_api/md/MarketDataClient.cs +++ b/src/client/spark_api/md/MarketDataClient.cs @@ -24,8 +24,10 @@ namespace bts.md readonly ConcurrentDictionary _data = new ConcurrentDictionary(); readonly List _disp = new List(); - public MarketDataClient(AuthToken token = null) + readonly uint _default_pump_ms; + public MarketDataClient(uint default_pump_ms = 100, AuthToken token = null) { + _default_pump_ms = default_pump_ms; if (token != null) set_auth_token(token); @@ -35,40 +37,36 @@ namespace bts.md _data.AddOrUpdate(entry.Key, entry.Value, (_, __) => entry.Value); })); } - - public void set_auth_token(AuthToken toke) - { - _subscription.set_token(toke); - } - public IEnumerable securities => _data.Values.Select(x => x.security); public IObservable> on_securities { get { return _subscription.on_securities.Select(x => x.Values.Select(xx => xx.security)); } } - public IObservable subscribe_combined(Product product) + public void set_auth_token(AuthTokenImmutable? toke) { - Func where = (x => x.Exchange == product.Exchange && - x.Symbol == product.Symbol && x.security_type() == product.Type); - return subscribe_combined(where); + if(toke.HasValue) + _subscription.set_token(toke.Value); } - - public IObservable subscribe_book(Func filter) + public IObservable subscribe_book(Func filter, + TimeSpan? update_interval = null, IScheduler scheduler = null) { - return _subscribe(filter); + return _subscribe(filter, update_interval, scheduler); } - public IObservable subscribe_last(Func filter) + public IObservable subscribe_last(Func filter, + TimeSpan? update_interval = null, IScheduler scheduler = null) { - return _subscribe(filter); + return _subscribe(filter, update_interval, scheduler); } - public IObservable subscribe_misc(Func filter) + public IObservable subscribe_misc(Func filter, + TimeSpan? update_interval = null, IScheduler scheduler = null) { - return _subscribe(filter); + return _subscribe(filter, update_interval, scheduler); } - public IObservable subscribe_combined(Func filter) + public IObservable subscribe_combined(Func filter, + TimeSpan? update_interval = null, IScheduler scheduler = null) { - return _subscribe(filter); + return _subscribe(filter, update_interval, scheduler); } IObservable _subscribe(Func filter, @@ -90,6 +88,50 @@ namespace bts.md update_interval, scheduler); } + public IObservable> subscribe_book(IEnumerable ids, TimeSpan? update_interval = null, + IScheduler scheduler = null) + { + return _subscribe(ids, update_interval, scheduler); + } + public IObservable> subscribe_last(IEnumerable ids, TimeSpan? update_interval = null, + IScheduler scheduler = null) + { + return _subscribe(ids, update_interval, scheduler); + } + public IObservable> subscribe_misc(IEnumerable ids, TimeSpan? update_interval = null, + IScheduler scheduler = null) + { + return _subscribe(ids, update_interval, scheduler); + } + public IObservable> subscribe_combined(IEnumerable ids, TimeSpan? update_interval = null, + IScheduler scheduler = null) + { + return _subscribe(ids, update_interval, scheduler); + } + + IObservable> _subscribe(IEnumerable ids, TimeSpan? update_interval = null, + IScheduler scheduler = null) where T : IMDData, IMDUpdate, new() + { + List> slots = ids.Where(ii => _data.TryGetValue(ii, out SecurityMD _)).Select(x => + { + _data.TryGetValue(x, out SecurityMD smd); + return new Slot(smd); + }).ToList(); + return timer_pump>((last_timer_tick, observer) => + { + List updates = new List(); + foreach (var slot in slots) + { + bool did_update = slot.data.update(slot.secmd, ref slot.last_update_time); + if (slot.last_update_time > last_timer_tick) + updates.Add(slot.data); + } + if(updates.Count > 0) + observer.OnNext(updates); + }, + update_interval, scheduler); + } + class Slot where T : IMDData, IMDUpdate, new() { public Slot(SecurityMD md) @@ -106,7 +148,7 @@ namespace bts.md IObservable timer_pump(Action> tick, TimeSpan? interval, IScheduler scheduler = null) { if(!interval.HasValue) - interval = TimeSpan.FromMilliseconds(100); + interval = TimeSpan.FromMilliseconds(_default_pump_ms); ulong last_update_time = 0; return Observable.Create(observer => { diff --git a/src/client/spark_api/utils/Authenticator.cs b/src/client/spark_api/utils/Authenticator.cs deleted file mode 100644 index 001defa86..000000000 --- a/src/client/spark_api/utils/Authenticator.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System; -using System.Threading.Tasks; -using bts.api; -using bts.api.core; - -namespace bts.api -{ - public class Authenticator - { - readonly static Lazy _auth = new Lazy(() => Locator.locate(), true); - AuthToken _token = null; - public Authenticator() { } - - public AuthToken last_token => _token; - public async Task login(string login, string password) - { - var res = await _auth.Value.authenticate_login_async(new user.AuthenticateLoginRequest { Login = login, Password = password }); - if (res.success) - _token = res.value.Token; - return _token; - } - } -} \ No newline at end of file diff --git a/src/client/spark_api/utils/Locator.cs b/src/client/spark_api/utils/Locator.cs index e86c98a05..a95cb9fb3 100644 --- a/src/client/spark_api/utils/Locator.cs +++ b/src/client/spark_api/utils/Locator.cs @@ -11,6 +11,11 @@ namespace bts.api public static T locate(string qualifier="") where T : class, IApiClient { return _context.Value.locate(qualifier); - } + } + static public async Task login(string username, string password) + { + return await _context.Value.login(username, password); + } + static public AuthTokenImmutable? token => _context.Value.token; } } diff --git a/src/client/spark_excel/rtd/formatting/BookMDFormatter.cs b/src/client/spark_excel/rtd/formatting/BookMDFormatter.cs index b676e4877..ceebff059 100644 --- a/src/client/spark_excel/rtd/formatting/BookMDFormatter.cs +++ b/src/client/spark_excel/rtd/formatting/BookMDFormatter.cs @@ -1,21 +1,22 @@ using System; +using bts.md; namespace bts.excel.rtd { class BookMDFormatter : IExcelFormatter { - readonly co2.ChannelUpdate _update; - public BookMDFormatter(co2.ChannelUpdate upd) + readonly IMDBook _update; + public BookMDFormatter(IMDBook upd) { _update = upd; } - public static double format_md(long mantissa, int exponent) + public object[,] format(bool include_headers = false) { - return mantissa * Math.Pow(10, exponent); + return format(_update, include_headers); } - public object[,] format(bool include_headers = false) + static public object[,] format(IMDBook update, bool include_headers = false) { const int cols = 5; const int rows = 30; @@ -24,21 +25,21 @@ namespace bts.excel.rtd for (int j = 0; j < cols; j++) ret[i, j] = string.Empty; - if (_update.Direct != null) + if (update != null) { int idx = 0; - for (int j = _update.Direct.Asks.Count - 1; j >= 0 && idx < rows; j--) + for (int j = update.asks.Count - 1; j >= 0 && idx < rows; j--) { - var ask = _update.Direct.Asks[j]; - ret[idx, 1] = format_md(ask.Mantissa, ask.Exponent); - ret[idx, 2] = ask.Size; + var ask = update.asks[j]; + ret[idx, 1] = ask.price; + ret[idx, 2] = ask.size; idx++; } - for (int j = 0; j < _update.Direct.Bids.Count && idx < rows; j++) + for (int j = 0; j < update.bids.Count && idx < rows; j++) { - var bid = _update.Direct.Bids[j]; - ret[idx, 1] = format_md(bid.Mantissa, bid.Exponent); - ret[idx, 0] = bid.Size; + var bid = update.bids[j]; + ret[idx, 1] = bid.price; + ret[idx, 0] = bid.size; idx++; } } diff --git a/src/client/spark_excel/rtd/formatting/FormatterFactory.cs b/src/client/spark_excel/rtd/formatting/FormatterFactory.cs index b4fcbd09e..eb718e228 100644 --- a/src/client/spark_excel/rtd/formatting/FormatterFactory.cs +++ b/src/client/spark_excel/rtd/formatting/FormatterFactory.cs @@ -1,4 +1,5 @@ using System; +using bts.md; namespace bts.excel.rtd { @@ -6,7 +7,7 @@ namespace bts.excel.rtd { public static IExcelFormatter make_formatter(object data) { - if(data is co2.ChannelUpdate upd) + if(data is IMDBook upd) return new BookMDFormatter(upd); else { diff --git a/src/client/spark_excel/rtd/formatting/MiscMDFormatter.cs b/src/client/spark_excel/rtd/formatting/MiscMDFormatter.cs index 6f7119b7d..5e79d6ae5 100644 --- a/src/client/spark_excel/rtd/formatting/MiscMDFormatter.cs +++ b/src/client/spark_excel/rtd/formatting/MiscMDFormatter.cs @@ -1,16 +1,22 @@ using System; +using bts.md; namespace bts.excel.rtd { class MiscMDFormatter : IExcelFormatter { - readonly co2.ChannelUpdate _update; - public MiscMDFormatter(co2.ChannelUpdate upd) + readonly IMDMisc _update; + public MiscMDFormatter(IMDMisc upd) { _update = upd; } public object[,] format(bool include_headers = false) + { + return format(_update, include_headers); + } + + static public object[,] format(IMDMisc update, bool include_headers = false) { return new object[0, 0]; } diff --git a/src/client/spark_excel/rtd/formatting/TopOfBookMDFormatter.cs b/src/client/spark_excel/rtd/formatting/TopOfBookMDFormatter.cs index 82cb46be8..9b29ea5e9 100644 --- a/src/client/spark_excel/rtd/formatting/TopOfBookMDFormatter.cs +++ b/src/client/spark_excel/rtd/formatting/TopOfBookMDFormatter.cs @@ -1,17 +1,22 @@ - using System; +using bts.md; namespace bts.excel.rtd { class TopOfBookMDFormatter : IExcelFormatter { - readonly co2.ChannelUpdate _update; - public TopOfBookMDFormatter(co2.ChannelUpdate upd) + readonly IMDBook _update; + public TopOfBookMDFormatter(IMDBook upd) { _update = upd; } public object[,] format(bool include_headers = false) + { + return format(_update, include_headers); + } + + static public object[,] format(IMDBook update, bool include_headers = false) { const int cols = 4; const int rows = 1; @@ -20,22 +25,22 @@ namespace bts.excel.rtd for (int j = 0; j < cols; j++) ret[i, j] = string.Empty; - if (_update.Direct != null) + if (update != null) { int idx = 0; - for (int j = 0; j < _update.Direct.Asks.Count && idx < rows; j++) + for (int j = 0; j < update.asks.Count && idx < rows; j++) { - var ask = _update.Direct.Asks[j]; - ret[idx, 2] = BookMDFormatter.format_md(ask.Mantissa, ask.Exponent); - ret[idx, 3] = ask.Size; + var ask = update.asks[j]; + ret[idx, 2] = ask.price; + ret[idx, 3] = ask.size; idx++; } idx = 0; - for (int j = 0; j < _update.Direct.Bids.Count && idx < rows; j++) + for (int j = 0; j < update.bids.Count && idx < rows; j++) { - var bid = _update.Direct.Bids[j]; - ret[idx, 1] = BookMDFormatter.format_md(bid.Mantissa, bid.Exponent); - ret[idx, 0] = bid.Size; + var bid = update.bids[j]; + ret[idx, 1] = bid.price; + ret[idx, 0] = bid.size; idx++; } } diff --git a/src/client/spark_excel/rtd/formatting/TopicMDFormatter.cs b/src/client/spark_excel/rtd/formatting/TopicMDFormatter.cs index 92af1f8a3..3338a70bb 100644 --- a/src/client/spark_excel/rtd/formatting/TopicMDFormatter.cs +++ b/src/client/spark_excel/rtd/formatting/TopicMDFormatter.cs @@ -1,86 +1,95 @@ using System; +using bts.md; namespace bts.excel.rtd { class TopicMDFormatter : IExcelFormatter { - readonly co2.ChannelUpdate _update; + readonly IMDCombined _update; readonly string _topic; - public TopicMDFormatter(co2.ChannelUpdate upd, string topic) + public TopicMDFormatter(IMDCombined upd, string topic) { _update = upd; _topic = topic; } public object[,] format(bool include_headers = false) + { + return format(_update, _topic, include_headers); + } + + static public object[,] format(IMDCombined update, string topic, bool include_headers = false) { var retval = new object[1, 1]; - switch (_topic.ToLower()) + if(update == null || string.IsNullOrEmpty(topic)) + return retval; + + switch (topic.ToLower()) { case "bid": case "bidprice": - retval[0, 0] = BookMDFormatter.format_md(_update?.Direct?.Bids?[0]?.Mantissa ?? 0, _update?.Direct?.Bids?[0]?.Exponent ?? 0); + retval[0, 0] = update.bids?[0]?.price; break; case "ask": case "askprice": - retval[0, 0] = BookMDFormatter.format_md(_update?.Direct?.Asks?[0]?.Mantissa ?? 0, _update?.Direct?.Asks?[0]?.Exponent ?? 0); + retval[0, 0] = update.asks?[0]?.price; break; case "bidsize": case "bidqty": - retval[0, 0] = _update?.Direct?.Bids?[0]?.Size; + retval[0, 0] = update.bids?[0]?.size; break; case "asksize": case "askqty": - retval[0, 0] = _update?.Direct?.Asks?[0]?.Size; + retval[0, 0] = update.asks?[0]?.size; break; case "impliedbid": case "impliedbidprice": - retval[0, 0] = BookMDFormatter.format_md(_update?.Implied?.Bids?[0]?.Mantissa ?? 0, _update?.Implied?.Bids?[0]?.Exponent ?? 0); + retval[0, 0] = update.bids?[0]?.price; //TODO is this the first price with impsz > 0? break; case "impliedask": case "impliedaskprice": - retval[0, 0] = BookMDFormatter.format_md(_update?.Implied?.Asks?[0]?.Mantissa ?? 0, _update?.Implied?.Asks?[0]?.Exponent ?? 0); + retval[0, 0] = update.asks?[0]?.price; break; case "impliedbidsize": case "impliedbidqty": - retval[0, 0] = _update?.Implied?.Bids?[0]?.Size; + retval[0, 0] = update.bids?[0]?.implied_size; break; case "impliedasksize": case "impliedaskqty": - retval[0, 0] = _update?.Implied?.Asks?[0]?.Size; + retval[0, 0] = update.asks?[0]?.implied_size; break; case "settlement": case "settlementprice": - retval[0, 0] = BookMDFormatter.format_md(_update?.Misc?.Settlement?.Mantissa ?? 0, _update?.Misc?.Settlement?.Exponent ?? 0); + retval[0, 0] = update.settlement_price; break; case "previoussettlement": case "previoussettlementprice": - retval[0, 0] = BookMDFormatter.format_md(_update?.Misc?.PreviousSettlementPrice?.Mantissa ?? 0, _update?.Misc?.PreviousSettlementPrice?.Exponent ?? 0); + retval[0, 0] = update.previous_settlement_price; break; case "open": case "openprice": - retval[0, 0] = _update?.Misc?.OpenPrice; + retval[0, 0] = update.open_price; break; case "close": case "closeprice": - retval[0, 0] = _update?.Misc?.ClosePrice; + retval[0, 0] = update.close_price; break; case "high": case "highprice": - retval[0, 0] = _update?.Misc?.SessionHigh; + retval[0, 0] = update.session_high; break; case "low": case "lowprice": - retval[0, 0] = _update?.Misc?.SessionLow; + retval[0, 0] = update.session_low; break; case "last": case "lastprice": - retval[0, 0] = BookMDFormatter.format_md(_update?.LastTrade?.Mantissa ?? 0, _update?.LastTrade?.Exponent ?? 0); + retval[0, 0] = update?.last.price; break; case "lastsize": case "lastqty": - retval[0, 0] = _update?.LastTrade?.Size; + retval[0, 0] = update?.last.size; break; } return retval; diff --git a/src/client/spark_excel/rtd/subscriptions/MDSubscribe.cs b/src/client/spark_excel/rtd/subscriptions/MDSubscribe.cs index 712cc5e91..6da9579b1 100644 --- a/src/client/spark_excel/rtd/subscriptions/MDSubscribe.cs +++ b/src/client/spark_excel/rtd/subscriptions/MDSubscribe.cs @@ -14,15 +14,19 @@ namespace bts.excel.rtd { public class MDSubscribe { - static Authenticator _auth = new Authenticator(); [ExcelFunction(Category = "BTS", Description = "Log in to BTS Spark")] async public static void spark_login(string login, string password, ExcelAsyncHandle handle) { try { - var toke = await _auth.login(login, password); - _md.set_auth_token(toke); - handle.SetResult(toke?.Token ?? "Could not log in check user/pass"); + var res = await Locator.login(login, password); + if (res && Locator.token.HasValue) + { + _md.set_auth_token(Locator.token); + handle.SetResult("Login Successful"); + } + else + handle.SetResult("Login Error: Could not log in check user/pass"); } catch(Exception ex) { @@ -62,10 +66,10 @@ namespace bts.excel.rtd if (string.IsNullOrEmpty(contract)) return Observable.Return("Can't Parse Contract: " + contract ?? string.Empty); - Product prod = new Product() { Exchange = ven, Type = sectype, Symbol = symbol }; - Func filter = (x => x.Glbx.SecurityDesc == contract); //TODO GLBX + Func where = (x => x.Exchange == ven && x.Symbol == symbol && x.security_type() == sectype && + x.HasGlbx && x.Glbx.SecurityDesc == contract); - var stream = market_data(ven).subscribe(prod).Where(x => filter(x.Security)); + var stream = market_data(ven).subscribe_combined(where); return stream; } @@ -81,8 +85,8 @@ namespace bts.excel.rtd return ObservableRtdUtil.Observe(nameof(spark_md_book), param, () => md_observable(contract, symbol, security_type, exchange).Select(x => { - if (x is co2.ChannelUpdate upd) - return new BookMDFormatter(upd).format(); + if (x is IMDBook upd) + return BookMDFormatter.format(upd); return x; })); // security_type = string.IsNullOrEmpty(security_type) ? SecurityType.Future.ToString() : security_type; @@ -107,8 +111,8 @@ namespace bts.excel.rtd return ObservableRtdUtil.Observe(nameof(spark_md_top_of_book), param, () => md_observable(contract, symbol, security_type, exchange).Select(x => { - if (x is co2.ChannelUpdate upd) - return new TopOfBookMDFormatter(upd).format(); + if (x is IMDBook upd) + return TopOfBookMDFormatter.format(upd); return x; })); } @@ -124,8 +128,8 @@ namespace bts.excel.rtd return ObservableRtdUtil.Observe(nameof(spark_md_misc), param, () => md_observable(contract, symbol, security_type, exchange).Select(x => { - if (x is co2.ChannelUpdate upd) - return new MiscMDFormatter(upd).format(); + if (x is IMDMisc upd) + return MiscMDFormatter.format(upd); return x; })); @@ -143,8 +147,8 @@ namespace bts.excel.rtd return ObservableRtdUtil.Observe(nameof(spark_md), param, () => md_observable(contract, symbol, security_type, exchange).Select(x => { - if (x is co2.ChannelUpdate upd) - return new TopicMDFormatter(upd, topic).format(); + if (x is IMDCombined upd) + return TopicMDFormatter.format(upd, topic); return x; })); } diff --git a/src/client/spark_sdk/samples/MarketDataSample.cs b/src/client/spark_sdk/samples/MarketDataSample.cs index 6d4dd0146..11995514f 100644 --- a/src/client/spark_sdk/samples/MarketDataSample.cs +++ b/src/client/spark_sdk/samples/MarketDataSample.cs @@ -9,8 +9,7 @@ using System.Reactive.Concurrency; using bts.api; using bts.api.core; -using bts.co2; -using bts.api.md; +using bts.md; namespace bts.sdk { @@ -24,7 +23,7 @@ namespace bts.sdk _md = client; } - void print_update(ChannelUpdate update) + void print_update(IMDData update) { Console.WriteLine(update.ToString()); Console.WriteLine(); @@ -46,12 +45,14 @@ namespace bts.sdk return st; } - public void print_channel(string exch, string sectype, string symbol) + public void print_product(string exch, string sectype, string symbol) { Venue ven = parse_venue(exch); SecurityType st = parse_security_type(sectype); Product prod = new Product() { Exchange = ven, Type = st, Symbol = symbol }; - _disps.Add(_md.subscribe(prod).Subscribe(x => + Func where = (x => x.Exchange == ven && x.Symbol == symbol && x.security_type() == st); + + _disps.Add(_md.subscribe_combined(where).Subscribe(x => { print_update(x); })); @@ -61,11 +62,11 @@ namespace bts.sdk { Venue ven = parse_venue(exch); SecurityType st = parse_security_type(sectype); - Product prod = new Product() { Exchange = ven, Type = st, Symbol = symbol }; - Func filter = (x => x.Glbx.SecurityDesc == security_desc); - //if you have a security_id, we could make a more specifics subscription, but this is a command line driver.... - _disps.Add(_md.subscribe(prod).Where(x => filter(x.Security)).Subscribe(x => + Func where = (x => x.Exchange == ven && x.Symbol == symbol && x.security_type() == st && + x.HasGlbx && x.Glbx.SecurityDesc == security_desc); + + _disps.Add(_md.subscribe_combined(where).Subscribe(x => { print_update(x); })); diff --git a/src/client/spark_sdk/samples/OrderSample.cs b/src/client/spark_sdk/samples/OrderSample.cs index 186041c1a..0c6735ff2 100644 --- a/src/client/spark_sdk/samples/OrderSample.cs +++ b/src/client/spark_sdk/samples/OrderSample.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; using System.Reactive.Linq; using bts.api; -using bts.api.md; +using bts.md; using bts.api.core; using bts.api.orderman; using bts.api.user; @@ -58,7 +58,7 @@ namespace bts.sdk else cr.NewOrder.CustomDef = new CustomOrderDefinition() { Market = new MarketOrderDefinition() }; var sec = await _md.find_security_async(x => x.Glbx.SecurityDesc == security_desc.ToUpper()); - cr.NewOrder.SecurityKey = sec.Id; + cr.NewOrder.SecurityKey = sec.Value.Id; Result resp = await _orders.Value.create_order_async(cr); print_update(resp); if(resp.value != null) diff --git a/src/client/spark_sdk/samples/SDKMain.cs b/src/client/spark_sdk/samples/SDKMain.cs index 3e7670e48..0ec5087b5 100644 --- a/src/client/spark_sdk/samples/SDKMain.cs +++ b/src/client/spark_sdk/samples/SDKMain.cs @@ -6,7 +6,7 @@ using System.Reactive.Disposables; using bts.api; using bts.api.core; -using bts.api.md; +using bts.md; namespace bts.sdk { @@ -14,10 +14,8 @@ namespace bts.sdk public class SDKMain { private static void user_test() - { - var ctx = new ServiceContext(); - - var s = ctx.locate(); + { + var s = Locator.locate(); var r = new api.user.GetUsersRequest(); var resp = s.get_users(r); Console.WriteLine("{0}", resp); @@ -31,7 +29,12 @@ namespace bts.sdk } else { - MarketDataClient client = new MarketDataClient(); + uint ms = 100; + string p = args.FirstOrDefault(x => x.Contains("--pump=")); + if (p != null) + ms = uint.Parse(p.Replace("--pump=", string.Empty)); + + MarketDataClient client = new MarketDataClient(ms); CompositeDisposable disp = new CompositeDisposable(client); if (args.FirstOrDefault() == "ui") { @@ -56,7 +59,7 @@ namespace bts.sdk } else if (args.Length >= 4) { - s.print_channel(args[1], args[2], args[3]); + s.print_product(args[1], args[2], args[3]); } else md_help(); @@ -73,11 +76,6 @@ namespace bts.sdk else help(); - int ms = 100; - string p = args.FirstOrDefault(x => x.Contains("--pump=")); - if (p != null) - ms = int.Parse(p.Replace("--pump=", string.Empty)); - client.run_pump(TimeSpan.FromMilliseconds(ms)); wait_for_stop(disp); } } diff --git a/src/client/spark_sdk/samples/UISample.cs b/src/client/spark_sdk/samples/UISample.cs index 6b8660454..97ae9fded 100644 --- a/src/client/spark_sdk/samples/UISample.cs +++ b/src/client/spark_sdk/samples/UISample.cs @@ -2,7 +2,7 @@ using System; using System.Linq; using bts.api; -using bts.api.md; +using bts.md; namespace bts.sdk.ui { diff --git a/src/client/spark_sdk/uisamples/SparkSDKUI.cs b/src/client/spark_sdk/uisamples/SparkSDKUI.cs index 9b56d2604..fadb12e0a 100644 --- a/src/client/spark_sdk/uisamples/SparkSDKUI.cs +++ b/src/client/spark_sdk/uisamples/SparkSDKUI.cs @@ -11,7 +11,7 @@ using System.Threading.Tasks; using System.Windows.Forms; using bts.api; -using bts.api.md; +using bts.md; namespace bts.sdk.ui { From 70db5ceb10a95581885d153efe59a31049088dca Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Mon, 10 Dec 2018 12:19:16 -0500 Subject: [PATCH 064/107] added spark_md_last to excel --- .../rtd/formatting/LastMDFormatter.cs | 35 +++++++++++++++++++ .../rtd/subscriptions/MDSubscribe.cs | 22 ++++++++++-- 2 files changed, 55 insertions(+), 2 deletions(-) create mode 100644 src/client/spark_excel/rtd/formatting/LastMDFormatter.cs diff --git a/src/client/spark_excel/rtd/formatting/LastMDFormatter.cs b/src/client/spark_excel/rtd/formatting/LastMDFormatter.cs new file mode 100644 index 000000000..5c1bfca4c --- /dev/null +++ b/src/client/spark_excel/rtd/formatting/LastMDFormatter.cs @@ -0,0 +1,35 @@ +using System; +using bts.md; + +namespace bts.excel.rtd +{ + class LastMDFormatter : IExcelFormatter + { + readonly IMDLast _update; + public LastMDFormatter(IMDLast upd) + { + _update = upd; + } + + public object[,] format(bool include_headers = false) + { + return format(_update, include_headers); + } + + static public object[,] format(IMDLast update, bool include_headers = false) + { + const int cols = 3; + const int rows = 1; + var ret = new object[rows, cols]; + + if (update != null) + { + ret[0, 0] = update.last?.price; + ret[0, 1] = update.last?.size; + ret[0, 1] = update.last_time; + } + return ret; + } + } + +} \ No newline at end of file diff --git a/src/client/spark_excel/rtd/subscriptions/MDSubscribe.cs b/src/client/spark_excel/rtd/subscriptions/MDSubscribe.cs index 6da9579b1..bf73fae89 100644 --- a/src/client/spark_excel/rtd/subscriptions/MDSubscribe.cs +++ b/src/client/spark_excel/rtd/subscriptions/MDSubscribe.cs @@ -115,7 +115,25 @@ namespace bts.excel.rtd return TopOfBookMDFormatter.format(upd); return x; })); - } + } + + [ExcelFunction(Category = "BTS", Description = "Subscribe to BTS Spark last trade market data")] + public static object spark_md_last( + [ExcelArgument("Required. The specific contract, GCZ8 or ZNU8-ZNZ8, etc")] string contract, + [ExcelArgument("Required. The symbol, GC or ZN, etc")] string symbol, + [ExcelArgument("Optional. The type, Future or Spread, default = Future")] string security_type = null, + [ExcelArgument("Optional. The exchange, default = GLBX")] string exchange = null) + { + var param = new object[] { contract, symbol, security_type, exchange }; + return ObservableRtdUtil.Observe(nameof(spark_md_last), param, + () => md_observable(contract, symbol, security_type, exchange).Select(x => + { + if (x is IMDLast upd) + return LastMDFormatter.format(upd); + return x; + })); + + } [ExcelFunction(Category = "BTS", Description = "Subscribe to BTS Spark miscellaneous market data")] public static object spark_md_misc( @@ -135,7 +153,7 @@ namespace bts.excel.rtd } - [ExcelFunction(Category = "BTS", Description = "Subscribe to BTS Spark top of book market data")] + [ExcelFunction(Category = "BTS", Description = "Subscribe to BTS Spark topic based market data")] public static object spark_md( [ExcelArgument("Required. The 'Topic' string, 'bid', 'ask', etc")] string topic, [ExcelArgument("Required. The specific contract, GCZ8 or ZNU8-ZNZ8, etc")] string contract, From 70570164c70c2c67ccb0aec4663db001529c5187 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Mon, 10 Dec 2018 14:58:21 -0600 Subject: [PATCH 065/107] show/hide tab, protos and settings --- .../spark/view/Spark/Ladder/LadderSettings.cs | 86 ++++++++++++++++- .../view/Spark/Ladder/LadderSettingsVM.cs | 80 ++++++++++++++++ .../view/Spark/Ladder/LadderSettingsView.xaml | 62 +++++++++++++ .../spark/view/Spark/Ladder/LadderVM.cs | 39 +++++++- .../spark/view/Spark/Ladder/LadderView.xaml | 93 ++++++++++++++----- 5 files changed, 334 insertions(+), 26 deletions(-) diff --git a/src/client/spark/view/Spark/Ladder/LadderSettings.cs b/src/client/spark/view/Spark/Ladder/LadderSettings.cs index 39a528650..bc5c33816 100644 --- a/src/client/spark/view/Spark/Ladder/LadderSettings.cs +++ b/src/client/spark/view/Spark/Ladder/LadderSettings.cs @@ -216,7 +216,22 @@ namespace mbts.spark { session_high_line = new LadderMarketBreakLine { color = BTSColors.MarketData.session_high, show = true }, session_range_fill = new LadderMarketBreakLine { color = BTSColors.MarketData.session_range_fill, show = true }, alternate_order_size = 0, - size_display = MarketSizeDisplay.get_default() + size_display = MarketSizeDisplay.get_default(), + day_visible = true, + high_visible = true, + low_visible = true, + open_visible = true, + settle_visible = true, + volume_visible = true, + account_visible = true, + tif_visible = true, + order_type_visible = true, + account_position_visible = true, + size_presets_visible = true, + cancel_buys_visible = true, + cancel_sells_visible = true, + cancel_all_visible = true, + auto_clear_visible = true }; } } @@ -278,6 +293,39 @@ namespace mbts.spark { [ProtoMember(26)] public MarketSizeDisplay size_display { get; set; } + // order entry panel items show/hide + [ProtoMember(27)] + public bool day_visible { get; set; } + [ProtoMember(28)] + public bool high_visible { get; set; } + [ProtoMember(29)] + public bool low_visible { get; set; } + [ProtoMember(30)] + public bool open_visible { get; set; } + [ProtoMember(31)] + public bool settle_visible { get; set; } + [ProtoMember(32)] + public bool volume_visible { get; set; } + [ProtoMember(33)] + public bool account_visible { get; set; } + [ProtoMember(34)] + public bool tif_visible { get; set; } + [ProtoMember(35)] + public bool order_type_visible { get; set; } + [ProtoMember(36)] + public bool account_position_visible { get; set; } + [ProtoMember(37)] + public bool size_presets_visible { get; set; } + [ProtoMember(38)] + public bool cancel_buys_visible { get; set; } + [ProtoMember(39)] + public bool cancel_sells_visible { get; set; } + [ProtoMember(40)] + public bool cancel_all_visible { get; set; } + [ProtoMember(41)] + public bool auto_clear_visible { get; set; } + + public bool Equals(LadderSettings other) => other != null && row_height == other.row_height && @@ -302,7 +350,23 @@ namespace mbts.spark { session_high_line.safe_equals(other.session_high_line) && session_range_fill.safe_equals(other.session_range_fill) && volume_column.safe_equals(other.volume_column) && - size_display.safe_equals(other.size_display); + size_display.safe_equals(other.size_display) && + day_visible == other.day_visible && + high_visible == other.high_visible && + low_visible == other.low_visible && + open_visible == other.open_visible && + settle_visible == other.settle_visible && + volume_visible == other.volume_visible && + account_visible == other.account_visible && + tif_visible == other.tif_visible && + order_type_visible == other.order_type_visible && + account_position_visible == other.account_position_visible && + size_presets_visible == other.size_presets_visible && + cancel_buys_visible == other.cancel_buys_visible && + cancel_sells_visible == other.cancel_sells_visible && + cancel_all_visible == other.cancel_all_visible && + auto_clear_visible == other.auto_clear_visible + ; public override bool Equals(object obj) => Equals(obj as LadderSettings); @@ -330,7 +394,23 @@ namespace mbts.spark { EqualityComparer.safe_get_hash_code(session_high_line), EqualityComparer.safe_get_hash_code(session_range_fill), EqualityComparer.safe_get_hash_code(volume_column), - EqualityComparer.safe_get_hash_code(size_display)); + EqualityComparer.safe_get_hash_code(size_display), + day_visible.GetHashCode(), + high_visible.GetHashCode(), + low_visible.GetHashCode(), + open_visible.GetHashCode(), + settle_visible.GetHashCode(), + volume_visible.GetHashCode(), + account_visible.GetHashCode(), + tif_visible.GetHashCode(), + order_type_visible.GetHashCode(), + account_position_visible.GetHashCode(), + size_presets_visible.GetHashCode(), + cancel_buys_visible.GetHashCode(), + cancel_sells_visible.GetHashCode(), + cancel_all_visible.GetHashCode(), + auto_clear_visible.GetHashCode() + ); } static class LadderSettingsExtensions { diff --git a/src/client/spark/view/Spark/Ladder/LadderSettingsVM.cs b/src/client/spark/view/Spark/Ladder/LadderSettingsVM.cs index 4047a6ca4..91c79599b 100644 --- a/src/client/spark/view/Spark/Ladder/LadderSettingsVM.cs +++ b/src/client/spark/view/Spark/Ladder/LadderSettingsVM.cs @@ -32,6 +32,23 @@ namespace mbts.spark { _session_low_mkt_line = new LadderMarketBreakLineVM("Session Low", 2, 1), _session_high_mkt_line = new LadderMarketBreakLineVM("Session High", 2, 1, false), _session_range_fill = new LadderMarketBreakLineVM("Session Range", 0, 0, false); + OrderEntryPanelItemVisibilityVM + _day_visibility = new OrderEntryPanelItemVisibilityVM("Day Change"), + _high_visibility = new OrderEntryPanelItemVisibilityVM("High"), + _low_visibility = new OrderEntryPanelItemVisibilityVM("Low"), + _open_visibility = new OrderEntryPanelItemVisibilityVM("Open"), + _settle_visibility = new OrderEntryPanelItemVisibilityVM("Settle"), + _volume_visibility = new OrderEntryPanelItemVisibilityVM("Volume"), + _account_visibility = new OrderEntryPanelItemVisibilityVM("Account"), + _tif_visibility = new OrderEntryPanelItemVisibilityVM("Time In Force"), + _order_type_visibility = new OrderEntryPanelItemVisibilityVM("Order Type"), + _account_position_visibility = new OrderEntryPanelItemVisibilityVM("Account Position"), + _size_preset_visibility = new OrderEntryPanelItemVisibilityVM("Size Presets"), + _auto_clear_visibility = new OrderEntryPanelItemVisibilityVM("Auto Clear"), + _cancel_buys_visibility = new OrderEntryPanelItemVisibilityVM("Cancel Buys"), + _cancel_sells_visibility = new OrderEntryPanelItemVisibilityVM("Cancel Sells"), + _cancel_all_visibility = new OrderEntryPanelItemVisibilityVM("Cancel All"); + public LadderSettingsVM(bool is_synthetic) { this.is_synthetic = is_synthetic; @@ -108,6 +125,26 @@ namespace mbts.spark { } } + public IEnumerable order_entry_panel_items { + get { + yield return _day_visibility; + yield return _high_visibility; + yield return _low_visibility; + yield return _open_visibility; + yield return _settle_visibility; + yield return _volume_visibility; + yield return _account_visibility; + yield return _tif_visibility; + yield return _order_type_visibility; + yield return _account_position_visibility; + yield return _size_preset_visibility; + yield return _auto_clear_visibility; + yield return _cancel_buys_visibility; + yield return _cancel_sells_visibility; + yield return _cancel_all_visibility; + } + } + public string key => GridOrLadderSettingsSelectorKeys.Ladder; public void load(LadderSettings settings) { @@ -128,6 +165,21 @@ namespace mbts.spark { _session_low_mkt_line.assign_from(_current.session_low_line); _session_high_mkt_line.assign_from(_current.session_high_line); _session_range_fill.assign_from(_current.session_range_fill); + _day_visibility.show = settings.day_visible; + _high_visibility.show = settings.high_visible; + _low_visibility.show = settings.low_visible; + _open_visibility.show = settings.open_visible; + _settle_visibility.show = settings.settle_visible; + _volume_visibility.show = settings.volume_visible; + _account_visibility.show = settings.account_visible; + _tif_visibility.show = settings.tif_visible; + _order_type_visibility.show = settings.order_type_visible; + _account_position_visibility.show = settings.account_position_visible; + _size_preset_visibility.show = settings.size_presets_visible; + _auto_clear_visibility.show = settings.auto_clear_visible; + _cancel_buys_visibility.show = settings.cancel_buys_visible; + _cancel_sells_visibility.show = settings.cancel_sells_visible; + _cancel_all_visibility.show = settings.cancel_all_visible; } public LadderSettings get_result() { @@ -149,6 +201,21 @@ namespace mbts.spark { clone.session_high_line = _session_high_mkt_line.get_settings(); clone.session_range_fill = _session_range_fill.get_settings(); clone.row_height = LadderRender.measure_row_height(clone); + clone.day_visible = _day_visibility.show; + clone.high_visible = _high_visibility.show; + clone.low_visible = _low_visibility.show; + clone.open_visible = _open_visibility.show; + clone.settle_visible = _settle_visibility.show; + clone.volume_visible = _volume_visibility.show; + clone.account_visible = _account_visibility.show; + clone.tif_visible = _tif_visibility.show; + clone.order_type_visible = _order_type_visibility.show; + clone.account_position_visible = _account_position_visibility.show; + clone.size_presets_visible = _size_preset_visibility.show; + clone.auto_clear_visible = _auto_clear_visibility.show; + clone.cancel_buys_visible = _cancel_buys_visibility.show; + clone.cancel_sells_visible = _cancel_sells_visibility.show; + clone.cancel_all_visible = _cancel_all_visibility.show; return clone; } @@ -276,6 +343,19 @@ namespace mbts.spark { }; } + public class OrderEntryPanelItemVisibilityVM : ViewModelBase { + readonly Property _show; + + public OrderEntryPanelItemVisibilityVM(string name) { + this.name = name; + _show = backing(nameof(show), true); + } + + public string name { get; } + public bool show { get => _show.Value; set => _show.Value = value; } + + } + public class VolumeColumnVM : ViewModelBase { readonly DelegateProperty _any_visible; public VolumeColumnVM() { diff --git a/src/client/spark/view/Spark/Ladder/LadderSettingsView.xaml b/src/client/spark/view/Spark/Ladder/LadderSettingsView.xaml index eeceec542..5e4c7777f 100644 --- a/src/client/spark/view/Spark/Ladder/LadderSettingsView.xaml +++ b/src/client/spark/view/Spark/Ladder/LadderSettingsView.xaml @@ -140,6 +140,7 @@ + @@ -232,6 +233,7 @@ + @@ -350,6 +352,7 @@ + @@ -440,6 +443,7 @@ + @@ -557,6 +561,7 @@ + @@ -592,6 +597,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/client/spark/view/Spark/Ladder/LadderVM.cs b/src/client/spark/view/Spark/Ladder/LadderVM.cs index 905b5c072..c6bd4320f 100644 --- a/src/client/spark/view/Spark/Ladder/LadderVM.cs +++ b/src/client/spark/view/Spark/Ladder/LadderVM.cs @@ -24,7 +24,9 @@ namespace mbts.spark { readonly LadderModel _model; readonly Property _high, _low, _change, _open, _settlement, _position; readonly Property _volume; - readonly Property _auto_clear; + readonly Property _auto_clear, _show_day, _show_high, _show_low, _show_open, _show_settle, _show_volume, _show_account, + _show_tif, _show_order_type, _show_account_position, _show_size_preset, _show_auto_clear, _show_cancel_buys, + _show_cancel_sells, _show_cancel_all; readonly Property _bid_background, _bid_foreground, _ask_background, _ask_foreground; IWindowSettingsManager _settings_manager; ulong _misc_time = 0; @@ -58,6 +60,26 @@ namespace mbts.spark { _ask_foreground = brush_prop(nameof(ask_foreground), s => s.ask_column.foreground.rgb_brush()); Property brush_prop(string name, Func get_brush) => backing(name, settings_manager.subscribe_current().OnDispatcher(), get_brush); + // bool visibility props + _show_day = bool_prop(nameof(show_day), s => s.day_visible); + _show_high = bool_prop(nameof(show_high), s => s.high_visible); + _show_low = bool_prop(nameof(show_low), s => s.low_visible); + _show_open = bool_prop(nameof(show_open), s => s.open_visible); + _show_settle = bool_prop(nameof(show_settle), s => s.settle_visible); + _show_volume = bool_prop(nameof(show_volume), s => s.volume_visible); + _show_account = bool_prop(nameof(show_account), s => s.account_visible); + _show_tif = bool_prop(nameof(show_tif), s => s.tif_visible); + _show_order_type = bool_prop(nameof(show_order_type), s => s.order_type_visible); + _show_account_position = bool_prop(nameof(show_account_position), s => s.account_position_visible); + _show_size_preset = bool_prop(nameof(show_size_preset), s => s.size_presets_visible); + _show_auto_clear = bool_prop(nameof(show_auto_clear), s => s.auto_clear_visible); + _show_cancel_buys = bool_prop(nameof(show_cancel_buys), s => s.cancel_buys_visible); + _show_cancel_sells = bool_prop(nameof(show_cancel_sells), s => s.cancel_sells_visible); + _show_cancel_all = bool_prop(nameof(show_cancel_all), s => s.cancel_all_visible); + + Property bool_prop(string name, Func get_bool) => + backing(name, settings_manager.subscribe_current().OnDispatcher(), get_bool); + // position_click_command = new DelegateCommand(() => size_calculator.value = DoubleHelper.safe_convert_to_uint(Math.Abs(position))); send_order_command = new DelegateCommand<(double price, Side? side, bool size_from_alternate)>(send_order); @@ -233,6 +255,21 @@ namespace mbts.spark { public Brush ask_background => _ask_background.Value; public Brush ask_foreground => _ask_foreground.Value; public DialogCommand settings_command { get; } + public bool show_day { get => _show_day.Value; set => _show_day.set(value); } + public bool show_high { get => _show_high.Value; set => _show_high.set(value); } + public bool show_low { get => _show_low.Value; set => _show_low.set(value); } + public bool show_open { get => _show_open.Value; set => _show_open.set(value); } + public bool show_settle { get => _show_settle.Value; set => _show_settle.set(value); } + public bool show_volume { get => _show_volume.Value; set => _show_volume.set(value); } + public bool show_account { get => _show_account.Value; set => _show_account.set(value); } + public bool show_tif { get => _show_tif.Value; set => _show_tif.set(value); } + public bool show_order_type { get => _show_order_type.Value; set => _show_order_type.set(value); } + public bool show_account_position { get => _show_account_position.Value; set => _show_account_position.set(value); } + public bool show_size_preset { get => _show_size_preset.Value; set => _show_size_preset.set(value); } + public bool show_auto_clear { get => _show_auto_clear.Value; set => _show_auto_clear.set(value); } + public bool show_cancel_buys { get => _show_cancel_buys.Value; set => _show_cancel_buys.set(value); } + public bool show_cancel_sells { get => _show_cancel_sells.Value; set => _show_cancel_sells.set(value); } + public bool show_cancel_all { get => _show_cancel_all.Value; set => _show_cancel_all.set(value); } internal LadderModel model => _model; internal IObservable settings => _settings_manager.subscribe_current(); diff --git a/src/client/spark/view/Spark/Ladder/LadderView.xaml b/src/client/spark/view/Spark/Ladder/LadderView.xaml index 68c43b28f..67084a98d 100644 --- a/src/client/spark/view/Spark/Ladder/LadderView.xaml +++ b/src/client/spark/view/Spark/Ladder/LadderView.xaml @@ -307,14 +307,12 @@ - - - - - - - - + + + @@ -322,7 +320,11 @@ - + + + @@ -330,7 +332,11 @@ - + + + @@ -338,7 +344,11 @@ - + + + @@ -346,7 +356,11 @@ - + + + @@ -354,16 +368,31 @@ - + + + - - + + + + + + + - + + @@ -404,26 +442,37 @@ + - - Auto Clear + + + Auto Clear + + -