From d2179b1acffe3a143f85511ba3c555981cff104e Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Wed, 28 Dec 2016 12:10:08 -0800 Subject: [PATCH] Reduce tracing impact if tracing isn't active --- libraries/shared/src/Profile.cpp | 3 ++- libraries/shared/src/Profile.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libraries/shared/src/Profile.cpp b/libraries/shared/src/Profile.cpp index 4c5882348e..02a6f94337 100644 --- a/libraries/shared/src/Profile.cpp +++ b/libraries/shared/src/Profile.cpp @@ -25,8 +25,9 @@ Q_LOGGING_CATEGORY(trace_simulation_physics, "trace.simulation.physics") #define NSIGHT_TRACING #endif -Duration::Duration(const QLoggingCategory& category, const QString& name, uint32_t argbColor, uint64_t payload, QVariantMap args) : _name(name), _category(category) { +Duration::Duration(const QLoggingCategory& category, const QString& name, uint32_t argbColor, uint64_t payload, const QVariantMap& baseArgs) : _name(name), _category(category) { if (_category.isDebugEnabled()) { + QVariantMap args = baseArgs; args["nv_payload"] = QVariant::fromValue(payload); tracing::traceEvent(_category, _name, tracing::DurationBegin, "", args); diff --git a/libraries/shared/src/Profile.h b/libraries/shared/src/Profile.h index 6d02a0939f..7472768ce1 100644 --- a/libraries/shared/src/Profile.h +++ b/libraries/shared/src/Profile.h @@ -26,7 +26,7 @@ Q_DECLARE_LOGGING_CATEGORY(trace_simulation_physics) class Duration { public: - Duration(const QLoggingCategory& category, const QString& name, uint32_t argbColor = 0xff0000ff, uint64_t payload = 0, QVariantMap args = QVariantMap()); + Duration(const QLoggingCategory& category, const QString& name, uint32_t argbColor = 0xff0000ff, uint64_t payload = 0, const QVariantMap& args = QVariantMap()); ~Duration(); static uint64_t beginRange(const QLoggingCategory& category, const char* name, uint32_t argbColor);