diff --git a/src/lib/CMakeDeps.cmake b/src/lib/CMakeDeps.cmake index 6211e72d2..06d5cbeda 100644 --- a/src/lib/CMakeDeps.cmake +++ b/src/lib/CMakeDeps.cmake @@ -1 +1 @@ -set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/services/UserService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/Executor.conf;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/PerfTraceLog.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/IcebergOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/CoverOrder.cpp;orderman/orders/book_algos/JoinOrder.cpp;orderman/orders/book_algos/LeanOrder.cpp;orderman/orders/book_algos/OffsetOrder.cpp;orderman/orders/book_algos/TickOrder.cpp;orderman/orders/book_algos/TopOrder.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;orderman2/orders/NativeOrder.cpp;orderman2/orders/Order.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/thread_manager.cpp) \ No newline at end of file +set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/services/UserService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/Executor.conf;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/PerfTraceLog.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/IcebergOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/CoverOrder.cpp;orderman/orders/book_algos/JoinOrder.cpp;orderman/orders/book_algos/LeanOrder.cpp;orderman/orders/book_algos/OffsetOrder.cpp;orderman/orders/book_algos/TickOrder.cpp;orderman/orders/book_algos/TopOrder.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;orderman2/orders/NativeOrder.cpp;orderman2/orders/Order.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;tracing/PerfLog.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/thread_manager.cpp) \ No newline at end of file diff --git a/src/lib/jetfix/codec/FIXMsg.h b/src/lib/jetfix/codec/FIXMsg.h index 1d587802c..519946cbc 100644 --- a/src/lib/jetfix/codec/FIXMsg.h +++ b/src/lib/jetfix/codec/FIXMsg.h @@ -11,7 +11,7 @@ #include "lib/jetfix/codec/IFIXMsg.h" #include "lib/jetfix/common/InMsgBuffer.h" #include "lib/utils/meta_programming.h" -#include "lib/orderman/orderman_utils/PerfTrace.h" +#include "lib/tracing/PerfLog.h" namespace bts { namespace jetfix { @@ -73,8 +73,8 @@ public: } } - void set_trace (PerfTrace const&trace) {_trace = trace;} - PerfTrace const&trace() const {return _trace;} + void set_trace (trace::CorID const&trace) {_trace = trace;} + trace::CorID const&trace() const {return _trace;} private: typedef std::tuple FieldTuple; @@ -103,7 +103,7 @@ private: FieldTuple _fields; std::bitset::value> _has_value; std::vector> _field_idx; - PerfTrace _trace; + trace::CorID _trace; }; diff --git a/src/lib/jetfix/common/InMsgBuffer.h b/src/lib/jetfix/common/InMsgBuffer.h index f01426120..bd1c76f9f 100644 --- a/src/lib/jetfix/common/InMsgBuffer.h +++ b/src/lib/jetfix/common/InMsgBuffer.h @@ -6,7 +6,7 @@ #include #include "lib/utils/bts_assert.h" #include "lib/jetfix/codec/MessageTypes.h" -#include "lib/orderman/orderman_utils/PerfTrace.h" +#include "lib/tracing/PerfLog.h" namespace bts { namespace jetfix { @@ -114,16 +114,16 @@ public: std::string get_test_req_id () const {return get_string_field ("\001112=",sizeof("\001112=")-1);} - PerfTrace const&trace() const {return _trace;} + trace::CorID const&trace() const {return _trace;} - void set_trace(PerfTrace const&t) {_trace = t;} + void set_trace(trace::CorID const&t) {_trace = t;} private: const char *_data; size_t _size; MessageTypes _type; std::shared_ptr _buffer; - PerfTrace _trace; + trace::CorID _trace; MessageTypes get_type () const { diff --git a/src/lib/jetfix/connection/AsyncReader.cpp b/src/lib/jetfix/connection/AsyncReader.cpp index 4c513f5a5..93129e2d0 100644 --- a/src/lib/jetfix/connection/AsyncReader.cpp +++ b/src/lib/jetfix/connection/AsyncReader.cpp @@ -72,6 +72,7 @@ struct AsyncReader::PImpl PImpl(IConnection &connection, std::string const&connection_name, ICoreGatewayEventSink &sink, + trace::PerfLog &l, size_t buffer_sz, size_t high_water_mark) : @@ -81,6 +82,7 @@ struct AsyncReader::PImpl write_cursor (0), reader_thread (), sink (sink), + perf_log(l), high_water_mark (high_water_mark), connection_name(connection_name) {} @@ -98,6 +100,8 @@ struct AsyncReader::PImpl std::thread reader_thread; // an observer that will process the messages we frame ICoreGatewayEventSink &sink; + // For performance analysis + trace::PerfLog &perf_log; // a position in the current buffer that if reached signals the // need to increase the buffer size uint32_t high_water_mark; @@ -107,8 +111,9 @@ struct AsyncReader::PImpl AsyncReader::AsyncReader (IConnection &connection, std::string const&connection_name, ICoreGatewayEventSink &sink, + trace::PerfLog &log, size_t buffer_sz, size_t high_water_mark): - me (new PImpl(connection,connection_name,sink,buffer_sz,high_water_mark)) + me (new PImpl(connection,connection_name,sink,log,buffer_sz,high_water_mark)) {} void AsyncReader::start () @@ -137,8 +142,9 @@ void AsyncReader::dispatch () for (;;) { // read as many bytes as we have buffer space for auto read_count = me->connection.read (cursor (),free_bytes ()); - PerfTrace trace; - trace.fix_socket_r = utils::TimeStamp::now(); + auto read_time = utils::TimeStamp::now(); + trace::CorID trace; + trace.channel = "fix"; // signal a disconnect if the connection broke if (read_count <= 0) { @@ -162,6 +168,8 @@ void AsyncReader::dispatch () me->first_pending_msg += first_unprocessed_offset; for (auto &msg : framed_msgs) { + trace.sn = msg.get_seq_num(); + me->perf_log.log(trace,read_time,"fix_socket_r"); msg.set_trace(trace); LOG(Latency, Diag, "perf_event AsyncReader.on_fix"); tracepoint(bts_trace, trace_order, (char *)"AsyncReader.on_fix", 0, diff --git a/src/lib/jetfix/connection/AsyncReader.h b/src/lib/jetfix/connection/AsyncReader.h index 85063d1c7..5ef506a28 100644 --- a/src/lib/jetfix/connection/AsyncReader.h +++ b/src/lib/jetfix/connection/AsyncReader.h @@ -3,6 +3,7 @@ #include namespace bts { +namespace trace {class PerfLog;} namespace jetfix { class IConnection; @@ -16,6 +17,7 @@ public: AsyncReader(IConnection &connection, std::string const&connection_name, ICoreGatewayEventSink &sink, + trace::PerfLog &l, size_t buffer_sz, // initial buffer size to use size_t high_water_mark); // when do we allocate a new buffer void start (); diff --git a/src/lib/jetfix/connection/IConnection.h b/src/lib/jetfix/connection/IConnection.h index 3673788b9..ab8b9b214 100644 --- a/src/lib/jetfix/connection/IConnection.h +++ b/src/lib/jetfix/connection/IConnection.h @@ -1,9 +1,9 @@ #pragma once #include -#include "lib/orderman/orderman_utils/PerfTrace.h" namespace bts { +namespace trace {struct CorID;} namespace jetfix { class IConnection @@ -14,7 +14,7 @@ public: virtual bool connect () = 0; virtual void shutdown () = 0; virtual int read (char* to_buffer,size_t read_count) = 0; - virtual int write (WriteVec const&vec,size_t vec_size,PerfTrace const&trace) = 0; + virtual int write (WriteVec const&vec,size_t vec_size,trace::CorID trace) = 0; virtual ~IConnection() {}; }; diff --git a/src/lib/jetfix/connection/SocketConnection.cpp b/src/lib/jetfix/connection/SocketConnection.cpp index 10fd1907f..a3b390a45 100644 --- a/src/lib/jetfix/connection/SocketConnection.cpp +++ b/src/lib/jetfix/connection/SocketConnection.cpp @@ -1,11 +1,11 @@ #include "SocketConnection.h" #include "lib/jetfix/store/session_name.h" #include "lib/logging/logging.h" -#include "lib/orderman/orderman_utils/PerfTraceLog.h" #include "lib/tracing/bts_trace.h" #include "lib/utils/TimeStamp.h" #include "lib/utils/bts_assert.h" #include "lib/utils/helper_macros.h" +#include "lib/tracing/PerfLog.h" #include #include @@ -19,7 +19,7 @@ namespace bts { namespace jetfix { SocketConnection::SocketConnection(bts::config::JetFIX::Connection const &cfg, - PerfTraceLog &perf_log) + trace::PerfLog &perf_log) : _fd(-1), _cfg(cfg), _log(cfg.log_fix_stream()), _in_log(), _out_log(), _perf_log(perf_log) { if (_log) { @@ -98,7 +98,7 @@ int SocketConnection::read(char *to_buffer, size_t read_count) { } int SocketConnection::write(WriteVec const &vec, size_t vec_size, - PerfTrace const &trace) { + trace::CorID trace) { bts_assert(_fd >= 0); struct iovec iv[MaxWriteVecSz]; @@ -107,65 +107,9 @@ int SocketConnection::write(WriteVec const &vec, size_t vec_size, iv[i].iov_len = vec[i].second; } - auto trace_cpy = trace; - trace_cpy.fix_socket_w = utils::TimeStamp::now(); - - utils::TimeStamp::Interval s2s; - if (trace.md.to_uint64()) { - s2s = (trace_cpy.fix_socket_w - trace_cpy.md); - tracepoint(bts_trace, trace_order, - (char *)"SocketConnection.tick_to_order.pre_write", 0, - trace.md_sn, s2s.microseconds()); - } else { - s2s = (trace_cpy.fix_socket_w - trace_cpy.fix_socket_r); - tracepoint(bts_trace, trace_order, - (char *)"SocketConnection.fill_to_order.pre_write", 0, - trace.md_sn, s2s.microseconds()); - } - - LOG(Latency, Diag, "perf_event before_socket_write"); + _perf_log.log(trace,"before_fix_socket_w"); auto result = ::writev(_fd, iv, (int)vec_size); - - if (trace.md.to_uint64()) { - LOG(Latency, Info, - "perf_event:tick_to_order s2s_us:{} do_work_begin:{} fix_socket_r:{} " - "md:{} " - "md_src:{} spreader_on_book:{} spreader_modify_order:{} " - "spreader_on_child_order_update:{} " - "order_update:{} exe_gw:{} fix_socket_w:{} md_sn:{} order_key:{} " - "send_fix_buffer:{}", - s2s.microseconds(), trace_cpy.do_work_begin.to_uint64(), - trace_cpy.fix_socket_r.to_uint64(), trace_cpy.md.to_uint64(), - trace_cpy.md_src.to_uint64(), trace_cpy.spreader_on_book.to_uint64(), - trace_cpy.spreader_modify_order.to_uint64(), - trace_cpy.spreader_on_child_order_update.to_uint64(), - trace_cpy.order_update.to_uint64(), trace_cpy.exe_gw.to_uint64(), - trace_cpy.fix_socket_w.to_uint64(), trace_cpy.md_sn, - trace_cpy.order_key, trace.send_fix_buffer.to_uint64()); - _perf_log.log(trace_cpy); - } - - if (trace.fix_socket_r.to_uint64()) { - LOG(Latency, Info, - "perf_event:fill_to_order s2s_us:{} do_work_begin:{} fix_socket_r:{} " - "md:{} md_src:{} " - "spreader_on_book:{} spreader_modify_order:{} " - "spreader_on_child_order_update:{} " - "order_update:{} exe_gw:{} fix_socket_w:{} md_sn:{} order_key:{} " - "send_fix_buffer:{} ", - s2s.microseconds(), trace_cpy.do_work_begin.to_uint64(), - trace_cpy.fix_socket_r.to_uint64(), trace_cpy.md.to_uint64(), - trace_cpy.md_src.to_uint64(), trace_cpy.spreader_on_book.to_uint64(), - trace_cpy.spreader_modify_order.to_uint64(), - trace_cpy.spreader_on_child_order_update.to_uint64(), - trace_cpy.order_update.to_uint64(), trace_cpy.exe_gw.to_uint64(), - trace_cpy.fix_socket_w.to_uint64(), trace_cpy.md_sn, trace_cpy.order_key, - trace_cpy.send_fix_buffer.to_uint64()); - _perf_log.log(trace_cpy); - } - - tracepoint(bts_trace, trace_order, (char *)"SocketConnection.post_write", 0, - trace.md_sn, 0); + _perf_log.log(trace,"after_fix_socket_w"); if (_log && result > 0) { for (size_t i = 0; i < vec_size; i++) diff --git a/src/lib/jetfix/connection/SocketConnection.h b/src/lib/jetfix/connection/SocketConnection.h index 6246d3e5f..ebdf75828 100644 --- a/src/lib/jetfix/connection/SocketConnection.h +++ b/src/lib/jetfix/connection/SocketConnection.h @@ -7,19 +7,19 @@ #include "lib/metrics/metrics.h" namespace bts { -class PerfTraceLog; +namespace trace {class PerfLog;struct CorID;} namespace jetfix { class SocketConnection : public IConnection { public: - SocketConnection(bts::config::JetFIX::Connection const &cfgl,PerfTraceLog &log); + SocketConnection(bts::config::JetFIX::Connection const &cfgl,trace::PerfLog &log); ~SocketConnection(); bool connect () override; void shutdown () override; int read (char* to_buffer,size_t read_count) override; - int write (WriteVec const&vec,size_t vec_size,const PerfTrace &trace) override; + int write (WriteVec const&vec,size_t vec_size,trace::CorID ) override; private: int _fd; @@ -27,7 +27,7 @@ private: bool _log; std::ofstream _in_log; std::ofstream _out_log; - PerfTraceLog &_perf_log; + trace::PerfLog &_perf_log; }; }} diff --git a/src/lib/jetfix/gateway/CoreGateway.cpp b/src/lib/jetfix/gateway/CoreGateway.cpp index 1f062ea2f..67c54111f 100644 --- a/src/lib/jetfix/gateway/CoreGateway.cpp +++ b/src/lib/jetfix/gateway/CoreGateway.cpp @@ -1,26 +1,26 @@ #include "CoreGateway.h" -#include "lib/logging/logging.h" -#include "lib/utils/TimeStamp.h" -#include "lib/utils/bts_chrono.h" -#include "lib/utils/datetime.h" #include "lib/jetfix/common/OutFIX.h" #include "lib/jetfix/connection/AsyncReader.h" #include "lib/jetfix/connection/IConnection.h" #include "lib/jetfix/gateway/ICoreGatewayObserver.h" #include "lib/jetfix/gateway/Session.h" #include "lib/jetfix/store/IFIXStore.h" +#include "lib/logging/logging.h" #include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/tracing/bts_trace.h" -#include +#include "lib/utils/TimeStamp.h" +#include "lib/utils/bts_chrono.h" +#include "lib/utils/datetime.h" #include "lib/utils/thread_manager.h" +#include #include #include #include #include -#include #include +#include namespace bts { namespace jetfix { @@ -50,22 +50,17 @@ struct CoreGateway::EventData { : handler(src.handler), out_msgs(src.out_msgs), in_msg(src.in_msg), trace(src.trace), ts(src.ts) {} - EventData() - : handler(), out_msgs(), in_msg(), trace(), - ts() {} + EventData() : handler(), out_msgs(), in_msg(), trace(), ts() {} EventData(Handler handler) : handler(handler), out_msgs(), in_msg(), trace(), ts() {} - EventData(Handler handler, PerfTrace const &trace, - OutFIXPtr const &out_msgs) + EventData(Handler handler, trace::CorID const &trace, OutFIXPtr const &out_msgs) : handler(handler), out_msgs(out_msgs), in_msg(), trace(trace), ts() {} EventData(Handler handler, InMsgBuffer const &in_msg) - : handler(handler), out_msgs(), in_msg(in_msg), - trace(), ts() {} + : handler(handler), out_msgs(), in_msg(in_msg), trace(), ts() {} EventData(Handler handler, std::shared_ptr const &ts) - : handler(handler), out_msgs(), in_msg(), - trace(), ts(ts) {} + : handler(handler), out_msgs(), in_msg(), trace(), ts(ts) {} EventData &operator=(EventData &src) { handler = src.handler; @@ -87,19 +82,19 @@ struct CoreGateway::EventData { Handler handler; OutFIXPtr out_msgs; InMsgBuffer in_msg; - PerfTrace trace; + trace::CorID trace; std::shared_ptr ts; }; struct CoreGateway::PImpl { PImpl(config::JetFIX::Connection const &cfg, ICoreGatewayObserver &observer, ConnectionFactory const &conn_factory, - StoreFactory const &store_factory) + StoreFactory const &store_factory, trace::PerfLog &l) : cfg(cfg), observer(observer), make_connection(conn_factory), make_store(store_factory), state(State::OFF), start_of_pause(), session_info(), event_queue(), timer_thread(), destroy(false), is_on(false), has_replayed(false), send_batch(), recv_batch(), - connection_attempts(0) { + connection_attempts(0), perf_log(l) { send_batch.reserve(1024); recv_batch.reserve(1024); } @@ -112,7 +107,7 @@ struct CoreGateway::PImpl { State state; datetime::PTime start_of_pause; std::unique_ptr session_info; - tbb::concurrent_queue event_queue; + tbb::concurrent_queue event_queue; std::thread timer_thread; std::atomic destroy; bool is_on; @@ -120,18 +115,21 @@ struct CoreGateway::PImpl { std::vector send_batch; std::vector recv_batch; uint32_t connection_attempts; + trace::PerfLog &perf_log; }; std::thread CoreGateway::make_timer_thread() { - auto thread_name = fmt::format ("jf_tmr_{}", me->cfg.name()); - return threading::make_thread(thread_name, std::bind(&CoreGateway::call_time, this)); + auto thread_name = fmt::format("jf_tmr_{}", me->cfg.name()); + return threading::make_thread(thread_name, + std::bind(&CoreGateway::call_time, this)); } CoreGateway::CoreGateway(config::JetFIX::Connection const &cfg, ICoreGatewayObserver &observer, ConnectionFactory const &conn_factory, - StoreFactory const &store_factory) - : me(new PImpl(cfg, observer, conn_factory, store_factory)) { + StoreFactory const &store_factory, + trace::PerfLog &perf_trace) + : me(new PImpl(cfg, observer, conn_factory, store_factory, perf_trace)) { me->timer_thread = make_timer_thread(); } @@ -145,8 +143,7 @@ CoreGateway::~CoreGateway() { me->timer_thread.join(); } -void CoreGateway::send(PerfTrace const &trace, OutFIXPtr const &fix) { - tracepoint(bts_trace, trace_order, (char *)"CoreGateway.send", 0, trace.md_sn,0); +void CoreGateway::send(OutFIXPtr const &fix, trace::CorID trace) { me->event_queue.push(EventData(&CoreGateway::sync_send, trace, fix)); } @@ -262,7 +259,7 @@ void CoreGateway::sync_stop(EventData const &) { void CoreGateway::sync_send(EventData const &ev) { tracepoint(bts_trace, trace_order, (char *)"CoreGateway.sync_send", 0, - ev.trace.md_sn,0); + ev.trace.md_sn, 0); switch (me->state) { case State::OFF: bts_assert(false); @@ -273,7 +270,7 @@ void CoreGateway::sync_send(EventData const &ev) { case State::WSESSION_TERMINATE: break; case State::READY: - me->session_info->session->send(ev.trace, ev.out_msgs); + me->session_info->session->send(ev.out_msgs,ev.trace); break; default: bts_assert(false); @@ -477,7 +474,8 @@ void CoreGateway::sync_time(EventData const &ev) { []() { return utils::TimeStamp::now(); })); me->session_info->reader.reset(new AsyncReader( *me->session_info->connection, me->cfg.name(), *this, - me->cfg.msg_buffer_sz(), me->cfg.msg_high_water_mark())); + me->perf_log, me->cfg.msg_buffer_sz(), + me->cfg.msg_high_water_mark())); me->session_info->reader->start(); me->session_info->session->start(); transition(State::CONNECTING); @@ -573,5 +571,5 @@ const char *CoreGateway::state_name(State st) { bts_assert(false); } } -} -} +} // namespace jetfix +} // namespace bts diff --git a/src/lib/jetfix/gateway/CoreGateway.h b/src/lib/jetfix/gateway/CoreGateway.h index dba302441..fcba9510b 100644 --- a/src/lib/jetfix/gateway/CoreGateway.h +++ b/src/lib/jetfix/gateway/CoreGateway.h @@ -10,6 +10,7 @@ #include "lib/config/protos/jetfix.pb.h" namespace bts { +namespace trace {class PerfLog;} namespace jetfix { class ICoreGatewayObserver; class IConnection; @@ -25,12 +26,13 @@ public: CoreGateway(config::JetFIX::Connection const &cfg, ICoreGatewayObserver &observer, ConnectionFactory const &conn_factory, - StoreFactory const &store_factory); + StoreFactory const &store_factory, + trace::PerfLog &); ~CoreGateway(); void start (); void stop (); - void send (PerfTrace const&, OutFIXPtr const &msgs); + void send (OutFIXPtr const &msgs, trace::CorID trace); void dispatch_events (); // for certification use only diff --git a/src/lib/jetfix/gateway/JetFIXGateway.h b/src/lib/jetfix/gateway/JetFIXGateway.h index 6578bb8fd..6454aab8f 100644 --- a/src/lib/jetfix/gateway/JetFIXGateway.h +++ b/src/lib/jetfix/gateway/JetFIXGateway.h @@ -8,11 +8,12 @@ #include "lib/jetfix/store/FIXFileStore.h" #include "lib/utils/meta_programming.h" #include "lib/orderman/orderman_utils/orderman_common.h" +#include "lib/tracing/PerfLog.h" #include "lib/config/protos/jetfix.pb.h" namespace bts { -class PerfTraceLog; +namespace trace {class PerfLog;} namespace jetfix { // A parsing layer over CoreGateway @@ -20,7 +21,7 @@ template class JetFIXGateway : ICoreGatewayObserver { public: - JetFIXGateway(config::JetFIX::Connection const &cfg, PerfTraceLog &log) + JetFIXGateway(config::JetFIX::Connection const &cfg, trace::PerfLog &log) : _core (cfg,*this, @@ -28,13 +29,16 @@ public: {return new SocketConnection (cfg,log);}, [] (config::JetFIX::Connection const &cfg) - { return new FIXFileStore (cfg);}), + { return new FIXFileStore (cfg);}, + + log), _dispatchers (), _dispatcher_idx (), _on_ready ([](){}), _on_disconnect ([](){}), _on_begin_replay ([](){}), - _on_end_replay ([](){}) + _on_end_replay ([](){}), + _perf_log(log) { std::vector disp_vec; meta::collect_tuple_items (_dispatchers,&disp_vec); @@ -45,7 +49,7 @@ public: void start () {_core.start ();} void stop () {_core.stop ();} - void send (PerfTrace const &trace, OutFIXPtr const &msgs) {_core.send (trace,msgs);} + void send (OutFIXPtr const &msgs,trace::CorID trace ) {_core.send (msgs,trace);} void dispatch_events () {_core.dispatch_events ();} @@ -123,6 +127,7 @@ private: std::function _on_disconnect; std::function _on_begin_replay; std::function _on_end_replay; + trace::PerfLog &_perf_log; }; }} diff --git a/src/lib/jetfix/gateway/Session.cpp b/src/lib/jetfix/gateway/Session.cpp index 232469c06..05609d611 100644 --- a/src/lib/jetfix/gateway/Session.cpp +++ b/src/lib/jetfix/gateway/Session.cpp @@ -106,8 +106,7 @@ void Session::start() { *me->current_time, me->cfg)); } -void Session::send(PerfTrace const &trace, OutFIXPtr const &msgs) { - tracepoint(bts_trace, trace_order, (char *)"Session.send", 0, trace.md_sn, 0); +void Session::send(OutFIXPtr const &msgs,trace::CorID trace) { switch (me->state) { case State::READY: case State::CERT_MODE: @@ -547,10 +546,10 @@ void Session::buffer_or_deliver(InMsgBuffer const &msg) { } void Session::internal_send(OutFIXPtr const &msgs) { - internal_send(PerfTrace(), msgs); + internal_send(trace::CorID {},msgs); } -void Session::internal_send(PerfTrace const &trace, OutFIXPtr const &msgs) { +void Session::internal_send(trace::CorID trace, OutFIXPtr const &msgs) { IConnection::WriteVec data_vec; bts_assert(msgs->fix.size() < IConnection::MaxWriteVecSz); @@ -681,7 +680,7 @@ void Session::send_seq_reset(uint32_t sn, uint32_t new_sn) { IConnection::WriteVec data_vec; data_vec[0].first = stream.data(); data_vec[0].second = stream.size(); - if (me->connection.write(data_vec, 1, PerfTrace()) < 0) { + if (me->connection.write(data_vec, 1, trace::CorID()) < 0) { terminate_session(JetFIXError::CONNECTION_ERROR); return; } else { diff --git a/src/lib/jetfix/gateway/Session.h b/src/lib/jetfix/gateway/Session.h index 86ac8472d..3808a78d1 100644 --- a/src/lib/jetfix/gateway/Session.h +++ b/src/lib/jetfix/gateway/Session.h @@ -8,6 +8,7 @@ #include "lib/utils/datetime.h" #include "lib/jetfix/common/OutFIXPtr.h" #include "lib/orderman/orderman_utils/orderman_common.h" +#include "lib/tracing/PerfLog.h" #include "lib/config/protos/jetfix.pb.h" @@ -31,7 +32,7 @@ public: ~Session(); void start (); - void send (PerfTrace const &, OutFIXPtr const&); + void send (OutFIXPtr const&, trace::CorID); void receive (InMsgBuffer const&); void shutdown (); void time (std::shared_ptr const&time_str); @@ -59,7 +60,7 @@ private: void buffer (InMsgBuffer const &msg); void buffer_or_deliver (InMsgBuffer const&msg); - void internal_send (PerfTrace const&, OutFIXPtr const&); + void internal_send (trace::CorID , OutFIXPtr const&); void internal_send (OutFIXPtr const&); void logout (JetFIXError::Code reason); void logout (JetFIXError::Code reason,std::string const &extra_info); diff --git a/src/lib/jetfix/tests/async_reader_tests.cpp b/src/lib/jetfix/tests/async_reader_tests.cpp index 362bb0211..d75fff0f2 100644 --- a/src/lib/jetfix/tests/async_reader_tests.cpp +++ b/src/lib/jetfix/tests/async_reader_tests.cpp @@ -111,7 +111,7 @@ struct Connection : public IConnection return str.gcount (); } - int write (WriteVec const&,size_t, PerfTrace const&) + int write (WriteVec const&,size_t, trace::CorID ) {return -1;} std::istream &str; @@ -119,6 +119,8 @@ struct Connection : public IConnection TEST_CASE ("JetFIX AsyncReaderTests", "[jetfix]") { + trace::PerfLog l; + SECTION ("jeftix_smoke") { std::stringstream str; @@ -128,7 +130,7 @@ TEST_CASE ("JetFIX AsyncReaderTests", "[jetfix]") MyGWObserver ob; { - AsyncReader r (c,"test",ob,10,5); + AsyncReader r (c,"test",ob,l,10,5); r.start (); } @@ -144,7 +146,7 @@ TEST_CASE ("JetFIX AsyncReaderTests", "[jetfix]") MyGWObserver ob; { - AsyncReader r (c,"test",ob,10,5); + AsyncReader r (c,"test",ob,l,10,5); r.start (); } REQUIRE (ob.got_eof); diff --git a/src/lib/mercury/actors/ContentSubscription.h b/src/lib/mercury/actors/ContentSubscription.h index b7803d0fc..92a6cccf5 100644 --- a/src/lib/mercury/actors/ContentSubscription.h +++ b/src/lib/mercury/actors/ContentSubscription.h @@ -4,6 +4,7 @@ #include #include #include +#include #include "lib/utils/bts_assert.h" @@ -100,7 +101,7 @@ template class ContentSubscription { CB cb; }; - using SubList = std::vector; + using SubList = boost::container::small_vector; using Subscriptions = std::unordered_map; Actor *_actor; diff --git a/src/lib/orderman/actors/ExecutionGateway.cpp b/src/lib/orderman/actors/ExecutionGateway.cpp index 28c59e426..334f484ed 100644 --- a/src/lib/orderman/actors/ExecutionGateway.cpp +++ b/src/lib/orderman/actors/ExecutionGateway.cpp @@ -24,10 +24,10 @@ using JFGw = fix::RejectMsg, fix::CancelRejectMsg>; struct ExecutionGateway::PImpl { - PImpl(config::JetFIX::Connection const &cfg, PerfTraceLog &log) - : gw(cfg, log), exe_report_pool(), state(State::WAITING_FOR_SECURITIES), + PImpl(config::JetFIX::Connection const &cfg, trace::PerfLog &l) + : gw(cfg, l), exe_report_pool(), state(State::WAITING_FOR_SECURITIES), securities(), securities_by_descriptor(), gw_name(cfg.name()), - cfg(cfg) {} + cfg(cfg), perf_log(l) {} JFGw gw; boost::object_pool exe_report_pool; @@ -40,10 +40,11 @@ struct ExecutionGateway::PImpl { OnExeReport on_exe_report; OnGwStatusChange on_gw_status_change; OnCancelReject on_cancel_reject; + trace::PerfLog &perf_log; }; ExecutionGateway::ExecutionGateway(config::JetFIX::Connection const &cfg, - PerfTraceLog &log) + trace::PerfLog &log) : me(new PImpl(cfg, log)) { me->state = State::WAITING_FOR_SECURITIES; } @@ -249,9 +250,8 @@ void ExecutionGateway::on_exe_report( str_to(msg.get(), &data->transact_time); data->cfg = &me->cfg; data->msg = text_msg; - auto trace = msg.trace(); - trace.exe_gw = utils::TimeStamp::now(); - me->on_exe_report(*data, trace); + me->perf_log.log(msg.trace(),"exe_gw"); + me->on_exe_report(*data, msg.trace()); LOG(Latency, Info, "Finished handling of execution report for order {}. {}ns", ok.value(), ns_diff(Timer::now(), start)); @@ -303,10 +303,9 @@ void ExecutionGateway::dispatch_incoming_fix_messages() { } void ExecutionGateway::send_fix(jetfix::OutFIXPtr const &fix, - PerfTrace &trace) { - LOG(Latency, Info, "on_outgoing_fix sn: {} ok: {}", trace.md_sn, trace.order_key); - trace.exe_gw = utils::TimeStamp::now(); - me->gw.send(trace,fix); + trace::CorID trace) { + me->perf_log.log(trace,"exe_gw"); + me->gw.send(fix,trace); me->gw.dispatch_events(); } diff --git a/src/lib/orderman/actors/ExecutionGateway.h b/src/lib/orderman/actors/ExecutionGateway.h index 0e028105b..b94d56afa 100644 --- a/src/lib/orderman/actors/ExecutionGateway.h +++ b/src/lib/orderman/actors/ExecutionGateway.h @@ -9,26 +9,26 @@ #include namespace bts { -class PerfTraceLog; +namespace trace {struct CorID;class PerfLog;} namespace orderman { class NewSecuritiesEvent; class ExecutionReport; using OnExeReport = - std::function; + std::function; using OnGwStatusChange = std::function; using OnCancelReject = std::function; // fix execution gateway for a single FIX session class ExecutionGateway { public: - ExecutionGateway(config::JetFIX::Connection const &, PerfTraceLog &); + ExecutionGateway(config::JetFIX::Connection const &, trace::PerfLog &); ~ExecutionGateway(); void start(); void dispatch_incoming_fix_messages(); void on_securities(const mercury::Update &); - void send_fix(jetfix::OutFIXPtr const &fix, PerfTrace &trace); + void send_fix(jetfix::OutFIXPtr const &fix, trace::CorID trace); OnExeReport& on_exe_report(); OnGwStatusChange& on_gw_status_change(); diff --git a/src/lib/orderman/actors/MDSource.h b/src/lib/orderman/actors/MDSource.h index 5a8e506e4..83f58a387 100644 --- a/src/lib/orderman/actors/MDSource.h +++ b/src/lib/orderman/actors/MDSource.h @@ -10,6 +10,7 @@ #include "lib/orderman/events/MDRequestEvent.h" #include "lib/tracing/bts_trace.h" #include "lib/utils/TimeStamp.h" +#include "lib/tracing/PerfLog.h" namespace bts { namespace orderman { @@ -21,8 +22,8 @@ namespace orderman { class MDSource : public mercury::Actor, public mercury::IPollableActor { public: - MDSource(md::MDConsumer &consumer, metrics::MetricsContainer &stats) - : _handles(), _md_consumer(consumer), _book_update(), _stats(stats), _loop_timer() {} + MDSource(md::MDConsumer &consumer, metrics::MetricsContainer &stats, trace::PerfLog &log) + : _handles(), _md_consumer(consumer), _book_update(), _perf_log(log),_stats(stats), _loop_timer() {} void init() override { LOG(OrderMan, Warn, "Starting MDSource actor"); bts_assert_msg(_md_consumer.all_heartbeats_ok(), "Marketdata heartbeats are bad. MDConsumer will not recover from this condition. Please run 'sparkd md cleanup' and restart sparkd"); @@ -77,21 +78,15 @@ class MDSource : public mercury::Actor, public mercury::IPollableActor { void on_poll() override { Book book; - PerfTrace trace; auto start = utils::TimeStamp::now(); - trace.do_work_begin = start; - for (auto &h : _handles) { auto &handle = h.handle; if (handle.get_book(h.last, std::tuple_size(), &book.bid()[0], &book.ask()[0]) == md::HandleReadResult::SUCCESS) { book._security_key = SecurityKey(handle.key()); - trace.md_src = utils::TimeStamp::now(); - trace.md_sn = trace.md_src.to_uint64(); - trace.md = h.last; - - tracepoint(bts_trace, trace_order, "MDSource", 0, trace.md_sn, 0); + trace::CorID trace {"md",handle.sequence()}; + _perf_log.log(trace,h.last,"md",handle.key()); publish(_book_update, book, trace); } } @@ -107,6 +102,7 @@ class MDSource : public mercury::Actor, public mercury::IPollableActor { std::vector _handles; md::MDConsumer _md_consumer; mercury::Stream _book_update; + trace::PerfLog &_perf_log; metrics::MetricsContainer &_stats; std::shared_ptr> _loop_timer; }; diff --git a/src/lib/orderman/actors/ServiceBridge.cpp b/src/lib/orderman/actors/ServiceBridge.cpp index b9c683150..de8f85dd6 100644 --- a/src/lib/orderman/actors/ServiceBridge.cpp +++ b/src/lib/orderman/actors/ServiceBridge.cpp @@ -15,6 +15,7 @@ #include "lib/orderman/order_router/OrderRouter.h" #include "lib/orderman/securities/MapSecurityDB.h" #include "lib/utils/PBUtils.h" +#include "lib/tracing/PerfLog.h" #include "lib/api/services/OrderService.pb.h" #include "lib/orderman/orderman_utils/orderman_common.h" @@ -150,7 +151,7 @@ ServiceBridge::create_order(api::orderman::Create const &c) { me->order_factory.create(null_order_key(), c.new_order()); me->known_orders.insert(order.key()); publish(me->activate_order_pub, order, Price(c.price()), - Quantity(c.quantity()), PerfTrace()); + Quantity(c.quantity()), trace::CorID()); r.set_order_key(order.key().value()); r.set_error_code(api::orderman::ORDER_ERROR_OK); } else diff --git a/src/lib/orderman/actors/order_manager/ChildOrder.h b/src/lib/orderman/actors/order_manager/ChildOrder.h index c9d1e014a..ed506a3d2 100644 --- a/src/lib/orderman/actors/order_manager/ChildOrder.h +++ b/src/lib/orderman/actors/order_manager/ChildOrder.h @@ -39,7 +39,7 @@ class ChildOrder { bool is_active() const { return _active; } - void activate(Price p, Quantity q, PerfTrace const &trace = PerfTrace()) { + void activate(Price p, Quantity q, trace::CorID const &trace = trace::CorID()) { bts_assert(_order); bts_assert(!_active); @@ -48,19 +48,19 @@ class ChildOrder { _active = true; } - void update(Price p, Quantity q, PerfTrace const &trace = PerfTrace()) { + void update(Price p, Quantity q, trace::CorID const &trace = trace::CorID()) { bts_assert(_order); bts_assert(_active); _child_order_services->update(p, q, trace); } - void crack(PerfTrace const &trace = PerfTrace()) { + void crack(trace::CorID const &trace = trace::CorID()) { bts_assert(_order); bts_assert(_active); _child_order_services->crack(trace); } - void cancel(PerfTrace const &trace = PerfTrace()) { + void cancel(trace::CorID const &trace = trace::CorID()) { bts_assert(_order); bts_assert(_active); _child_order_services->cancel(trace); diff --git a/src/lib/orderman/actors/order_manager/OrderManager.cpp b/src/lib/orderman/actors/order_manager/OrderManager.cpp index 2d0dacddb..d65304712 100644 --- a/src/lib/orderman/actors/order_manager/OrderManager.cpp +++ b/src/lib/orderman/actors/order_manager/OrderManager.cpp @@ -31,7 +31,7 @@ enum class OrderManager::State { }; struct OrderManager::PImpl { - PImpl(OrderManager &owner, DynamicOrderRegistry const &b, PerfTraceLog &l) + PImpl(OrderManager &owner, DynamicOrderRegistry const &b, trace::PerfLog &l) : state(State::WAIT_ADMIN), services_data(owner, b, l) {} State state; @@ -42,7 +42,7 @@ struct OrderManager::PImpl { mercury::Stream pub_ready; }; -OrderManager::OrderManager(DynamicOrderRegistry const &b, PerfTraceLog &l) +OrderManager::OrderManager(DynamicOrderRegistry const &b, trace::PerfLog &l) : me(new PImpl(*this, b, l)) {} OrderManager::~OrderManager() {} @@ -155,7 +155,7 @@ void OrderManager::on_order_recovery( auto const &ostate = ev.order_record.state(); order.on_activate(Price(ostate.price()), Quantity(ostate.quantity()), *order._services, - PerfTrace()); + trace::CorID()); } // signal that we are ready @@ -189,7 +189,7 @@ void OrderManager::on_execution_report( auto r = me->orders.emplace(order->key(), order); bts_assert(r.second); order->on_activate(report.data->price, report.data->quantity, - *order->_services, PerfTrace()); + *order->_services, trace::CorID()); } } } @@ -265,7 +265,7 @@ void OrderManager::on_gateway_state( OrderServices &OrderManager::activate_child(OrderServices &parent, Order &order, Price p, Quantity q, - PerfTrace const &trace) { + trace::CorID const &trace) { order.init_order_services(me->services_data, parent); auto r = me->orders.emplace(order.key(), &order); bts_assert(r.second); diff --git a/src/lib/orderman/actors/order_manager/OrderManager.h b/src/lib/orderman/actors/order_manager/OrderManager.h index c827c2141..a8ec11582 100644 --- a/src/lib/orderman/actors/order_manager/OrderManager.h +++ b/src/lib/orderman/actors/order_manager/OrderManager.h @@ -14,7 +14,7 @@ // fwd namespace bts { -class PerfTraceLog; +namespace trace {class PerfLog;} namespace mercury { class TimerEvent; } @@ -60,7 +60,7 @@ namespace orderman { class OrderManager : public mercury::Actor, public mercury::IPollableActor { public: - OrderManager(DynamicOrderRegistry const &dyn_order_builder, PerfTraceLog &); + OrderManager(DynamicOrderRegistry const &dyn_order_builder, trace::PerfLog &); ~OrderManager(); void init() override; @@ -89,7 +89,7 @@ class OrderManager : public mercury::Actor, public mercury::IPollableActor { void after_event() override; OrderServices &activate_child(OrderServices &parent, Order &, Price, - Quantity, PerfTrace const &); + Quantity, trace::CorID const &); std::vector &free_buffers(std::string const &); enum class State; diff --git a/src/lib/orderman/actors/order_manager/OrderServices.h b/src/lib/orderman/actors/order_manager/OrderServices.h index cd8555787..d80f5c274 100644 --- a/src/lib/orderman/actors/order_manager/OrderServices.h +++ b/src/lib/orderman/actors/order_manager/OrderServices.h @@ -8,6 +8,7 @@ #include "lib/orderman/governor/Governor.h" #include "lib/orderman/orderman_utils/EventStream.h" #include "lib/orderman/orders/Order.h" +#include "lib/tracing/PerfLog.h" #include #include @@ -54,7 +55,7 @@ class SessionServices { } void queue_fix(jetfix::MessageTypes mt, jetfix::FIXFragment const &f, - PerfTrace const &trace) { + trace::CorID const &trace) { auto &stream = _session_data->current_buffer->first_stream(); stream.new_msg(mt).append(f); @@ -130,8 +131,14 @@ class OrderServices { return _data->last_timer_ev.ts_str; } + void log(trace::CorID cid, const char *entry_kind, uint32_t uint32_1 = 0, + uint32_t uint32_2 = 0, const char *txt_1 = "", + uint64_t uint64_1 = 0) { + _data->log.log(cid,entry_kind,uint32_1,uint32_2,txt_1,uint64_1); + } + void report_state(const api::orderman::OrderState &state, - PerfTrace const &trace = PerfTrace()) { + trace::CorID const &trace = trace::CorID()) { OrderStateUpdateEvent ev(_owner->key(), _owner->parent_key(), _owner->definition(), state, trace); @@ -233,19 +240,19 @@ class OrderServices { friend class ChildOrder; OrderServices &activate_child(Order &o, Price p, Quantity q, - PerfTrace const &trace) { + trace::CorID const &trace) { return _data->owner.activate_child(*this, o, p, q, trace); } - void update(Price p, Quantity q, PerfTrace const &trace) { + void update(Price p, Quantity q, trace::CorID const &trace) { on_inter_order_call([p, q, trace](OrderServices &self) { self._owner->on_update(p, q, trace); }); } - void crack(PerfTrace const &trace) { + void crack(trace::CorID const &trace) { on_inter_order_call( [trace](OrderServices &self) { self._owner->on_crack(trace); }); } - void cancel(PerfTrace const &trace) { + void cancel(trace::CorID const &trace) { on_inter_order_call( [trace](OrderServices &self) { self._owner->on_cancel(trace); }); } diff --git a/src/lib/orderman/actors/order_manager/OrderServicesData.cpp b/src/lib/orderman/actors/order_manager/OrderServicesData.cpp index 9bdd18f49..5b19f6e44 100644 --- a/src/lib/orderman/actors/order_manager/OrderServicesData.cpp +++ b/src/lib/orderman/actors/order_manager/OrderServicesData.cpp @@ -7,16 +7,16 @@ namespace orderman { OrderServicesData::OrderServicesData(OrderManager &owner, DynamicOrderRegistry const &b, - PerfTraceLog &l) - : owner(owner), order_router(), order_factory(sec_db, order_router, b), + trace::PerfLog &l) + : owner(owner), log(l), order_router(), + order_factory(sec_db, order_router, b), last_timer_ev( Timer::now(), to(datetime::FIX_timestamp(datetime::now()))) { auto &all_connections = config::get().connection(); for (auto const &c : all_connections) - sessions.push_back(std::make_unique( - c, l)); + sessions.push_back(std::make_unique(c, l)); } } // namespace orderman } // namespace bts diff --git a/src/lib/orderman/actors/order_manager/OrderServicesData.h b/src/lib/orderman/actors/order_manager/OrderServicesData.h index bfd155164..06fe8bca2 100644 --- a/src/lib/orderman/actors/order_manager/OrderServicesData.h +++ b/src/lib/orderman/actors/order_manager/OrderServicesData.h @@ -44,7 +44,7 @@ struct ParentKey { }; struct SessionServicesData { - SessionServicesData(config::JetFIX::Connection const &cfg, PerfTraceLog &log) + SessionServicesData(config::JetFIX::Connection const &cfg, trace::PerfLog &log) : session(cfg.name()), gw_connected(false), cfg(cfg), governor(cfg.max_order_msgs_per_window(), cfg.window_duration_msecs()), gw(cfg, log) {} @@ -63,7 +63,7 @@ struct SessionServicesData { Governor governor; jetfix::OutFIXPtr current_buffer; - PerfTrace current_trace; + trace::CorID current_trace; ExecutionGateway gw; mercury::Stream exe_report_pub; mercury::Stream gw_status_change_pub; @@ -72,14 +72,16 @@ struct SessionServicesData { class OrderServicesData { public: + OrderServicesData(OrderManager &owner, DynamicOrderRegistry const &b, - PerfTraceLog &l); + trace::PerfLog &l); + OrderManager &owner; + trace::PerfLog &log; securities::MapSecurityDB sec_db; OrderRouter order_router; Limiter limiter; OrderFactory order_factory; - std::unique_ptr> md_subs; std::unique_ptr> settlement_subs; diff --git a/src/lib/orderman/events/ActivateOrderEvent.h b/src/lib/orderman/events/ActivateOrderEvent.h index 874b79f99..91f0f5f46 100644 --- a/src/lib/orderman/events/ActivateOrderEvent.h +++ b/src/lib/orderman/events/ActivateOrderEvent.h @@ -4,6 +4,7 @@ #include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/mercury/events/Event.h" +#include "lib/tracing/PerfLog.h" namespace bts { namespace orderman { @@ -18,14 +19,14 @@ public: order (&o),price(p),quantity(q), trace() {} - ActivateOrderEvent (Order &o,Price p, Quantity q,PerfTrace trace) : + ActivateOrderEvent (Order &o,Price p, Quantity q,trace::CorID trace) : order (&o),price(p),quantity(q), trace(trace) {} Order* order; Price price; Quantity quantity; - PerfTrace trace; + trace::CorID trace; }; }} diff --git a/src/lib/orderman/events/BookUpdateEvent.h b/src/lib/orderman/events/BookUpdateEvent.h index cd2fe6aa1..bf71357a8 100644 --- a/src/lib/orderman/events/BookUpdateEvent.h +++ b/src/lib/orderman/events/BookUpdateEvent.h @@ -5,6 +5,7 @@ #include "lib/mercury/events/Event.h" #include "lib/orderman/orderman_utils/Book.h" #include "lib/orderman/orderman_utils/orderman_common.h" +#include "lib/tracing/PerfLog.h" namespace bts { namespace orderman { @@ -13,10 +14,10 @@ class BookUpdateEvent : public mercury::Event { public: using SynopsisPolicy = mercury::NoSynopsis; Book book; - PerfTrace trace; + trace::CorID trace; SecurityKey key() const { return book.security_key(); } - BookUpdateEvent(const Book &b, PerfTrace const &trace) + BookUpdateEvent(const Book &b, trace::CorID const &trace) : book(b), trace(trace) {} }; } diff --git a/src/lib/orderman/events/CancelOrderEvent.h b/src/lib/orderman/events/CancelOrderEvent.h index 9593dcd3c..cdc2fa563 100644 --- a/src/lib/orderman/events/CancelOrderEvent.h +++ b/src/lib/orderman/events/CancelOrderEvent.h @@ -4,6 +4,7 @@ #include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/mercury/events/Event.h" +#include "lib/tracing/PerfLog.h" namespace bts { namespace orderman { @@ -14,12 +15,12 @@ public: using SynopsisPolicy = mercury::NoSynopsis; CancelOrderEvent (OrderKey k) : k (k), trace() {} - CancelOrderEvent (OrderKey k,PerfTrace const&trace) : k (k), trace(trace) {} + CancelOrderEvent (OrderKey k,trace::CorID const&trace) : k (k), trace(trace) {} // used by ContentSubscription OrderKey key() const {return k;} OrderKey k; - PerfTrace trace; + trace::CorID trace; }; }} diff --git a/src/lib/orderman/events/CrackOrderEvent.h b/src/lib/orderman/events/CrackOrderEvent.h index 833df23ba..115826241 100644 --- a/src/lib/orderman/events/CrackOrderEvent.h +++ b/src/lib/orderman/events/CrackOrderEvent.h @@ -4,6 +4,7 @@ #include "lib/mercury/events/Event.h" #include "lib/orderman/orderman_utils/orderman_common.h" +#include "lib/tracing/PerfLog.h" namespace bts { namespace orderman { @@ -15,13 +16,13 @@ class CrackOrderEvent : public mercury::Event { CrackOrderEvent(OrderKey k) : k(k), trace() {} - CrackOrderEvent(OrderKey k, PerfTrace const &trace) + CrackOrderEvent(OrderKey k, trace::CorID const &trace) : k(k), trace(trace) {} // used by ContentSubscription OrderKey key() const { return k; } OrderKey k; - PerfTrace trace; + trace::CorID trace; }; } } diff --git a/src/lib/orderman/events/NewExecutionReportEvent.h b/src/lib/orderman/events/NewExecutionReportEvent.h index c1971d4ce..87fb02224 100644 --- a/src/lib/orderman/events/NewExecutionReportEvent.h +++ b/src/lib/orderman/events/NewExecutionReportEvent.h @@ -7,6 +7,8 @@ #include "lib/mercury/synopsis/CacheAll.h" #include "lib/orderman/orderman_utils/ExecutionReport.h" #include "lib/orderman/orderman_utils/orderman_common.h" +#include "lib/tracing/PerfLog.h" + #include #include @@ -19,10 +21,10 @@ class NewExecutionReportEvent : public mercury::Event { using Tag = GatewayName; using SynopsisPolicy = mercury::CacheAll; ExecutionReport const *data; - PerfTrace trace; + trace::CorID trace; // used by ContentSubscription OrderKey key() const { return data->order_key; } - NewExecutionReportEvent(const ExecutionReport *dt, PerfTrace const &trace) + NewExecutionReportEvent(const ExecutionReport *dt, trace::CorID const &trace) : data(dt), trace(trace){}; }; diff --git a/src/lib/orderman/events/OrderStateUpdateEvent.h b/src/lib/orderman/events/OrderStateUpdateEvent.h index 5e888040c..1083866ba 100644 --- a/src/lib/orderman/events/OrderStateUpdateEvent.h +++ b/src/lib/orderman/events/OrderStateUpdateEvent.h @@ -2,9 +2,10 @@ #include "lib/mercury/events/Event.h" #include "lib/orderman/orderman_utils/PerfTrace.h" -#include - #include "lib/api/services/OrderService.pb.h" +#include "lib/tracing/PerfLog.h" + +#include namespace bts { namespace orderman { @@ -15,7 +16,7 @@ class OrderStateUpdateEvent : public mercury::Event { OrderStateUpdateEvent(OrderKey key, OrderKey parent_key, api::orderman::OrderDefinition const &def, api::orderman::OrderState const &state, - PerfTrace const &trace = PerfTrace()) + trace::CorID const &trace = trace::CorID()) : key(key), parent_key(parent_key), trace(trace), definition(&def) { status = state.status(); @@ -51,7 +52,7 @@ class OrderStateUpdateEvent : public mercury::Event { double avg_price; std::string last_msg; - PerfTrace trace; + trace::CorID trace; api::orderman::OrderState::CustomCase custom; // native order state diff --git a/src/lib/orderman/events/UpdateOrderEvent.h b/src/lib/orderman/events/UpdateOrderEvent.h index 80c0f3c54..c514c9649 100644 --- a/src/lib/orderman/events/UpdateOrderEvent.h +++ b/src/lib/orderman/events/UpdateOrderEvent.h @@ -4,6 +4,7 @@ #include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/mercury/events/Event.h" +#include "lib/tracing/PerfLog.h" namespace bts { namespace orderman { @@ -17,7 +18,7 @@ public: k(k), price(p), quantity(q), trace() {} - UpdateOrderEvent (OrderKey k, Price p, Quantity q,PerfTrace const&trace) : + UpdateOrderEvent (OrderKey k, Price p, Quantity q,trace::CorID const&trace) : k(k), price(p), quantity(q), trace(trace) {} @@ -27,7 +28,7 @@ public: OrderKey k; Price price; Quantity quantity; - PerfTrace trace; + trace::CorID trace; }; }} diff --git a/src/lib/orderman/orders/DynamicOrder.cpp b/src/lib/orderman/orders/DynamicOrder.cpp index 3326b62e0..df6670c3f 100644 --- a/src/lib/orderman/orders/DynamicOrder.cpp +++ b/src/lib/orderman/orders/DynamicOrder.cpp @@ -49,13 +49,13 @@ void DynamicOrder::on_init_recovered(api::orderman::OrderRecord const &rec, } void DynamicOrder::on_activate(Price, Quantity, OrderServices &services, - PerfTrace const &) { + trace::CorID const &) { services.report_state(me->state); } -void DynamicOrder::on_update(Price, Quantity, PerfTrace const &) {} -void DynamicOrder::on_crack(PerfTrace const &) {} -void DynamicOrder::on_cancel(PerfTrace const &) {} +void DynamicOrder::on_update(Price, Quantity, trace::CorID const &) {} +void DynamicOrder::on_crack(trace::CorID const &) {} +void DynamicOrder::on_cancel(trace::CorID const &) {} } // namespace orderman } // namespace bts diff --git a/src/lib/orderman/orders/DynamicOrder.h b/src/lib/orderman/orders/DynamicOrder.h index 5318649bf..d346b6b5c 100644 --- a/src/lib/orderman/orders/DynamicOrder.h +++ b/src/lib/orderman/orders/DynamicOrder.h @@ -19,10 +19,10 @@ public: const PreActivationOrderServices&) override; void on_init_recovered(api::orderman::OrderRecord const&, const PreActivationOrderServices &) override; - void on_activate(Price,Quantity,OrderServices &, PerfTrace const&) override ; - void on_update(Price , Quantity,PerfTrace const&) override ; - void on_crack(PerfTrace const&) override ; - void on_cancel(PerfTrace const&) override ; + void on_activate(Price,Quantity,OrderServices &, trace::CorID const&) override ; + void on_update(Price , Quantity,trace::CorID const&) override ; + void on_crack(trace::CorID const&) override ; + void on_cancel(trace::CorID const&) override ; private: struct PImpl; diff --git a/src/lib/orderman/orders/IcebergOrder.cpp b/src/lib/orderman/orders/IcebergOrder.cpp index 4c26b07f9..df72b6911 100644 --- a/src/lib/orderman/orders/IcebergOrder.cpp +++ b/src/lib/orderman/orders/IcebergOrder.cpp @@ -104,7 +104,7 @@ void IcebergOrder::on_init_recovered(api::orderman::OrderRecord const &rec, } void IcebergOrder::on_activate(Price p, Quantity q, OrderServices &services, - PerfTrace const &) { + trace::CorID const &) { bts_assert(!me->services); me->services = &services; me->child_builder.activate(services); @@ -145,7 +145,7 @@ void IcebergOrder::on_activate(Price p, Quantity q, OrderServices &services, report_state(); } -void IcebergOrder::on_update(Price p, Quantity q, PerfTrace const &) { +void IcebergOrder::on_update(Price p, Quantity q, trace::CorID const &) { switch (me->state.status()) { case ORDER_STATUS_WORKING: case ORDER_STATUS_PENDING_WORKING: @@ -171,9 +171,9 @@ void IcebergOrder::on_update(Price p, Quantity q, PerfTrace const &) { report_state(); } -void IcebergOrder::on_crack(PerfTrace const &) {} +void IcebergOrder::on_crack(trace::CorID const &) {} -void IcebergOrder::on_cancel(PerfTrace const &) { +void IcebergOrder::on_cancel(trace::CorID const &) { switch (me->state.status()) { case ORDER_STATUS_WORKING: LOG(OrderMan, Info, "Canceling Iceberg Order {}", key().value()); @@ -255,7 +255,7 @@ void IcebergOrder::send_next_child_order() { key().value(), me->child.order.key().value(), to_send, me->state.price(), me->state.filled_quantity(), me->state.quantity()); - me->child.order.activate(Price(me->state.price()), Quantity(to_send), PerfTrace()); + me->child.order.activate(Price(me->state.price()), Quantity(to_send), trace::CorID()); } void IcebergOrder::on_child_order_update(OrderStateUpdateEvent const &ev) { diff --git a/src/lib/orderman/orders/IcebergOrder.h b/src/lib/orderman/orders/IcebergOrder.h index a7442b923..c0b3f8ceb 100644 --- a/src/lib/orderman/orders/IcebergOrder.h +++ b/src/lib/orderman/orders/IcebergOrder.h @@ -20,10 +20,10 @@ public: const PreActivationOrderServices&) override; void on_init_recovered(api::orderman::OrderRecord const&, const PreActivationOrderServices &) override; - void on_activate(Price,Quantity,OrderServices &, PerfTrace const&) override ; - void on_update(Price , Quantity,PerfTrace const&) override ; - void on_crack(PerfTrace const&) override ; - void on_cancel(PerfTrace const&) override ; + void on_activate(Price,Quantity,OrderServices &, trace::CorID const&) override ; + void on_update(Price , Quantity,trace::CorID const&) override ; + void on_crack(trace::CorID const&) override ; + void on_cancel(trace::CorID const&) override ; private: void report_state(); diff --git a/src/lib/orderman/orders/NativeOrder.cpp b/src/lib/orderman/orders/NativeOrder.cpp index acb980068..78e4a1c26 100644 --- a/src/lib/orderman/orders/NativeOrder.cpp +++ b/src/lib/orderman/orders/NativeOrder.cpp @@ -274,15 +274,9 @@ NativeOrder::~NativeOrder() {} void NativeOrder::on_activate(Price p, Quantity q, bts::orderman::OrderServices &services, - PerfTrace const &t) { - LOG(Latency, Info, "on_activate start {}", key().value()); - - auto trace = t; - trace.order_key = key().value(); - trace.order_update = utils::TimeStamp::now(); - - tracepoint(bts_trace, trace_order, (char *)"on_activate", 0, trace.md_sn, - key().value()); + trace::CorID const &trace) { + services.log(trace,"on_activate_start",key().value()); + bts_assert(!me->services); me->services = &services; @@ -390,14 +384,13 @@ void NativeOrder::on_activate(Price p, Quantity q, auto const &ts = services.get_time_str(); me->create_transact_time_bm = encoding.overwrite( me->create_transact_time_bm, &ts.value()[0], ts.value().size()); - trace.send_fix_buffer = utils::TimeStamp::now(); + services.log(trace,"send_fix_buffer",key().value()); me->session_services->queue_fix(jetfix::MessageTypes::NewOrderSingle, me->create_encoding, trace); me->session_services->governor().record_sent(); me->state.set_status(ORDER_STATUS_PENDING_WORKING); - LOG(Latency, Diag, "on_activate done fix {} t: {}us", key().value(), - (utils::TimeStamp::now() - trace.order_update).microseconds()); + services.log(trace,"on_activate_done",key().value()); LOG(OrderMan, Info, "Sent new order with key {} to gateway", key().value()); // early return so we skip the expensive report_state() call @@ -458,12 +451,9 @@ void NativeOrder::on_activate(Price p, Quantity q, report_state(); } -void NativeOrder::on_update(Price p, Quantity q, PerfTrace const &t) { - auto trace = t; - trace.order_update = utils::TimeStamp::now(); - trace.order_key = key().value(); - tracepoint(bts_trace, trace_order, (char *)"on_update.begin", 0, trace.md_sn, - trace.order_key); +void NativeOrder::on_update(Price p, Quantity q, trace::CorID const &trace) { + + me->services->log(trace,"order_update",key().value()); switch (me->state.status()) { @@ -564,9 +554,9 @@ void NativeOrder::on_update(Price p, Quantity q, PerfTrace const &t) { report_state(); } -void NativeOrder::on_crack(PerfTrace const &) {} +void NativeOrder::on_crack(trace::CorID const &) {} -void NativeOrder::on_cancel(PerfTrace const &trace) { +void NativeOrder::on_cancel(trace::CorID const &trace) { switch (me->state.status()) { case ORDER_STATUS_WORKING: { @@ -818,7 +808,7 @@ void NativeOrder::update_working_position() { key().value(), me->definition.security_key()); } -void NativeOrder::report_state(PerfTrace const &trace) { +void NativeOrder::report_state(trace::CorID const &trace) { update_working_position(); me->services->report_state(me->state, trace); } diff --git a/src/lib/orderman/orders/NativeOrder.h b/src/lib/orderman/orders/NativeOrder.h index d1b52279c..88c040a58 100644 --- a/src/lib/orderman/orders/NativeOrder.h +++ b/src/lib/orderman/orders/NativeOrder.h @@ -3,7 +3,7 @@ #include #include "lib/orderman/orders/Order.h" #include "lib/api/services/OrderService.pb.h" -#include "lib/orderman/orderman_utils/PerfTrace.h" +#include "lib/tracing/PerfLog.h" namespace bts { namespace orderman { @@ -24,10 +24,10 @@ public: const PreActivationOrderServices&) override; void on_init_recovered(api::orderman::OrderRecord const&, const PreActivationOrderServices &) override; - void on_activate(Price,Quantity,OrderServices &, PerfTrace const&) override ; - void on_update(Price , Quantity,PerfTrace const&) override ; - void on_crack(PerfTrace const&) override ; - void on_cancel(PerfTrace const&) override ; + void on_activate(Price,Quantity,OrderServices &, trace::CorID const&) override ; + void on_update(Price , Quantity,trace::CorID const&) override ; + void on_crack(trace::CorID const&) override ; + void on_cancel(trace::CorID const&) override ; void on_init_from_exe_report(ExecutionReport const&,const PreActivationOrderServices &); private: @@ -36,7 +36,7 @@ private: void on_exe_report(const NewExecutionReportEvent &); void on_cancel_reject(const CancelRejectEvent&); void on_gateway_status(const GatewayStatusChangeEvent&); - void report_state(PerfTrace const&trace = PerfTrace()); + void report_state(trace::CorID const&trace = trace::CorID()); void init_fix(); void add_exchange_order_id_to_fix(); diff --git a/src/lib/orderman/orders/Order.h b/src/lib/orderman/orders/Order.h index 4a4606e22..eebcea1bf 100644 --- a/src/lib/orderman/orders/Order.h +++ b/src/lib/orderman/orders/Order.h @@ -5,6 +5,7 @@ // fwd namespace bts { +namespace trace {struct CorID;} namespace securities { class ISecurityDB; } @@ -45,12 +46,12 @@ class Order { const PreActivationOrderServices &) = 0; // activation - cannot be slow - virtual void on_activate(Price, Quantity, OrderServices &, PerfTrace const&) = 0; + virtual void on_activate(Price, Quantity, OrderServices &, trace::CorID const&) = 0; // order is running, maintenance - virtual void on_update(Price, Quantity, PerfTrace const&) = 0; - virtual void on_crack(PerfTrace const&) = 0; - virtual void on_cancel(PerfTrace const&) = 0; + virtual void on_update(Price, Quantity, trace::CorID const&) = 0; + virtual void on_crack(trace::CorID const&) = 0; + virtual void on_cancel(trace::CorID const&) = 0; private: OrderKey _key; diff --git a/src/lib/orderman/orders/TimeBoxOrder.cpp b/src/lib/orderman/orders/TimeBoxOrder.cpp index 1a3dfa6cb..8ad686489 100644 --- a/src/lib/orderman/orders/TimeBoxOrder.cpp +++ b/src/lib/orderman/orders/TimeBoxOrder.cpp @@ -85,7 +85,7 @@ void TimeBoxOrder::on_init_recovered(api::orderman::OrderRecord const &rec, } void TimeBoxOrder::on_activate(Price p, Quantity q, OrderServices &services, - PerfTrace const &) { + trace::CorID const &) { bts_assert(!me->services); me->services = &services; me->child_builder.activate(services); @@ -123,7 +123,7 @@ void TimeBoxOrder::on_activate(Price p, Quantity q, OrderServices &services, report_state(); } -void TimeBoxOrder::on_update(Price p, Quantity q, PerfTrace const &) { +void TimeBoxOrder::on_update(Price p, Quantity q, trace::CorID const &) { LOG(OrderMan, Info, "Updating TimeBox Order {}", key().value()); switch (me->state.status()) { @@ -183,9 +183,9 @@ void TimeBoxOrder::on_update(Price p, Quantity q, PerfTrace const &) { report_state(); } -void TimeBoxOrder::on_crack(PerfTrace const &) {} +void TimeBoxOrder::on_crack(trace::CorID const &) {} -void TimeBoxOrder::on_cancel(PerfTrace const &) { +void TimeBoxOrder::on_cancel(trace::CorID const &) { LOG(OrderMan, Info, "Canceling TimeBox Order {}", key().value()); switch (me->state.status()) { diff --git a/src/lib/orderman/orders/TimeBoxOrder.h b/src/lib/orderman/orders/TimeBoxOrder.h index 3a403ee38..9475a5a37 100644 --- a/src/lib/orderman/orders/TimeBoxOrder.h +++ b/src/lib/orderman/orders/TimeBoxOrder.h @@ -19,10 +19,10 @@ public: const PreActivationOrderServices&) override; void on_init_recovered(api::orderman::OrderRecord const&, const PreActivationOrderServices &) override; - void on_activate(Price,Quantity,OrderServices &, PerfTrace const&) override ; - void on_update(Price , Quantity,PerfTrace const&) override ; - void on_crack(PerfTrace const&) override ; - void on_cancel(PerfTrace const&) override ; + void on_activate(Price,Quantity,OrderServices &, trace::CorID const&) override ; + void on_update(Price , Quantity,trace::CorID const&) override ; + void on_crack(trace::CorID const&) override ; + void on_cancel(trace::CorID const&) override ; private: void report_state(); diff --git a/src/lib/orderman/orders/TriggerOrder.cpp b/src/lib/orderman/orders/TriggerOrder.cpp index 7b9bdda84..5b8f2cc5f 100644 --- a/src/lib/orderman/orders/TriggerOrder.cpp +++ b/src/lib/orderman/orders/TriggerOrder.cpp @@ -101,7 +101,7 @@ void TriggerOrder::on_init_recovered(const api::orderman::OrderRecord &rec, } } void TriggerOrder::on_activate(Price price, Quantity qty, - OrderServices &services, PerfTrace const &) { + OrderServices &services, trace::CorID const &) { LOG(OrderMan, Info, "TriggerOrder::on_activate key:{} state:{} price:{} qty:{}", key(), _state, price, qty); @@ -140,7 +140,7 @@ void TriggerOrder::on_activate(Price price, Quantity qty, } } // order price, qty change -void TriggerOrder::on_update(Price price, Quantity qty, PerfTrace const &) { +void TriggerOrder::on_update(Price price, Quantity qty, trace::CorID const &) { LOG(OrderMan, Info, "TriggerOrder::on_update key:{} state:{} price:{} qty:{}", key(), _state, price, qty); @@ -166,10 +166,10 @@ void TriggerOrder::on_update(Price price, Quantity qty, PerfTrace const &) { break; } } -void TriggerOrder::on_crack(PerfTrace const &) { +void TriggerOrder::on_crack(trace::CorID const &) { // not supported } -void TriggerOrder::on_cancel(PerfTrace const &) { +void TriggerOrder::on_cancel(trace::CorID const &) { LOG(OrderMan, Info, "TriggerOrder::on_cancel key:{} state:{}", key(), _state); me->cancel_mode = CancelMode::external; diff --git a/src/lib/orderman/orders/TriggerOrder.h b/src/lib/orderman/orders/TriggerOrder.h index f79013ef6..a62c82cba 100644 --- a/src/lib/orderman/orders/TriggerOrder.h +++ b/src/lib/orderman/orders/TriggerOrder.h @@ -56,10 +56,10 @@ public: const PreActivationOrderServices &) override; void on_activate(Price, Quantity, OrderServices&, - PerfTrace const&) override ; - void on_update(Price, Quantity, PerfTrace const&) override; - void on_crack(PerfTrace const&) override; - void on_cancel(PerfTrace const&) override; + trace::CorID const&) override ; + void on_update(Price, Quantity, trace::CorID const&) override; + void on_crack(trace::CorID const&) override; + void on_cancel(trace::CorID const&) override; private: // callbacks from book and child order udpates void _on_book_update(const BookUpdateEvent&); diff --git a/src/lib/orderman/orders/book_algos/BookAlgo.cpp b/src/lib/orderman/orders/book_algos/BookAlgo.cpp index 6cad96f9c..5298aa9d0 100644 --- a/src/lib/orderman/orders/book_algos/BookAlgo.cpp +++ b/src/lib/orderman/orders/book_algos/BookAlgo.cpp @@ -140,7 +140,7 @@ void BookAlgo::on_init_recovered(const api::orderman::OrderRecord &rec, } void BookAlgo::on_activate(Price p, Quantity q, OrderServices &services, - PerfTrace const &) { + trace::CorID const &) { bts_assert(!me->services); me->services = &services; switch (this_state().status()) { @@ -181,7 +181,7 @@ void BookAlgo::on_activate(Price p, Quantity q, OrderServices &services, report_state(); } -void BookAlgo::on_update(Price p, Quantity q, PerfTrace const &) { +void BookAlgo::on_update(Price p, Quantity q, trace::CorID const &) { LOG(OrderMan, Info, "Updating BookAlgo {}", key().value()); switch (this_state().status()) { case ORDER_STATUS_WORKING: @@ -235,9 +235,9 @@ void BookAlgo::on_update(Price p, Quantity q, PerfTrace const &) { report_state(); } -void BookAlgo::on_crack(PerfTrace const &) {} +void BookAlgo::on_crack(trace::CorID const &) {} -void BookAlgo::on_cancel(PerfTrace const &) { +void BookAlgo::on_cancel(trace::CorID const &) { LOG(OrderMan, Info, "Canceling BookAlgo Order {}", key().value()); switch (this_state().status()) { diff --git a/src/lib/orderman/orders/book_algos/BookAlgo.h b/src/lib/orderman/orders/book_algos/BookAlgo.h index 7c01878a0..689bb1da0 100644 --- a/src/lib/orderman/orders/book_algos/BookAlgo.h +++ b/src/lib/orderman/orders/book_algos/BookAlgo.h @@ -24,10 +24,10 @@ public: const PreActivationOrderServices&) override; void on_init_recovered(const api::orderman::OrderRecord&, const PreActivationOrderServices &) override; - void on_activate(Price,Quantity,OrderServices &, PerfTrace const&) override ; - void on_update(Price , Quantity,PerfTrace const&) override ; - void on_crack(PerfTrace const&) override ; - void on_cancel(PerfTrace const&) override ; + void on_activate(Price,Quantity,OrderServices &, trace::CorID const&) override ; + void on_update(Price , Quantity,trace::CorID const&) override ; + void on_crack(trace::CorID const&) override ; + void on_cancel(trace::CorID const&) override ; protected: virtual void setup_child(const api::orderman::OrderDefinition& parent, const PreActivationOrderServices&, diff --git a/src/lib/orderman/orders/spreader_orders/ISpreaderStateWorker.h b/src/lib/orderman/orders/spreader_orders/ISpreaderStateWorker.h index c5519bddb..f4ef18dca 100644 --- a/src/lib/orderman/orders/spreader_orders/ISpreaderStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/ISpreaderStateWorker.h @@ -34,7 +34,7 @@ public: // 5. called when the user cancels an order virtual void on_cancel() = 0; // 6. on market data update (support late joiners) - virtual void on_book(const Book&,PerfTrace &) = 0; + virtual void on_book(const Book&,trace::CorID &) = 0; // 15. settlement price update virtual void on_settlement_price(const SettlementUpdateEvent&) = 0; // 7. time event called by the infrastructure @@ -43,7 +43,7 @@ public: virtual void on_quoter_order_error(SpreaderLegData& leg_data) = 0; // 9. on a quoter order fill virtual void on_quoter_order_fill(SpreaderLegData& leg_data, - PerfTrace &) = 0; + trace::CorID &) = 0; // 10. on a quoter status update without a fill virtual void on_quoter_order_status_update(SpreaderLegData& leg_data) = 0; // 11. when a hedger order ack from the exchange has an error diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp index cccba1190..8b5131a7e 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp @@ -54,26 +54,26 @@ void SpreaderOrder::on_init_recovered(const bts::api::orderman::OrderRecord& ord _report_state(); } void SpreaderOrder::on_activate(Price price, Quantity quantity, - OrderServices& services, const PerfTrace&){ + OrderServices& services, const trace::CorID&){ if (!_active) return; SpreaderOrderServices spreader_order_services (&services); _on_activate(price, quantity, spreader_order_services); _report_state(); } -void SpreaderOrder::on_update(Price price, Quantity quantity,PerfTrace const&){ +void SpreaderOrder::on_update(Price price, Quantity quantity,trace::CorID const&){ if (!_active) return; LOG(OrderMan, Info, "SpreaderOrder.on_update key:{} price:{} quantity:{}", key().value(), price.value(), quantity.value()); _state_worker->on_update(price, quantity); _report_state(); } -void SpreaderOrder::on_cancel(PerfTrace const&){ +void SpreaderOrder::on_cancel(trace::CorID const&){ if (!_active) return; LOG(OrderMan, Info, "SpreaderOrder.on_cancel key:{}", key().value()); _state_worker->on_cancel(); _report_state(); } -void SpreaderOrder::on_crack(PerfTrace const&){ +void SpreaderOrder::on_crack(trace::CorID const&){ if (!_active) return; LOG(OrderMan, Info, "SpreaderOrder.on_crack key: {}", key().value()); _state_worker->on_crack(); @@ -100,10 +100,9 @@ void SpreaderOrder::_on_time(const bts::mercury::TimerEvent& t_event){ } void SpreaderOrder::_on_book_update(const BookUpdateEvent& book_event){ if (!_active) return; - tracepoint (bts_trace,trace_order,(char*) "_on_book_update", key().value(),book_event.trace.md_sn,0); - auto trace = book_event.trace; - trace.spreader_on_book = utils::TimeStamp::now(); - _state_worker->on_book (book_event.book,trace); + + _order_services->order_services().log(book_event.trace,"spreader_on_book", key().value()); + _state_worker->on_book (book_event.book,book_event.trace); } void SpreaderOrder::_on_settlement_update(const SettlementUpdateEvent& settlement_event){ @@ -315,7 +314,7 @@ bool SpreaderOrder::_quoters_can_accept_modification (){ void SpreaderOrder::_send_hedge(size_t hedge_leg_index, Price hedge_price, Quantity hedge_qty, - const PerfTrace &trace){ + const trace::CorID &trace){ LOG(OrderMan, Info, "SpreaderOrder::_send_hedge key:{} hedge_leg_index:{} " "hedge_price:{} hedge_qty:{} cid:{}", key(), hedge_leg_index, hedge_price, hedge_qty, trace.md_sn); diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h index 9b377d948..f97a8e68c 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h @@ -99,15 +99,15 @@ public: const PreActivationOrderServices&) override; // this is in the critical path, orders can be submitted now // (this is only called once and after the on_init_new) - void on_activate(Price, Quantity, OrderServices&,PerfTrace const&) override; + void on_activate(Price, Quantity, OrderServices&,trace::CorID const&) override; // called when the user (or a higher level order) // updates the order's price or quantity - void on_update(Price, Quantity,PerfTrace const&) override; + void on_update(Price, Quantity,trace::CorID const&) override; // called when the user (or higher level order) cancels an order - void on_cancel(PerfTrace const&) override; + void on_cancel(trace::CorID const&) override; // crack means to let the lower level orders lose from the higher // level order and cancel the higher level order - void on_crack(PerfTrace const&) override; + void on_crack(trace::CorID const&) override; // ISpreaderManager //////////////////// //////////////////////////////////////// public: @@ -178,7 +178,7 @@ private: void _send_hedge(size_t hedge_leg_index, Price hedge_price, Quantity hedge_qty, - PerfTrace const&); + trace::CorID const&); void _compute_hedge_price_quantity(size_t filled_leg_index, Price filled_price, double filled_quantity, @@ -251,7 +251,7 @@ public: SpreaderBookkeepingData& test_only_func_spreader_full_data () {return _bookkeeping_data();} int64_t test_cancel_timeout () {return _cancel_timeout;} void test_only_on_book_update(const bts::orderman::BookUpdateEvent& b) {_on_book_update(b);} - void test_only_on_book_update(const bts::orderman::Book& b, PerfTrace const&trace) {_on_book_update(bts::orderman::BookUpdateEvent(b, trace));} + void test_only_on_book_update(const bts::orderman::Book& b, trace::CorID const&trace) {_on_book_update(bts::orderman::BookUpdateEvent(b, trace));} void test_only_on_child_order_update (bts::orderman::OrderKey order_key, bts::api::orderman::OrderStatus status, Quantity total_filled_qty, Price avg_price) { bts::api::orderman::OrderDefinition order_def; @@ -260,7 +260,7 @@ public: order_state.set_status(status); order_state.set_filled_quantity(total_filled_qty.value()); order_state.set_last_price(avg_price.value()); - OrderStateUpdateEvent ord_ev (order_key, OrderKey(0), order_def, order_state,PerfTrace()); + OrderStateUpdateEvent ord_ev (order_key, OrderKey(0), order_def, order_state,trace::CorID()); _on_child_order_update (ord_ev); } void test_only_on_init_new(const bts::api::orderman::OrderDefinition& order_def, const SpreaderPreActivationOrderServices& pao_services) {_on_init_new(order_def, pao_services);} diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp index 5025a4c2d..2060e02fd 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp @@ -14,7 +14,7 @@ SingleFillHedger::SingleFillHedger(ISpreaderManager& spreader_manager, ChildOrder& child_order, bts::Price hedge_price, bts::Quantity hedge_quantity, - PerfTrace const &fill_trace, + trace::CorID const &fill_trace, bool is_live) : _spreader(spreader_manager), @@ -94,7 +94,7 @@ void SingleFillHedger::on_order_update(const SpreaderChildOrderState& u){ u.last_update_filled_quantity()); _worker->on_order_update (u); } -void SingleFillHedger::on_book(const bts::orderman::Book& book,PerfTrace &trace){ +void SingleFillHedger::on_book(const bts::orderman::Book& book,trace::CorID &trace){ _worker->on_book (book,trace); } void SingleFillHedger::cancel_hedge(){ diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h index 9b9fa926c..1e3bf495c 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h @@ -30,7 +30,7 @@ private: const LegPropertyData& _leg_property_data; SpreaderChildOrderState _child_order_state; HedgePriceQuantityState _price_quantity_state; - PerfTrace _fill_trace; + trace::CorID _fill_trace; IHedgerStateWorker* _worker; HedgerStartStateWorker _start_state_worker; HedgerWaitingForFirstAckStateWorker _waiting_for_first_ack_state_worker; @@ -71,7 +71,7 @@ public: ChildOrder& child_order, bts::Price hedge_price, bts::Quantity hedge_quantity, - PerfTrace const &trace, + trace::CorID const &trace, bool is_live); SingleFillHedger() = delete; SingleFillHedger (const SingleFillHedger&) = delete; @@ -88,7 +88,7 @@ public: void on_order_update(const SpreaderChildOrderState& order_update_message); //c. called when the market data associated // with this security is changed - void on_book(const bts::orderman::Book& book,PerfTrace &); + void on_book(const bts::orderman::Book& book,trace::CorID &); //d. called when the hedge order is cancelled, either // manually or automatically void cancel_hedge(); diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp index 573b1dbf8..b48208383 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp @@ -101,7 +101,7 @@ void SingleLegQuoter::update_order_status(const SpreaderChildOrderState& u){ } } void SingleLegQuoter::on_book(size_t leg_index, - const bts::orderman::Book& book,PerfTrace &trace){ + const bts::orderman::Book& book,trace::CorID &trace){ if (_active_quoting) _worker->on_book (leg_index, book,trace); } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h index c55968042..5139254d9 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h @@ -101,7 +101,7 @@ public: //c. called when the market data associated // with this security is changed void on_book(size_t leg_index, - const bts::orderman::Book&,PerfTrace &); + const bts::orderman::Book&,trace::CorID &); //d. called when the order is cancelled, either // manually or automatically void cancel_order(); @@ -171,13 +171,13 @@ private: } void _place_order (Price price, Quantity quantity, - const PerfTrace &trace) { + const trace::CorID &trace) { _child_order_state.place_order(price, quantity, _spreader.current_time(), trace); } - void _modify_order (Price price, Quantity quantity, PerfTrace &trace) { + void _modify_order (Price price, Quantity quantity, trace::CorID &trace) { _child_order_state.modify_order(price, quantity, trace); } void _cancel_order () {_child_order_state.cancel_order();} diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp index 2e8064684..7a3c8d5b5 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp @@ -84,10 +84,10 @@ SingleFillHedger& SpreaderBookkeepingData::add_new_hedger(ISpreaderManager& spre size_t leg_index, bts::Price hedge_price, bts::Quantity hedge_quantity, - const PerfTrace &trace){ + const trace::CorID &trace){ LOG(OrderMan, Info, "SpreaderBookkeepingData::add_new_hedger " "leg_index:{} price:{} quantity:{} cid:{}", - leg_index, hedge_price, hedge_quantity,trace.md_sn); + leg_index, hedge_price, hedge_quantity,trace.sn); bts_assert(leg_index < _n_legs); SpreaderLegData& leg_data = _leg_data[leg_index]; std::vector& leg_hedgers = _hedgers[leg_index]; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h index 77998a4f1..0d1b4832f 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h @@ -108,7 +108,7 @@ public: size_t leg_index, bts::Price hedge_price, bts::Quantity hedge_quantity, - PerfTrace const &); + trace::CorID const &); // finds the spreader fill, price (ie averages it out, using // the size and price ratio, across all legs) void total_fills (Quantity& out_quantity, Price& out_price) const; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h index aa42e7b85..1f8f9c875 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h @@ -130,7 +130,7 @@ public: void place_order(Price price, Quantity quantity, bts::TimeStamp curr_time, - const PerfTrace& trace){ + const trace::CorID& trace){ _out_price = price; _out_quantity = quantity; _order_place_time=curr_time; @@ -140,15 +140,15 @@ public: "key:{} is_quoting:{} sec_key:{} live:{} " "price:{} qty:{} cid:{}", order_key(), _is_quoting, _sec_key, - _is_live, price, quantity, trace.md_sn); + _is_live, price, quantity, trace.sn); if (_is_live) _child_order.activate(price, quantity, trace); } void modify_order(Price price, Quantity quantity){ - PerfTrace dont_care; + trace::CorID dont_care; modify_order(price,quantity,dont_care); } - void modify_order(Price price, Quantity quantity, PerfTrace &trace){ + void modify_order(Price price, Quantity quantity, trace::CorID &trace){ _out_price = price; _out_quantity = quantity; _n_modify_orders++; @@ -158,7 +158,6 @@ public: order_key(), _is_quoting, _sec_key, _is_live, price, quantity, _n_modify_orders); if (_is_live) { - trace.spreader_modify_order = utils::TimeStamp::now(); _child_order.update(price, quantity, trace); } } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/IHedgerStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/IHedgerStateWorker.h index 186c8d074..ff966a518 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/IHedgerStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/IHedgerStateWorker.h @@ -5,6 +5,7 @@ #include "lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerState.h" namespace bts { +namespace trace {struct CorID;} namespace orderman {class Book;} namespace orderman { class SpreaderChildOrderState; @@ -24,7 +25,7 @@ public: virtual void on_order_update (const SpreaderChildOrderState& order_update) = 0; // called only when the security that the hedger is working on // has a market data update - virtual void on_book (const bts::orderman::Book& book,PerfTrace &) = 0; + virtual void on_book (const bts::orderman::Book& book,trace::CorID &) = 0; // when the spreader wants the hedger to cancel its order virtual void cancel() = 0; // on terminate, the hedger should simply go to its end state diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp index ac6a92a71..61ce32ef4 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp @@ -9,7 +9,7 @@ void HedgerEndStateWorker::init(){ } void HedgerEndStateWorker::on_order_update(const SpreaderChildOrderState&){ } -void HedgerEndStateWorker::on_book(const bts::orderman::Book&,PerfTrace &){ +void HedgerEndStateWorker::on_book(const bts::orderman::Book&,trace::CorID &){ } void HedgerEndStateWorker::cancel(){ } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.h index 1ab5917b5..549d67306 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.h @@ -17,7 +17,7 @@ public: const std::string state_text () const override {return "END";} void init () override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (const bts::orderman::Book& book,PerfTrace &) override; + void on_book (const bts::orderman::Book& book,trace::CorID &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp index b23d78c92..1ed919153 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp @@ -18,7 +18,7 @@ void HedgerStartStateWorker::init(){ void HedgerStartStateWorker::on_order_update(const SpreaderChildOrderState&){ bts_assert_msg (false, "HedgerStartStateWorker::on_order_update illegal operation"); } -void HedgerStartStateWorker::on_book(const bts::orderman::Book&,PerfTrace &){ +void HedgerStartStateWorker::on_book(const bts::orderman::Book&,trace::CorID &){ // market data will not be sent until out of start. bts_assert_msg (false, "HedgerStartStateWorker::on_book illegal operation"); } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.h index 37c9c79ef..12757001b 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.h @@ -21,7 +21,7 @@ public: const std::string state_text () const override {return "START";} void init () override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (const bts::orderman::Book& book,PerfTrace &) override; + void on_book (const bts::orderman::Book& book,trace::CorID &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp index 92bc38267..c31a3a112 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp @@ -17,7 +17,7 @@ void HedgerWaitingForCancelAckStateWorker::on_order_update(const SpreaderChildOr _hedger->transform_to_END (); } } -void HedgerWaitingForCancelAckStateWorker::on_book(const bts::orderman::Book&,PerfTrace &){ +void HedgerWaitingForCancelAckStateWorker::on_book(const bts::orderman::Book&,trace::CorID &){ } void HedgerWaitingForCancelAckStateWorker::cancel(){ } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.h index 6a7800ec5..d2be51786 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.h @@ -21,7 +21,7 @@ public: const std::string state_text () const override {return "WAITING_FOR_CANCEL_ACK";} void init () override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (const bts::orderman::Book& book,PerfTrace &) override; + void on_book (const bts::orderman::Book& book,trace::CorID &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp index e8b5bf049..084b8c3de 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp @@ -23,7 +23,7 @@ void HedgerWaitingForFirstAckCancelledStateWorker::on_order_update(const Spreade _hedger->transform_to_WAITING_FOR_CANCEL_ACK (); } } -void HedgerWaitingForFirstAckCancelledStateWorker::on_book(const bts::orderman::Book&,PerfTrace &){ +void HedgerWaitingForFirstAckCancelledStateWorker::on_book(const bts::orderman::Book&,trace::CorID &){ } void HedgerWaitingForFirstAckCancelledStateWorker::cancel(){ } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.h index 21f542f5b..97383f885 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.h @@ -21,7 +21,7 @@ public: const std::string state_text () const override {return "WAITING_FOR_FIRST_ACK_CANCELLED";} void init () override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (const bts::orderman::Book& book,PerfTrace &) override; + void on_book (const bts::orderman::Book& book,trace::CorID &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp index 8e5a7e396..cb99478c4 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp @@ -18,7 +18,7 @@ void HedgerWaitingForFirstAckStateWorker::on_order_update(const SpreaderChildOrd // this means the first ack _hedger->transform_to_WORKING (); } -void HedgerWaitingForFirstAckStateWorker::on_book(const bts::orderman::Book&,PerfTrace &){ +void HedgerWaitingForFirstAckStateWorker::on_book(const bts::orderman::Book&,trace::CorID &){ } void HedgerWaitingForFirstAckStateWorker::cancel(){ _hedger->transform_to_WAITING_FOR_FIRST_ACK_CANCELLED (); diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.h index 900e6b4ed..b1ca9c5f0 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.h @@ -21,7 +21,7 @@ public: const std::string state_text () const override {return "WAITING_FOR_FIRST_ACK";} void init () override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (const bts::orderman::Book& book,PerfTrace &) override; + void on_book (const bts::orderman::Book& book,trace::CorID &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp index 019b87e21..aebb18a6a 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp @@ -20,7 +20,7 @@ void HedgerWorkingStateWorker::on_order_update(const SpreaderChildOrderState& or _hedger->transform_to_END (); } } -void HedgerWorkingStateWorker::on_book(const bts::orderman::Book&,PerfTrace &){ +void HedgerWorkingStateWorker::on_book(const bts::orderman::Book&,trace::CorID &){ double new_price; if (SpreaderUtils::post_hedge_market_based_price_action (_hedger->_price_quantity_state.out_price().value(), _hedger->_price_quantity_state.out_quantity().value(), diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.h index be0201d94..1e23979ff 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.h @@ -24,7 +24,7 @@ public: const std::string state_text () const override {return "WORKING";} void init () override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (const bts::orderman::Book& book,PerfTrace &) override; + void on_book (const bts::orderman::Book& book,trace::CorID &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/IQuoterStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/IQuoterStateWorker.h index 909239e1b..a83697af0 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/IQuoterStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/IQuoterStateWorker.h @@ -26,7 +26,7 @@ public: virtual void on_order_update (const SpreaderChildOrderState& order_update) = 0; // called when any of the legs in the spread has a book update //virtual void on_book (TickToTradeCorID corid, size_t leg_id, const Book& book) = 0; - virtual void on_book (size_t, const bts::orderman::Book&,PerfTrace &) = 0; + virtual void on_book (size_t, const bts::orderman::Book&,trace::CorID &) = 0; // when the spreader wants the quoter to cancel its order virtual void cancel() = 0; // on terminate, the quoter should simply go to its end state diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp index d73bfc9b4..24c417c8f 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp @@ -29,7 +29,7 @@ void QuoterEndStateWorker::one_time_activate (Price, Quantity){ void QuoterEndStateWorker::on_order_update (const SpreaderChildOrderState&) {} void QuoterEndStateWorker::on_book (size_t, - const bts::orderman::Book&,PerfTrace &) + const bts::orderman::Book&,trace::CorID &) {} void QuoterEndStateWorker::cancel() {} diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.h index c8342757a..2a52ee1a6 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.h @@ -25,7 +25,7 @@ public: virtual void on_transition () override; void one_time_activate (Price, Quantity) override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (size_t leg_id, const bts::orderman::Book& book,PerfTrace &) override; + void on_book (size_t leg_id, const bts::orderman::Book& book,trace::CorID &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp& ts) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp index 754a3aa47..38d3b9dea 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp @@ -24,7 +24,7 @@ void QuoterStartStateWorker::on_order_update (const SpreaderChildOrderState&){ bts_assert_msg (false, "QuoterStartStateWorker::on_order_update is an illegal operation, nothing can happen before one_time_activate"); } void QuoterStartStateWorker::on_book (size_t, - const bts::orderman::Book&,PerfTrace &){ + const bts::orderman::Book&,trace::CorID &){ } void QuoterStartStateWorker::cancel(){ // since no order has been sent for this leg, diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.h index 05e9f74d2..dae5ada02 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.h @@ -23,7 +23,7 @@ public: virtual void on_transition () override {} void one_time_activate (Price, Quantity) override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (size_t leg_id, const bts::orderman::Book& book,PerfTrace &) override; + void on_book (size_t leg_id, const bts::orderman::Book& book,trace::CorID &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp& ts) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp index bbef8d47c..bf493f55f 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp @@ -21,7 +21,7 @@ void QuoterWaitingForCancelAckStateWorker::on_order_update (const SpreaderChildO } void QuoterWaitingForCancelAckStateWorker::on_book (size_t, const bts::orderman::Book&, - PerfTrace &){ + trace::CorID &){ } void QuoterWaitingForCancelAckStateWorker::cancel(){ } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.h index bd8a4be24..9ef9d2409 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.h @@ -24,7 +24,7 @@ public: virtual void on_transition () override {} void one_time_activate (Price, Quantity) override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (size_t leg_id, const bts::orderman::Book& book,PerfTrace &) override; + void on_book (size_t leg_id, const bts::orderman::Book& book,trace::CorID &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp& ts) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp index dac791970..b674b1d3b 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp @@ -25,7 +25,7 @@ void QuoterWaitingForFirstAckCancelledWorker::on_order_update (const SpreaderChi _quoter->_transform_to_WAITING_FOR_CANCEL_ACK (); } } -void QuoterWaitingForFirstAckCancelledWorker::on_book (size_t , const bts::orderman::Book& ,PerfTrace &) { +void QuoterWaitingForFirstAckCancelledWorker::on_book (size_t , const bts::orderman::Book& ,trace::CorID &) { } void QuoterWaitingForFirstAckCancelledWorker::cancel(){ } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.h index 60db96ace..085e9b919 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.h @@ -30,7 +30,7 @@ public: virtual void on_transition () override {} void one_time_activate (Price, Quantity) override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (size_t leg_id, const bts::orderman::Book& book,PerfTrace &) override; + void on_book (size_t leg_id, const bts::orderman::Book& book,trace::CorID &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp& ts) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp index c68d7db84..cd5e845b2 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp @@ -22,7 +22,7 @@ void QuoterWaitingForFirstAckWorker::on_order_update (const SpreaderChildOrderSt _quoter->_transform_to_WORKING (); } void QuoterWaitingForFirstAckWorker::on_book (size_t, - const bts::orderman::Book&,PerfTrace &){ + const bts::orderman::Book&,trace::CorID &){ _analyze_and_act(); } void QuoterWaitingForFirstAckWorker::cancel(){ diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.h index ded3b991b..d4c8d0ed0 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.h @@ -28,7 +28,7 @@ public: virtual void on_transition () override {} void one_time_activate (Price, Quantity) override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (size_t leg_id, const bts::orderman::Book& book,PerfTrace & ) override; + void on_book (size_t leg_id, const bts::orderman::Book& book,trace::CorID & ) override; void cancel() override; void terminate() override; void on_time(const TimeStamp& ts) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp index a4a17678f..588761444 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp @@ -24,7 +24,7 @@ void QuoterWaitingForIOCWorker::on_order_update (const SpreaderChildOrderState& } } void QuoterWaitingForIOCWorker::on_book (size_t, - const bts::orderman::Book&,PerfTrace &){ + const bts::orderman::Book&,trace::CorID &){ } void QuoterWaitingForIOCWorker::cancel(){ _quoter->_transform_to_WAITING_FOR_FIRST_ACK_CANCELLED (); diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.h index 48bf749eb..69ba40109 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.h @@ -31,7 +31,7 @@ public: void one_time_activate (Price, Quantity) override; void on_order_update (const SpreaderChildOrderState& order_update) override; void on_book (size_t leg_id, - const bts::orderman::Book& book,PerfTrace &) override; + const bts::orderman::Book& book,trace::CorID &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp& ts) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp index d5e90f133..6cefbfcf3 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp @@ -20,7 +20,7 @@ void QuoterWaitingForSizeStateWorker::on_order_update (const SpreaderChildOrderS "is an illegal operation"); } void QuoterWaitingForSizeStateWorker::on_book (size_t, - const Book&,PerfTrace &trace){ + const Book&,trace::CorID &trace){ _longpath_analyze_and_act (trace); } void QuoterWaitingForSizeStateWorker::cancel(){ @@ -45,10 +45,10 @@ void QuoterWaitingForSizeStateWorker::update_spreader_order (Price price, _longpath_analyze_and_act (); } void QuoterWaitingForSizeStateWorker::_longpath_analyze_and_act(){ - PerfTrace trace; + trace::CorID trace; _longpath_analyze_and_act(trace); } -void QuoterWaitingForSizeStateWorker::_longpath_analyze_and_act(PerfTrace &trace){ +void QuoterWaitingForSizeStateWorker::_longpath_analyze_and_act(trace::CorID &trace){ if (_quoter->_price_quantity_state.target_reached()){ LOG(OrderMan, Info, "QuoterWaitingForSizeStateWorker key:{} " "target reached, transforming to end", diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.h index 830e61557..5cbad6abf 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.h @@ -30,7 +30,7 @@ public: virtual void on_transition () override {} void one_time_activate (Price, Quantity) override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (size_t leg_id, const bts::orderman::Book& book,PerfTrace &) override; + void on_book (size_t leg_id, const bts::orderman::Book& book,trace::CorID &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp& ts) override; @@ -41,6 +41,6 @@ private: // if it has. otherwise computes the price, qty and if // its valid, places an order goes to waiting_for_first_ack void _longpath_analyze_and_act (); - void _longpath_analyze_and_act (PerfTrace &); + void _longpath_analyze_and_act (trace::CorID &); }; }} diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp index 8fcf93397..0c505d9b6 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp @@ -31,7 +31,7 @@ void QuoterWorkingStateWorker::on_order_update (const SpreaderChildOrderState& u } void QuoterWorkingStateWorker::on_book (size_t, const bts::orderman::Book&, - PerfTrace &trace){ + trace::CorID &trace){ _longpath_analyze_and_act (trace); } void QuoterWorkingStateWorker::cancel(){ @@ -55,10 +55,10 @@ void QuoterWorkingStateWorker::update_spreader_order (Price price, } void QuoterWorkingStateWorker::_longpath_analyze_and_act () { - PerfTrace trace; + trace::CorID trace; _longpath_analyze_and_act(trace); } -void QuoterWorkingStateWorker::_longpath_analyze_and_act (PerfTrace &trace) +void QuoterWorkingStateWorker::_longpath_analyze_and_act (trace::CorID &trace) { if (_quoter->_price_quantity_state.target_reached()){ // this could happen if @@ -94,7 +94,7 @@ void QuoterWorkingStateWorker::_longpath_analyze_and_act (PerfTrace &trace) } } } -void QuoterWorkingStateWorker::_modify_order (Price price, Quantity quantity,PerfTrace &trace ){ +void QuoterWorkingStateWorker::_modify_order (Price price, Quantity quantity,trace::CorID &trace ){ bool same_price_qty = _quoter->_price_quantity_state.out_quantity() == quantity && bts::securities::test_price_equality(_quoter->_price_quantity_state.out_price().value(), price.value(), _quoter->_this_leg_data.tick_size()); diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.h index a0568256f..e7f5ee612 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.h @@ -23,7 +23,7 @@ public: virtual void on_transition () override; void one_time_activate (Price, Quantity) override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (size_t leg_id, const bts::orderman::Book& book,PerfTrace &) override; + void on_book (size_t leg_id, const bts::orderman::Book& book,trace::CorID &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp& ts) override; @@ -34,8 +34,8 @@ private: // i. if target reached => cxl order and go to waiting_for_cancel_ack_final // ii. if computed_qty = 0 => cxl order and go to waiting_for_cancel_ack_continue // iii. if reprice (ie qty changed or price changed beyond the threshold) => requote - void _longpath_analyze_and_act (PerfTrace &); + void _longpath_analyze_and_act (trace::CorID &); void _longpath_analyze_and_act (); - void _modify_order (Price price, Quantity quantity,PerfTrace &); + void _modify_order (Price price, Quantity quantity,trace::CorID &); }; }} diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp index 2dcd517cb..4c74d2bf0 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp @@ -34,7 +34,7 @@ void SpreaderEndStateWorker::on_update(Price, Quantity){ } void SpreaderEndStateWorker::on_cancel(){ } -void SpreaderEndStateWorker::on_book(const Book&,PerfTrace&){ +void SpreaderEndStateWorker::on_book(const Book&,trace::CorID&){ } void SpreaderEndStateWorker::on_settlement_price(const SettlementUpdateEvent&){ } @@ -43,7 +43,7 @@ void SpreaderEndStateWorker::on_time(const TimeStamp&){ void SpreaderEndStateWorker::on_quoter_order_error(SpreaderLegData&){ } void SpreaderEndStateWorker::on_quoter_order_fill(SpreaderLegData&, - PerfTrace&){ + trace::CorID&){ } void SpreaderEndStateWorker::on_quoter_order_status_update(SpreaderLegData&){ } diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.h index 2c19c9bcd..69bee63ed 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.h @@ -20,12 +20,12 @@ public: void on_activate(Price, Quantity, SpreaderOrderServices&) override; void on_update(Price, Quantity) override; void on_cancel() override; - void on_book(const Book&,PerfTrace&) override; + void on_book(const Book&,trace::CorID&) override; void on_settlement_price(const SettlementUpdateEvent&) override; void on_time(const TimeStamp&) override; void on_quoter_order_error(SpreaderLegData& leg_data) override; void on_quoter_order_fill(SpreaderLegData& leg_data, - PerfTrace&) override; + trace::CorID&) override; void on_quoter_order_status_update(SpreaderLegData& leg_data) override; void on_hedger_order_error(SingleFillHedger&) override; void on_hedger_order_update(SingleFillHedger&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp index 7035bb815..522f8dcdd 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp @@ -117,7 +117,7 @@ void SpreaderStartStateWorker::on_cancel(){ // and hence it goes directly to END _spreader->_transform_to_END(); } -void SpreaderStartStateWorker::on_book(const bts::orderman::Book&,PerfTrace &){ +void SpreaderStartStateWorker::on_book(const bts::orderman::Book&,trace::CorID &){ bts_assert_msg (false, "SpreaderStartStateWorker::on_book is an illegal operation"); } void SpreaderStartStateWorker::on_settlement_price(const SettlementUpdateEvent&){ @@ -131,7 +131,7 @@ void SpreaderStartStateWorker::on_quoter_order_error(SpreaderLegData&){ bts_assert_msg (false, "SpreaderStartStateWorker::on_quoter_order_error is an illegal operation"); } void SpreaderStartStateWorker::on_quoter_order_fill(SpreaderLegData&, - PerfTrace&){ + trace::CorID&){ bts_assert_msg (false, "SpreaderStartStateWorker::on_quoter_order_fill is an illegal operation"); } void SpreaderStartStateWorker::on_quoter_order_status_update(SpreaderLegData&){ diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.h index fe2f863ac..b14d8e08f 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.h @@ -25,12 +25,12 @@ public: SpreaderOrderServices&) override; void on_update(Price, Quantity) override; void on_cancel() override; - void on_book(const Book&,PerfTrace &) override; + void on_book(const Book&,trace::CorID &) override; void on_time(const TimeStamp&) override; void on_settlement_price(const SettlementUpdateEvent&) override; void on_quoter_order_error(SpreaderLegData& leg_data) override; void on_quoter_order_fill(SpreaderLegData& leg_data, - PerfTrace &) override; + trace::CorID &) override; void on_quoter_order_status_update(SpreaderLegData& leg_data) override; void on_hedger_order_error(SingleFillHedger&) override; void on_hedger_order_update(SingleFillHedger&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp index dbc6b2955..36669f38e 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp @@ -33,7 +33,7 @@ void SpreaderWaitingForCancelAllStateWorker::on_update(Price, } void SpreaderWaitingForCancelAllStateWorker::on_cancel(){ } -void SpreaderWaitingForCancelAllStateWorker::on_book(const Book&,PerfTrace &){ +void SpreaderWaitingForCancelAllStateWorker::on_book(const Book&,trace::CorID &){ } void SpreaderWaitingForCancelAllStateWorker::on_time(const TimeStamp& ts){ if (ms_diff (ts, _cancel_timestamp) >= _spreader->_cancel_timeout){ @@ -48,7 +48,7 @@ void SpreaderWaitingForCancelAllStateWorker::on_quoter_order_error(SpreaderLegDa leg_data.quoter().update_order_status (leg_data.order_update_message()); } void SpreaderWaitingForCancelAllStateWorker::on_quoter_order_fill(SpreaderLegData& leg_data, - PerfTrace &){ + trace::CorID &){ leg_data.quoter().update_order_status (leg_data.order_update_message()); } void SpreaderWaitingForCancelAllStateWorker::on_quoter_order_status_update(SpreaderLegData& leg_data){ diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.h index 0ff8771a7..96c3128e5 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.h @@ -23,12 +23,12 @@ public: SpreaderOrderServices&) override; void on_update(Price, Quantity) override; void on_cancel() override; - void on_book(const Book&,PerfTrace &) override; + void on_book(const Book&,trace::CorID &) override; void on_settlement_price(const SettlementUpdateEvent&) override; void on_time(const TimeStamp&) override; void on_quoter_order_error(SpreaderLegData& leg_data) override; void on_quoter_order_fill(SpreaderLegData& leg_data, - PerfTrace &) override; + trace::CorID &) override; void on_quoter_order_status_update(SpreaderLegData& leg_data) override; void on_hedger_order_error(SingleFillHedger&) override; void on_hedger_order_update(SingleFillHedger&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp index 2cc07d80c..0e7cfd266 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp @@ -46,7 +46,7 @@ void SpreaderWaitingForInitialDataStateWorker::on_cancel(){ _spreader->_transform_to_END(); } void SpreaderWaitingForInitialDataStateWorker::on_book(const Book& book, - PerfTrace&){ + trace::CorID&){ SpreaderBookkeepingData& bookkeeping_data = _spreader->_bookkeeping_data(); SpreaderLegData& md_leg = bookkeeping_data.get_leg_data(book.security_key()); md_leg.update_book(book); @@ -71,7 +71,7 @@ void SpreaderWaitingForInitialDataStateWorker::on_quoter_order_error(SpreaderLeg "on_quoter_order_error is an illegal operation"); } void SpreaderWaitingForInitialDataStateWorker::on_quoter_order_fill(SpreaderLegData&, - PerfTrace&){ + trace::CorID&){ bts_assert_msg (false, "SpreaderWaitingForInitialDataStateWorker::" "on_quoter_order_fill is an illegal operation"); } diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.h index b9bd5c2f9..4477edacf 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.h @@ -25,12 +25,12 @@ public: SpreaderOrderServices&) override; void on_update(Price, Quantity) override; void on_cancel() override; - void on_book(const Book&,PerfTrace &) override; + void on_book(const Book&,trace::CorID &) override; void on_settlement_price(const SettlementUpdateEvent&) override; void on_time(const TimeStamp&) override; void on_quoter_order_error(SpreaderLegData& leg_data) override; void on_quoter_order_fill(SpreaderLegData& leg_data, - PerfTrace &) override; + trace::CorID &) override; void on_quoter_order_status_update(SpreaderLegData& leg_data) override; void on_hedger_order_error(SingleFillHedger&) override; void on_hedger_order_update(SingleFillHedger&) override; @@ -40,4 +40,4 @@ private: void _init_quoters(); void _go_to_working(); }; -}} \ No newline at end of file +}} diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp index 4a32b5451..989a46e3f 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp @@ -42,7 +42,7 @@ void SpreaderWorkingStateWorker::on_cancel(){ _spreader->_cancel_orders (true, true); _spreader->_transform_to_WAITING_FOR_CANCEL_ALL (); } -void SpreaderWorkingStateWorker::on_book(const Book& book,PerfTrace &trace){ +void SpreaderWorkingStateWorker::on_book(const Book& book,trace::CorID &trace){ SpreaderBookkeepingData& bookkeeping_data = _spreader->_bookkeeping_data(); // this is a key->index lookup SpreaderLegData& md_leg = bookkeeping_data.get_leg_data(book.security_key()); @@ -78,7 +78,7 @@ void SpreaderWorkingStateWorker::on_quoter_order_error(SpreaderLegData& leg_data _spreader->_transform_to_WAITING_FOR_CANCEL_ALL (); } void SpreaderWorkingStateWorker::on_quoter_order_fill(SpreaderLegData& leg_data, - PerfTrace &trace){ + trace::CorID &trace){ // this is the most complex part of the spreader. the following needs to be done // 1. tell other quoters about it (so they reduce their sizes) // 2. launch a new hedger diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.h index e832eef41..1ff8e4dab 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.h @@ -22,12 +22,12 @@ public: SpreaderOrderServices&) override; void on_update(Price, Quantity) override; void on_cancel() override; - void on_book(const Book&,PerfTrace &) override; + void on_book(const Book&,trace::CorID &) override; void on_settlement_price(const SettlementUpdateEvent&) override; void on_time(const TimeStamp&) override; void on_quoter_order_error(SpreaderLegData& leg_data) override; void on_quoter_order_fill(SpreaderLegData& leg_data, - PerfTrace &) override; + trace::CorID &) override; void on_quoter_order_status_update(SpreaderLegData& leg_data) override; void on_hedger_order_error(SingleFillHedger&) override; void on_hedger_order_update(SingleFillHedger&) override; diff --git a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp index b3bd2bbef..4baf91726 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp +++ b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp @@ -47,7 +47,7 @@ TEST_CASE ("quoter price quantity state", "[spreader]") REQUIRE (s.out_price() == Price (0.0)); REQUIRE (s.out_quantity() == Quantity (0)); // set out price and quantity - PerfTrace dont_care; + trace::CorID dont_care; bts::TimeStamp ts; order.place_order(Price (-0.35), Quantity (123),ts,dont_care); REQUIRE (s.target_spread_price() == Price (-1.0)); @@ -102,7 +102,7 @@ TEST_CASE ("quoter price quantity state", "[spreader]") s.add_hedged_reduction (Quantity(5)); s.add_hedged_reduction (Quantity(15)); // set out values - PerfTrace dont_care; + trace::CorID dont_care; bts::TimeStamp ts; order_2.place_order (Price(1), Quantity (50),ts,dont_care); REQUIRE (s.target_spread_price() == Price (-1.0)); @@ -1250,7 +1250,7 @@ TEST_CASE ("hedger_START_state", "[spreader]") 1, hedger_price, hedger_quantity, - PerfTrace()); + trace::CorID()); verify_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); SECTION("0. transition_to_start") @@ -1300,7 +1300,7 @@ TEST_CASE ("hedger_WAITING_FOR_FIRST_ACK_state", "[spreader]") 1, hedger_price, hedger_quantity, - PerfTrace()); + trace::CorID()); verify_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); hedger.init (); @@ -1359,7 +1359,7 @@ TEST_CASE ("hedger_WAITING_FOR_FIRST_ACK_CANCELLED_state", "[spreader]") 1, hedger_price, hedger_quantity, - PerfTrace()); + trace::CorID()); verify_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); hedger.init (); @@ -1420,7 +1420,7 @@ TEST_CASE ("hedger_WAITING_FOR_CANCEL_ACK_state", "[spreader]") 1, hedger_price, hedger_quantity, - PerfTrace()); + trace::CorID()); verify_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); hedger.init (); @@ -1492,7 +1492,7 @@ TEST_CASE ("hedger_END_state", "[spreader]") 1, hedger_price, hedger_quantity, - PerfTrace()); + trace::CorID()); verify_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); hedger.init (); @@ -1549,7 +1549,7 @@ TEST_CASE ("hedger_WORKING", "[spreader]") 1, hedger_price, hedger_quantity, - PerfTrace()); + trace::CorID()); verify_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); SpreaderChildOrderState& u = hedger.order_state(); @@ -1651,7 +1651,7 @@ TEST_CASE ("spreader_START", "[spreader]") } SECTION("5. on_cancel") { - spreader.on_cancel(PerfTrace()); + spreader.on_cancel(trace::CorID()); REQUIRE(spreader.test_only_func_spreader_state() == SpreaderState::END); LOG(OrderMan, Diag, "spreader_START.on_cancel"); } @@ -1763,7 +1763,7 @@ TEST_CASE ("spreader_WORKING", "[spreader]") // be as is spreader_price = Price (0); spreader_quantity = Quantity (200); - spreader.on_update (spreader_price, spreader_quantity,PerfTrace()); + spreader.on_update (spreader_price, spreader_quantity,trace::CorID()); verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity (30), Quantity(55), Price(1998), Quantity(130), Quantity(115), false); verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity (55), Quantity(30), Price(2004), Quantity(165), Quantity(115), false); @@ -1773,7 +1773,7 @@ TEST_CASE ("spreader_WORKING", "[spreader]") } SECTION("5. on_cancel") { - spreader.on_cancel(PerfTrace()); + spreader.on_cancel(trace::CorID()); verify_basic_spreader_state (spreader, SpreaderState::WAITING_FOR_CANCEL_ALL, spreader_price, spreader_quantity); generic_validate_quoters (QuoterState::WAITING_FOR_CANCEL_ACK, true); generic_validate_hedgers (HedgerState::WAITING_FOR_CANCEL_ACK); @@ -1794,7 +1794,7 @@ TEST_CASE ("spreader_WORKING", "[spreader]") new double[5] {2005, 2006, 2007, 2008, 2009}, new uint16_t[5] {0, 0, 0, 0, 0}, true); - spreader.test_only_on_book_update (modified_book, PerfTrace()); + spreader.test_only_on_book_update (modified_book, trace::CorID()); verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); generic_validate_quoters (QuoterState::WORKING, false); generic_validate_hedgers (HedgerState::WORKING); @@ -1808,8 +1808,8 @@ TEST_CASE ("spreader_WORKING", "[spreader]") new double[5] {2003, 2004, 2005, 2006, 2007}, new uint16_t[5] {25, 25, 20, 20, 10}, true); - //spreader.on_book (bts::orderman::PerfTrace(), modified_book); - spreader.test_only_on_book_update (modified_book,PerfTrace()); + //spreader.on_book (bts::orderman::trace::CorID(), modified_book); + spreader.test_only_on_book_update (modified_book,trace::CorID()); verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(1999), Quantity(45), Quantity(15), false); verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); @@ -1824,8 +1824,8 @@ TEST_CASE ("spreader_WORKING", "[spreader]") new double[5] {2003, 2004, 2005, 2006, 2007}, new uint16_t[5] {25, 25, 20, 20, 10}, true); - //spreader.on_book (bts::orderman::PerfTrace(), modified_book); - spreader.test_only_on_book_update (modified_book,PerfTrace()); + //spreader.on_book (bts::orderman::trace::CorID(), modified_book); + spreader.test_only_on_book_update (modified_book,trace::CorID()); verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2000), Quantity(34), Quantity(15), false); verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); @@ -1838,8 +1838,8 @@ TEST_CASE ("spreader_WORKING", "[spreader]") new double[5] {2003, 2004, 2005, 2006, 2007}, new uint16_t[5] {25, 25, 20, 20, 10}, true); - //spreader.on_book (bts::orderman::PerfTrace(), modified_book); - spreader.test_only_on_book_update (modified_book, PerfTrace()); + //spreader.on_book (bts::orderman::trace::CorID(), modified_book); + spreader.test_only_on_book_update (modified_book, trace::CorID()); verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2001), Quantity(45), Quantity(15), false); verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); @@ -1853,8 +1853,8 @@ TEST_CASE ("spreader_WORKING", "[spreader]") new double[5] {2003, 2004, 2005, 2006, 2007}, new uint16_t[5] {25, 25, 20, 20, 10}, true); - //spreader.on_book (bts::orderman::PerfTrace(), modified_book); - spreader.test_only_on_book_update (modified_book, PerfTrace()); + //spreader.on_book (bts::orderman::trace::CorID(), modified_book); + spreader.test_only_on_book_update (modified_book, trace::CorID()); verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WAITING_FOR_CANCEL_ACK, false, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2001), Quantity(45), Quantity(15), false); verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); @@ -2068,7 +2068,7 @@ TEST_CASE ("spreader_WAITING_FOR_CANCEL_ACK", "[spreader]") // now cancel the spreader bts::TimeStamp cancel_timestamp = std::chrono::system_clock::now(); spreader.test_only_on_time (cancel_timestamp); - spreader.on_cancel (PerfTrace()); + spreader.on_cancel (trace::CorID()); auto validate_state = [&]() -> void { verify_basic_spreader_state (spreader, SpreaderState::WAITING_FOR_CANCEL_ALL, spreader_price, spreader_quantity); @@ -2091,7 +2091,7 @@ TEST_CASE ("spreader_WAITING_FOR_CANCEL_ACK", "[spreader]") } SECTION("4. on_update") { - spreader.on_update (Price(-0.05), Quantity(200),PerfTrace()); + spreader.on_update (Price(-0.05), Quantity(200),trace::CorID()); validate_state(); // order changes dont go through validate_state(); @@ -2099,7 +2099,7 @@ TEST_CASE ("spreader_WAITING_FOR_CANCEL_ACK", "[spreader]") } SECTION("5. on_cancel") { - spreader.on_cancel(PerfTrace()); + spreader.on_cancel(trace::CorID()); // already in cancel state, no change validate_state(); LOG(OrderMan, Diag, "spreader_WAITING_FOR_CANCEL_ACK.on_cancel"); @@ -2668,10 +2668,10 @@ TEST_CASE ("spreader_perf_2legs", "[spreader]") for (uint32_t i=0; i(us_diff (t1,t0))/n_iters; @@ -2804,11 +2804,11 @@ TEST_CASE ("spreader_perf_4legs", "[spreader]") new uint16_t[5] {100,150,250,25,125}, true); spreader.test_only_on_book_update (BookUpdateEvent(book_1, - PerfTrace())); + trace::CorID())); spreader.test_only_on_book_update (BookUpdateEvent(book_2, - PerfTrace())); + trace::CorID())); spreader.test_only_on_book_update (BookUpdateEvent(book_3, - PerfTrace())); + trace::CorID())); verify_complete_quoter_state (qleg_data_4.quoter(), QuoterState::WAITING_FOR_FIRST_ACK, false, @@ -2843,10 +2843,10 @@ TEST_CASE ("spreader_perf_4legs", "[spreader]") for (uint32_t i=0; i(us_diff (t1,t0))/n_iters; diff --git a/src/lib/orderman/orders/spreader_orders/tests/tests_common.h b/src/lib/orderman/orders/spreader_orders/tests/tests_common.h index 7792d29c3..0f570d31e 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/tests_common.h +++ b/src/lib/orderman/orders/spreader_orders/tests/tests_common.h @@ -390,7 +390,7 @@ void fire_book_update (double* prices, uint16_t* sizes, api::Side side, size_t l bts::orderman::Book book; fill_book (book, prices, sizes, side); sm.set_book (book, leg_index); - PerfTrace trace; + trace::CorID trace; quoter.on_book (leg_index, book,trace); } void verify_leg_data (SpreaderLegData& l, bts::orderman::OrderKey, size_t leg_index, uint32_t sec_key, uint32_t exp_yr, uint32_t exp_m, uint32_t exp_day, const std::string& symbol, double leg_mult, double price_mult, api::Side side) @@ -441,7 +441,7 @@ void fire_book_update_hedger (double* prices, uint16_t* sizes, api::Side side, S { bts::orderman::Book book; fill_book (book, prices, sizes, side); - PerfTrace trace; + trace::CorID trace; hedger.on_book (book,trace); } void verify_complete_hedger_state (const SingleFillHedger& hedger, HedgerState state, Price target_price, Quantity target_quantity, Quantity aggregated_filled_quantity, @@ -525,11 +525,11 @@ void set_spreader_orders (SpreaderOrder& spreader, double* leg_1_bid_prices, uin bts::orderman::Book book_leg_1 = get_book (SecurityKey (leg_1_id), 5, leg_1_bid_prices, leg_1_bid_sizes, leg_1_ask_prices, leg_1_ask_sizes, true); - spreader.test_only_on_book_update (bts::orderman::BookUpdateEvent(book_leg_1, PerfTrace())); + spreader.test_only_on_book_update (bts::orderman::BookUpdateEvent(book_leg_1, trace::CorID())); bts::orderman::Book book_leg_2 = get_book (SecurityKey (leg_2_id), 5, leg_2_bid_prices, leg_2_bid_sizes, leg_2_ask_prices, leg_2_ask_sizes, true); - spreader.test_only_on_book_update (bts::orderman::BookUpdateEvent(book_leg_2,PerfTrace())); + spreader.test_only_on_book_update (bts::orderman::BookUpdateEvent(book_leg_2,trace::CorID())); spreader.test_only_on_child_order_update (leg_data_1.order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (leg_1_fills), Price (leg_1_filled_price)); spreader.test_only_on_child_order_update (leg_data_2.order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (leg_2_fills), Price (leg_2_filled_price)); } diff --git a/src/lib/orderman/server/OrderServiceServer.cpp b/src/lib/orderman/server/OrderServiceServer.cpp index 4348f0887..0b53e4a13 100644 --- a/src/lib/orderman/server/OrderServiceServer.cpp +++ b/src/lib/orderman/server/OrderServiceServer.cpp @@ -89,7 +89,7 @@ ActorThread *find_thread_for_actor( struct OrderServiceServer::PImpl { PImpl(bts::api::ServiceContext &ctx, std::shared_ptr &ss, - DynamicOrderRegistry const &d, metrics::MetricsContainer &stats, PerfTraceLog &log) + DynamicOrderRegistry const &d, metrics::MetricsContainer &stats, trace::PerfLog &log) : service_bridge(), service_ready(false), known_orders(), known_fills(), publish_orders(), publish_fills(), admin_service(ctx.locate()), md_consumer(ss), @@ -109,14 +109,14 @@ struct OrderServiceServer::PImpl { bts::md::MDConsumer md_consumer; metrics::MetricsContainer &stats; DynamicOrderRegistry const &dyn_order_registry; - PerfTraceLog &log; + trace::PerfLog &log; }; OrderServiceServer::OrderServiceServer( bts::api::ServiceContext &ctx, std::shared_ptr &ss, DynamicOrderRegistry const &d, metrics::MetricsContainer &stats, - PerfTraceLog &log) + trace::PerfLog &log) : api::orderman::OrderServiceBase(ctx), me(new PImpl(ctx, ss, d, stats,log)) { me->publish_orders = make_orders_publisher(); diff --git a/src/lib/orderman/server/OrderServiceServer.h b/src/lib/orderman/server/OrderServiceServer.h index 526a63b2a..4c23c13f9 100644 --- a/src/lib/orderman/server/OrderServiceServer.h +++ b/src/lib/orderman/server/OrderServiceServer.h @@ -6,7 +6,7 @@ #include namespace bts { -class PerfTraceLog; +namespace trace {class PerfLog;} namespace api { class ISyntheticSecurityService; } @@ -22,7 +22,7 @@ class OrderServiceServer : public api::orderman::OrderServiceBase { std::shared_ptr &, DynamicOrderRegistry const&, metrics::MetricsContainer &, - PerfTraceLog &); + trace::PerfLog &); ~OrderServiceServer(); void create_order(const api::orderman::Create &, diff --git a/src/server/sparkd/cmds/Benchmark.cpp b/src/server/sparkd/cmds/Benchmark.cpp index e25268b4c..089222abd 100644 --- a/src/server/sparkd/cmds/Benchmark.cpp +++ b/src/server/sparkd/cmds/Benchmark.cpp @@ -32,6 +32,7 @@ #include #include #include +#include "lib/tracing/PerfLog.h" #include @@ -835,6 +836,13 @@ static void fix_time_stamp(benchmark::State &state) { } BENCHMARK(fix_time_stamp); +static void perf_log(benchmark::State &state) { + trace::PerfLog l; + for (auto _ : state) + l.log(trace::CorID{"sim", 0}, "this", 1, 2, "txt", 3); +} +BENCHMARK(perf_log); + std::string Benchmark::help() { return "Run micro-benchmarks. Use --benchmark_filter=regex to run only " "specific benchmarks."; diff --git a/src/server/sparkd/cmds/QuickTest.cpp b/src/server/sparkd/cmds/QuickTest.cpp index 84d9931e1..0489920c7 100644 --- a/src/server/sparkd/cmds/QuickTest.cpp +++ b/src/server/sparkd/cmds/QuickTest.cpp @@ -1,30 +1,16 @@ #include "QuickTest.h" #include "ICmd.h" - -#include "lib/api/services/OrderService.server.pb.h" -#include "lib/mercury/actors/PingPong.h" -#include "lib/mercury/broker/BrokerProxy.h" -#include "lib/mercury/common/mercury_common.h" -#include "lib/mercury/executor/Executor.h" -#include "lib/utils/PBUtils.h" -#include "lib/utils/thread_manager.h" -#include "lib/orderman/events/OrderStateUpdateEvent.h" +#include "lib/tracing/PerfLog.h" #include namespace bts { namespace cmd { -using namespace bts::mercury; -using namespace bts::orderman; - int QuickTest::execute(std::vector const &) { - sleep_for(10s); - for (int i = 0; i < 100; i++) { - auto t = utils::TimeStamp::now(); - LOG(OrderMan,Info,"Now: {}", (utils::TimeStamp::now() - t).nanoseconds()); - } - sleep_for(10s); + trace::PerfLog l; + l.log(trace::CorID{"sim", 0}, "this", 1, 2, "txt", 3); + l.store_log_entries(); return 0; } diff --git a/src/server/sparkd/cmds/Run.cpp b/src/server/sparkd/cmds/Run.cpp index 516980043..701148644 100644 --- a/src/server/sparkd/cmds/Run.cpp +++ b/src/server/sparkd/cmds/Run.cpp @@ -10,26 +10,27 @@ #include "lib/quickbus/quickbus.h" #include "lib/utils/Dispatcher.h" +#include "lib/config/protos/toggles.pb.h" #include "lib/md/SyntheticSecurityService.h" #include "lib/md/relay/QueryServer.h" #include "lib/metrics/metrics.h" #include "lib/metrics/system_metrics.h" -#include "lib/orderman/orderman_utils/PerfTraceLog.h" +#include "lib/orderman/order_factory/DynamicOrderRegistry.h" #include "lib/orderman/server/OrderServiceServer.h" #include "lib/persistence/PersistenceServiceServer.h" +#include "lib/plugin/SparkServices.h" +#include "lib/plugin/plugin.h" +#include "lib/tracing/PerfLog.h" #include "lib/utils/thread_manager.h" #include "server/sparkd/http/WebServer.h" +#include "server/sparkd/md/MarketDataAuxiliaryServiceServer.h" #include "server/sparkd/md/run_md.h" #include "server/sparkd/position/PositionServiceServer.h" #include "server/sparkd/support/ErrorReportService.h" #include "server/sparkd/support/ShellLatencyServer.h" #include "server/sparkd/user/AdminServiceServer.h" -#include "server/sparkd/md/MarketDataAuxiliaryServiceServer.h" #include "server/sparkd/user/UserServiceServer.h" -#include "lib/orderman/order_factory/DynamicOrderRegistry.h" -#include "lib/plugin/SparkServices.h" -#include "lib/plugin/plugin.h" -#include "lib/config/protos/toggles.pb.h" + #include namespace bts { @@ -41,17 +42,16 @@ int Run::execute(std::vector const &) { "------------------------------------ Sparkd launched " "--------------------------------"); - config::QuickbusNodeCfg qb_cfg; auto &ports = config::get(); qb_cfg.set_my_port(ports.qbus_port()); qbus::Quickbus quickbus(qb_cfg); api::ServiceContext sc(&quickbus); - PerfTraceLog perf_log; + trace::PerfLog perf_log; metrics::MetricsContainer stats; metrics::publish_system_metrics(stats); - http::SparkWebServer webserver(sc, stats, perf_log,ports.config_port()); + http::SparkWebServer webserver(sc, stats, perf_log, ports.config_port()); persistence::PersistenceServiceServer settings_saver(sc, "settings"); user::UserServiceServer login_server(sc); @@ -67,10 +67,10 @@ int Run::execute(std::vector const &) { plugin::init_plugins(plugin_services); // finished initializing order plugins - orderman::OrderServiceServer order_service_server(sc, synthetic_service,dyn_order_registry, - stats, perf_log); + orderman::OrderServiceServer order_service_server( + sc, synthetic_service, dyn_order_registry, stats, perf_log); support::ErrorReportServer error_report_service(sc); - admin::AdminServiceServer admin_service(sc); + admin::AdminServiceServer admin_service(sc); md::auxiliary::MarketDataAuxiliaryServiceServer md_aux_server(sc); position::PositionServiceServer position_service(sc); metrics::ShellLatencyServer shell_latency_service( @@ -79,12 +79,11 @@ int Run::execute(std::vector const &) { auto bg_health = std::make_shared("spark_background_thread"); utils::DispatcherTimer timer(utils::Dispatcher::background(), 5000, - [=]() {bg_health->increment(); }); + [=]() { bg_health->increment(); }); timer.start(); - utils::DispatcherTimer timer2(utils::Dispatcher::background(), 1000, - [&]() {perf_log.persist_traces();}); + [&]() { perf_log.store_log_entries(); }); timer2.start(); stats.publish(bg_health); diff --git a/src/server/sparkd/cmds/Web.cpp b/src/server/sparkd/cmds/Web.cpp index 09bda5c6e..9ba90c72b 100644 --- a/src/server/sparkd/cmds/Web.cpp +++ b/src/server/sparkd/cmds/Web.cpp @@ -14,7 +14,7 @@ #include "server/sparkd/user/AdminServiceServer.h" #include "server/sparkd/user/UserServiceServer.h" #include "server/sparkd/md/run_md.h" -#include "lib/orderman/orderman_utils/PerfTraceLog.h" +#include "lib/tracing/PerfLog.h" #include #include @@ -31,7 +31,7 @@ int Web::execute(const std::vector& args) { metrics::MetricsContainer stats; metrics::publish_system_metrics(stats); - PerfTraceLog perf_log; + trace::PerfLog perf_log; http::SparkWebServer webserver(sc, stats, perf_log,ports.config_port()); user::UserServiceServer login_server(sc); diff --git a/src/server/sparkd/http/WebServer.cpp b/src/server/sparkd/http/WebServer.cpp index e72ffcebe..bcd6ddae2 100644 --- a/src/server/sparkd/http/WebServer.cpp +++ b/src/server/sparkd/http/WebServer.cpp @@ -6,7 +6,7 @@ #include "lib/logging/logging.h" #include "lib/os/os.h" #include "lib/utils/TimeStamp.h" -#include "lib/orderman/orderman_utils/PerfTraceLog.h" +#include "lib/tracing/PerfLog.h" #include #include @@ -54,9 +54,9 @@ namespace http { const api::ServiceContext& _ctx; metrics::MetricsContainer& _metrics; std::shared_ptr> _mtimer; - PerfTraceLog &_trace_log; + trace::PerfLog &_perf_log; - ServerState(const api::ServiceContext& ctx, metrics::MetricsContainer& metrics, PerfTraceLog &l,int port) : + ServerState(const api::ServiceContext& ctx, metrics::MetricsContainer& metrics, trace::PerfLog &l,int port) : _m(), _dispatcher(utils::Dispatcher::get_named("Webserver")), _session(), @@ -67,7 +67,7 @@ namespace http { _metrics(metrics), _mtimer(std::make_shared>("spark_metrics_query_duration_ms", std::array({ 0.5, 1.0, 5.0, 10.0 }))), - _trace_log(l) + _perf_log(l) { _www = os::sparkdata_path("www"); _conf = os::sparkdata_path("conf"); @@ -165,10 +165,10 @@ namespace http { _mtimer->observe((utils::TimeStamp::now() - start).microseconds() / 1000.0); } - void return_perf_trace_data(connection_ptr& con,size_t max_rows) { + void return_perf_trace_data(connection_ptr& con,size_t ) { utils::TimeStamp start = utils::TimeStamp::now(); std::stringstream ss; - _trace_log.print_latest_traces(ss,max_rows); + //_perf_log.print_latest_traces(ss,max_rows); con->set_body(ss.str()); con->set_status(websocketpp::http::status_code::ok); _mtimer->observe((utils::TimeStamp::now() - start).microseconds() / 1000.0); @@ -359,7 +359,7 @@ namespace http { -SparkWebServer::SparkWebServer(const api::ServiceContext& ctx, metrics::MetricsContainer& metrics, PerfTraceLog &l,int port) : +SparkWebServer::SparkWebServer(const api::ServiceContext& ctx, metrics::MetricsContainer& metrics, trace::PerfLog &l,int port) : _me(std::make_shared(ctx, metrics, l,port)) { } diff --git a/src/server/sparkd/http/WebServer.h b/src/server/sparkd/http/WebServer.h index 2414a4f8b..b9bb981df 100644 --- a/src/server/sparkd/http/WebServer.h +++ b/src/server/sparkd/http/WebServer.h @@ -4,7 +4,7 @@ #include namespace bts { -class PerfTraceLog; +namespace trace {class PerfLog;} namespace http { struct ServerState; @@ -12,7 +12,7 @@ namespace http { class SparkWebServer { std::shared_ptr _me; public: - SparkWebServer(const api::ServiceContext& ctx, metrics::MetricsContainer& metrics, PerfTraceLog &,int port); + SparkWebServer(const api::ServiceContext& ctx, metrics::MetricsContainer& metrics, trace::PerfLog &,int port); }; }}