From 5e1fd41935eb58af2a2787c6ce1ef170bfb5eeb6 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Sat, 24 Nov 2018 20:26:39 +0000 Subject: [PATCH] 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