From ec9425f4e879f974d53ed0cb3318cef586e241ef Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Wed, 5 Sep 2018 15:00:37 +0000 Subject: [PATCH] Added some tools to parse latency metrics out our logs. --- src/lib/CMakeDeps.cmake | 2 +- .../jetfix/connection/SocketConnection.cpp | 16 +- .../actors/order_manager/ChildOrder.h | 8 +- .../orderman_utils/TickToTradeCorID.h | 4 +- .../spreader_orders/ISpreaderStateWorker.h | 4 +- .../orders/spreader_orders/SpreaderOrder.cpp | 6 +- .../spreader/SingleFillHedger.cpp | 5 +- .../spreader/SingleFillHedger.h | 3 +- .../spreader/SingleLegQuoter.cpp | 7 +- .../spreader/SingleLegQuoter.h | 7 +- .../spreader/SpreaderChildOrderState.h | 11 +- .../spreader/hedger/IHedgerStateWorker.h | 2 +- .../hedger_states/HedgerEndStateWorker.cpp | 3 +- .../hedger_states/HedgerEndStateWorker.h | 2 +- .../hedger_states/HedgerStartStateWorker.cpp | 3 +- .../hedger_states/HedgerStartStateWorker.h | 2 +- .../HedgerWaitingForCancelAckStateWorker.cpp | 3 +- .../HedgerWaitingForCancelAckStateWorker.h | 2 +- ...WaitingForFirstAckCancelledStateWorker.cpp | 3 +- ...erWaitingForFirstAckCancelledStateWorker.h | 2 +- .../HedgerWaitingForFirstAckStateWorker.cpp | 3 +- .../HedgerWaitingForFirstAckStateWorker.h | 2 +- .../HedgerWorkingStateWorker.cpp | 3 +- .../hedger_states/HedgerWorkingStateWorker.h | 2 +- .../spreader/quoter/IQuoterStateWorker.h | 2 +- .../quoter_states/QuoterEndStateWorker.cpp | 5 +- .../quoter_states/QuoterEndStateWorker.h | 2 +- .../quoter_states/QuoterStartStateWorker.cpp | 5 +- .../quoter_states/QuoterStartStateWorker.h | 2 +- .../QuoterWaitingForCancelAckStateWorker.cpp | 6 +- .../QuoterWaitingForCancelAckStateWorker.h | 2 +- ...uoterWaitingForFirstAckCancelledWorker.cpp | 4 +- .../QuoterWaitingForFirstAckCancelledWorker.h | 2 +- .../QuoterWaitingForFirstAckWorker.cpp | 5 +- .../QuoterWaitingForFirstAckWorker.h | 2 +- .../QuoterWaitingForIOCWorker.cpp | 5 +- .../quoter_states/QuoterWaitingForIOCWorker.h | 5 +- .../QuoterWaitingForSizeStateWorker.cpp | 15 +- .../QuoterWaitingForSizeStateWorker.h | 5 +- .../QuoterWorkingStateWorker.cpp | 31 ++-- .../quoter_states/QuoterWorkingStateWorker.h | 7 +- .../SpreaderEndStateWorker.cpp | 5 +- .../spreader_states/SpreaderEndStateWorker.h | 4 +- .../SpreaderStartStateWorker.cpp | 5 +- .../SpreaderStartStateWorker.h | 5 +- ...SpreaderWaitingForCancelAllStateWorker.cpp | 4 +- .../SpreaderWaitingForCancelAllStateWorker.h | 4 +- .../SpreaderWorkingStateWorker.cpp | 9 +- .../SpreaderWorkingStateWorker.h | 5 +- .../spreader_orders/tests/tests_common.h | 6 +- .../logs/latency_data/import.sql | 4 + .../perf_analysis/logs/latency_data/trace.csv | 152 ++++++++++++++++++ .../logs/latency_data/trace.sqlite | Bin 0 -> 20480 bytes src/lib/orderman/perf_analysis/logs/load.sh | 7 + .../perf_analysis/logs/parse_helper.py | 30 ++++ .../perf_analysis/{ => lttng}/load.sh | 0 .../perf_analysis/{ => lttng}/parse.sh | 0 .../perf_analysis/{ => lttng}/parse_helper.py | 0 .../perf_analysis/{ => lttng}/trace.sh | 0 59 files changed, 325 insertions(+), 125 deletions(-) create mode 100644 src/lib/orderman/perf_analysis/logs/latency_data/import.sql create mode 100644 src/lib/orderman/perf_analysis/logs/latency_data/trace.csv create mode 100644 src/lib/orderman/perf_analysis/logs/latency_data/trace.sqlite create mode 100755 src/lib/orderman/perf_analysis/logs/load.sh create mode 100755 src/lib/orderman/perf_analysis/logs/parse_helper.py rename src/lib/orderman/perf_analysis/{ => lttng}/load.sh (100%) rename src/lib/orderman/perf_analysis/{ => lttng}/parse.sh (100%) rename src/lib/orderman/perf_analysis/{ => lttng}/parse_helper.py (100%) rename src/lib/orderman/perf_analysis/{ => lttng}/trace.sh (100%) diff --git a/src/lib/CMakeDeps.cmake b/src/lib/CMakeDeps.cmake index ff879e749..8921353f3 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/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/cpp_config.conf;config/defaults/dynamic_orders.conf;config/defaults/edge.conf;config/defaults/expiration_display_offset.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.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/cpp_config.proto;config/protos/dynamic_orders.proto;config/protos/environment.proto;config/protos/expiration_display_offset.proto;config/protos/jetfix.proto;config/protos/logging.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/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPriceLantencyTester.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;utils/Dispatcher.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) \ 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/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/cpp_config.conf;config/defaults/dynamic_orders.conf;config/defaults/edge.conf;config/defaults/expiration_display_offset.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.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/cpp_config.proto;config/protos/dynamic_orders.proto;config/protos/environment.proto;config/protos/expiration_display_offset.proto;config/protos/jetfix.proto;config/protos/logging.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/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/MDPriceLantencyTester.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/Actor.cpp;mercury/broker/AsyncEventBroker.cpp;mercury/broker/CoreEventBroker.cpp;mercury/broker/IEventBroker.cpp;mercury/events/TimerEvent.cpp;mercury/mercury_utils/Executor.cpp;mercury/mercury_utils/IPollableActor.cpp;mercury/mercury_utils/mercury_common.cpp;mercury/synopsis/SynopsisBuilder.cpp;mercury/topics/ITopic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.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/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/IcebergOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/CoverOrder.cpp;orderman/orders/book_algos/JoinOrder.cpp;orderman/orders/book_algos/LeanOrder.cpp;orderman/orders/book_algos/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/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/tests/PersistenceServiceTests.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/Dispatcher.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) \ No newline at end of file diff --git a/src/lib/jetfix/connection/SocketConnection.cpp b/src/lib/jetfix/connection/SocketConnection.cpp index e7aef5a43..483895e2e 100644 --- a/src/lib/jetfix/connection/SocketConnection.cpp +++ b/src/lib/jetfix/connection/SocketConnection.cpp @@ -129,12 +129,14 @@ int SocketConnection::write(WriteVec const &vec, size_t vec_size, if (trace.md.to_uint64()) { auto s2s = (trace_cpy.fix_socket_w - trace_cpy.md); LOG(Latency, Info, - "tick_to_order event trace. s2s_us:{} fix_socket_r:{} md:{} " - "md_src:{} spreader:{} " + "perf_event:tick_to_order s2s_us:{} fix_socket_r:{} md:{} " + "md_src:{} spreader_on_book:{} spreader_modify_order:{} " "order_update:{} exe_gw:{} fix_socket_w:{} md_sn:{}", s2s.microseconds(), trace_cpy.fix_socket_r.to_uint64(), trace_cpy.md.to_uint64(), trace_cpy.md_src.to_uint64(), - trace_cpy.spreader.to_uint64(), trace_cpy.order_update.to_uint64(), + trace_cpy.spreader_on_book.to_uint64(), + trace_cpy.spreader_modify_order.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); _tick_to_order->observe(s2s.nanoseconds()); @@ -143,12 +145,14 @@ int SocketConnection::write(WriteVec const &vec, size_t vec_size, if (trace.fix_socket_r.to_uint64()) { auto s2s = (trace_cpy.fix_socket_w - trace_cpy.fix_socket_r); LOG(Latency, Info, - "fill_to_order trace. s2s_us:{} fix_socket_r:{} md:{} md_src:{} " - "spreader:{} " + "perf_event:fill_to_order s2s_us:{} fix_socket_r:{} md:{} md_src:{} " + "spreader_on_book:{} spreader_modify_order:{} " "order_update:{} exe_gw:{} fix_socket_w:{} md_sn:{}", s2s.microseconds(), trace_cpy.fix_socket_r.to_uint64(), trace_cpy.md.to_uint64(), trace_cpy.md_src.to_uint64(), - trace_cpy.spreader.to_uint64(), trace_cpy.order_update.to_uint64(), + trace_cpy.spreader_on_book.to_uint64(), + trace_cpy.spreader_modify_order.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); _fill_to_order->observe(s2s.nanoseconds()); diff --git a/src/lib/orderman/actors/order_manager/ChildOrder.h b/src/lib/orderman/actors/order_manager/ChildOrder.h index 60ce45385..6a985aa4f 100644 --- a/src/lib/orderman/actors/order_manager/ChildOrder.h +++ b/src/lib/orderman/actors/order_manager/ChildOrder.h @@ -56,7 +56,13 @@ public: _active = true; } - void update(Price p, Quantity q, PerfTrace const&trace = PerfTrace()) + void update(Price p, Quantity q) + { + PerfTrace trace; + update(p,q,trace); + } + + void update(Price p, Quantity q, PerfTrace &trace) { bts_assert(_order); bts_assert(_active); diff --git a/src/lib/orderman/orderman_utils/TickToTradeCorID.h b/src/lib/orderman/orderman_utils/TickToTradeCorID.h index da78d73be..a0e0411bd 100644 --- a/src/lib/orderman/orderman_utils/TickToTradeCorID.h +++ b/src/lib/orderman/orderman_utils/TickToTradeCorID.h @@ -10,10 +10,12 @@ public: utils::TimeStamp fix_socket_r; utils::TimeStamp md ; utils::TimeStamp md_src ; - utils::TimeStamp spreader ; + utils::TimeStamp spreader_on_book ; + utils::TimeStamp spreader_on_child_order_update ; utils::TimeStamp order_update ; utils::TimeStamp exe_gw ; utils::TimeStamp fix_socket_w ; + utils::TimeStamp spreader_modify_order ; uint16_t md_sn = 0; }; diff --git a/src/lib/orderman/orders/spreader_orders/ISpreaderStateWorker.h b/src/lib/orderman/orders/spreader_orders/ISpreaderStateWorker.h index 522637136..f9dbad672 100644 --- a/src/lib/orderman/orders/spreader_orders/ISpreaderStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/ISpreaderStateWorker.h @@ -33,14 +33,14 @@ 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(PerfTrace, const Book&) = 0; + virtual void on_book(const Book&,PerfTrace &) = 0; // 7. time event called by the infrastructure virtual void on_time(const TimeStamp&) = 0; // 8. when a quoter order ack from the exchange has an error 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 const&) = 0; + PerfTrace &) = 0; // 10. on a quoter status update without a fill virtual void on_quoter_order_status_update(SpreaderLegData& leg_data) = 0; // 11. when a hedger order ack from the exchange has an error diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp index fe955ea01..cbf1cb1bb 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp @@ -97,12 +97,12 @@ void SpreaderOrder::_on_book_update(const BookUpdateEvent& book_event){ if (!_active) return; tracepoint (bts_trace,trace_order,(char*) "_on_book_update", 0,book_event.trace.md_sn,0); auto trace = book_event.trace; - trace.spreader = utils::TimeStamp::now(); - _state_worker->on_book (trace, book_event.book); + trace.spreader_on_book = utils::TimeStamp::now(); + _state_worker->on_book (book_event.book,trace); } void SpreaderOrder::_on_child_order_update(const OrderStateUpdateEvent& ord_ev){ auto trace = ord_ev.trace; - trace.spreader = utils::TimeStamp::now(); + trace.spreader_on_child_order_update = utils::TimeStamp::now(); if (!_active) return; SecurityKey sec_key = SecurityKey(ord_ev.definition->security_key()); OrderKey order_key = ord_ev.key; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp index 76a810682..5025a4c2d 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp @@ -94,9 +94,8 @@ void SingleFillHedger::on_order_update(const SpreaderChildOrderState& u){ u.last_update_filled_quantity()); _worker->on_order_update (u); } -void SingleFillHedger::on_book(PerfTrace const&trace, - const bts::orderman::Book& book){ - _worker->on_book (trace,book); +void SingleFillHedger::on_book(const bts::orderman::Book& book,PerfTrace &trace){ + _worker->on_book (book,trace); } void SingleFillHedger::cancel_hedge(){ LOG(OrderMan, Info, "SingleFillHedger::cancel_order key:{} state:{}", diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h index ba9a7ad12..5afb00839 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h @@ -87,8 +87,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(PerfTrace const &, - const bts::orderman::Book& book); + void on_book(const bts::orderman::Book& book,PerfTrace &); //d. called when the hedge order is cancelled, either // manually or automatically void cancel_hedge(); diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp index ae5dd20d3..50b2c6a05 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp @@ -100,11 +100,10 @@ void SingleLegQuoter::update_order_status(const SpreaderChildOrderState& u){ _worker->on_order_update (u); } } -void SingleLegQuoter::on_book(PerfTrace const &trace, - size_t leg_index, - const bts::orderman::Book& book){ +void SingleLegQuoter::on_book(size_t leg_index, + const bts::orderman::Book& book,PerfTrace &trace){ if (_active_quoting) - _worker->on_book (trace, leg_index, book); + _worker->on_book (leg_index, book,trace); } void SingleLegQuoter::update_other_leg_fills(size_t leg_index, Quantity filled_quantity){ diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h index f2163decd..8cdb51036 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h @@ -100,9 +100,8 @@ public: void update_order_status(const SpreaderChildOrderState& u); //c. called when the market data associated // with this security is changed - void on_book(PerfTrace const &, - size_t leg_index, - const bts::orderman::Book&); + void on_book(size_t leg_index, + const bts::orderman::Book&,PerfTrace &); //d. called when the order is cancelled, either // manually or automatically void cancel_order(); @@ -173,7 +172,7 @@ private: void _place_order (Price price, Quantity quantity, const PerfTrace &trace = PerfTrace()) { _child_order_state.place_order(price, quantity,trace); } - void _modify_order (Price price, Quantity quantity, const PerfTrace &trace = PerfTrace()) { + void _modify_order (Price price, Quantity quantity, PerfTrace &trace) { _child_order_state.modify_order(price, quantity, trace); } void _cancel_order () {_child_order_state.cancel_order();} diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h index c26dda114..3bc115e8a 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h @@ -138,8 +138,11 @@ public: if (_is_live) _child_order.activate(price, quantity, trace); } - void modify_order(Price price, Quantity quantity, - PerfTrace const &trace = PerfTrace()){ + void modify_order(Price price, Quantity quantity){ + PerfTrace dont_care; + modify_order(price,quantity,dont_care); + } + void modify_order(Price price, Quantity quantity, PerfTrace &trace){ _out_price = price; _out_quantity = quantity; _n_modify_orders++; @@ -148,8 +151,10 @@ public: "price:{} quantity:{} mod_no:{}", order_key(), _is_quoting, _sec_key, _is_live, price, quantity, _n_modify_orders); - if (_is_live) + if (_is_live) { + trace.spreader_modify_order = utils::TimeStamp::now(); _child_order.update(price, quantity, trace); + } } void cancel_order(){ bts_assert(_n_cancel_orders == 0); 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 fe32dfe8d..186c8d074 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/IHedgerStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/IHedgerStateWorker.h @@ -24,7 +24,7 @@ public: virtual void on_order_update (const SpreaderChildOrderState& order_update) = 0; // called only when the security that the hedger is working on // has a market data update - virtual void on_book (PerfTrace const&, const bts::orderman::Book& book) = 0; + virtual void on_book (const bts::orderman::Book& book,PerfTrace &) = 0; // when the spreader wants the hedger to cancel its order virtual void cancel() = 0; // on terminate, the hedger should simply go to its end state diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp index a176abd9d..ac6a92a71 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp @@ -9,8 +9,7 @@ void HedgerEndStateWorker::init(){ } void HedgerEndStateWorker::on_order_update(const SpreaderChildOrderState&){ } -void HedgerEndStateWorker::on_book(PerfTrace const&, - const bts::orderman::Book&){ +void HedgerEndStateWorker::on_book(const bts::orderman::Book&,PerfTrace &){ } void HedgerEndStateWorker::cancel(){ } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.h index a4f6e1980..1ab5917b5 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.h @@ -17,7 +17,7 @@ public: const std::string state_text () const override {return "END";} void init () override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (PerfTrace const&, const bts::orderman::Book& book) override; + void on_book (const bts::orderman::Book& book,PerfTrace &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp index 449d41aa4..b23d78c92 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp @@ -18,8 +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(PerfTrace const&, - const bts::orderman::Book&){ +void HedgerStartStateWorker::on_book(const bts::orderman::Book&,PerfTrace &){ // market data will not be sent until out of start. bts_assert_msg (false, "HedgerStartStateWorker::on_book illegal operation"); } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.h index 6521aa819..37c9c79ef 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.h @@ -21,7 +21,7 @@ public: const std::string state_text () const override {return "START";} void init () override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (PerfTrace const &, const bts::orderman::Book& book) override; + void on_book (const bts::orderman::Book& book,PerfTrace &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp index 1fc38b8b8..92bc38267 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp @@ -17,8 +17,7 @@ void HedgerWaitingForCancelAckStateWorker::on_order_update(const SpreaderChildOr _hedger->transform_to_END (); } } -void HedgerWaitingForCancelAckStateWorker::on_book(PerfTrace const&, - const bts::orderman::Book&){ +void HedgerWaitingForCancelAckStateWorker::on_book(const bts::orderman::Book&,PerfTrace &){ } void HedgerWaitingForCancelAckStateWorker::cancel(){ } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.h index b0f68b12c..6a7800ec5 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.h @@ -21,7 +21,7 @@ public: const std::string state_text () const override {return "WAITING_FOR_CANCEL_ACK";} void init () override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (PerfTrace const&, const bts::orderman::Book& book) override; + void on_book (const bts::orderman::Book& book,PerfTrace &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp index 8aad75182..e8b5bf049 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp @@ -23,8 +23,7 @@ void HedgerWaitingForFirstAckCancelledStateWorker::on_order_update(const Spreade _hedger->transform_to_WAITING_FOR_CANCEL_ACK (); } } -void HedgerWaitingForFirstAckCancelledStateWorker::on_book(PerfTrace const&, - const bts::orderman::Book&){ +void HedgerWaitingForFirstAckCancelledStateWorker::on_book(const bts::orderman::Book&,PerfTrace &){ } void HedgerWaitingForFirstAckCancelledStateWorker::cancel(){ } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.h index b84a5c033..21f542f5b 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.h @@ -21,7 +21,7 @@ public: const std::string state_text () const override {return "WAITING_FOR_FIRST_ACK_CANCELLED";} void init () override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (PerfTrace const&, const bts::orderman::Book& book) override; + void on_book (const bts::orderman::Book& book,PerfTrace &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp index bdfb69a8f..8e5a7e396 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp @@ -18,8 +18,7 @@ void HedgerWaitingForFirstAckStateWorker::on_order_update(const SpreaderChildOrd // this means the first ack _hedger->transform_to_WORKING (); } -void HedgerWaitingForFirstAckStateWorker::on_book(PerfTrace const&, - const bts::orderman::Book&){ +void HedgerWaitingForFirstAckStateWorker::on_book(const bts::orderman::Book&,PerfTrace &){ } void HedgerWaitingForFirstAckStateWorker::cancel(){ _hedger->transform_to_WAITING_FOR_FIRST_ACK_CANCELLED (); diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.h index 5817dd748..900e6b4ed 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.h @@ -21,7 +21,7 @@ public: const std::string state_text () const override {return "WAITING_FOR_FIRST_ACK";} void init () override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (PerfTrace const&, const bts::orderman::Book& book) override; + void on_book (const bts::orderman::Book& book,PerfTrace &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp index 029ca8803..019b87e21 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp @@ -20,8 +20,7 @@ void HedgerWorkingStateWorker::on_order_update(const SpreaderChildOrderState& or _hedger->transform_to_END (); } } -void HedgerWorkingStateWorker::on_book(PerfTrace const&, - const bts::orderman::Book&){ +void HedgerWorkingStateWorker::on_book(const bts::orderman::Book&,PerfTrace &){ double new_price; if (SpreaderUtils::post_hedge_market_based_price_action (_hedger->_price_quantity_state.out_price().value(), _hedger->_price_quantity_state.out_quantity().value(), diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.h index 28545e345..be0201d94 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.h @@ -24,7 +24,7 @@ public: const std::string state_text () const override {return "WORKING";} void init () override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (PerfTrace const&, const bts::orderman::Book& book) override; + void on_book (const bts::orderman::Book& book,PerfTrace &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/IQuoterStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/IQuoterStateWorker.h index cd2d7c1f0..909239e1b 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/IQuoterStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/IQuoterStateWorker.h @@ -26,7 +26,7 @@ public: virtual void on_order_update (const SpreaderChildOrderState& order_update) = 0; // called when any of the legs in the spread has a book update //virtual void on_book (TickToTradeCorID corid, size_t leg_id, const Book& book) = 0; - virtual void on_book (PerfTrace const&, size_t, const bts::orderman::Book&) = 0; + virtual void on_book (size_t, const bts::orderman::Book&,PerfTrace &) = 0; // when the spreader wants the quoter to cancel its order virtual void cancel() = 0; // on terminate, the quoter should simply go to its end state diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp index 665052682..d73bfc9b4 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp @@ -28,9 +28,8 @@ void QuoterEndStateWorker::one_time_activate (Price, Quantity){ } void QuoterEndStateWorker::on_order_update (const SpreaderChildOrderState&) {} -void QuoterEndStateWorker::on_book (PerfTrace const&, - size_t, - const bts::orderman::Book&) +void QuoterEndStateWorker::on_book (size_t, + const bts::orderman::Book&,PerfTrace &) {} void QuoterEndStateWorker::cancel() {} diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.h index eeff2e18b..c8342757a 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.h @@ -25,7 +25,7 @@ public: virtual void on_transition () override; void one_time_activate (Price, Quantity) override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (PerfTrace const&, size_t leg_id, const bts::orderman::Book& book) override; + void on_book (size_t leg_id, const bts::orderman::Book& book,PerfTrace &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp& ts) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp index 7dd6c3d77..754a3aa47 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp @@ -23,9 +23,8 @@ void QuoterStartStateWorker::on_order_update (const SpreaderChildOrderState&){ // no order has been sent as yet, so there is no way to get a callback bts_assert_msg (false, "QuoterStartStateWorker::on_order_update is an illegal operation, nothing can happen before one_time_activate"); } -void QuoterStartStateWorker::on_book (PerfTrace const&, - size_t, - const bts::orderman::Book&){ +void QuoterStartStateWorker::on_book (size_t, + const bts::orderman::Book&,PerfTrace &){ } void QuoterStartStateWorker::cancel(){ // since no order has been sent for this leg, diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.h index 1c67a7da8..05e9f74d2 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.h @@ -23,7 +23,7 @@ public: virtual void on_transition () override {} void one_time_activate (Price, Quantity) override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (PerfTrace const&, size_t leg_id, const bts::orderman::Book& book) override; + void on_book (size_t leg_id, const bts::orderman::Book& book,PerfTrace &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp& ts) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp index 3de66f9f1..bbef8d47c 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp @@ -19,9 +19,9 @@ void QuoterWaitingForCancelAckStateWorker::on_order_update (const SpreaderChildO if (u.terminal_status()) _quoter->_transform_to_END (); } -void QuoterWaitingForCancelAckStateWorker::on_book (PerfTrace const&, - size_t, - const bts::orderman::Book&){ +void QuoterWaitingForCancelAckStateWorker::on_book (size_t, + const bts::orderman::Book&, + PerfTrace &){ } void QuoterWaitingForCancelAckStateWorker::cancel(){ } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.h index d704a8ea0..bd8a4be24 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.h @@ -24,7 +24,7 @@ public: virtual void on_transition () override {} void one_time_activate (Price, Quantity) override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (PerfTrace const &, size_t leg_id, const bts::orderman::Book& book) override; + void on_book (size_t leg_id, const bts::orderman::Book& book,PerfTrace &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp& ts) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp index bb8ffe030..dac791970 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp @@ -25,9 +25,7 @@ void QuoterWaitingForFirstAckCancelledWorker::on_order_update (const SpreaderChi _quoter->_transform_to_WAITING_FOR_CANCEL_ACK (); } } -void QuoterWaitingForFirstAckCancelledWorker::on_book (PerfTrace const&, - size_t, - const bts::orderman::Book&){ +void QuoterWaitingForFirstAckCancelledWorker::on_book (size_t , const bts::orderman::Book& ,PerfTrace &) { } void QuoterWaitingForFirstAckCancelledWorker::cancel(){ } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.h index a0eaed461..60db96ace 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.h @@ -30,7 +30,7 @@ public: virtual void on_transition () override {} void one_time_activate (Price, Quantity) override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (PerfTrace const&, size_t leg_id, const bts::orderman::Book& book) override; + void on_book (size_t leg_id, const bts::orderman::Book& book,PerfTrace &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp& ts) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp index 2a4a84a7c..c68d7db84 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp @@ -21,9 +21,8 @@ void QuoterWaitingForFirstAckWorker::on_order_update (const SpreaderChildOrderSt else _quoter->_transform_to_WORKING (); } -void QuoterWaitingForFirstAckWorker::on_book (PerfTrace const&, - size_t, - const bts::orderman::Book&){ +void QuoterWaitingForFirstAckWorker::on_book (size_t, + const bts::orderman::Book&,PerfTrace &){ _analyze_and_act(); } void QuoterWaitingForFirstAckWorker::cancel(){ diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.h index 0f302fe15..ded3b991b 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.h @@ -28,7 +28,7 @@ public: virtual void on_transition () override {} void one_time_activate (Price, Quantity) override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (PerfTrace const&, size_t leg_id, const bts::orderman::Book& book) override; + void on_book (size_t leg_id, const bts::orderman::Book& book,PerfTrace & ) override; void cancel() override; void terminate() override; void on_time(const TimeStamp& ts) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp index a90c00c62..a4a17678f 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp @@ -23,9 +23,8 @@ void QuoterWaitingForIOCWorker::on_order_update (const SpreaderChildOrderState& _quoter->_transform_to_END (); } } -void QuoterWaitingForIOCWorker::on_book (PerfTrace const&, - size_t, - const bts::orderman::Book&){ +void QuoterWaitingForIOCWorker::on_book (size_t, + const bts::orderman::Book&,PerfTrace &){ } void QuoterWaitingForIOCWorker::cancel(){ _quoter->_transform_to_WAITING_FOR_FIRST_ACK_CANCELLED (); diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.h index 7340bf3bd..48bf749eb 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.h @@ -30,9 +30,8 @@ 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 (PerfTrace const&, - size_t leg_id, - const bts::orderman::Book& book) override; + void on_book (size_t leg_id, + const bts::orderman::Book& book,PerfTrace &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp& ts) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp index a72ed4ccc..d5e90f133 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp @@ -19,9 +19,8 @@ void QuoterWaitingForSizeStateWorker::on_order_update (const SpreaderChildOrderS bts_assert_msg (false, "QuoterWaitingForSizeStateWorker::on_order_update " "is an illegal operation"); } -void QuoterWaitingForSizeStateWorker::on_book (PerfTrace const&trace, - size_t, - const Book&){ +void QuoterWaitingForSizeStateWorker::on_book (size_t, + const Book&,PerfTrace &trace){ _longpath_analyze_and_act (trace); } void QuoterWaitingForSizeStateWorker::cancel(){ @@ -38,14 +37,18 @@ void QuoterWaitingForSizeStateWorker::on_time(const TimeStamp&){ void QuoterWaitingForSizeStateWorker::on_other_leg_quoter_fill (size_t leg_index, Quantity filled_quantity){ _quoter->_incorporate_other_leg_fill (leg_index, filled_quantity); - _longpath_analyze_and_act (PerfTrace()); + _longpath_analyze_and_act (); } void QuoterWaitingForSizeStateWorker::update_spreader_order (Price price, Quantity quantity){ _quoter->_price_quantity_state.update_target_price_quantity (price, quantity); - _longpath_analyze_and_act (PerfTrace()); + _longpath_analyze_and_act (); } -void QuoterWaitingForSizeStateWorker::_longpath_analyze_and_act(PerfTrace const &trace){ +void QuoterWaitingForSizeStateWorker::_longpath_analyze_and_act(){ + PerfTrace trace; + _longpath_analyze_and_act(trace); +} +void QuoterWaitingForSizeStateWorker::_longpath_analyze_and_act(PerfTrace &trace){ if (_quoter->_price_quantity_state.target_reached()){ LOG(OrderMan, Info, "QuoterWaitingForSizeStateWorker key:{} " "target reached, transforming to end", diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.h index 99b3607ac..830e61557 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.h @@ -30,7 +30,7 @@ public: virtual void on_transition () override {} void one_time_activate (Price, Quantity) override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (PerfTrace const&, size_t leg_id, const bts::orderman::Book& book) override; + void on_book (size_t leg_id, const bts::orderman::Book& book,PerfTrace &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp& ts) override; @@ -40,6 +40,7 @@ private: // checks to see if target has reached and goes to end // 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 (PerfTrace const&); + void _longpath_analyze_and_act (); + void _longpath_analyze_and_act (PerfTrace &); }; }} diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp index f87611751..8fcf93397 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp @@ -15,8 +15,8 @@ void QuoterWorkingStateWorker::on_transition (){ // since from the time the order was entered and we had been // waiting for the ack, things could have changed (namely // fills in other legs, books, order qty change), hence - // we analyze and potentially modify/cxl immediatly - _longpath_analyze_and_act (PerfTrace()); + // we analyze and potentially modify/cxl immediatly + _longpath_analyze_and_act (); } void QuoterWorkingStateWorker::one_time_activate (Price, Quantity){ @@ -27,11 +27,11 @@ void QuoterWorkingStateWorker::on_order_update (const SpreaderChildOrderState& u if (u.terminal_status()) _quoter->_transform_to_END (); else - _longpath_analyze_and_act (PerfTrace()); + _longpath_analyze_and_act (); } -void QuoterWorkingStateWorker::on_book (PerfTrace const&trace, - size_t, - const bts::orderman::Book&){ +void QuoterWorkingStateWorker::on_book (size_t, + const bts::orderman::Book&, + PerfTrace &trace){ _longpath_analyze_and_act (trace); } void QuoterWorkingStateWorker::cancel(){ @@ -46,14 +46,19 @@ void QuoterWorkingStateWorker::on_time(const TimeStamp&){ void QuoterWorkingStateWorker::on_other_leg_quoter_fill (size_t leg_index, Quantity filled_quantity){ _quoter->_incorporate_other_leg_fill (leg_index, filled_quantity); - _longpath_analyze_and_act (PerfTrace()); + _longpath_analyze_and_act (); } void QuoterWorkingStateWorker::update_spreader_order (Price price, Quantity quantity){ _quoter->_price_quantity_state.update_target_price_quantity (price, quantity); - _longpath_analyze_and_act (PerfTrace()); + _longpath_analyze_and_act (); } -void QuoterWorkingStateWorker::_longpath_analyze_and_act (PerfTrace const&trace) +void QuoterWorkingStateWorker::_longpath_analyze_and_act () +{ + PerfTrace trace; + _longpath_analyze_and_act(trace); +} +void QuoterWorkingStateWorker::_longpath_analyze_and_act (PerfTrace &trace) { if (_quoter->_price_quantity_state.target_reached()){ // this could happen if @@ -77,25 +82,25 @@ void QuoterWorkingStateWorker::_longpath_analyze_and_act (PerfTrace const&trace) if (order_quantity.value() != _quoter->_price_quantity_state.out_quantity().value()) // this is a size change, size changes always go through regardless of the // quoting parameters - _modify_order (trace, computed_price, order_quantity); + _modify_order (computed_price, order_quantity,trace); else{ bool reprice = true; if (_quoter->_this_leg_data.leg_params().quote_params().has_quote_mute_zone()) reprice = SpreaderUtils::reprice_quote_mute_zone(_quoter->_price_quantity_state.out_price().value(), computed_price.value(), _quoter->_this_leg_data.trading_side(), _quoter->_this_leg_data.tick_size(), _quoter->_this_leg_data.leg_params().quote_params().quote_mute_zone()); if (reprice) - _modify_order (trace, computed_price, order_quantity); + _modify_order (computed_price, order_quantity,trace); } } } } -void QuoterWorkingStateWorker::_modify_order (PerfTrace const&trace, Price price, Quantity quantity){ +void QuoterWorkingStateWorker::_modify_order (Price price, Quantity quantity,PerfTrace &trace ){ bool same_price_qty = _quoter->_price_quantity_state.out_quantity() == quantity && bts::securities::test_price_equality(_quoter->_price_quantity_state.out_price().value(), price.value(), _quoter->_this_leg_data.tick_size()); if (!same_price_qty){ _quoter->_commit_drivers (price); - _quoter->_modify_order(price, quantity, trace); + _quoter->_modify_order(price, quantity,trace); } } }} 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 2c0452a0a..a0568256f 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.h @@ -23,7 +23,7 @@ public: virtual void on_transition () override; void one_time_activate (Price, Quantity) override; void on_order_update (const SpreaderChildOrderState& order_update) override; - void on_book (PerfTrace const&, size_t leg_id, const bts::orderman::Book& book) override; + void on_book (size_t leg_id, const bts::orderman::Book& book,PerfTrace &) override; void cancel() override; void terminate() override; void on_time(const TimeStamp& ts) override; @@ -34,7 +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 const&); - void _modify_order (PerfTrace const&, Price price, Quantity quantity); + void _longpath_analyze_and_act (PerfTrace &); + void _longpath_analyze_and_act (); + void _modify_order (Price price, Quantity quantity,PerfTrace &); }; }} diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp index f8df81d89..792a0830f 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp @@ -33,15 +33,14 @@ void SpreaderEndStateWorker::on_update(Price, Quantity){ } void SpreaderEndStateWorker::on_cancel(){ } -void SpreaderEndStateWorker::on_book(PerfTrace, - const Book&){ +void SpreaderEndStateWorker::on_book(const Book&,PerfTrace&){ } void SpreaderEndStateWorker::on_time(const TimeStamp&){ } void SpreaderEndStateWorker::on_quoter_order_error(SpreaderLegData&){ } void SpreaderEndStateWorker::on_quoter_order_fill(SpreaderLegData&, - const PerfTrace&){ + PerfTrace&){ } void SpreaderEndStateWorker::on_quoter_order_status_update(SpreaderLegData&){ } diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.h index 68699c4ef..8e48984fc 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.h @@ -20,11 +20,11 @@ public: void on_activate(Price, Quantity, SpreaderOrderServices&) override; void on_update(Price, Quantity) override; void on_cancel() override; - void on_book(PerfTrace, const Book&) override; + void on_book(const Book&,PerfTrace&) override; void on_time(const TimeStamp&) override; void on_quoter_order_error(SpreaderLegData& leg_data) override; void on_quoter_order_fill(SpreaderLegData& leg_data, - const PerfTrace&) override; + PerfTrace&) override; void on_quoter_order_status_update(SpreaderLegData& leg_data) override; void on_hedger_order_error(SingleFillHedger&) override; void on_hedger_order_update(SingleFillHedger&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp index 74b266714..13b204c58 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp @@ -122,8 +122,7 @@ void SpreaderStartStateWorker::on_cancel(){ // and hence it goes directly to END _spreader->_transform_to_END(); } -void SpreaderStartStateWorker::on_book(PerfTrace, - const bts::orderman::Book&){ +void SpreaderStartStateWorker::on_book(const bts::orderman::Book&,PerfTrace &){ bts_assert_msg (false, "SpreaderStartStateWorker::on_book is an illegal operation"); } void SpreaderStartStateWorker::on_time(const TimeStamp&){ @@ -133,7 +132,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&, - const PerfTrace&){ + PerfTrace&){ bts_assert_msg (false, "SpreaderStartStateWorker::on_quoter_order_fill is an illegal operation"); } void SpreaderStartStateWorker::on_quoter_order_status_update(SpreaderLegData&){ diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.h index 29d64f1ec..a495d3894 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,11 @@ public: SpreaderOrderServices&) override; void on_update(Price, Quantity) override; void on_cancel() override; - void on_book(PerfTrace, - const Book&) override; + void on_book(const Book&,PerfTrace &) 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 const&) override; + PerfTrace &) override; void on_quoter_order_status_update(SpreaderLegData& leg_data) override; void on_hedger_order_error(SingleFillHedger&) override; void on_hedger_order_update(SingleFillHedger&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp index 690b31e8f..92121eb05 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(PerfTrace, const Book&){ +void SpreaderWaitingForCancelAllStateWorker::on_book(const Book&,PerfTrace &){ } void SpreaderWaitingForCancelAllStateWorker::on_time(const TimeStamp& ts){ if (ms_diff (ts, _cancel_timestamp) >= _spreader->_cancel_timeout){ @@ -46,7 +46,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, - const PerfTrace &){ + PerfTrace &){ leg_data.quoter().update_order_status (leg_data.order_update_message()); } void SpreaderWaitingForCancelAllStateWorker::on_quoter_order_status_update(SpreaderLegData& leg_data){ diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.h index aac098617..2b08e843d 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.h @@ -23,11 +23,11 @@ public: SpreaderOrderServices&) override; void on_update(Price, Quantity) override; void on_cancel() override; - void on_book(PerfTrace, const Book&) override; + void on_book(const Book&,PerfTrace &) override; void on_time(const TimeStamp&) override; void on_quoter_order_error(SpreaderLegData& leg_data) override; void on_quoter_order_fill(SpreaderLegData& leg_data, - const PerfTrace &) override; + PerfTrace &) override; void on_quoter_order_status_update(SpreaderLegData& leg_data) override; void on_hedger_order_error(SingleFillHedger&) override; void on_hedger_order_update(SingleFillHedger&) override; diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp index 01f0af938..f9a58ead7 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp @@ -41,8 +41,7 @@ void SpreaderWorkingStateWorker::on_cancel(){ _spreader->_cancel_orders (true, true); _spreader->_transform_to_WAITING_FOR_CANCEL_ALL (); } -void SpreaderWorkingStateWorker::on_book(PerfTrace cid, - const Book& book){ +void SpreaderWorkingStateWorker::on_book(const Book& book,PerfTrace &trace){ SpreaderBookkeepingData& bookkeeping_data = _spreader->_bookkeeping_data(); // this is a key->index lookup SpreaderLegData& md_leg = bookkeeping_data.get_leg_data(book.security_key()); @@ -52,11 +51,11 @@ void SpreaderWorkingStateWorker::on_book(PerfTrace cid, for (size_t q_idx = 0; q_idx < bookkeeping_data.n_legs(); q_idx++){ SpreaderLegData& d = bookkeeping_data.get_leg_data(q_idx); if (d.leg_property_data().is_active_quoting()) - d.quoter().on_book(cid, md_leg.leg_property_data().leg_index(), book); + d.quoter().on_book(md_leg.leg_property_data().leg_index(), book,trace); } //send md to hedgers hedging this security only for (size_t h_idx = 0; h_idx < md_leg.n_hedgers(); h_idx++) - md_leg.get_hedger(h_idx).on_book(cid, book); + md_leg.get_hedger(h_idx).on_book(book,trace); } void SpreaderWorkingStateWorker::on_time(const TimeStamp& ts){ SpreaderBookkeepingData& bookkeeping_data = _spreader->_bookkeeping_data(); @@ -75,7 +74,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 const &trace){ + PerfTrace &trace){ // this is the most complex part of the spreader. the following needs to be done // 1. tell other quoters about it (so they reduce their sizes) // 2. launch a new hedger diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.h index d4781dfb8..7fa322294 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,11 @@ public: SpreaderOrderServices&) override; void on_update(Price, Quantity) override; void on_cancel() override; - void on_book(PerfTrace, - const Book&) override; + void on_book(const Book&,PerfTrace &) 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 const&) override; + PerfTrace &) override; void on_quoter_order_status_update(SpreaderLegData& leg_data) override; void on_hedger_order_error(SingleFillHedger&) override; void on_hedger_order_update(SingleFillHedger&) override; diff --git a/src/lib/orderman/orders/spreader_orders/tests/tests_common.h b/src/lib/orderman/orders/spreader_orders/tests/tests_common.h index cc9113f46..a927df1b4 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/tests_common.h +++ b/src/lib/orderman/orders/spreader_orders/tests/tests_common.h @@ -371,7 +371,8 @@ 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); - quoter.on_book (PerfTrace(), leg_index, book); + PerfTrace trace; + quoter.on_book (leg_index, book,trace); } void verify_leg_data (SpreaderLegData& l, bts::orderman::OrderKey, size_t leg_index, uint32_t sec_key, uint32_t exp_yr, uint32_t exp_m, uint32_t exp_day, const std::string& symbol, double leg_mult, double price_mult, api::Side side) { @@ -421,7 +422,8 @@ void fire_book_update_hedger (double* prices, uint16_t* sizes, api::Side side, S { bts::orderman::Book book; fill_book (book, prices, sizes, side); - hedger.on_book (PerfTrace(),book); + PerfTrace trace; + hedger.on_book (book,trace); } void verify_complete_hedger_state (const SingleFillHedger& hedger, HedgerState state, Price target_price, Quantity target_quantity, Quantity aggregated_filled_quantity, Price out_price, Quantity, Quantity remaining_to_fill) diff --git a/src/lib/orderman/perf_analysis/logs/latency_data/import.sql b/src/lib/orderman/perf_analysis/logs/latency_data/import.sql new file mode 100644 index 000000000..4fe53975f --- /dev/null +++ b/src/lib/orderman/perf_analysis/logs/latency_data/import.sql @@ -0,0 +1,4 @@ +.separator "," +create table trace (md integer,event_type text,md_src integer,event_id integer,order_update integer,fix_socket_r integer,spreader integer,md_sn integer,s2s_us integer,fix_socket_w integer,exe_gw integer); +.import trace.csv trace +create view summary as select (fix_socket_w - md) / 1000 total, (md_src-md)/1000 md_to_md_src, (spreader-md_src)/1000 md_src_to_spreader, (exe_gw - spreader)/1000 spreader_to_gw, (fix_socket_w - exe_gw)/1000 gw_to_socket from trace where md<>0 and total < 3000 diff --git a/src/lib/orderman/perf_analysis/logs/latency_data/trace.csv b/src/lib/orderman/perf_analysis/logs/latency_data/trace.csv new file mode 100644 index 000000000..2d9bb6ac8 --- /dev/null +++ b/src/lib/orderman/perf_analysis/logs/latency_data/trace.csv @@ -0,0 +1,152 @@ +28196590053886,'tick_to_order',28197102957058,28197103124480,0,0,28197102965440,0,513025,28197103079756,28197103059842 +28196697483499,'tick_to_order',28197102959931,28197103141481,0,0,28197102977491,0,405644,28197103127966,28197103069284 +28201969547888,'tick_to_order',28202833807433,28202833937515,0,0,28202833816030,0,864350,28202833898377,28202833881042 +28202088397252,'tick_to_order',28202833808697,28202833958080,0,0,28202833820739,0,745545,28202833942340,28202833889176 +28208616597481,'tick_to_order',28208827513088,28208827642654,0,0,28208827522022,0,211009,28208827607194,28208827592933 +28206481082894,'tick_to_order',28208827514190,28208827656336,0,0,28208827526464,0,2346563,28208827646293,28208827600491 +0,'fill_to_order',0,28208839081032,0,28208838837781,28208838868980,0,217,28208839055537,28208839019346 +28208839129931,'tick_to_order',28208839131496,28208839264318,28208839145688,0,28208839136228,0,117,28208839247030,28208839179115 +28208839129931,'tick_to_order',28208839131496,28208839289002,28208839159470,0,28208839140083,0,137,28208839267546,28208839198889 +28208839129931,'tick_to_order',28208839131496,28208839308230,28208839168905,0,28208839142093,0,162,28208839291985,28208839226400 +28208840433680,'tick_to_order',28208840435375,28208840547408,28208840447508,0,28208840439959,0,82,28208840516447,28208840472378 +28208840433680,'tick_to_order',28208840435375,28208840564743,28208840461566,0,28208840443149,0,116,28208840550591,28208840491019 +0,'fill_to_order',0,28208840879082,0,28208840576867,28208840672109,0,279,28208840855927,28208840823128 +28208843503746,'tick_to_order',28208843504814,28208843593574,28208843515483,0,28208843508641,0,59,28208843563706,28208843538005 +28208843503746,'tick_to_order',28208843504814,28208843610982,28208843528636,0,28208843511561,0,93,28208843596950,28208843551505 +0,'fill_to_order',0,28208944130393,0,28208943887617,28208943948194,0,222,28208944109810,28208944074684 +0,'fill_to_order',0,28209370139941,0,28209369888113,28209369952751,0,229,28209370117992,28209370079701 +0,'fill_to_order',0,28209484101320,0,28209483868990,28209483924268,0,212,28209484081653,28209484047486 +0,'fill_to_order',0,28209620409858,0,28209620162751,28209620228530,0,226,28209620388905,28209620355079 +0,'fill_to_order',0,28209739007884,0,28209738787668,28209738842302,0,199,28209738987526,28209738956093 +0,'fill_to_order',0,28210065047881,0,28210064800913,28210064864573,0,222,28210065023655,28210064978085 +0,'fill_to_order',0,28210065233727,0,28210064898370,28210065084780,0,323,28210065221391,28210065180960 +0,'fill_to_order',0,28210065333238,0,28210064996958,28210065263677,0,318,28210065315113,28210065306971 +0,'fill_to_order',0,28210065415952,0,28210065129134,28210065363289,0,273,28210065402209,28210065394553 +28215444390938,'tick_to_order',28215444393078,28215444529603,28215444414071,0,28215444400232,0,112,28215444503281,28215444457072 +28215444390938,'tick_to_order',28215444393078,28215444554080,28215444447525,0,28215444407818,0,142,28215444533183,28215444489016 +28215701976039,'tick_to_order',28215701977746,28215702098032,28215701997311,0,28215701984151,0,96,28215702072244,28215702038741 +28215701976039,'tick_to_order',28215701977746,28215702117853,28215702025791,0,28215701991346,0,125,28215702101709,28215702058942 +28220019865624,'tick_to_order',28220019867840,28220020026255,28220019895427,0,28220019878734,0,121,28220019986960,28220019950863 +28220019865624,'tick_to_order',28220019867840,28220020048864,28220019925593,0,28220019887884,0,164,28220020030569,28220019973048 +28220718678139,'tick_to_order',28220718680250,28220718831012,28220718700578,0,28220718686869,0,117,28220718795381,28220718739230 +28220718678139,'tick_to_order',28220718680250,28220718843749,28220718729541,0,28220718694405,0,156,28220718834720,28220718758232 +0,'fill_to_order',0,28220848918980,0,28220848687143,28220848747379,0,215,28220848902908,28220848871434 +0,'fill_to_order',0,28220849030568,0,28220848810372,28220848942605,0,208,28220849018851,28220848995256 +28220979169929,'tick_to_order',28220979172020,28220979305300,28220979192771,0,28220979179092,0,91,28220979261054,28220979229515 +28220979169929,'tick_to_order',28220979172020,28220979318464,28220979220293,0,28220979186577,0,139,28220979309388,28220979248193 +0,'fill_to_order',0,28220979513307,0,28220979350005,28220979419822,0,143,28220979493077,28220979481893 +28221070673726,'tick_to_order',28221070675735,28221070736601,28221070686482,0,28221070679562,0,38,28221070712616,28221070696306 +0,'fill_to_order',0,28222155872739,0,28222155643549,28222155706574,0,212,28222155855965,28222155816114 +0,'fill_to_order',0,28223133846563,0,28223133590522,28223133654830,0,239,28223133830454,28223133794944 +0,'fill_to_order',0,28223133964453,0,28223133694947,28223133883747,0,257,28223133952496,28223133928563 +0,'fill_to_order',0,28223581969280,0,28223581343526,28223581815686,0,609,28223581953459,28223581912188 +0,'fill_to_order',0,28223704304248,0,28223704088620,28223704171518,0,198,28223704286939,28223704256133 +0,'fill_to_order',0,28223810423519,0,28223810245448,28223810273233,0,160,28223810406444,28223810375144 +0,'fill_to_order',0,28224157832610,0,28224157585281,28224157653252,0,228,28224157813464,28224157774003 +28225529919208,'tick_to_order',28225529920711,28225530042405,28225529934691,0,28225529924851,0,80,28225529999639,28225529967993 +28226405462919,'tick_to_order',28226405465191,28226405619988,28226405485773,0,28226405472394,0,109,28226405572077,28226405529637 +28226405462919,'tick_to_order',28226405465191,28226405643951,28226405515803,0,28226405479758,0,161,28226405624112,28226405552798 +0,'fill_to_order',0,28226639771067,0,28226639589379,28226639651419,0,160,28226639750285,28226639740882 +0,'fill_to_order',0,28226639868980,0,28226639697224,28226639800947,0,156,28226639853935,28226639847230 +0,'fill_to_order',0,28227470569733,0,28227470374132,28227470440886,0,173,28227470547685,28227470529896 +0,'fill_to_order',0,28227924680234,0,28227924466565,28227924537639,0,191,28227924657821,28227924642595 +0,'fill_to_order',0,28228583926424,0,28228583705807,28228583773256,0,196,28228583902203,28228583885542 +0,'fill_to_order',0,28229533144966,0,28229532943412,28229533016549,0,179,28229533123032,28229533107434 +28229639851202,'tick_to_order',28229639852863,28229639980592,28229639870969,0,28229639858965,0,101,28229639952655,28229639907287 +28229639851202,'tick_to_order',28229639852863,28229640022874,28229639895237,0,28229639865959,0,137,28229639988700,28229639933822 +28229758761828,'tick_to_order',28229758763548,28229758882763,28229758783209,0,28229758770464,0,87,28229758849709,28229758814253 +28230101180913,'tick_to_order',28230101182993,28230101321254,28230101203074,0,28230101189865,0,93,28230101274549,28230101238130 +0,'fill_to_order',0,28230213923877,0,28230213648930,28230213710049,0,247,28230213896822,28230213856225 +0,'fill_to_order',0,28230322952329,0,28230322741821,28230322777654,0,195,28230322937621,28230322902984 +28230322898664,'tick_to_order',28230322908948,28230323024151,28230322965669,0,28230322958901,0,112,28230323011412,28230322986116 +28230322898664,'tick_to_order',28230322908948,28230323038883,28230322977834,0,28230322962821,0,128,28230323027132,28230322999842 +28230440123991,'tick_to_order',28230440126171,28230440213062,28230440147361,0,28230440132325,0,64,28230440188943,28230440169401 +0,'fill_to_order',0,28230662058747,0,28230661808794,28230661873095,0,228,28230662036818,28230661997869 +28230661973920,'tick_to_order',28230662004972,28230662136598,28230662078575,0,28230662071011,0,145,28230662119451,28230662092610 +28232123015042,'tick_to_order',28232123016868,28232123163592,28232123038403,0,28232123025185,0,98,28232123113494,28232123079664 +28232246918717,'tick_to_order',28232246920939,28232247064104,28232246940909,0,28232246927439,0,103,28232247021756,28232246981847 +28232246918717,'tick_to_order',28232246920939,28232247092688,28232246970727,0,28232246934998,0,149,28232247068479,28232247006870 +0,'fill_to_order',0,28232368953013,0,28232368700267,28232368775616,0,231,28232368931852,28232368894466 +28233036777229,'tick_to_order',28233036779530,28233036901259,28233036799515,0,28233036787312,0,85,28233036862284,28233036832720 +28233143137874,'tick_to_order',28233143139325,28233143260634,28233143160138,0,28233143147888,0,80,28233143218446,28233143191543 +28233699628365,'tick_to_order',28233699630159,28233699764620,28233699650528,0,28233699637850,0,84,28233699713280,28233699683814 +28234022689932,'tick_to_order',28234022691802,28234022828558,28234022711256,0,28234022699631,0,88,28234022778733,28234022747663 +28234704667015,'tick_to_order',28234704668729,28234704800087,28234704690713,0,28234704677354,0,86,28234704753635,28234704723237 +28234821194623,'tick_to_order',28234821196392,28234821314094,28234821215371,0,28234821204189,0,85,28234821280172,28234821249340 +28236352247871,'tick_to_order',28236352249625,28236352418387,28236352276252,0,28236352259617,0,116,28236352364376,28236352321875 +28236352247871,'tick_to_order',28236352249625,28236352441756,28236352308395,0,28236352268768,0,174,28236352422196,28236352346336 +28237224563641,'tick_to_order',28237224565693,28237224718121,28237224586812,0,28237224573410,0,111,28237224675179,28237224629165 +28237224563641,'tick_to_order',28237224565693,28237224741455,28237224617616,0,28237224580796,0,158,28237224721866,28237224660120 +28237332437212,'tick_to_order',28237332439266,28237332577973,28237332458507,0,28237332446944,0,103,28237332540626,28237332500617 +28237332437212,'tick_to_order',28237332439266,28237332599881,28237332488379,0,28237332453920,0,143,28237332580885,28237332523852 +28237549841429,'tick_to_order',28237549843628,28237549965700,28237549863870,0,28237549851244,0,85,28237549926606,28237549894491 +28238228061596,'tick_to_order',28238228063700,28238228177547,28238228084533,0,28238228077227,0,87,28238228149300,28238228118553 +28240113746524,'tick_to_order',28240113749923,28240113863959,28240113772664,0,28240113765041,0,93,28240113840462,28240113806744 +28240330403263,'tick_to_order',28240330405652,28240330535145,28240330434929,0,28240330420233,0,97,28240330500436,28240330470432 +28240853135285,'tick_to_order',28240853137341,28240853262896,28240853159118,0,28240853146534,0,86,28240853221294,28240853191691 +28240977598825,'tick_to_order',28240977600650,28240977717730,28240977622582,0,28240977609659,0,86,28240977685679,28240977656167 +0,'fill_to_order',0,28240978153216,0,28240977958658,28240978007053,0,180,28240978138810,28240978114020 +28240991592589,'tick_to_order',28240991593244,28240991653539,28240991597776,0,28240991594417,0,30,28240991623111,28240991609356 +28241670792957,'tick_to_order',28241670795036,28241670914874,28241670817757,0,28241670802941,0,88,28241670881569,28241670848033 +0,'fill_to_order',0,28241794767341,0,28241794513571,28241794577505,0,236,28241794750100,28241794703433 +28241823290439,'tick_to_order',28241823292469,28241823402171,28241823319217,0,28241823308663,0,82,28241823372733,28241823346560 +0,'fill_to_order',0,28242287683143,0,28242287436494,28242287498636,0,230,28242287667458,28242287624940 +28242298774730,'tick_to_order',28242298775728,28242298835466,28242298785181,0,28242298781321,0,34,28242298809643,28242298796811 +28242403521235,'tick_to_order',28242403521791,28242403623300,28242403529069,0,28242403523540,0,72,28242403593658,28242403559881 +0,'fill_to_order',0,28243061262066,0,28243061022436,28243061084315,0,224,28243061246455,28243061200891 +28243068384448,'tick_to_order',28243068384965,28243068443520,28243068390651,0,28243068386258,0,35,28243068420176,28243068403580 +28245948431958,'tick_to_order',28245948434240,28245948538937,28245948452612,0,28245948440859,0,82,28245948514737,28245948482316 +28247374525300,'tick_to_order',28247374526964,28247374651012,28247374547402,0,28247374535057,0,90,28247374615901,28247374579848 +28248234779582,'tick_to_order',28248234781348,28248234894161,28248234800599,0,28248234788742,0,86,28248234866284,28248234833094 +28252865029092,'tick_to_order',28252865030782,28252865145166,28252865048926,0,28252865037341,0,92,28252865121187,28252865083003 +28256547630478,'tick_to_order',28256547632063,28256547752066,28256547651901,0,28256547640012,0,86,28256547717211,28256547686110 +28279272348557,'tick_to_order',28279272349076,28279272467980,28279272355844,0,28279272350444,0,73,28279272422135,28279272389172 +28279501250366,'tick_to_order',28279501251899,28279501365341,28279501269773,0,28279501258390,0,86,28279501336734,28279501303261 +28280187509181,'tick_to_order',28280187511273,28280187630391,28280187528341,0,28280187517136,0,83,28280187592503,28280187561987 +28282957934927,'tick_to_order',28282957935955,28282958035906,28282957942708,0,28282957937270,0,71,28282958006407,28282957974920 +28289227944564,'tick_to_order',28289227946847,28289228127778,28289227964979,0,28289227953145,0,132,28289228076736,28289227998830 +28289718961779,'tick_to_order',28289718962450,28289719097342,28289718971611,0,28289718964883,0,78,28289719040495,28289719006734 +28289840450006,'tick_to_order',28289840451831,28289840568368,28289840471697,0,28289840459824,0,89,28289840539343,28289840506386 +28289951908418,'tick_to_order',28289951909247,28289952025470,28289951916324,0,28289951910651,0,77,28289951986204,28289951950742 +28290430936960,'tick_to_order',28290430937796,28290431040042,28290430945067,0,28290430939356,0,76,28290431013304,28290430979156 +28291466291399,'tick_to_order',28291466292396,28291466391677,28291466299142,0,28291466293741,0,73,28291466364828,28291466331580 +28291586496848,'tick_to_order',28291586499297,28291586630493,28291586518549,0,28291586506523,0,89,28291586586748,28291586552740 +28292751384837,'tick_to_order',28292751386806,28292751515067,28292751402678,0,28292751392069,0,83,28292751468056,28292751435430 +28293907933522,'tick_to_order',28293907934184,28293908066450,28293907941496,0,28293907935646,0,82,28293908016305,28293907974890 +28295067740412,'tick_to_order',28295067741030,28295067853412,28295067747989,0,28295067742670,0,74,28295067814671,28295067780682 +28295196992579,'tick_to_order',28295196993281,28295197144280,28295197000321,0,28295196995181,0,66,28295197059418,28295197030200 +28295451473434,'tick_to_order',28295451475533,28295451601789,28295451493675,0,28295451482374,0,86,28295451560177,28295451527873 +28295571761366,'tick_to_order',28295571763034,28295571881990,28295571773921,0,28295571766554,0,87,28295571848682,28295571810898 +28295799249116,'tick_to_order',28295799249915,28295799381637,28295799259696,0,28295799252812,0,85,28295799334429,28295799296519 +28297239376580,'tick_to_order',28297239377240,28297239498181,28297239384700,0,28297239378885,0,73,28297239449922,28297239418885 +0,'fill_to_order',0,28298760385155,0,28298760203371,28298760266335,0,159,28298760363345,28298760352002 +28298760374945,'tick_to_order',28298760391800,28298760451225,28298760405116,0,28298760398804,0,55,28298760430902,28298760417038 +0,'fill_to_order',0,28299876959405,0,28299876766737,28299876827336,0,167,28299876934037,28299876920197 +0,'fill_to_order',0,28299989659260,0,28299989480132,28299989530309,0,157,28299989637655,28299989625573 +28299989581876,'tick_to_order',28299989633042,28299989717824,28299989671330,0,28299989665389,0,115,28299989697691,28299989684427 +0,'fill_to_order',0,28300122561435,0,28300122382620,28300122417354,0,163,28300122545783,28300122511174 +0,'fill_to_order',0,28300483509579,0,28300483262045,28300483323303,0,228,28300483490414,28300483452480 +0,'fill_to_order',0,28300841665450,0,28300841442269,28300841506011,0,206,28300841649125,28300841613194 +0,'fill_to_order',0,28301189220778,0,28301188990707,28301189050284,0,213,28301189204011,28301189165953 +0,'fill_to_order',0,28301653689006,0,28301653480269,28301653538862,0,200,28301653680352,28301653645610 +0,'fill_to_order',0,28301653834317,0,28301653598088,28301653712709,0,228,28301653826941,28301653795605 +0,'fill_to_order',0,28301653955025,0,28301653702923,28301653857384,0,245,28301653948024,28301653918401 +28302449240285,'tick_to_order',28302449240876,28302449335838,28302449247510,0,28302449242166,0,70,28302449310609,28302449282305 +0,'fill_to_order',0,28302686107925,0,28302685894905,28302685956385,0,197,28302686092000,28302686056337 +0,'fill_to_order',0,28303035556183,0,28303035327940,28303035392496,0,208,28303035536455,28303035500778 +0,'fill_to_order',0,28304618318730,0,28304618096174,28304618159048,0,206,28304618302477,28304618266601 +28306678855488,'tick_to_order',28306678857539,28306678970537,28306678878136,0,28306678865289,0,86,28306678941575,28306678909824 +0,'fill_to_order',0,28306679437306,0,28306679263763,28306679309431,0,159,28306679423428,28306679399469 +0,'fill_to_order',0,28306679584663,0,28306679309460,28306679462045,0,264,28306679573483,28306679540241 +28306709072481,'tick_to_order',28306709073029,28306709138909,28306709077851,0,28306709074198,0,39,28306709111506,28306709097190 +0,'fill_to_order',0,28306818077071,0,28306817801256,28306817871966,0,253,28306818054507,28306818012078 +0,'fill_to_order',0,28306818303482,0,28306817895245,28306818119406,0,388,28306818283918,28306818253059 +28307181183628,'tick_to_order',28307181186016,28307181304136,28307181209067,0,28307181193730,0,93,28307181277531,28307181244198 +0,'fill_to_order',0,28309145604025,0,28309145374760,28309145437019,0,212,28309145587475,28309145548980 +0,'fill_to_order',0,28309284279140,0,28309284059642,28309284117538,0,202,28309284262556,28309284227472 +0,'fill_to_order',0,28309449537547,0,28309449314305,28309449372163,0,203,28309449517790,28309449480468 +0,'fill_to_order',0,28309449660123,0,28309449443555,28309449562971,0,204,28309449648393,28309449624212 +0,'fill_to_order',0,28310100956899,0,28310100701043,28310100768437,0,232,28310100933398,28310100893978 +0,'fill_to_order',0,28310247666234,0,28310247418609,28310247492259,0,230,28310247649244,28310247612730 +0,'fill_to_order',0,28310247794724,0,28310247528988,28310247699695,0,253,28310247782849,28310247759510 +0,'fill_to_order',0,28310884035988,0,28310883781857,28310883843745,0,204,28310883986697,28310883951864 diff --git a/src/lib/orderman/perf_analysis/logs/latency_data/trace.sqlite b/src/lib/orderman/perf_analysis/logs/latency_data/trace.sqlite new file mode 100644 index 0000000000000000000000000000000000000000..fb09217916ed87f4881641df7368129bcedc8651 GIT binary patch literal 20480 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 Y@;bJ`7Z^kDLXNyX6Qx-KOfJm)A0zqWI{*Lx literal 0 HcmV?d00001 diff --git a/src/lib/orderman/perf_analysis/logs/load.sh b/src/lib/orderman/perf_analysis/logs/load.sh new file mode 100755 index 000000000..50314db22 --- /dev/null +++ b/src/lib/orderman/perf_analysis/logs/load.sh @@ -0,0 +1,7 @@ +#!/bin/bash +mkdir -p latency_data +rm latency_data/* +grep Latency $1 | python parse_helper.py import trace.csv> latency_data/import.sql +rm -f latency_data/latency.sqlite +grep Latency ~/sparkdata/data/logging/log | python parse_helper.py load > latency_data/trace.csv +(cd latency_data && sqlite3 trace.sqlite < import.sql) diff --git a/src/lib/orderman/perf_analysis/logs/parse_helper.py b/src/lib/orderman/perf_analysis/logs/parse_helper.py new file mode 100755 index 000000000..14e28dd39 --- /dev/null +++ b/src/lib/orderman/perf_analysis/logs/parse_helper.py @@ -0,0 +1,30 @@ +#!/usr/bin/python + +import re,sys + +sample = "2018-09-04 21:01:55.298494|28229758882763|Latency |Info |8 |fast_exe |9270|SocketConnection.cpp:139 |perf_event:tick_to_order s2s_us:87 fix_socket_r:0 md:28229758761828 md_src:28229758763548 spreader:28229758770464 order_update:28229758783209 exe_gw:28229758814253 fix_socket_w:28229758849709 md_sn:0 " +rx = ".*\\|(?P\\d+)\\|Latency.*perf_event\\:(?P\\w+) (?P.*)"; +rcx = re.compile(rx) + +def gen_create_table(d,t): + fields = [ "%s integer" % k if isinstance (v,int) else "%s text" % k for (k,v) in d.iteritems()] + print ".separator \",\"\ncreate table trace (%s);" % ",".join(fields) + print ".import %s trace" % t + print "create view summary as select (fix_socket_w - md) / 1000 total, (md_src-md)/1000 md_to_md_src, (spreader_on_book-md_src)/1000 md_src_to_spreader, (spreader_on_child_order_update-spreader_on_book)/1000 on_book_to_order_update, (exe_gw - spreader_on_child_order_update)/1000 child_order_update_to_gw, (fix_socket_w - exe_gw)/1000 gw_to_socket from trace where md<>0 and total < 3000"; + +def gen_insert(d): + values = [ "%s" % v if isinstance (v,int) else "'%s'" % v for v in d.values()] + print "%s" % (",".join(values)) + +for line in sys.stdin: + g = rcx.match(line) + if g: + lst = g.group('data').strip() + d = dict(s.split(':') for s in lst.split(' ')) + d = {k:int(v) for k, v in d.iteritems()} + d['event_id'] = int(g.group('event_id')) + d['event_type'] = g.group('event_type') + if sys.argv[1] == "import": + gen_create_table(d,sys.argv[2]) + sys.exit(0) + gen_insert(d) diff --git a/src/lib/orderman/perf_analysis/load.sh b/src/lib/orderman/perf_analysis/lttng/load.sh similarity index 100% rename from src/lib/orderman/perf_analysis/load.sh rename to src/lib/orderman/perf_analysis/lttng/load.sh diff --git a/src/lib/orderman/perf_analysis/parse.sh b/src/lib/orderman/perf_analysis/lttng/parse.sh similarity index 100% rename from src/lib/orderman/perf_analysis/parse.sh rename to src/lib/orderman/perf_analysis/lttng/parse.sh diff --git a/src/lib/orderman/perf_analysis/parse_helper.py b/src/lib/orderman/perf_analysis/lttng/parse_helper.py similarity index 100% rename from src/lib/orderman/perf_analysis/parse_helper.py rename to src/lib/orderman/perf_analysis/lttng/parse_helper.py diff --git a/src/lib/orderman/perf_analysis/trace.sh b/src/lib/orderman/perf_analysis/lttng/trace.sh similarity index 100% rename from src/lib/orderman/perf_analysis/trace.sh rename to src/lib/orderman/perf_analysis/lttng/trace.sh