From 36ef487a90d0d14c4da8ce7e19b5916b8b15056c Mon Sep 17 00:00:00 2001 From: Giacomo Pozzoni Date: Mon, 27 Jul 2020 12:00:28 +0000 Subject: Core/Metric: Add new cmake option WITH_DETAILED_METRICS to enable more metrics (#25136) * Core/Metric: Add new cmake option WITH_DETAILED_METRICS to enable more metrics Add more detailed metrics in World::UpdateSessions(). * Attempt using C++17 features * Fix cmake typo Co-authored-by: NoName <322016+Faq@users.noreply.github.com> * Fix build with WITHOUT_METRICS * Update Performance profiling dashboard with Update sessions panel * Add panel to show sessions with update time above 100 ms * Move legends on the right and add max update time diff in the legend of sessions Co-authored-by: NoName <322016+Faq@users.noreply.github.com> --- src/common/Metric/Metric.h | 17 ++++++++++++++--- src/server/game/World/World.cpp | 3 +++ 2 files changed, 17 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/common/Metric/Metric.h b/src/common/Metric/Metric.h index 33bdf3b4ed7..11c156653d0 100644 --- a/src/common/Metric/Metric.h +++ b/src/common/Metric/Metric.h @@ -166,6 +166,7 @@ MetricStopWatch MakeMetricStopWatch(LoggerType&& loggerFunc) #define TC_METRIC_EVENT(category, title, description) ((void)0) #define TC_METRIC_VALUE(category, value) ((void)0) #define TC_METRIC_TIMER(category, ...) ((void)0) +#define TC_METRIC_DETAILED_TIMER(category, ...) ((void)0) #else # if TRINITY_PLATFORM != TRINITY_PLATFORM_WINDOWS #define TC_METRIC_EVENT(category, title, description) \ @@ -196,11 +197,21 @@ MetricStopWatch MakeMetricStopWatch(LoggerType&& loggerFunc) } while (0) \ __pragma(warning(pop)) # endif -#define TC_METRIC_TIMER(category, ...) \ +#define TC_METRIC_TIMER(category, ...) \ MetricStopWatch TC_METRIC_UNIQUE_NAME(__tc_metric_stop_watch) = MakeMetricStopWatch([&](TimePoint start) \ - { \ - sMetric->LogValue(category, std::chrono::steady_clock::now() - start, { __VA_ARGS__ }); \ + { \ + sMetric->LogValue(category, std::chrono::steady_clock::now() - start, { __VA_ARGS__ }); \ }); +# if defined WITH_DETAILED_METRICS +#define TC_METRIC_DETAILED_TIMER(category, ...) \ + MetricStopWatch TC_METRIC_UNIQUE_NAME(__tc_metric_stop_watch) = MakeMetricStopWatch([&](TimePoint start) \ + { \ + sMetric->LogValue(category, std::chrono::steady_clock::now() - start, { __VA_ARGS__ }); \ + }); +# else +#define TC_METRIC_DETAILED_TIMER(category, ...) ((void)0) +# endif + #endif #endif // METRIC_H__ diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index fe1abc71094..0e050c110b0 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -3074,6 +3074,9 @@ void World::UpdateSessions(uint32 diff) WorldSession* pSession = itr->second; WorldSessionFilter updater(pSession); + [[maybe_unused]] uint32 currentSessionId = itr->first; + TC_METRIC_DETAILED_TIMER("world_update_sessions_time", TC_METRIC_TAG("account_id", std::to_string(currentSessionId))); + if (!pSession->Update(diff, updater)) // As interval = 0 { if (!RemoveQueuedPlayer(itr->second) && itr->second && getIntConfig(CONFIG_INTERVAL_DISCONNECT_TOLERANCE)) -- cgit v1.2.3