From 5bed54c953f31371cfe9ddd13b34dac253bd1875 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Fri, 8 Feb 2019 09:10:01 -0500 Subject: [PATCH] More SDK work. --- src/lib/CMakeDeps.cmake | 2 +- src/lib/api/services/OrderService.proto | 1 + .../actors/order_manager/OrderBuilder.h | 14 +- src/lib/orderman/core/IOrderServices.cpp | 2 +- .../orderman/order_factory/IOrderFactory.h | 2 + src/lib/orderman/orders/IcebergOrder.cpp | 2 +- src/lib/orderman/orders/IcebergOrder2.cpp | 160 ++++++++++++++++++ src/lib/orderman/orders/IcebergOrder2.h | 53 ++++++ src/lib/orderman/orders/TimeBoxOrder.cpp | 2 +- src/lib/orderman/orders/TriggerOrder.cpp | 2 +- .../orderman/orders/book_algos/BookAlgo.cpp | 4 +- .../SpreaderOrderBuilder.cpp | 4 +- src/sdk/examples/order_plugin_example.cpp | 2 +- 13 files changed, 238 insertions(+), 12 deletions(-) create mode 100644 src/lib/orderman/orders/IcebergOrder2.cpp create mode 100644 src/lib/orderman/orders/IcebergOrder2.h diff --git a/src/lib/CMakeDeps.cmake b/src/lib/CMakeDeps.cmake index e3785a74c..87295f644 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/AuthService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/core/IOrderServices.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/IcebergOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/CoverOrder.cpp;orderman/orders/book_algos/JoinOrder.cpp;orderman/orders/book_algos/LeanOrder.cpp;orderman/orders/book_algos/OffsetOrder.cpp;orderman/orders/book_algos/TickOrder.cpp;orderman/orders/book_algos/TopOrder.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegFillState.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/HedgerManager.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;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;tracing/PerfLog.cpp;tracing/bts_trace.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/thread_manager.cpp) \ No newline at end of file +set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/core/IOrderServices.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/IcebergOrder.cpp;orderman/orders/IcebergOrder2.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/LegFillState.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/HedgerManager.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;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;tracing/PerfLog.cpp;tracing/bts_trace.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/thread_manager.cpp) \ No newline at end of file diff --git a/src/lib/api/services/OrderService.proto b/src/lib/api/services/OrderService.proto index ee6acddbf..23637e201 100644 --- a/src/lib/api/services/OrderService.proto +++ b/src/lib/api/services/OrderService.proto @@ -109,6 +109,7 @@ message StopLimitOrderDefinition { } message IcebergOrderDefinition { double show_quantity = 1; + uint32 pause_between_orders_ms = 3; CustomOrderDefinition child = 2; } message SpreaderOrderDefinition { diff --git a/src/lib/orderman/actors/order_manager/OrderBuilder.h b/src/lib/orderman/actors/order_manager/OrderBuilder.h index 1a446d59e..92b1a1161 100644 --- a/src/lib/orderman/actors/order_manager/OrderBuilder.h +++ b/src/lib/orderman/actors/order_manager/OrderBuilder.h @@ -21,7 +21,7 @@ class OrderBuilder { OrderBuilder(OrderBuilder &&src) { operator=(std::move(src)); } OrderBuilder(OrderKey parent_key, api::orderman::OrderDefinition const &def, - PreActivationOrderServices const &srv, size_t reserve_sz = 1) + IOrderFactory &factory, size_t reserve_sz = 1) : _parent_key(parent_key), _definition(def), _reserve_sz(reserve_sz), _order_stash(), _builder_id(++_current_builder_id), _order_services(nullptr) @@ -30,7 +30,17 @@ class OrderBuilder { bts_assert(parent_key != null_order_key()); while (_order_stash.size() != reserve_sz) _order_stash.push_back( - &srv.order_factory.create(parent_key, _definition)); + &factory.create(parent_key, _definition)); + } + + OrderBuilder(OrderKey parent_key, api::orderman::OrderDefinition const &def, + size_t reserve_sz = 1) + : _parent_key(parent_key), _definition(def), _reserve_sz(reserve_sz), + _order_stash(), _builder_id(++_current_builder_id), + _order_services(nullptr) + + { + bts_assert(parent_key != null_order_key()); } void activate(OrderServices &order_services) { diff --git a/src/lib/orderman/core/IOrderServices.cpp b/src/lib/orderman/core/IOrderServices.cpp index 47bb48912..d2640c03f 100644 --- a/src/lib/orderman/core/IOrderServices.cpp +++ b/src/lib/orderman/core/IOrderServices.cpp @@ -1 +1 @@ -#include "lib/orderman/core/IOrderServices.h" +//#include "lib/orderman/core/IOrderServices.h" diff --git a/src/lib/orderman/order_factory/IOrderFactory.h b/src/lib/orderman/order_factory/IOrderFactory.h index 70557bf26..80cc9207b 100644 --- a/src/lib/orderman/order_factory/IOrderFactory.h +++ b/src/lib/orderman/order_factory/IOrderFactory.h @@ -18,6 +18,8 @@ namespace orderman { inline OrderKey null_order_key() {return OrderKey(0);} + + class IOrderFactory { public: diff --git a/src/lib/orderman/orders/IcebergOrder.cpp b/src/lib/orderman/orders/IcebergOrder.cpp index a8a57e1e8..a9a80020d 100644 --- a/src/lib/orderman/orders/IcebergOrder.cpp +++ b/src/lib/orderman/orders/IcebergOrder.cpp @@ -68,7 +68,7 @@ void IcebergOrder::on_init_new(api::orderman::OrderDefinition const &def, *child_def.mutable_custom_def() = iceberg_def.child(); if (me->show_quantity.value() != 0) { me->child_builder = OrderBuilder( - key(), child_def, services, + key(), child_def, services.order_factory, std::max((size_t)1, (size_t)(me->show_quantity).value() / 10)); transition(ORDER_STATUS_INACTIVE); } else { diff --git a/src/lib/orderman/orders/IcebergOrder2.cpp b/src/lib/orderman/orders/IcebergOrder2.cpp new file mode 100644 index 000000000..b1a782911 --- /dev/null +++ b/src/lib/orderman/orders/IcebergOrder2.cpp @@ -0,0 +1,160 @@ +// #include "IcebergOrder2.h" +// #include "lib/orderman/actors/order_manager/ChildOrder.h" +// #include "lib/orderman/actors/order_manager/OrderBuilder.h" + +// namespace bts { +// namespace orderman { + +// using namespace api::orderman; + +// enum class IcebergOrder2::State { PAUSED, WORKING, COMPLETED }; + +// struct IcebergOrder2::ActiveChild { +// ActiveChild() {} +// ChildOrder order; + +// OrderState state; +// OrderKey key; +// void clear() { +// state = OrderState(); +// key = null_order_key(); +// } +// }; + +// struct IcebergOrder2::PImpl { +// OrderServices *services = nullptr; +// OrderDefinition def; +// OrderState order_state; +// OrderBuilder child_builder; +// ActiveChild child; +// State state = State::PAUSED; +// TimeStamp start_of_pause = Timer::now(); +// uint32_t ms_pause_between_orders = 0; +// }; + +// IcebergOrder2::IcebergOrder2() : me(new PImpl()) {} +// IcebergOrder2::~IcebergOrder2() {} + +// void IcebergOrder2::on_init_new(OrderDefinition const &def, +// const PreActivationOrderServices &services) { +// // Save our order definition +// me->def = def; + +// // Initialize mutable iceberg component of our state report +// me->order_state.mutable_iceberg(); + +// auto &ib = iceberg_def(); + +// if (ib.show_quantity() == 0) { +// transition(State::COMPLETED, ORDER_STATUS_REJECTED_BY_SPARK, +// "Show quantity must be greater than 0"); +// return; +// } + +// initialize_child_builder(services.order_factory); +// } + +// void IcebergOrder2::on_init_recovered(OrderRecord const &rec, +// const PreActivationOrderServices &) { +// auto const &def = rec.def(); +// me->def = def; +// me->order_state = rec.state(); + +// switch (me->order_state.status()) { + +// case ORDER_STATUS_WORKING: +// case ORDER_STATUS_DISCONNECTED: +// transition(State::COMPLETED, ORDER_STATUS_REJECTED_BY_SPARK, +// "System restarted with active iceberg order"); +// break; + +// // terminal states +// case ORDER_STATUS_ERROR: +// case ORDER_STATUS_REJECTED_BY_SPARK: +// case ORDER_STATUS_COMPLETED: +// case ORDER_STATUS_CANCELED: +// transition(State::COMPLETED, rec.state().status(), +// rec.state().last_msg()); +// break; + +// case ORDER_STATUS_PENDING_WORKING: +// case ORDER_STATUS_INACTIVE: +// case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: +// case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: +// bts_assert(false); +// break; +// } +// } + +// OrderOpResult IcebergOrder2::on_activate(Price p, Quantity q, OrderServices &services) { +// bts_assert(!me->services); +// me->services = &services; +// me->child_builder.activate(services); + +// switch (me->state) { +// case State::PAUSED: +// me->order_state.set_price(p.value()); +// me->order_state.set_quantity(q.value()); +// services.subscribe_to_time( +// [this](auto const &time) { this->on_time(time); }); +// services.subscribe_to_child_updates( +// [this](auto const &os) { this->on_child_order_update(os); }); +// send_next_child_order(); +// break; + +// case State::COMPLETED: +// break; +// case State::WORKING: +// bts_assert(false); +// break; +// } +// report_state(); +// cb(OrderOpResult{}); +// } + +// OrderOpResult IcebergOrder2::on_update(api::orderman::Update const &update) { +// switch (me->state) { +// case State::PAUSED: +// case State::WORKING: +// if (update.has_custom() && !update.custom().has_iceberg()) +// cb(OrderOpResult{ORDER_ERROR_INVALID_OP, +// "Update is not valid for this order type"}); +// else { +// auto &ib_update = update.custom().iceberg(); +// if (ib_update.show_quantity() == 0) +// cb(OrderOpResult{ORDER_ERROR_INVALID_OP, +// "Show quantity must be greater than 0"}); +// else { + +// me->order_state.set_price(update.price()); +// me->order_state.set_quantity(update.quantity()); +// } + + +// break; + +// case State::COMPLETED: +// break; +// break; +// } +// } + +// IcebergOrderDefinition &IcebergOrder2::iceberg_def() { +// return *me->def.mutable_custom_def()->mutable_iceberg(); +// } + +// void IcebergOrder2::initialize_child_builder(IOrderFactory &of) { +// // Copy parent definition to child, so the child inherits all the +// // standard properties of the parent (side, security, TIF, etc) +// auto child_def = me->def; +// // Copy the custom part of the child order definition to our child +// *child_def.mutable_custom_def() = iceberg_def().child(); + +// // Build our child builder +// me->child_builder = OrderBuilder(key(), child_def, of, 1); +// if (me->services) +// me->child_builder.activate(*me->services); +// } + +// } // namespace orderman +// } // namespace bts diff --git a/src/lib/orderman/orders/IcebergOrder2.h b/src/lib/orderman/orders/IcebergOrder2.h new file mode 100644 index 000000000..ffe0e7975 --- /dev/null +++ b/src/lib/orderman/orders/IcebergOrder2.h @@ -0,0 +1,53 @@ +#pragma once + +#include "lib/api/services/OrderService.server.pb.h" +#include "lib/orderman/orders/Order.h" +#include + +namespace bts { +namespace api { +namespace orderman { +class IcebergOrderDefinition; +} +} // namespace api +} // namespace bts + +namespace bts { +namespace mercury { +class TimerEvent; +} +namespace orderman { + +class OrderStateUpdateEvent; +class IOrderFactory; + +class IcebergOrder2 : public Order { + public: + IcebergOrder2(); + ~IcebergOrder2(); + void on_init_new(api::orderman::OrderDefinition const &, + const PreActivationOrderServices &) override; + void on_init_recovered(api::orderman::OrderRecord const &, + const PreActivationOrderServices &) override; + OrderOpResult on_activate(Price, Quantity, OrderServices &) override; + OrderOpResult on_update(api::orderman::Update const &) override; + OrderOpResult on_detach() override; + OrderOpResult on_cancel() override; + + private: + + enum class State; + struct ActiveChild; + struct PImpl; + std::unique_ptr me; + api::orderman::IcebergOrderDefinition &iceberg_def(); + void initialize_child_builder(IOrderFactory&); + void transition(State state, api::orderman::OrderStatus,std::string const&msg=""); + void on_time(mercury::TimerEvent const &t); + void on_child_order_update(OrderStateUpdateEvent const &ev); + void report_state(); + void send_next_child_order(); +}; + +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/orders/TimeBoxOrder.cpp b/src/lib/orderman/orders/TimeBoxOrder.cpp index ef90a67a0..1231103a0 100644 --- a/src/lib/orderman/orders/TimeBoxOrder.cpp +++ b/src/lib/orderman/orders/TimeBoxOrder.cpp @@ -43,7 +43,7 @@ void TimeBoxOrder::on_init_new(api::orderman::OrderDefinition const &def, *child_def.mutable_custom_def() = timebox_def.child(); if (me->start_time.seconds() > utils::pb::pb_now().seconds() && me->stop_time.seconds() > me->start_time.seconds()) { - me->child_builder = OrderBuilder(key(), child_def, services, 1); + me->child_builder = OrderBuilder(key(), child_def, services.order_factory, 1); transition(ORDER_STATUS_INACTIVE); } else { auto msg = fmt::format("Invalid time"); diff --git a/src/lib/orderman/orders/TriggerOrder.cpp b/src/lib/orderman/orders/TriggerOrder.cpp index 510864dde..0461be0c3 100644 --- a/src/lib/orderman/orders/TriggerOrder.cpp +++ b/src/lib/orderman/orders/TriggerOrder.cpp @@ -314,7 +314,7 @@ bool TriggerOrder::_on_init_new(const api::orderman::OrderDefinition &order_def, 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); + me->order_builder = OrderBuilder(key(), child_order_def, pre_os.order_factory); 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(), diff --git a/src/lib/orderman/orders/book_algos/BookAlgo.cpp b/src/lib/orderman/orders/book_algos/BookAlgo.cpp index e89c69532..383eb01e1 100644 --- a/src/lib/orderman/orders/book_algos/BookAlgo.cpp +++ b/src/lib/orderman/orders/book_algos/BookAlgo.cpp @@ -90,12 +90,12 @@ void BookAlgo::on_init_new(const api::orderman::OrderDefinition &def, 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); + me->child_builder = OrderBuilder(key(), child_def, services.order_factory, 1); 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); + me->hedge_builder = OrderBuilder(key(), hedge_def, services.order_factory, 4); const bts::api::Security *sec = services.sec_db.resolve(SecurityKey(def.security_key())); diff --git a/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp b/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp index 4a4fda9d7..b746a9178 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp @@ -11,7 +11,7 @@ SpreaderOrderBuilder::SpreaderOrderBuilder (bts::orderman::OrderKey parent_key, _is_live(spreader_pao_services.is_live()){ if (_is_live){ LOG(OrderMan, Info, "SpreaderOrderBuilder.cons parent_key: {} sec_key: {}", parent_key, order_def.security_key()); - _real_order_builder = bts::orderman::OrderBuilder(parent_key, order_def, spreader_pao_services.pre_services(), reserve_sz); + _real_order_builder = bts::orderman::OrderBuilder(parent_key, order_def, spreader_pao_services.pre_services().order_factory, reserve_sz); } } SpreaderOrderBuilder::SpreaderOrderBuilder(SpreaderOrderBuilder&&) @@ -33,4 +33,4 @@ void SpreaderOrderBuilder::activate(SpreaderOrderServices& order_services){ if (_is_live) _real_order_builder.activate(order_services.order_services()); } -}} \ No newline at end of file +}} diff --git a/src/sdk/examples/order_plugin_example.cpp b/src/sdk/examples/order_plugin_example.cpp index 349a5989c..c46800910 100644 --- a/src/sdk/examples/order_plugin_example.cpp +++ b/src/sdk/examples/order_plugin_example.cpp @@ -81,7 +81,7 @@ void DynamicIcebergOrder::on_init_new( iceberg_def.order_params().at("child").as_order_def(); if (me->show_quantity.value() != 0) { me->child_builder = OrderBuilder( - key(), child_def, services, + key(), child_def, services.order_factory, std::max((size_t)1, (size_t)(me->show_quantity).value() / 10)); transition(ORDER_STATUS_INACTIVE); } else {