diff -r 26645d81f48d -r cc28652e0254 traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/src/te_perfsanity.cpp --- a/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/src/te_perfsanity.cpp Tue Aug 31 16:57:14 2010 +0300 +++ b/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/src/te_perfsanity.cpp Wed Sep 01 12:39:58 2010 +0100 @@ -102,7 +102,7 @@ if(BlockResult()==EPass) { - SetBlockResult(TestTimerL()); + SetBlockResult(TestTimer()); } //run this no matter if its failed or not..., just to get some statistics out. @@ -110,14 +110,14 @@ //temporarily tagged out this test as it is causing a test timeout //can be reinstated as soon as the device driver has been fully implemented - //SanityTestTimedUtraceL(); + //SanityTestTimedUtrace(); return ETrue; } -TVerdict CPerformanceSanityWrapper::TestTimerL() +TVerdict CPerformanceSanityWrapper::TestTimer() { INFO_PRINTF1(_L("Testing User side timer functions")); TBool passed = EFalse; @@ -128,7 +128,7 @@ //test CUptTimer class TTestTimer timer; TUint32 userTime = 0; - passed = timer.TestUserTimerL(userTime); + passed = timer.TestUserTimer(userTime); INFO_PRINTF1(_L("Testing User side timer functions #2")); if(!passed) @@ -186,16 +186,16 @@ return BlockResult(); } -TBool CPerformanceSanityWrapper::SanityTestTimedUtraceL() +TBool CPerformanceSanityWrapper::SanityTestTimedUtrace() { TTestTimer timer; TUint32 userSanityTime = 0; TUint32 userSanityLongTime = 0; TUint32 userUtraceTime = 0; - timer.TestUserTimerL(userSanityTime); - timer.TestUserLongTimerL(userSanityLongTime); - timer.TestUTraceUserTimerL(userUtraceTime); + timer.TestUserTimer(userSanityTime); + timer.TestUserLongTimer(userSanityLongTime); + timer.TestUTraceUserTimer(userUtraceTime); TUint32 kernelSanityTime = 0; // TUint32 kernelSanityLongTime = 0; @@ -226,8 +226,8 @@ //I want to find out what the variation is, is it static 0.5us, or is it 10% variable, or what? for(TInt i = 0; i < iters; i++) { - timer.TestUserTimerL(user[i]); - timer.TestUserLongTimerL(ulong[i]); + timer.TestUserTimer(user[i]); + timer.TestUserLongTimer(ulong[i]); utracedriver.SanityTestTimer(kernel[i]); //utracedriver.SanityTestLongTimer(klong[i]); }