diff -r c1f20ce4abcf -r 3e88ff8f41d5 kerneltest/e32test/usbho/t_otgdi/src/b2bwatchers.cpp --- a/kerneltest/e32test/usbho/t_otgdi/src/b2bwatchers.cpp Tue Aug 31 16:34:26 2010 +0300 +++ b/kerneltest/e32test/usbho/t_otgdi/src/b2bwatchers.cpp Wed Sep 01 12:34:56 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2007-2009 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" @@ -30,10 +30,6 @@ #include // USBCC header #include "testcaseroot.h" #include "b2bwatchers.h" -#include "OstTraceDefinitions.h" -#ifdef OST_TRACE_COMPILER_IN_USE -#include "b2bwatchersTraces.h" -#endif @@ -49,10 +45,7 @@ CNotifyCollector::CNotifyCollector(TRequestStatus &aStatus) : iStatusStep(aStatus) { - if(gVerboseOutput) - { - OstTraceFunctionEntry0(CNOTIFYCOLLECTOR_CNOTIFYCOLLECTOR); - } + LOG_FUNC TTimeIntervalDays oneday(1); iTimeStarted.HomeTime(); iTimeStarted += (oneday); // force all durations to produce a negative (invalid) value @@ -64,10 +57,7 @@ */ CNotifyCollector::~CNotifyCollector() { - if(gVerboseOutput) - { - OstTraceFunctionEntry0(CNOTIFYCOLLECTOR_DCNOTIFYCOLLECTOR); - } + LOG_FUNC ClearAllEvents(); // free event arrays @@ -84,6 +74,7 @@ */ void CNotifyCollector::ClearAllEvents(TBool aClearRecieved/*=ETrue*/, TBool aClearRequired /*=ETrue*/) { + //LOG_FUNC if (aClearRequired) { iRequiredEvents.Reset(); @@ -101,10 +92,7 @@ */ void CNotifyCollector::CreateObserversL(COtgRoot &aOtgDriver) { - if(gVerboseOutput) - { - OstTraceFunctionEntry0(CNOTIFYCOLLECTOR_CREATEOBSERVERSL); - } + LOG_FUNC TInt watchType; ASSERT(aOtgDriver.LddLoaded()); @@ -137,7 +125,7 @@ // add it to our list so we can kill them after the test. iNotifyObjects.Append(pWatcher); - + //LOG_VERBOSE3(_L("Added watcher type %d, TRequest= %08X.\n"), iType, (TInt)(&pWatcher->iStatus)); // start all watchers, except for the watchdog if (watchType != EWatcherTimeouts) @@ -146,7 +134,6 @@ } } test.Printf(_L("\n")); - OstTrace0(TRACE_NORMAL, CNOTIFYCOLLECTOR_CREATEOBSERVERSL_DUP02, "\n"); } @@ -154,19 +141,12 @@ */ void CNotifyCollector::DestroyObservers() { - if(gVerboseOutput) - { - OstTraceFunctionEntry0(CNOTIFYCOLLECTOR_DESTROYOBSERVERS); - } + LOG_FUNC // Free the Watchers for (TInt idx=0; idx < iNotifyObjects.Count(); idx++) { LOG_VERBOSE2(_L(".. %d .."), idx); - if(gVerboseOutput) - { - OstTrace1(TRACE_VERBOSE, CNOTIFYCOLLECTOR_DESTROYOBSERVERS_DUP01, ".. %d ..", idx); - } delete iNotifyObjects[idx]; // they will call their own Cancel() methods } iNotifyObjects.Close(); @@ -202,42 +182,22 @@ case EWatcherState: COtgRoot::OtgStateString(static_cast(aValue), aDescription); LOG_VERBOSE3(_L("AddRequiredNotification() State %d '%S' wanted\n"), aValue, &aDescription); - if(gVerboseOutput) - { - OstTraceExt2(TRACE_VERBOSE, CNOTIFYCOLLECTOR_ADDREQUIREDORFAILURENOTIFICATION, "AddRequiredNotification() State %d '%S' wanted\n", aValue, aDescription); - } break; case EWatcherEvent: COtgRoot::OtgEventString(static_cast(aValue), aDescription); LOG_VERBOSE3(_L("AddRequiredNotification() Event %d '%S' wanted\n"), aValue, &aDescription); - if(gVerboseOutput) - { - OstTraceExt2(TRACE_VERBOSE, CNOTIFYCOLLECTOR_ADDREQUIREDORFAILURENOTIFICATION_DUP01, "AddRequiredNotification() Event %d '%S' wanted\n", aValue, aDescription); - } break; case EWatcherMessage: COtgRoot::OtgMessageString(static_cast(aValue), aDescription); LOG_VERBOSE3(_L("AddRequiredNotification() Message %d '%S' wanted\n"), aValue, &aDescription); - if(gVerboseOutput) - { - OstTraceExt2(TRACE_VERBOSE, CNOTIFYCOLLECTOR_ADDREQUIREDORFAILURENOTIFICATION_DUP02, "AddRequiredNotification() Message %d '%S' wanted\n", aValue, aDescription); - } break; case EWatcherPeripheralState: COtgRoot::PeripheralStateString(static_cast(aValue), aDescription); LOG_VERBOSE3(_L("AddRequiredNotification() Peripheral State %d '%S' wanted\n"), aValue, &aDescription); - if(gVerboseOutput) - { - OstTraceExt2(TRACE_VERBOSE, CNOTIFYCOLLECTOR_ADDREQUIREDORFAILURENOTIFICATION_DUP03, "AddRequiredNotification() Peripheral State %d '%S' wanted\n", aValue, aDescription); - } break; case EWatcherAConnectionIdle: COtgRoot::AConnectionIdleString(static_cast(aValue), aDescription); LOG_VERBOSE3(_L("AddRequiredNotification() AConnectionIdle %d '%S' wanted\n"), aValue, &aDescription); - if(gVerboseOutput) - { - OstTraceExt2(TRACE_VERBOSE, CNOTIFYCOLLECTOR_ADDREQUIREDORFAILURENOTIFICATION_DUP04, "AddRequiredNotification() AConnectionIdle %d '%S' wanted\n", aValue, aDescription); - } break; } @@ -351,7 +311,6 @@ if (aType == EWatcherTimeouts) { test.Printf(_L("Step timed out..(%dms).\n\n"), GetWatcher(aType)->GetEventValue()); - OstTrace1(TRACE_NORMAL, CNOTIFYCOLLECTOR_HANDLEEVENT, "Step timed out..(%dms).\n\n", GetWatcher(aType)->GetEventValue()); CompleteStep(KTestCaseWatchdogTO); return; } @@ -364,7 +323,6 @@ if (IsFailureEvent(evt)) { test.Printf(_L("This event denotes failure for this test\n")); - OstTrace0(TRACE_NORMAL, CNOTIFYCOLLECTOR_HANDLEEVENT_DUP01, "This event denotes failure for this test\n"); CompleteStep(KTestCaseFailureEventReceived); return; } @@ -374,6 +332,8 @@ // itterate all required events, search for each one in the incomming events list while (start< iRequiredEvents.Count()) { + //LOG_VERBOSE3(_L("Search for=[%d,%d] :"), + // iRequiredEvents[start].GetType(), iRequiredEvents[start].GetValue()); if (!EventReceivedAlready(iRequiredEvents[start])) return; // missing still, continue @@ -381,16 +341,11 @@ } // found all the required events LOG_VERBOSE1(_L("Found all.\n")); - if(gVerboseOutput) - { - OstTrace0(TRACE_VERBOSE, CNOTIFYCOLLECTOR_HANDLEEVENT_DUP03, "Found all.\n"); - } CompleteStep(KErrNone); } else { test.Printf(_L("Warning : No required events!\n")); - OstTrace0(TRACE_NORMAL, CNOTIFYCOLLECTOR_HANDLEEVENT_DUP04, "Warning : No required events!\n"); } } @@ -402,7 +357,6 @@ if(iStatusStep.Int() != KRequestPending) { test.Printf(_L("Can't complete step - not KRequestPending!\n")); - OstTrace0(TRACE_NORMAL, CNOTIFYCOLLECTOR_COMPLETESTEP, "Can't complete step - not KRequestPending!\n"); } else { @@ -418,10 +372,7 @@ const TWatcherNotifyType aWatchType, COtgRoot &aOtgRoot) { - if(gVerboseOutput) - { - OstTraceFunctionEntry0(CNOTIFYCOLLECTOR_COMPLETESTEP_DUP01); - } + LOG_FUNC COtgWatchdogWatcher* self = new (ELeave) COtgWatchdogWatcher(wdHandler, aWatchType, aOtgRoot); CleanupStack::PushL(self); self->ConstructL(); @@ -432,10 +383,7 @@ void COtgWatchdogWatcher::ConstructL() { - if(gVerboseOutput) - { - OstTraceFunctionEntry0(COTGWATCHDOGWATCHER_CONSTRUCTL); - } + LOG_FUNC iTimer.CreateLocal(); iIntervalMs = -1; @@ -444,26 +392,21 @@ void COtgWatchdogWatcher::StepExpired(TInt aInterval) { - if(gVerboseOutput) - { - OstTraceFunctionEntry0(COTGWATCHDOGWATCHER_STEPEXPIRED); - } + LOG_FUNC ; iHandler.HandleEvent(EWatcherTimeouts, aInterval) ; } void COtgWatchdogWatcher::RunL() { + //LOG_FUNC StepExpired(iIntervalMs); } void COtgWatchdogWatcher::StartTimer(TInt aIntervalMs) { - if(gVerboseOutput) - { - OstTraceFunctionEntry0(COTGWATCHDOGWATCHER_STARTTIMER); - } + LOG_FUNC ; iIntervalMs = aIntervalMs; // save value for printing latter if (IsActive()) //cancel the last timer we set, this is easier than cancelling it in each test-step @@ -478,10 +421,6 @@ SetActive(); } LOG_VERBOSE2(_L("wd Timer %dms\n"), aIntervalMs) - if(gVerboseOutput) - { - OstTrace1(TRACE_VERBOSE, COTGWATCHDOGWATCHER_STARTTIMER_DUP01, "wd Timer %dms\n", aIntervalMs); - } } @@ -492,10 +431,7 @@ const TWatcherNotifyType aWatchType, COtgRoot &aOtgRoot) { - if(gVerboseOutput) - { - OstTraceFunctionEntry0(COTGMESSAGEWATCHER_NEWL); - } + LOG_FUNC COtgMessageWatcher* self = new (ELeave) COtgMessageWatcher(wdHandler, aWatchType, aOtgRoot); CleanupStack::PushL(self); self->ConstructL(); @@ -509,7 +445,6 @@ TBuf aDescription; iOtgRoot.OtgMessageString(iMessage, aDescription); test.Printf(_L("Received Message %d '%S'\n"), iMessage, &aDescription); - OstTraceExt2(TRACE_NORMAL, COTGMESSAGEWATCHER_DISPLAYEVENT, "Received Message %d '%S'\n", iMessage, aDescription); } @@ -517,10 +452,7 @@ const TWatcherNotifyType aWatchType, COtgRoot &aOtgRoot) { - if(gVerboseOutput) - { - OstTraceFunctionEntry0(COTGSTATEWATCHER_NEWL); - } + LOG_FUNC COtgStateWatcher* self = new (ELeave) COtgStateWatcher(wdHandler, aWatchType, aOtgRoot); CleanupStack::PushL(self); self->ConstructL(); @@ -531,10 +463,10 @@ void COtgStateWatcher::DisplayEvent() { + //LOG_FUNC TBuf aDescription; iOtgRoot.OtgStateString(iState, aDescription); test.Printf(_L("Received State %d '%S'\n"), iState, &aDescription); - OstTraceExt2(TRACE_NORMAL, COTGSTATEWATCHER_DISPLAYEVENT_DUP01, "Received State %d '%S'\n", iState, aDescription); } @@ -542,6 +474,7 @@ const TWatcherNotifyType aWatchType, COtgRoot &aOtgRoot) { + //LOG_FUNC COtgEventWatcher* self = new (ELeave) COtgEventWatcher(wdHandler, aWatchType, aOtgRoot); CleanupStack::PushL(self); self->ConstructL(); @@ -554,13 +487,13 @@ TBuf aDescription; iOtgRoot.OtgEventString(iEvent, aDescription); test.Printf(_L("Received Event %d '%S'\n"), iEvent, &aDescription); - OstTraceExt2(TRACE_NORMAL, COTGEVENTWATCHER_DISPLAYEVENT, "Received Event %d '%S'\n", iEvent, aDescription); } CPeripheralStateWatcher* CPeripheralStateWatcher::NewL(MOtgNotificationHandler &wdHandler, const TWatcherNotifyType aWatchType, COtgRoot &aOtgRoot) { + //LOG_FUNC CPeripheralStateWatcher* self = new (ELeave) CPeripheralStateWatcher(wdHandler, aWatchType, aOtgRoot); CleanupStack::PushL(self); self->ConstructL(); @@ -573,13 +506,13 @@ TBuf aDescription; iOtgRoot.PeripheralStateString(iPeripheralState, aDescription); test.Printf(_L("Peripheral State %d '%S'\n"), iPeripheralState, &aDescription); - OstTraceExt2(TRACE_NORMAL, CPERIPHERALSTATEWATCHER_DISPLAYEVENT, "Peripheral State %u '%S'\n", iPeripheralState, aDescription); } CAConnectionIdleWatcher* CAConnectionIdleWatcher::NewL(MOtgNotificationHandler &wdHandler, const TWatcherNotifyType aWatchType, COtgRoot &aOtgRoot) { + //LOG_FUNC CAConnectionIdleWatcher* self = new (ELeave) CAConnectionIdleWatcher(wdHandler, aWatchType, aOtgRoot); CleanupStack::PushL(self); self->ConstructL(); @@ -617,5 +550,4 @@ TBuf aDescription; iOtgRoot.AConnectionIdleString(iAConnectionIdle, aDescription); test.Printf(_L("AConnectionIdle %d '%S'\n"), iAConnectionIdle, &aDescription); - OstTraceExt2(TRACE_NORMAL, CACONNECTIONIDLEWATCHER_DISPLAYEVENT, "AConnectionIdle %d '%S'\n", iAConnectionIdle, aDescription); }