From 9117e3e238cd04c964459d68456b275303c54339 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Mon, 11 Mar 2019 07:58:43 -0400 Subject: [PATCH 1/3] Add a minimum tracing interval for scoped logs --- src/lib/orderman/actors/MDSource.h | 2 +- .../actors/order_manager/OrderManager.cpp | 2 +- src/lib/tracing/PerfLog.h | 46 ++++++++++++++----- src/lib/utils/TimeStamp.h | 8 ++++ 4 files changed, 45 insertions(+), 13 deletions(-) diff --git a/src/lib/orderman/actors/MDSource.h b/src/lib/orderman/actors/MDSource.h index 4d3882f80..ae77779d0 100644 --- a/src/lib/orderman/actors/MDSource.h +++ b/src/lib/orderman/actors/MDSource.h @@ -97,7 +97,7 @@ class MDSource : public mercury::Actor, public mercury::IPollableActor { private: void on_poll(trace::PerfLog& log) override { - auto scoped_do_work = trace::log_scope(log, {}, "MDSource::on_poll"); + auto scoped_do_work = trace::log_scope(log, {}, "MDSource::on_poll", utils::Timespan::Interval::from_microseconds(2)); // Book Updates Book book; diff --git a/src/lib/orderman/actors/order_manager/OrderManager.cpp b/src/lib/orderman/actors/order_manager/OrderManager.cpp index 83354507f..604bb421b 100644 --- a/src/lib/orderman/actors/order_manager/OrderManager.cpp +++ b/src/lib/orderman/actors/order_manager/OrderManager.cpp @@ -458,7 +458,7 @@ void OrderManager::reload_fix_buffer(SessionServicesData &osd) { } void OrderManager::on_poll(trace::PerfLog& log) { - auto scoped_do_work = trace::log_scope(log, {}, "OrderManager::dispatch_incoming_fix_messages"); + auto scoped_do_work = trace::log_scope(log, {}, "OrderManager::dispatch_incoming_fix_messages", utils::Timespan::Interval::from_microseconds(2)); for (auto &osd : me->services_data.sessions) osd->gw.dispatch_incoming_fix_messages(); } diff --git a/src/lib/tracing/PerfLog.h b/src/lib/tracing/PerfLog.h index 8ccac1430..9b1a7fb5b 100644 --- a/src/lib/tracing/PerfLog.h +++ b/src/lib/tracing/PerfLog.h @@ -85,9 +85,10 @@ class ScopedPerfLogEntry { ScopedPerfLogEntry() : _log(nullptr) { _begin.entry_kind = nullptr; } ScopedPerfLogEntry(PerfLog &l, CorID cid, const char *entry_kind, + utils::TimeStamp::Interval minimum, uint64_t uint64_1 = 0, const char *txt_1 = "", uint32_t uint32_1 = 0) - : _log(&l), _begin{utils::TimeStamp::now(), + : _log(&l), _begin{utils::TimeStamp::now(), _min(minimum) cid.channel, entry_kind, txt_1, @@ -96,23 +97,35 @@ class ScopedPerfLogEntry { utils::TimeStamp(), cid.sn, uint32_1} { - - if (_begin.entry_kind) { - _log->log(_begin); - } + if (_min.zero()) { + if (_begin.entry_kind) { + _log->log(_begin); + } + } } ScopedPerfLogEntry(ScopedPerfLogEntry &&src) - : _log(src._log), _begin(src._begin) { + : _log(src._log), _begin(src._begin), _min(src._min) { src._begin.entry_kind = nullptr; } void finish() { if (_begin.entry_kind) { - // _log->log(_begin); - _begin.cor_event = _begin.ts; - _begin.ts = utils::TimeStamp::now(); - _log->log(_begin); + bool discard = false; + auto ts = utils::TimeStamp::now(); + if (!_min.zero()) { + if (_begin.ts - ts) >= _min) { + _log->log(_begin); + } + else { + discard = true; + } + } + if (!discard) { + _begin.cor_event = _begin.ts; + _begin.ts = ts; + _log->log(_begin); + } discard(); } } @@ -124,6 +137,7 @@ class ScopedPerfLogEntry { private: PerfLog *_log; PerfLogEntry _begin; + utils::TimeStamp::Interval _min; }; // ScopedPerfLogEntry inline ScopedPerfLogEntry log_scope(PerfLog& log, @@ -131,7 +145,17 @@ inline ScopedPerfLogEntry log_scope(PerfLog& log, uint64_t uint64_1 = 0, const char *txt_1 = "", uint32_t uint32_1 = 0) { - return ScopedPerfLogEntry(log, cid, entry_kind, uint64_1, + return ScopedPerfLogEntry(log, cid, entry_kind, TimeStamp::Interval::from_microseconds(0), uint64_1, + txt_1, uint32_1); +} + +inline ScopedPerfLogEntry log_scope(PerfLog& log, + trace::CorID cid, const char *entry_kind, + Timestamp::Interval minimum_relavant, + uint64_t uint64_1 = 0, + const char *txt_1 = "", + uint32_t uint32_1 = 0) { + return ScopedPerfLogEntry(log, cid, entry_kind, minimum_relavant, uint64_1, txt_1, uint32_1); } diff --git a/src/lib/utils/TimeStamp.h b/src/lib/utils/TimeStamp.h index 19a546a8a..1e6b8ef71 100644 --- a/src/lib/utils/TimeStamp.h +++ b/src/lib/utils/TimeStamp.h @@ -32,6 +32,7 @@ public: int64_t microseconds() const; int64_t milliseconds() const; int64_t nanoseconds() const; + bool zero() const; friend class bts::utils::TimeStamp; friend Interval operator-( const TimeStamp& t1, const TimeStamp& t2); @@ -43,6 +44,10 @@ public: } Interval& operator+=(const Interval& other) { _val += other._val; return *this; } Interval& operator-=(const Interval& other) { _val -= other._val; return *this; } + bool operator > (const Interval& t1, const Interval& t2) { return t1._val > t2._val; } + bool operator < (const Interval& t1, const Interval& t2) { return t1._val < t2._val; } + bool operator >= (const Interval& t1, const Interval& t2) { return t1._val >= t2._val; } + bool operator <= (const Interval& t1, const Interval& t2) { return t1._val <= t2._val; } static Interval from_microseconds(uint64_t microseconds); private: @@ -137,6 +142,9 @@ inline int64_t TimeStamp::Interval::nanoseconds() const { return _val ; #endif } +inline bool TimeStamp::Interval::zero() const { + return _val == 0; +} inline int64_t TimeStamp::Interval::milliseconds() const { return microseconds() / 1000; From 41a04de31b6f5e2d53b05263438d54ff36bed501 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Mon, 11 Mar 2019 13:52:12 -0400 Subject: [PATCH 2/3] Update threshhold with help from compiler --- src/lib/orderman/actors/ExecutionGateway.cpp | 2 +- src/lib/orderman/actors/MDSource.h | 2 +- .../actors/order_manager/OrderManager.cpp | 2 +- .../actors/order_manager/OrderServices.h | 2 +- src/lib/tracing/PerfLog.h | 18 +++++++++--------- src/lib/utils/TimeStamp.h | 8 ++++---- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/lib/orderman/actors/ExecutionGateway.cpp b/src/lib/orderman/actors/ExecutionGateway.cpp index 9b3b83687..b3c1ca888 100644 --- a/src/lib/orderman/actors/ExecutionGateway.cpp +++ b/src/lib/orderman/actors/ExecutionGateway.cpp @@ -298,7 +298,7 @@ void ExecutionGateway::dispatch_incoming_fix_messages() { void ExecutionGateway::send_fix(jetfix::OutFIXPtr const &fix, trace::CorID trace) { - trace::ScopedPerfLogEntry scoped_log (me->perf_log,trace,"ExecutionGateway::send_fix"); + auto scoped_log = trace::log_scope(me->perf_log,trace,"ExecutionGateway::send_fix"); me->gw.send(fix,trace); me->gw.dispatch_events(); } diff --git a/src/lib/orderman/actors/MDSource.h b/src/lib/orderman/actors/MDSource.h index ae77779d0..54c0245f2 100644 --- a/src/lib/orderman/actors/MDSource.h +++ b/src/lib/orderman/actors/MDSource.h @@ -97,7 +97,7 @@ class MDSource : public mercury::Actor, public mercury::IPollableActor { private: void on_poll(trace::PerfLog& log) override { - auto scoped_do_work = trace::log_scope(log, {}, "MDSource::on_poll", utils::Timespan::Interval::from_microseconds(2)); + auto scoped_do_work = trace::log_scope(log, {}, "MDSource::on_poll", utils::TimeStamp::Interval::from_microseconds(2)); // Book Updates Book book; diff --git a/src/lib/orderman/actors/order_manager/OrderManager.cpp b/src/lib/orderman/actors/order_manager/OrderManager.cpp index 604bb421b..94bab97d7 100644 --- a/src/lib/orderman/actors/order_manager/OrderManager.cpp +++ b/src/lib/orderman/actors/order_manager/OrderManager.cpp @@ -458,7 +458,7 @@ void OrderManager::reload_fix_buffer(SessionServicesData &osd) { } void OrderManager::on_poll(trace::PerfLog& log) { - auto scoped_do_work = trace::log_scope(log, {}, "OrderManager::dispatch_incoming_fix_messages", utils::Timespan::Interval::from_microseconds(2)); + auto scoped_do_work = trace::log_scope(log, {}, "OrderManager::dispatch_incoming_fix_messages", utils::TimeStamp::Interval::from_microseconds(2)); for (auto &osd : me->services_data.sessions) osd->gw.dispatch_incoming_fix_messages(); } diff --git a/src/lib/orderman/actors/order_manager/OrderServices.h b/src/lib/orderman/actors/order_manager/OrderServices.h index f910cbda1..9c65b5343 100644 --- a/src/lib/orderman/actors/order_manager/OrderServices.h +++ b/src/lib/orderman/actors/order_manager/OrderServices.h @@ -159,7 +159,7 @@ class OrderServices { uint64_t uint64_1 = 0, const char *txt_1 = "", uint32_t uint32_1 = 0) { - return trace::ScopedPerfLogEntry(_data->log, cid, entry_kind, uint64_1, + return trace::log_scope(_data->log, cid, entry_kind, uint64_1, txt_1, uint32_1); } diff --git a/src/lib/tracing/PerfLog.h b/src/lib/tracing/PerfLog.h index 9b1a7fb5b..372ee28f0 100644 --- a/src/lib/tracing/PerfLog.h +++ b/src/lib/tracing/PerfLog.h @@ -85,10 +85,10 @@ class ScopedPerfLogEntry { ScopedPerfLogEntry() : _log(nullptr) { _begin.entry_kind = nullptr; } ScopedPerfLogEntry(PerfLog &l, CorID cid, const char *entry_kind, - utils::TimeStamp::Interval minimum, + utils::TimeStamp::Interval threshhold, uint64_t uint64_1 = 0, const char *txt_1 = "", uint32_t uint32_1 = 0) - : _log(&l), _begin{utils::TimeStamp::now(), _min(minimum) + : _log(&l), _begin{utils::TimeStamp::now(), cid.channel, entry_kind, txt_1, @@ -96,7 +96,7 @@ class ScopedPerfLogEntry { pthread_self(), utils::TimeStamp(), cid.sn, - uint32_1} { + uint32_1}, _min(threshhold) { if (_min.zero()) { if (_begin.entry_kind) { _log->log(_begin); @@ -111,17 +111,17 @@ class ScopedPerfLogEntry { void finish() { if (_begin.entry_kind) { - bool discard = false; + bool is_trivial = false; auto ts = utils::TimeStamp::now(); if (!_min.zero()) { - if (_begin.ts - ts) >= _min) { + if ((ts - _begin.ts) >= _min) { _log->log(_begin); } else { - discard = true; + is_trivial = true; } } - if (!discard) { + if (!is_trivial) { _begin.cor_event = _begin.ts; _begin.ts = ts; _log->log(_begin); @@ -145,13 +145,13 @@ inline ScopedPerfLogEntry log_scope(PerfLog& log, uint64_t uint64_1 = 0, const char *txt_1 = "", uint32_t uint32_1 = 0) { - return ScopedPerfLogEntry(log, cid, entry_kind, TimeStamp::Interval::from_microseconds(0), uint64_1, + return ScopedPerfLogEntry(log, cid, entry_kind, utils::TimeStamp::Interval::from_microseconds(0), uint64_1, txt_1, uint32_1); } inline ScopedPerfLogEntry log_scope(PerfLog& log, trace::CorID cid, const char *entry_kind, - Timestamp::Interval minimum_relavant, + utils::TimeStamp::Interval minimum_relavant, uint64_t uint64_1 = 0, const char *txt_1 = "", uint32_t uint32_1 = 0) { diff --git a/src/lib/utils/TimeStamp.h b/src/lib/utils/TimeStamp.h index 1e6b8ef71..bc0510a8e 100644 --- a/src/lib/utils/TimeStamp.h +++ b/src/lib/utils/TimeStamp.h @@ -44,10 +44,10 @@ public: } Interval& operator+=(const Interval& other) { _val += other._val; return *this; } Interval& operator-=(const Interval& other) { _val -= other._val; return *this; } - bool operator > (const Interval& t1, const Interval& t2) { return t1._val > t2._val; } - bool operator < (const Interval& t1, const Interval& t2) { return t1._val < t2._val; } - bool operator >= (const Interval& t1, const Interval& t2) { return t1._val >= t2._val; } - bool operator <= (const Interval& t1, const Interval& t2) { return t1._val <= t2._val; } + bool operator > (const Interval& other) const { return _val > other._val; } + bool operator < (const Interval& other) const { return _val < other._val; } + bool operator >= (const Interval& other) const { return _val >= other._val; } + bool operator <= (const Interval& other) const { return _val <= other._val; } static Interval from_microseconds(uint64_t microseconds); private: From 29ddd6621c082d24479d6d8cafd13ac112b745cc Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Mon, 11 Mar 2019 16:11:21 -0400 Subject: [PATCH 3/3] Move NativeOrder::on_activate trace message so it doesn't get triggered by warmup --- src/lib/orderman/orders/NativeOrder.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib/orderman/orders/NativeOrder.cpp b/src/lib/orderman/orders/NativeOrder.cpp index 2024bb4c6..f677bcd4a 100644 --- a/src/lib/orderman/orders/NativeOrder.cpp +++ b/src/lib/orderman/orders/NativeOrder.cpp @@ -280,8 +280,6 @@ bool NativeOrder::_on_activate(log::Level reject_level, log::Level transition_level, Price p, Quantity q, bts::orderman::OrderServices &services, trace::CorID const &trace) { - auto scoped_log = - services.log_scope(trace, "NativeOrder::on_activate", key().value()); me->state.set_price(p.value()); me->state.set_quantity(q.value()); @@ -414,12 +412,14 @@ void NativeOrder::warm_up_activate(OrderServicesData &data, void NativeOrder::on_activate(Price p, Quantity q, bts::orderman::OrderServices &services, trace::CorID const &trace) { + bts_assert(!me->services); me->services = &services; switch (me->state.status()) { - - case ORDER_STATUS_INACTIVE: + case ORDER_STATUS_INACTIVE: { + auto scoped_log = + services.log_scope(trace, "NativeOrder::on_activate", key().value()); // this is a brand new order if (_on_activate(Warn, Info, p, q, services, trace)) { me->services->queue_fix(*me->session_services, @@ -433,7 +433,7 @@ void NativeOrder::on_activate(Price p, Quantity q, key().value()); // early return so we skip the expensive report_state() call return; - } + }} break; // all cases below are for orders recovered from disk