From 7ea19b675fd1ede69f1f225e89a4a6170d7464c0 Mon Sep 17 00:00:00 2001 From: jackpoz Date: Tue, 4 Aug 2020 14:10:33 +0200 Subject: Core/Metric: Require WITH_DETAILED_METRICS CMake flag for MMaps metric (cherry picked from commit 8ad6bd8a9ba45ef22ed0275fd402da17666d8522) --- src/common/Metric/Metric.h | 3 +++ src/server/game/Movement/PathGenerator.cpp | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/common/Metric/Metric.h b/src/common/Metric/Metric.h index ed455b6b8e4..73416ff14c4 100644 --- a/src/common/Metric/Metric.h +++ b/src/common/Metric/Metric.h @@ -169,6 +169,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_EVENT(category, title, description) ((void)0) #define TC_METRIC_DETAILED_TIMER(category, ...) ((void)0) #define TC_METRIC_DETAILED_NO_THRESHOLD_TIMER(category, ...) ((void)0) #else @@ -215,7 +216,9 @@ MetricStopWatch MakeMetricStopWatch(LoggerType&& loggerFunc) sMetric->LogValue(category, duration, { __VA_ARGS__ }); \ }); #define TC_METRIC_DETAILED_NO_THRESHOLD_TIMER(category, ...) TC_METRIC_TIMER(category, __VA_ARGS__) +#define TC_METRIC_DETAILED_EVENT(category, title, description) TC_METRIC_EVENT(category, title, description) # else +#define TC_METRIC_DETAILED_EVENT(category, title, description) ((void)0) #define TC_METRIC_DETAILED_TIMER(category, ...) ((void)0) #define TC_METRIC_DETAILED_NO_THRESHOLD_TIMER(category, ...) ((void)0) # endif diff --git a/src/server/game/Movement/PathGenerator.cpp b/src/server/game/Movement/PathGenerator.cpp index 3d2e6de024e..c22d1280e24 100644 --- a/src/server/game/Movement/PathGenerator.cpp +++ b/src/server/game/Movement/PathGenerator.cpp @@ -62,7 +62,7 @@ bool PathGenerator::CalculatePath(float destX, float destY, float destZ, bool fo if (!Trinity::IsValidMapCoord(destX, destY, destZ) || !Trinity::IsValidMapCoord(x, y, z)) return false; - TC_METRIC_EVENT("mmap_events", "CalculatePath", ""); + TC_METRIC_DETAILED_EVENT("mmap_events", "CalculatePath", ""); G3D::Vector3 dest(destX, destY, destZ); SetEndPosition(dest); -- cgit v1.2.3