diff --git a/src/server/sparkd/CMakeDeps.cmake b/src/server/sparkd/CMakeDeps.cmake index 93a11ab4a..38decb8ab 100644 --- a/src/server/sparkd/CMakeDeps.cmake +++ b/src/server/sparkd/CMakeDeps.cmake @@ -1 +1 @@ -set(sources cmds/AutoCert.cpp;cmds/Benchmark.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/Md.cpp;cmds/QuickTest.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Span.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;dspark/mirage.cpp;dspark/mirage/routing/Router.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/book/Book.cpp;exchange_sim/book/ExchangeSim.proto;exchange_sim/book/Order.cpp;exchange_sim/book/OrderMatcher.cpp;exchange_sim/book/book_transform.cpp;exchange_sim/tests/test_book_transform.cpp;http/ApiGateway.cpp;http/WebServer.cpp;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;main.cpp;md/platforms/celoxica/CXListener.cpp;md/platforms/celoxica/CXMain.cpp;md/platforms/celoxica/tests/cx_tests.cpp;md/platforms/mdp3_onixs/MDP3Listener.cpp;md/platforms/mdp3_onixs/MDP3Main.cpp;md/platforms/mdp3_onixs/MDP3Utils.cpp;md/platforms/mdp3_onixs/tests/mdp3_tests.cpp;md/run_md.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;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/OrderStore.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/IcebergOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/book_algos/BookAlgo.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/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/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/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;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/tests/PersistenceServiceTests.cpp;position/IMarginObserver.cpp;position/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/PositionServiceCore.cpp;position/tests/PositionTests.cpp;support/ErrorReportService.cpp;testing/catch_test_runner.cpp;tracing/bts_trace_c.c;user/AdminServiceServer.cpp;user/UserServiceServer.cpp;user/tests/admin_service_tests.cpp) \ No newline at end of file +set(sources cmds/AutoCert.cpp;cmds/Benchmark.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/Md.cpp;cmds/QuickTest.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Span.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;dspark/mirage.cpp;dspark/mirage/routing/Router.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/book/Book.cpp;exchange_sim/book/ExchangeSim.proto;exchange_sim/book/Order.cpp;exchange_sim/book/OrderMatcher.cpp;exchange_sim/book/book_transform.cpp;exchange_sim/tests/test_book_transform.cpp;http/ApiGateway.cpp;http/WebServer.cpp;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;main.cpp;md/platforms/celoxica/CXListener.cpp;md/platforms/celoxica/CXMain.cpp;md/platforms/celoxica/tests/cx_tests.cpp;md/platforms/mdp3_onixs/MDP3Listener.cpp;md/platforms/mdp3_onixs/MDP3Main.cpp;md/platforms/mdp3_onixs/MDP3Utils.cpp;md/platforms/mdp3_onixs/tests/mdp3_tests.cpp;md/run_md.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/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/IcebergOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/book_algos/BookAlgo.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/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/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/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;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/tests/PersistenceServiceTests.cpp;position/IMarginObserver.cpp;position/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/PositionServiceCore.cpp;position/tests/PositionTests.cpp;support/ErrorReportService.cpp;testing/catch_test_runner.cpp;tracing/bts_trace_c.c;user/AdminServiceServer.cpp;user/UserServiceServer.cpp;user/tests/admin_service_tests.cpp) \ No newline at end of file diff --git a/src/server/sparkd/jetfix/connection/SocketConnection.cpp b/src/server/sparkd/jetfix/connection/SocketConnection.cpp index f9579340c..0dc176191 100644 --- a/src/server/sparkd/jetfix/connection/SocketConnection.cpp +++ b/src/server/sparkd/jetfix/connection/SocketConnection.cpp @@ -112,9 +112,9 @@ int SocketConnection::write (WriteVec const&vec,size_t vec_size,size_t cid) iv[i].iov_len = vec[i].second; } - tracepoint (bts_trace,trace_order,(char*) "SocketConnection.pre_write", 0,cid); + tracepoint (bts_trace,trace_order,(char*) "SocketConnection.pre_write", 0,cid,0); auto result = ::writev (_fd,iv,(int) vec_size); - tracepoint (bts_trace,trace_order,(char*) "SocketConnection.post_write", 0,cid); + tracepoint (bts_trace,trace_order,(char*) "SocketConnection.post_write", 0,cid,0); if (_log && result >0) { for (size_t i = 0; i < vec_size;i++) _out_log.write (vec[i].first, vec[i].second); diff --git a/src/server/sparkd/jetfix/gateway/CoreGateway.cpp b/src/server/sparkd/jetfix/gateway/CoreGateway.cpp index 82f9bf3ac..a966ee064 100644 --- a/src/server/sparkd/jetfix/gateway/CoreGateway.cpp +++ b/src/server/sparkd/jetfix/gateway/CoreGateway.cpp @@ -139,7 +139,7 @@ CoreGateway::~CoreGateway() { } void CoreGateway::send(orderman::TickToTradeCorID cid, OutFIXPtr const &fix) { - tracepoint(bts_trace, trace_order, (char *)"CoreGateway.send", 0, cid); + tracepoint(bts_trace, trace_order, (char *)"CoreGateway.send", 0, cid,0); me->event_queue.enqueue(EventData(&CoreGateway::sync_send, cid, fix)); } @@ -257,7 +257,7 @@ void CoreGateway::sync_stop(EventData const &) { void CoreGateway::sync_send(EventData const &ev) { tracepoint(bts_trace, trace_order, (char *)"CoreGateway.sync_send", 0, - ev.cid); + ev.cid,0); switch (me->state) { case State::OFF: bts_assert(false); diff --git a/src/server/sparkd/jetfix/gateway/Session.cpp b/src/server/sparkd/jetfix/gateway/Session.cpp index 9be4b3144..814fd0c91 100644 --- a/src/server/sparkd/jetfix/gateway/Session.cpp +++ b/src/server/sparkd/jetfix/gateway/Session.cpp @@ -106,7 +106,7 @@ void Session::start() { } void Session::send(orderman::TickToTradeCorID cid, OutFIXPtr const &msgs) { - tracepoint (bts_trace,trace_order,(char*) "Session.send", 0,cid); + tracepoint (bts_trace,trace_order,(char*) "Session.send", 0,cid,0); switch (me->state) { case State::READY: case State::CERT_MODE: @@ -563,12 +563,12 @@ void Session::internal_send(orderman::TickToTradeCorID cid, data_vec[i].first = s.data(); data_vec[i].second = s.size(); } - tracepoint (bts_trace,trace_order,(char*) "Session.internal_send.pre_write", 0,cid); + tracepoint (bts_trace,trace_order,(char*) "Session.internal_send.pre_write", 0,cid,0); if (me->connection.write(data_vec, msgs->fix.size(), cid) < 0) { terminate_session(JetFIXError::CONNECTION_ERROR); return; } - tracepoint (bts_trace,trace_order,(char*) "Session.internal_send.post_write", 0,cid); + tracepoint (bts_trace,trace_order,(char*) "Session.internal_send.post_write", 0,cid,0); me->last_sent_msg_timestamp = me->now(); me->store.store(msgs); msgs->set_ts(OutFIX::POST_STORE, utils::TimeStamp::now()); diff --git a/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.cpp b/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.cpp index bb2d35b95..2d6a6d18f 100644 --- a/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.cpp +++ b/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.cpp @@ -106,19 +106,19 @@ MDP3Listener::~MDP3Listener() { // // Warnings/Errors void MDP3Listener::onError(onixs::Handler&, const onixs::ErrorArgs& error) { - tracepoint (bts_trace,trace_order,(char*) "onError", 0, _latest_sequence); + tracepoint (bts_trace,trace_order,(char*) "onError", 0, _latest_sequence,0); LOG(md,Warn, "OnixS Error: {} - {}", error.description(), error.source()); } void MDP3Listener::onWarning(onixs::Handler&, const onixs::WarningArgs& warning) { - tracepoint (bts_trace,trace_order,(char*) "onWarning", 0, _latest_sequence); + tracepoint (bts_trace,trace_order,(char*) "onWarning", 0, _latest_sequence,0); LOG(md,Warn, "OnixS Warn: {} - {}", warning.description(), warning.source()); } void MDP3Listener::onInstrumentRecovery(onixs::Handler& h) { - tracepoint (bts_trace,trace_order,(char*) "onInstrumentRecovery", 0, _latest_sequence); + tracepoint (bts_trace,trace_order,(char*) "onInstrumentRecovery", 0, _latest_sequence,0); LOG(md,Info, "Beginning security definition recovery for channel {}", h.settings().channel()); } void MDP3Listener::onEndOfInstrumentRecovery(onixs::Handler& h, const onixs::RecoveryCompletionArgs&) { - tracepoint (bts_trace,trace_order,(char*) "onEndOfInstrumentRecovery", 0, _latest_sequence); + tracepoint (bts_trace,trace_order,(char*) "onEndOfInstrumentRecovery", 0, _latest_sequence,0); LOG(md,Info, "Finished Security definition recovery for channel {}", h.settings().channel()); } // void MDP3Listener::onGap(onixs::Handler& h, const Security&, unsigned) { @@ -129,22 +129,22 @@ void MDP3Listener::onEndOfInstrumentRecovery(onixs::Handler& h, const onixs::Rec // // Gap Recovery void MDP3Listener::onMarketRecovery(onixs::Handler& h) { - tracepoint (bts_trace,trace_order,(char*) "onMarketRecovery", 0, _latest_sequence); + tracepoint (bts_trace,trace_order,(char*) "onMarketRecovery", 0, _latest_sequence,0); update_all_status(COCONUTSECURITYSTATUS_PACKET_LOSS); LOG(md,Info, "Beginning market recovery for channel {}", h.settings().channel()); } void MDP3Listener::onEndOfMarketRecovery(onixs::Handler& h, const onixs::RecoveryCompletionArgs&) { - tracepoint (bts_trace,trace_order,(char*) "onEndOfMarketRecovery", 0, _latest_sequence); + tracepoint (bts_trace,trace_order,(char*) "onEndOfMarketRecovery", 0, _latest_sequence,0); update_all_status(COCONUTSECURITYSTATUS_OK); LOG(md,Info, "Finished market recovery for channel {}", h.settings().channel()); } void MDP3Listener::onTcpRecovery(onixs::Handler& h) { - tracepoint (bts_trace,trace_order,(char*) "onTcpRecovery", 0, _latest_sequence); + tracepoint (bts_trace,trace_order,(char*) "onTcpRecovery", 0, _latest_sequence,0); update_all_status(COCONUTSECURITYSTATUS_PACKET_LOSS); LOG(md,Info, "Beginning tcp recovery for channel {}", h.settings().channel()); } void MDP3Listener::onEndOfTcpRecovery(onixs::Handler& h, const onixs::RecoveryCompletionArgs&) { - tracepoint (bts_trace,trace_order,(char*) "onEndOfTcpRecovery", 0, _latest_sequence); + tracepoint (bts_trace,trace_order,(char*) "onEndOfTcpRecovery", 0, _latest_sequence,0); update_all_status(COCONUTSECURITYSTATUS_OK); LOG(md,Info, "Finished tcp recovery for channel {}", h.settings().channel()); } @@ -171,12 +171,12 @@ void MDP3Listener::onPacket(onixs::Handler&, const onixs::PacketArgs& args) { // was needed for clang compilation tracepoint (bts_trace,trace_order,(char*) "onPacket", - _packet_arrived.to_uint64() - (onixs_now-onixs_zero),_latest_sequence); + _packet_arrived.to_uint64() - (onixs_now-onixs_zero),_latest_sequence,0); } void MDP3Listener::onEndOfPacket(onixs::Handler&, const onixs::PacketArgs&) { - tracepoint (bts_trace,trace_order,(char*) "onEndOfPacket.begin", 0,_latest_sequence); + tracepoint (bts_trace,trace_order,(char*) "onEndOfPacket.begin", 0,_latest_sequence,0); flush_books(); - tracepoint (bts_trace,trace_order,(char*) "onEndOfPacket.end", 0,_latest_sequence); + tracepoint (bts_trace,trace_order,(char*) "onEndOfPacket.end", 0,_latest_sequence,0); } // @@ -230,7 +230,7 @@ void set_security_common(const Definition& def, FixedSecurity& fsec) { } void MDP3Listener::onDefinition(onixs::Handler&, const onixs::Security& osec, const onixs::InstrumentDefinitionFutureArgs& def) { - tracepoint (bts_trace,trace_order,(char*) "onDefinition.future", 0,_latest_sequence); + tracepoint (bts_trace,trace_order,(char*) "onDefinition.future", 0,_latest_sequence,0); const auto& sec = def.message(); auto exchange_id = sec.securityId(); // LOG(Info, MarketData) << "onDefinition future " << exchange_id; @@ -255,7 +255,7 @@ void MDP3Listener::onDefinition(onixs::Handler&, const onixs::Security& osec, co add_security(fsec); } void MDP3Listener::onDefinition(onixs::Handler&, const onixs::Security&, const onixs::InstrumentDefinitionOptionArgs& def) { - tracepoint (bts_trace,trace_order,(char*) "onDefinition.option", 0,_latest_sequence); + tracepoint (bts_trace,trace_order,(char*) "onDefinition.option", 0,_latest_sequence,0); const auto& sec = def.message(); auto exchange_id = sec.securityId(); // LOG(Info, MarketData) << "onDefinition option " << exchange_id; @@ -288,7 +288,7 @@ void MDP3Listener::onDefinition(onixs::Handler&, const onixs::Security&, const o } void MDP3Listener::onDefinition(onixs::Handler&, const onixs::Security&, const onixs::InstrumentDefinitionSpreadArgs& spread_args) { - tracepoint (bts_trace,trace_order,(char*) "onDefinition.spread", 0,_latest_sequence); + tracepoint (bts_trace,trace_order,(char*) "onDefinition.spread", 0,_latest_sequence,0); const auto& sec = spread_args.message(); auto exchange_id = sec.securityId(); // LOG(Info, MarketData) << "onDefinition spread " << exchange_id; @@ -339,7 +339,7 @@ void MDP3Listener::onDefinition(onixs::Handler&, const onixs::Security&, const o // // Book void MDP3Listener::onBookUpdate(onixs::Handler&, const onixs::Security& sec, const onixs::ConsolidatedBook& book) { - tracepoint (bts_trace,trace_order,(char*) "onBookUpdate", 0,_latest_sequence); + tracepoint (bts_trace,trace_order,(char*) "onBookUpdate", 0,_latest_sequence,0); auto data = _index.get_security(sec.id()); if (data == nullptr) return; @@ -389,7 +389,7 @@ void on_trade(SecurityData* data, const onixs::PRICE& price, int size, const oni } void MDP3Listener::onTrade(onixs::Handler&, const onixs::Security& sec, const onixs::RecoveryEntryArgs& arg) { - tracepoint (bts_trace,trace_order,(char*) "onTrade.recovery", 0,_latest_sequence); + tracepoint (bts_trace,trace_order,(char*) "onTrade.recovery", 0,_latest_sequence,0); auto* data = _index.get_security(sec.id()); if (data != NULL) { int size = 0; @@ -400,7 +400,7 @@ void MDP3Listener::onTrade(onixs::Handler&, const onixs::Security& sec, const on } } void MDP3Listener::onTrade(onixs::Handler&, const onixs::Security& sec, const onixs::TradeSummaryArgs& arg) { - tracepoint (bts_trace,trace_order,(char*) "onTrade.summary", 0,_latest_sequence); + tracepoint (bts_trace,trace_order,(char*) "onTrade.summary", 0,_latest_sequence,0); auto* data = _index.get_security(sec.id()); if (data != NULL) { auto size = arg.entry().entrySize(); @@ -409,7 +409,7 @@ void MDP3Listener::onTrade(onixs::Handler&, const onixs::Security& sec, const on } } void MDP3Listener::onTrade(onixs::Handler&, const onixs::Security& sec, const onixs::TradeArgs& arg) { - tracepoint (bts_trace,trace_order,(char*) "onTrade.trade_args", 0,_latest_sequence); + tracepoint (bts_trace,trace_order,(char*) "onTrade.trade_args", 0,_latest_sequence,0); if (arg.entry().updateAction() == onixs::UpdateAction::New) { auto* data = _index.get_security(sec.id()); if (data != nullptr) { @@ -423,7 +423,7 @@ void MDP3Listener::onTrade(onixs::Handler&, const onixs::Security& sec, const on // // RFQ void MDP3Listener::onQuoteRequest(onixs::Handler&, const onixs::Security& sec, const onixs::QuoteRequestRelatedSymArgs& arg) { - tracepoint (bts_trace,trace_order,(char*) "onQuoteRequest", 0,_latest_sequence); + tracepoint (bts_trace,trace_order,(char*) "onQuoteRequest", 0,_latest_sequence,0); auto* data = _index.get_security(sec.id()); if (data != nullptr) { auto ts = utils::TimeStamp::now(); @@ -472,7 +472,7 @@ void MDP3Listener::onQuoteRequest(onixs::Handler&, const onixs::Security& sec, c // // Volume void MDP3Listener::onElectronicVolume(onixs::Handler&, const onixs::Security& sec, const onixs::VolumeArgs& args) { - tracepoint (bts_trace,trace_order,(char*) "onElectronicVolume.volume", 0,_latest_sequence); + tracepoint (bts_trace,trace_order,(char*) "onElectronicVolume.volume", 0,_latest_sequence,0); auto* data = _index.get_security(sec.id()); if (data != nullptr) { bts_assert_d( args.entry().entryType().value() == 'e'); @@ -482,7 +482,7 @@ void MDP3Listener::onElectronicVolume(onixs::Handler&, const onixs::Security& se } } void MDP3Listener::onElectronicVolume(onixs::Handler&, const onixs::Security& sec, const onixs::RecoveryEntryArgs& args) { - tracepoint (bts_trace,trace_order,(char*) "onElectronicVolume.recovery", 0,_latest_sequence); + tracepoint (bts_trace,trace_order,(char*) "onElectronicVolume.recovery", 0,_latest_sequence,0); auto* data = _index.get_security(sec.id()); if (data) { int32_t size; @@ -495,7 +495,7 @@ void MDP3Listener::onElectronicVolume(onixs::Handler&, const onixs::Security& se // // Misc void MDP3Listener::onSettlementPrice(onixs::Handler&, const onixs::Security& sec, const onixs::DailyStatisticsArgs& args) { - tracepoint (bts_trace,trace_order,(char*) "onSettlementPrice.daily", 0,_latest_sequence); + tracepoint (bts_trace,trace_order,(char*) "onSettlementPrice.daily", 0,_latest_sequence,0); auto* data = _index.get_security(sec.id()); if (data != nullptr) { onixs::PRICE price; @@ -510,7 +510,7 @@ void MDP3Listener::onSettlementPrice(onixs::Handler&, const onixs::Security& sec } } void MDP3Listener::onSettlementPrice(onixs::Handler&, const onixs::Security& sec, const onixs::RecoveryEntryArgs& args) { - tracepoint (bts_trace,trace_order,(char*) "onSettlementPrice.recovery", 0,_latest_sequence); + tracepoint (bts_trace,trace_order,(char*) "onSettlementPrice.recovery", 0,_latest_sequence,0); auto* data = _index.get_security(sec.id()); if (data != nullptr) { onixs::PRICE price; @@ -525,7 +525,7 @@ void MDP3Listener::onSettlementPrice(onixs::Handler&, const onixs::Security& sec } } void MDP3Listener::onOpenInterest(onixs::Handler&, const onixs::Security& sec, const onixs::DailyStatisticsArgs& args) { - tracepoint (bts_trace,trace_order,(char*) "onOpenInterest.daily", 0,_latest_sequence); + tracepoint (bts_trace,trace_order,(char*) "onOpenInterest.daily", 0,_latest_sequence,0); auto* data = _index.get_security(sec.id()); if (data != nullptr) { onixs::PRICE price; @@ -535,7 +535,7 @@ void MDP3Listener::onOpenInterest(onixs::Handler&, const onixs::Security& sec, c } } void MDP3Listener::onOpenInterest(onixs::Handler&, const onixs::Security& sec, const onixs::RecoveryEntryArgs& args) { - tracepoint (bts_trace,trace_order,(char*) "onOpenInterest.recovery", 0,_latest_sequence); + tracepoint (bts_trace,trace_order,(char*) "onOpenInterest.recovery", 0,_latest_sequence,0); auto* data = _index.get_security(sec.id()); if (data != nullptr) { onixs::PRICE price; @@ -545,7 +545,7 @@ void MDP3Listener::onOpenInterest(onixs::Handler&, const onixs::Security& sec, c } } void MDP3Listener::onOpeningPrice(onixs::Handler&, const onixs::Security& sec, const onixs::SessionStatisticsArgs& args) { - tracepoint (bts_trace,trace_order,(char*) "onOpeningPrice.session", 0,_latest_sequence); + tracepoint (bts_trace,trace_order,(char*) "onOpeningPrice.session", 0,_latest_sequence,0); auto* data = _index.get_security(sec.id()); if (data != nullptr) { onixs::PRICE price = args.entry().entryPx(); @@ -558,7 +558,7 @@ void MDP3Listener::onOpeningPrice(onixs::Handler&, const onixs::Security& sec, c } } void MDP3Listener::onOpeningPrice(onixs::Handler&, const onixs::Security& sec, const onixs::RecoveryEntryArgs& args) { - tracepoint (bts_trace,trace_order,(char*) "onOpeningPrice.recovery", 0,_latest_sequence); + tracepoint (bts_trace,trace_order,(char*) "onOpeningPrice.recovery", 0,_latest_sequence,0); auto* data = _index.get_security(sec.id()); if (data != nullptr) { onixs::PRICE price; @@ -573,7 +573,7 @@ void MDP3Listener::onOpeningPrice(onixs::Handler&, const onixs::Security& sec, c } } void MDP3Listener::onHighTradePrice(onixs::Handler&, const onixs::Security& sec, const onixs::SessionStatisticsArgs& args) { - tracepoint (bts_trace,trace_order,(char*) "onHighTradePrice.session", 0,_latest_sequence); + tracepoint (bts_trace,trace_order,(char*) "onHighTradePrice.session", 0,_latest_sequence,0); auto* data = _index.get_security(sec.id()); if (data != nullptr) { auto display_factor = data->handle.security().display_factor; @@ -583,7 +583,7 @@ void MDP3Listener::onHighTradePrice(onixs::Handler&, const onixs::Security& sec, } } void MDP3Listener::onHighTradePrice(onixs::Handler&, const onixs::Security& sec, const onixs::RecoveryEntryArgs& args) { - tracepoint (bts_trace,trace_order,(char*) "onHighTradePrice.recovery", 0,_latest_sequence); + tracepoint (bts_trace,trace_order,(char*) "onHighTradePrice.recovery", 0,_latest_sequence,0); auto* data = _index.get_security(sec.id()); if (data != nullptr) { auto display_factor = data->handle.security().display_factor; @@ -595,7 +595,7 @@ void MDP3Listener::onHighTradePrice(onixs::Handler&, const onixs::Security& sec, } } void MDP3Listener::onLowTradePrice(onixs::Handler&, const onixs::Security& sec, const onixs::SessionStatisticsArgs& args) { - tracepoint (bts_trace,trace_order,(char*) "onLowTradePrice.session", 0,_latest_sequence); + tracepoint (bts_trace,trace_order,(char*) "onLowTradePrice.session", 0,_latest_sequence,0); auto* data = _index.get_security(sec.id()); if (data != nullptr) { auto display_factor = data->handle.security().display_factor; @@ -605,7 +605,7 @@ void MDP3Listener::onLowTradePrice(onixs::Handler&, const onixs::Security& sec, } } void MDP3Listener::onLowTradePrice(onixs::Handler&, const onixs::Security& sec, const onixs::RecoveryEntryArgs& args) { - tracepoint (bts_trace,trace_order,(char*) "onLowTradePrice.recovery", 0,_latest_sequence); + tracepoint (bts_trace,trace_order,(char*) "onLowTradePrice.recovery", 0,_latest_sequence,0); auto* data = _index.get_security(sec.id()); if (data != nullptr) { auto display_factor = data->handle.security().display_factor; @@ -617,7 +617,7 @@ void MDP3Listener::onLowTradePrice(onixs::Handler&, const onixs::Security& sec, } } void MDP3Listener::onHighestBid(onixs::Handler&, const onixs::Security& sec, const onixs::SessionStatisticsArgs& args) { - tracepoint (bts_trace,trace_order,(char*) "onHighestBid.session", 0,_latest_sequence); + tracepoint (bts_trace,trace_order,(char*) "onHighestBid.session", 0,_latest_sequence,0); auto* data = _index.get_security(sec.id()); if (data != nullptr) { auto display_factor = data->handle.security().display_factor; @@ -627,7 +627,7 @@ void MDP3Listener::onHighestBid(onixs::Handler&, const onixs::Security& sec, con } } void MDP3Listener::onLowestOffer(onixs::Handler&, const onixs::Security& sec, const onixs::SessionStatisticsArgs& args) { - tracepoint (bts_trace,trace_order,(char*) "onLowestOffer.session", 0,_latest_sequence); + tracepoint (bts_trace,trace_order,(char*) "onLowestOffer.session", 0,_latest_sequence,0); auto* data = _index.get_security(sec.id()); if (data != nullptr) { auto display_factor = data->handle.security().display_factor; diff --git a/src/server/sparkd/orderman/actors/ExecutionGateway.cpp b/src/server/sparkd/orderman/actors/ExecutionGateway.cpp index e54fd3277..24da71292 100644 --- a/src/server/sparkd/orderman/actors/ExecutionGateway.cpp +++ b/src/server/sparkd/orderman/actors/ExecutionGateway.cpp @@ -265,7 +265,7 @@ void ExecutionGateway::on_outgoing_fix( mercury::Update const &msg) { if (msg.events) for (auto const &ev : *(msg.events)) { - tracepoint (bts_trace,trace_order,(char*) "on_outgoing_fix", 0,ev.cid); + tracepoint (bts_trace,trace_order,(char*) "on_outgoing_fix", 0,ev.cid,0); me->gw.send(ev.cid, ev.msg); } } diff --git a/src/server/sparkd/orderman/actors/MDSource.h b/src/server/sparkd/orderman/actors/MDSource.h index 87660af97..d6a39d380 100644 --- a/src/server/sparkd/orderman/actors/MDSource.h +++ b/src/server/sparkd/orderman/actors/MDSource.h @@ -65,7 +65,7 @@ class MDSource : public mercury::Actor, public mercury::IPollableActor { md::HandleReadResult::SUCCESS) { book._security_key = SecurityKey(handle->key()); corid = handle->sequence(); - tracepoint (bts_trace,trace_order,(char*) "MDSource", 0, corid); + tracepoint (bts_trace,trace_order,(char*) "MDSource", 0, corid,0); publish(_book_update, book, corid); } } diff --git a/src/server/sparkd/orderman/orders/NativeOrder.cpp b/src/server/sparkd/orderman/orders/NativeOrder.cpp index 53192238d..9b7ca9754 100644 --- a/src/server/sparkd/orderman/orders/NativeOrder.cpp +++ b/src/server/sparkd/orderman/orders/NativeOrder.cpp @@ -268,7 +268,7 @@ NativeOrder::~NativeOrder() {} void NativeOrder::on_activate(Price p, Quantity q, bts::orderman::OrderServices &services, TickToTradeCorID cid) { - tracepoint(bts_trace, trace_order, (char *)"on_activate", 0, cid); + tracepoint(bts_trace, trace_order, (char *)"on_activate", 0, cid,0); bts_assert(!me->services); me->services = &services; @@ -445,7 +445,7 @@ void NativeOrder::on_activate(Price p, Quantity q, } void NativeOrder::on_update(Price p, Quantity q, TickToTradeCorID cid) { - tracepoint(bts_trace, trace_order, (char *)"on_update", 0, cid); + tracepoint(bts_trace, trace_order, (char *)"on_update", 0, cid,0); switch (me->state.status()) { diff --git a/src/server/sparkd/orderman/orders/spreader_orders/SpreaderOrder.cpp b/src/server/sparkd/orderman/orders/spreader_orders/SpreaderOrder.cpp index 66c323838..4b4c1b2f8 100644 --- a/src/server/sparkd/orderman/orders/spreader_orders/SpreaderOrder.cpp +++ b/src/server/sparkd/orderman/orders/spreader_orders/SpreaderOrder.cpp @@ -87,7 +87,7 @@ void SpreaderOrder::_on_time(const bts::mercury::TimerEvent& t_event){ } void SpreaderOrder::_on_book_update(const BookUpdateEvent& book_event){ if (!_active) return; - tracepoint (bts_trace,trace_order,(char*) "_on_book_update", 0,book_event.correlation_id); + tracepoint (bts_trace,trace_order,(char*) "_on_book_update", 0,book_event.correlation_id,0); _state_worker->on_book (book_event.correlation_id, book_event.book); } void SpreaderOrder::_on_child_order_update(const OrderStateUpdateEvent& ord_ev){ @@ -329,4 +329,4 @@ void SpreaderOrder::_send_check_termination(bool force){ _state_worker->on_check_termination(); } } -}} \ No newline at end of file +}} diff --git a/src/server/sparkd/tracing/bts_trace_c.h b/src/server/sparkd/tracing/bts_trace_c.h index 678a17857..b23bbb26d 100644 --- a/src/server/sparkd/tracing/bts_trace_c.h +++ b/src/server/sparkd/tracing/bts_trace_c.h @@ -11,11 +11,12 @@ TRACEPOINT_EVENT(bts_trace, trace_order, - TP_ARGS(char *, text, long long, argument1, long long, argument2), + TP_ARGS(char *, text, long long, argument1, long long, argument2, long long, argument3), TP_FIELDS( ctf_string(msg, text) ctf_integer(long long, arg1,argument1) ctf_integer(long long, arg2,argument2) + ctf_integer(long long, arg3,argument3) )) #endif /* _BTS_TP_H */