Cleaning up fast timer fixes

2 files changed, 3 insertions, 13 deletions

diff --git a/indra/llcommon/llfasttimer.h b/indra/llcommon/llfasttimer.h
index c177027f4e..2b25f2fabb 100755
--- a/indra/llcommon/llfasttimer.h
+++ b/indra/llcommon/llfasttimer.h
@@ -27,7 +27,6 @@
 #ifndef LL_FASTTIMER_H
 #define LL_FASTTIMER_H
 
-// Temporarily(?) de-inlined these functions to simplify diagnosis of problems.
 // Implementation of getCPUClockCount32() and getCPUClockCount64 are now in llfastertimer_class.cpp.
 
 // pull in the actual class definition
diff --git a/indra/llcommon/llfasttimer_class.cpp b/indra/llcommon/llfasttimer_class.cpp
index 055660e85b..558a4dc005 100755
--- a/indra/llcommon/llfasttimer_class.cpp
+++ b/indra/llcommon/llfasttimer_class.cpp
@@ -244,6 +244,9 @@ U64 LLFastTimer::countsPerSecond() // counts per second for the *32-bit* timer
 
 	// we drop the low-order byte in our timers, so report a lower frequency
 #else
+	// If we're not using RDTSC, each fasttimer tick is just a performance counter tick.
+	// Not redefining the clock frequency itself (in llprocessor.cpp/calculate_cpu_frequency())
+	// since that would change displayed MHz stats for CPUs
 	static bool firstcall = true;
 	static U64 sCPUClockFrequency;
 	if (firstcall)
@@ -497,18 +500,6 @@ void LLFastTimer::NamedTimer::resetFrame()
 	if (sLog)
 	{ //output current frame counts to performance log
 
-		static S32 call_count = 0;
-		if (call_count % 100 == 0)
-		{
-			llinfos << "countsPerSecond (32 bit): " << countsPerSecond() << llendl;
-			llinfos << "get_clock_count (64 bit): " << get_clock_count() << llendl;
-			llinfos << "LLProcessorInfo().getCPUFrequency() " << LLProcessorInfo().getCPUFrequency() << llendl;
-			llinfos << "getCPUClockCount32() " << getCPUClockCount32() << llendl;
-			llinfos << "getCPUClockCount64() " << getCPUClockCount64() << llendl;
-			llinfos << "elapsed sec " << ((F64)getCPUClockCount64())/((F64)LLProcessorInfo().getCPUFrequency()*1000000.0) << llendl;
-		}
-		call_count++;
-		
 		F64 iclock_freq = 1000.0 / countsPerSecond(); // good place to calculate clock frequency
 
 		F64 total_time = 0;