--- a/graphicstest/graphicstestharness/src/tprofiler.cpp	Tue Jul 20 13:27:44 2010 +0300
+++ b/graphicstest/graphicstestharness/src/tprofiler.cpp	Fri Jul 30 11:41:40 2010 +0300
@@ -133,19 +133,12 @@
 */
 EXPORT_C void CTProfiler::MarkResultSetL()
     {   
-    TUint32 res = (TUint32)StopTimer();
-    iResults.InsertInUnsignedKeyOrderAllowRepeatsL(res);
-    if(iStoreResultInTimingOrder)
-        {
-        iResultsTimingOrder.AppendL(res);
-        }
-    iDiff = 0;
-    PROFILER_TEST(iResultsInitalised);
+    MarkResultSetAndSuspendL();
     StartTimer();
     }
 
 /**
-Records set current time. Alike MarkResultSetL() the function doesn't 
+Records set current time. Unlike MarkResultSetL() the function doesn't 
 restart the timer at the end. The following operations will not be 
 included into benchmark mesuarment. To resume the profiling the user must 
 start the timer.
@@ -260,9 +253,9 @@
     TBuf<128> variationTrimmedMean;
     variationTrimmedMean.Format(KTrimmedMean, &variation);
     
-    SqlInsert(&aTestName, &variationTrimmedMean,    &KMicroSeconds,     GetTrimedMean());
-    SqlInsert(&aTestName, &variationMax,            &KPixelsPerSecond,  TimeMax());
-    SqlInsert(&aTestName, &variationMin,            &KPixelsPerSecond,  TimeMin());
+    SqlInsert(&aTestName, &variationTrimmedMean,    &KMicroSeconds,  GetTrimedMean());
+    SqlInsert(&aTestName, &variationMax,            &KMicroSeconds,  TimeMax());
+    SqlInsert(&aTestName, &variationMin,            &KMicroSeconds,  TimeMin());
     
     iResultsInitalised = EFalse;
     }
@@ -293,8 +286,8 @@
     variationMin.Format(KMinTime, &variation);
     
     SqlInsert(&aTestName, &variation,       &KPixelsPerSecond,  pixelRate);
-    SqlInsert(&aTestName, &variationMax,    &KPixelsPerSecond,  TimeMax());
-    SqlInsert(&aTestName, &variationMin,    &KPixelsPerSecond,  TimeMin());
+    SqlInsert(&aTestName, &variationMax,    &KMicroSeconds,     TimeMax());
+    SqlInsert(&aTestName, &variationMin,    &KMicroSeconds,     TimeMin());
     
     iResultsInitalised = EFalse;
     }
@@ -324,8 +317,8 @@
     variationMin.Format(KMinTime, &variation);
     
     SqlInsert(&aTestName, &variation,       &KCharacterRate,  characterRate);
-    SqlInsert(&aTestName, &variationMax,    &KCharacterRate,  TimeMax());
-    SqlInsert(&aTestName, &variationMin,    &KCharacterRate,  TimeMin());
+    SqlInsert(&aTestName, &variationMax,    &KMicroSeconds,   TimeMax());
+    SqlInsert(&aTestName, &variationMin,    &KMicroSeconds,   TimeMin());
     
     iResultsInitalised = EFalse;
     }
@@ -422,8 +415,8 @@
     
     SqlInsert(&aTestName, &variation,       &KPixelsPerSecond,  pixelRate);
     SqlInsert(&aTestName, &variation,       &KFrameRate,        frameRate);
-    SqlInsert(&aTestName, &variationMax,    &KPixelsPerSecond,  TimeMax());
-    SqlInsert(&aTestName, &variationMin,    &KPixelsPerSecond,  TimeMin());
+    SqlInsert(&aTestName, &variationMax,    &KMicroSeconds,     TimeMax());
+    SqlInsert(&aTestName, &variationMin,    &KMicroSeconds,     TimeMin());
 
     iResultsInitalised = EFalse;
     }
@@ -455,8 +448,8 @@
     
     SqlInsert(&aTestName, &variation,       &KPixelsPerSecond,  pixelRate);
     SqlInsert(&aTestName, &variation,       &KFrameRate,        frameRate);
-    SqlInsert(&aTestName, &variationMax,    &KPixelsPerSecond,  TimeMax());
-    SqlInsert(&aTestName, &variationMin,    &KPixelsPerSecond,  TimeMin());
+    SqlInsert(&aTestName, &variationMax,    &KMicroSeconds,     TimeMax());
+    SqlInsert(&aTestName, &variationMin,    &KMicroSeconds,     TimeMin());
     
     iResultsInitalised = EFalse;
     }
@@ -487,8 +480,8 @@
     
     SqlInsert(&aTestName, &variation,       &KPixelsPerSecond,  pixelRate);
     SqlInsert(&aTestName, &variation,       &KFrameRate,        frameRate);
-    SqlInsert(&aTestName, &variationMax,    &KPixelsPerSecond,  TimeMax());
-    SqlInsert(&aTestName, &variationMin,    &KPixelsPerSecond,  TimeMin());
+    SqlInsert(&aTestName, &variationMax,    &KMicroSeconds,     TimeMax());
+    SqlInsert(&aTestName, &variationMin,    &KMicroSeconds,     TimeMin());
     
     iResultsInitalised = EFalse;
     }
@@ -530,9 +523,9 @@
     TBuf<128> variationMin;   
     variationMin.Format(KMinTime, &variation);
  
-    SqlInsert(&aTestName, &variationMean, &KMicroSeconds,     Mean());
-    SqlInsert(&aTestName, &variationMax,  &KPixelsPerSecond,  TimeMax());
-    SqlInsert(&aTestName, &variationMin,  &KPixelsPerSecond,  TimeMin());
+    SqlInsert(&aTestName, &variationMean, &KMicroSeconds,  Mean());
+    SqlInsert(&aTestName, &variationMax,  &KMicroSeconds,  TimeMax());
+    SqlInsert(&aTestName, &variationMin,  &KMicroSeconds,  TimeMin());
     
     iResultsInitalised = EFalse;
     }
@@ -571,11 +564,20 @@
 EXPORT_C void CTProfiler::ResultsAnalysisGlyphRate(const TDesC & aTestName, TInt aRotation, TInt aSrcScreenMode, TInt aDstScreenMode, TInt aIters, TInt aNumGlyphsPerIteration)
     {
     PROFILER_TEST(iResultsInitalised);
-
     TReal time = (iResults.Count() > 0) ? (TReal)iResults[0] / 1000000 : 0;
     TInt32 glyphRate = aNumGlyphsPerIteration*aIters/time;
-    PROFILER_INFO_PRINTF7(_L("TID:   %S  Rot:    %i  SrcMode:    %i  DestMode:   %i  Iters: %i   TrimmedMean:    %i  glyphs/second"), &aTestName, aRotation, aSrcScreenMode, aDstScreenMode, aIters, glyphRate);
-    PROFILER_INFO_PRINTF3(_L("Max:   %i  Min:    %i  "), TimeMax(), TimeMin());
+
+    TBuf<128> variation;
+    variation.Format(KVariationCPI, aRotation, aSrcScreenMode, aDstScreenMode, aIters, aNumGlyphsPerIteration);
+    TBuf<128> variationMax;
+    variationMax.Format(KMaxTime, &variation);
+    TBuf<128> variationMin;
+    variationMin.Format(KMinTime, &variation);
+
+    SqlInsert(&aTestName, &variation,       &KGlyphRate,  glyphRate);
+    SqlInsert(&aTestName, &variationMax,    &KMicroSeconds,  TimeMax());
+    SqlInsert(&aTestName, &variationMin,    &KMicroSeconds,  TimeMin());
+
     iResultsInitalised = EFalse;
-  }
+    }