SH-4162 Merge metrics repo into this branch and integrate

Pull cpu-based metrics into llcorehttp work to enable A/B
testing.  Simple merge.

1 files changed, 6 insertions, 4 deletions

diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index 419613091a..2d4692be5b 100755
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -98,7 +98,7 @@ U32 LLMeshRepository::sLODPending = 0;
 U32 LLMeshRepository::sCacheBytesRead = 0;
 U32 LLMeshRepository::sCacheBytesWritten = 0;
 U32 LLMeshRepository::sPeakKbps = 0;
-LLDeadmanTimer LLMeshRepository::sQuiescentTimer(15.0);
+LLDeadmanTimer LLMeshRepository::sQuiescentTimer(15.0, true);	// true -> gather cpu metrics
 
 	
 const U32 MAX_TEXTURE_UPLOAD_RETRIES = 5;
@@ -4420,9 +4420,9 @@ void LLMeshRepository::metricsProgress(unsigned int this_count)
 void LLMeshRepository::metricsUpdate()
 {
 	F64 started, stopped;
-	U64 total_count;
-
-	if (sQuiescentTimer.isExpired(0, started, stopped, total_count))
+	U64 total_count(U64L(0)), user_cpu(U64L(0)), sys_cpu(U64L(0));
+	
+	if (sQuiescentTimer.isExpired(0, started, stopped, total_count, user_cpu, sys_cpu))
 	{
 		LLSD metrics;
 
@@ -4432,6 +4432,8 @@ void LLMeshRepository::metricsUpdate()
 		metrics["stop"] = stopped;
 		metrics["downloads"] = LLSD::Integer(total_count);
 		metrics["teleports"] = LLSD::Integer(metrics_teleport_start_count);
+		metrics["user_cpu"] = double(user_cpu) / 1.0e6;
+		metrics["sys_cpu"] = double(sys_cpu) / 1.0e6;
 		llinfos << "EventMarker " << metrics << llendl;
 	}
 }