--- a/telephonyserverplugins/simatktsy/src/CSatTsyReqHandleStore.cpp Thu Aug 19 11:03:36 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatTsyReqHandleStore.cpp Tue Aug 31 16:23:08 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"
@@ -20,9 +20,14 @@
// INCLUDE FILES
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "CSatTsyReqHandleStoreTraces.h"
+#endif
+
#include "CSatTsyReqHandleStore.h" // Class header
#include "CSatTsy.h" // Main tsy class header
-#include "TfLogger.h" // For TFLOGSTRING
// -----------------------------------------------------------------------------
// CSatTsyReqHandleStore::NewL
@@ -37,7 +42,7 @@
TTsyReqHandle* aFirstElement // Pointer to the first element
)
{
- TFLOGSTRING( "CSAT: CSatTsyReqHandleStore::NewL" );
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSYREQHANDLESTORE_NEWL_1, "CSAT: CSatTsyReqHandleStore::NewL" );
CSatTsyReqHandleStore* tsyReqHandleStore = new ( ELeave )
CSatTsyReqHandleStore();
@@ -52,7 +57,7 @@
}
CleanupStack::Pop( tsyReqHandleStore );
- TFLOGSTRING( "CSAT: CSatTsyReqHandleStore::NewL, end of method" );
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSYREQHANDLESTORE_NEWL_2, "CSAT: CSatTsyReqHandleStore::NewL, end of method" );
return tsyReqHandleStore;
}
@@ -67,7 +72,7 @@
// None
)
{
- TFLOGSTRING( "CSAT: CSatTsyReqHandleStore::~CSatTsyReqHandleStore" );
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSYREQHANDLESTORE_DTOR_1, "CSAT: CSatTsyReqHandleStore::~CSatTsyReqHandleStore" );
}
// -----------------------------------------------------------------------------
@@ -80,7 +85,7 @@
// None
)
{
- TFLOGSTRING( "CSAT: CSatTsyReqHandleStore::CSatTsyReqHandleStore" );
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSYREQHANDLESTORE_CTOR_1, "CSAT: CSatTsyReqHandleStore::CSatTsyReqHandleStore" );
}
// -----------------------------------------------------------------------------
@@ -93,7 +98,7 @@
// None
)
{
- TFLOGSTRING( "CSAT: CSatTsyReqHandleStore::ConstructL" );
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSYREQHANDLESTORE_CONSTRUCTL_1, "CSAT: CSatTsyReqHandleStore::ConstructL" );
}
// -----------------------------------------------------------------------------
@@ -106,7 +111,7 @@
const TInt aIndex // TSY req handle index
)
{
- TFLOGSTRING( "CSAT: CSatTsyReqHandleStore::TsyReqHandle" );
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSYREQHANDLESTORE_TSYREQHANDLE_1, "CSAT: CSatTsyReqHandleStore::TsyReqHandle" );
TTsyReqHandle ret( NULL );
// Check the bounds
@@ -116,8 +121,7 @@
}
else
{
- TFLOGSTRING( "CSAT: CSatTsyReqHandleStore::TsyReqHandle, \
- Out of bounds" );
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSYREQHANDLESTORE_TSYREQHANDLE_2, "CSAT: CSatTsyReqHandleStore::TsyReqHandle, Out of bounds" );
}
return ret;
}
@@ -133,17 +137,15 @@
const TTsyReqHandle aTsyReqHandle // Request handle
)
{
- TFLOGSTRING( "CSAT: CSatTsyReqHandleStore::SetTsyReqHandle" );
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSYREQHANDLESTORE_SETTSYREQHANDLE_1, "CSAT: CSatTsyReqHandleStore::SetTsyReqHandle" );
if ( ( aIndex >= 0 ) && ( aIndex < iNumOfRequests ) )
{
*( iReqHandles + aIndex ) = aTsyReqHandle;
- TFLOGSTRING2( "CSAT: CSatTsyReqHandleStore::SetTsyReqHandle, %d saved",
- aTsyReqHandle );
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSYREQHANDLESTORE_SETTSYREQHANDLE_2, "CSAT: CSatTsyReqHandleStore::SetTsyReqHandle, %d saved", aTsyReqHandle );
}
else
{
- TFLOGSTRING( "CSAT: CSatTsyReqHandleStore::SetTsyReqHandle,\
- Request handle not saved" );
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSYREQHANDLESTORE_SETTSYREQHANDLE_3, "CSAT: CSatTsyReqHandleStore::SetTsyReqHandle, Request handle not saved" );
}
}
@@ -160,7 +162,7 @@
)
{
- TFLOGSTRING( "CSAT: CSatTsyReqHandleStore::ResetTsyReqHandle" );
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSYREQHANDLESTORE_RESETTSYREQHANDLE_1, "CSAT: CSatTsyReqHandleStore::ResetTsyReqHandle" );
// Req handle was not used.
TInt ret = 0;
@@ -174,13 +176,11 @@
// Reset req handle
*( iReqHandles + aIndex ) = 0;
- TFLOGSTRING2( "CSAT: CSatTsyReqHandleStore::ResetTsyReqHandle, index \
- %d removed", aIndex );
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSYREQHANDLESTORE_RESETTSYREQHANDLE_2, "CSAT: CSatTsyReqHandleStore::ResetTsyReqHandle, index %d removed", aIndex );
}
else
{
- TFLOGSTRING("CSAT: CSatTsyReqHandleStore::ResetTsyReqHandle,\
- Not in use");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSYREQHANDLESTORE_RESETTSYREQHANDLE_3, "CSAT: CSatTsyReqHandleStore::ResetTsyReqHandle, Not in use");
}
}
else
@@ -188,8 +188,7 @@
// Do nothing
}
- TFLOGSTRING2("CSAT: CSatTsyReqHandleStore::ResetTsyReqHandle \
- reqHandle is :%d", ret );
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSYREQHANDLESTORE_RESETTSYREQHANDLE_4, "CSAT: CSatTsyReqHandleStore::ResetTsyReqHandle reqHandle is :%d", ret );
return ret;
}