diff -r a179b74831c9 -r c1f20ce4abcf kerneltest/e32test/usbho/t_usbdi/src/TestEngine.cpp --- a/kerneltest/e32test/usbho/t_usbdi/src/TestEngine.cpp Thu Aug 19 11:14:22 2010 +0300 +++ b/kerneltest/e32test/usbho/t_usbdi/src/TestEngine.cpp Tue Aug 31 16:34:26 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 the License "Eclipse Public License v1.0" @@ -20,6 +20,10 @@ #include "testdebug.h" #include "TestCaseController.h" #include "TestCaseFactory.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "TestEngineTraces.h" +#endif // Console application options @@ -43,10 +47,12 @@ CTestEngine* CTestEngine::NewL() { + OstTraceFunctionEntry0( CTESTENGINE_NEWL_ENTRY ); CTestEngine* self = new (ELeave) CTestEngine; CleanupStack::PushL(self); self->ConstructL(); CleanupStack::Pop(self); + OstTraceFunctionExit1( CTESTENGINE_NEWL_EXIT, ( TUint )( self ) ); return self; } @@ -56,12 +62,15 @@ : CActive(EPriorityUserInput), iTestCaseIndex(0), iRepeat(0), iNumRepeats(KDefaultNumRepeats) { + OstTraceFunctionEntry1( CTESTENGINE_CTESTENGINE_ENTRY, this ); + OstTraceFunctionExit1( CTESTENGINE_CTESTENGINE_EXIT, this ); } CTestEngine::~CTestEngine() { + OstTraceFunctionEntry1( CTESTENGINE_CTESTENGINE_ENTRY_DUP01, this ); // Cancel reading user console input Cancel(); @@ -74,21 +83,25 @@ // Finish test and release resources gtest.End(); gtest.Close(); + OstTraceFunctionExit1( CTESTENGINE_CTESTENGINE_EXIT_DUP01, this ); } void CTestEngine::ConstructL() { - LOG_FUNC + OstTraceFunctionEntry1( CTESTENGINE_CONSTRUCTL_ENTRY, this ); CActiveScheduler::Add(this); // Display information (construction text and OS build version number gtest.Title(); gtest.Start(_L("Test Engine Initiation")); gtest.Printf(_L(">>\n")); + OstTrace0(TRACE_NORMAL, CTESTENGINE_CONSTRUCTL, ">>\n"); gtest.Printf(_L(">> T E S T R U N \n")); + OstTrace0(TRACE_NORMAL, CTESTENGINE_CONSTRUCTL_DUP01, ">> T E S T R U N \n"); gtest.Printf(_L(">>\n")); + OstTrace0(TRACE_NORMAL, CTESTENGINE_CONSTRUCTL_DUP02, ">>\n"); // Process the command line option for role TInt cmdLineLength(User::CommandLineLength()); @@ -99,6 +112,7 @@ // be careful, command line length is limited(248 characters) gtest.Printf(_L("***cmdLine = %lS\n"), cmdLine); + OstTraceExt1(TRACE_NORMAL, CTESTENGINE_CONSTRUCTL_DUP03, "***cmdLine = %lS\n", *cmdLine); TLex args(*cmdLine); args.SkipSpace(); @@ -123,12 +137,14 @@ else { gtest.Printf(_L("Test configuration: could not find option -role\n")); + OstTrace0(TRACE_NORMAL, CTESTENGINE_CONSTRUCTL_DUP04, "Test configuration: could not find option -role\n"); gtest(EFalse); } } else { gtest.Printf(_L("Test configuration option not found: %S\n"),&KArgRole); + OstTraceExt1(TRACE_NORMAL, CTESTENGINE_CONSTRUCTL_DUP05, "Test configuration option not found: %S\n",KArgRole); gtest(EFalse); } @@ -161,6 +177,7 @@ } gtest.Printf(_L("Test case specified: %S\n"),tc); + OstTraceExt1(TRACE_NORMAL, CTESTENGINE_CONSTRUCTL_DUP06, "Test case specified: %S\n",*tc); iTestCasesIdentities.Append(tc); @@ -171,6 +188,7 @@ else { gtest.Printf(_L("Test configuration option not found: %S\n"),&KArgTestCases); + OstTraceExt1(TRACE_NORMAL, CTESTENGINE_CONSTRUCTL_DUP07, "Test configuration option not found: %S\n",KArgTestCases()); gtest(EFalse); } @@ -187,32 +205,39 @@ if(ret) { gtest.Printf(_L("Test configuration option not found: %S\n"),&KArgTestRepeats); + OstTraceExt1(TRACE_NORMAL, CTESTENGINE_CONSTRUCTL_DUP08, "Test configuration option not found: %S\n",KArgTestRepeats()); gtest.Printf(_L("DEFAULT to number of repeats = %d\n"),KDefaultNumRepeats); + OstTrace1(TRACE_NORMAL, CTESTENGINE_CONSTRUCTL_DUP09, "DEFAULT to number of repeats = %d\n",KDefaultNumRepeats); iNumRepeats = KDefaultNumRepeats; } gtest.Printf(_L("Test repeats specified: %d cycles\n"),iNumRepeats); + OstTrace1(TRACE_NORMAL, CTESTENGINE_CONSTRUCTL_DUP10, "Test repeats specified: %d cycles\n",iNumRepeats); } else { gtest.Printf(_L("Test configuration option not found: %S\n"),&KArgTestRepeats); + OstTraceExt1(TRACE_NORMAL, CTESTENGINE_CONSTRUCTL_DUP11, "Test configuration option not found: %S\n",KArgTestRepeats()); gtest.Printf(_L("DEFAULT to number of repeats = %d\n"),KDefaultNumRepeats); + OstTrace1(TRACE_NORMAL, CTESTENGINE_CONSTRUCTL_DUP12, "DEFAULT to number of repeats = %d\n",KDefaultNumRepeats); iNumRepeats = KDefaultNumRepeats; } // Create the test case controller gtest.Printf(_L("Creating the test controller\n")); + OstTrace0(TRACE_NORMAL, CTESTENGINE_CONSTRUCTL_DUP13, "Creating the test controller\n"); iTestCaseController = CTestCaseController::NewL(*this,hostFlag); CleanupStack::PopAndDestroy(cmdLine); gtest.Console()->Read(iStatus); SetActive(); + OstTraceFunctionExit1( CTESTENGINE_CONSTRUCTL_EXIT, this ); } TInt CTestEngine::NextTestCaseId(TDes& aTestCaseId) { - LOG_FUNC + OstTraceFunctionEntryExt( CTESTENGINE_NEXTTESTCASEID_ENTRY, this ); if(iTestCaseIndex < iTestCasesIdentities.Count()) { aTestCaseId = *iTestCasesIdentities[iTestCaseIndex++]; @@ -224,34 +249,41 @@ iTestCaseIndex = 0; //prepare to start again } } + OstTraceFunctionExitExt( CTESTENGINE_NEXTTESTCASEID_EXIT, this, KErrNone ); return KErrNone; } else { + OstTraceFunctionExitExt( CTESTENGINE_NEXTTESTCASEID_EXIT_DUP01, this, KErrNotFound ); return KErrNotFound; } } RPointerArray& CTestEngine::TestCasesIdentities() { + OstTraceFunctionEntry1( CTESTENGINE_TESTCASESIDENTITIES_ENTRY, this ); + OstTraceFunctionExitExt( CTESTENGINE_TESTCASESIDENTITIES_EXIT, this, ( TUint )&( iTestCasesIdentities ) ); return iTestCasesIdentities; } TUint CTestEngine::NumRepeats() { + OstTraceFunctionEntry1( CTESTENGINE_NUMREPEATS_ENTRY, this ); + OstTraceFunctionExitExt( CTESTENGINE_NUMREPEATS_EXIT, this, iNumRepeats ); return iNumRepeats; } void CTestEngine::DoCancel() { - LOG_FUNC + OstTraceFunctionEntry1( CTESTENGINE_DOCANCEL_ENTRY, this ); gtest.Console()->ReadCancel(); + OstTraceFunctionExit1( CTESTENGINE_DOCANCEL_EXIT, this ); } void CTestEngine::RunL() { - LOG_FUNC + OstTraceFunctionEntry1( CTESTENGINE_RUNL_ENTRY, this ); TInt completionCode(iStatus.Int()); if(completionCode == KErrNone) @@ -264,24 +296,30 @@ { iTestCaseController->Cancel(); gtest.Printf(_L("Test module terminating\n")); - RDebug::Printf("CActiveScheduler::Stop CTestEngine::RunL"); + OstTrace0(TRACE_NORMAL, CTESTENGINE_RUNL, "Test module terminating\n"); + OstTrace0(TRACE_NORMAL, CTESTENGINE_RUNL_DUP01, "CActiveScheduler::Stop CTestEngine::RunL"); CActiveScheduler::Stop(); } else { gtest.Printf(_L("%d key pressed"),keyCode); + OstTrace1(TRACE_NORMAL, CTESTENGINE_RUNL_DUP02, "%d key pressed",keyCode); } } else { gtest.Printf(_L("Manual key error %d\n"),completionCode); + OstTrace1(TRACE_NORMAL, CTESTENGINE_RUNL_DUP03, "Manual key error %d\n",completionCode); SetActive(); } + OstTraceFunctionExit1( CTESTENGINE_RUNL_EXIT, this ); } TInt CTestEngine::RunError(TInt aError) { + OstTraceFunctionEntryExt( CTESTENGINE_RUNERROR_ENTRY, this ); + OstTraceFunctionExitExt( CTESTENGINE_RUNERROR_EXIT, this, KErrNone ); return KErrNone; }