PATH-638: Adding elements to render the new sim stats.
parent
8bc499f13c
commit
cab86a913d
|
|
@ -28,41 +28,48 @@
|
|||
|
||||
enum
|
||||
{
|
||||
LL_SIM_STAT_TIME_DILATION, // 0
|
||||
LL_SIM_STAT_FPS,
|
||||
LL_SIM_STAT_PHYSFPS,
|
||||
LL_SIM_STAT_AGENTUPS,
|
||||
LL_SIM_STAT_FRAMEMS,
|
||||
LL_SIM_STAT_NETMS, // 5
|
||||
LL_SIM_STAT_SIMOTHERMS,
|
||||
LL_SIM_STAT_SIMPHYSICSMS,
|
||||
LL_SIM_STAT_AGENTMS,
|
||||
LL_SIM_STAT_IMAGESMS,
|
||||
LL_SIM_STAT_SCRIPTMS, // 10
|
||||
LL_SIM_STAT_NUMTASKS,
|
||||
LL_SIM_STAT_NUMTASKSACTIVE,
|
||||
LL_SIM_STAT_NUMAGENTMAIN,
|
||||
LL_SIM_STAT_NUMAGENTCHILD,
|
||||
LL_SIM_STAT_NUMSCRIPTSACTIVE, // 15
|
||||
LL_SIM_STAT_LSLIPS,
|
||||
LL_SIM_STAT_INPPS,
|
||||
LL_SIM_STAT_OUTPPS,
|
||||
LL_SIM_STAT_PENDING_DOWNLOADS,
|
||||
LL_SIM_STAT_PENDING_UPLOADS, // 20
|
||||
LL_SIM_STAT_VIRTUAL_SIZE_KB,
|
||||
LL_SIM_STAT_RESIDENT_SIZE_KB,
|
||||
LL_SIM_STAT_PENDING_LOCAL_UPLOADS,
|
||||
LL_SIM_STAT_TOTAL_UNACKED_BYTES,
|
||||
LL_SIM_STAT_PHYSICS_PINNED_TASKS, // 25
|
||||
LL_SIM_STAT_PHYSICS_LOD_TASKS,
|
||||
LL_SIM_STAT_SIMPHYSICSSTEPMS,
|
||||
LL_SIM_STAT_SIMPHYSICSSHAPEMS,
|
||||
LL_SIM_STAT_SIMPHYSICSOTHERMS,
|
||||
LL_SIM_STAT_SIMPHYSICSMEMORY, // 30
|
||||
LL_SIM_STAT_SCRIPT_EPS,
|
||||
LL_SIM_STAT_SIMSPARETIME,
|
||||
LL_SIM_STAT_SIMSLEEPTIME,
|
||||
LL_SIM_STAT_IOPUMPTIME,
|
||||
LL_SIM_STAT_TIME_DILATION = 0,
|
||||
LL_SIM_STAT_FPS = 1,
|
||||
LL_SIM_STAT_PHYSFPS = 2,
|
||||
LL_SIM_STAT_AGENTUPS = 3,
|
||||
LL_SIM_STAT_FRAMEMS = 4,
|
||||
LL_SIM_STAT_NETMS = 5,
|
||||
LL_SIM_STAT_SIMOTHERMS = 6,
|
||||
LL_SIM_STAT_SIMPHYSICSMS = 7,
|
||||
LL_SIM_STAT_AGENTMS = 8,
|
||||
LL_SIM_STAT_IMAGESMS = 9,
|
||||
LL_SIM_STAT_SCRIPTMS = 10,
|
||||
LL_SIM_STAT_NUMTASKS = 11,
|
||||
LL_SIM_STAT_NUMTASKSACTIVE = 12,
|
||||
LL_SIM_STAT_NUMAGENTMAIN = 13,
|
||||
LL_SIM_STAT_NUMAGENTCHILD = 14,
|
||||
LL_SIM_STAT_NUMSCRIPTSACTIVE = 15,
|
||||
LL_SIM_STAT_LSLIPS = 16,
|
||||
LL_SIM_STAT_INPPS = 17,
|
||||
LL_SIM_STAT_OUTPPS = 18,
|
||||
LL_SIM_STAT_PENDING_DOWNLOADS = 19,
|
||||
LL_SIM_STAT_PENDING_UPLOADS = 20,
|
||||
LL_SIM_STAT_VIRTUAL_SIZE_KB = 21,
|
||||
LL_SIM_STAT_RESIDENT_SIZE_KB = 22,
|
||||
LL_SIM_STAT_PENDING_LOCAL_UPLOADS = 23,
|
||||
LL_SIM_STAT_TOTAL_UNACKED_BYTES = 24,
|
||||
LL_SIM_STAT_PHYSICS_PINNED_TASKS = 25,
|
||||
LL_SIM_STAT_PHYSICS_LOD_TASKS = 26,
|
||||
LL_SIM_STAT_SIMPHYSICSSTEPMS = 27,
|
||||
LL_SIM_STAT_SIMPHYSICSSHAPEMS = 28,
|
||||
LL_SIM_STAT_SIMPHYSICSOTHERMS = 29,
|
||||
LL_SIM_STAT_SIMPHYSICSMEMORY = 30,
|
||||
LL_SIM_STAT_SCRIPT_EPS = 31,
|
||||
LL_SIM_STAT_SIMSPARETIME = 32,
|
||||
LL_SIM_STAT_SIMSLEEPTIME = 33,
|
||||
LL_SIM_STAT_IOPUMPTIME = 34,
|
||||
LL_SIM_STAT_PCTSCRIPTSRUN = 35,
|
||||
LL_SIM_STAT_REGION_IDLE = 36, // dataserver only
|
||||
LL_SIM_STAT_REGION_IDLE_POSSIBLE = 37, // dataserver only
|
||||
LL_SIM_STAT_SIMAISTEPTIMEMS = 38,
|
||||
LL_SIM_STAT_SKIPPEDAISILSTEPS_PS = 39,
|
||||
LL_SIM_STAT_PCTSTEPPEDCHARACTERS = 40
|
||||
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -4626,6 +4626,18 @@ void process_sim_stats(LLMessageSystem *msg, void **user_data)
|
|||
case LL_SIM_STAT_IOPUMPTIME:
|
||||
LLViewerStats::getInstance()->mSimPumpIOMsec.addValue(stat_value);
|
||||
break;
|
||||
case LL_SIM_STAT_PCTSCRIPTSRUN:
|
||||
LLViewerStats::getInstance()->mSimPctScriptsRun.addValue(stat_value);
|
||||
break;
|
||||
case LL_SIM_STAT_SIMAISTEPTIMEMS:
|
||||
LLViewerStats::getInstance()->mSimSimAIStepMsec.addValue(stat_value);
|
||||
break;
|
||||
case LL_SIM_STAT_SKIPPEDAISILSTEPS_PS:
|
||||
LLViewerStats::getInstance()->mSimSimSkippedSilhouetteSteps.addValue(stat_value);
|
||||
break;
|
||||
case LL_SIM_STAT_PCTSTEPPEDCHARACTERS:
|
||||
LLViewerStats::getInstance()->mSimSimPctSteppedCharacters.addValue(stat_value);
|
||||
break;
|
||||
default:
|
||||
// Used to be a commented out warning.
|
||||
LL_DEBUGS("Messaging") << "Unknown stat id" << stat_id << LL_ENDL;
|
||||
|
|
|
|||
|
|
@ -233,6 +233,9 @@ LLViewerStats::LLViewerStats() :
|
|||
mSimSimPhysicsStepMsec("simsimphysicsstepmsec"),
|
||||
mSimSimPhysicsShapeUpdateMsec("simsimphysicsshapeupdatemsec"),
|
||||
mSimSimPhysicsOtherMsec("simsimphysicsothermsec"),
|
||||
mSimSimAIStepMsec("simsimaistepmsec"),
|
||||
mSimSimSkippedSilhouetteSteps("simsimskippedsilhouettesteps"),
|
||||
mSimSimPctSteppedCharacters("simsimpctsteppedcharacters"),
|
||||
mSimAgentMsec("simagentmsec"),
|
||||
mSimImagesMsec("simimagesmsec"),
|
||||
mSimScriptMsec("simscriptmsec"),
|
||||
|
|
@ -244,6 +247,7 @@ LLViewerStats::LLViewerStats() :
|
|||
mSimObjects("simobjects"),
|
||||
mSimActiveObjects("simactiveobjects"),
|
||||
mSimActiveScripts("simactivescripts"),
|
||||
mSimPctScriptsRun("simpctscriptsrun"),
|
||||
mSimInPPS("siminpps"),
|
||||
mSimOutPPS("simoutpps"),
|
||||
mSimPendingDownloads("simpendingdownloads"),
|
||||
|
|
|
|||
|
|
@ -71,6 +71,10 @@ public:
|
|||
LLStat mSimSimPhysicsShapeUpdateMsec;
|
||||
LLStat mSimSimPhysicsOtherMsec;
|
||||
|
||||
LLStat mSimSimAIStepMsec;
|
||||
LLStat mSimSimSkippedSilhouetteSteps;
|
||||
LLStat mSimSimPctSteppedCharacters;
|
||||
|
||||
LLStat mSimAgentMsec;
|
||||
LLStat mSimImagesMsec;
|
||||
LLStat mSimScriptMsec;
|
||||
|
|
@ -83,6 +87,7 @@ public:
|
|||
LLStat mSimObjects;
|
||||
LLStat mSimActiveObjects;
|
||||
LLStat mSimActiveScripts;
|
||||
LLStat mSimPctScriptsRun;
|
||||
|
||||
LLStat mSimInPPS;
|
||||
LLStat mSimOutPPS;
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue