--- a/kerneltest/e32test/usbho/t_usbdi/src/BasicWatcher.cpp Wed Aug 18 11:08:29 2010 +0300
+++ b/kerneltest/e32test/usbho/t_usbdi/src/BasicWatcher.cpp Thu Sep 02 21:54:16 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"
@@ -18,6 +18,10 @@
#include "BasicWatcher.h"
#include "testdebug.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "BasicWatcherTraces.h"
+#endif
namespace NUnitTesting_USBDI
{
@@ -27,51 +31,58 @@
iCallBack(aCallBack),
iCompletionCode(KErrNone)
{
+ OstTraceFunctionEntryExt( CBASICWATCHER_CBASICWATCHER_ENTRY, this );
CActiveScheduler::Add(this);
+ OstTraceFunctionExit1( CBASICWATCHER_CBASICWATCHER_EXIT, this );
}
CBasicWatcher::~CBasicWatcher()
{
- LOG_FUNC
+ OstTraceFunctionEntry1( CBASICWATCHER_CBASICWATCHER_ENTRY_DUP01, this );
Cancel();
+ OstTraceFunctionExit1( CBASICWATCHER_CBASICWATCHER_EXIT_DUP01, this );
}
void CBasicWatcher::DoCancel()
{
- LOG_FUNC
+ OstTraceFunctionEntry1( CBASICWATCHER_DOCANCEL_ENTRY, this );
- RDebug::Printf("Watch cancelled");
+ OstTrace0(TRACE_NORMAL, CBASICWATCHER_DOCANCEL, "Watch cancelled");
iStatus = KErrCancel;
+ OstTraceFunctionExit1( CBASICWATCHER_DOCANCEL_EXIT, this );
}
void CBasicWatcher::StartWatching()
{
- LOG_FUNC
+ OstTraceFunctionEntry1( CBASICWATCHER_STARTWATCHING_ENTRY, this );
if(iStatus != KRequestPending)
{
User::Panic(_L("iStatus has not been set to pending this will lead to E32USER-CBase Panic"),46);
}
SetActive();
+ OstTraceFunctionExit1( CBASICWATCHER_STARTWATCHING_EXIT, this );
}
void CBasicWatcher::RunL()
{
- LOG_FUNC
+ OstTraceFunctionEntry1( CBASICWATCHER_RUNL_ENTRY, this );
iCompletionCode = iStatus.Int();
User::LeaveIfError(iCallBack.CallBack());
+ OstTraceFunctionExit1( CBASICWATCHER_RUNL_EXIT, this );
}
TInt CBasicWatcher::RunError(TInt aError)
{
- LOG_FUNC
+ OstTraceFunctionEntryExt( CBASICWATCHER_RUNERROR_ENTRY, this );
- RDebug::Printf("Watcher code Left with %d",aError);
+ OstTrace1(TRACE_NORMAL, CBASICWATCHER_RUNERROR, "Watcher code Left with %d",aError);
+ OstTraceFunctionExitExt( CBASICWATCHER_RUNERROR_EXIT, this, KErrNone );
return KErrNone;
}