From e43efa74de0708dffbbaf49e0548e87013029a82 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Tue, 20 Dec 2016 16:16:31 -0800 Subject: [PATCH] use sampled counter --- interface/src/avatar/AvatarManager.cpp | 7 +++++-- libraries/shared/src/Profile.cpp | 1 - libraries/shared/src/Profile.h | 1 - 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/interface/src/avatar/AvatarManager.cpp b/interface/src/avatar/AvatarManager.cpp index ee92bc9210..53f17e9635 100644 --- a/interface/src/avatar/AvatarManager.cpp +++ b/interface/src/avatar/AvatarManager.cpp @@ -124,6 +124,9 @@ void AvatarManager::updateMyAvatar(float deltaTime) { } } + +Q_LOGGING_CATEGORY(trace_simulation_avatar, "trace.simulation.avatar"); + void AvatarManager::updateOtherAvatars(float deltaTime) { // lock the hash for read to check the size QReadLocker lock(&_hashLock); @@ -167,9 +170,9 @@ void AvatarManager::updateOtherAvatars(float deltaTime) { // simulate avatar fades simulateAvatarFades(deltaTime); - PROFILE_COUNTER(simulation_avatar, "NumAvatarsPerSec", + SAMPLE_PROFILE_COUNTER(0.1f, simulation_avatar, "NumAvatarsPerSec", { { "NumAvatarsPerSec", (float)(size() * USECS_PER_SECOND) / (float)(usecTimestampNow() - start) } }); - PROFILE_COUNTER(simulation_avatar, "NumJointsPerSec", { { "NumJointsPerSec", Avatar::getNumJointsProcessedPerSecond() } }); + SAMPLE_PROFILE_COUNTER(0.1f, simulation_avatar, "NumJointsPerSec", { { "NumJointsPerSec", Avatar::getNumJointsProcessedPerSecond() } }); } void AvatarManager::postUpdate(float deltaTime) { diff --git a/libraries/shared/src/Profile.cpp b/libraries/shared/src/Profile.cpp index 33c5c15862..4c5882348e 100644 --- a/libraries/shared/src/Profile.cpp +++ b/libraries/shared/src/Profile.cpp @@ -18,7 +18,6 @@ Q_LOGGING_CATEGORY(trace_resource_network, "trace.resource.network") Q_LOGGING_CATEGORY(trace_resource_parse, "trace.resource.parse") Q_LOGGING_CATEGORY(trace_simulation, "trace.simulation") Q_LOGGING_CATEGORY(trace_simulation_animation, "trace.simulation.animation") -Q_LOGGING_CATEGORY(trace_simulation_avatar, "trace.simulation.avatar") Q_LOGGING_CATEGORY(trace_simulation_physics, "trace.simulation.physics") #if defined(NSIGHT_FOUND) diff --git a/libraries/shared/src/Profile.h b/libraries/shared/src/Profile.h index 57a98deb73..6d02a0939f 100644 --- a/libraries/shared/src/Profile.h +++ b/libraries/shared/src/Profile.h @@ -22,7 +22,6 @@ Q_DECLARE_LOGGING_CATEGORY(trace_resource_parse) Q_DECLARE_LOGGING_CATEGORY(trace_resource_network) Q_DECLARE_LOGGING_CATEGORY(trace_simulation) Q_DECLARE_LOGGING_CATEGORY(trace_simulation_animation) -Q_DECLARE_LOGGING_CATEGORY(trace_simulation_avatar) Q_DECLARE_LOGGING_CATEGORY(trace_simulation_physics) class Duration {