--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/cpdpfsmfactory.cpp Thu Aug 19 11:03:36 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/cpdpfsmfactory.cpp Tue Aug 31 16:23:08 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"
@@ -20,14 +20,20 @@
@internalComponent
*/
+
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "cpdpfsmfactoryTraces.h"
+#endif
+
#include "cpdpfsmfactory.h"
-#include "spudfsmdebuglogger.h"
// NewL
CPdpFsmFactory* CPdpFsmFactory::NewL ()
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmFactory::NewL()");
-
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMFACTORY_NEWL_1, ">>CPdpFsmFactory::NewL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMFACTORY_NEWL_2, "<<CPdpFsmFactory::NewL()");
return new (ELeave) CPdpFsmFactory ();
}
@@ -64,24 +70,26 @@
iStateActivatingMbms(this),
iStateCreatedMbms(this)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmFactory::CPdpFsmFactory()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMFACTORY_CTOR_1, ">>CPdpFsmFactory::CPdpFsmFactory()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMFACTORY_CTOR_2, "<<CPdpFsmFactory::CPdpFsmFactory()");
}
CPdpFsmFactory::~CPdpFsmFactory()
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmFactory::~CPdpFsmFactory()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMFACTORY_DTOR_1, ">>CPdpFsmFactory::~CPdpFsmFactory()");
iContexts.DeleteAll();
iContexts.Reset();
delete iEtelDriverInput;
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMFACTORY_DTOR_2, "<<CPdpFsmFactory::~CPdpFsmFactory()");
}
void CPdpFsmFactory::InitL(const TName& aTsyName, CPdpFsmInterface * aPdpFsmInterface)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmFactory::InitL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMFACTORY_INITL_1, ">>CPdpFsmFactory::InitL()");
iPdpFsmInterface = aPdpFsmInterface;
@@ -92,20 +100,21 @@
iEtelDriverInput = new (ELeave) REtelDriverInput;
iEtelDriverInput->OpenL (*iPdpFsmInterface);
-
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMFACTORY_INITL_2, "<<CPdpFsmFactory::InitL()");
// Only create PDP contexts if specifically requested.
}
void CPdpFsmFactory::Close (void)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmFactory::Close()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMFACTORY_CLOSE_1, ">>CPdpFsmFactory::Close()");
// in OOM conditions iEtelDriveInput may not have successfully
// been created, check here for safety.
if (iEtelDriverInput != NULL)
{
iEtelDriverInput->Close();
}
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMFACTORY_CLOSE_2, "<<CPdpFsmFactory::Close()");
}
@@ -114,8 +123,8 @@
*/
CPdpFsm* CPdpFsmFactory::GetFsmContext (TContextId aPdpId)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmFactory::GetContext()");
-
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMFACTORY_GETFSMCONTEXT_1, ">>CPdpFsmFactory::GetContext()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMFACTORY_GETFSMCONTEXT_2, "<<CPdpFsmFactory::GetContext()");
return iContexts[aPdpId];
}
@@ -131,7 +140,7 @@
TContextId CPdpFsmFactory::NewFsmContextL(MPdpFsmEventHandler& aPdpFsmEventHandler,SpudMan::TPdpContextType aContextType)
#endif
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmFactory::NewFsmContext()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMFACTORY_NEWFSMCONTEXTL_1, ">>CPdpFsmFactory::NewFsmContext()");
#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
TInt ret = KErrNone;
@@ -145,6 +154,7 @@
iContexts[aPdpId] = p;
);
}
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMFACTORY_NEWFSMCONTEXTL_2, "<<CPdpFsmFactory::NewFsmContext()");
return ret;
#else
TInt i=0;
@@ -158,18 +168,19 @@
iContexts[i] = p;
iEtelDriverInput->CreatePdpL(i, aContextType);
}
- return i;
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMFACTORY_NEWFSMCONTEXTL_3, "<<CPdpFsmFactory::NewFsmContext()");
+ return i;
#endif
}
TInt CPdpFsmFactory::DeleteFsmContext(TContextId aPdpId)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmFactory::DeleteFsmContext()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMFACTORY_DELETEFSMCONTEXT_1, ">>CPdpFsmFactory::DeleteFsmContext()");
ASSERT(ContextIsValid(aPdpId));
delete iContexts[aPdpId];
iContexts[aPdpId] = NULL;
-
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMFACTORY_DELETEFSMCONTEXT_2, "<<CPdpFsmFactory::DeleteFsmContext()");
return KErrNone;
}