diff --git a/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.cpp b/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.cpp index 2d6a6d18f..baa453a4a 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,0); + tracepoint (bts_trace,trace_order,(char*) "onError", _latest_sequence, (uint16_t) _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,0); + tracepoint (bts_trace,trace_order,(char*) "onWarning", _latest_sequence, (uint16_t) _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,0); + tracepoint (bts_trace,trace_order,(char*) "onInstrumentRecovery", _latest_sequence, (uint16_t) _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,0); + tracepoint (bts_trace,trace_order,(char*) "onEndOfInstrumentRecovery", _latest_sequence, (uint16_t) _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,0); + tracepoint (bts_trace,trace_order,(char*) "onMarketRecovery", _latest_sequence, (uint16_t) _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,0); + tracepoint (bts_trace,trace_order,(char*) "onEndOfMarketRecovery", _latest_sequence, (uint16_t) _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,0); + tracepoint (bts_trace,trace_order,(char*) "onTcpRecovery", _latest_sequence, (uint16_t) _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,0); + tracepoint (bts_trace,trace_order,(char*) "onEndOfTcpRecovery", _latest_sequence, (uint16_t) _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,0); + _latest_sequence,(uint16_t) _latest_sequence, onixs_now-onixs_zero); } void MDP3Listener::onEndOfPacket(onixs::Handler&, const onixs::PacketArgs&) { - tracepoint (bts_trace,trace_order,(char*) "onEndOfPacket.begin", 0,_latest_sequence,0); + tracepoint (bts_trace,trace_order,(char*) "onEndOfPacket.begin", _latest_sequence, (uint16_t) _latest_sequence, 0); flush_books(); - tracepoint (bts_trace,trace_order,(char*) "onEndOfPacket.end", 0,_latest_sequence,0); + tracepoint (bts_trace,trace_order,(char*) "onEndOfPacket.end", _latest_sequence, (uint16_t) _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,0); + tracepoint (bts_trace,trace_order,(char*) "onDefinition.future", _latest_sequence, (uint16_t) _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,0); + tracepoint (bts_trace,trace_order,(char*) "onDefinition.option", _latest_sequence, (uint16_t) _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,0); + tracepoint (bts_trace,trace_order,(char*) "onDefinition.spread", _latest_sequence, (uint16_t) _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,0); + tracepoint (bts_trace,trace_order,(char*) "onBookUpdate", _latest_sequence, (uint16_t) _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,0); + tracepoint (bts_trace,trace_order,(char*) "onTrade.recovery", _latest_sequence, (uint16_t) _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,0); + tracepoint (bts_trace,trace_order,(char*) "onTrade.summary", _latest_sequence, (uint16_t) _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,0); + tracepoint (bts_trace,trace_order,(char*) "onTrade.trade_args", _latest_sequence, (uint16_t) _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,0); + tracepoint (bts_trace,trace_order,(char*) "onQuoteRequest", _latest_sequence, (uint16_t) _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,0); + tracepoint (bts_trace,trace_order,(char*) "onElectronicVolume.volume", _latest_sequence, (uint16_t) _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,0); + tracepoint (bts_trace,trace_order,(char*) "onElectronicVolume.recovery", _latest_sequence, (uint16_t) _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,0); + tracepoint (bts_trace,trace_order,(char*) "onSettlementPrice.daily", _latest_sequence, (uint16_t) _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,0); + tracepoint (bts_trace,trace_order,(char*) "onSettlementPrice.recovery", _latest_sequence, (uint16_t) _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,0); + tracepoint (bts_trace,trace_order,(char*) "onOpenInterest.daily", _latest_sequence, (uint16_t) _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,0); + tracepoint (bts_trace,trace_order,(char*) "onOpenInterest.recovery", _latest_sequence, (uint16_t) _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,0); + tracepoint (bts_trace,trace_order,(char*) "onOpeningPrice.session", _latest_sequence, (uint16_t) _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,0); + tracepoint (bts_trace,trace_order,(char*) "onOpeningPrice.recovery", _latest_sequence, (uint16_t) _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,0); + tracepoint (bts_trace,trace_order,(char*) "onHighTradePrice.session", _latest_sequence, (uint16_t) _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,0); + tracepoint (bts_trace,trace_order,(char*) "onHighTradePrice.recovery", _latest_sequence, (uint16_t) _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,0); + tracepoint (bts_trace,trace_order,(char*) "onLowTradePrice.session", _latest_sequence, (uint16_t) _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,0); + tracepoint (bts_trace,trace_order,(char*) "onLowTradePrice.recovery", _latest_sequence, (uint16_t) _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,0); + tracepoint (bts_trace,trace_order,(char*) "onHighestBid.session", _latest_sequence, (uint16_t) _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,0); + tracepoint (bts_trace,trace_order,(char*) "onLowestOffer.session", _latest_sequence, (uint16_t) _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/perf_analysis/load.sh b/src/server/sparkd/orderman/perf_analysis/load.sh index 6c6c8c41a..6dec072a3 100644 --- a/src/server/sparkd/orderman/perf_analysis/load.sh +++ b/src/server/sparkd/orderman/perf_analysis/load.sh @@ -4,12 +4,41 @@ sqlite3 trace_data/trace.sqlite < packets.ts ; +create table shot_packet as select - (seq % 65535) seq16, seq, ts, hts, msg, cpu, tid, arg1 -from - raw_trace; -create index trace_seq_idx on trace(seq16); + (shot_ts - max(packet_ts)) / 1000 t, + shot_ts, + max(packet_ts) packet_ts, + max(seq) seq +from + paired_all +group by + shot_ts; +create table tick_to_trade as +select + shot_packet.*, + (shot_packet.t + packets.offset/1000) total_t, + packets.offset, + packets.seq16 +from + shot_packet, packets where shot_packet.packet_ts = packets.ts; EOF diff --git a/src/server/sparkd/orderman/perf_analysis/parse_helper.py b/src/server/sparkd/orderman/perf_analysis/parse_helper.py index baba0a93a..2c97ca121 100644 --- a/src/server/sparkd/orderman/perf_analysis/parse_helper.py +++ b/src/server/sparkd/orderman/perf_analysis/parse_helper.py @@ -4,7 +4,7 @@ import re import fileinput import sys -sample = "[11:13:02.685629121] (+0.000001447) pp-12 bts_trace:quoter: { cpu_id = 2 }, { pthread_id = 140322906629888 }, { msg = \"handle_updated\", arg1 = 3893975869889250, arg2 = 0 }" +sample = "[11:13:02.685629121] (+0.000001447) pp-12 bts_trace:quoter: { cpu_id = 2 }, { pthread_id = 140322906629888 }, { msg = \"handle_updated\", arg1 = 3893975869889250, arg2 = 0 , arg3 = 0 }" rx = '\\[(?P\\d\\d)\\:(?P\\d\\d)\\:(?P\\d\\d)\\.(?P\\d*).*?\\{ (?P.*?)\\ }, ' '\\{ (?P.*?) \\}, ' '\\{ (?P.*?) \\}' rcx = re.compile(rx) @@ -29,9 +29,9 @@ for line in sys.stdin: parse_group(g.group('ctx1'),row) parse_group(g.group('ctx2'),row) parse_group(g.group('udata'),row) - # seq, ts, hts,msg,cpu,tid,arg1 + #ts, hts,msg,cpu,tid,arg1,arg2, arg3 #print row - print ("%s,%s,%s,%s,%s,%s,%s" % (row['arg2'],row['t'],row['ts'],row['msg'],row['cpu_id'],row['pthread_id'],row['arg1'])) + print ("%s,%s,%s,%s,%s,%s,%s,%s" % (row['t'],row['ts'],row['msg'],row['cpu_id'],row['pthread_id'],row['arg1'],row['arg2'],row['arg3']))