# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1278422310 -10800 # Node ID 0d6db0a1400181d85657c043c6ab50cf614f15a6 # Parent 63532cdadd44f868011715cee1a7f42109c67b43 Revision: 201027 Kit: 2010127 diff -r 63532cdadd44 -r 0d6db0a14001 build.config.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/build.config.xml Tue Jul 06 16:18:30 2010 +0300 @@ -0,0 +1,190 @@ + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 63532cdadd44 -r 0d6db0a14001 featuremgmt/featuremgr/group/featmgrserver.mmp --- a/featuremgmt/featuremgr/group/featmgrserver.mmp Fri Jun 11 15:29:22 2010 +0300 +++ b/featuremgmt/featuremgr/group/featmgrserver.mmp Tue Jul 06 16:18:30 2010 +0300 @@ -15,15 +15,16 @@ #ifdef __FEATMGR_TESTCFG__ TARGET test_featmgrserver.exe -CAPABILITY AllFiles +CAPABILITY AllFiles ProtServ ReadDeviceData #else TARGET featmgrserver.exe +CAPABILITY ProtServ ReadDeviceData #endif // __FEATMGR_TESTCFG__ // Since this is an exe with no alternate implementations, // just use same UID for both UID2 and UID3 UID 0x10205054 0x10205054 -CAPABILITY ProtServ ReadDeviceData + TARGETTYPE exe VENDORID 0x70000001 diff -r 63532cdadd44 -r 0d6db0a14001 featuremgmt/featuremgr/test/group/bld.inf --- a/featuremgmt/featuremgr/test/group/bld.inf Fri Jun 11 15:29:22 2010 +0300 +++ b/featuremgmt/featuremgr/test/group/bld.inf Tue Jul 06 16:18:30 2010 +0300 @@ -83,6 +83,7 @@ //iby files for the test components featmgr_techview_test.iby /epoc32/rom/include/featmgr_techview_test.iby +featmgr_techview_rtest.iby /epoc32/rom/include/featmgr_techview_rtest.iby featmgr_textshell_test.iby /epoc32/rom/include/featmgr_textshell_test.iby ../tef/tef_efm_configured/group/efm_configured_testserver.iby /epoc32/rom/include/efm_configured_testserver.iby ../tef/tef_efm_normal/group/efm_normal_testserver.iby /epoc32/rom/include/efm_normal_testserver.iby diff -r 63532cdadd44 -r 0d6db0a14001 featuremgmt/featuremgr/test/group/featmgr_techview_rtest.iby --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/featuremgmt/featuremgr/test/group/featmgr_techview_rtest.iby Tue Jul 06 16:18:30 2010 +0300 @@ -0,0 +1,22 @@ +// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +// All rights reserved. +// This component and the accompanying materials are made available +// under the terms of "Eclipse Public License v1.0" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// + +#ifndef __FEATMGR_TECHVIEW_RTEST_IBY__ +#define __FEATMGR_TECHVIEW_RTEST_IBY__ + +file=ABI_DIR\BUILD_DIR\t_fmgrbackupresponse.exe test\t_fmgrbackupresponse.exe +file=ABI_DIR\BUILD_DIR\t_fmgrrestoreresponse.exe test\t_fmgrrestoreresponse.exe + +#endif // __FEATMGR_TECHVIEW_RTEST_IBY__ diff -r 63532cdadd44 -r 0d6db0a14001 layers.sysdef.xml --- a/layers.sysdef.xml Fri Jun 11 15:29:22 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,166 +0,0 @@ - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r 63532cdadd44 -r 0d6db0a14001 loggingservices/eventlogger/test/tef/group/logengteftests.iby --- a/loggingservices/eventlogger/test/tef/group/logengteftests.iby Fri Jun 11 15:29:22 2010 +0300 +++ b/loggingservices/eventlogger/test/tef/group/logengteftests.iby Tue Jul 06 16:18:30 2010 +0300 @@ -19,14 +19,6 @@ #include #include -#include -// the backup engine is dependant on all of these: -#include -#include -#include -#include -#include -#include file=ABI_DIR\BUILD_DIR\teflogengbur.exe sys\bin\teflogengbur.exe diff -r 63532cdadd44 -r 0d6db0a14001 loggingservices/filelogger/SSVR/FLOGSVR.CPP --- a/loggingservices/filelogger/SSVR/FLOGSVR.CPP Fri Jun 11 15:29:22 2010 +0300 +++ b/loggingservices/filelogger/SSVR/FLOGSVR.CPP Tue Jul 06 16:18:30 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -26,6 +26,11 @@ */ const TInt KOpenLogFilesGranularity=5; +/* Internal error. Use positive number to ensure no conflict with other error code + Indicate that client message has panic'ed and should not be completed. +*/ +const TInt KErrMessagePanic = 1; + /** panics for log client @@ -268,7 +273,10 @@ { TRAPD(ret,DispatchMessageL(aMessage)); - aMessage.Complete(ret); + if (ret!=KErrMessagePanic) + { + aMessage.Complete(ret); + } } void CFileLogSession::DispatchMessageL(const RMessage2& aMessage) @@ -281,13 +289,24 @@ TLogFile log; TPckg logPckg(log); aMessage.ReadL(0,logPckg); - __ASSERT_ALWAYS(log.Directory().Length()!=0,aMessage.Panic(KFLoggerServerName,ELogDirectoryNameDoesNotExist)); - __ASSERT_ALWAYS(log.Name().Length()!=0,aMessage.Panic(KFLoggerServerName,ELogFileNameDoesNotExist)); + if (log.Directory().Length()<=0) + { + aMessage.Panic(KFLoggerServerName,ELogDirectoryNameDoesNotExist); + User::Leave(KErrMessagePanic); + } + + if (log.Name().Length()<=0) + { + aMessage.Panic(KFLoggerServerName,ELogFileNameDoesNotExist); + User::Leave(KErrMessagePanic); + } // TBuf8 buf; TBuf8<1600> buf; if (func==EWriteLog || func==ECreateWriteAndCloseLog) + { aMessage.ReadL(1,buf); + } switch (func) { diff -r 63532cdadd44 -r 0d6db0a14001 loggingservices/rfilelogger/Logger/Group/bld.inf --- a/loggingservices/rfilelogger/Logger/Group/bld.inf Fri Jun 11 15:29:22 2010 +0300 +++ b/loggingservices/rfilelogger/Logger/Group/bld.inf Tue Jul 06 16:18:30 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -16,10 +16,10 @@ #include "../te_RFileLogger/group/bld.inf" PRJ_EXPORTS -../inc/RFileLogger.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(test/rfilelogger.h) -../inc/RFileLoggermacro.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(test/rfileloggermacro.h) -../Group/RFilelogger.iby /epoc32/rom/include/rfilelogger.iby +../inc/RFileLogger.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(test/rfilelogger.h) +../inc/RFileLoggermacro.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(test/rfileloggermacro.h) +RFilelogger.iby /epoc32/rom/include/rfilelogger.iby + PRJ_MMPFILES RFileLoggerServer.mmp RFileloggerclient.mmp - diff -r 63532cdadd44 -r 0d6db0a14001 loggingservices/rfilelogger/Logger/Src/Client.cpp --- a/loggingservices/rfilelogger/Logger/Src/Client.cpp Fri Jun 11 15:29:22 2010 +0300 +++ b/loggingservices/rfilelogger/Logger/Src/Client.cpp Tue Jul 06 16:18:30 2010 +0300 @@ -288,7 +288,8 @@ } /*----------------- End of Maintaince warning section --------------------------*/ - TRAPD(err,WriteL(ptr)); + TRAP_IGNORE(WriteL(ptr)); + delete buffer; } @@ -305,7 +306,7 @@ TPtr8 ptr(buffer->Des()); AddTime(ptr); ptr.Append(aLogBuffer); - TRAPD(err,WriteL(ptr)); + TRAP_IGNORE(WriteL(ptr)); CleanupStack::PopAndDestroy(buffer); } diff -r 63532cdadd44 -r 0d6db0a14001 loggingservices/rfilelogger/Logger/Src/Main.cpp --- a/loggingservices/rfilelogger/Logger/Src/Main.cpp Fri Jun 11 15:29:22 2010 +0300 +++ b/loggingservices/rfilelogger/Logger/Src/Main.cpp Tue Jul 06 16:18:30 2010 +0300 @@ -69,7 +69,7 @@ { return KErrNoMemory; } - TRAPD(err,MainL()); + TRAP_IGNORE(MainL()); delete cleanup; __UHEAP_MARKEND; return KErrNone; diff -r 63532cdadd44 -r 0d6db0a14001 loggingservices/rfilelogger/Logger/Src/Server.Cpp --- a/loggingservices/rfilelogger/Logger/Src/Server.Cpp Fri Jun 11 15:29:22 2010 +0300 +++ b/loggingservices/rfilelogger/Logger/Src/Server.Cpp Tue Jul 06 16:18:30 2010 +0300 @@ -382,27 +382,28 @@ aCount[0]=0; TInt posI(0); -// retrive log message: + // retrive log message: // Retrive common part of log message: - for(TInt i = 1; i<6; i++) + TInt i=0; + for(i=1; i<6; i++) { SearchBuf.Set(aPtr.Mid(posI)); aCount[i]=SearchBuf.Find(KSeperation8)+posI; posI=aCount[i]+3; if(aCount[i]" - //It shoud happened once at the beginning of the file - // such as overwrite mode - { - afileSize=12; // used for lock position - alogbuf.Copy(KxmlHeader); - } - alogbuf.Append(_L8("\r\n\r\n")); - for(TInt i=0; i<6; i++) - { - alogbuf.Append(_L8(" <")); - alogbuf.Append(alogField[i].iLogTag8); - alogbuf.Append(_L8(">")); - alogbuf.Append(alogField[i].iLogValue8); - alogbuf.Append(_L8("\r\n")); - } - for(TInt i=0; i")); - alogbuf.Append(extralogField[i].iLogValue8); - alogbuf.Append(_L8("\r\n")); - } - - alogbuf.Append(_L8("")); - alogbuf.Append(_L8("\r\n")); - - iLogFile.Write(afileSize-12, alogbuf,iStatus); - - - if(!r) - { - mutex.Signal(); - mutex.Close(); - } - - if(extralogField) delete[] extralogField; + } + // Start to organize an XML format: + TInt afileSize; + _LIT(KLogMutex, "LoggingServerMutex"); + RMutex mutex; + TInt r = mutex.CreateGlobal(KLogMutex); + if(r==KErrAlreadyExists) + r = mutex.OpenGlobal(KLogMutex); + + if(!r) + mutex.Wait(); // If still failed, let logging go without bother the mutex. + iLogFile.Size(afileSize); + if(afileSize<12) // 12 is from charters of "\r\n" + //It shoud happened once at the beginning of the file + // such as overwrite mode + { + afileSize=12; // used for lock position + alogbuf.Copy(KxmlHeader); + } + alogbuf.Append(_L8("\r\n\r\n")); + for(TInt i=0; i<6; i++) + { + alogbuf.Append(_L8(" <")); + alogbuf.Append(alogField[i].iLogTag8); + alogbuf.Append(_L8(">")); + alogbuf.Append(alogField[i].iLogValue8); + alogbuf.Append(_L8("\r\n")); + } + for(TInt i=0; i")); + alogbuf.Append(extralogField[i].iLogValue8); + alogbuf.Append(_L8("\r\n")); + } + + alogbuf.Append(_L8("")); + alogbuf.Append(_L8("\r\n")); + + iLogFile.Write(afileSize-12, alogbuf,iStatus); + + if(!r) + { + mutex.Signal(); + mutex.Close(); + } + + if(extralogField) + delete[] extralogField; + delete[] alogField; delete pBuf1; - } void CLogFileControl::WriteTxt(const TDesC8 &aDes) diff -r 63532cdadd44 -r 0d6db0a14001 loggingservices/rfilelogger/Logger/te_RFileLogger/group/Te_RFileLoggersuite.mmp --- a/loggingservices/rfilelogger/Logger/te_RFileLogger/group/Te_RFileLoggersuite.mmp Fri Jun 11 15:29:22 2010 +0300 +++ b/loggingservices/rfilelogger/Logger/te_RFileLogger/group/Te_RFileLoggersuite.mmp Tue Jul 06 16:18:30 2010 +0300 @@ -13,25 +13,22 @@ // Description: // -TARGET Te_RFileLoggerSuite.exe +TARGET te_rfileloggersuite.exe TARGETTYPE exe UID 0x1000007A 0x102089CD -//Please add any change under here. -SOURCEPATH ..\src +SOURCEPATH ../src SOURCE Te_RFileLoggerSuiteServer.cpp SOURCE Te_RFileLoggerSuiteStepBase.cpp SOURCE addfield_logStep.cpp SOURCE conn_closeStep.cpp -USERINCLUDE ..\src +USERINCLUDE ../src OS_LAYER_SYSTEMINCLUDE_SYMBIAN LIBRARY euser.lib LIBRARY testexecuteutils.lib LIBRARY testexecutelogclient.lib - -//Please add your libraries under here. -LIBRARY RFileLoggerclient.lib +LIBRARY rfileloggerclient.lib CAPABILITY ALL -Tcb diff -r 63532cdadd44 -r 0d6db0a14001 loggingservices/rfilelogger/Logger/te_RFileLogger/group/bld.inf --- a/loggingservices/rfilelogger/Logger/te_RFileLogger/group/bld.inf Fri Jun 11 15:29:22 2010 +0300 +++ b/loggingservices/rfilelogger/Logger/te_RFileLogger/group/bld.inf Tue Jul 06 16:18:30 2010 +0300 @@ -17,6 +17,7 @@ ../scripts/te_RFileLoggerSuite.script z:/testdata/scripts/te_rfileloggersuite.script ../testdata/te_RFileLoggersuite.ini z:/testdata/configs/te_rfileloggersuite.ini +te_RFileLoggersuite.iby /epoc32/rom/include/te_rfileloggersuite.iby PRJ_TESTMMPFILES Te_RFileLoggersuite.mmp manual diff -r 63532cdadd44 -r 0d6db0a14001 loggingservices/rfilelogger/Logger/te_RFileLogger/group/te_RFileLoggersuite.iby --- a/loggingservices/rfilelogger/Logger/te_RFileLogger/group/te_RFileLoggersuite.iby Fri Jun 11 15:29:22 2010 +0300 +++ b/loggingservices/rfilelogger/Logger/te_RFileLogger/group/te_RFileLoggersuite.iby Tue Jul 06 16:18:30 2010 +0300 @@ -20,7 +20,7 @@ #include -file=ABI_DIR\DEBUG_DIR\Te_RFileLoggerSuite.exe system\bin\te_RFileLoggerSuite.exe +file=ABI_DIR\DEBUG_DIR\te_rfileloggersuite.exe system\bin\te_rfileloggersuite.exe data=DATAZ_\testdata\configs\te_rfileloggersuite.ini testdata\configs\te_rfileloggersuite.ini data=DATAZ_\testdata\scripts\te_rfileloggersuite.script testdata\Scripts\te_rfileloggersuite.script diff -r 63532cdadd44 -r 0d6db0a14001 loggingservices/rfilelogger/Logger/te_RFileLogger/src/Te_RFileLoggerSuiteServer.cpp --- a/loggingservices/rfilelogger/Logger/te_RFileLogger/src/Te_RFileLoggerSuiteServer.cpp Fri Jun 11 15:29:22 2010 +0300 +++ b/loggingservices/rfilelogger/Logger/te_RFileLogger/src/Te_RFileLoggerSuiteServer.cpp Tue Jul 06 16:18:30 2010 +0300 @@ -90,7 +90,7 @@ { return KErrNoMemory; } - TRAPD(err,MainL()); + TRAP_IGNORE(MainL()); delete cleanup; __UHEAP_MARKEND; return KErrNone; diff -r 63532cdadd44 -r 0d6db0a14001 package_definition.xml --- a/package_definition.xml Fri Jun 11 15:29:22 2010 +0300 +++ b/package_definition.xml Tue Jul 06 16:18:30 2010 +0300 @@ -13,7 +13,7 @@ - + diff -r 63532cdadd44 -r 0d6db0a14001 persistentstorage/centralrepository/group/CenRepFotaTvRTests.iby --- a/persistentstorage/centralrepository/group/CenRepFotaTvRTests.iby Fri Jun 11 15:29:22 2010 +0300 +++ b/persistentstorage/centralrepository/group/CenRepFotaTvRTests.iby Tue Jul 06 16:18:30 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -28,8 +28,10 @@ // centrep techview test files #ifdef SYMBIAN_BAFL_SYSUTIL -file=ABI_DIR\BUILD_DIR\t_cenrep_fota_hw_setup.exe test\t_cenrep_fota_hw_setup.exe -file=ABI_DIR\BUILD_DIR\t_cenrep_fota_hw_tests.exe test\t_cenrep_fota_hw_tests.exe + #ifdef CENTREP_MW_TESTS + file=ABI_DIR\BUILD_DIR\t_cenrep_fota_hw_setup.exe test\t_cenrep_fota_hw_setup.exe + file=ABI_DIR\BUILD_DIR\t_cenrep_fota_hw_tests.exe test\t_cenrep_fota_hw_tests.exe + #endif // CENTREP_MW_TESTS #endif #ifdef SYMBIAN_BAFL_SYSUTIL diff -r 63532cdadd44 -r 0d6db0a14001 persistentstorage/centralrepository/group/CentralRepositoryTechviewFlashPerformance.iby --- a/persistentstorage/centralrepository/group/CentralRepositoryTechviewFlashPerformance.iby Fri Jun 11 15:29:22 2010 +0300 +++ b/persistentstorage/centralrepository/group/CentralRepositoryTechviewFlashPerformance.iby Tue Jul 06 16:18:30 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -24,7 +24,9 @@ // centrep techview test files #ifdef SYMBIAN_BAFL_SYSUTIL // cenrep test exes -file=ABI_DIR\BUILD_DIR\t_cenrep_fota_perf1.exe test\t_cenrep_fota_perf1.exe +#ifdef CENTREP_MW_TESTS + file=ABI_DIR\BUILD_DIR\t_cenrep_fota_perf1.exe test\t_cenrep_fota_perf1.exe +#endif // CENTREP_MW_TESTS file=ABI_DIR\BUILD_DIR\t_cenrep_fota_perf2.exe test\t_cenrep_fota_perf2.exe #ifndef __CENTRALREPOSITORYTECHVIEWRTESTS_IBY__ diff -r 63532cdadd44 -r 0d6db0a14001 persistentstorage/centralrepository/group/CentralRepositoryTechviewRTests.iby --- a/persistentstorage/centralrepository/group/CentralRepositoryTechviewRTests.iby Fri Jun 11 15:29:22 2010 +0300 +++ b/persistentstorage/centralrepository/group/CentralRepositoryTechviewRTests.iby Tue Jul 06 16:18:30 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -19,13 +19,19 @@ REM Central Repository Tests that require Techview. #ifdef SYMBIAN_BAFL_SYSUTIL - #include + #ifdef CENTREP_MW_TESTS + #include + #endif // CENTREP_MW_TESTS #endif // SYMBIAN_BAFL_SYSUTIL -file=ABI_DIR\BUILD_DIR\t_cenrep_back_rest_defect.exe test\t_cenrep_back_rest_defect.exe - +#ifdef CENTREP_MW_TESTS + file=ABI_DIR\BUILD_DIR\t_cenrep_back_rest_defect.exe test\t_cenrep_back_rest_defect.exe +#endif // CENTREP_MW_TESTS + #ifdef SYMBIAN_BAFL_SYSUTIL - file=ABI_DIR\BUILD_DIR\t_cenrep_fotaut.exe test\t_cenrep_fotaut.exe + #ifdef CENTREP_MW_TESTS + file=ABI_DIR\BUILD_DIR\t_cenrep_fotaut.exe test\t_cenrep_fotaut.exe + #endif // CENTREP_MW_TESTS #endif // SYMBIAN_BAFL_SYSUTIL #ifndef __CENTREPTESTDATA_IBY__ diff -r 63532cdadd44 -r 0d6db0a14001 persistentstorage/centralrepository/group/bld.inf --- a/persistentstorage/centralrepository/group/bld.inf Fri Jun 11 15:29:22 2010 +0300 +++ b/persistentstorage/centralrepository/group/bld.inf Tue Jul 06 16:18:30 2010 +0300 @@ -41,9 +41,9 @@ // Stub sis file required by various tests. #ifdef __SERIES60_ -../test/testexecute/SWI/data/rnd_sis/centrepswiteststub.SIS z:/system/install/centrepswiteststub.sis +../test/testexecute/SWI/data/rnd_sis/centrepswiteststub.sis z:/system/install/centrepswiteststub.sis #else -../test/testexecute/SWI/data/techview_sis/centrepswiteststub.SIS z:/system/install/centrepswiteststub.sis +../test/testexecute/SWI/data/techview_sis/centrepswiteststub.sis z:/system/install/centrepswiteststub.sis #endif //__SERIES60_ CentralRepositoryTests.bat /epoc32/data/z/system/test/centralrepositorytests.bat @@ -1451,26 +1451,38 @@ t_cenrep_meta.mmp t_cenrep_rfs.mmp t_cenrep_back_rest.mmp -t_cenrep_back_rest_defect.mmp manual +#ifdef CENTREP_MW_TESTS + t_cenrep_back_rest_defect.mmp manual +#endif // CENTREP_MW_TESTS t_cenrep_back_rest_delete.mmp t_oomcenrepsrv.mmp t_processkillprocess.mmp support #ifdef SYMBIAN_BAFL_SYSUTIL - t_cenrep_fota_tvem1.mmp manual - t_cenrep_fota_tvem2.mmp manual - t_cenrep_fota_tvem3.mmp manual - t_cenrep_fota_txtem1.mmp manual - t_cenrep_fota_txtem2.mmp manual - t_cenrep_fotaUT.mmp manual + #ifdef CENTREP_MW_TESTS + t_cenrep_fota_tvem1.mmp manual + #endif // CENTREP_MW_TESTS + + t_cenrep_fota_tvem2.mmp manual - #ifdef __CENTREP_SERVER_PERFTEST__ - t_cenrep_fota_perf1.mmp manual - t_cenrep_fota_perf2.mmp manual - #endif // __CENTREP_SERVER_PERFTEST__ + #ifdef CENTREP_MW_TESTS + t_cenrep_fota_tvem3.mmp manual + t_cenrep_fota_txtem1.mmp manual + t_cenrep_fota_txtem2.mmp manual + t_cenrep_fotaUT.mmp manual + #endif // CENTREP_MW_TESTS - t_cenrep_fota_hw_setup.mmp manual - t_cenrep_fota_hw_tests.mmp manual + #ifdef __CENTREP_SERVER_PERFTEST__ + #ifdef CENTREP_MW_TESTS + t_cenrep_fota_perf1.mmp manual + #endif // CENTREP_MW_TESTS + t_cenrep_fota_perf2.mmp manual + #endif // __CENTREP_SERVER_PERFTEST__ + + #ifdef CENTREP_MW_TESTS + t_cenrep_fota_hw_setup.mmp manual + t_cenrep_fota_hw_tests.mmp manual + #endif // CENTREP_MW_TESTS #endif // SYMBIAN_BAFL_SYSUTIL diff -r 63532cdadd44 -r 0d6db0a14001 persistentstorage/centralrepository/group/t_cenrep_back_rest.mmp --- a/persistentstorage/centralrepository/group/t_cenrep_back_rest.mmp Fri Jun 11 15:29:22 2010 +0300 +++ b/persistentstorage/centralrepository/group/t_cenrep_back_rest.mmp Tue Jul 06 16:18:30 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -28,7 +28,7 @@ target t_cenrep_back_rest.exe targettype exe -MW_LAYER_SYSTEMINCLUDE_SYMBIAN +OS_LAYER_SYSTEMINCLUDE_SYMBIAN OS_LAYER_LIBC_SYSTEMINCLUDE USERINCLUDE ../cenrepsrv ../common/inc diff -r 63532cdadd44 -r 0d6db0a14001 persistentstorage/centralrepository/group/t_cenrep_back_rest_delete.mmp --- a/persistentstorage/centralrepository/group/t_cenrep_back_rest_delete.mmp Fri Jun 11 15:29:22 2010 +0300 +++ b/persistentstorage/centralrepository/group/t_cenrep_back_rest_delete.mmp Tue Jul 06 16:18:30 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -25,7 +25,7 @@ target t_cenrep_back_rest_delete.exe targettype exe -MW_LAYER_SYSTEMINCLUDE_SYMBIAN +OS_LAYER_SYSTEMINCLUDE_SYMBIAN OS_LAYER_LIBC_SYSTEMINCLUDE USERINCLUDE ../cenrepsrv ../common/inc diff -r 63532cdadd44 -r 0d6db0a14001 persistentstorage/centralrepository/group/t_cenrep_defects.mmp --- a/persistentstorage/centralrepository/group/t_cenrep_defects.mmp Fri Jun 11 15:29:22 2010 +0300 +++ b/persistentstorage/centralrepository/group/t_cenrep_defects.mmp Tue Jul 06 16:18:30 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -21,7 +21,7 @@ target t_cenrep_defects.exe targettype exe -MW_LAYER_SYSTEMINCLUDE_SYMBIAN +OS_LAYER_SYSTEMINCLUDE_SYMBIAN USERINCLUDE ../cenrepsrv USERINCLUDE ../common/inc diff -r 63532cdadd44 -r 0d6db0a14001 persistentstorage/centralrepository/group/t_cenrep_fota_perf2.mmp --- a/persistentstorage/centralrepository/group/t_cenrep_fota_perf2.mmp Fri Jun 11 15:29:22 2010 +0300 +++ b/persistentstorage/centralrepository/group/t_cenrep_fota_perf2.mmp Tue Jul 06 16:18:30 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -21,7 +21,7 @@ target t_cenrep_fota_perf2.exe targettype exe -MW_LAYER_SYSTEMINCLUDE_SYMBIAN +OS_LAYER_SYSTEMINCLUDE_SYMBIAN USERINCLUDE ../cenrepsrv USERINCLUDE ../common/inc diff -r 63532cdadd44 -r 0d6db0a14001 persistentstorage/centralrepository/test/multirofs/group/t_cenrep_preq2112.mmp --- a/persistentstorage/centralrepository/test/multirofs/group/t_cenrep_preq2112.mmp Fri Jun 11 15:29:22 2010 +0300 +++ b/persistentstorage/centralrepository/test/multirofs/group/t_cenrep_preq2112.mmp Tue Jul 06 16:18:30 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -22,7 +22,7 @@ UID 0 0x1020FFFF -MW_LAYER_SYSTEMINCLUDE_SYMBIAN +OS_LAYER_SYSTEMINCLUDE_SYMBIAN USERINCLUDE ../../../cenrepsrv USERINCLUDE ../../../common/inc diff -r 63532cdadd44 -r 0d6db0a14001 persistentstorage/centralrepository/test/multirofs/group/t_cenrep_preq2112perf.mmp --- a/persistentstorage/centralrepository/test/multirofs/group/t_cenrep_preq2112perf.mmp Fri Jun 11 15:29:22 2010 +0300 +++ b/persistentstorage/centralrepository/test/multirofs/group/t_cenrep_preq2112perf.mmp Tue Jul 06 16:18:30 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -22,7 +22,7 @@ target t_cenrep_preq2112perf.exe targettype exe -MW_LAYER_SYSTEMINCLUDE_SYMBIAN +OS_LAYER_SYSTEMINCLUDE_SYMBIAN USERINCLUDE ../../../cenrepsrv USERINCLUDE ../../../common/inc diff -r 63532cdadd44 -r 0d6db0a14001 persistentstorage/centralrepository/test/multirofs/group/t_cenrep_preq2112u.mmp --- a/persistentstorage/centralrepository/test/multirofs/group/t_cenrep_preq2112u.mmp Fri Jun 11 15:29:22 2010 +0300 +++ b/persistentstorage/centralrepository/test/multirofs/group/t_cenrep_preq2112u.mmp Tue Jul 06 16:18:30 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -19,7 +19,7 @@ target t_cenrep_preq2112u.exe targettype exe -MW_LAYER_SYSTEMINCLUDE_SYMBIAN +OS_LAYER_SYSTEMINCLUDE_SYMBIAN USERINCLUDE ../../../cenrepsrv USERINCLUDE ../../../common/inc diff -r 63532cdadd44 -r 0d6db0a14001 persistentstorage/centralrepository/test/testexecute/group/TEF_CentralRepository.iby --- a/persistentstorage/centralrepository/test/testexecute/group/TEF_CentralRepository.iby Fri Jun 11 15:29:22 2010 +0300 +++ b/persistentstorage/centralrepository/test/testexecute/group/TEF_CentralRepository.iby Tue Jul 06 16:18:30 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -23,7 +23,9 @@ // // Note also that all these tests are techview tests. -#include -#include - +#ifdef CENTREP_MW_TESTS + #include + #include +#endif // CENTREP_MW_TESTS + #endif // __TEF_CentralRepository_IBY__ diff -r 63532cdadd44 -r 0d6db0a14001 persistentstorage/centralrepository/test/testexecute/group/bld.inf --- a/persistentstorage/centralrepository/test/testexecute/group/bld.inf Fri Jun 11 15:29:22 2010 +0300 +++ b/persistentstorage/centralrepository/test/testexecute/group/bld.inf Tue Jul 06 16:18:30 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -14,16 +14,12 @@ // - #include "../performance/group/bld.inf" #include "../convtool/group/bld.inf" -#include "../SWI/group/bld.inf" -#include "../BUR/group/bld.inf" +#ifdef CENTREP_MW_TESTS + #include "../SWI/group/bld.inf" + #include "../BUR/group/bld.inf" +#endif // CENTREP_MW_TESTS PRJ_TESTEXPORTS - - -../group/TEF_CentralRepository.iby /epoc32/rom/include/tef_centralrepository.iby - - - +../group/TEF_CentralRepository.iby /epoc32/rom/include/tef_centralrepository.iby diff -r 63532cdadd44 -r 0d6db0a14001 persistentstorage/dbms/pcdbms/ustor/US_FILE.CPP --- a/persistentstorage/dbms/pcdbms/ustor/US_FILE.CPP Fri Jun 11 15:29:22 2010 +0300 +++ b/persistentstorage/dbms/pcdbms/ustor/US_FILE.CPP Tue Jul 06 16:18:30 2010 +0300 @@ -91,13 +91,11 @@ { default: __LEAVE(KErrNotSupported); -// When the file cache in file server is on, the order of file writing is not guaranteed which could cause data inconsistency in some circumstances, for example, when the power is lost in the middle of data transaction. Therefore, the file write cache is switched off here to maintain the file integrity . case TDbFormat::ECreate: - store=CPermanentFileStore::CreateL(iFs,aName,EFileRead|EFileWrite|EFileWriteDirectIO); + store=CPermanentFileStore::CreateL(iFs,aName,EFileRead|EFileWrite); break; -// When the file cache in file server is on, the order of file writing is not guaranteed which could cause data inconsistency in some circumstances, for example, when the power is lost in the middle of data transaction. Therefore, the file write cache is switched off here to maintain the file integrity . case TDbFormat::EReplace: - store=CPermanentFileStore::ReplaceL(iFs,aName,EFileRead|EFileWrite|EFileWriteDirectIO); + store=CPermanentFileStore::ReplaceL(iFs,aName,EFileRead|EFileWrite); break; }; iStore=store; @@ -140,8 +138,6 @@ // iName=aName.AllocL(); const TUint mode=aMode==TDbFormat::EReadOnly ? EFileShareReadersOnly : EFileWrite; -// When the file cache in file server is on, the order of file writing is not guaranteed which could cause data inconsistency in some circumstances, for example, when the power is lost in the middle of data transaction. Therefore, the file write cache is switched off here to maintain the file integrity . - mode=mode|EFileWriteDirectIO; CFileStore* store=CPermanentFileStore::OpenL(iFs,*iName,mode); iStore=store; CDbStoreDatabase::RestoreL(DatabaseIdL(store->Root())); diff -r 63532cdadd44 -r 0d6db0a14001 persistentstorage/dbms/ustor/US_FILE.CPP --- a/persistentstorage/dbms/ustor/US_FILE.CPP Fri Jun 11 15:29:22 2010 +0300 +++ b/persistentstorage/dbms/ustor/US_FILE.CPP Tue Jul 06 16:18:30 2010 +0300 @@ -97,13 +97,11 @@ { default: __LEAVE(KErrNotSupported); - case TDbFormat::ECreate: -// When the file cache in file server is on, the order of file writing is not guaranteed which could cause data inconsistency in some circumstances, for example, when the power is lost in the middle of data transaction. Therefore, the file write cache is switched off here to maintain the file integrity . - store=CPermanentFileStore::CreateL(iFs,aName,EFileRead|EFileWrite/EFileWriteDirectIO); + case TDbFormat::ECreate: + store=CPermanentFileStore::CreateL(iFs,aName,EFileRead|EFileWrite); break; case TDbFormat::EReplace: -// When the file cache in file server is on, the order of file writing is not guaranteed which could cause data inconsistency in some circumstances, for example, when the power is lost in the middle of data transaction. Therefore, the file write cache is switched off here to maintain the file integrity . - store=CPermanentFileStore::ReplaceL(iFs,aName,EFileRead|EFileWrite/EFileWriteDirectIO); + store=CPermanentFileStore::ReplaceL(iFs,aName,EFileRead|EFileWrite); break; }; iStore=store; @@ -146,8 +144,6 @@ // iName=aName.AllocL(); TUint mode=aMode==TDbFormat::EReadOnly ? EFileShareReadersOnly : EFileWrite; -// When the file cache in file server is on, the order of file writing is not guaranteed which could cause data inconsistency in some circumstances, for example, when the power is lost in the middle of data transaction. Therefore, the file write cache is switched off here to maintain the file integrity . - mode = mode|EFileWriteDirectIO; CFileStore* store=CPermanentFileStore::OpenL(iFs,*iName,mode); iStore=store; CDbStoreDatabase::RestoreL(DatabaseIdL(store->Root())); diff -r 63532cdadd44 -r 0d6db0a14001 persistentstorage/dbms/ustor/US_TABLE.CPP --- a/persistentstorage/dbms/ustor/US_TABLE.CPP Fri Jun 11 15:29:22 2010 +0300 +++ b/persistentstorage/dbms/ustor/US_TABLE.CPP Tue Jul 06 16:18:30 2010 +0300 @@ -611,7 +611,9 @@ TInt size; rec=ReadCardinality(rec,size); size<<=2; - if(size < 0) + + //If such huge allocation is requested(KMaxTInt/2), it is highly likely the file is corrupt + if((size < 0) || (size >= KMaxTInt/2)) { aRow.SetSize(0); __LEAVE(KErrCorrupt); diff -r 63532cdadd44 -r 0d6db0a14001 persistentstorage/sql/OsLayer/FileBuf64.cpp --- a/persistentstorage/sql/OsLayer/FileBuf64.cpp Fri Jun 11 15:29:22 2010 +0300 +++ b/persistentstorage/sql/OsLayer/FileBuf64.cpp Tue Jul 06 16:18:30 2010 +0300 @@ -195,6 +195,7 @@ EFBufPanicNextReadFilePos, EFBufPanicNextReadFilePosHits, EFBufPanicFileBlockSize, //15 + EFBufPanicRwDataLength, }; /** @@ -249,15 +250,16 @@ /** Initializes RFileBuf64 data members with their default values. -@param aSize Max file buffer size (capacity) in bytes. +@param aMinCapacity Minimal file buffer size (capacity) in bytes. -@panic FBuf64 1 In _DEBUG mode - aSize is 0 or negative. +@panic FBuf64 1 In _DEBUG mode - aMinCapacity is 0 or negative. */ -RFileBuf64::RFileBuf64(TInt aSize) : - iCapacity(aSize), - iReadAheadSize(RFileBuf64::KDefaultReadAheadSize) +RFileBuf64::RFileBuf64(TInt aMinCapacity) : + iCapacity(aMinCapacity), + iReadAheadSize(RFileBuf64::KDefaultReadAheadSize), + iOptimized(EFalse) { - __FBUF64_ASSERT(aSize > 0, EFBufPanicCapacity); + __FBUF64_ASSERT(aMinCapacity > 0, EFBufPanicCapacity); } /** @@ -473,21 +475,26 @@ __FBUF64_ASSERT(aFilePos >= 0, EFBufPanicFilePos); __FILEBUF64_INVARIANT(); aDes.SetLength(0); - //1. The output buffer max len is 0 + //0. The output buffer max len is 0 if(aDes.MaxLength() == 0) { __FILEBUF64_INVARIANT(); return KErrNone; } - //2. Initialize the "iFileSize" if it is not initialized yet + //1. Initialize the "iFileSize" if it is not initialized yet TInt err = DoFileSize(); if(err != KErrNone) { __FILEBUF64_INVARIANT(); return err; } + //2. Optimize the buffer capacity + TInt len = aDes.MaxLength(); + if((err = DoSetCapacity(len)) != KErrNone) + { + return err; + } //3. Too big "read" request - read directly from the file - TInt len = aDes.MaxLength(); if(len > iCapacity) { if((aFilePos + len) > iFilePos && aFilePos < (iFilePos + iLength)) @@ -537,7 +544,7 @@ break; } //The guessed from the previous "file read" operation file pos is correct. Start reading-ahead. - const TInt KMaxReadFilePosHits = 8;//The max read-ahead buffer size can be up to 2^8 times the iReadAheadSize + const TInt KMaxReadFilePosHits = 4;//The max read-ahead buffer size can be up to 2^4 times the iReadAheadSize if(iNextReadFilePosHits < KMaxReadFilePosHits) { ++iNextReadFilePosHits; @@ -608,6 +615,10 @@ __FILEBUF64_INVARIANT(); return err; } + if((err = DoSetCapacity(aData.Length())) != KErrNone) + { + return err; + } DoDiscardBufferedReadData(); const TUint8* data = aData.Ptr(); for(TInt len = aData.Length(); len > 0 && err == KErrNone;) @@ -1078,6 +1089,64 @@ __FILEBUF64_INVARIANT(); } +/** +Sets the most appropriate buffer capacity based on the database page size. +The function does a lazy evaluation. The first time the function is called and +aRwDataLength parameter is recognized to be a database or journal page size, the new (optimal) +buffer capacity is calculated and set. All next DoSetCapacity() calls will detect that the new +capacity is already set and will return KErrNone. + +@param aRwDataLength The length of the data being read or written. +@return KErrNone The new capacity was set successfully, + KErrNoMemory Out of memory. +*/ +TInt RFileBuf64::DoSetCapacity(TInt aRwDataLength) + { + const TInt KMinPageCount = 4;//the buffer capacity should be at least (KMinPageCount * page size) + //but not less than the original capacity. + const TInt KDefaultPageSize = 1024;//The journal header size is equal to 512 bytes, so it is not easy + //to detect the 512 bytes page size. + + __FBUF64_ASSERT(aRwDataLength > 0, EFBufPanicRwDataLength); + __FILEBUF64_INVARIANT(); + if(iOptimized) + { + __FILEBUF64_INVARIANT(); + return KErrNone; + } + if((aRwDataLength & (aRwDataLength - 1)) != 0 || aRwDataLength < KDefaultPageSize) + { + __FILEBUF64_INVARIANT(); + return KErrNone; + } + //Here: aRwDataLength is power of 2 and is bigger than the default db page size. + //aRwDataLength is the size of the db page. + const TInt pageSize = aRwDataLength; + TInt cnt = iCapacity / pageSize;//how many pages can fit in the buffer now + TInt pageCount = Max(cnt, KMinPageCount);//the number of pages that should fit in the new buffer + TInt newBufCapacity = pageCount * pageSize; + if(newBufCapacity != iCapacity) + { + TUint8* newBase = static_cast (User::ReAlloc(iBase, newBufCapacity)); + if(!newBase) + { + __FILEBUF64_INVARIANT(); + return KErrNoMemory; + } + iBase = newBase; + iCapacity = newBufCapacity; + //Adjust the initial read-ahead size to be multiple of the page size. + if((iReadAheadSize % pageSize) != 0) + { + TInt q = iReadAheadSize / pageSize; + iReadAheadSize = q != 0 ? pageSize * q : pageSize; + } + } + iOptimized = ETrue; + __FILEBUF64_INVARIANT(); + return KErrNone; + } + #ifdef _DEBUG /** @@ -1093,7 +1162,7 @@ @panic FBuf64 6 In _DEBUG mode - null file handle (the RFile64 object is not created or already destroyed). @panic FBuf64 13 In _DEBUG mode - set but negative iNextReadFilePos value. @panic FBuf64 14 In _DEBUG mode - negative iNextReadFilePosHits value. -@panic FBuf64 15 In _DEBUG mode - iReadAheadSize is negative or is not power of two. +@panic FBuf64 15 In _DEBUG mode - iReadAheadSize is negative or is bigger than iCapacity. */ void RFileBuf64::Invariant() const { @@ -1106,7 +1175,7 @@ __FBUF64_ASSERT(iFile.SubSessionHandle() != 0, EFBufPanicFileHandle); __FBUF64_ASSERT(iNextReadFilePos == KNextReadFilePosNotSet || iNextReadFilePos >= 0, EFBufPanicNextReadFilePos); __FBUF64_ASSERT(iNextReadFilePosHits >= 0, EFBufPanicNextReadFilePosHits); - __FBUF64_ASSERT(iReadAheadSize > 0 && (iReadAheadSize & (iReadAheadSize - 1)) == 0, EFBufPanicFileBlockSize); + __FBUF64_ASSERT(iReadAheadSize > 0, EFBufPanicFileBlockSize); } #endif diff -r 63532cdadd44 -r 0d6db0a14001 persistentstorage/sql/OsLayer/FileBuf64.h --- a/persistentstorage/sql/OsLayer/FileBuf64.h Fri Jun 11 15:29:22 2010 +0300 +++ b/persistentstorage/sql/OsLayer/FileBuf64.h Tue Jul 06 16:18:30 2010 +0300 @@ -36,7 +36,7 @@ - an object of RFileBuf64 type must be defined first, specifying the max size (capacity) of the buffer as a parameter of the constructor: - RFileBuf64 fbuf();// is the buffer capacity in bytes + RFileBuf64 fbuf();// is the minimal buffer capacity in bytes - the second step is to initialize the just defined RFileBuf64 object by calling one of the "resource acquisition" methods: RFileBuf64::Create(), RFileBuf64::Open(), RFileBuf64::Temp() or RFileBuf64::AdoptFromClient(). @@ -141,7 +141,7 @@ enum {KDefaultReadAheadSize = 1024};//Default size in bytes of the read-ahead buffer public: - RFileBuf64(TInt aSize); + RFileBuf64(TInt aMinCapacity); TInt Create(RFs& aFs, const TDesC& aFileName, TUint aFileMode); TInt Open(RFs& aFs, const TDesC& aFileName, TUint aFileMode); @@ -171,10 +171,11 @@ TInt DoFileWrite1(TInt64 aNewFilePos); TInt DoFileWrite2(TInt64 aNewFilePos = 0LL); void DoDiscardBufferedReadData(); + TInt DoSetCapacity(TInt aRwDataLength); private: //Buffer related - const TInt iCapacity; //The buffer size. Indicates how much data can be put in. + TInt iCapacity; //The buffer size. Indicates how much data can be put in. TUint8* iBase; //Pointer to the beginning of the buffer. TInt iLength; //The length of the data currently held in the buffer. //File related @@ -186,6 +187,8 @@ TInt64 iNextReadFilePos; //The guessed file position of the next "file read" operation TInt iNextReadFilePosHits; //How many times the guessed file position of the "file read" operation was correct TInt iReadAheadSize; + // + TBool iOptimized; //True if the file buffer capacity has been optimized already //Profiler related #ifdef _SQLPROFILER diff -r 63532cdadd44 -r 0d6db0a14001 persistentstorage/sql/OsLayer/os_symbian.cpp --- a/persistentstorage/sql/OsLayer/os_symbian.cpp Fri Jun 11 15:29:22 2010 +0300 +++ b/persistentstorage/sql/OsLayer/os_symbian.cpp Tue Jul 06 16:18:30 2010 +0300 @@ -332,14 +332,13 @@ // - iBytesTotal - the total amount of bytes passed to the monitored OS porting layer function (if it is read or write); struct TOsCallProfile { - TOsCallProfile(char aType, char aIdentifier[]) : + TOsCallProfile(char aType, const TDesC& aIdentifier) : iType(aType), + iIdentifier(aIdentifier), iCallCounter(0), iTicksTotal(0), iBytesTotal(0) { - iIdentifier[0] = aIdentifier[0]; - iIdentifier[1] = aIdentifier[1]; } void Zero() { @@ -348,7 +347,7 @@ iBytesTotal = 0; } char iType; - char iIdentifier[2]; + TBuf<32> iIdentifier; TInt iCallCounter; TInt64 iTicksTotal; TInt64 iBytesTotal; @@ -358,22 +357,22 @@ //the function was used on the main database file TOsCallProfile TheOsCallMProfile[EOsOpLast] = { - TOsCallProfile('M', "CL"), TOsCallProfile('M', "RD"), TOsCallProfile('M', "WR"), TOsCallProfile('M', "TR"), - TOsCallProfile('M', "SY"), TOsCallProfile('M', "FS"), TOsCallProfile('M', "LK"), TOsCallProfile('M', "UL"), - TOsCallProfile('M', "RL"), TOsCallProfile('M', "FC"), TOsCallProfile('M', "SS"), TOsCallProfile('M', "DC"), - TOsCallProfile('M', "OP"), TOsCallProfile('M', "DE"), TOsCallProfile('M', "AC"), TOsCallProfile('M', "FN"), - TOsCallProfile('M', "RN"), TOsCallProfile('M', "SL"), TOsCallProfile('M', "CT"), TOsCallProfile('M', "LE") + TOsCallProfile('M', _L("Close")), TOsCallProfile('M', _L("Read")), TOsCallProfile('M', _L("Write")), TOsCallProfile('M', _L("Truncate")), + TOsCallProfile('M', _L("Sync")), TOsCallProfile('M', _L("Size")), TOsCallProfile('M', _L("Lock")), TOsCallProfile('M', _L("Unlock")), + TOsCallProfile('M', _L("CheckReservedLock")), TOsCallProfile('M', _L("FileControl")), TOsCallProfile('M', _L("SetSize")), TOsCallProfile('M', _L("DeviceCharacteristics")), + TOsCallProfile('M', _L("Open")), TOsCallProfile('M', _L("Delete")), TOsCallProfile('M', _L("Access")), TOsCallProfile('M', _L("FullPath")), + TOsCallProfile('M', _L("Randomness")), TOsCallProfile('M', _L("Sleep")), TOsCallProfile('M', _L("CurrentTime")), TOsCallProfile('M', _L("GetLastError")) }; //An array of TOsCallProfile entries, each entry keeps the profile of a specifc OS porting layer function, when //the function was used on the journal file TOsCallProfile TheOsCallJProfile[EOsOpLast] = { - TOsCallProfile('J', "CL"), TOsCallProfile('J', "RD"), TOsCallProfile('J', "WR"), TOsCallProfile('J', "TR"), - TOsCallProfile('J', "SY"), TOsCallProfile('J', "FS"), TOsCallProfile('J', "LK"), TOsCallProfile('J', "UL"), - TOsCallProfile('J', "RL"), TOsCallProfile('J', "FC"), TOsCallProfile('J', "SS"), TOsCallProfile('J', "DC"), - TOsCallProfile('J', "OP"), TOsCallProfile('J', "DE"), TOsCallProfile('J', "AC"), TOsCallProfile('J', "FN"), - TOsCallProfile('J', "RN"), TOsCallProfile('J', "SL"), TOsCallProfile('J', "CT"), TOsCallProfile('J', "LE") + TOsCallProfile('J', _L("Close")), TOsCallProfile('J', _L("Read")), TOsCallProfile('J', _L("Write")), TOsCallProfile('J', _L("Truncate")), + TOsCallProfile('J', _L("Sync")), TOsCallProfile('J', _L("Size")), TOsCallProfile('J', _L("Lock")), TOsCallProfile('J', _L("Unlock")), + TOsCallProfile('J', _L("CheckReservedLock")), TOsCallProfile('J', _L("FileControl")), TOsCallProfile('J', _L("SetSize")), TOsCallProfile('J', _L("DeviceCharacteristics")), + TOsCallProfile('J', _L("Open")), TOsCallProfile('J', _L("Delete")), TOsCallProfile('J', _L("Access")), TOsCallProfile('J', _L("FullPath")), + TOsCallProfile('J', _L("Randomness")), TOsCallProfile('J', _L("Sleep")), TOsCallProfile('J', _L("CurrentTime")), TOsCallProfile('J', _L("GetLastError")) }; //The main class for the OS porting layer call profiles. @@ -421,8 +420,8 @@ TPtrC8 fn8(iOptional); fname.Copy(fn8); } - // 0 1 2 3 4 5 6 7 8 9 10 11 - RDebug::Print(_L("[SQL-OS]��\"%X\"�%c�%c%c�%d�%d�%ld�%d�%ld�%ld�%ld�%S\n"), + // 0 1 2 3 4 5 6 7 8 9 10 + RDebug::Print(_L("[SQL-OS]��\"%X\"�%c�%S�%d�%d�%ld�%d�%ld�%ld�%ld�%S\n"), //[SQL-OS] //Handle //Time from start, microseconds @@ -431,16 +430,15 @@ //IPC call name iHandle, //sqlite3_file* iOsCallProfileRef.iType, //1 - main or journal file - iOsCallProfileRef.iIdentifier[0], //2 - 1st letter - operation type - iOsCallProfileRef.iIdentifier[1], //3 - 2nd letter - operation type - TheOpCounter, //4 - Operation counter - iOsCallProfileRef.iCallCounter, //5 - This call type counter - iOffset, //6 - File offset - iBytes, //7 - Data, bytes - diffTicks, //8 - Ticks - iOsCallProfileRef.iBytesTotal, //9 - Data total, bytes - iOsCallProfileRef.iTicksTotal, //10- Ticks total - &fname); //11- File name + &iOsCallProfileRef.iIdentifier, //2 - operation type + TheOpCounter, //3 - Operation counter + iOsCallProfileRef.iCallCounter, //4 - This call type counter + iOffset, //5 - File offset + iBytes, //6 - Data, bytes + diffTicks, //7 - Ticks + iOsCallProfileRef.iBytesTotal, //8 - Data total, bytes + iOsCallProfileRef.iTicksTotal, //9 - Ticks total + &fname); //10- File name } } } diff -r 63532cdadd44 -r 0d6db0a14001 persistentstorage/sql/SRC/Server/Compact/SqlCompactEntry.cpp --- a/persistentstorage/sql/SRC/Server/Compact/SqlCompactEntry.cpp Fri Jun 11 15:29:22 2010 +0300 +++ b/persistentstorage/sql/SRC/Server/Compact/SqlCompactEntry.cpp Tue Jul 06 16:18:30 2010 +0300 @@ -189,6 +189,8 @@ Performs a compaction step on the database. If the number of the free pages is bigger than the number of pages removed in one compaction step, the function will reschedule itself for another compaction step. +If the database file is corrupted, then the function will remove the database entry from the timer queue - +the database won't be compacted anymore. @return KErrNoMemory, an out of memory condition has occurred; Note that the function may also return some other database specific @@ -213,8 +215,9 @@ iPageCount -= processedPageCount; __SQLASSERT(iPageCount >= 0, ESqlPanicInternalError); } - if(iPageCount <= 0) - {//No more pages to compact. Stop the compacting, move to EInactive state, remove from the timer queue. + TBool stopCompaction = err == KSqlErrCorrupt || err == KSqlErrNotDb || err == KErrCorrupt || err == KErrDisMounted; + if(iPageCount <= 0 || stopCompaction) + {//No more pages to compact or the file is corrupted . Stop the compacting, move to EInactive state, remove from the timer queue. ResetState(); iTimer.DeQueue(*this); } diff -r 63532cdadd44 -r 0d6db0a14001 persistentstorage/sql/SRC/Server/SqlSrvConfig.h --- a/persistentstorage/sql/SRC/Server/SqlSrvConfig.h Fri Jun 11 15:29:22 2010 +0300 +++ b/persistentstorage/sql/SRC/Server/SqlSrvConfig.h Tue Jul 06 16:18:30 2010 +0300 @@ -50,7 +50,12 @@ enum TDbEncoding {EEncNotSet, EEncUtf8, EEncUtf16};//Database encoding: the default value for iDbEncoding is EEncNotSet enum { - KDefaultSoftHeapLimitKb = 1024, +#ifdef __WINSCW__ + KDefaultSoftHeapLimitKb = 1024, +#else + KDefaultSoftHeapLimitKb = 8192, +#endif + #ifdef SYSLIBS_TEST KMinSoftHeapLimitKb = 8, #else diff -r 63532cdadd44 -r 0d6db0a14001 persistentstorage/sql/TEST/t_sqlcompact4.cpp --- a/persistentstorage/sql/TEST/t_sqlcompact4.cpp Fri Jun 11 15:29:22 2010 +0300 +++ b/persistentstorage/sql/TEST/t_sqlcompact4.cpp Tue Jul 06 16:18:30 2010 +0300 @@ -1019,6 +1019,78 @@ (void)RSqlDatabase::Delete(KDbName); } +/** +@SYMTestCaseID PDS-SQL-CT-4209 +@SYMTestCaseDesc Corrupted database background compaction test. + The test creates a database, inserts records, then deletes part of the records. + The free pages count should be big enough to kick off the background compaction. + But the database is closed immediatelly and then the db file is corrupted in a such + way that during the "database open" operation the corruption is not detected. + But the corruption is detected during the background compaction. The SQL server + should detect during the compaction that the databas eis corrupted and should + stop compacting the database (and draining the battery). Unfortunatelly, this + cannot be tested automatically, so a breakpoint should be set at the User::After() + call, and then the SQL server side should be debugged in order to berify that the + background compaction is really stopped for that database. +@SYMTestPriority High +@SYMTestActions Corrupted database background compaction test. +@SYMTestExpectedResults Test must not fail +@SYMDEF ou1cimx1#406830 +*/ +void CorruptedDbBckgCompactionTest() + { + //Step 1: Create a database with some records + const TInt KOperationCount = 100; + (void)RSqlDatabase::Delete(KDbName); + TInt err = TheDb.Create(KDbName); + TEST2(err, KErrNone); + err = TheDb.Exec(_L("BEGIN")); + TEST(err >= 0); + err = TheDb.Exec(_L("CREATE TABLE A(I INTEGER, T TEXT)")); + TEST2(err, 1); + TheText.SetLength(KTextLen); + TheText.Fill(TChar('A')); + for(TInt i=0;i<=KOperationCount;++i) + { + TheSqlTexLen.Format(_L("INSERT INTO A VALUES(%d, '%S')"), i + 1, &TheText); + err = TheDb.Exec(TheSqlTexLen); + TEST2(err, 1); + } + err = TheDb.Exec(_L("COMMIT")); + TEST(err >= 0); + //Step 2: Delete some records to free some space + err = TheDb.Exec(_L("DELETE FROM A WHERE (I % 2) = 0")); + TEST(err > 0); + //Step 3: Close the database + TheDb.Close(); + //Step 4: Corrupt the database + RFs fs; + err = fs.Connect(); + TEST2(err, KErrNone); + RFile file; + err = file.Open(fs, KDbName, EFileRead | EFileWrite); + TEST2(err, KErrNone); + TInt pos = 5000; + err = file.Seek(ESeekStart, pos); + TEST2(err, KErrNone); + TheSqlQuery.SetLength(1000); + for(TInt i=0;i<30;++i) + { + err = file.Write(TheSqlQuery); + TEST2(err, KErrNone); + } + file.Close(); + //Step 5: Check the background compaction. Wait 10 seconds allowing the SQL server to try to compact the + // database. The SQL server should detect that the SQL database is corrupted and should stop trying to + // compact the database. + err = TheDb.Open(KDbName); + TEST2(err, KErrNone); + User::After(10000000); + // + TheDb.Close(); + (void)RSqlDatabase::Delete(KDbName); + } + void DoTestsL() { CreateTestDatabase8(); @@ -1049,6 +1121,9 @@ TheTest.Next(_L(" @SYMTestCaseID:SYSLIB-SQL-UT-4071 Background compaction activated inside a DDL transaction - test")); BackgroundCompactionInDDLTransactionTest(); + + TheTest.Next(_L(" @SYMTestCaseID:PDS-SQL-CT-4209 Corrupted database background compaction test")); + CorruptedDbBckgCompactionTest(); } TInt E32Main() diff -r 63532cdadd44 -r 0d6db0a14001 persistentstorage/sql/TEST/t_sqlenvdestroy.cpp --- a/persistentstorage/sql/TEST/t_sqlenvdestroy.cpp Fri Jun 11 15:29:22 2010 +0300 +++ b/persistentstorage/sql/TEST/t_sqlenvdestroy.cpp Tue Jul 06 16:18:30 2010 +0300 @@ -38,6 +38,8 @@ _LIT(KPrivateSubDir, "c:\\private\\10281e17\\cfg-TestDir.db\\"); +TParse TheParse; + /////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////// //Test macros and functions @@ -62,6 +64,53 @@ } } +void PrintDiskUsage(RFs& aFs, const TDesC& aPath, TInt aOffset = 0) + { + _LIT(KSpace, " "); + TheTest.Printf(_L("%*.*S%S\r\n"), aOffset, aOffset, &KSpace, &aPath); + TFindFile findFile(aFs); + CDir* fileNameCol = NULL; + TBuf<8> fileNameMask; + fileNameMask.Copy(_L("*.*")); + TInt err = findFile.FindWildByDir(fileNameMask, aPath, fileNameCol); + if(err == KErrNone) + { + do + { + const TDesC& file = findFile.File();//"file" variable contains the drive and the path. the file name in "file" is invalid in this case. + (void)TheParse.Set(file, NULL, NULL); + TPtrC driveName = TheParse.Drive(); + if(aPath.FindF(driveName) >= 0) + { + TInt cnt = fileNameCol->Count(); + for(TInt i=0;i path; + path.Copy(aPath); + path.Append(entry.iName); + path.Append(_L("\\")); + PrintDiskUsage(aFs, path, aOffset + 4); + } + } + } // if(aPath.FindF(driveName) >= 0) + + delete fileNameCol; + fileNameCol = NULL; + } while((err = findFile.FindWild(fileNameCol)) == KErrNone);//Get the next set of files + } + else + { + TheTest.Printf(_L(" FindWildByDir() failed with err=%d\r\n"), err); + } + } + void DoRun() { RFs fs; @@ -85,8 +134,11 @@ DoDeleteFile(fs, KDb7); DoDeleteFile(fs, KDb8); - //Create a subdir in the private datacage. The SQL production code should properly detects - //KPrivateSubDir is a directory not a database file + TheTest.Printf(_L("====================================================\r\n")); + PrintDiskUsage(fs, _L("c:\\")); + TheTest.Printf(_L("====================================================\r\n")); + + //Remove the created subdir in the private datacage. err = fs.RmDir(KPrivateSubDir); if(err != KErrNone && err != KErrNotFound) { diff -r 63532cdadd44 -r 0d6db0a14001 persistentstorage/sql/TEST/t_sqlfilebuf64.cpp --- a/persistentstorage/sql/TEST/t_sqlfilebuf64.cpp Fri Jun 11 15:29:22 2010 +0300 +++ b/persistentstorage/sql/TEST/t_sqlfilebuf64.cpp Tue Jul 06 16:18:30 2010 +0300 @@ -50,6 +50,10 @@ EOomTempTest }; +//Used in read/write OOM tests +const TUint8 KChar = 'A'; +const TInt KPageSize = 32768; + /////////////////////////////////////////////////////////////////////////////////////// void DeleteTestFiles() @@ -821,15 +825,21 @@ parse.Set(KTestFile2, &drvName, NULL); TheDbName.Copy(parse.FullName()); TRAP(err, BaflUtils::EnsurePathExistsL(TheFs, TheDbName)); - TEST(err == KErrNone || err == KErrAlreadyExists); - (void)TheFs.Delete(TheDbName); - RFileBuf64 fbuf64(8 * 1024); - err = fbuf64.Create(TheFs, TheDbName, EFileRead | EFileWrite); - TEST2(err, KErrNone); - TInt readAhead = fbuf64.SetReadAheadSize(vparam.iBlockSize, vparam.iRecReadBufSize); - TheTest.Printf(_L(" Read-ahead size=%d.\r\n"), readAhead); - fbuf64.Close(); - (void)TheFs.Delete(TheDbName); + if(err == KErrNone || err == KErrAlreadyExists) + { + (void)TheFs.Delete(TheDbName); + RFileBuf64 fbuf64(8 * 1024); + err = fbuf64.Create(TheFs, TheDbName, EFileRead | EFileWrite); + TEST2(err, KErrNone); + TInt readAhead = fbuf64.SetReadAheadSize(vparam.iBlockSize, vparam.iRecReadBufSize); + TheTest.Printf(_L(" Read-ahead size=%d.\r\n"), readAhead); + fbuf64.Close(); + (void)TheFs.Delete(TheDbName); + } + else + { + TheTest.Printf(_L("Drive %C. BaflUtils::EnsurePathExistsL() has failed with err=%d.\r\n"), 'A' + drive, err); + } } } else @@ -1112,6 +1122,140 @@ TheTest.Printf(_L("\r\n===File I/O error simulation test succeeded on iteration %d===\r\n"), cnt); } +/** +@SYMTestCaseID PDS-SQL-UT-4207 +@SYMTestCaseDesc RFileBuf64::Write() OOM test. + The test calls RFileBuf64:Write() in an OOM + simulation loop and verifies that no memory is leaked. + The test also check that RFileBuf::DoSetCapacity() correctly operates in + "out of memory" situation. +@SYMTestActions RFileBuf64::Write() OOM test. +@SYMTestExpectedResults Test must not fail +@SYMTestPriority High +@SYMDEF 380056 +*/ +void WriteOomTest() + { + HBufC8* databuf = HBufC8::New(KPageSize); + TEST(databuf != NULL); + TPtr8 dataptr = databuf->Des(); + dataptr.SetLength(KPageSize); + dataptr.Fill(TChar(KChar)); + + TInt err = KErrNoMemory; + TInt failingAllocationNo = 0; + TheTest.Printf(_L("Iteration:\r\n")); + while(err == KErrNoMemory) + { + TheTest.Printf(_L(" %d"), ++failingAllocationNo); + + (void)TheFs.Delete(KTestFile); + + MarkHandles(); + MarkAllocatedCells(); + + __UHEAP_MARK; + __UHEAP_SETBURSTFAIL(RAllocator::EBurstFailNext, failingAllocationNo, KBurstRate); + + const TInt KDefaultBufCapacity = 1024; + RFileBuf64 fbuf(KDefaultBufCapacity); + err = fbuf.Create(TheFs, KTestFile, EFileWrite | EFileRead); + if(err == KErrNone) + { + err = fbuf.Write(0LL, dataptr); + } + fbuf.Close(); + + __UHEAP_RESET; + __UHEAP_MARKEND; + + CheckAllocatedCells(); + CheckHandles(); + } + TEST2(err, KErrNone); + RFile64 file; + err = file.Open(TheFs, KTestFile, EFileRead); + TEST2(err, KErrNone); + dataptr.Zero(); + err = file.Read(dataptr); + TEST2(err, KErrNone); + file.Close(); + TEST2(dataptr.Length(), KPageSize); + for(TInt i=0;iDes(); + + TInt err = KErrNoMemory; + TInt failingAllocationNo = 0; + TheTest.Printf(_L("Iteration:\r\n")); + while(err == KErrNoMemory) + { + TheTest.Printf(_L(" %d"), ++failingAllocationNo); + + MarkHandles(); + MarkAllocatedCells(); + + __UHEAP_MARK; + __UHEAP_SETBURSTFAIL(RAllocator::EBurstFailNext, failingAllocationNo, KBurstRate); + + const TInt KDefaultBufCapacity = 1024; + RFileBuf64 fbuf(KDefaultBufCapacity); + err = fbuf.Open(TheFs, KTestFile, EFileRead); + if(err == KErrNone) + { + err = fbuf.Read(0LL, dataptr); + } + fbuf.Close(); + + __UHEAP_RESET; + __UHEAP_MARKEND; + + CheckAllocatedCells(); + CheckHandles(); + } + TEST2(err, KErrNone); + RFile64 file; + err = file.Open(TheFs, KTestFile, EFileRead); + TEST2(err, KErrNone); + dataptr.Zero(); + err = file.Read(dataptr); + TEST2(err, KErrNone); + file.Close(); + TEST2(dataptr.Length(), KPageSize); + for(TInt i=0;i KTestTimeLimit; + return s; } void CreateTestDir() @@ -614,8 +616,9 @@ if((idx % 100) == 0) { GetHomeTimeAsString(time); - TheTest.Printf(_L("=== %S: Create % 5d statements\r\n"), &time, idx + 1); - if(IsTimeLimitReached()) + TTimeIntervalSeconds s = ExecutionTimeSeconds(); + TheTest.Printf(_L("=== %S: Create % 5d statements. %d seconds.\r\n"), &time, idx + 1, s.Int()); + if(s.Int() > KTestTimeLimit) { TheTest.Printf(_L("=== %S: The time limit reached.\r\n"), &time); ++idx;//The idx-th statement is valid, the statement count is idx + 1. @@ -649,12 +652,13 @@ TEST2(err, KSqlAtRow); err = stmt[idx].Next(); TEST2(err, KSqlAtEnd); + GetHomeTimeAsString(time); + TTimeIntervalSeconds s = ExecutionTimeSeconds(); if((j % 100) == 0) { - GetHomeTimeAsString(time); - TheTest.Printf(_L("=== %S: % 5d statements processed\r\n"), &time, j + 1); + TheTest.Printf(_L("=== %S: % 5d statements processed. %d seconds.\r\n"), &time, j + 1, s.Int()); } - if(IsTimeLimitReached()) + if(s.Int() > KTestTimeLimit) { TheTest.Printf(_L("=== %S: The time limit reached.\r\n"), &time); break; diff -r 63532cdadd44 -r 0d6db0a14001 persistentstorage/sql/TEST/testexecute/SQLite/config/Configuration.ini --- a/persistentstorage/sql/TEST/testexecute/SQLite/config/Configuration.ini Fri Jun 11 15:29:22 2010 +0300 +++ b/persistentstorage/sql/TEST/testexecute/SQLite/config/Configuration.ini Tue Jul 06 16:18:30 2010 +0300 @@ -26,7 +26,7 @@ Function4=ScalarFullSelect Method4=SelectIntL -Result4=1024 +Result4=DEFAULT_SOFT_HEAP_LIMIT Use_Set4=1 Statement4=PRAGMA cache_size; Close5= @@ -214,7 +214,7 @@ Function4=ScalarFullSelect Method4=SelectIntL -Result4=1024 +Result4=DEFAULT_SOFT_HEAP_LIMIT Use_Set4=1 Statement4=PRAGMA cache_size; @@ -257,7 +257,7 @@ Function5=ScalarFullSelect Method5=SelectIntL -Result5=1024 +Result5=DEFAULT_SOFT_HEAP_LIMIT Use_Set5=1 Statement5=PRAGMA cache_size; diff -r 63532cdadd44 -r 0d6db0a14001 persistentstorage/sql/TEST/testexecute/SQLite/config/Robustness.ini.DEVBOARD --- a/persistentstorage/sql/TEST/testexecute/SQLite/config/Robustness.ini.DEVBOARD Fri Jun 11 15:29:22 2010 +0300 +++ b/persistentstorage/sql/TEST/testexecute/SQLite/config/Robustness.ini.DEVBOARD Tue Jul 06 16:18:30 2010 +0300 @@ -19,7 +19,7 @@ NewBlock5=FillDisk150K NewBlock6=FillDisk100K -Exec7=Begin Transaction; +NoOperation7= // Fill the disk until an out of disk error occurs. Then close the // database because once it's reported a disk full error all bets are off.. NewBlock8=FillDisk1 @@ -33,12 +33,12 @@ // still be usable. Open11=E:\Robustness0.db -// Check the original block is still ok... -NewBlock12=CheckBlock10-1 - // Delete the data that we used to fill the disk. This is easy, our 'AddBlock' // data has 'Someint' values that are negative, the filldisk data is positive. -Exec13=Delete From Sometable where Someint >= 0; +Exec12=Delete From Sometable where Someint >= 0; + +// Check the original block is still ok... +NewBlock13=CheckBlock10-1 NewBlock14=AddBlock10-2 NewBlock15=CheckBlock10-2 diff -r 63532cdadd44 -r 0d6db0a14001 persistentstorage/sql/TEST/testexecute/SQLite/config/Robustness.ini.EMULATOR --- a/persistentstorage/sql/TEST/testexecute/SQLite/config/Robustness.ini.EMULATOR Fri Jun 11 15:29:22 2010 +0300 +++ b/persistentstorage/sql/TEST/testexecute/SQLite/config/Robustness.ini.EMULATOR Tue Jul 06 16:18:30 2010 +0300 @@ -19,7 +19,7 @@ NewBlock5=FillDisk150K NewBlock6=FillDisk100K -Exec7=Begin Transaction; +NoOperation7= // Fill the disk until an out of disk error occurs. Then close the // database because once it's reported a disk full error all bets are off.. NewBlock8=FillDisk1 @@ -33,12 +33,12 @@ // still be usable. Open11=T:\Robustness0.db -// Check the original block is still ok... -NewBlock12=CheckBlock10-1 - // Delete the data that we used to fill the disk. This is easy, our 'AddBlock' // data has 'Someint' values that are negative, the filldisk data is positive. -Exec13=Delete From Sometable where Someint >= 0; +Exec12=Delete From Sometable where Someint >= 0; + +// Check the original block is still ok... +NewBlock13=CheckBlock10-1 NewBlock14=AddBlock10-2 NewBlock15=CheckBlock10-2 diff -r 63532cdadd44 -r 0d6db0a14001 persistentstorage/sql/TEST/testexecute/SQLite/src/cdtest.cpp --- a/persistentstorage/sql/TEST/testexecute/SQLite/src/cdtest.cpp Fri Jun 11 15:29:22 2010 +0300 +++ b/persistentstorage/sql/TEST/testexecute/SQLite/src/cdtest.cpp Tue Jul 06 16:18:30 2010 +0300 @@ -18,6 +18,13 @@ #include "common.h" #include +//Constants taken from SqlSrvConfig.h +#ifdef __WINSCW__ + const TInt KDefaultSoftHeapLimitKb = 1024; +#else + const TInt KDefaultSoftHeapLimitKb = 8192; +#endif + // Includes any code required for 'Code-Driven' testing, generally tests // that cannot be data-driven (or not completely). @@ -476,8 +483,17 @@ actual = asfs->SelectIntL(stmt8); else actual = asfs->SelectIntL(stmt); + TInt expected; - conv.Val(expected); + if (res.CompareF(_L("DEFAULT_SOFT_HEAP_LIMIT")) == 0) + { + expected = KDefaultSoftHeapLimitKb; + } + else + { + conv.Val(expected); + } + if( actual != expected ) { SetTestStepResult(EFail); diff -r 63532cdadd44 -r 0d6db0a14001 persistentstorage/store/INC/S32FILE.INL --- a/persistentstorage/store/INC/S32FILE.INL Fri Jun 11 15:29:22 2010 +0300 +++ b/persistentstorage/store/INC/S32FILE.INL Tue Jul 06 16:18:30 2010 +0300 @@ -290,14 +290,14 @@ @param aFs Handle to a file server session. @param aName The full path name of the file containing the store. @param aFileMode The mode in which the file is to be accessed. The mode is -defined by the TFileMode type. It is strongly recommended to set EFileWriteDirectIO -bit. It is because that When the file cache in file server is on, the -order of file writing is not guaranteed which could cause data inconsistency in some -circumstances, for example, when the power is lost in the middle of data transaction. -Therefore, the file write cache should be switched off to maintain the file integrity. +defined by the TFileMode type. @return A pointer to the new permanent file store object. @see TFileMode */ - {return STATIC_CAST(CPermanentFileStore*,CFileStore::OpenL(aFs,aName,aFileMode,KPermanentFileStoreFactoryFunction));} + { +// When the file server write caching is enabled, the order of file write operations is not guaranteed. This could cause data inconsistency in some circumstances, +// for example, when the power is lost in the middle of a database transaction. Therefore, the file write caching is disabled for this file to maintain integrity. + return STATIC_CAST(CPermanentFileStore*,CFileStore::OpenL(aFs,aName,aFileMode|EFileWriteDirectIO,KPermanentFileStoreFactoryFunction)); + } inline CPermanentFileStore* CPermanentFileStore::OpenLC(RFs& aFs,const TDesC& aName,TUint aFileMode) /** Opens a file containing a permanent file store, constructs a permanent file store object, and places the pointer onto the cleanup stack. @@ -305,14 +305,14 @@ @param aFs Handle to a file server session. @param aName The full path name of the file containing the store. @param aFileMode The mode in which the file is to be accessed. The mode is -defined by the TFileMode type. It is strongly recommended to set EFileWriteDirectIO -bit. It is because that When the file cache in file server is on, the -order of file writing is not guaranteed which could cause data inconsistency in some -circumstances, for example, when the power is lost in the middle of data transaction. -Therefore, the file write cache should be switched off to maintain the file integrity. +defined by the TFileMode type. @return A pointer to the new permanent file store object. @see TFileMode */ - {return STATIC_CAST(CPermanentFileStore*,CFileStore::OpenLC(aFs,aName,aFileMode,KPermanentFileStoreFactoryFunction));} + { +// When the file server write caching is enabled, the order of file write operations is not guaranteed. This could cause data inconsistency in some circumstances, +// for example, when the power is lost in the middle of a database transaction. Therefore, the file write caching is disabled for this file to maintain integrity. + return STATIC_CAST(CPermanentFileStore*,CFileStore::OpenLC(aFs,aName,aFileMode|EFileWriteDirectIO,KPermanentFileStoreFactoryFunction)); + } inline CPermanentFileStore* CPermanentFileStore::CreateL(RFs& aFs,const TDesC& aName,TUint aFileMode) /** Creates a new file and constructs a new permanent file store object to be associated with this file. @@ -321,14 +321,14 @@ @param aName The full path name of the new file. A file with this name must not already exist, otherwise the function leaves. @param aFileMode The mode in which the new file is to be accessed. This mode -is defined by the TFileMode type. It is strongly recommended to set EFileWriteDirectIO -bit. It is because that When the file cache in file server is on, the -order of file writing is not guaranteed which could cause data inconsistency in some -circumstances, for example, when the power is lost in the middle of data transaction. -Therefore, the file write cache should be switched off to maintain the file integrity. +is defined by the TFileMode type. @return A pointer to the new permanent file store object. @see TFileMode */ - {return STATIC_CAST(CPermanentFileStore*,CFileStore::CreateL(aFs,aName,aFileMode,&DoNewL));} + { +// When the file server write caching is enabled, the order of file write operations is not guaranteed. This could cause data inconsistency in some circumstances, +// for example, when the power is lost in the middle of a database transaction. Therefore, the file write caching is disabled for this file to maintain integrity. + return STATIC_CAST(CPermanentFileStore*,CFileStore::CreateL(aFs,aName,aFileMode|EFileWriteDirectIO,&DoNewL)); + } inline CPermanentFileStore* CPermanentFileStore::CreateLC(RFs& aFs,const TDesC& aName,TUint aFileMode) /** Creates a new file and constructs a new permanent file store object to be associated with this file, and places the pointer onto the cleanup stack. @@ -337,14 +337,14 @@ @param aName The full path name of the new file. A file with this name must not already exist, otherwise the function leaves. @param aFileMode The mode in which the new file is to be accessed. This mode -is defined by the TFileMode type. It is strongly recommended to set EFileWriteDirectIO -bit. It is because that when the file cache in file server is on, the -order of file writing is not guaranteed which could cause data inconsistency in some -circumstances, for example, when the power is lost in the middle of data transaction. -Therefore, the file write cache should be switched off to maintain the file integrity. +is defined by the TFileMode type. @return A pointer to the new permanent file store object. @see TFileMode */ - {return STATIC_CAST(CPermanentFileStore*,CFileStore::CreateLC(aFs,aName,aFileMode,&DoNewL));} + { +// When the file server write caching is enabled, the order of file write operations is not guaranteed. This could cause data inconsistency in some circumstances, +// for example, when the power is lost in the middle of a database transaction. Therefore, the file write caching is disabled for this file to maintain integrity. + return STATIC_CAST(CPermanentFileStore*,CFileStore::CreateLC(aFs,aName,aFileMode|EFileWriteDirectIO,&DoNewL)); + } inline CPermanentFileStore* CPermanentFileStore::ReplaceL(RFs& aFs,const TDesC& aName,TUint aFileMode) /** Creates a file, constructs a permanent file store object to be associated with it. @@ -354,14 +354,14 @@ @param aFs Handle to a file server session. @param aName The full path name of the file to be replaced. @param aFileMode The mode in which the file is to be accessed. The mode is -defined by the TFileMode type. It is strongly recommended to set EFileWriteDirectIO -bit. It is because that when the file cache in file server is on, the -order of file writing is not guaranteed which could cause data inconsistency in some -circumstances, for example, when the power is lost in the middle of data transaction. -Therefore, the file write cache should be switched off to maintain the file integrity. +defined by the TFileMode type. @return A pointer to the new permanent file store object. @see TFileMode */ - {return STATIC_CAST(CPermanentFileStore*,CFileStore::ReplaceL(aFs,aName,aFileMode,&DoNewL));} + { +// When the file server write caching is enabled, the order of file write operations is not guaranteed. This could cause data inconsistency in some circumstances, +// for example, when the power is lost in the middle of a database transaction. Therefore, the file write caching is disabled for this file to maintain integrity. + return STATIC_CAST(CPermanentFileStore*,CFileStore::ReplaceL(aFs,aName,aFileMode|EFileWriteDirectIO,&DoNewL)); + } inline CPermanentFileStore* CPermanentFileStore::ReplaceLC(RFs& aFs,const TDesC& aName,TUint aFileMode) /** Creates a file, constructs a permanent file store object to be associated with it, and places the pointer onto the cleanup stack. @@ -371,14 +371,14 @@ @param aFs Handle to a file server session. @param aName The full path name of the file to be replaced. @param aFileMode The mode in which the file is to be accessed. The mode is -defined by the TFileMode type. It is strongly recommended to set EFileWriteDirectIO -bit. It is because that when the file cache in file server is on, the -order of file writing is not guaranteed which could cause data inconsistency in some -circumstances, for example, when the power is lost in the middle of data transaction. -Therefore, the file write cache should be switched off to maintain the file integrity. +defined by the TFileMode type. @return A pointer to the new permanent file store object. @see TFileMode */ - {return STATIC_CAST(CPermanentFileStore*,CFileStore::ReplaceLC(aFs,aName,aFileMode,&DoNewL));} + { +// When the file server write caching is enabled, the order of file write operations is not guaranteed. This could cause data inconsistency in some circumstances, +// for example, when the power is lost in the middle of a database transaction. Therefore, the file write caching is disabled for this file to maintain integrity. + return STATIC_CAST(CPermanentFileStore*,CFileStore::ReplaceLC(aFs,aName,aFileMode|EFileWriteDirectIO,&DoNewL)); + } inline CPermanentFileStore* CPermanentFileStore::TempL(RFs& aFs,const TDesC& aPath,TFileName& aName,TUint aFileMode) /** Creates a temporary file and constructs a permanent file store object to be associated with it. @@ -396,7 +396,11 @@ defined by the TFileMode type. @return A pointer to the new permanent file store object. @see TFileMode */ - {return STATIC_CAST(CPermanentFileStore*,CFileStore::TempL(aFs,aPath,aName,aFileMode,&DoNewL));} + { +// When the file server write caching is enabled, the order of file write operations is not guaranteed. This could cause data inconsistency in some circumstances, +// for example, when the power is lost in the middle of a database transaction. Therefore, the file write caching is disabled for this file to maintain integrity. + return STATIC_CAST(CPermanentFileStore*,CFileStore::TempL(aFs,aPath,aName,aFileMode|EFileWriteDirectIO,&DoNewL)); + } inline CPermanentFileStore* CPermanentFileStore::TempLC(RFs& aFs,const TDesC& aPath,TFileName& aName,TUint aFileMode) /** Creates a temporary file, constructs a permanent file store object to be associated with it, and places the pointer onto the cleanup stack. @@ -411,20 +415,22 @@ @param aPath The path where the new file is to be created. @param aName On return, contains the full path name of the new file. @param aFileMode The mode in which the file is to be accessed. The mode is -defined by the TFileMode type. It is strongly recommended to set EFileWriteDirectIO -bit. It is because that When the file cache in file server is on, the -order of file writing is not guaranteed which could cause data inconsistency in some -circumstances, for example, when the power is lost in the middle of data transaction. -Therefore, the file write cache should be switched off to maintain the file integrity. +defined by the TFileMode type. @return A pointer to the new permanent file store object. @see TFileMode */ - {return STATIC_CAST(CPermanentFileStore*,CFileStore::TempLC(aFs,aPath,aName,aFileMode,&DoNewL));} + { +// When the file server write caching is enabled, the order of file write operations is not guaranteed. This could cause data inconsistency in some circumstances, +// for example, when the power is lost in the middle of a database transaction. Therefore, the file write caching is disabled for this file to maintain integrity. + return STATIC_CAST(CPermanentFileStore*,CFileStore::TempLC(aFs,aPath,aName,aFileMode|EFileWriteDirectIO,&DoNewL)); + } inline CPermanentFileStore* CPermanentFileStore::FromL(RFile& aFile) /** Constructs a permanent file store object from an already opened file. It is strongly recommended to set EFileWriteDirectIO -bit when opening the file. It is because that when the file cache in file server is on, the -order of file writing is not guaranteed which could cause data inconsistency in some -circumstances, for example, when the power is lost in the middle of data transaction. -Therefore, the file write cache should be switched off to maintain the file integrity. +bit when opening the file. This is because that when the file server write caching is enabled, the +order of file write operations is not guaranteed. This could cause data inconsistency in some +circumstances, for example, when the power is lost in the middle of database transaction. +Therefore, the file write caching should be switched off to maintain integrity. + + The file must already be open before calling this function. @@ -440,10 +446,10 @@ the pointer onto the cleanup stack. The file must already be open before calling this function. It is strongly recommended to set EFileWriteDirectIO -bit when opening the file. It is because that when the file cache in file server is on, the -order of file writing is not guaranteed which could cause data inconsistency in some -circumstances, for example, when the power is lost in the middle of data transaction. -Therefore, the file write cache should be switched off to maintain the file integrity. +bit when opening the file. This is because that when the file server write caching is enabled, the +order of file write operations is not guaranteed. This could cause data inconsistency in some +circumstances, for example, when the power is lost in the middle of database transaction. +Therefore, the file write caching should be switched off to maintain integrity. Note that ownership of the file passes to the store. The referenced RFile is cleared and is no longer valid. @@ -456,10 +462,10 @@ The file must already be open before calling this function. The existing content of the file is discarded. It is strongly recommended to set EFileWriteDirectIO -bit when opening the file. It is because that when the file cache in file server is on, the +bit when opening the file. It is because that when the file write caching in file server is on, the order of file writing is not guaranteed which could cause data inconsistency in some circumstances, for example, when the power is lost in the middle of data transaction. -Therefore, the file write cache should be switched off to maintain the file integrity. +Therefore, the file write caching should be switched off to maintain the file integrity. Note that ownership of the file passes to the store. The referenced RFile is cleared and is no longer valid. @@ -473,10 +479,10 @@ The file must already be open before calling this function.The existing content of the file is discarded. It is strongly recommended to set EFileWriteDirectIO -bit when opening the file. It is because that when the file cache in file server is on, the +bit when opening the file. It is because that when the write caching in file server is on, the order of file writing is not guaranteed which could cause data inconsistency in some circumstances, for example, when the power is lost in the middle of data transaction. -Therefore, the file write cache should be switched off to maintain the file integrity. +Therefore, the file write caching should be switched off to maintain the file integrity. Note that ownership of the file passes to the store. The referenced RFile is cleared and is no longer valid. diff -r 63532cdadd44 -r 0d6db0a14001 persistentstorage/store/UFILE/UF_DICT.CPP --- a/persistentstorage/store/UFILE/UF_DICT.CPP Fri Jun 11 15:29:22 2010 +0300 +++ b/persistentstorage/store/UFILE/UF_DICT.CPP Tue Jul 06 16:18:30 2010 +0300 @@ -154,7 +154,11 @@ for (TInt wait=KLockoutLimit;;) { RFile file; - TInt r=file.Open(aFs,aName,EFileShareExclusive|EFileWrite); + // When the file server write caching is enabled, the order of file write operations is not guaranteed. + // This could cause data inconsistency in some circumstances,for example, when the power is lost in the + // middle of a database transaction.Therefore, the file write caching is disabled for this file to maintain integrity. + + TInt r=file.Open(aFs,aName,EFileShareExclusive|EFileWrite|EFileWriteDirectIO); switch (r) { case KErrNone: @@ -175,8 +179,12 @@ } if (r==KErrCorrupt) { - // silently replace the entire file if it is corrupt - r=file.Replace(aFs,aName,EFileShareExclusive|EFileWrite); + // silently replace the entire file if it is corrupt + // When the file server write caching is enabled, the order of file write operations is not guaranteed. + // This could cause data inconsistency in some circumstances,for example, when the power is lost in the + // middle of a database transaction.Therefore, the file write caching is disabled for this file to maintain integrity. + // + r=file.Replace(aFs,aName,EFileShareExclusive|EFileWrite|EFileWriteDirectIO); if (r==KErrInUse) break; // try again later... if (r==KErrNone) @@ -197,7 +205,10 @@ return; } case KErrNotFound: - r=file.Create(aFs,aName,EFileShareExclusive|EFileWrite); + // When the file server write caching is enabled, the order of file write operations is not guaranteed. + // This could cause data inconsistency in some circumstances,for example, when the power is lost in the + // middle of a database transaction.Therefore, the file write caching is disabled for this file to maintain integrity. + r=file.Create(aFs,aName,EFileShareExclusive|EFileWrite|EFileWriteDirectIO); if (r==KErrNone) { CreateStoreL(file,type); diff -r 63532cdadd44 -r 0d6db0a14001 persistentstorage/store/USTOR/UT_COLL.CPP --- a/persistentstorage/store/USTOR/UT_COLL.CPP Fri Jun 11 15:29:22 2010 +0300 +++ b/persistentstorage/store/USTOR/UT_COLL.CPP Tue Jul 06 16:18:30 2010 +0300 @@ -904,34 +904,44 @@ return ::ExtentL(Host(),iMark,Coord().Base(),aStream); } -void CPermanentStoreCollector::RelocateStreamL(const CPermanentStoreCollector::TEntry& aReloc, TInt aExtent) /* relocate a stream into [iFree, aExtent) -During compaction the sequence of operations is: +During compaction, for each string which is to be moved from position A1 to B1, the sequence of operations is: 1. Copy stream S1 content from position A1 to position B1 . The copy never overlaps so the old stream content is still good at this point. 2. Optionally rewrite the file header to state that stream S1 is being relocated to B1 (more about the �optional below�) 3. Overwrite the TOC entry for S1 to state that the content is now at B1 -4. Carry on with stream S2 -5. � etc +This function completes 3 steps above and will be called again and again for every string to be moved. -First consider the impact of a mid-write failure in any of these steps (when write caching is disabled): +In terms of data consistency, first consider the impact of a mid-write failure in any of these steps (when write caching is disabled): 1. If step #1 only partially completes the file is good as the original content is intact and the new content was being written to otherwise free space -2. If step #2 only partially completes the header CRC fails and only the TOC reference is considered valid (so the corrupt stream relocation record is ignored). The TOC will be good because it is being overwritten with the same content. -3. If step #3 only partially completes the entry for S1 in the TOC is corrupt, BUT the relocation record for S1 in the file header is good and will override the entry in the TOC. +2. If step #2 only partially completes the header CRC fails and only the TOC reference is considered valid (so the corrupt stream relocation record is ignored). + The TOC will be good because it is being overwritten with the same content. +3. If step #3 only partially completes the entry for S1 in the TOC is corrupt, BUT the relocation record for S1 in the file header is good and will + override the entry in the TOC. In all cases the file is never broken by a crash in mid-compaction. -Step #2 is optional � there are many cases when step #3 cannot fail �halfway through� because the underlying media makes atomic block/page based updates and the write does not cross any block boundaries. In STORE we assume that blocks cannot be smaller than 512 bytes and any flash based media provides the required behavior. Thus 99% of the step #2 writes are eliminated. +Step #2 is optional � there are many cases when step #3 cannot fail �halfway through� because the underlying media makes atomic block/page based +updates and the write does not cross any block boundaries. In STORE we assume that blocks cannot be smaller than 512 bytes and any flash based +media provides the required behavior. Thus 99% of the step #2 writes are eliminated. -Note that sequencing MATTERS even for just one stream. If the TOC update hits the disk before the content is moved, and then the device fails we will have a broken file: S1 points to B1 which contains garbage. Equally in the case where step #2 is required (i.e. when step #3 straddles a block boundary and could fail) step 2 has to go before the step 3. Otherwise write #3 could go to disk and fail part way through before write #2 and leave the TOC corrupt with no recovery in the file header. +Note that sequencing MATTERS even for just one stream. If the TOC update hits the disk before the content is moved, and then the device fails +we will have a broken file: S1 points to B1 which contains garbage. Equally in the case where step #2 is required (i.e. when step #3 straddles +a block boundary and could fail) step 2 has to go before the step 3. Otherwise write #3 could go to disk and fail part way through before write #2 +and leave the TOC corrupt with no recovery in the file header. -Consider the case that step 2 was omitted, so the Store relies on step 3 being completed in order to know that S1 is in location B1; and that no flush is done after step 3. In step 4 the stream S2 is moved � at this point the old space for stream S1 at A1 is considered empty � and suppose it gets moved from A2 to B2 where B2 overlaps/overwrites A1. If the writes in step 3 and step 4 are re-ordered and the step 3 write does not happen � then the TOC will claim that S1 is still at A1 but this location in the file has been overwritten with data from S2. A corrupted file. +Consider the case that step 2 was omitted, so the Store relies on step 3 being completed in order to know that S1 is in location B1; +and that no flush is done after step 3. In step 4 the stream S2 is moved � at this point the old space for stream S1 at A1 is considered empty +� and suppose it gets moved from A2 to B2 where B2 overlaps/overwrites A1. If the writes in step 3 and step 4 are re-ordered and the step 3 +write does not happen � then the TOC will claim that S1 is still at A1 but this location in the file has been overwritten with data from S2. +A corrupted file. -Based on the knowledge above, it is strongly recommended to set EFileWriteDirectIO bit when opening the file so that the order is maintained when writing to the file. - +Based on the knowledge above, it is strongly recommended to set EFileWriteDirectIO bit when opening the file so that the order is maintained +when writing to the file. */ +void CPermanentStoreCollector::RelocateStreamL(const CPermanentStoreCollector::TEntry& aReloc, TInt aExtent) { if (Coord().Accessed()) // must have exclusive access to relocate the stream __LEAVE(KErrInUse); diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/group/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/traceservices/tracefw/group/bld.inf Tue Jul 06 16:18:30 2010 +0300 @@ -0,0 +1,23 @@ +// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +// All rights reserved. +// This component and the accompanying materials are made available +// under the terms of "Eclipse Public License v1.0" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// TraceFw +// +// + +#include "../ulogger/group/bld.inf" +#include "../utf_trace_api/unit_test/group/bld.inf" +#include "../ost_trace_api/unit_test/group/bld.inf" +#include "../ulogger/unit_test/group/bld.inf" +#include "../integ_test/ulogger/TEF/group/bld.inf" +#include "../integ_test/ost/TEF/group/bld.inf" diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ost/TEF/group/te_ostv2integsuite.iby --- a/traceservices/tracefw/integ_test/ost/TEF/group/te_ostv2integsuite.iby Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ost/TEF/group/te_ostv2integsuite.iby Tue Jul 06 16:18:30 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ost/TEF/perfdevicedriver/src/te_drv.cpp --- a/traceservices/tracefw/integ_test/ost/TEF/perfdevicedriver/src/te_drv.cpp Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ost/TEF/perfdevicedriver/src/te_drv.cpp Tue Jul 06 16:18:30 2010 +0300 @@ -48,7 +48,7 @@ * and loose our state. So we solve this by running the device driver as * as it's own separate thread in the kernel (DLogicalChannelBase runs a user thread in kernel mode, * DLogicalChannel runs a kernel thread called from a user thread). - * We also solve the long timing issue by making an asynchrounous call by using the DoRequest call. + * We also solve the long timing issue by making an asynchrounous call by using the DoRequestL call. * For this to work we need to create a DfcQ, i.e. a queue of all the incoming calls from the user side. * These then get's run in turn. */ @@ -68,7 +68,7 @@ // Inherited from DLogicalChannel virtual TInt DoCreate(TInt aUnit, const TDesC8* anInfo, const TVersion& aVer); //Make an asynchronous call... - virtual TInt DoRequest(TInt aReqNo, TRequestStatus* aStatus, TAny* a1, TAny* a2); + virtual TInt DoRequestL(TInt aReqNo, TRequestStatus* aStatus, TAny* a1, TAny* a2); void TestUptTraces(const TApiRunConfig& aApiRunConfig, TApiRunResults& aApiRunResults); void TimeUptTraces(const TApiRunConfig& aApiRunConfig, TApiRunResults& aApiRunResults); @@ -80,7 +80,7 @@ TDfcQue* iDfcQ; TKernelTimer iTimer; - //This is used to signal when one of the async calls (to DoRequest) is finished. + //This is used to signal when one of the async calls (to DoRequestL) is finished. TRequestStatus iStatus; }; @@ -164,10 +164,10 @@ message.Complete(KErrNone, ETrue); return; } - if(id < 0 ) //it was a call for DoRequest() + if(id < 0 ) //it was a call for DoRequestL() { TRequestStatus* status = (TRequestStatus*)message.Ptr0(); - DoRequest(~id, status, message.Ptr1(), message.Ptr2()); + DoRequestL(~id, status, message.Ptr1(), message.Ptr2()); message.Complete(KErrNone, ETrue); } else //it was a call for DoControl, we dont implement that now so just fall through @@ -178,7 +178,7 @@ } } -TInt DUptUTraceChannel::DoRequest(TInt aReqNo, TRequestStatus* aStatus, TAny* a1, TAny* a2) +TInt DUptUTraceChannel::DoRequestL(TInt aReqNo, TRequestStatus* aStatus, TAny* a1, TAny* a2) { TInt error = KErrNone; @@ -258,11 +258,11 @@ { TTestTimer timer; if(aReqNo == RUptUTrace::ESanityTestTimer) - results.iPass = timer.TestKernelTimer(results.iTime); + results.iPass = timer.TestKernelTimerL(results.iTime); if(aReqNo == RUptUTrace::ESanityTestLongTimer) - results.iPass = timer.TestKernelLongTimer(results.iTime); + results.iPass = timer.TestKernelLongTimerL(results.iTime); if(aReqNo == RUptUTrace::ESanityUtraceTimer) - results.iPass = timer.TestUTraceKernelTimer(results.iTime); + results.iPass = timer.TestUTraceKernelTimerL(results.iTime); } if(!error) error = Kern::ThreadRawWrite(iClient, a1, (TUint8 *)&results, sizeof(TSanityResults)); diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_common/inc/te_ostv2integsuite_defs.h --- a/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_common/inc/te_ostv2integsuite_defs.h Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_common/inc/te_ostv2integsuite_defs.h Tue Jul 06 16:18:30 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -15,11 +15,11 @@ // - /** @file te_uloggerostv2integsuite_defs.h @internalTechnology */ + #if (!defined TE_ULOGGER_MCL_SUITEDEFS_H) #define TE_ULOGGER_MCL_SUITEDEFS_H @@ -31,8 +31,8 @@ public: ~CClearConfig(); CClearConfig(); - void Clear(RULogger& loggerSession); - void Default(RULogger& loggerSession); + void ClearL(RULogger& loggerSession); + void DefaultL(RULogger& loggerSession); //private: }; diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_common/inc/te_tracecontrolcmds.h --- a/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_common/inc/te_tracecontrolcmds.h Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_common/inc/te_tracecontrolcmds.h Tue Jul 06 16:18:30 2010 +0300 @@ -51,7 +51,7 @@ TInt StopAndDeleteFile(RULogger& aLogger); TInt Stop(RULogger& aLogger); TInt DeleteFile(); - void SetFilter(CArrayFixFlat* aFilters); + void SetFilterL(CArrayFixFlat* aFilters); TInt Test(); private: diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_common/src/te_ostv2integsuite_defs.cpp --- a/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_common/src/te_ostv2integsuite_defs.cpp Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_common/src/te_ostv2integsuite_defs.cpp Tue Jul 06 16:18:30 2010 +0300 @@ -36,7 +36,7 @@ /*Constructor*/ } -void CClearConfig::Clear(RULogger& loggerSession) +void CClearConfig::ClearL(RULogger& loggerSession) { loggerSession.Stop();//C.A. previously:loggerSession.StopOutputting(); loggerSession.DeActivateInputPlugin(); @@ -63,9 +63,9 @@ } //NB: currently this method does not set the default values for serial and usb! hanging the server -void CClearConfig::Default(RULogger& loggerSession) +void CClearConfig::DefaultL(RULogger& loggerSession) { - Clear(loggerSession); + ClearL(loggerSession); //Now set default configurations shipped with ulogger CArrayFixFlat *setfilter=new (ELeave)CArrayFixFlat(1);//CA:added so can use old ulogger api setfilter->AppendL(3);//CA:added so can use old ulogger api diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_common/src/te_tracecontrolclearconfig.cpp --- a/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_common/src/te_tracecontrolclearconfig.cpp Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_common/src/te_tracecontrolclearconfig.cpp Tue Jul 06 16:18:30 2010 +0300 @@ -85,7 +85,7 @@ } } CClearConfig configIni; - configIni.Clear(logger); + configIni.ClearL(logger); SetBlockResult(EPass); return ETrue; } diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_common/src/te_tracecontrolcmds.cpp --- a/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_common/src/te_tracecontrolcmds.cpp Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_common/src/te_tracecontrolcmds.cpp Tue Jul 06 16:18:30 2010 +0300 @@ -93,7 +93,7 @@ //clear any configurations stored in the ULogger configuration file CClearConfig configIni; - configIni.Clear(aLogger); + configIni.ClearL(aLogger); //prepare arrays for storing the filter settings to configure ULogger (and push any heap objects on the cleanup stack) CArrayFixFlat *setPrimFilter = new (ELeave)CArrayFixFlat(256); @@ -139,7 +139,7 @@ if(aGroupIdFilterMatch==1) { //if the user specifies that ULogger should have classifiaction filter settings which match the test trace points, then fill the filter arrays with the test trace point identifiers accordingly - SetFilter(setPrimFilter); + SetFilterL(setPrimFilter); } else { @@ -190,7 +190,7 @@ /** This user-side method sets the filter for OSTv2 */ -void CUptULogger::SetFilter(CArrayFixFlat* aSetPrimFilter) +void CUptULogger::SetFilterL(CArrayFixFlat* aSetPrimFilter) { aSetPrimFilter->AppendL(KGroupId); } diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_common/src/te_tracecontroldefaultconfig.cpp --- a/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_common/src/te_tracecontroldefaultconfig.cpp Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_common/src/te_tracecontroldefaultconfig.cpp Tue Jul 06 16:18:30 2010 +0300 @@ -84,7 +84,7 @@ } } CClearConfig configIni; - configIni.Default(logger); + configIni.DefaultL(logger); SetBlockResult(EPass); return ETrue; } diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_functional/inc/te_advancedfiltering.h --- a/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_functional/inc/te_advancedfiltering.h Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_functional/inc/te_advancedfiltering.h Tue Jul 06 16:18:30 2010 +0300 @@ -45,7 +45,7 @@ TBool DoCommandL( const TTEFFunction& aCommand, const TTEFSectionName& aSection, const TInt aAsyncErrorIndex); - TVerdict TestGroupIdFiltering(RULogger& aLogger, const TBool aFilter, const TBool aFiltering); + TVerdict TestGroupIdFilteringL(RULogger& aLogger, const TBool aFilter, const TBool aFiltering); private: CTCMAdvancedGroupIDFilteringWrapper(); @@ -62,7 +62,7 @@ TBool DoCommandL( const TTEFFunction& aCommand, const TTEFSectionName& aSection, const TInt aAsyncErrorIndex); - TVerdict TestComponentIdFiltering(RULogger& aLogger, const TBool aFilter, const TBool aFiltering); + TVerdict TestComponentIdFilteringL(RULogger& aLogger, const TBool aFilter, const TBool aFiltering); // Please add/modify your class members here: private: diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_functional/src/te_advancedfiltering.cpp --- a/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_functional/src/te_advancedfiltering.cpp Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_functional/src/te_advancedfiltering.cpp Tue Jul 06 16:18:30 2010 +0300 @@ -108,7 +108,7 @@ } } CClearConfig configIni; - configIni.Clear(logger); + configIni.ClearL(logger); INFO_PRINTF2(_L("connect err %d"), result); INFO_PRINTF1(_L("Test setting a single primary filter with the filter, rather than an array")); @@ -187,7 +187,7 @@ INFO_PRINTF1(_L(" Testing GroupId filtering enabled/ disabled ")); //reset config file - configIni.Clear(logger); + configIni.ClearL(logger); /***********************************************************/ @@ -195,7 +195,7 @@ /***********************************************************/ INFO_PRINTF1(_L("\n\n Enable test GroupId, enable GroupId filtering.\n Testing error returns and ensuring a trace statement IS carried out ")); - SetBlockResult(TestGroupIdFiltering(logger, ETrue, ETrue)); + SetBlockResult(TestGroupIdFilteringL(logger, ETrue, ETrue)); /***********************************************************/ /***enable GroupId, disable GroupId filtering*/ @@ -204,7 +204,7 @@ if(BlockResult()==EPass) { INFO_PRINTF1(_L("\n\n Enable test GroupId, disable GroupId filtering.\n Testing error returns and ensuring a trace statement IS carried out + lots of kernel traces ")); - SetBlockResult(TestGroupIdFiltering(logger, ETrue, EFalse)); + SetBlockResult(TestGroupIdFilteringL(logger, ETrue, EFalse)); } /***********************************************************/ @@ -214,7 +214,7 @@ if(BlockResult()==EPass) { INFO_PRINTF1(_L("\n\n Disable test GroupId, disable GroupId filtering.\n Testing error returns and ensuring a trace statement IS carried out + lots of kernel traces")); - SetBlockResult(TestGroupIdFiltering(logger, EFalse, EFalse)); + SetBlockResult(TestGroupIdFilteringL(logger, EFalse, EFalse)); } /***********************************************************/ @@ -224,7 +224,7 @@ if(BlockResult()==EPass) { INFO_PRINTF1(_L("\n\n Disable test GroupId, enable GroupId filtering.\n Testing error returns and ensuring a trace statement IS NOT carried out ")); - SetBlockResult(TestGroupIdFiltering(logger, EFalse, ETrue)); + SetBlockResult(TestGroupIdFilteringL(logger, EFalse, ETrue)); } } @@ -249,7 +249,7 @@ // ************** Block end **************** - configIni.Clear(logger); + configIni.ClearL(logger); logger.Close(); CleanupStack::Pop(3); if(getfilter) @@ -263,7 +263,7 @@ } -TVerdict CTCMAdvancedGroupIDFilteringWrapper::TestGroupIdFiltering(RULogger& aLogger, const TBool aFilter, const TBool aFiltering) +TVerdict CTCMAdvancedGroupIDFilteringWrapper::TestGroupIdFilteringL(RULogger& aLogger, const TBool aFilter, const TBool aFiltering) /** * @return - TVerdict code * standard function to test error returns and GroupId filtering @@ -497,7 +497,7 @@ } } CClearConfig configIni; - configIni.Clear(logger); + configIni.ClearL(logger); result = logger.SetSecondaryFiltersEnabled(setfilterarray,ETrue);//CA previously:Result = logger.EnableModuleUid(setfilter); INFO_PRINTF2(_L("Setting single Secondary filter with filter rather than array has been set with single filter, %d, check log"), setfilter); INFO_PRINTF2(_L("code: %d"), result); @@ -558,7 +558,7 @@ INFO_PRINTF1(_L(" Testing ComponentId filtering enabled/ disabled ")); //reset config file - configIni.Clear(logger); + configIni.ClearL(logger); /***********************************************************/ @@ -566,7 +566,7 @@ /***********************************************************/ INFO_PRINTF1(_L("\n\n Enable test ComponentID, enable ComponentID filtering.\n Testing error returns and ensuring a trace statement IS carried out ")); - SetBlockResult(TestComponentIdFiltering(logger, ETrue, ETrue)); + SetBlockResult(TestComponentIdFilteringL(logger, ETrue, ETrue)); /***********************************************************/ /***enable ComponentId, disable ComponentId filtering*/ @@ -575,7 +575,7 @@ if(BlockResult()==EPass) { INFO_PRINTF1(_L("\n\n Enable test ComponentId, disable ComponentId filtering.\n Testing error returns and ensuring a trace statement IS carried out ")); - SetBlockResult(TestComponentIdFiltering(logger, ETrue, EFalse)); + SetBlockResult(TestComponentIdFilteringL(logger, ETrue, EFalse)); } /***********************************************************/ @@ -585,7 +585,7 @@ if(BlockResult()==EPass) { INFO_PRINTF1(_L("\n\n Disable test ComponentId, disable ComponentId filtering.\n Testing error returns and ensuring a trace statement IS carried out ")); - SetBlockResult(TestComponentIdFiltering(logger, EFalse, EFalse)); + SetBlockResult(TestComponentIdFilteringL(logger, EFalse, EFalse)); } /***********************************************************/ @@ -595,7 +595,7 @@ if(BlockResult()==EPass) { INFO_PRINTF1(_L("\n\n Disable test ComponentId, enable ComponentId filtering.\n Testing error returns and ensuring a trace statement IS NOT carried out ")); - SetBlockResult(TestComponentIdFiltering(logger, EFalse, ETrue)); + SetBlockResult(TestComponentIdFilteringL(logger, EFalse, ETrue)); } } @@ -621,7 +621,7 @@ // ************** Block end **************** - configIni.Clear(logger); + configIni.ClearL(logger); logger.Close(); } return ETrue; @@ -629,7 +629,7 @@ -TVerdict CTCMAdvancedComponentIDFilteringWrapper::TestComponentIdFiltering(RULogger& aLogger, const TBool aFilter, const TBool aFiltering) +TVerdict CTCMAdvancedComponentIDFilteringWrapper::TestComponentIdFilteringL(RULogger& aLogger, const TBool aFilter, const TBool aFiltering) /** * @return - TVerdict code * standard function to test error returns and ComponentId filtering diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_functional/src/te_buffermode.cpp --- a/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_functional/src/te_buffermode.cpp Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_functional/src/te_buffermode.cpp Tue Jul 06 16:18:30 2010 +0300 @@ -157,7 +157,7 @@ } } CClearConfig configIni; - configIni.Clear(logger); + configIni.ClearL(logger); logger.SetSecondaryFilteringEnabled(EFalse);//C.A. previously:logger.DisableModuleUidFiltering(); // C.A. previously: /* TBufferMode bufferCircular = ECircular; diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_functional/src/te_buffersizing.cpp --- a/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_functional/src/te_buffersizing.cpp Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_functional/src/te_buffersizing.cpp Tue Jul 06 16:18:30 2010 +0300 @@ -136,7 +136,7 @@ } } CClearConfig configIni; - configIni.Clear(logger); + configIni.ClearL(logger); logger.SetSecondaryFilteringEnabled(EFalse);//C.A. previously:logger.DisableModuleUidFiltering(); CArrayFixFlat *setprimfilter = new (ELeave)CArrayFixFlat(1); setprimfilter->AppendL(KGroupId); diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_functional/src/te_configfile.cpp --- a/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_functional/src/te_configfile.cpp Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_functional/src/te_configfile.cpp Tue Jul 06 16:18:30 2010 +0300 @@ -229,7 +229,7 @@ Result=logger.Connect(); INFO_PRINTF2(_L("connect err %d"), Result); CClearConfig configIni; - configIni.Default(logger); + configIni.DefaultL(logger); /**************First get primary filter*************/ diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_functional/src/te_filepluginerr.cpp --- a/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_functional/src/te_filepluginerr.cpp Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_functional/src/te_filepluginerr.cpp Tue Jul 06 16:18:30 2010 +0300 @@ -87,7 +87,7 @@ } } CClearConfig configIni; - configIni.Clear(logger); + configIni.ClearL(logger); _LIT8(KTextmedia,"te_fileplugin"); const TPtrC8 mediaptr(KTextmedia); INFO_PRINTF1(_L("Setting test plugin as active...")); diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_functional/src/te_ostv2tracetestwrapper.cpp --- a/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_functional/src/te_ostv2tracetestwrapper.cpp Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_functional/src/te_ostv2tracetestwrapper.cpp Tue Jul 06 16:18:30 2010 +0300 @@ -150,7 +150,7 @@ User::LeaveIfError(OpenUlogger(logger)); // clear the config file CClearConfig configIni; - configIni.Clear(logger); + configIni.ClearL(logger); // extract the user ids from the values generated by tracecompiler const TUint8 USER_DEFINED_GID_1 = TEST_OSTTRACEWRAPPER7 >> 16; @@ -277,7 +277,7 @@ User::LeaveIfError(OpenUlogger(logger)); // clear the config file CClearConfig configIni; - configIni.Clear(logger); + configIni.ClearL(logger); // extract the user ids from the values generated by tracecompiler const TUint8 USER_DEFINED_GID_1w = TEST_OSTTRACEWRAPPER7w >> 16; @@ -404,7 +404,7 @@ User::LeaveIfError(OpenUlogger(logger)); // clear the config file CClearConfig configIni; - configIni.Clear(logger); + configIni.ClearL(logger); // switch on primary filtering mechanism CArrayFixFlat *setprimfilter = diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_functional/src/te_tracecollectorclient.cpp --- a/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_functional/src/te_tracecollectorclient.cpp Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_functional/src/te_tracecollectorclient.cpp Tue Jul 06 16:18:30 2010 +0300 @@ -103,7 +103,7 @@ } } CClearConfig configIni; - configIni.Clear(logger); + configIni.ClearL(logger); INFO_PRINTF2(_L("connect err %d"), result); result=logger.SetPrimaryFiltersEnabled(*setfilter,ETrue);//C.A. previously:result=logger.EnableClassifications(*setfilter); @@ -320,7 +320,7 @@ // ************** Block end **************** - configIni.Clear(logger); + configIni.ClearL(logger); logger.Close(); if(setfilter) delete setfilter; @@ -414,7 +414,7 @@ } CClearConfig configIni; - configIni.Clear(logger); + configIni.ClearL(logger); result = logger.SetSecondaryFiltersEnabled(setfilter,ETrue);//C.A. previously:result = logger.EnableModuleUids(setfilter); INFO_PRINTF2(_L("Secondary filter has been set with single filter, %d, check log"), setfilter[0]); INFO_PRINTF2(_L("code: %d"), result); @@ -600,7 +600,7 @@ } } INFO_PRINTF1(_L("Now call clear config to check removing multiple second filters performance")); - configIni.Clear(logger); + configIni.ClearL(logger); INFO_PRINTF1(_L("after clear config- multiple second filters performance")); if(result==1) @@ -694,7 +694,7 @@ #endif #ifndef SysStartTest CClearConfig configIni; - configIni.Clear(logger); + configIni.ClearL(logger); #endif CArrayFixFlat *setprimfilter = new (ELeave)CArrayFixFlat(22); setprimfilter->AppendL(KGroupId); @@ -993,7 +993,7 @@ { INFO_PRINTF1(_L("Now do some multiple type logging testing.")); //CClearConfig configIni; - //configIni.Clear(logger); + //configIni.ClearL(logger); if(result==0) { @@ -1205,7 +1205,7 @@ multsetprimfilter=NULL; } } - configIni.Clear(logger); + configIni.ClearL(logger); } else INFO_PRINTF1(_L("adding file as output plugin failed")); @@ -1310,7 +1310,7 @@ } } CClearConfig configIni; - configIni.Clear(logger); + configIni.ClearL(logger); CArrayFixFlat *setprimfilter = new (ELeave)CArrayFixFlat(1); setprimfilter->AppendL(KGroupId); RArray setsecondfilter; @@ -1580,7 +1580,7 @@ else SetBlockResult(EFail); INFO_PRINTF1(_L("Multiple logging to file with kernel side tracing has been tested - check output log. It should contain four lines of tracing of type, (sec,prim), (sec+2, prim), (sec, prim+2), (sec+2, prim+2)")); - configIni.Clear(logger); + configIni.ClearL(logger); } if(setprimfilter) { @@ -1668,7 +1668,7 @@ } } CClearConfig configIni; - configIni.Clear(logger); + configIni.ClearL(logger); CArrayFixFlat *setprimfilter = new (ELeave)CArrayFixFlat(1); setprimfilter->AppendL(KGroupId); RArray setsecondfilter; @@ -1885,7 +1885,7 @@ } } - configIni.Clear(logger); + configIni.ClearL(logger); CArrayFixFlat *setprimfilter = new (ELeave)CArrayFixFlat(1); setprimfilter->AppendL(KGroupId); RArray setsecondfilter; @@ -1977,7 +1977,7 @@ SetBlockResult(EFail); INFO_PRINTF1(_L("Simple printf logging to file has been tested with kernel side tracing- check output log")); - configIni.Clear(logger); + configIni.ClearL(logger); if(setprimfilter) { diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_functional/src/te_tracecollectorfile.cpp --- a/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_functional/src/te_tracecollectorfile.cpp Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_functional/src/te_tracecollectorfile.cpp Tue Jul 06 16:18:30 2010 +0300 @@ -92,7 +92,7 @@ } CClearConfig configIni; - configIni.Clear(logger); + configIni.ClearL(logger); _LIT8(KTextmedia,"uloggerfileplugin"); const TPtrC8 mediaptr(KTextmedia); if(result==0||result==-11) diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_functional/src/te_tracecollectorserial.cpp --- a/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_functional/src/te_tracecollectorserial.cpp Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_functional/src/te_tracecollectorserial.cpp Tue Jul 06 16:18:30 2010 +0300 @@ -91,7 +91,7 @@ } } CClearConfig configIni; - configIni.Clear(logger); + configIni.ClearL(logger); CArrayFixFlat *setprimfilter = new (ELeave)CArrayFixFlat(1); setprimfilter->AppendL(KGroupId); RArray setsecondfilter; diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_functional/testdata/scripts/te_integ_tracecollectorclient.script --- a/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_functional/testdata/scripts/te_integ_tracecollectorclient.script Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_functional/testdata/scripts/te_integ_tracecollectorclient.script Tue Jul 06 16:18:30 2010 +0300 @@ -13,7 +13,7 @@ // Description: // -//! @File +//! @file //! @SYMTestSuiteName te-integ-tracecollectorclient.script //! @SYMScriptTestEnvironment TEF @@ -55,7 +55,7 @@ //! @SYMTestActions //! @SYMTestExpectedResults Verify that the errors returned are as expected //! @SYMTestType CT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ2390 //! @SYMREQ diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_functional/testdata/scripts/te_integ_tracecollectorclient_disabled.script --- a/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_functional/testdata/scripts/te_integ_tracecollectorclient_disabled.script Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_functional/testdata/scripts/te_integ_tracecollectorclient_disabled.script Tue Jul 06 16:18:30 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -14,7 +14,7 @@ // -//! @File +//! @file //! @SYMTestSuiteName te-integ-tracecollectorclient_disabled.script //! @SYMScriptTestEnvironment TEF @@ -31,7 +31,7 @@ //! @SYMTestActions Run a combination of single and multiple group ID filter set() methods and check the contents of the get() methods on server return the filters as expected //! @SYMTestExpectedResults Verify that the values returned by get methods match those expected from settings (test step returns a test pass if so) //! @SYMTestType CT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ2390 //! @SYMREQ 12128 12974 12975 START_TEST_BLOCK 1000 te_ostv2integsuite_disabled \testdata\configs\te_integ_tracecollectorclient.ini @@ -48,7 +48,7 @@ //! @SYMTestActions Run a combination of single and multiple component ID filter set() methods and check the contents of the get() methods on server return the filters as expected //! @SYMTestExpectedResults Verify that the values returned by get methods match those expected from settings (test step returns a test pass if so) //! @SYMTestType CT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ2390 //! @SYMREQ 12128 12974 12975 START_TEST_BLOCK 20000 te_ostv2integsuite_disabled \testdata\configs\te_integ_tracecollectorclient.ini @@ -65,7 +65,7 @@ //! @SYMTestActions Run a combination of single and multiple filter and filtering set() methods instrument user-side trace points accordingly for positive, begative and multiple setting tests //! @SYMTestExpectedResults Verify that no returned trace data and no output trace log files accordingly //! @SYMTestType CT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ2390 //! @SYMREQ 12128 12974 12975 12823 12824 12825 12128 12974 12975 START_TEST_BLOCK 20000 te_ostv2integsuite_disabled \testdata\configs\te_integ_tracecollectorclient.ini @@ -82,7 +82,7 @@ //! @SYMTestActions Run a combination of single and multiple group ID filter and filtering set() methods and check the contents of the get() methods on server return the filters as expected //! @SYMTestExpectedResults Verify that the values returned by get methods match those expected from settings (test step returns a test pass if so) //! @SYMTestType CT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ2390 //! @SYMREQ 12128 12974 12975 START_TEST_BLOCK 1000 te_ostv2integsuite_disabled \testdata\configs\te_integ_tracecollectorclient.ini @@ -105,7 +105,7 @@ //! @SYMTestActions Run a combination of single and multiple component ID filter and filtering set() methods and check the contents of the get() methods on server return the filters as expected //! @SYMTestExpectedResults Verify that the values returned by get methods match those expected from settings (test step returns a test pass if so) //! @SYMTestType CT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ2390 //! @SYMREQ 12128 12974 12975 START_TEST_BLOCK 1000 te_ostv2integsuite_disabled \testdata\configs\te_integ_tracecollectorclient.ini @@ -128,7 +128,7 @@ //! @SYMTestActions Run a combination of buffer resizing methods and run over various stress testing trace instrumentations. Check the contents of the output file is as expected //! @SYMTestExpectedResults Verify that output file contains no #traces as expected //! @SYMTestType CT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ2390 //! @SYMREQ 12152 START_TEST_BLOCK 1000 te_ostv2integsuite_disabled \testdata\configs\te_integ_tracecollectorclient.ini @@ -145,7 +145,7 @@ //! @SYMTestActions Run a combination of buffer mode change methods and run over various stress testing trace instrumentations. check the contents of the output file is as expected //! @SYMTestExpectedResults Verify that output file contains no //! @SYMTestType CT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ2390 //! @SYMREQ 12152 START_TEST_BLOCK 1000 te_ostv2integsuite_disabled \testdata\configs\te_integ_tracecollectorclient.ini @@ -163,7 +163,7 @@ //! @SYMTestActions Run a combination of single and multiple filter and filtering set() methods instrument kernel-side trace points accordingly for positive, negative and multiple setting tests //! @SYMTestExpectedResults Verify that no returned trace data and no output trace log files accordingly //! @SYMTestType CT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ2390 //! @SYMREQ 12128 12974 12975 12823 12824 12825 12128 12974 12975 // START_TEST_BLOCK 1000 te_ostv2integsuite_disabled \testdata\configs\te_integ_tracecollectorclient.ini @@ -180,7 +180,7 @@ //! @SYMTestActions Run a combination of single and multiple filter and filtering set() methods instrument user-side trace printf-style points accordingly for positive, negative and multiple setting tests //! @SYMTestExpectedResults Verify that no returned trace data and no output trace log files accordingly //! @SYMTestType CT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ2390 //! @SYMREQ 12128 12974 12975 12823 12824 12825 12128 12974 12975 START_TEST_BLOCK 1000 te_ostv2integsuite_disabled \testdata\configs\te_integ_tracecollectorclient.ini @@ -198,7 +198,7 @@ //! @SYMTestActions Run a combination of single and multiple filter and filtering set() methods instrument kernel-side trace printf-style points accordingly for positive, negative and multiple setting tests //! @SYMTestExpectedResults Verify that no returned trace data and no output trace log files accordingly //! @SYMTestType CT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ2390 //! @SYMREQ 12128 12974 12975 12823 12824 12825 12128 12974 12975 // START_TEST_BLOCK 1000 te_ostv2integsuite_disabled \testdata\configs\te_integ_tracecollectorclient.ini @@ -218,7 +218,7 @@ //! @SYMTestActions Run a combination of plugin configuration methods for the file plugin and log over trace instrumentation //! @SYMTestExpectedResults Verify that the trace data is not output as expected to the file plugin //! @SYMTestType CT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ2390 //! @SYMREQ 12129 12153 START_TEST_BLOCK 1000 te_ostv2integsuite_disabled \testdata\configs\te_integ_tracecollectorclient.ini @@ -235,7 +235,7 @@ //! @SYMTestActions Run a combination of plugin configuration methods for the serial plugin and log over trace instrumentation //! @SYMTestExpectedResults Verify that trace data is not output as expected to the serial plugin //! @SYMTestType CT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ2390 //! @SYMREQ 12129 12153 12147 START_TEST_BLOCK 1000 te_ostv2integsuite_disabled \testdata\configs\te_integ_tracecollectorclient.ini @@ -252,7 +252,7 @@ //! @SYMTestActions Run a combination of plugin configuration methods for the file plugin and test on the return errors //! @SYMTestExpectedResults Verify that the errors returned are as expected //! @SYMTestType CT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ2390 //! @SYMREQ 12129 12153 12147 START_TEST_BLOCK 1000 te_ostv2integsuite_disabled \testdata\configs\te_integ_tracecollectorclient.ini diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_functional/testdata/scripts/te_integ_tracecollectorclient_enabled.script --- a/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_functional/testdata/scripts/te_integ_tracecollectorclient_enabled.script Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_functional/testdata/scripts/te_integ_tracecollectorclient_enabled.script Tue Jul 06 16:18:30 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -14,7 +14,7 @@ // -//! @File +//! @file //! @SYMTestSuiteName te-integ-tracecollectorclient_enabled.script //! @SYMScriptTestEnvironment TEF @@ -31,7 +31,7 @@ //! @SYMTestActions Run a combination of single and multiple group ID filter set() methods and check the contents of the get() methods on server return the filters as expected //! @SYMTestExpectedResults Verify that the values returned by get methods match those expected from settings (test step returns a test pass if so) //! @SYMTestType CT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ2390 //! @SYMREQ 12128 12974 12975 START_TEST_BLOCK 1000 te_ostv2integsuite_enabled \testdata\configs\te_integ_tracecollectorclient.ini @@ -48,7 +48,7 @@ //! @SYMTestActions Run a combination of single and multiple component ID filter set() methods and check the contents of the get() methods on server return the filters as expected //! @SYMTestExpectedResults Verify that the values returned by get methods match those expected from settings (test step returns a test pass if so) //! @SYMTestType CT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ2390 //! @SYMREQ 12128 12974 12975 START_TEST_BLOCK 20000 te_ostv2integsuite_enabled \testdata\configs\te_integ_tracecollectorclient.ini @@ -65,7 +65,7 @@ //! @SYMTestActions Run a combination of single and multiple filter and filtering set() methods instrument user-side trace points accordingly for positive, negative and multiple setting tests //! @SYMTestExpectedResults Verify that the returned trace data and the output trace log files match the settings in the TraceControl accordingly //! @SYMTestType CT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ2390 //! @SYMREQ 12128 12974 12975 12823 12824 12825 12128 12974 12975 START_TEST_BLOCK 20000 te_ostv2integsuite_enabled \testdata\configs\te_integ_tracecollectorclient.ini @@ -82,7 +82,7 @@ //! @SYMTestActions Run a combination of single and multiple group ID filter and filtering set() methods and check the contents of the get() methods on server return the filters as expected //! @SYMTestExpectedResults Verify that the values returned by get methods match those expected from settings (test step returns a test pass if so) //! @SYMTestType CT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ2390 //! @SYMREQ 12128 12974 12975 START_TEST_BLOCK 1000 te_ostv2integsuite_enabled \testdata\configs\te_integ_tracecollectorclient.ini @@ -105,7 +105,7 @@ //! @SYMTestActions Run a combination of single and multiple component ID filter and filtering set() methods and check the contents of the get() methods on server return the filters as expected //! @SYMTestExpectedResults Verify that the values returned by get methods match those expected from settings (test step returns a test pass if so) //! @SYMTestType CT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ2390 //! @SYMREQ 12128 12974 12975 START_TEST_BLOCK 1000 te_ostv2integsuite_enabled \testdata\configs\te_integ_tracecollectorclient.ini @@ -128,7 +128,7 @@ //! @SYMTestActions Run a combination of buffer resizing methods and run over various stress testing trace instrumentations. check the contents of the output file is as expected //! @SYMTestExpectedResults Verify that output file contains #traces as expected //! @SYMTestType CT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ2390 //! @SYMREQ 12152 START_TEST_BLOCK 1000 te_ostv2integsuite_enabled \testdata\configs\te_integ_tracecollectorclient.ini @@ -145,7 +145,7 @@ //! @SYMTestActions Run a combination of buffer mode change methods and run over various stress testing trace instrumentations. check the contents of the output file is as expected //! @SYMTestExpectedResults Verify that output file contains a trace pattern as expected from buffer mode type //! @SYMTestType CT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ2390 //! @SYMREQ 12152 START_TEST_BLOCK 1000 te_ostv2integsuite_enabled \testdata\configs\te_integ_tracecollectorclient.ini @@ -163,7 +163,7 @@ //! @SYMTestActions Run a combination of single and multiple filter and filtering set() methods instrument kernel-side trace points accordingly for positive, negative and multiple setting tests //! @SYMTestExpectedResults Verify that the returned trace data and the output trace log files match the settings in the TraceControl accordingly //! @SYMTestType CT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ2390 //! @SYMREQ 12128 12974 12975 12823 12824 12825 12128 12974 12975 // START_TEST_BLOCK 1000 te_ostv2integsuite_enabled \testdata\configs\te_integ_tracecollectorclient.ini @@ -180,7 +180,7 @@ //! @SYMTestActions Run a combination of single and multiple filter and filtering set() methods instrument user-side trace printf-style points accordingly for positive, negative and multiple setting tests //! @SYMTestExpectedResults Verify that the returned trace data and the output trace log files match the settings in the TraceControl accordingly //! @SYMTestType CT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ2390 //! @SYMREQ 12128 12974 12975 12823 12824 12825 12128 12974 12975 START_TEST_BLOCK 1000 te_ostv2integsuite_enabled \testdata\configs\te_integ_tracecollectorclient.ini @@ -198,7 +198,7 @@ //! @SYMTestActions Run a combination of single and multiple filter and filtering set() methods instrument kernel-side trace printf-style points accordingly for positive, negative and multiple setting tests //! @SYMTestExpectedResults Verify that the returned trace data and the output trace log files match the settings in the TraceControl accordingly //! @SYMTestType CT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ2390 //! @SYMREQ 12128 12974 12975 12823 12824 12825 12128 12974 12975 // START_TEST_BLOCK 1000 te_ostv2integsuite_enabled \testdata\configs\te_integ_tracecollectorclient.ini @@ -218,7 +218,7 @@ //! @SYMTestActions Run a combination of plugin configuration methods for the file plugin and log over trace instrumentation //! @SYMTestExpectedResults Verify that the trace data is output as expected to the file plugin //! @SYMTestType CT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ2390 //! @SYMREQ 12129 12153 START_TEST_BLOCK 1000 te_ostv2integsuite_enabled \testdata\configs\te_integ_tracecollectorclient.ini @@ -235,7 +235,7 @@ //! @SYMTestActions Run a combination of plugin configuration methods for the serial plugin and log over trace instrumentation //! @SYMTestExpectedResults Verify that the trace data is output as expected to the serial plugin //! @SYMTestType CT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ2390 //! @SYMREQ 12129 12153 12147 START_TEST_BLOCK 1000 te_ostv2integsuite_enabled \testdata\configs\te_integ_tracecollectorclient.ini @@ -252,7 +252,7 @@ //! @SYMTestActions Run a combination of plugin configuration methods for the file plugin and test on the return errors //! @SYMTestExpectedResults Verify that the errors returned are as expected //! @SYMTestType CT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ2390 //! @SYMREQ 12129 12153 12147 START_TEST_BLOCK 1000 te_ostv2integsuite_enabled \testdata\configs\te_integ_tracecollectorclient.ini diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_functional/testdata/scripts/te_integ_tracecollectorconfigfile.script --- a/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_functional/testdata/scripts/te_integ_tracecollectorconfigfile.script Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_functional/testdata/scripts/te_integ_tracecollectorconfigfile.script Tue Jul 06 16:18:30 2010 +0300 @@ -1,5 +1,5 @@ -// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -14,7 +14,7 @@ // Description: // -//! @File +//! @file //! @SYMTestSuiteName te_integ_tracecollectorconfigfile.script //! @SYMScriptTestEnvironment TEF @@ -39,7 +39,7 @@ //! @SYMTestActions Compare the settings in the TraceControl server with that specified in the test config file in \testdata\configs\configfiletracecontrolconfig.ini //! @SYMTestExpectedResults Verify that the returned settings match those expected (test step returns a test pass if so) //! @SYMTestType CT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ2390 //! @SYMREQ 12128 12129 START_TEST_BLOCK 100 te_ostv2integsuite_enabled \testdata\configs\te_integ_tracecollectorconfigfile.ini @@ -63,7 +63,7 @@ //! @SYMTestActions Having deleted c:\ulogger\uloggerconfig.ini in the public path, now compare the settings in the TraceControl server with that specified by default in the private path //! @SYMTestExpectedResults Verify that the returned settings match those expected (test step returns a test pass if so) //! @SYMTestType CT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ2390 //! @SYMREQ 12128 12129 START_TEST_BLOCK 100 te_ostv2integsuite_enabled \testdata\configs\te_integ_tracecollectorconfigfile.ini @@ -88,7 +88,7 @@ //! @SYMTestActions Having reinstated a config file on the public path, now compare the settings in the TraceControl server with that specified in the public path //! @SYMTestExpectedResults Verify that the returned settings match those expected (test step returns a test pass if so) //! @SYMTestType CT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ2390 //! @SYMREQ 12128 12129 START_TEST_BLOCK 100 te_ostv2integsuite_enabled \testdata\configs\te_integ_tracecollectorconfigfile.ini diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_functional/testdata/scripts/te_integ_tracecollectorconfigfile_winscw.script --- a/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_functional/testdata/scripts/te_integ_tracecollectorconfigfile_winscw.script Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_functional/testdata/scripts/te_integ_tracecollectorconfigfile_winscw.script Tue Jul 06 16:18:30 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -14,7 +14,7 @@ // -//! @File +//! @file //! @SYMTestSuiteName te_integ_tracecollectorconfigfile_winscw.script //! @SYMScriptTestEnvironment TEF @@ -36,7 +36,7 @@ //! @SYMTestActions Compare the settings in the TraceControl server with that specified in the test config file in \testdata\configs\configfiletracecontrolconfig.ini //! @SYMTestExpectedResults Verify that the returned settings match those expected (test step returns a test pass if so) //! @SYMTestType CT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ2390 //! @SYMREQ 12128 12129 START_TEST_BLOCK 100 te_ostv2integsuite_enabled \testdata\configs\te_integ_tracecollectorconfigfile_winscw.ini @@ -60,7 +60,7 @@ //! @SYMTestActions Having deleted c:\ulogger\uloggerconfig.ini in the public path, now compare the settings in the TraceControl server with that specified by default in the private path //! @SYMTestExpectedResults Verify that the returned settings match those expected (test step returns a test pass if so) //! @SYMTestType CT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ2390 //! @SYMREQ 12128 12129 START_TEST_BLOCK 100 te_ostv2integsuite_enabled \testdata\configs\te_integ_tracecollectorconfigfile_winscw.ini @@ -83,7 +83,7 @@ //! @SYMTestActions Having reinstated a config file on the public path, now compare the settings in the TraceControl server with that specified in the public path //! @SYMTestExpectedResults Verify that the returned settings match those expected (test step returns a test pass if so) //! @SYMTestType CT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ2390 //! @SYMREQ 12128 12129 START_TEST_BLOCK 100 te_ostv2integsuite_enabled \testdata\configs\te_integ_tracecollectorconfigfile_winscw.ini diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_functional/testdata/scripts/te_integ_tracecollectorsysstart.script --- a/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_functional/testdata/scripts/te_integ_tracecollectorsysstart.script Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_functional/testdata/scripts/te_integ_tracecollectorsysstart.script Tue Jul 06 16:18:30 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -14,7 +14,7 @@ // -//! @File +//! @file //! @SYMTestSuiteName te_integ_tracecollectorsysstart.script //! @SYMScriptTestEnvironment TEF @@ -32,7 +32,7 @@ //! @SYMTestActions Compile a rom with uloggersysstart.exe compiled into startup sequence and uncomment #define sysstart in TCMLogging datawrapper. Run test step. //! @SYMTestExpectedResults Verify that the output log contains btrace output from boot sequence as well as trace points enabled in TCMLogging datawrapper //! @SYMTestType CT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ2390 //! @SYMREQ 12825 12976 12978 START_TEST_BLOCK 100 te_ostv2integsuite_enabled \testdata\configs\te_integ_tracecollectorsysstart.ini diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/inc/sanity/te_perfsanitytimer.h --- a/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/inc/sanity/te_perfsanitytimer.h Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/inc/sanity/te_perfsanitytimer.h Tue Jul 06 16:18:30 2010 +0300 @@ -43,17 +43,17 @@ }; public: - TBool TestUserTimer(TUint32& aTestTime); - TBool TestUserLongTimer(TUint32& aTestTime); - TBool TestKernelTimer(TUint32& aTestTime); - TBool TestKernelLongTimer(TUint32& aTestTime); - TBool TestUTraceUserTimer(TUint32& aTestTime); - TBool TestUTraceKernelTimer(TUint32& aTestTime); + TBool TestUserTimerL(TUint32& aTestTime); + TBool TestUserLongTimerL(TUint32& aTestTime); + TBool TestKernelTimerL(TUint32& aTestTime); + TBool TestKernelLongTimerL(TUint32& aTestTime); + TBool TestUTraceUserTimerL(TUint32& aTestTime); + TBool TestUTraceKernelTimerL(TUint32& aTestTime); TUint32 Count(){return iCount;} private: TBool VerifyTime(TUint32 aTime); TBool DoTestUTraceTimer(const TInt aApi, TUint32& aTestTime); - TBool DoTestTrace(const TTestMethodType aMethod, TUint32& aTestTime); + TBool DoTestTraceL(const TTestMethodType aMethod, TUint32& aTestTime); private: #ifndef __KERNEL_MODE__ CUptTimer iTimer; diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/inc/te_perf.h --- a/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/inc/te_perf.h Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/inc/te_perf.h Tue Jul 06 16:18:30 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -14,13 +14,14 @@ // - /** @file te_perf.h @internalTechnology */ + #if (!defined TE_ULOGGERMCLPERFSTEP_H) #define TE_ULOGGERMCLPERFSTEP_H + #include #include "te_ostv2integsuite_basewrapper.h" #include @@ -53,8 +54,8 @@ private: //private run config members + }; - }; class CTCMPerformanceWrapper : public CTe_MCLSuiteBaseWrapper { @@ -69,17 +70,14 @@ private: CTCMPerformanceWrapper(); void ConstructL(); - TVerdict DoApiTests(const TTEFSectionName& aSection); - TVerdict DoPluginTests(const TInt& aPluginOnly, const TTEFSectionName& aSection); //tried TBool - didn't work for some reason + TVerdict DoApiTestsL(const TTEFSectionName& aSection); + TVerdict DoPluginTestsL(const TInt& aPluginOnly, const TTEFSectionName& aSection); //tried TBool - didn't work for some reason TVerdict DoBufferSizeTests();//to be implemented TVerdict DoBufferModeTests();//to be implemented TApiRunConfig iApiRunConfig; CPluginRunConfig* iPluginRunConfig; }; - - - _LIT(KTCMPerformanceWrapper,"TCMPerformance"); diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/inc/te_perfapicall.h --- a/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/inc/te_perfapicall.h Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/inc/te_perfapicall.h Tue Jul 06 16:18:30 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -15,7 +15,6 @@ // - /** @file te_perfapicall.h @internalTechnology @@ -34,8 +33,6 @@ #include "te_apirunconfig.h" - - class CApiCallTest: public CBase { public: @@ -43,9 +40,9 @@ ~CApiCallTest(); //could get rid of this now if you want... TInt DoTestL(const TApiRunConfig& aApiRunConfig, TApiTestResult& aApiTestResult); - TInt CachedTraceTime(TApiRunConfig& aApiRunConfig, TApiTestResult& aApiTestResult); - TInt NonCachedTraceTime(TApiRunConfig& aApiRunConfig, TApiTestResult& aApiTestResult); - TInt StackUsage(TApiRunConfig& aApiRunConfig, TApiTestResult& aApiTestResult); + TInt CachedTraceTimeL(TApiRunConfig& aApiRunConfig, TApiTestResult& aApiTestResult); + TInt NonCachedTraceTimeL(TApiRunConfig& aApiRunConfig, TApiTestResult& aApiTestResult); + TInt StackUsageL(TApiRunConfig& aApiRunConfig, TApiTestResult& aApiTestResult); TInt Test(); private: @@ -59,12 +56,12 @@ //TInt TraceBaselineTime(const TApiRunConfig& aApiRunConfig, TUint64& aBaselineTime, TBool aDoTrace); //TInt TraceTime(const TApiRunConfig& aApiRunConfig, TUint64& aTime, const TUint64& aBaselineTime, TBool aDoTrace); - TInt CachedTraceBaselineTime(TApiRunConfig& aApiRunConfig, TInt32& aMinimumExecutionBaselineTime); - TInt CachedTraceTime(TApiRunConfig& aApiRunConfig, TInt32& aMinimumExecutionTime, TInt32& aMinimumExecutionBaselineTime); - TInt NonCachedTraceBaselineTime(TApiRunConfig& aApiRunConfig, TInt32& aTypicalExecutionBaselineTime); - TInt NonCachedTraceTime(TApiRunConfig& aApiRunConfig, TInt32& aTypicalExecutionTime, TInt32& aTypicalExecutionBaselineTime); + TInt CachedTraceBaselineTimeL(TApiRunConfig& aApiRunConfig, TInt32& aMinimumExecutionBaselineTime); + TInt CachedTraceTimeL(TApiRunConfig& aApiRunConfig, TInt32& aMinimumExecutionTime, TInt32& aMinimumExecutionBaselineTime); + TInt NonCachedTraceBaselineTimeL(TApiRunConfig& aApiRunConfig, TInt32& aTypicalExecutionBaselineTime); + TInt NonCachedTraceTimeL(TApiRunConfig& aApiRunConfig, TInt32& aTypicalExecutionTime, TInt32& aTypicalExecutionBaselineTime); - TInt StackUsage(TApiRunConfig& aApiRunConfig, TInt& aApiStackUsage); + TInt StackUsageL(TApiRunConfig& aApiRunConfig, TInt& aApiStackUsage); TInt HeapUsage(TInt& aApiHeapUsage); TInt DoTheApiCall(); @@ -77,5 +74,3 @@ }; #endif - - diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/inc/te_perfcsvgenerator.h --- a/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/inc/te_perfcsvgenerator.h Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/inc/te_perfcsvgenerator.h Tue Jul 06 16:18:30 2010 +0300 @@ -47,15 +47,15 @@ CUptCsvGenerator(); ~CUptCsvGenerator(); - TInt Open(const TDesC& aFileName, const TBool& aAppend); + TInt OpenL(const TDesC& aFileName, const TBool& aAppend); TInt Close(); void WriteL(const RArray& aPerformanceData); void WriteL(const RArray& aPerformanceConfig); void WriteApiNameL(const TInt aApiEnum); - TInt WriteNewLine(); - TInt WriteHeader(const TInt& aTestType); + TInt WriteNewLineL(); + TInt WriteHeaderL(const TInt& aTestType); - TInt Test(); + TInt TestL(); private: //Private helper method for sanity tests TInt FillReferenceBuffer(RBuf8& aBufferName, const TInt& aAppendCount, const RArray& aDataName, const TInt& aData1Count, const RArray& aData2Name, const TInt& aData2Count); diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/inc/te_perfoutputsanity.h --- a/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/inc/te_perfoutputsanity.h Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/inc/te_perfoutputsanity.h Tue Jul 06 16:18:30 2010 +0300 @@ -42,9 +42,9 @@ private: COutputCSVSanityWrapper(); void ConstructL(); - TVerdict TestBaselineCsv(); - TInt ReadCsvFile(const TDesC& aFilename, RBuf8& aBuffer); - TInt CsvFileSize(const TDesC& aFilename, TInt& aSize); + TVerdict TestBaselineCsvL(); + TInt ReadCsvFileL(const TDesC& aFilename, RBuf8& aBuffer); + TInt CsvFileSizeL(const TDesC& aFilename, TInt& aSize); }; diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/inc/te_perfsanity.h --- a/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/inc/te_perfsanity.h Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/inc/te_perfsanity.h Tue Jul 06 16:18:30 2010 +0300 @@ -42,8 +42,8 @@ private: CPerformanceSanityWrapper(); void ConstructL(); - TVerdict TestTimer(); - TBool SanityTestTimedUtrace(); + TVerdict TestTimerL(); + TBool SanityTestTimedUtraceL(); }; diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/inc/te_perftracetester.h --- a/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/inc/te_perftracetester.h Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/inc/te_perftracetester.h Tue Jul 06 16:18:30 2010 +0300 @@ -56,13 +56,13 @@ * Makes a trace call to either kernel or user side * and returns the time in the parameter aApiRunConfig.iApiTraceTime */ - TInt TimeTraceCall(const TApiRunConfig& aApiRunConfig, TApiRunResults& aApiRunResults); + TInt TimeTraceCallL(const TApiRunConfig& aApiRunConfig, TApiRunResults& aApiRunResults); /** * Makes a call to user side, returning the time in the * parameter aApiRunConfig.iApiTraceTime */ - TInt TimeUsersideTraceCalls(const TApiRunConfig& aApiRunConfig, TApiRunResults& aApiRunResults); + TInt TimeUsersideTraceCallsL(const TApiRunConfig& aApiRunConfig, TApiRunResults& aApiRunResults); /** */ diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/src/sanity/te_perfsanitytimer.cpp --- a/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/src/sanity/te_perfsanitytimer.cpp Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/src/sanity/te_perfsanitytimer.cpp Tue Jul 06 16:18:30 2010 +0300 @@ -30,39 +30,39 @@ #endif #include "te_dataparameters.h" -TBool TTestTimer::TestUserTimer(TUint32& aTestTime) +TBool TTestTimer::TestUserTimerL(TUint32& aTestTime) { - return DoTestTrace(ESanityFoo, aTestTime); + return DoTestTraceL(ESanityFoo, aTestTime); } -TBool TTestTimer::TestUserLongTimer(TUint32& aTestTime) +TBool TTestTimer::TestUserLongTimerL(TUint32& aTestTime) { - return DoTestTrace(ESanityFooLong, aTestTime); + return DoTestTraceL(ESanityFooLong, aTestTime); } -TBool TTestTimer::TestKernelTimer(TUint32& aTestTime) +TBool TTestTimer::TestKernelTimerL(TUint32& aTestTime) { - return DoTestTrace(ESanityFoo, aTestTime); + return DoTestTraceL(ESanityFoo, aTestTime); } -TBool TTestTimer::TestKernelLongTimer(TUint32& aTestTime) +TBool TTestTimer::TestKernelLongTimerL(TUint32& aTestTime) { - return DoTestTrace(ESanityFooLong, aTestTime); + return DoTestTraceL(ESanityFooLong, aTestTime); } -TBool TTestTimer::TestUTraceUserTimer(TUint32& aTestTime) +TBool TTestTimer::TestUTraceUserTimerL(TUint32& aTestTime) { - return DoTestTrace(EUtraceUsr, aTestTime); + return DoTestTraceL(EUtraceUsr, aTestTime); } -TBool TTestTimer::TestUTraceKernelTimer(TUint32& aTestTime) +TBool TTestTimer::TestUTraceKernelTimerL(TUint32& aTestTime) { - return DoTestTrace(EUtraceKrn, aTestTime); + return DoTestTraceL(EUtraceKrn, aTestTime); } -TBool TTestTimer::DoTestTrace(const TTestMethodType aMethod, TUint32& aTestTime) +TBool TTestTimer::DoTestTraceL(const TTestMethodType aMethod, TUint32& aTestTime) { aTestTime = 0; diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/src/te_perf.cpp --- a/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/src/te_perf.cpp Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/src/te_perf.cpp Tue Jul 06 16:18:30 2010 +0300 @@ -71,7 +71,6 @@ */ { TRunConfigurer::Init(iApiRunConfig); - iPluginRunConfig = new(ELeave) CPluginRunConfig; } @@ -92,6 +91,7 @@ void CTCMPerformanceWrapper::ConstructL() { + iPluginRunConfig = new(ELeave) CPluginRunConfig; } TAny* CTCMPerformanceWrapper::GetObject() @@ -125,18 +125,18 @@ TInt pluginOnlyTests=0; //run api tests if(doapicalltests) - SetBlockResult(DoApiTests(aSection)); + SetBlockResult(DoApiTestsL(aSection)); if(dooutputplugintests) { pluginOnlyTests=1; - SetBlockResult(DoPluginTests(pluginOnlyTests, aSection)); + SetBlockResult(DoPluginTestsL(pluginOnlyTests, aSection)); } if(dothroughputtests) { pluginOnlyTests=2; - SetBlockResult(DoPluginTests(pluginOnlyTests, aSection)); + SetBlockResult(DoPluginTestsL(pluginOnlyTests, aSection)); } /* @@ -155,7 +155,7 @@ return ETrue; } -TVerdict CTCMPerformanceWrapper::DoApiTests(const TTEFSectionName& aSection) +TVerdict CTCMPerformanceWrapper::DoApiTestsL(const TTEFSectionName& aSection) { //initialize and create test run parameters //*******this is quite ugly and could be tidied up into a new routine so isnt in main test step @@ -327,7 +327,7 @@ } } CClearConfig configIni; - configIni.Clear(logger); + configIni.ClearL(logger); //put in test over API CALLS testtype=0; @@ -373,22 +373,22 @@ //do the test INFO_PRINTF2(_L("Testing API %d"), iApiRunConfig.iApiId); - error = apitest.CachedTraceTime(iApiRunConfig, apitestresult); + error = apitest.CachedTraceTimeL(iApiRunConfig, apitestresult); if(error) { - INFO_PRINTF2(_L("ERROR: CachedTraceTime failed, error %d"), error); + INFO_PRINTF2(_L("ERROR: CachedTraceTimeL failed, error %d"), error); SetBlockResult(EFail); } - error = apitest.NonCachedTraceTime(iApiRunConfig, apitestresult); + error = apitest.NonCachedTraceTimeL(iApiRunConfig, apitestresult); if(error) { - INFO_PRINTF2(_L("ERROR: NonCachedTraceTime failed, error %d"), error); + INFO_PRINTF2(_L("ERROR: NonCachedTraceTimeL failed, error %d"), error); SetBlockResult(EFail); } - error = apitest.StackUsage(iApiRunConfig, apitestresult); + error = apitest.StackUsageL(iApiRunConfig, apitestresult); if(error) { - INFO_PRINTF2(_L("ERROR: StackUsage failed, error %d"), error); + INFO_PRINTF2(_L("ERROR: StackUsageL failed, error %d"), error); SetBlockResult(EFail); } @@ -437,7 +437,7 @@ } } } - configIni.Clear(logger); + configIni.ClearL(logger); } //put in all the error returns //put in test step result returns @@ -445,7 +445,7 @@ return BlockResult(); } -TVerdict CTCMPerformanceWrapper::DoPluginTests(const TInt& aPluginOnly, const TTEFSectionName& aSection) +TVerdict CTCMPerformanceWrapper::DoPluginTestsL(const TInt& aPluginOnly, const TTEFSectionName& aSection) { //define default plugin configurations _LIT(KDefaultPlugin,"uloggerfileplugin"); diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/src/te_perfapicall.cpp --- a/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/src/te_perfapicall.cpp Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/src/te_perfapicall.cpp Tue Jul 06 16:18:30 2010 +0300 @@ -75,7 +75,7 @@ return error; } -TInt CApiCallTest::CachedTraceTime(TApiRunConfig& aApiRunConfig, TApiTestResult& aApiTestResult) +TInt CApiCallTest::CachedTraceTimeL(TApiRunConfig& aApiRunConfig, TApiTestResult& aApiTestResult) { TInt error = KErrNotSupported; //create a dummy time variable to be used for the baseline measurement @@ -85,17 +85,17 @@ __TEST_LOG("about to carry out cache trace"); if(aApiRunConfig.iDoMinExecution) { - CachedTraceBaselineTime(aApiRunConfig, baselinetime); + CachedTraceBaselineTimeL(aApiRunConfig, baselinetime); __TEST_LOG("cache baseline"); __TEST_LOGNUM(baselinetime); - error = CachedTraceTime(aApiRunConfig, aApiTestResult.iMinimumExecutionTime, baselinetime); + error = CachedTraceTimeL(aApiRunConfig, aApiTestResult.iMinimumExecutionTime, baselinetime); __TEST_LOG("cache"); __TEST_LOGNUM(aApiTestResult.iMinimumExecutionTime); } return error; } -TInt CApiCallTest::NonCachedTraceTime(TApiRunConfig& aApiRunConfig, TApiTestResult& aApiTestResult) +TInt CApiCallTest::NonCachedTraceTimeL(TApiRunConfig& aApiRunConfig, TApiTestResult& aApiTestResult) { TInt error = KErrNotSupported; //create a dummy time variable to be used for the baseline measurement @@ -103,20 +103,20 @@ __TEST_LOG("about to carry out non cache trace"); if(aApiRunConfig.iDoTypicalExecution) { - NonCachedTraceBaselineTime(aApiRunConfig, baselinetime); + NonCachedTraceBaselineTimeL(aApiRunConfig, baselinetime); __TEST_LOG("noncache baseline"); __TEST_LOGNUM(baselinetime); - error = NonCachedTraceTime(aApiRunConfig, aApiTestResult.iTypicalExecutionTime, baselinetime); + error = NonCachedTraceTimeL(aApiRunConfig, aApiTestResult.iTypicalExecutionTime, baselinetime); __TEST_LOG("noncache"); __TEST_LOGNUM(aApiTestResult.iTypicalExecutionTime); } return error; } -TInt CApiCallTest::StackUsage(TApiRunConfig& aApiRunConfig, TApiTestResult& aApiTestResult) +TInt CApiCallTest::StackUsageL(TApiRunConfig& aApiRunConfig, TApiTestResult& aApiTestResult) { __TEST_LOG("about to carry out stack usage trace"); - TInt error = StackUsage(aApiRunConfig, aApiTestResult.iRunResults.iApiStackUsage); + TInt error = StackUsageL(aApiRunConfig, aApiTestResult.iRunResults.iApiStackUsage); if(aApiTestResult.iRunResults.iApiStackUsage == KErrNotSupported && !error) error = KErrNotSupported; return error; @@ -141,7 +141,7 @@ @param aMinimumExecutionBaselineTime is the minimum execution baseline time taken for the commented API call, calculated in nanoseconds @return KErrNone if command was prepared correctly and a system wide error code otherwise. */ -TInt CApiCallTest::CachedTraceBaselineTime(TApiRunConfig& aApiRunConfig, TInt32& aMinimumExecutionBaselineTime) +TInt CApiCallTest::CachedTraceBaselineTimeL(TApiRunConfig& aApiRunConfig, TInt32& aMinimumExecutionBaselineTime) { //****NB: update this routine to something more maintainable TUptTraceTester timer; @@ -171,7 +171,7 @@ @param aMinimumExecutionBaselineTime is the minimum execution baseline time taken for commented API call, calculated in nanoseconds @return KErrNone if command was prepared correctly and a system wide error code otherwise. */ -TInt CApiCallTest::CachedTraceTime(TApiRunConfig& aApiRunConfig, TInt32& aMinimumExecutionTime, TInt32& aMinimumExecutionBaselineTime) +TInt CApiCallTest::CachedTraceTimeL(TApiRunConfig& aApiRunConfig, TInt32& aMinimumExecutionTime, TInt32& aMinimumExecutionBaselineTime) { //NB!!! any changes to this routine and you have to update the baseline calculation as well TUptTraceTester timer; @@ -194,7 +194,7 @@ @param aTypicalExecutionBaselineTime is the typical execution baseline time taken for the API call, calculated in nanoseconds @return KErrNone if command was prepared correctly and a system wide error code otherwise. */ -TInt CApiCallTest::NonCachedTraceBaselineTime(TApiRunConfig& aApiRunConfig, TInt32& aTypicalExecutionBaselineTime) +TInt CApiCallTest::NonCachedTraceBaselineTimeL(TApiRunConfig& aApiRunConfig, TInt32& aTypicalExecutionBaselineTime) { //****NB: update this routine to something more maintainable TUptTraceTester timer; @@ -223,7 +223,7 @@ @param aTypicalExecutionTime is the typical execution time taken for the API call, calculated in nanoseconds @return KErrNone if command was prepared correctly and a system wide error code otherwise. */ -TInt CApiCallTest::NonCachedTraceTime(TApiRunConfig& aApiRunConfig, TInt32& aTypicalExecutionTime, TInt32& aTypicalExecutionBaselineTime) +TInt CApiCallTest::NonCachedTraceTimeL(TApiRunConfig& aApiRunConfig, TInt32& aTypicalExecutionTime, TInt32& aTypicalExecutionBaselineTime) { TUptTraceTester timer; @@ -259,7 +259,7 @@ * * @return KErrNone if command was prepared correctly and a system wide error code otherwise. */ -TInt CApiCallTest::StackUsage(TApiRunConfig& aApiRunConfig, TInt& aApiStackUsage) +TInt CApiCallTest::StackUsageL(TApiRunConfig& aApiRunConfig, TInt& aApiStackUsage) { /* PSEUDOCODE @@ -311,7 +311,7 @@ return err; } -/** This sanity test method is executed in Test() to verify that UPT StackUsage() method in +/** This sanity test method is executed in Test() to verify that UPT StackUsageL() method in this class are stable before any of the stack size performance tests are carried out @return KErrNone if command was prepared correctly and system wide error code otherwise. */ diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/src/te_perfcsvgenerator.cpp --- a/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/src/te_perfcsvgenerator.cpp Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/src/te_perfcsvgenerator.cpp Tue Jul 06 16:18:30 2010 +0300 @@ -48,7 +48,7 @@ ETrue=Append, EFalse=Overwrite @return KErrNone if command was prepared correctly and a system wide error code otherwise. */ -TInt CUptCsvGenerator::Open(const TDesC& aFileName, const TBool& aAppend) +TInt CUptCsvGenerator::OpenL(const TDesC& aFileName, const TBool& aAppend) { iCsvFileSession.Connect(); @@ -89,7 +89,7 @@ appends a newline character. @return KErrNone if command was prepared correctly and a system wide error code otherwise. */ -TInt CUptCsvGenerator::WriteNewLine() +TInt CUptCsvGenerator::WriteNewLineL() { TInt filesize; @@ -211,7 +211,7 @@ @param aTestType is the enum identifier for the test in question @return KErrNone if command was prepared correctly and a system wide error code otherwise. */ -TInt CUptCsvGenerator::WriteHeader(const TInt& aTestType) +TInt CUptCsvGenerator::WriteHeaderL(const TInt& aTestType) { RBuf8 buf; CleanupClosePushL(buf); @@ -294,7 +294,7 @@ @return KErrNone if command was prepared correctly and system wide error code otherwise. */ -TInt CUptCsvGenerator::Test() +TInt CUptCsvGenerator::TestL() { //define filepaths for the test csv files according to the test platform. #ifdef __WINSCW__ @@ -338,11 +338,11 @@ TInt appendcount=3; for(TInt i=0; i!=appendcount;i++) { - Open(KTestFileAppend, ETrue); + OpenL(KTestFileAppend, ETrue); WriteL(atestdata1); - WriteNewLine(); + WriteNewLineL(); WriteL(atestdata2); - WriteNewLine(); + WriteNewLineL(); Close(); } @@ -352,11 +352,11 @@ // 0, 1000, 2000, 3000, 4000, 5000, 6000, 7000, 8000, 9000, 10000, 11000 for(TInt i=0; i!=appendcount;i++) { - Open(KTestFileOverwrite, EFalse); + OpenL(KTestFileOverwrite, EFalse); WriteL(atestdata1); - WriteNewLine(); + WriteNewLineL(); WriteL(atestdata2); - WriteNewLine(); + WriteNewLineL(); Close(); } diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/src/te_perfoutputsanity.cpp --- a/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/src/te_perfoutputsanity.cpp Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/src/te_perfoutputsanity.cpp Tue Jul 06 16:18:30 2010 +0300 @@ -71,7 +71,7 @@ if(BlockResult()==EPass) { - SetBlockResult(TestBaselineCsv()); + SetBlockResult(TestBaselineCsvL()); } return ETrue; @@ -79,7 +79,7 @@ -TVerdict COutputCSVSanityWrapper::TestBaselineCsv() +TVerdict COutputCSVSanityWrapper::TestBaselineCsvL() { //read a sanity test file @@ -91,14 +91,14 @@ TInt size = 0; //get the size of the reference file #ifdef __WINSCW__ - TInt error = CsvFileSize(KReferenceWinscwCsvFile, size); + TInt error = CsvFileSizeL(KReferenceWinscwCsvFile, size); #else - TInt error = CsvFileSize(KReferenceCsvFile, size); + TInt error = CsvFileSizeL(KReferenceCsvFile, size); #endif if(error) { SetBlockResult(EFail); - INFO_PRINTF2(_L("TestBaselineCsv, KReferenceCsvFile, test failed on with error code %d"), error); + INFO_PRINTF2(_L("TestBaselineCsvL, KReferenceCsvFile, test failed on with error code %d"), error); } //Set the size of the RBuf csvReference.Create(size); @@ -106,32 +106,32 @@ //Create csvGenerated CCsvReader csvGenerated; //get the size of the generated file - error = CsvFileSize(KApiCSVFile, size); + error = CsvFileSizeL(KApiCSVFile, size); if(error) { SetBlockResult(EFail); - INFO_PRINTF2(_L("TestBaselineCsv, KApiCSVFile, test failed on with error code %d"), error); + INFO_PRINTF2(_L("TestBaselineCsvL, KApiCSVFile, test failed on with error code %d"), error); } //create the RBuf csvGenerated.Create(size); //Read the reference file into the RBuf #ifdef __WINSCW__ - error = ReadCsvFile(KReferenceWinscwCsvFile, csvReference.Buffer()); + error = ReadCsvFileL(KReferenceWinscwCsvFile, csvReference.Buffer()); #else - error = ReadCsvFile(KReferenceCsvFile, csvReference.Buffer()); + error = ReadCsvFileL(KReferenceCsvFile, csvReference.Buffer()); #endif if(error) { SetBlockResult(EFail); - INFO_PRINTF2(_L("TestBaselineCsv, ReadCsvFile(KReferenceCsvFile) failed on with error code %d"), error); + INFO_PRINTF2(_L("TestBaselineCsvL, ReadCsvFileL(KReferenceCsvFile) failed on with error code %d"), error); } //Read the generated file into the RBuf - error = ReadCsvFile(KApiCSVFile, csvGenerated.Buffer()); + error = ReadCsvFileL(KApiCSVFile, csvGenerated.Buffer()); if(error) { SetBlockResult(EFail); - INFO_PRINTF2(_L("TestBaselineCsv, ReadCsvFile(KApiCSVFile) failed on with error code %d"), error); + INFO_PRINTF2(_L("TestBaselineCsvL, ReadCsvFileL(KApiCSVFile) failed on with error code %d"), error); } //compare the two files @@ -164,7 +164,7 @@ } -TInt COutputCSVSanityWrapper::CsvFileSize(const TDesC& aFilename, TInt& aSize) +TInt COutputCSVSanityWrapper::CsvFileSizeL(const TDesC& aFilename, TInt& aSize) { RFs fsSession; CleanupClosePushL(fsSession); @@ -189,7 +189,7 @@ * The caller of the method owns the buffer * Ie. this method allocates the buffer but the caller is responsible for destroying it. */ -TInt COutputCSVSanityWrapper::ReadCsvFile(const TDesC& aFilename, RBuf8& aBuffer) +TInt COutputCSVSanityWrapper::ReadCsvFileL(const TDesC& aFilename, RBuf8& aBuffer) { RFs fsSession; CleanupClosePushL(fsSession); diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/src/te_perfplugin.cpp --- a/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/src/te_perfplugin.cpp Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/src/te_perfplugin.cpp Tue Jul 06 16:18:30 2010 +0300 @@ -73,7 +73,7 @@ CPluginTests::CPluginTests() { /*Constructor*/ - iPluginTestResult = new(ELeave) CPluginTestResult; + __CREATE_LOG(false); } @@ -102,7 +102,10 @@ //const COutputPluginTestResult* COutputPluginTests::DoTestL(const TPtrC8& aPluginName, const TPluginConfiguration& aPluginSetting, const TInt& aTestDataSize, const TInt& aTestIteration) { //TTraceTester tracecall; - + if (iPluginTestResult == NULL) + { + iPluginTestResult = new(ELeave) CPluginTestResult; + } TInt numberOfTraces=aPluginRunConfig.iDataSize/16; //update magic number to a size of (trace)/bytes //do a baseline to remove loop effects for throughput tests????? diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/src/te_perfresultscollector.cpp --- a/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/src/te_perfresultscollector.cpp Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/src/te_perfresultscollector.cpp Tue Jul 06 16:18:30 2010 +0300 @@ -85,10 +85,10 @@ //create a csvgenerator class CUptCsvGenerator csvgenerator; - csvgenerator.Open(aFileName,aAppend); + csvgenerator.OpenL(aFileName,aAppend); //call writeheader to write the relevent test column header for the csv file, - csvgenerator.WriteHeader(aTestType); + csvgenerator.WriteHeaderL(aTestType); if(aTestType==0) { @@ -125,7 +125,7 @@ // __TEST_LOGNUM(iApiTest.Count()); //call write newline to write a new line in preparation for the next test object - csvgenerator.WriteNewLine(); + csvgenerator.WriteNewLineL(); //clear out the RArray object in preparation for the next test result object testdataarray.Reset(); @@ -161,7 +161,7 @@ //call write newline to write a new line in preparation for the next test object - csvgenerator.WriteNewLine(); + csvgenerator.WriteNewLineL(); //clear out the RArray objects in preparation for the next test result object initialpluginarray.Reset(); diff -r 63532cdadd44 -r 0d6db0a14001 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 Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/src/te_perfsanity.cpp Tue Jul 06 16:18:30 2010 +0300 @@ -102,7 +102,7 @@ if(BlockResult()==EPass) { - SetBlockResult(TestTimer()); + SetBlockResult(TestTimerL()); } //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 - //SanityTestTimedUtrace(); + //SanityTestTimedUtraceL(); return ETrue; } -TVerdict CPerformanceSanityWrapper::TestTimer() +TVerdict CPerformanceSanityWrapper::TestTimerL() { 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.TestUserTimer(userTime); + passed = timer.TestUserTimerL(userTime); INFO_PRINTF1(_L("Testing User side timer functions #2")); if(!passed) @@ -186,16 +186,16 @@ return BlockResult(); } -TBool CPerformanceSanityWrapper::SanityTestTimedUtrace() +TBool CPerformanceSanityWrapper::SanityTestTimedUtraceL() { TTestTimer timer; TUint32 userSanityTime = 0; TUint32 userSanityLongTime = 0; TUint32 userUtraceTime = 0; - timer.TestUserTimer(userSanityTime); - timer.TestUserLongTimer(userSanityLongTime); - timer.TestUTraceUserTimer(userUtraceTime); + timer.TestUserTimerL(userSanityTime); + timer.TestUserLongTimerL(userSanityLongTime); + timer.TestUTraceUserTimerL(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.TestUserTimer(user[i]); - timer.TestUserLongTimer(ulong[i]); + timer.TestUserTimerL(user[i]); + timer.TestUserLongTimerL(ulong[i]); utracedriver.SanityTestTimer(kernel[i]); //utracedriver.SanityTestLongTimer(klong[i]); } diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/src/te_perftracetester.cpp --- a/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/src/te_perftracetester.cpp Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/src/te_perftracetester.cpp Tue Jul 06 16:18:30 2010 +0300 @@ -66,7 +66,7 @@ TUint32 callResults[KNumberOfTraceCallIterations]; for(TInt i = 0; i < KNumberOfTraceCallIterations; i++) { - error = TimeTraceCall(aApiRunConfig, aApiRunResults); + error = TimeTraceCallL(aApiRunConfig, aApiRunResults); callResults[i] = aApiRunResults.iApiTraceTime; } TUint32 total = 0; @@ -76,7 +76,7 @@ return error; } -TInt TUptTraceTester::TimeTraceCall(const TApiRunConfig& aApiRunConfig, TApiRunResults& aApiRunResults) +TInt TUptTraceTester::TimeTraceCallL(const TApiRunConfig& aApiRunConfig, TApiRunResults& aApiRunResults) { TInt error = KErrNone; if(TUptTraceCalls::IsKernelTrace(aApiRunConfig.iApiId)) @@ -91,13 +91,13 @@ } else { - error = TimeUsersideTraceCalls(aApiRunConfig, aApiRunResults); + error = TimeUsersideTraceCallsL(aApiRunConfig, aApiRunResults); } return error; } -TInt TUptTraceTester::TimeUsersideTraceCalls(const TApiRunConfig& aApiRunConfig, TApiRunResults& aApiRunResults) //pass the configuration here +TInt TUptTraceTester::TimeUsersideTraceCallsL(const TApiRunConfig& aApiRunConfig, TApiRunResults& aApiRunResults) //pass the configuration here { aApiRunResults.iTimeCount = 0; CUptTimer timer; diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/testdata/scripts/te_perf_default.script --- a/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/testdata/scripts/te_perf_default.script Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/testdata/scripts/te_perf_default.script Tue Jul 06 16:18:30 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -13,7 +13,7 @@ // Description: // -//! @File +//! @file //! @SYMTestSuiteName te_perf_default.script //! @SYMScriptTestEnvironment TEF diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/testdata/scripts/te_perf_guidelines.script --- a/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/testdata/scripts/te_perf_guidelines.script Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/testdata/scripts/te_perf_guidelines.script Tue Jul 06 16:18:30 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -13,7 +13,7 @@ // Description: // -//! @File +//! @file //! @SYMTestSuiteName te_perf_guidelines.script //! @SYMScriptTestEnvironment TEF diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/testdata/scripts/te_perf_guidelines_disabled.script --- a/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/testdata/scripts/te_perf_guidelines_disabled.script Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/testdata/scripts/te_perf_guidelines_disabled.script Tue Jul 06 16:18:30 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -13,7 +13,7 @@ // Description: // -//! @File +//! @file //! @SYMTestSuiteName te_perf_guidelines_disabled.script //! @SYMScriptTestEnvironment TEF @@ -38,7 +38,7 @@ //! @SYMTestActions Calculate the typical and minimum times taken for trace APIs (compiled out, GroupID filtering on, Component ID Filtering on, GroupID filter matches trace point, Component ID filter matches trace point) and run configs specified in the te_perf_default.ini config file. Output to te_apitestresults.csv along with its stack usage. //! @SYMTestExpectedResults Verify that there has not been any significant change in the performance figures from previous runs, other than expected by source code changes.. //! @SYMTestType ST -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ2390 //! @SYMREQ 12115 12122 12761 START_TEST_BLOCK 10000 te_ostv2integsuite_disabled \testdata\configs\te_perf_gon_con_gmatch_cmatch.ini @@ -63,7 +63,7 @@ //! @SYMTestActions Calculate the typical and minimum times taken for trace APIs (compiled out, GroupID filtering on, Component ID Filtering on, GroupID filter matches trace point, Component ID filter doesn't match trace point) and run configs specified in the te_perf_default.ini config file. Output to te_apitestresults.csv along with its stack usage. //! @SYMTestExpectedResults Verify that there has not been any significant change in the performance figures from previous runs, other than expected by source code changes. //! @SYMTestType ST -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ2390 //! @SYMREQ 12115 12122 12761 START_TEST_BLOCK 10000 te_ostv2integsuite_disabled \testdata\configs\te_perf_gon_con_gmatch_cmismatch.ini @@ -88,7 +88,7 @@ //! @SYMTestActions Calculate the typical and minimum times taken for trace APIs (compiled out, GroupID filtering on, Component ID Filtering on, GroupID filter doesn't match trace point, Component ID filter matches trace point) and run configs specified in the te_perf_default.ini config file. Output to te_apitestresults.csv along with its stack usage. //! @SYMTestExpectedResults Verify that there has not been any significant change in the performance figures from previous runs, other than expected by source code changes. //! @SYMTestType ST -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ2390 //! @SYMREQ 12115 12122 12761 START_TEST_BLOCK 10000 te_ostv2integsuite_disabled \testdata\configs\te_perf_gon_con_gmismatch_cmatch.ini @@ -113,7 +113,7 @@ //! @SYMTestActions Calculate the typical and minimum times taken for trace APIs (compiled out, GroupID filtering on, Component ID Filtering off, GroupID filter matches trace point, Component ID filter doesn't match trace point) and run configs specified in the te_perf_default.ini config file. Output to te_apitestresults.csv along with its stack usage. //! @SYMTestExpectedResults Verify that there has not been any significant change in the performance figures from previous runs, other than expected by source code changes. //! @SYMTestType ST -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ2390 //! @SYMREQ 12115 12122 12761 START_TEST_BLOCK 10000 te_ostv2integsuite_disabled \testdata\configs\te_perf_gon_coff_gmatch_cmismatch.ini @@ -138,7 +138,7 @@ //! @SYMTestActions Calculate the typical and minimum times taken for trace APIs (compiled out, GroupID filtering on, Component ID Filtering off, GroupID filter doesn't match trace point, Component ID filter matches trace point) and run configs specified in the te_perf_default.ini config file. Output to te_apitestresults.csv along with its stack usage. //! @SYMTestExpectedResults Verify that there has not been any significant change in the performance figures from previous runs, other than expected by source code changes. //! @SYMTestType ST -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ2390 //! @SYMREQ 12115 12122 12761 START_TEST_BLOCK 10000 te_ostv2integsuite_disabled \testdata\configs\te_perf_gon_coff_gmismatch_cmatch.ini @@ -163,7 +163,7 @@ //! @SYMTestActions Calculate the typical and minimum times taken for trace APIs (compiled out, GroupID filtering off, Component ID Filtering on, GroupID filter doesn't match trace point, Component ID filter matches trace point) and run configs specified in the te_perf_default.ini config file. Output to te_apitestresults.csv along with its stack usage. //! @SYMTestExpectedResults Verify that there has not been any significant change in the performance figures from previous runs, other than expected by source code changes. //! @SYMTestType ST -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ2390 //! @SYMREQ 12115 12122 12761 START_TEST_BLOCK 10000 te_ostv2integsuite_disabled \testdata\configs\te_perf_goff_con_gmismatch_cmatch.ini @@ -188,7 +188,7 @@ //! @SYMTestActions Calculate the typical and minimum times taken for trace APIs (compiled out, GroupID filtering off, Component ID Filtering on, GroupID filter matches trace point, Component ID filter doesn't match trace point) and run configs specified in the te_perf_default.ini config file. Output to te_apitestresults.csv along with its stack usage. //! @SYMTestExpectedResults Verify that there has not been any significant change in the performance figures from previous runs, other than expected by source code changes. //! @SYMTestType ST -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ2390 //! @SYMREQ 12115 12122 12761 START_TEST_BLOCK 10000 te_ostv2integsuite_disabled \testdata\configs\te_perf_goff_con_gmatch_cmismatch.ini @@ -213,7 +213,7 @@ //! @SYMTestActions Calculate the typical and minimum times taken for trace APIs (compiled out, GroupID filtering off, Component ID Filtering off, GroupID filter matches trace point, Component ID filter doesn't match trace point) and run configs specified in the te_perf_default.ini config file. Output to te_apitestresults.csv along with its stack usage. //! @SYMTestExpectedResults Verify that there has not been any significant change in the performance figures from previous runs, other than expected by source code changes. //! @SYMTestType ST -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ2390 //! @SYMREQ 12115 12122 12761 START_TEST_BLOCK 10000 te_ostv2integsuite_disabled \testdata\configs\te_perf_goff_coff_gmatch_cmatch.ini diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/testdata/scripts/te_perf_guidelines_enabled.script --- a/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/testdata/scripts/te_perf_guidelines_enabled.script Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/testdata/scripts/te_perf_guidelines_enabled.script Tue Jul 06 16:18:30 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -13,7 +13,7 @@ // Description: // -//! @File +//! @file //! @SYMTestSuiteName te_perf_guidelines_enabled.script //! @SYMScriptTestEnvironment TEF @@ -38,7 +38,7 @@ //! @SYMTestActions Calculate the typical and minimum times taken for trace APIs (compiled in, GroupID filtering on, Component ID Filtering on, GroupID filter matches trace point, Component ID filter matches trace point) and run configs specified in the te_perf_default.ini config file. Output to te_apitestresults.csv along with its stack usage. //! @SYMTestExpectedResults Verify that there has not been any significant change in the performance figures from previous runs, other than expected by source code changes.. //! @SYMTestType ST -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ2390 //! @SYMREQ 12115 12122 12761 START_TEST_BLOCK 10000 te_ostv2integsuite_enabled \testdata\configs\te_perf_gon_con_gmatch_cmatch.ini @@ -63,7 +63,7 @@ //! @SYMTestActions Calculate the typical and minimum times taken for trace APIs (compiled in, GroupID filtering on, Component ID Filtering on, GroupID filter matches trace point, Component ID filter doesn't match trace point) and run configs specified in the te_perf_default.ini config file. Output to te_apitestresults.csv along with its stack usage. //! @SYMTestExpectedResults Verify that there has not been any significant change in the performance figures from previous runs, other than expected by source code changes. //! @SYMTestType ST -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ2390 //! @SYMREQ 12115 12122 12761 START_TEST_BLOCK 10000 te_ostv2integsuite_enabled \testdata\configs\te_perf_gon_con_gmatch_cmismatch.ini @@ -88,7 +88,7 @@ //! @SYMTestActions Calculate the typical and minimum times taken for trace APIs (compiled in, GroupID filtering on, Component ID Filtering on, GroupID filter doesn't match trace point, Component ID filter matches trace point) and run configs specified in the te_perf_default.ini config file. Output to te_apitestresults.csv along with its stack usage. //! @SYMTestExpectedResults Verify that there has not been any significant change in the performance figures from previous runs, other than expected by source code changes. //! @SYMTestType ST -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ2390 //! @SYMREQ 12115 12122 12761 START_TEST_BLOCK 10000 te_ostv2integsuite_enabled \testdata\configs\te_perf_gon_con_gmismatch_cmatch.ini @@ -113,7 +113,7 @@ //! @SYMTestActions Calculate the typical and minimum times taken for trace APIs (compiled in, GroupID filtering on, Component ID Filtering off, GroupID filter matches trace point, Component ID filter doesn't match trace point) and run configs specified in the te_perf_default.ini config file. Output to te_apitestresults.csv along with its stack usage. //! @SYMTestExpectedResults Verify that there has not been any significant change in the performance figures from previous runs, other than expected by source code changes. //! @SYMTestType ST -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ2390 //! @SYMREQ 12115 12122 12761 START_TEST_BLOCK 10000 te_ostv2integsuite_enabled \testdata\configs\te_perf_gon_coff_gmatch_cmismatch.ini @@ -138,7 +138,7 @@ //! @SYMTestActions Calculate the typical and minimum times taken for trace APIs (compiled in, GroupID filtering on, Component ID Filtering off, GroupID filter doesn't match trace point, Component ID filter matches trace point) and run configs specified in the te_perf_default.ini config file. Output to te_apitestresults.csv along with its stack usage. //! @SYMTestExpectedResults Verify that there has not been any significant change in the performance figures from previous runs, other than expected by source code changes. //! @SYMTestType ST -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ2390 //! @SYMREQ 12115 12122 12761 START_TEST_BLOCK 10000 te_ostv2integsuite_enabled \testdata\configs\te_perf_gon_coff_gmismatch_cmatch.ini @@ -163,7 +163,7 @@ //! @SYMTestActions Calculate the typical and minimum times taken for trace APIs (compiled in, GroupID filtering off, Component ID Filtering on, GroupID filter doesn't match trace point, Component ID filter matches trace point) and run configs specified in the te_perf_default.ini config file. Output to te_apitestresults.csv along with its stack usage. //! @SYMTestExpectedResults Verify that there has not been any significant change in the performance figures from previous runs, other than expected by source code changes. //! @SYMTestType ST -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ2390 //! @SYMREQ 12115 12122 12761 START_TEST_BLOCK 10000 te_ostv2integsuite_enabled \testdata\configs\te_perf_goff_con_gmismatch_cmatch.ini @@ -188,7 +188,7 @@ //! @SYMTestActions Calculate the typical and minimum times taken for trace APIs (compiled in, GroupID filtering off, Component ID Filtering on, GroupID filter matches trace point, Component ID filter doesn't match trace point) and run configs specified in the te_perf_default.ini config file. Output to te_apitestresults.csv along with its stack usage. //! @SYMTestExpectedResults Verify that there has not been any significant change in the performance figures from previous runs, other than expected by source code changes. //! @SYMTestType ST -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ2390 //! @SYMREQ 12115 12122 12761 START_TEST_BLOCK 10000 te_ostv2integsuite_enabled \testdata\configs\te_perf_goff_con_gmatch_cmismatch.ini @@ -213,7 +213,7 @@ //! @SYMTestActions Calculate the typical and minimum times taken for trace APIs (compiled in, GroupID filtering off, Component ID Filtering off, GroupID filter matches trace point, Component ID filter doesn't match trace point) and run configs specified in the te_perf_default.ini config file. Output to te_apitestresults.csv along with its stack usage. //! @SYMTestExpectedResults Verify that there has not been any significant change in the performance figures from previous runs, other than expected by source code changes. //! @SYMTestType ST -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ2390 //! @SYMREQ 12115 12122 12761 START_TEST_BLOCK 10000 te_ostv2integsuite_enabled \testdata\configs\te_perf_goff_coff_gmatch_cmatch.ini diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/testdata/scripts/te_perf_outputcsvsanity.script --- a/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/testdata/scripts/te_perf_outputcsvsanity.script Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/testdata/scripts/te_perf_outputcsvsanity.script Tue Jul 06 16:18:30 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -13,7 +13,7 @@ // Description: // -//! @File +//! @file //! @SYMTestSuiteName te_perf_outputcsvsanity.script //! @SYMScriptTestEnvironment TEF @@ -35,7 +35,7 @@ //! @SYMTestActions Compares a baseline.csv file included in the reference subfolder of the integration tests with that output from a default performance test ru n and return a fail if any of the column elements>10% from that expected. All elements compared and reported back with associated discrepancy //! @SYMTestExpectedResults Verify that there has not been any significant change in the performance figures from previous runs. //! @SYMTestType UT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ2390 //! @SYMREQ 12115 12122 12761 START_TEST_BLOCK 100 te_ostv2integsuite_enabled \testdata\configs\te_perf_outputcsvsanity.ini diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/testdata/scripts/te_perf_sanity.script --- a/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/testdata/scripts/te_perf_sanity.script Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/testdata/scripts/te_perf_sanity.script Tue Jul 06 16:18:30 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -13,7 +13,7 @@ // Description: // -//! @File +//! @file //! @SYMTestSuiteName te_perf_sanity.script //! @SYMScriptTestEnvironment TEF @@ -29,7 +29,7 @@ //! @SYMTestActions Compares lauterbach measured time for foo() with that generated in the returns a fail it is>10% from that expected. //! @SYMTestExpectedResults Verify that there has not been any significant change in the timer resolution figures from hardware measurement. //! @SYMTestType UT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ2390 //! @SYMREQ 12115 12122 12761 START_TEST_BLOCK 100 te_ostv2integsuite_enabled \testdata\configs\te_perf_sanity.ini diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/testdata/scripts/te_perf_sanity_disabled.script --- a/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/testdata/scripts/te_perf_sanity_disabled.script Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/testdata/scripts/te_perf_sanity_disabled.script Tue Jul 06 16:18:30 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -13,7 +13,7 @@ // Description: // -//! @File +//! @file //! @SYMTestSuiteName te_perf_sanity_disabled.script //! @SYMScriptTestEnvironment TEF diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/testdata/scripts/te_perf_sanity_enabled.script --- a/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/testdata/scripts/te_perf_sanity_enabled.script Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/testdata/scripts/te_perf_sanity_enabled.script Tue Jul 06 16:18:30 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -13,7 +13,7 @@ // Description: // -//! @File +//! @file //! @SYMTestSuiteName te_perf_sanity_enabled.script //! @SYMScriptTestEnvironment TEF diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/testdata/scripts/te_perf_sanityloop.script --- a/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/testdata/scripts/te_perf_sanityloop.script Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_performance/testdata/scripts/te_perf_sanityloop.script Tue Jul 06 16:18:30 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -13,7 +13,7 @@ // Description: // -//! @File +//! @file //! @SYMTestSuiteName te_perf_sanityloop.script //! @SYMScriptTestEnvironment TEF diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ulogger/TEF/device-driver/src/d_usbc.cpp --- a/traceservices/tracefw/integ_test/ulogger/TEF/device-driver/src/d_usbc.cpp Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ulogger/TEF/device-driver/src/d_usbc.cpp Tue Jul 06 16:18:30 2010 +0300 @@ -278,9 +278,9 @@ } if (id < 0) { - // DoRequest + // DoRequestL TRequestStatus* pS = (TRequestStatus*) m.Ptr0(); - DoRequest(~id, pS, m.Ptr1(), m.Ptr2()); + DoRequestL(~id, pS, m.Ptr1(), m.Ptr2()); m.Complete(KErrNone, ETrue); } else @@ -314,10 +314,10 @@ } // Asynchronous requests - overriding pure virtual // -void DLddUsbcChannel::DoRequest(TInt aReqNo, TRequestStatus* aStatus, TAny* a1, TAny* a2) +void DLddUsbcChannel::DoRequestL(TInt aReqNo, TRequestStatus* aStatus, TAny* a1, TAny* a2) { // Check on request status - //__KTRACE_OPT(KUSB, Kern::Printf("DoRequest 0x%08x", aReqNo)); + //__KTRACE_OPT(KUSB, Kern::Printf("DoRequestL 0x%08x", aReqNo)); if (aReqNo <= KUsbcMaxRequests) { TInt r = KErrNone; @@ -442,7 +442,7 @@ // ep0 requests if (!(iValidInterface || iOwnsDeviceControl)) { - //__KTRACE_OPT(KUSB, Kern::Printf("DoRequest rejected: not configured (Ep0)")); + //__KTRACE_OPT(KUSB, Kern::Printf("DoRequestL rejected: not configured (Ep0)")); r = KErrUsbInterfaceNotReady; goto exit; } @@ -454,7 +454,7 @@ iDeviceState == EUsbcDeviceStateSuspended)) ) { - //__KTRACE_OPT(KUSB, Kern::Printf("DoRequest rejected not configured (Ep %d)", aEndpointNum)); + //__KTRACE_OPT(KUSB, Kern::Printf("DoRequestL rejected not configured (Ep %d)", aEndpointNum)); r = KErrUsbInterfaceNotReady; goto exit; } @@ -462,7 +462,7 @@ if (!ValidEndpoint(aEndpointNum)) { - //__KTRACE_OPT(KPANIC, Kern::Printf(" Error: DoRequest Read: in error complete")); + //__KTRACE_OPT(KPANIC, Kern::Printf(" Error: DoRequestL Read: in error complete")); r = KErrUsbEpNotInInterface; goto exit; } @@ -481,13 +481,13 @@ pEndpoint = iEndpoint[aEndpointNum]; if (!pEndpoint) { - //__KTRACE_OPT(KPANIC, Kern::Printf(" Error: DoRequest Read: in error complete")); + //__KTRACE_OPT(KPANIC, Kern::Printf(" Error: DoRequestL Read: in error complete")); r = KErrUsbEpNotInInterface; goto exit; } pEndpointInfo = pEndpoint->EndpointInfo(); - //__KTRACE_OPT(KUSB, Kern::Printf("DoRequest %d", aEndpointNum)); + //__KTRACE_OPT(KUSB, Kern::Printf("DoRequestL %d", aEndpointNum)); switch (pTfr->iTransferType) { @@ -497,7 +497,7 @@ case ETransferTypeReadUntilShort: case ETransferTypeReadOneOrMore: { - //__KTRACE_OPT(KUSB, Kern::Printf("DoRequest Read")); + //__KTRACE_OPT(KUSB, Kern::Printf("DoRequestL Read")); if (pEndpoint->iDmaBuffers->RxIsActive()) { //__KTRACE_OPT(KUSB, Kern::Printf("**** ReadReq ep%d RxActive", aEndpointNum)); @@ -511,7 +511,7 @@ pEndpointInfo->iDir != KUsbEpDirBidirect) { // Trying to do the wrong thing - //__KTRACE_OPT(KPANIC, Kern::Printf(" Error: DoRequest Read: in error complete")); + //__KTRACE_OPT(KPANIC, Kern::Printf(" Error: DoRequestL Read: in error complete")); r = KErrUsbEpBadDirection; break; } @@ -530,7 +530,7 @@ { if (pTfr->iTransferType == ETransferTypeReadPacket) { - //__KTRACE_OPT(KUSB, Kern::Printf("DoRequest Read packet: data available complete")); + //__KTRACE_OPT(KUSB, Kern::Printf("DoRequestL Read packet: data available complete")); r = pEndpoint->CopyToClient(iClient); aNeedsCompletion = ETrue; break; @@ -539,7 +539,7 @@ { if (pTfr->iTransferSize <= pEndpoint->RxBytesAvailable()) { - //__KTRACE_OPT(KUSB, Kern::Printf("DoRequest Read data: data available complete")); + //__KTRACE_OPT(KUSB, Kern::Printf("DoRequestL Read data: data available complete")); r = pEndpoint->CopyToClient(iClient); aNeedsCompletion = ETrue; break; @@ -553,7 +553,7 @@ { if (pEndpoint->RxBytesAvailable() > 0) { - //__KTRACE_OPT(KUSB, Kern::Printf("DoRequest Read data: data available complete")); + //__KTRACE_OPT(KUSB, Kern::Printf("DoRequestL Read data: data available complete")); r = pEndpoint->CopyToClient(iClient); aNeedsCompletion = ETrue; break; @@ -571,7 +571,7 @@ (nRx < maxPacketSize) || pEndpoint->iDmaBuffers->ShortPacketExists()) { - //__KTRACE_OPT(KUSB, Kern::Printf("DoRequest Read data: data available complete")); + //__KTRACE_OPT(KUSB, Kern::Printf("DoRequestL Read data: data available complete")); r = pEndpoint->CopyToClient(iClient); aNeedsCompletion = ETrue; } @@ -584,7 +584,7 @@ r = pEndpoint->TryToStartRead(EFalse); if (r != KErrNone) { - //__KTRACE_OPT(KPANIC, Kern::Printf(" Error: DoRequest Read: couldn't start read")); + //__KTRACE_OPT(KPANIC, Kern::Printf(" Error: DoRequestL Read: couldn't start read")); r = KErrNone; // Reader full isn't a userside error; } break; @@ -592,33 +592,33 @@ case ETransferTypeWrite: { - //__KTRACE_OPT(KUSB, Kern::Printf("DoRequest Write 1")); + //__KTRACE_OPT(KUSB, Kern::Printf("DoRequestL Write 1")); if (pEndpointInfo->iDir != KUsbEpDirIn && pEndpointInfo->iDir != KUsbEpDirBidirect) { - //__KTRACE_OPT(KPANIC, Kern::Printf(" Error: DoRequest Write: wrong direction complete")); + //__KTRACE_OPT(KPANIC, Kern::Printf(" Error: DoRequestL Write: wrong direction complete")); r = KErrUsbEpBadDirection; break; } - //__KTRACE_OPT(KUSB, Kern::Printf("DoRequest Write 2")); + //__KTRACE_OPT(KUSB, Kern::Printf("DoRequestL Write 2")); TAny* logicalSrc = pTfr->iDes; TInt desLength = Kern::ThreadGetDesLength(iClient, logicalSrc); if (desLength < pTfr->iTransferSize) { - //__KTRACE_OPT(KPANIC, Kern::Printf(" Error: DoRequest Write: user buffer too short")); + //__KTRACE_OPT(KPANIC, Kern::Printf(" Error: DoRequestL Write: user buffer too short")); r = KErrUsbTransferSize; break; } - //__KTRACE_OPT(KUSB, Kern::Printf("DoRequest Write 3 length=%d maxlength=%d", + //__KTRACE_OPT(KUSB, Kern::Printf("DoRequestL Write 3 length=%d maxlength=%d", // pTfr->iTransferSize, desLength)); // Zero length writes are acceptable pEndpoint->SetClientWritePending(ETrue); r = pEndpoint->TryToStartWrite(pTfr); if (r != KErrNone) { - //__KTRACE_OPT(KPANIC, Kern::Printf(" Error: DoRequest Write: couldn't start write")); + //__KTRACE_OPT(KPANIC, Kern::Printf(" Error: DoRequestL Write: couldn't start write")); pEndpoint->SetClientWritePending(EFalse); } break; diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ulogger/TEF/te_ulogger/inc/te_uloggermclsuitedefs.h --- a/traceservices/tracefw/integ_test/ulogger/TEF/te_ulogger/inc/te_uloggermclsuitedefs.h Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ulogger/TEF/te_ulogger/inc/te_uloggermclsuitedefs.h Tue Jul 06 16:18:30 2010 +0300 @@ -34,7 +34,7 @@ public: ~CClearConfig(); CClearConfig(); - void Clear(RULogger& loggerSession); + void ClearL(RULogger& loggerSession); //private: }; diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ulogger/TEF/te_ulogger/scripts/te_uloggerconfigfile.script --- a/traceservices/tracefw/integ_test/ulogger/TEF/te_ulogger/scripts/te_uloggerconfigfile.script Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ulogger/TEF/te_ulogger/scripts/te_uloggerconfigfile.script Tue Jul 06 16:18:30 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -13,7 +13,7 @@ // Description: // -//! @File +//! @file //! @SYMTestSuiteName utfv1-api-uloggerv1-configfile-test-suite.script //! @SYMScriptTestEnvironment TEF @@ -38,7 +38,7 @@ //! @SYMTestActions Compare the settings in the ulogger server with that specified in the test config file in \testdata\configs\configfiletracecontrolconfig.ini //! @SYMTestExpectedResults Verify that the returned settings match those expected (test step returns a test pass if so) //! @SYMTestType CT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ1635 //! @SYMREQ RUN_TEST_STEP 1000 te_uloggermclsuite ULoggerPublicConfigFileTestStep @@ -60,7 +60,7 @@ //! @SYMTestActions Having deleted c:\ulogger\uloggerconfig.ini in the public path, now compare the settings in the ulogger server with that specified by default in the private path //! @SYMTestExpectedResults Verify that the returned settings match those expected (test step returns a test pass if so) //! @SYMTestType CT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ1635 //! @SYMREQ RUN_TEST_STEP 1000 te_uloggermclsuite ULoggerPrivateConfigFileTestStep @@ -82,7 +82,7 @@ //! @SYMTestActions Having reinstated a config file on the public path, now compare the settings in the ulogger server with that specified in the public path //! @SYMTestExpectedResults Verify that the returned settings match those expected (test step returns a test pass if so) //! @SYMTestType CT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ1635 //! @SYMREQ RUN_TEST_STEP 1000 te_uloggermclsuite ULoggerPublicConfigFileTestStep diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ulogger/TEF/te_ulogger/scripts/te_uloggerconfigfile_winscw.script --- a/traceservices/tracefw/integ_test/ulogger/TEF/te_ulogger/scripts/te_uloggerconfigfile_winscw.script Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ulogger/TEF/te_ulogger/scripts/te_uloggerconfigfile_winscw.script Tue Jul 06 16:18:30 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -14,7 +14,7 @@ // -//! @File +//! @file //! @SYMTestSuiteName utfv1-api-uloggerv1-configfilewinscw-test-suite.script //! @SYMScriptTestEnvironment TEF @@ -36,7 +36,7 @@ //! @SYMTestActions Compare the settings in the ulogger server with that specified in the test config file in \testdata\configs\configfiletracecontrolconfig.ini //! @SYMTestExpectedResults Verify that the returned settings match those expected (test step returns a test pass if so) //! @SYMTestType CT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ1635 //! @SYMREQ RUN_TEST_STEP 1000 te_uloggermclsuite ULoggerPublicConfigFileTestStep @@ -57,7 +57,7 @@ //! @SYMTestActions Having deleted c:\ulogger\uloggerconfig.ini in the public path, now compare the settings in the ulogger server with that specified by default in the private path //! @SYMTestExpectedResults Verify that the returned settings match those expected (test step returns a test pass if so) //! @SYMTestType CT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ1635 //! @SYMREQ RUN_TEST_STEP 1000 te_uloggermclsuite ULoggerPrivateConfigFileTestStep @@ -77,7 +77,7 @@ //! @SYMTestActions Having reinstated a config file on the public path, now compare the settings in the ulogger server with that specified in the public path //! @SYMTestExpectedResults Verify that the returned settings match those expected (test step returns a test pass if so) //! @SYMTestType CT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ1635 //! @SYMREQ RUN_TEST_STEP 1000 te_uloggermclsuite ULoggerPublicConfigFileTestStep diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ulogger/TEF/te_ulogger/scripts/te_uloggermclperfsuite.script --- a/traceservices/tracefw/integ_test/ulogger/TEF/te_ulogger/scripts/te_uloggermclperfsuite.script Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ulogger/TEF/te_ulogger/scripts/te_uloggermclperfsuite.script Tue Jul 06 16:18:30 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -14,7 +14,7 @@ // -//! @File +//! @file //! @SYMTestSuiteName utfv1-api-uloggerv1-performance-test-suite.script //! @SYMScriptTestEnvironment TEF @@ -31,7 +31,7 @@ //! @SYMTestActions Calculate the cached and non-cached times taken for user side trace APIs, outputting to file and serial plugins. //! @SYMTestExpectedResults Verify that there has not been any significant change in the performance figures from previous runs. //! @SYMTestType CT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ1635 //! @SYMREQ RUN_TEST_STEP 1000000 te_uloggermclsuite ULoggerMCLUserPerfStep @@ -53,7 +53,7 @@ //! @SYMTestActions Calculate the cached and non-cached times taken for kernel side trace APIs, outputting to file and serial plugins. //! @SYMTestExpectedResults Verify that there has not been any significant change in the performance figures from previous runs. //! @SYMTestType CT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ1635 //! @SYMREQ RUN_TEST_STEP 1000000 te_uloggermclsuite ULoggerMCLKernelPerfStep diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ulogger/TEF/te_ulogger/scripts/te_uloggermclsuite.script --- a/traceservices/tracefw/integ_test/ulogger/TEF/te_ulogger/scripts/te_uloggermclsuite.script Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ulogger/TEF/te_ulogger/scripts/te_uloggermclsuite.script Tue Jul 06 16:18:30 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -14,7 +14,7 @@ // -//! @File +//! @file //! @SYMTestSuiteName utfv1-api-uloggerv1-integration-test-suite.script //! @SYMScriptTestEnvironment TEF @@ -32,7 +32,7 @@ //! @SYMTestActions Run a combination of single and multiple Primary filter set() methods and check the contents of the get() methods on server return the filters as expected //! @SYMTestExpectedResults Verify that the returned gettings match those expected from settings (test step returns a test pass if so) //! @SYMTestType CT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ1635 //! @SYMREQ RUN_TEST_STEP 1000 te_uloggermclsuite ULoggerAPIPrimTestStep @@ -46,7 +46,7 @@ //! @SYMTestActions Run a combination of single and multiple Secondary filter set() methods and check the contents of the get() methods on server return the filters as expected //! @SYMTestExpectedResults Verify that the returned gettings match those expected from settings (test step returns a test pass if so) //! @SYMTestType CT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ1635 //! @SYMREQ RUN_TEST_STEP 20000 te_uloggermclsuite ULoggerAPISecondTestStep @@ -60,7 +60,7 @@ //! @SYMTestActions Run a combination of single and multiple filter and filtering set() methods instrument user-side trace points accordingly for positive, begative and multiple setting tests //! @SYMTestExpectedResults Verify that the returned trace data and the output trace log files match the setttings in the ulogger accordingly //! @SYMTestType CT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ1635 //! @SYMREQ RUN_TEST_STEP 1000 te_uloggermclsuite ULoggerAPILoggingTestStep @@ -74,7 +74,7 @@ //! @SYMTestActions Run a combination of buffer resizing methods and run over various stress testing trace instrumentations. check the contents of the output file is as expected //! @SYMTestExpectedResults Verify that output file contains #traces as expected //! @SYMTestType CT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ1635 //! @SYMREQ RUN_TEST_STEP 1000 te_uloggermclsuite ULoggerBufferSizingStep @@ -88,7 +88,7 @@ //! @SYMTestActions Run a combination of buffer mode change methods and run over various stress testing trace instrumentations. check the contents of the output file is as expected //! @SYMTestExpectedResults Verify that output file contains a trace pattern as expected from buffer mode type //! @SYMTestType CT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ1635 //! @SYMREQ RUN_TEST_STEP 1000 te_uloggermclsuite ULoggerBufferModeStep @@ -102,7 +102,7 @@ //! @SYMTestActions Run a combination of single and multiple filter and filtering set() methods instrument kernel-side trace points accordingly for positive, begative and multiple setting tests //! @SYMTestExpectedResults Verify that the returned trace data and the output trace log files match the setttings in the ulogger accordingly //! @SYMTestType CT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ1635 //! @SYMREQ RUN_TEST_STEP 1000 te_uloggermclsuite ULoggerAPIKernelTestStep @@ -116,7 +116,7 @@ //! @SYMTestActions Run a combination of single and multiple filter and filtering set() methods instrument user-side trace printf-style points accordingly for positive, begative and multiple setting tests //! @SYMTestExpectedResults Verify that the returned trace data and the output trace log files match the setttings in the ulogger accordingly //! @SYMTestType CT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ1635 //! @SYMREQ RUN_TEST_STEP 1000 te_uloggermclsuite ULoggerAPIPrintfTestStep @@ -130,7 +130,7 @@ //! @SYMTestActions Run a combination of single and multiple filter and filtering set() methods instrument kernel-side trace printf-style points accordingly for positive, begative and multiple setting tests //! @SYMTestExpectedResults Verify that the returned trace data and the output trace log files match the setttings in the ulogger accordingly //! @SYMTestType CT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ1635 //! @SYMREQ RUN_TEST_STEP 1000 te_uloggermclsuite ULoggerAPIKernelPrintfTestStep @@ -146,7 +146,7 @@ //! @SYMTestActions Run a combination of plguin configuration methods for the file plugin and log over trace instrumentaion //! @SYMTestExpectedResults Verify that the trace data is output as expected to the file plugin //! @SYMTestType CT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ1635 //! @SYMREQ RUN_TEST_STEP 1000 te_uloggermclsuite ULoggerFilePluginStep @@ -160,7 +160,7 @@ //! @SYMTestActions Run a combination of plguin configuration methods for the serial plugin and log over trace instrumentaion //! @SYMTestExpectedResults Verify that the trace data is output as expected to the serial plugin //! @SYMTestType CT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ1635 //! @SYMREQ RUN_TEST_STEP 1000 te_uloggermclsuite ULoggerSerialPluginStep @@ -174,7 +174,7 @@ //! @SYMTestActions Run a combination of plguin configuration methods for the file plugin and test on the return errors //! @SYMTestExpectedResults Verify that the errors returned are as expected //! @SYMTestType CT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ1635 //! @SYMREQ RUN_TEST_STEP 1000 te_uloggermclsuite ULoggerFilePluginStepErr diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ulogger/TEF/te_ulogger/scripts/te_uloggersysstart.script --- a/traceservices/tracefw/integ_test/ulogger/TEF/te_ulogger/scripts/te_uloggersysstart.script Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ulogger/TEF/te_ulogger/scripts/te_uloggersysstart.script Tue Jul 06 16:18:30 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -14,7 +14,7 @@ // -//! @File +//! @file //! @SYMTestSuiteName utfv1-api-uloggerv1-sysstart-test-suite.script //! @SYMScriptTestEnvironment TEF @@ -34,7 +34,7 @@ //! @SYMTestActions Compile a rom with uloggersysstart.exe compiled into startup sequence and uncomment #define systart in ULoggerAPILoggingTestStep. Run test step. //! @SYMTestExpectedResults Verify that the output log contains btrace output from bott sequence as well as trace points enabled in ULoggerAPILoggingTestStep //! @SYMTestType CT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ1635 //! @SYMREQ RUN_TEST_STEP 1000 te_uloggermclsuite ULoggerAPILoggingTestStep diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ulogger/TEF/te_ulogger/src/te_uloggerapiteststep.cpp --- a/traceservices/tracefw/integ_test/ulogger/TEF/te_ulogger/src/te_uloggerapiteststep.cpp Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ulogger/TEF/te_ulogger/src/te_uloggerapiteststep.cpp Tue Jul 06 16:18:30 2010 +0300 @@ -81,7 +81,7 @@ Result=logger.Connect(); INFO_PRINTF2(_L("connect err %d"), Result); CClearConfig configIni; - configIni.Clear(logger); + configIni.ClearL(logger); INFO_PRINTF2(_L("connect err %d"), Result); Result=logger.SetPrimaryFiltersEnabled(*setfilter,ETrue); @@ -280,7 +280,7 @@ // ************** Block end **************** - configIni.Clear(logger); + configIni.ClearL(logger); logger.Close(); if(setfilter) delete setfilter; @@ -361,7 +361,7 @@ logger.Connect(); CClearConfig configIni; - configIni.Clear(logger); + configIni.ClearL(logger); Result = logger.SetSecondaryFiltersEnabled(setfilter,ETrue); INFO_PRINTF2(_L("Secondary filter has been set with single filter, %d, check log"), setfilter[0]); INFO_PRINTF2(_L("code: %d"), Result); @@ -547,7 +547,7 @@ } } INFO_PRINTF1(_L("Now call clear config to check removing multiple second filters performance")); - configIni.Clear(logger); + configIni.ClearL(logger); INFO_PRINTF1(_L("after clear config- multiple second filters performance")); if(Result==1) @@ -640,7 +640,7 @@ #endif #ifndef SysStartTest CClearConfig configIni; - configIni.Clear(logger); + configIni.ClearL(logger); #endif CArrayFixFlat *setprimfilter = new (ELeave)CArrayFixFlat(1); setprimfilter->AppendL(UTracePrimary); @@ -909,7 +909,7 @@ { INFO_PRINTF1(_L("Now do some multiple type logging testing.")); //CClearConfig configIni; - //configIni.Clear(logger); + //configIni.ClearL(logger); if(Result==0) { @@ -1062,7 +1062,7 @@ multsetprimfilter=NULL; } } - configIni.Clear(logger); + configIni.ClearL(logger); } else INFO_PRINTF1(_L("adding file as output plugin failed")); @@ -1151,7 +1151,7 @@ RULogger logger; logger.Connect(); CClearConfig configIni; - configIni.Clear(logger); + configIni.ClearL(logger); CArrayFixFlat *setprimfilter = new (ELeave)CArrayFixFlat(1); setprimfilter->AppendL(UTracePrimary); RArray setsecondfilter; @@ -1377,7 +1377,7 @@ else SetTestStepResult(EFail); INFO_PRINTF1(_L("Multiple logging to file with kernel side tracing has been tested - check output log. It should contain four lines of tracing of type, (sec,prim), (sec+2, prim), (sec, prim+2), (sec+2, prim+2)")); - configIni.Clear(logger); + configIni.ClearL(logger); } if(setprimfilter) { @@ -1462,7 +1462,7 @@ RULogger logger; logger.Connect(); CClearConfig configIni; - configIni.Clear(logger); + configIni.ClearL(logger); CArrayFixFlat *setprimfilter = new (ELeave)CArrayFixFlat(1); setprimfilter->AppendL(UTracePrimary); RArray setsecondfilter; @@ -1643,7 +1643,7 @@ RULogger logger; logger.Connect(); CClearConfig configIni; - configIni.Clear(logger); + configIni.ClearL(logger); CArrayFixFlat *setprimfilter = new (ELeave)CArrayFixFlat(1); setprimfilter->AppendL(UTracePrimary); RArray setsecondfilter; @@ -1870,7 +1870,7 @@ else SetTestStepResult(EFail); INFO_PRINTF1(_L("Multiple printf logging to file with kernel side tracing has been tested - check output log. It should contain four lines of tracing of type, (sec,prim), (sec+2, prim), (sec, prim+2), (sec+2, prim+2)")); - configIni.Clear(logger); + configIni.ClearL(logger); } if(setprimfilter) { diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ulogger/TEF/te_ulogger/src/te_uloggerbuffermodestep.cpp --- a/traceservices/tracefw/integ_test/ulogger/TEF/te_ulogger/src/te_uloggerbuffermodestep.cpp Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ulogger/TEF/te_ulogger/src/te_uloggerbuffermodestep.cpp Tue Jul 06 16:18:30 2010 +0300 @@ -115,7 +115,7 @@ RULogger logger; logger.Connect(); CClearConfig configIni; - configIni.Clear(logger); + configIni.ClearL(logger); TInt iBufferCircular = 0; TInt iBufferStraight = 1; TInt iGetBuffer = 2; diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ulogger/TEF/te_ulogger/src/te_uloggerbuffersizingstep.cpp --- a/traceservices/tracefw/integ_test/ulogger/TEF/te_ulogger/src/te_uloggerbuffersizingstep.cpp Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ulogger/TEF/te_ulogger/src/te_uloggerbuffersizingstep.cpp Tue Jul 06 16:18:30 2010 +0300 @@ -98,7 +98,7 @@ RULogger logger; logger.Connect(); CClearConfig configIni; - configIni.Clear(logger); + configIni.ClearL(logger); CArrayFixFlat *setprimfilter = new (ELeave)CArrayFixFlat(1); setprimfilter->AppendL(UTracePrimary); RArray setsecondfilter; diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ulogger/TEF/te_ulogger/src/te_uloggerclearconfigstep.cpp --- a/traceservices/tracefw/integ_test/ulogger/TEF/te_ulogger/src/te_uloggerclearconfigstep.cpp Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ulogger/TEF/te_ulogger/src/te_uloggerclearconfigstep.cpp Tue Jul 06 16:18:30 2010 +0300 @@ -62,7 +62,7 @@ RULogger logger; logger.Connect(); CClearConfig configIni; - configIni.Clear(logger); + configIni.ClearL(logger); SetTestStepResult(EPass); return TestStepResult(); } diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ulogger/TEF/te_ulogger/src/te_uloggerfilepluginstep.cpp --- a/traceservices/tracefw/integ_test/ulogger/TEF/te_ulogger/src/te_uloggerfilepluginstep.cpp Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ulogger/TEF/te_ulogger/src/te_uloggerfilepluginstep.cpp Tue Jul 06 16:18:30 2010 +0300 @@ -68,7 +68,7 @@ RULogger logger; logger.Connect(); CClearConfig configIni; - configIni.Clear(logger); + configIni.ClearL(logger); _LIT8(KTextmedia,"uloggerfileplugin"); const TPtrC8 mediaptr(KTextmedia); if(Result==0||Result==-11) diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ulogger/TEF/te_ulogger/src/te_uloggerfilepluginsteperr.cpp --- a/traceservices/tracefw/integ_test/ulogger/TEF/te_ulogger/src/te_uloggerfilepluginsteperr.cpp Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ulogger/TEF/te_ulogger/src/te_uloggerfilepluginsteperr.cpp Tue Jul 06 16:18:30 2010 +0300 @@ -49,7 +49,7 @@ RULogger logger; logger.Connect(); CClearConfig configIni; - configIni.Clear(logger); + configIni.ClearL(logger); _LIT8(KTextmedia,"te_fileplugin"); const TPtrC8 mediaptr(KTextmedia); INFO_PRINTF1(_L("Setting test plugin as active...")); diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ulogger/TEF/te_ulogger/src/te_uloggermclperfstep.cpp --- a/traceservices/tracefw/integ_test/ulogger/TEF/te_ulogger/src/te_uloggermclperfstep.cpp Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ulogger/TEF/te_ulogger/src/te_uloggermclperfstep.cpp Tue Jul 06 16:18:30 2010 +0300 @@ -86,7 +86,7 @@ RULogger logger; logger.Connect(); CClearConfig configIni; - configIni.Clear(logger); + configIni.ClearL(logger); CArrayFixFlat *setprimfilter = new (ELeave)CArrayFixFlat(1); setprimfilter->AppendL(UTracePrimary); RArray setsecondfilter; @@ -344,7 +344,7 @@ RULogger logger; logger.Connect(); CClearConfig configIni; - configIni.Clear(logger); + configIni.ClearL(logger); CArrayFixFlat *setprimfilter = new (ELeave)CArrayFixFlat(1); setprimfilter->AppendL(UTracePrimary); RArray setsecondfilter; diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ulogger/TEF/te_ulogger/src/te_uloggermclsuitedefs.cpp --- a/traceservices/tracefw/integ_test/ulogger/TEF/te_ulogger/src/te_uloggermclsuitedefs.cpp Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ulogger/TEF/te_ulogger/src/te_uloggermclsuitedefs.cpp Tue Jul 06 16:18:30 2010 +0300 @@ -33,7 +33,7 @@ /*Constructor*/ } -void CClearConfig::Clear(RULogger& loggerSession) +void CClearConfig::ClearL(RULogger& loggerSession) { loggerSession.Stop(); loggerSession.DeActivateInputPlugin(); diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/integ_test/ulogger/TEF/te_ulogger/src/te_uloggerserialpluginstep.cpp --- a/traceservices/tracefw/integ_test/ulogger/TEF/te_ulogger/src/te_uloggerserialpluginstep.cpp Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/integ_test/ulogger/TEF/te_ulogger/src/te_uloggerserialpluginstep.cpp Tue Jul 06 16:18:30 2010 +0300 @@ -69,7 +69,7 @@ RULogger logger; logger.Connect(); CClearConfig configIni; - configIni.Clear(logger); + configIni.ClearL(logger); CArrayFixFlat *setprimfilter = new (ELeave)CArrayFixFlat(1); setprimfilter->AppendL(UTracePrimary); RArray setsecondfilter; diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/ost_trace_api/unit_test/lauterbach_perf_tester/group/te_lauterbach.mmp --- a/traceservices/tracefw/ost_trace_api/unit_test/lauterbach_perf_tester/group/te_lauterbach.mmp Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/ost_trace_api/unit_test/lauterbach_perf_tester/group/te_lauterbach.mmp Tue Jul 06 16:18:30 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -29,12 +29,11 @@ LIBRARY euser.lib #if defined (WINS) - DEFFILE ..\bwins\te_lauterbach.def + DEFFILE ../bwins/te_lauterbach.def #else - DEFFILE ..\eabi\te_lauterbach.def + DEFFILE ../eabi/te_lauterbach.def #endif OPTION ARMCC --interleave SMPSAFE - diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/ost_trace_api/unit_test/lauterbach_perf_tester/inc/utracemacros.h --- a/traceservices/tracefw/ost_trace_api/unit_test/lauterbach_perf_tester/inc/utracemacros.h Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/ost_trace_api/unit_test/lauterbach_perf_tester/inc/utracemacros.h Tue Jul 06 16:18:30 2010 +0300 @@ -58,17 +58,17 @@ /**@internalComponent*/ #define UTRACE_PRIMARY_0(aClassification,aCategory,aContext,aPc,aFormatId) \ - ((BTrace::TBTrace2)BTrace::OutX) \ - (UTRACE_HEADER(8,(aClassification),(aCategory),(aContext),(aPc)), (TUint32)(aFormatId)) + BTrace::OutX \ + (UTRACE_HEADER(8,(aClassification),(aCategory),(aContext),(aPc)), (TUint32)(aFormatId),0,0) /**@internalComponent*/ #define UTRACE_PRIMARY_1(aClassification,aCategory,aContext,aPc,aFormatId, aData1) \ - ((BTrace::TBTrace3)BTrace::OutX)\ - (UTRACE_HEADER(12,(aClassification),(aCategory),(aContext),(aPc)),(TUint32)(aFormatId),(TUint32)(aData1)) + BTrace::OutX \ + (UTRACE_HEADER(12,(aClassification),(aCategory),(aContext),(aPc)),(TUint32)(aFormatId),(TUint32)(aData1),0) /**@internalComponent*/ #define UTRACE_PRIMARY_2(aClassification,aCategory,aContext,aPc,aFormatId,aData1,aData2) \ - (BTrace::OutX)\ + BTrace::OutX \ (UTRACE_HEADER(16,(aClassification),(aCategory),(aContext),(aPc)),(TUint32)(aFormatId),(TUint32)(aData1),(TUint32)(aData2)) /**@internalComponent @@ -84,11 +84,11 @@ /**@internalComponent*/ #define UTRACE_SECONDARY_0(aClassification,aModuleUid,aCategory,aContext,aPc,aFormatId) \ - ((BTrace::TBTrace3)BTrace::OutFilteredX)(UTRACE_HEADER(12,(aClassification),(aCategory),(aContext),(aPc)),(TUint32)(aModuleUid),(TUint32)(aFormatId)) + BTrace::OutFilteredX(UTRACE_HEADER(12,(aClassification),(aCategory),(aContext),(aPc)),(TUint32)(aModuleUid),(TUint32)(aFormatId),0) /** @internalComponent */ #define UTRACE_SECONDARY_1(aClassification,aModuleUid,aCategory,aContext,aPc,aFormatId, aData1) \ - (BTrace::OutFilteredX)(UTRACE_HEADER(16,(aClassification),(aCategory),(aContext),(aPc)),(TUint32)(aModuleUid),(TUint32)(aFormatId),(TUint32)(aData1)) + BTrace::OutFilteredX(UTRACE_HEADER(16,(aClassification),(aCategory),(aContext),(aPc)),(TUint32)(aModuleUid),(TUint32)(aFormatId),(TUint32)(aData1)) /** @internalComponent * You have to use the ANY macro instead. diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/ost_trace_api/unit_test/te_ost/group/te_ost.iby --- a/traceservices/tracefw/ost_trace_api/unit_test/te_ost/group/te_ost.iby Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/ost_trace_api/unit_test/te_ost/group/te_ost.iby Tue Jul 06 16:18:30 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -20,19 +20,19 @@ #include #include -file=ABI_DIR\DEBUG_DIR\te_ost_enabled.exe sys\bin\te_ost_enabled.exe -file=ABI_DIR\DEBUG_DIR\te_ost_disabled.exe sys\bin\te_ost_disabled.exe -file=ABI_DIR\DEBUG_DIR\te_ost_record_content.exe sys\bin\te_ost_record_content.exe -file=ABI_DIR\DEBUG_DIR\te_ost_multipart_trace.exe sys\bin\te_ost_multipart_trace.exe -file=ABI_DIR\DEBUG_DIR\te_ost_lauterbach.dll sys\bin\te_ost_lauterbach.dll -file=ABI_DIR\DEBUG_DIR\te_ost_macros_disabled.exe sys\bin\te_ost_macros_disabled.exe -file=ABI_DIR\DEBUG_DIR\te_ost_macros_enabled.exe sys\bin\te_ost_macros_enabled.exe +file=ABI_DIR\DEBUG_DIR\te_ost_enabled.exe sys\bin\te_ost_enabled.exe +file=ABI_DIR\DEBUG_DIR\te_ost_disabled.exe sys\bin\te_ost_disabled.exe +file=ABI_DIR\DEBUG_DIR\te_ost_record_content.exe sys\bin\te_ost_record_content.exe +file=ABI_DIR\DEBUG_DIR\te_ost_multipart_trace.exe sys\bin\te_ost_multipart_trace.exe +file=ABI_DIR\DEBUG_DIR\te_ost_lauterbach.dll sys\bin\te_ost_lauterbach.dll +file=ABI_DIR\DEBUG_DIR\te_ost_macros_disabled.exe sys\bin\te_ost_macros_disabled.exe +file=ABI_DIR\DEBUG_DIR\te_ost_macros_enabled.exe sys\bin\te_ost_macros_enabled.exe -ROM_IMAGE[0] device[VARID]=ABI_DIR\DEBUG_DIR\te_ost_lauterbach_kernel.dll sys\bin\te_ost_lauterbach_kernel.dll -ROM_IMAGE[0] device[VARID]=ABI_DIR\DEBUG_DIR\te_ostdd_enabled.ldd sys\bin\te_ostdd_enabled.ldd -ROM_IMAGE[0] device[VARID]=ABI_DIR\DEBUG_DIR\te_ostdd_disabled.ldd sys\bin\te_ostdd_disabled.ldd +//ROM_IMAGE[0] device[VARID]=ABI_DIR\DEBUG_DIR\te_ost_lauterbach_kernel.dll sys\bin\te_ost_lauterbach_kernel.dll +ROM_IMAGE[0] device[VARID]=ABI_DIR\DEBUG_DIR\te_ostdd_enabled.ldd sys\bin\te_ostdd_enabled.ldd +ROM_IMAGE[0] device[VARID]=ABI_DIR\DEBUG_DIR\te_ostdd_disabled.ldd sys\bin\te_ostdd_disabled.ldd -data=EPOCROOT##epoc32\release\winscw\udeb\z\testdata\scripts\te_ostsuite.script testdata\scripts\te_ostsuite.script -data=EPOCROOT##epoc32\release\winscw\udeb\z\testdata\configs\te_ost_trace_user.ini testdata\configs\te_ost_trace_user.ini +data=EPOCROOT##epoc32\release\winscw\udeb\z\testdata\scripts\te_ostsuite.script testdata\scripts\te_ostsuite.script +data=EPOCROOT##epoc32\release\winscw\udeb\z\testdata\configs\te_ost_trace_user.ini testdata\configs\te_ost_trace_user.ini -#endif \ No newline at end of file +#endif diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/ost_trace_api/unit_test/te_ost/group/te_record_content_suite.mmp --- a/traceservices/tracefw/ost_trace_api/unit_test/te_ost/group/te_record_content_suite.mmp Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/ost_trace_api/unit_test/te_ost/group/te_record_content_suite.mmp Tue Jul 06 16:18:30 2010 +0300 @@ -29,11 +29,11 @@ OS_LAYER_SYSTEMINCLUDE -USERINCLUDE ..\inc +USERINCLUDE ../inc USERINCLUDE ../../devicedriver/inc/ USERINCLUDE ../../lauterbach_perf_tester/inc/ -SOURCEPATH ..\src +SOURCEPATH ../src SOURCE te_suite_server.cpp SOURCE te_suite_step_base.cpp SOURCE te_check_record_content_step.cpp diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/ost_trace_api/unit_test/te_ost/group/te_trace_disabled_suite.mmp --- a/traceservices/tracefw/ost_trace_api/unit_test/te_ost/group/te_trace_disabled_suite.mmp Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/ost_trace_api/unit_test/te_ost/group/te_trace_disabled_suite.mmp Tue Jul 06 16:18:30 2010 +0300 @@ -28,11 +28,11 @@ OS_LAYER_SYSTEMINCLUDE -USERINCLUDE ..\inc +USERINCLUDE ../inc USERINCLUDE ../../devicedriver/inc/ USERINCLUDE ../../lauterbach_perf_tester/inc/ -SOURCEPATH ..\src +SOURCEPATH ../src SOURCE te_suite_server.cpp SOURCE te_suite_step_base.cpp SOURCE te_check_build_variability_step.cpp diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/ost_trace_api/unit_test/te_ost/group/te_trace_enabled_suite.mmp --- a/traceservices/tracefw/ost_trace_api/unit_test/te_ost/group/te_trace_enabled_suite.mmp Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/ost_trace_api/unit_test/te_ost/group/te_trace_enabled_suite.mmp Tue Jul 06 16:18:30 2010 +0300 @@ -28,11 +28,11 @@ OS_LAYER_SYSTEMINCLUDE -USERINCLUDE ..\inc +USERINCLUDE ../inc USERINCLUDE ../../devicedriver/inc/ USERINCLUDE ../../lauterbach_perf_tester/inc/ -SOURCEPATH ..\src +SOURCEPATH ../src SOURCE te_suite_server.cpp te_suite_step_base.cpp SOURCE te_check_build_variability_step.cpp SOURCE te_check_record_content_step.cpp diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/ost_trace_api/unit_test/te_ost/inc/te_check_build_variability_step.h --- a/traceservices/tracefw/ost_trace_api/unit_test/te_ost/inc/te_check_build_variability_step.h Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/ost_trace_api/unit_test/te_ost/inc/te_check_build_variability_step.h Tue Jul 06 16:18:30 2010 +0300 @@ -35,9 +35,9 @@ // virtual TVerdict doTestStepPostambleL(); private: TVerdict CheckBuildtimeVariability(); - TVerdict CheckLoggingVariability(); - TBool TestTraces(); - TBool DoSendTrace(TTraceApiUsed aApiUsed); + TVerdict CheckLoggingVariabilityL(); + TBool TestTracesL(); + TBool DoSendTraceL(TTraceApiUsed aApiUsed); TBool WasTraceVariabilitySuccessful(TInt aTraceResult); }; diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/ost_trace_api/unit_test/te_ost/inc/te_check_record_content_step.h --- a/traceservices/tracefw/ost_trace_api/unit_test/te_ost/inc/te_check_record_content_step.h Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/ost_trace_api/unit_test/te_ost/inc/te_check_record_content_step.h Tue Jul 06 16:18:30 2010 +0300 @@ -37,7 +37,7 @@ // virtual TVerdict doTestStepPostambleL(); private: TInt CompareTraces(); - TInt WriteTraces(); + TInt WriteTracesL(); TInt ReadTraces(); TTraceConfigs* CreateTrace(TTraceApiUsed aApi); TTraceParser iParser; diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/ost_trace_api/unit_test/te_ost/inc/te_suite_step_base.h --- a/traceservices/tracefw/ost_trace_api/unit_test/te_ost/inc/te_suite_step_base.h Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/ost_trace_api/unit_test/te_ost/inc/te_suite_step_base.h Tue Jul 06 16:18:30 2010 +0300 @@ -50,7 +50,7 @@ TInt StartLoggingL(TTraceConfigs& aTraceData); TInt StopLogging(); void SetLogFilename(const TDesC& aFilename); - void DeleteLogFile(); + void DeleteLogFileL(); protected: TTraceTester iTraceTester; TTraceConfigs iTraceData; diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/ost_trace_api/unit_test/te_ost/inc/te_tracer.h --- a/traceservices/tracefw/ost_trace_api/unit_test/te_ost/inc/te_tracer.h Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/ost_trace_api/unit_test/te_ost/inc/te_tracer.h Tue Jul 06 16:18:30 2010 +0300 @@ -35,7 +35,7 @@ static TInt SendTraceL(TTraceConfigs& aTraceData); static TInt TimeTraceL(TTraceConfigs& aTraceData, TUint32& aTime, TUint32& aCount); private: - static TInt TimeTraceCall(TTraceConfigs& aTraceData, TUint32& aTime, TUint32& aCount); + static TInt TimeTraceCallL(TTraceConfigs& aTraceData, TUint32& aTime, TUint32& aCount); }; #endif /*TE_TRACER_H_*/ diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/ost_trace_api/unit_test/te_ost/inc/uloggerconfig.h --- a/traceservices/tracefw/ost_trace_api/unit_test/te_ost/inc/uloggerconfig.h Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/ost_trace_api/unit_test/te_ost/inc/uloggerconfig.h Tue Jul 06 16:18:30 2010 +0300 @@ -34,8 +34,8 @@ public: ~CClearConfig(); CClearConfig(); - void Clear(RULogger& loggerSession); - void Default(RULogger& loggerSession); + void ClearL(RULogger& loggerSession); + void DefaultL(RULogger& loggerSession); //private: }; diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/ost_trace_api/unit_test/te_ost/scripts/te_ostsuite.script --- a/traceservices/tracefw/ost_trace_api/unit_test/te_ost/scripts/te_ostsuite.script Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/ost_trace_api/unit_test/te_ost/scripts/te_ostsuite.script Tue Jul 06 16:18:30 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -13,7 +13,7 @@ // Description: // -//! @File +//! @file //! @SYMTestSuiteName ostv2-api-unit-test-suite.script //! @SYMScriptTestEnvironment TEF @@ -28,7 +28,7 @@ //! @SYMTestActions For various size payloads inducing multi-parting of the trace packet (>80bytes) test the data contained in the trace packets //! @SYMTestExpectedResults Verify that the trace packet contain payload data multiparted as expected //! @SYMTestType UT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ2390 //! @SYMREQ 12115 12144 12761 12825 RUN_TEST_STEP 100 te_ost_multipart_trace CMultiTraceTestStep z:\testdata\configs\te_ost_trace_user.ini variability @@ -45,7 +45,7 @@ //! @SYMTestActions For trace compiled in at build time, instrument and output trace points //! @SYMTestExpectedResults Verify that trace is implemented and output as expected //! @SYMTestType UT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ2390 //! @SYMREQ 12115 12144 12761 12825 RUN_TEST_STEP 100 te_ost_enabled CCheckBuildVariabilityStep z:\testdata\configs\te_ost_trace_user.ini variability @@ -62,7 +62,7 @@ //! @SYMTestActions For trace compiled out at build time, instrument and output trace points //! @SYMTestExpectedResults Verify that trace is implemented and not output as expected //! @SYMTestType UT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ2390 //! @SYMREQ 12115 12144 12761 12825 RUN_TEST_STEP 100 te_ost_disabled CCheckBuildVariabilityStep z:\testdata\configs\te_ost_trace_user.ini variability @@ -80,7 +80,7 @@ //! @SYMTestActions Check record content of logged trace packets is as expected for the sent packet //! @SYMTestExpectedResults Verify that trace is implemented and output as expected //! @SYMTestType UT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ2390 //! @SYMREQ 12115 12144 12761 12825 RUN_TEST_STEP 100 te_ost_record_content CCheckRecordContentStep z:\testdata\configs\te_ost_trace_user.ini variability @@ -99,7 +99,7 @@ //! @SYMTestActions Measure the trace time of the implemented APIs //! @SYMTestExpectedResults Verify that performance of the trace APIs are not significantly more intrusive than previous implementations //! @SYMTestType UT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ2390 //! @SYMREQ 12115 12144 12761 12825 RUN_TEST_STEP 100 te_ost_record_content CCheckPerformanceStep z:\testdata\configs\te_ost_trace_user.ini variability @@ -116,7 +116,7 @@ //! @SYMTestActions Test the implemented OSTv1-style APIs when compiled in //! @SYMTestExpectedResults Verify that the OSTv1-style trace APIs return trace packets as expected by the instrumentation //! @SYMTestType UT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ2390 //! @SYMREQ 12115 12144 12761 12825 RUN_TEST_STEP 100 te_ost_macros_enabled COstMacrosEnabledStep z:\testdata\configs\te_ost_trace_user.ini variability @@ -133,7 +133,7 @@ //! @SYMTestActions Test the implemented OSTv1-style APIs when compiled out //! @SYMTestExpectedResults Verify that the OSTv1-style trace APIs don't return trace packets as expected by the instrumentation //! @SYMTestType UT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ2390 //! @SYMREQ 12115 12144 12761 12825 RUN_TEST_STEP 100 te_ost_macros_disabled COstMacrosDisabledStep z:\testdata\configs\te_ost_trace_user.ini variability diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/ost_trace_api/unit_test/te_ost/src/te_check_build_variability_step.cpp --- a/traceservices/tracefw/ost_trace_api/unit_test/te_ost/src/te_check_build_variability_step.cpp Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/ost_trace_api/unit_test/te_ost/src/te_check_build_variability_step.cpp Tue Jul 06 16:18:30 2010 +0300 @@ -88,13 +88,13 @@ CheckBuildtimeVariability(); if (TestStepResult()==EPass) {//now check that logging occurs properly - CheckLoggingVariability(); + CheckLoggingVariabilityL(); } } return TestStepResult(); } -TVerdict CCheckBuildVariabilityStep::CheckLoggingVariability() +TVerdict CCheckBuildVariabilityStep::CheckLoggingVariabilityL() { //test all cases when logging is enabled INFO_PRINTF2(_L("--- Logging enabled, tracing built in %i ---"), iTraceData.iTracingBuiltIn); @@ -108,7 +108,7 @@ SetTestStepResult(EFail); return TestStepResult(); } - TBool passLogging = TestTraces(); + TBool passLogging = TestTracesL(); //test all cases where logging is disabled INFO_PRINTF1(_L("--- Logging disabled ---")); iTraceData.iLoggingEnabled = EFalse; @@ -120,7 +120,7 @@ return TestStepResult(); } - TBool passNoLogging = TestTraces(); + TBool passNoLogging = TestTracesL(); //if any of the cases failed, fail the test step if((passLogging == EFalse) || (passNoLogging == EFalse)) @@ -130,7 +130,7 @@ return TestStepResult(); } -TBool CCheckBuildVariabilityStep::TestTraces() +TBool CCheckBuildVariabilityStep::TestTracesL() { TBool allPassed = ETrue; for(TInt i = 1; i <= KAPIMaxNumberOfTraceApis; i++) @@ -142,7 +142,7 @@ if(i == EContextTClassification) INFO_PRINTF1(_L("-- Testing contexts --")); - if(DoSendTrace((TTraceApiUsed)i)) + if(DoSendTraceL((TTraceApiUsed)i)) INFO_PRINTF2(_L("Trace %i - ok"), i); else allPassed = EFalse; @@ -153,7 +153,7 @@ } -TBool CCheckBuildVariabilityStep::DoSendTrace(TTraceApiUsed aApiUsed) +TBool CCheckBuildVariabilityStep::DoSendTraceL(TTraceApiUsed aApiUsed) { iTraceData.iApiUsed = aApiUsed; TInt result = iTraceTester.SendTraceL(iTraceData); diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/ost_trace_api/unit_test/te_ost/src/te_check_performance_step.cpp --- a/traceservices/tracefw/ost_trace_api/unit_test/te_ost/src/te_check_performance_step.cpp Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/ost_trace_api/unit_test/te_ost/src/te_check_performance_step.cpp Tue Jul 06 16:18:30 2010 +0300 @@ -49,11 +49,12 @@ SetTestStepName(KCheckPerformanceStep); SetLogFilename(KLogFilename); - DeleteLogFile(); } TVerdict CCheckPerformanceStep::doTestStepPreambleL() { + DeleteLogFileL(); + if(TestStepResult()==EPass) { //SetTestStepResult(EFail); diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/ost_trace_api/unit_test/te_ost/src/te_check_record_content_step.cpp --- a/traceservices/tracefw/ost_trace_api/unit_test/te_ost/src/te_check_record_content_step.cpp Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/ost_trace_api/unit_test/te_ost/src/te_check_record_content_step.cpp Tue Jul 06 16:18:30 2010 +0300 @@ -52,11 +52,12 @@ SetTestStepName(KCheckRecordContentStep); SetLogFilename(KLogFilename); - DeleteLogFile(); } TVerdict CCheckRecordContentStep::doTestStepPreambleL() { + DeleteLogFileL(); + if(TestStepResult()==EPass) { //SetTestStepResult(EFail); @@ -79,7 +80,7 @@ TInt error = KErrNone; INFO_PRINTF1(_L("-------- Writing traces --------")); - error = WriteTraces(); + error = WriteTracesL(); if(error) { INFO_PRINTF2(_L("ERROR: Error when writing traces, error %i"), error); @@ -276,7 +277,7 @@ return trace; } -TInt CCheckRecordContentStep::WriteTraces() +TInt CCheckRecordContentStep::WriteTracesL() { TInt error = KErrNone; TInt lastError = KErrNone; diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/ost_trace_api/unit_test/te_ost/src/te_multiparttrace.cpp --- a/traceservices/tracefw/ost_trace_api/unit_test/te_ost/src/te_multiparttrace.cpp Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/ost_trace_api/unit_test/te_ost/src/te_multiparttrace.cpp Tue Jul 06 16:18:30 2010 +0300 @@ -80,7 +80,7 @@ INFO_PRINTF1(_L("INFO: configuring ULogger...")); User::LeaveIfError( iUlogger.Connect() ); CClearConfig configIni; - configIni.Clear(iUlogger); + configIni.ClearL(iUlogger); iUlogger.SetSecondaryFilteringEnabled(EFalse); diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/ost_trace_api/unit_test/te_ost/src/te_suite_step_base.cpp --- a/traceservices/tracefw/ost_trace_api/unit_test/te_ost/src/te_suite_step_base.cpp Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/ost_trace_api/unit_test/te_ost/src/te_suite_step_base.cpp Tue Jul 06 16:18:30 2010 +0300 @@ -81,7 +81,7 @@ return KErrNone; } -void CTe_UTraceSuiteStepBase::DeleteLogFile() +void CTe_UTraceSuiteStepBase::DeleteLogFileL() { iLogger.DeleteLogfileL(); } diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/ost_trace_api/unit_test/te_ost/src/te_tracer.cpp --- a/traceservices/tracefw/ost_trace_api/unit_test/te_ost/src/te_tracer.cpp Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/ost_trace_api/unit_test/te_ost/src/te_tracer.cpp Tue Jul 06 16:18:30 2010 +0300 @@ -31,7 +31,7 @@ TUint32 callResults[KNumberOfTraceCallIterations]; for(TInt i = 0; i < KNumberOfTraceCallIterations; i++) { - error = TimeTraceCall(aTraceData, aTime, aCount); + error = TimeTraceCallL(aTraceData, aTime, aCount); callResults[i] = aTime; } TUint32 total = 0; @@ -42,7 +42,7 @@ } -TInt TTraceTester::TimeTraceCall(TTraceConfigs& aTraceData, TUint32& aTime, TUint32& aCount) +TInt TTraceTester::TimeTraceCallL(TTraceConfigs& aTraceData, TUint32& aTime, TUint32& aCount) { TInt error = KErrNotSupported; if(TApiCaller::IsKernelTrace(aTraceData.iApiUsed)) diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/ost_trace_api/unit_test/te_ost/src/uloggerconfig.cpp --- a/traceservices/tracefw/ost_trace_api/unit_test/te_ost/src/uloggerconfig.cpp Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/ost_trace_api/unit_test/te_ost/src/uloggerconfig.cpp Tue Jul 06 16:18:30 2010 +0300 @@ -26,7 +26,7 @@ /*Constructor*/ } -void CClearConfig::Clear(RULogger& aLoggerSession) +void CClearConfig::ClearL(RULogger& aLoggerSession) { aLoggerSession.Stop(); aLoggerSession.DeActivateInputPlugin(); @@ -58,9 +58,9 @@ } //NB: currently this method does not set the default values for serial and usb! hanging the server -void CClearConfig::Default(RULogger& aLoggerSession) +void CClearConfig::DefaultL(RULogger& aLoggerSession) { - Clear(aLoggerSession); + ClearL(aLoggerSession); //Now set default configurations shipped with ulogger CArrayFixFlat* array = new(ELeave) CArrayFixFlat(4); diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/ulogger/src/pluginframework/pluginallocator.cpp --- a/traceservices/tracefw/ulogger/src/pluginframework/pluginallocator.cpp Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/ulogger/src/pluginframework/pluginallocator.cpp Tue Jul 06 16:18:30 2010 +0300 @@ -79,12 +79,12 @@ EXPORT_C void CPluginAllocator::ConstructL(const TPtrC8& aOutputPluginName, const TPtrC8& aInputPluginName) { //create output and control channels - User::LeaveIfError(this->CreateChannels(aOutputPluginName, aInputPluginName)); + User::LeaveIfError(this->CreateChannelsL(aOutputPluginName, aInputPluginName)); } /*!This function create Output channel according to aOutputSettings. */ -TInt CPluginAllocator::CreateChannels(const TPtrC8& aOutputPluginName, const TPtrC8& aInputPluginName) +TInt CPluginAllocator::CreateChannelsL(const TPtrC8& aOutputPluginName, const TPtrC8& aInputPluginName) { TInt retVal = KErrNone; diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/ulogger/src/pluginframework/pluginallocator.h --- a/traceservices/tracefw/ulogger/src/pluginframework/pluginallocator.h Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/ulogger/src/pluginframework/pluginallocator.h Tue Jul 06 16:18:30 2010 +0300 @@ -53,7 +53,7 @@ private: CPluginAllocator(); - TInt CreateChannels(const TPtrC8& aOutputPluginName, const TPtrC8& aInputPluginName); + TInt CreateChannelsL(const TPtrC8& aOutputPluginName, const TPtrC8& aInputPluginName); private: CPlugin *iOutputPluginBase; //output plugin instance diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/ulogger/src/sysconfig/uloggersysconfig.cpp --- a/traceservices/tracefw/ulogger/src/sysconfig/uloggersysconfig.cpp Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/ulogger/src/sysconfig/uloggersysconfig.cpp Tue Jul 06 16:18:30 2010 +0300 @@ -57,7 +57,7 @@ */ EXPORT_C void CConfigSettingsIter::Reset() { - return iImpl->Reset(); + iImpl->Reset(); } /** diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/ulogger/src/uloggerserver/uloggerserver.cpp --- a/traceservices/tracefw/ulogger/src/uloggerserver/uloggerserver.cpp Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/ulogger/src/uloggerserver/uloggerserver.cpp Tue Jul 06 16:18:30 2010 +0300 @@ -276,7 +276,7 @@ TInt ret= KErrNone; //check configuration file in user path (\\ulogger\\uloggerconfig.ini) - ret = GetInstalledInputPlugins(activePluginsArray); + ret = GetInstalledInputPluginsL(activePluginsArray); if(ret==KErrNone) { ret = KErrNotFound; @@ -334,7 +334,7 @@ return KErrNotFound; else { - TInt ret = GetValues(aMediaName,aListBuffer); + TInt ret = GetValuesL(aMediaName,aListBuffer); if(ret == KErrNotFound) //this error indicate that there is no section in config file, plug-in exists ret = KErrNone; return ret; @@ -347,7 +347,7 @@ Function to get values from the configuration file (i.e. for filters,plugin settings) This should leave with KErrNotFound if it cannot find the configuration file */ -TInt CULoggerServer::GetValues(const TDesC8 &aSectionName, RArray& aListBuffer) +TInt CULoggerServer::GetValuesL(const TDesC8 &aSectionName, RArray& aListBuffer) { TPtrC8 key; TPtrC8 val; @@ -386,7 +386,7 @@ @return KErrNone, if successful, otherwise one of the other system-wide error codes. */ -TInt CULoggerServer::SetActiveFilter(RArray aCategory, TInt aFilterType) +TInt CULoggerServer::SetActiveFilterL(RArray aCategory, TInt aFilterType) { TInt error = KErrNone; if(aFilterType == 1) @@ -490,7 +490,7 @@ @return KErrNone, if successful, otherwise one of the other system-wide error codes. */ -TInt CULoggerServer::SetBufferSize(TInt aSize) +TInt CULoggerServer::SetBufferSizeL(TInt aSize) { if(aSize > KMaxBufferSize || aSize < 1) return KErrArgument; @@ -532,7 +532,7 @@ @return KErrNone, if successful, otherwise one of the other system-wide error codes. */ -TInt CULoggerServer::SetDataNotificationSize(TInt aSize) +TInt CULoggerServer::SetDataNotificationSizeL(TInt aSize) { if(aSize > KMaxDnsSize || aSize < 0) return KErrArgument; @@ -644,7 +644,7 @@ RArray aValues; if(aFilterType == 1) { - ret = GetValues(KPrimaryFilterSection,aValues); + ret = GetValuesL(KPrimaryFilterSection,aValues); if(ret==KErrNone) { TInt i =0; @@ -664,7 +664,7 @@ } else if(aFilterType == 2) { - ret = GetValues(KSecondaryFilterSection,aValues); + ret = GetValuesL(KSecondaryFilterSection,aValues); if(ret==KErrNone) { TInt i =0; @@ -739,7 +739,7 @@ -TInt CULoggerServer::GetInstalledInputPlugins(RArray& aListBuffer) +TInt CULoggerServer::GetInstalledInputPluginsL(RArray& aListBuffer) { #if defined(__LIGHTLOGGER_ENABLED) && defined(__VERBOSE_MODE) __MARK_METHOD("CULoggerServer::GetInstalledControlPlugins") @@ -773,7 +773,7 @@ */ TInt CULoggerServer::GetActiveOutputPlugin(RArray& aListBuffer) { - TInt errCode = GetValues(KActiveSection,aListBuffer); + TInt errCode = GetValuesL(KActiveSection,aListBuffer); //plugins are received as, e.g. '1 uloggerfileplugin' (.ini file syntax) //we have to remove number from array for(TInt i=0; i& aListBuffer) { - return GetValues(KActiveControlSection,aListBuffer); + return GetValuesL(KActiveControlSection,aListBuffer); } /** @@ -884,7 +884,7 @@ if(iBtraceOpen == EFalse) { if(iIsBooting) - error = TraceSettingsOnBoot(); + error = TraceSettingsOnBootL(); else error = iTrace.Open(); @@ -1015,9 +1015,8 @@ Gets the Trace settings on boot @return none */ -TInt CULoggerServer::TraceSettingsOnBoot() +TInt CULoggerServer::TraceSettingsOnBootL() { - TInt trace = FALSE; RArray category; @@ -1027,9 +1026,9 @@ TInt bufferSize = iTrace.BufferSize(); //To get the buffer size set at boot if(bufferSize <= 0 && bufferSize > KMaxBufferSize) - SetBufferSize(KMaxBufferSize); //Update config + SetBufferSizeL(KMaxBufferSize); //Update config else - SetBufferSize(bufferSize); //Update config + SetBufferSizeL(bufferSize); //Update config for(TUint i=0; iCreatePackage((void*)result.Ptr(), result.Length()); @@ -1436,7 +1435,7 @@ TInt bufSize; TLex8 lex(aArguments[0]); if((errCode = lex.Val(bufSize)) == KErrNone) - errCode = SetBufferSize(bufSize); + errCode = SetBufferSizeL(bufSize); } else errCode = KErrArgument; @@ -1485,7 +1484,7 @@ TInt dns; TLex8 lex(aArguments[0]); if((errCode = lex.Val(dns)) == KErrNone) - errCode = SetDataNotificationSize(dns); + errCode = SetDataNotificationSizeL(dns); else errCode = KErrArgument; } @@ -1937,7 +1936,7 @@ #endif RArray tmpArray; - errCode = GetInstalledInputPlugins(tmpArray); + errCode = GetInstalledInputPluginsL(tmpArray); result.Num(errCode); data = inputData->CreatePackage((void*)result.Ptr(), result.Length()); @@ -2015,7 +2014,7 @@ TInt errCode = 0; CPlugin::TPluginInterface interfaceId; //assign filter value - aFilter==EOutputPluginFilter ? interfaceId=MOutputPlugin::iInterfaceId : interfaceId=MInputPlugin::iInterfaceId; + interfaceId = (aFilter == EOutputPluginFilter ? MOutputPlugin::iInterfaceId : MInputPlugin::iInterfaceId); //filter plugins TInt i=0; @@ -2056,7 +2055,7 @@ if(aPluginFilter == EOutputPluginFilter) GetInstalledOutputPlugins(pluginsArray); else if(aPluginFilter == EInputPluginFilter) - GetInstalledInputPlugins(pluginsArray); + GetInstalledInputPluginsL(pluginsArray); for(TInt i=0; i& aListBuffer,TInt aFilterType); - TInt SetActiveFilter(RArray aCategory, TInt aFilterType); + TInt SetActiveFilterL(RArray aCategory, TInt aFilterType); TInt RemoveActiveFilter(RArray& aValue, const TInt aFilterType); TInt SetSecondaryFiltering(const TDesC8& aEnabled); TInt GetSecondaryFiltering(TBool& aEnabled); @@ -102,14 +102,14 @@ TInt DeActivateInputPlugin(const TDesC8& aPluginname); TInt GetActiveInputPlugin(RArray& aListBuffer); TInt SetActiveInputPlugin(const TDesC8& aPluginname); - TInt GetInstalledInputPlugins(RArray& aListBuffer); + TInt GetInstalledInputPluginsL(RArray& aListBuffer); //buffers TInt GetOptionsSettingsL(const TDesC8& aMedianame, RArray& aListBuffer); TInt GetBufandDataNotifyValuesL(const TDesC8& aSetting,TInt& value); TInt SetBufferMode(const TDesC8& aValue); - TInt SetBufferSize(TInt aSize); - TInt SetDataNotificationSize(TInt aSize); + TInt SetBufferSizeL(TInt aSize); + TInt SetDataNotificationSizeL(TInt aSize); private: //server related stuff @@ -124,7 +124,7 @@ CSession2* NewSessionL(const TVersion& aVersion,const RMessage2& aMessage) const; //on boot things - TInt TraceSettingsOnBoot(); + TInt TraceSettingsOnBootL(); TInt ResetBtracePrimaryFilters(RBTrace& aBTrace); //action related things @@ -153,7 +153,7 @@ //filter related stuff ControlData* SetPrimaryFilters(RArray &aArguments); - TInt GetValues(const TDesC8& aSectionName, RArray& aListBuffer); + TInt GetValuesL(const TDesC8& aSectionName, RArray& aListBuffer); private: //data TInt iRunAsService; diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/ulogger/src/uloggerserver/uloggersession.h --- a/traceservices/tracefw/ulogger/src/uloggerserver/uloggersession.h Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/ulogger/src/uloggerserver/uloggersession.h Tue Jul 06 16:18:30 2010 +0300 @@ -45,7 +45,7 @@ CULoggerSession(RThread& aClient, CULoggerServer& aServer); void ConstructL(); - void SendInteger(const RMessage2& aMessage, TUint32 aInt); + void SendIntegerL(const RMessage2& aMessage, TUint32 aInt); //void PanicClient(TInt aPanic) const; //data diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/ulogger/src/uloggerserver/uloggersrvsession.cpp --- a/traceservices/tracefw/ulogger/src/uloggerserver/uloggersrvsession.cpp Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/ulogger/src/uloggerserver/uloggersrvsession.cpp Tue Jul 06 16:18:30 2010 +0300 @@ -141,7 +141,7 @@ filterArray.Append((TUint32)array->At(i)); } - error = iServer.SetActiveFilter(filterArray, EPrimaryFilter); + error = iServer.SetActiveFilterL(filterArray, EPrimaryFilter); CleanupStack::PopAndDestroy(2,desData); //array, desData filterArray.Close(); @@ -218,7 +218,7 @@ TUint32 tmp=1; InternalizeFromBufL(readPtr, filterArray, tmp); - error = iServer.SetActiveFilter(filterArray,ESecondaryFilter); + error = iServer.SetActiveFilterL(filterArray,ESecondaryFilter); CleanupStack::PopAndDestroy(); //desData filterArray.Close(); @@ -285,7 +285,7 @@ { TBool enabled = EFalse; iServer.GetSecondaryFiltering(enabled); - SendInteger(aMessage, (TInt)enabled); + SendIntegerL(aMessage, (TInt)enabled); } break; @@ -452,7 +452,7 @@ { //Get the installed plugins RArray tmpArray; - error = iServer.GetInstalledInputPlugins(tmpArray); + error = iServer.GetInstalledInputPluginsL(tmpArray); if(!error) { // @@ -547,7 +547,7 @@ { //Resize buffer size TInt bufferSize = aMessage.Int0(); - error = iServer.SetBufferSize(bufferSize); + error = iServer.SetBufferSizeL(bufferSize); } break; @@ -556,7 +556,7 @@ //Get buffer size TInt bufferSize = 0; error = iServer.GetBufandDataNotifyValuesL(KBuffer,bufferSize); - SendInteger(aMessage, bufferSize); + SendIntegerL(aMessage, bufferSize); } break; @@ -577,7 +577,7 @@ //Get buffer size TInt bufferMode = 3; error = iServer.GetBufandDataNotifyValuesL(KBufferMode,bufferMode); - SendInteger(aMessage, bufferMode); + SendIntegerL(aMessage, bufferMode); } break; @@ -585,7 +585,7 @@ { //Set data notification size TInt dataNotification = aMessage.Int0(); - error = iServer.SetDataNotificationSize(dataNotification); + error = iServer.SetDataNotificationSizeL(dataNotification); } break; @@ -594,7 +594,7 @@ //Get Data Notification size TInt dataNotification = 0; error = iServer.GetBufandDataNotifyValuesL(KDataNotification,dataNotification); - SendInteger(aMessage, dataNotification); + SendIntegerL(aMessage, dataNotification); } break; @@ -607,7 +607,7 @@ aMessage.Complete(error); } -void CULoggerSession::SendInteger(const RMessage2& aMessage, TUint32 aInt) +void CULoggerSession::SendIntegerL(const RMessage2& aMessage, TUint32 aInt) { HBufC8* size = HBufC8::NewLC(32); size->Des().Num(aInt); diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/ulogger/unit_test/group/bld.inf --- a/traceservices/tracefw/ulogger/unit_test/group/bld.inf Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/ulogger/unit_test/group/bld.inf Tue Jul 06 16:18:30 2010 +0300 @@ -13,9 +13,6 @@ // Description: // -PRJ_PLATFORMS -WINSCW -ARMV5 PRJ_TESTEXPORTS //te_outfrwk files diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/ulogger/unit_test/scripts/te_client.script --- a/traceservices/tracefw/ulogger/unit_test/scripts/te_client.script Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/ulogger/unit_test/scripts/te_client.script Tue Jul 06 16:18:30 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -14,7 +14,7 @@ // // -//! @File +//! @file //! @SYMTestSuiteName uloggerv1-client-unit-test-suite.script //! @SYMScriptTestEnvironment TEF @@ -39,7 +39,7 @@ //! @SYMTestActions Connect to ulogger client //! @SYMTestExpectedResults error return as expected //! @SYMTestType UT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ1635 //! @SYMREQ RUN_TEST_STEP 100 UloggerClientAPIServer TestConnectStep @@ -55,7 +55,7 @@ //! @SYMTestActions Set Primary Filter in ulogger client //! @SYMTestExpectedResults error return as expected //! @SYMTestType UT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ1635 //! @SYMREQ RUN_TEST_STEP 100 UloggerClientAPIServer TestSetPrimaryFltStep @@ -71,7 +71,7 @@ //! @SYMTestActions Start ulogger client //! @SYMTestExpectedResults error return as expected //! @SYMTestType UT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ1635 //! @SYMREQ RUN_TEST_STEP 100 UloggerClientAPIServer TestStartStep @@ -87,7 +87,7 @@ //! @SYMTestActions Stop ulogger client //! @SYMTestExpectedResults error return as expected //! @SYMTestType UT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ1635 //! @SYMREQ RUN_TEST_STEP 100 UloggerClientAPIServer TestStopStep @@ -103,7 +103,7 @@ //! @SYMTestActions Get Primeay Filter in ulogger client //! @SYMTestExpectedResults error return as expected //! @SYMTestType UT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ1635 //! @SYMREQ RUN_TEST_STEP 100 UloggerClientAPIServer TestGetPrimaryFiltersLStep @@ -119,7 +119,7 @@ //! @SYMTestActions Get secondary Filter in ulogger client //! @SYMTestExpectedResults error return as expected //! @SYMTestType UT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ1635 //! @SYMREQ RUN_TEST_STEP 100 UloggerClientAPIServer TestGetSecondaryFiltersLStep @@ -135,7 +135,7 @@ //! @SYMTestActions Get buffer size in ulogger client //! @SYMTestExpectedResults error return/buffer size as expected //! @SYMTestType UT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ1635 //! @SYMREQ RUN_TEST_STEP 100 UloggerClientAPIServer TestGetTraceBufferSizeStep @@ -150,7 +150,7 @@ //! @SYMTestActions Remove Primeay Filter in ulogger client //! @SYMTestExpectedResults error return as expected //! @SYMTestType UT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ1635 //! @SYMREQ RUN_TEST_STEP -1 UloggerClientAPIServer TestRemovePrimaryFltStep @@ -166,7 +166,7 @@ //! @SYMTestActions Resize buffer size in ulogger client //! @SYMTestExpectedResults error return as expected //! @SYMTestType UT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ1635 //! @SYMREQ RUN_TEST_STEP 100 UloggerClientAPIServer TestResizeTraceBufferSizeStep @@ -183,7 +183,7 @@ //! @SYMTestActions Set DNS in ulogger client //! @SYMTestExpectedResults error return as expected //! @SYMTestType UT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ1635 //! @SYMREQ RUN_TEST_STEP 100 UloggerClientAPIServer TestSetDataNotificationSizeStep @@ -199,7 +199,7 @@ //! @SYMTestActions Set all secondary Filtesr in ulogger client //! @SYMTestExpectedResults error return as expected //! @SYMTestType UT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ1635 //! @SYMREQ RUN_TEST_STEP 100 UloggerClientAPIServer TestSetSecondaryFilterAllStep @@ -214,7 +214,7 @@ //! @SYMTestActions Set one secondary Filtesr in ulogger client //! @SYMTestExpectedResults error return as expected //! @SYMTestType UT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ1635 //! @SYMREQ RUN_TEST_STEP 100 UloggerClientAPIServer TestSetSecondaryFltStep @@ -231,7 +231,7 @@ //! @SYMTestActions Get version in ulogger client //! @SYMTestExpectedResults error return as expected //! @SYMTestType UT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ1635 //! @SYMREQ RUN_TEST_STEP 100 UloggerClientAPIServer TestVersionStep @@ -247,7 +247,7 @@ //! @SYMTestActions Deactivate output plugin in ulogger client //! @SYMTestExpectedResults error return as expected //! @SYMTestType UT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ1635 //! @SYMREQ RUN_TEST_STEP 100 UloggerClientAPIServer TestDeactivateOutputPluginStep @@ -263,7 +263,7 @@ //! @SYMTestActions Call RULogger API in ulogger client //! @SYMTestExpectedResults error return as expected //! @SYMTestType UT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ1635 //! @SYMREQ RUN_TEST_STEP 2000 UloggerClientAPIServer TestRULoggerAPIStep diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/ulogger/unit_test/scripts/te_file.script --- a/traceservices/tracefw/ulogger/unit_test/scripts/te_file.script Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/ulogger/unit_test/scripts/te_file.script Tue Jul 06 16:18:30 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -13,7 +13,7 @@ // Description: // -//! @File +//! @file //! @SYMTestSuiteName uloggerv1-file-unit-test-suite.script //! @SYMScriptTestEnvironment TEF @@ -32,7 +32,7 @@ //! @SYMTestActions Set and configure file plugin //! @SYMTestExpectedResults error returns as expected //! @SYMTestType UT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ1635 //! @SYMREQ RUN_TEST_STEP 100 uloggerplugfiletest file0Step diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/ulogger/unit_test/scripts/te_outfrwk.script --- a/traceservices/tracefw/ulogger/unit_test/scripts/te_outfrwk.script Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/ulogger/unit_test/scripts/te_outfrwk.script Tue Jul 06 16:18:30 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -13,7 +13,7 @@ // Description: // -//! @File +//! @file //! @SYMTestSuiteName uloggerv1-outfrwk-unit-test-suite.script //! @SYMScriptTestEnvironment TEF @@ -34,7 +34,7 @@ //! @SYMTestActions Set and configure output framework server //! @SYMTestExpectedResults error returns as expected //! @SYMTestType UT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ1635 //! @SYMREQ RUN_TEST_STEP 100 UloggerOutfrmwkServer TextMessageTeststep @@ -48,7 +48,7 @@ //! @SYMTestActions Set and configure output framework server with OOM //! @SYMTestExpectedResults error returns as expected //! @SYMTestType UT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ1635 //! @SYMREQ RUN_TEST_STEP !OOM 100 UloggerOutfrmwkServer TextMessageTeststep diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/ulogger/unit_test/scripts/te_serial.script --- a/traceservices/tracefw/ulogger/unit_test/scripts/te_serial.script Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/ulogger/unit_test/scripts/te_serial.script Tue Jul 06 16:18:30 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -13,7 +13,7 @@ // Description: // -//! @File +//! @file //! @SYMTestSuiteName uloggerv1-serial-unit-test-suite.script //! @SYMScriptTestEnvironment TEF @@ -34,7 +34,7 @@ //! @SYMTestActions Set and configure serial plugin //! @SYMTestExpectedResults error returns as expected //! @SYMTestType UT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ1635 //! @SYMREQ RUN_TEST_STEP 100 uloggerplugserialtest serial0Step diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/ulogger/unit_test/scripts/te_server.script --- a/traceservices/tracefw/ulogger/unit_test/scripts/te_server.script Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/ulogger/unit_test/scripts/te_server.script Tue Jul 06 16:18:30 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -13,7 +13,7 @@ // Description: // -//! @File +//! @file //! @SYMTestSuiteName uloggerv1-server-unit-test-suite.script //! @SYMScriptTestEnvironment TEF @@ -39,7 +39,7 @@ //! @SYMTestActions STart and Stop watching in the server //! @SYMTestExpectedResults error returns as expected //! @SYMTestType UT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ1635 //! @SYMREQ RUN_TEST_STEP 100 te_UloggerServerTestSuite UloggerServerTest0Step @@ -52,7 +52,7 @@ //! @SYMTestActions Call all possibly get/set/configure ulogger command methods in the server //! @SYMTestExpectedResults error returns as expected //! @SYMTestType UT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ1635 //! @SYMREQ RUN_TEST_STEP 1000 te_UloggerServerTestSuite UloggerServerTest1Step @@ -65,7 +65,7 @@ //! @SYMTestActions Call NewL and NewLC to create new server sessions //! @SYMTestExpectedResults error returns as expected //! @SYMTestType UT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ1635 //! @SYMREQ RUN_TEST_STEP 100 te_UloggerServerTestSuite UloggerServerTest2Step @@ -78,7 +78,7 @@ //! @SYMTestActions Call NewL and NewLC to create new plugin allocations under various conditions //! @SYMTestExpectedResults error returns as expected //! @SYMTestType UT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ1635 //! @SYMREQ RUN_TEST_STEP 100 te_UloggerServerTestSuite UloggerServerTest3Step @@ -91,7 +91,7 @@ //! @SYMTestActions Start/Stop reading and test functionality of passing and translating commands for server control framework //! @SYMTestExpectedResults error returns as expected //! @SYMTestType UT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ1635 //! @SYMREQ RUN_TEST_STEP 1000 te_UloggerServerTestSuite UloggerServerTest4Step @@ -104,7 +104,7 @@ //! @SYMTestActions Call methods to change settings of server channels //! @SYMTestExpectedResults error returns as expected //! @SYMTestType UT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ1635 //! @SYMREQ RUN_TEST_STEP 100 te_UloggerServerTestSuite UloggerServerTest5Step @@ -117,7 +117,7 @@ //! @SYMTestActions Call methods to pass data to/fro server //! @SYMTestExpectedResults error returns as expected //! @SYMTestType UT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ1635 //! @SYMREQ RUN_TEST_STEP 100 te_UloggerServerTestSuite UloggerServerTest6Step diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/ulogger/unit_test/scripts/te_sysconfig.script --- a/traceservices/tracefw/ulogger/unit_test/scripts/te_sysconfig.script Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/ulogger/unit_test/scripts/te_sysconfig.script Tue Jul 06 16:18:30 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -13,7 +13,7 @@ // Description: // -//! @File +//! @file //! @SYMTestSuiteName uloggerv1-sysconfig-unit-test-suite.script //! @SYMScriptTestEnvironment TEF @@ -38,7 +38,7 @@ //! @SYMTestActions Call Set/Get/Activate configuration methods for channels and plugins //! @SYMTestExpectedResults error returns as expected //! @SYMTestType UT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ1635 //! @SYMREQ RUN_TEST_STEP 100 Te_SysCfg SysCfgTeststep1 @@ -51,7 +51,7 @@ //! @SYMTestActions Call Set/Get/Remove configuration methods for sections and plugins //! @SYMTestExpectedResults error returns as expected //! @SYMTestType UT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ1635 //! @SYMREQ RUN_TEST_STEP 100 Te_SysCfg SysCfgTeststep2 @@ -64,7 +64,7 @@ //! @SYMTestActions Call Set/Get/Remove configuration methods for filters and buffer //! @SYMTestExpectedResults error returns as expected //! @SYMTestType UT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ1635 //! @SYMREQ RUN_TEST_STEP 100 Te_SysCfg SysCfgTeststep3 @@ -77,7 +77,7 @@ //! @SYMTestActions Call AddPlugin, RemoveChannel with various error cases //! @SYMTestExpectedResults error returns as expected //! @SYMTestType UT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ1635 //! @SYMREQ RUN_TEST_STEP 100 Te_SysCfg SysCfgTeststep4 diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/ulogger/unit_test/scripts/te_sysstart.script --- a/traceservices/tracefw/ulogger/unit_test/scripts/te_sysstart.script Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/ulogger/unit_test/scripts/te_sysstart.script Tue Jul 06 16:18:30 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -13,7 +13,7 @@ // Description: // -//! @File +//! @file //! @SYMTestSuiteName uloggerv1-sysstart-unit-test-suite.script //! @SYMScriptTestEnvironment TEF @@ -32,7 +32,7 @@ //! @SYMTestActions Call available start/configuration methods for ulogger systart //! @SYMTestExpectedResults error returns as expected //! @SYMTestType UT -//! @SYMTESTSTATUS Implemented +//! @SYMTestStatus Implemented //! @SYMPREQ PREQ1635 //! @SYMREQ RUN_TEST_STEP 100 uloggersysstarttest sysStart0Step diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/ulogger/unit_test/te-createconfig/te_clearconfig.cpp --- a/traceservices/tracefw/ulogger/unit_test/te-createconfig/te_clearconfig.cpp Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/ulogger/unit_test/te-createconfig/te_clearconfig.cpp Tue Jul 06 16:18:30 2010 +0300 @@ -35,7 +35,7 @@ } -void CClearConfig::Clear(RULogger& loggerSession) +void CClearConfig::ClearL(RULogger& loggerSession) { // CArrayPtrFlat *activeplugins = new (ELeave)CArrayPtrFlat(1); // CleanupStack::PushL(activeplugins); diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/ulogger/unit_test/te-createconfig/te_clearconfig.h --- a/traceservices/tracefw/ulogger/unit_test/te-createconfig/te_clearconfig.h Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/ulogger/unit_test/te-createconfig/te_clearconfig.h Tue Jul 06 16:18:30 2010 +0300 @@ -34,7 +34,7 @@ public: ~CClearConfig(); CClearConfig(); - void Clear(RULogger& loggerSession); + void ClearL(RULogger& loggerSession); //private: }; diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/ulogger/unit_test/te-createconfig/te_createconfigemptystep.cpp --- a/traceservices/tracefw/ulogger/unit_test/te-createconfig/te_createconfigemptystep.cpp Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/ulogger/unit_test/te-createconfig/te_createconfigemptystep.cpp Tue Jul 06 16:18:30 2010 +0300 @@ -74,7 +74,7 @@ logger.Connect(); CClearConfig configIni; - configIni.Clear(logger); + configIni.ClearL(logger); logger.SetSecondaryFilteringEnabled(EFalse); diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/ulogger/unit_test/te-createconfig/te_createconfigfullstep.cpp --- a/traceservices/tracefw/ulogger/unit_test/te-createconfig/te_createconfigfullstep.cpp Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/ulogger/unit_test/te-createconfig/te_createconfigfullstep.cpp Tue Jul 06 16:18:30 2010 +0300 @@ -72,7 +72,7 @@ logger.Connect(); CClearConfig configIni; - configIni.Clear(logger); + configIni.ClearL(logger); _LIT8(KTextplugin,"uloggerfileplugin"); logger.ActivateOutputPlugin(KTextplugin); diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/ulogger/unit_test/te-outfrwkchans/te-file/uloggerfileplugintest.cpp --- a/traceservices/tracefw/ulogger/unit_test/te-outfrwkchans/te-file/uloggerfileplugintest.cpp Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/ulogger/unit_test/te-outfrwkchans/te-file/uloggerfileplugintest.cpp Tue Jul 06 16:18:30 2010 +0300 @@ -36,7 +36,7 @@ delete fileWriter; } /* - * TestUnlockResources: Test that the CloseOutputPlugin method ??? + * TestUnlockResourcesL: Test that the CloseOutputPlugin method ??? * * Expected Verdict: PASS/FAIL/PANIC * @@ -45,7 +45,7 @@ * Description: Retrieve and print some data from an external ini data file * */ -void CFile0Step::TestUnlockResources() +void CFile0Step::TestUnlockResourcesL() { CFileWriter* fileWriter = CFileWriter::NewL(); INFO_PRINTF1(_L("Invoking CFileWriter::CloseOutputPlugin(). CloseOutputPlugin() is supposed to do nothing.")); @@ -55,7 +55,7 @@ } /* - * TestSettings: Test that the Settings method ??? + * TestSettingsL: Test that the Settings method ??? * * Expected Verdict: PASS/FAIL/PANIC * @@ -64,7 +64,7 @@ * Description: Retrieve and print some data from an external ini data file * */ -void CFile0Step::TestSettings() +void CFile0Step::TestSettingsL() { CFileWriter* fileWriter = CFileWriter::NewL(); INFO_PRINTF1(_L("Passing empty RPointerArray to CFileWriter::ConfigureOutputPlugin()")); @@ -75,7 +75,7 @@ } /* - * TestWrite: Test that the Write method ??? + * TestWriteL: Test that the Write method ??? * * Expected Verdict: PASS/FAIL/PANIC * @@ -86,7 +86,7 @@ * */ // The implementation for this is not working correctly! Check this -void CFile0Step::TestWrite() +void CFile0Step::TestWriteL() { INFO_PRINTF1(_L("Checking that CFileWriter::Write(const TDesC8&) writes a String correctly to C:\\logs\\log.txt")); @@ -136,9 +136,9 @@ if (TestStepResult()==EPass) { TestNewL(); - TestUnlockResources(); - TestSettings(); - TestWrite(); + TestUnlockResourcesL(); + TestSettingsL(); + TestWriteL(); if(iErrors == 0) SetTestStepResult(EPass); diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/ulogger/unit_test/te-outfrwkchans/te-file/uloggerfileplugintest.h --- a/traceservices/tracefw/ulogger/unit_test/te-outfrwkchans/te-file/uloggerfileplugintest.h Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/ulogger/unit_test/te-outfrwkchans/te-file/uloggerfileplugintest.h Tue Jul 06 16:18:30 2010 +0300 @@ -38,9 +38,9 @@ private: // Tests void TestNewL(); - void TestUnlockResources(); - void TestSettings(); - void TestWrite(); + void TestUnlockResourcesL(); + void TestSettingsL(); + void TestWriteL(); RFs iFileServer; }; diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/ulogger/unit_test/te-outfrwkchans/te-serial/uloggerserialplugintest.cpp --- a/traceservices/tracefw/ulogger/unit_test/te-outfrwkchans/te-serial/uloggerserialplugintest.cpp Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/ulogger/unit_test/te-outfrwkchans/te-serial/uloggerserialplugintest.cpp Tue Jul 06 16:18:30 2010 +0300 @@ -47,7 +47,7 @@ * Description: Retrieve and print some data from an external ini data file * */ -void CSerial0Step::TestUnlockResources() +void CSerial0Step::TestUnlockResourcesL() { Ulogger::CSerialWriter* serialWriter = Ulogger::CSerialWriter::NewL(); INFO_PRINTF1(_L("Invoking CSerialWriter::CloseOutputPlugin(). CloseOutputPlugin() is supposed to do nothing.")); @@ -66,7 +66,7 @@ * Description: Retrieve and print some data from an external ini data file * */ -void CSerial0Step::TestSettings() +void CSerial0Step::TestSettingsL() { Ulogger::CSerialWriter* serialWriter = Ulogger::CSerialWriter::NewL(); INFO_PRINTF1(_L("Passing empty RPointerArray to CSerialWriter::ConfigureOutputPlugin()")); @@ -92,7 +92,7 @@ * */ // The implementation for this is not working correctly! Check this -void CSerial0Step::TestWrite() +void CSerial0Step::TestWriteL() { INFO_PRINTF1(_L("Checking that CSerialWriter::Write(const TDesC8&) writes a string correctly to the serial port")); @@ -148,9 +148,9 @@ if (TestStepResult()==EPass) { TestNewL(); - TestUnlockResources(); - TestSettings(); - TestWrite(); + TestUnlockResourcesL(); + TestSettingsL(); + TestWriteL(); if(iErrors == 0) SetTestStepResult(EPass); diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/ulogger/unit_test/te-outfrwkchans/te-serial/uloggerserialplugintest.h --- a/traceservices/tracefw/ulogger/unit_test/te-outfrwkchans/te-serial/uloggerserialplugintest.h Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/ulogger/unit_test/te-outfrwkchans/te-serial/uloggerserialplugintest.h Tue Jul 06 16:18:30 2010 +0300 @@ -39,9 +39,9 @@ private: // Tests void TestNewL(); - void TestUnlockResources(); - void TestSettings(); - void TestWrite(); + void TestUnlockResourcesL(); + void TestSettingsL(); + void TestWriteL(); RFs iFileServer; }; diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/ulogger/unit_test/te-server/uloggerservertest1step.cpp --- a/traceservices/tracefw/ulogger/unit_test/te-server/uloggerservertest1step.cpp Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/ulogger/unit_test/te-server/uloggerservertest1step.cpp Tue Jul 06 16:18:30 2010 +0300 @@ -78,8 +78,8 @@ iErrors += Test15L();//CULoggerServer::GetInstalledPlugins iMediaCount = 0; iErrors += Test16L();//CULoggerServer::GetOutputPluginSettingsL - iErrors += Test18L();//CULoggerServer::SetBufferSize - iErrors += Test19L();//CULoggerServer::SetDataNotificationSize + iErrors += Test18L();//CULoggerServer::SetBufferSizeL + iErrors += Test19L();//CULoggerServer::SetDataNotificationSizeL iErrors += Test20L();//CULoggerServer::GetBufferSize iErrors += Test21L();// CULoggerServer::GetDataNotificationSize iErrors += Test22L();//CULoggerServer::SetGlobalSecondaryFilters @@ -315,7 +315,7 @@ aCategory.Append(194); TInt e = KErrNone; - e = server->SetActiveFilter(aCategory,EPrimaryFilter); + e = server->SetActiveFilterL(aCategory,EPrimaryFilter); TBuf<128> buf; buf.AppendFormat(_L("Code returned from method - %d"), e); INFO_PRINTF1(buf); @@ -340,7 +340,7 @@ { RArray array; array.Append(34); - TInt e = server->SetActiveFilter(array,ESecondaryFilter); + TInt e = server->SetActiveFilterL(array,ESecondaryFilter); TBuf<128> buf; buf.AppendFormat(_L("Code returned from method - %d"), e); INFO_PRINTF1(buf); @@ -536,9 +536,9 @@ TInt CUloggerServerTest1Step::Test18L() -{//CULoggerServer::SetBufferSize +{//CULoggerServer::SetBufferSizeL TInt errors = 0; - INFO_PRINTF1(_L("Testing - CULoggerServer::SetBufferSize method")); + INFO_PRINTF1(_L("Testing - CULoggerServer::SetBufferSizeL method")); CULoggerServer *server = NULL; server = CULoggerServer::NewLC(EPriorityBackground); if(server == NULL) @@ -550,38 +550,38 @@ { TInt e; INFO_PRINTF1(_L("testing value: -1")); - e = server->SetBufferSize(-1); + e = server->SetBufferSizeL(-1); TBuf<128> buf; buf.AppendFormat(_L("Code returned from method - %d"), e); INFO_PRINTF1(buf); buf.Zero(); INFO_PRINTF1(_L("testing value: 0")); - e = server->SetBufferSize(0); + e = server->SetBufferSizeL(0); buf.AppendFormat(_L("Code returned from method - %d"), e); INFO_PRINTF1(buf); buf.Zero(); INFO_PRINTF1(_L("testing value: 100")); - e = server->SetBufferSize(100); + e = server->SetBufferSizeL(100); buf.AppendFormat(_L("Code returned from method - %d"), e); INFO_PRINTF1(buf); buf.Zero(); INFO_PRINTF1(_L("testing value: 65535")); - e = server->SetBufferSize(65535); + e = server->SetBufferSizeL(65535); buf.AppendFormat(_L("Code returned from method - %d"), e); INFO_PRINTF1(buf); buf.Zero(); INFO_PRINTF1(_L("testing value: 65536")); - e = server->SetBufferSize(65536); + e = server->SetBufferSizeL(65536); buf.AppendFormat(_L("Code returned from method - %d"), e); INFO_PRINTF1(buf); buf.Zero(); INFO_PRINTF1(_L("testing value: 165537")); - e = server->SetBufferSize(165537); + e = server->SetBufferSizeL(165537); buf.AppendFormat(_L("Code returned from method - %d"), e); INFO_PRINTF1(buf); buf.Zero(); @@ -592,9 +592,9 @@ TInt CUloggerServerTest1Step::Test19L() -{//CULoggerServer::SetDataNotificationSize +{//CULoggerServer::SetDataNotificationSizeL TInt errors = 0; - INFO_PRINTF1(_L("Testing - CULoggerServer::SetDataNotificationSize method")); + INFO_PRINTF1(_L("Testing - CULoggerServer::SetDataNotificationSizeL method")); CULoggerServer *server = NULL; server = CULoggerServer::NewLC(EPriorityBackground); if(server == NULL) @@ -606,44 +606,44 @@ { TInt e; INFO_PRINTF1(_L("testing value: -1")); - e = server->SetDataNotificationSize(-1); + e = server->SetDataNotificationSizeL(-1); TBuf<128> buf; buf.AppendFormat(_L("Code returned from method - %d"), e); INFO_PRINTF1(buf); buf.Zero(); INFO_PRINTF1(_L("testing value: 0")); - e = server->SetDataNotificationSize(0); + e = server->SetDataNotificationSizeL(0); buf.AppendFormat(_L("Code returned from method - %d"), e); INFO_PRINTF1(buf); buf.Zero(); INFO_PRINTF1(_L("testing value: 100")); - e = server->SetDataNotificationSize(100); + e = server->SetDataNotificationSizeL(100); buf.AppendFormat(_L("Code returned from method - %d"), e); INFO_PRINTF1(buf); buf.Zero(); INFO_PRINTF1(_L("testing value: 65535")); - e = server->SetDataNotificationSize(65535); + e = server->SetDataNotificationSizeL(65535); buf.AppendFormat(_L("Code returned from method - %d"), e); INFO_PRINTF1(buf); buf.Zero(); INFO_PRINTF1(_L("testing value: 65536")); - e = server->SetDataNotificationSize(65536); + e = server->SetDataNotificationSizeL(65536); buf.AppendFormat(_L("Code returned from method - %d"), e); INFO_PRINTF1(buf); buf.Zero(); INFO_PRINTF1(_L("testing value: 85536")); - e = server->SetDataNotificationSize(85536); + e = server->SetDataNotificationSizeL(85536); buf.AppendFormat(_L("Code returned from method - %d"), e); INFO_PRINTF1(buf); buf.Zero(); INFO_PRINTF1(_L("testing value: 165538")); - e = server->SetDataNotificationSize(165538); + e = server->SetDataNotificationSizeL(165538); buf.AppendFormat(_L("Code returned from method - %d"), e); INFO_PRINTF1(buf); buf.Zero(); @@ -914,10 +914,10 @@ } -TInt CUloggerServerTest1Step::Test29L()//CULoggerServer::GetInstalledInputPlugins +TInt CUloggerServerTest1Step::Test29L()//CULoggerServer::GetInstalledInputPluginsL { TInt errors = 0; - INFO_PRINTF1(_L("Testing - CULoggerServer::GetInstalledInputPlugins method")); + INFO_PRINTF1(_L("Testing - CULoggerServer::GetInstalledInputPluginsL method")); CULoggerServer *server = NULL; server = CULoggerServer::NewLC(EPriorityBackground); if(server == NULL) @@ -928,7 +928,7 @@ else { RArray list; - server->GetInstalledInputPlugins(list); + server->GetInstalledInputPluginsL(list); list.Close(); CleanupStack::PopAndDestroy(); //server } diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/ulogger/unit_test/te-server/uloggerservertest1step.h --- a/traceservices/tracefw/ulogger/unit_test/te-server/uloggerservertest1step.h Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/ulogger/unit_test/te-server/uloggerservertest1step.h Tue Jul 06 16:18:30 2010 +0300 @@ -55,8 +55,8 @@ TInt Test15L();//CULoggerServer::GetInstalledPlugins TInt Test16L();//CULoggerServer::GetOutputPluginSettingsL TInt Test17L();//CULoggerServer::GetOutputChannelL - TInt Test18L();//CULoggerServer::SetBufferSize - TInt Test19L();//CULoggerServer::SetDataNotificationSize + TInt Test18L();//CULoggerServer::SetBufferSizeL + TInt Test19L();//CULoggerServer::SetDataNotificationSizeL TInt Test20L();//CULoggerServer::GetBufferSize TInt Test21L();// CULoggerServer::GetDataNotificationSize TInt Test22L();//CULoggerServer::SetGlobalSecondaryFilters diff -r 63532cdadd44 -r 0d6db0a14001 traceservices/tracefw/utf_trace_api/inc/e32utrace.h --- a/traceservices/tracefw/utf_trace_api/inc/e32utrace.h Fri Jun 11 15:29:22 2010 +0300 +++ b/traceservices/tracefw/utf_trace_api/inc/e32utrace.h Tue Jul 06 16:18:30 2010 +0300 @@ -83,14 +83,14 @@ +((aSchema)<