Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-25 17:14:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix stat tracker missing in agents

Browse source
This commit is contained in:
Brad Davis 2016-12-16 13:59:04 -08:00
parent 30a9961362
commit 2d73588361
4 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assignment-client/src/AssignmentClient.cpp
View file

@ -38,6 +38,7 @@
#include "AssignmentClientLogging.h"
#include "avatars/ScriptableAvatar.h"
#include <Trace.h>
#include <StatTracker.h>
const QString ASSIGNMENT_CLIENT_TARGET_NAME = "assignment-client";
const long long ASSIGNMENT_REQUEST_INTERVAL_MSECS = 1 * 1000;
@ -50,6 +51,7 @@ AssignmentClient::AssignmentClient(Assignment::Type requestAssignmentType, QStri
LogUtils::init();
DependencyManager::set<tracing::Tracer>();
DependencyManager::set<StatTracker>();
DependencyManager::set<AccountManager>();
auto scriptableAvatar = DependencyManager::set<ScriptableAvatar>();

2
domain-server/src/DomainServer.cpp
View file

@ -44,6 +44,7 @@
#include "DomainServerNodeData.h"
#include "NodeConnectionData.h"
#include <Trace.h>
#include <StatTracker.h>
int const DomainServer::EXIT_CODE_REBOOT = 234923;
@ -75,6 +76,7 @@ DomainServer::DomainServer(int argc, char* argv[]) :
parseCommandLine();
DependencyManager::set<tracing::Tracer>();
DependencyManager::set<StatTracker>();
LogUtils::init();
Setting::init();

6
interface/src/Application.cpp
View file

@ -3217,7 +3217,6 @@ bool Application::shouldPaint(float nsecsElapsed) {
}
void Application::idle(float nsecsElapsed) {
PROFILE_RANGE(interfaceapp, __FUNCTION__);
PerformanceTimer perfTimer("idle");
// Update the deadlock watchdog
@ -4538,11 +4537,6 @@ QRect Application::getDesirableApplicationGeometry() const {
// or the "myCamera".
//
void Application::loadViewFrustum(Camera& camera, ViewFrustum& viewFrustum) {
<<<<<<< HEAD
PROFILE_RANGE(interfaceapp, __FUNCTION__);
PerformanceTimer perfTimer("loadViewFrustum");
=======
>>>>>>> tracing polish
// We will use these below, from either the camera or head vectors calculated above
viewFrustum.setProjection(camera.getProjection());

4
libraries/shared/src/Profile.cpp
View file

@ -20,10 +20,6 @@ Q_LOGGING_CATEGORY(trace_simulation, "trace.simulation")
Q_LOGGING_CATEGORY(trace_simulation_animation, "trace.simulation.animation")
Q_LOGGING_CATEGORY(trace_simulation_physics, "trace.simulation.physics")
void foo() {
randFloat();
}
#if defined(NSIGHT_FOUND)
#include "nvToolsExt.h"
#define NSIGHT_TRACING