--- a/telephonyserverplugins/common_tsy/commontsy/src/mmstorage/cmmonstoretsy.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmstorage/cmmonstoretsy.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -16,6 +16,12 @@
// INCLUDE FILES
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "cmmonstoretsyTraces.h"
+#endif
+
#include "cmmonstoretsy.h"
#include "cmmtsyreqhandlestore.h"
#include "CMmPrivateUtility.h"
@@ -35,7 +41,7 @@
void CMmONStoreTsy::ConstructL()
{
-TFLOGSTRING("TSY: CMmONStoreTsy::ConstructL");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_CONSTRUCTL_1, "TSY: CMmONStoreTsy::ConstructL");
#ifdef REQHANDLE_TIMER
// Create req handle store
@@ -98,7 +104,7 @@
CMmONStoreTsy::~CMmONStoreTsy()
{
-TFLOGSTRING("TSY: CMmONStoreTsy::~CMmONStoreTsy");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_DTOR_1, "TSY: CMmONStoreTsy::~CMmONStoreTsy");
if (iMmPhone )
{
@@ -178,7 +184,7 @@
CTelObject::TReqMode CMmONStoreTsy::ReqModeL(
const TInt aIpc )
{
-TFLOGSTRING2("TSY: CMmONStoreTsy::ReqModeL IPC %d", aIpc);
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_REQMODEL_1, "TSY: CMmONStoreTsy::ReqModeL IPC %d", aIpc);
CTelObject::TReqMode ret=0;
switch ( aIpc )
{
@@ -290,7 +296,7 @@
const TInt aIpc,
const TDataPackage& aPackage )
{
-TFLOGSTRING3("TSY: CMmONStoreTsy::ExtFunc - IPC:%d Handle:%d", aIpc, aTsyReqHandle);
+OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_EXTFUNC_1, "TSY: CMmONStoreTsy::ExtFunc - IPC:%d Handle:%d", aIpc, aTsyReqHandle);
TInt ret = KErrNone;
TInt trapError = KErrNone;
@@ -333,7 +339,7 @@
const TInt aIpc,
const TDataPackage& aPackage )
{
-TFLOGSTRING3("TSY: CMmONStoreTsy::DoExtFuncL - IPC:%d Handle:%d", aIpc, aTsyReqHandle);
+OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_DOEXTFUNCL_1, "TSY: CMmONStoreTsy::DoExtFuncL - IPC:%d Handle:%d", aIpc, aTsyReqHandle);
TAny* dataPtr=aPackage.Ptr1();
TAny* dataPtr2=aPackage.Ptr2();
@@ -458,7 +464,7 @@
//
TInt CMmONStoreTsy::ReadL( TDes8* aEntry )
{
-TFLOGSTRING("TSY: CMmONStoreTsy::ReadL");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_READL_1, "TSY: CMmONStoreTsy::ReadL");
// Initialize ret value
TInt ret( KErrArgument );
@@ -501,7 +507,7 @@
TInt aResult,
CMmDataPackage* aDataPackage )
{
-TFLOGSTRING("TSY: CMmONStoreTsy::CompleteRead");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_COMPLETEREAD_1, "TSY: CMmONStoreTsy::CompleteRead");
// Response information
TONStoreMsg* ONStoreResp = NULL;
// unpack data if exists
@@ -512,7 +518,7 @@
}
else if ( KErrNone == aResult )
{
-TFLOGSTRING("TSY: CMmONStoreTsy::CompleteRead result is KErrNone and aDataPackage is NULL!");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_COMPLETEREAD_2, "TSY: CMmONStoreTsy::CompleteRead result is KErrNone and aDataPackage is NULL!");
aResult = KErrArgument;
}
@@ -578,7 +584,7 @@
TInt CMmONStoreTsy::ReadCancel(
const TTsyReqHandle aTsyReqHandle )
{
-TFLOGSTRING("TSY: CMmONStoreTsy::ReadCancel");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_READCANCEL_1, "TSY: CMmONStoreTsy::ReadCancel");
// Reset req handle. Returns the deleted req handle
TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
EMultimodeONStoreRead );
@@ -603,7 +609,7 @@
const TTsyReqHandle aTsyReqHandle,
TDesC8* aEntry )
{
-TFLOGSTRING("TSY: CMmONStoreTsy::WriteL");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_WRITEL_1, "TSY: CMmONStoreTsy::WriteL");
// Unpack entry param to get the location
RMobileONStore::TMobileONEntryV1Pckg* entryPckg =
@@ -661,7 +667,7 @@
TInt aResult,
CMmDataPackage* aDataPackage )
{
-TFLOGSTRING("TSY: CMmONStoreTsy::CompleteWrite");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_COMPLETEWRITE_1, "TSY: CMmONStoreTsy::CompleteWrite");
// Reset req handle. Returns the deleted req handle
TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
EMultimodeONStoreWrite );
@@ -713,7 +719,7 @@
TInt CMmONStoreTsy::WriteCancel(
const TTsyReqHandle aTsyReqHandle )
{
-TFLOGSTRING("TSY: CMmONStoreTsy::WriteCancel");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_WRITECANCEL_1, "TSY: CMmONStoreTsy::WriteCancel");
// Check if cancelling is possible. If not, return KErrNone
if ( iIsWriteCancellingPossible )
{
@@ -742,7 +748,7 @@
const TTsyReqHandle aTsyReqHandle,
TInt* aIndex )
{
-TFLOGSTRING("TSY: CMmONStoreTsy::DeleteL");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_DELETEL_1, "TSY: CMmONStoreTsy::DeleteL");
// Initialize ret value
TInt ret( KErrGeneral );
@@ -781,7 +787,7 @@
void CMmONStoreTsy::CompleteDelete(
TInt aResult )
{
-TFLOGSTRING("TSY: CMmONStoreTsy::CompleteDelete");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_COMPLETEDELETE_1, "TSY: CMmONStoreTsy::CompleteDelete");
// Reset req handle. Returns the deleted req handle
TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
EMultimodeONStoreDelete );
@@ -811,7 +817,7 @@
TInt CMmONStoreTsy::DeleteAllL (
const TTsyReqHandle aTsyReqHandle )
{
-TFLOGSTRING("TSY: CMmONStoreTsy::DeleteAllL");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_DELETEALLL_1, "TSY: CMmONStoreTsy::DeleteAllL");
// Init variable for DeleteAllPhase1
iDeleteAllContinue = ETrue;
@@ -843,7 +849,7 @@
void CMmONStoreTsy::CompleteDeleteAllPhase1L(
TInt aResult )
{
-TFLOGSTRING("TSY: CMmONStoreTsy::CompleteDeleteAllPhase1L");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_COMPLETEDELETEALLPHASE1L_1, "TSY: CMmONStoreTsy::CompleteDeleteAllPhase1L");
// Check that DeleteAll was called
if ( iDeleteAllContinue )
{
@@ -889,7 +895,7 @@
// Check that deleted request handle was valid
if ( EMultimodeONStoreReqHandleUnknown != reqHandle )
{
-TFLOGSTRING("TSY: CMmONStoreTsy::CompleteDeleteAll");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_COMPLETEDELETEALL_1, "TSY: CMmONStoreTsy::CompleteDeleteAll");
// Complete with error
ReqCompleted( reqHandle, aResult );
@@ -907,7 +913,7 @@
else if(EMultimodeONStoreReqHandleUnknown !=
iTsyReqHandleStore->GetTsyReqHandle(EMultimodeONStoreStoreAll ))
{
-TFLOGSTRING("TSY: CMmONStoreTsy::CompleteDeleteAll requested by StoreAllL.");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_COMPLETEDELETEALL_2, "TSY: CMmONStoreTsy::CompleteDeleteAll requested by StoreAllL.");
TInt ret (aResult);
if(KErrNone == ret)
@@ -928,7 +934,7 @@
}
else
{
-TFLOGSTRING("TSY: CMmONStoreTsy::CompleteDeleteAll - the request has been cancelled or bad req handle");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_COMPLETEDELETEALL_3, "TSY: CMmONStoreTsy::CompleteDeleteAll - the request has been cancelled or bad req handle");
}
}
@@ -941,7 +947,7 @@
TInt CMmONStoreTsy::DeleteAllCancel(
const TTsyReqHandle aTsyReqHandle )
{
-TFLOGSTRING("TSY: CMmONStoreTsy::DeleteAllCancel");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_DELETEALLCANCEL_1, "TSY: CMmONStoreTsy::DeleteAllCancel");
// Reset req handle. Returns the deleted req handle
TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
EMultimodeONStoreDeleteAll );
@@ -967,7 +973,7 @@
const TTsyReqHandle aTsyReqHandle,
RMobileONStore::TMobileONStoreInfoV1* aInfo )
{
-TFLOGSTRING("TSY: CMmONStoreTsy::GetInfoL");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_GETINFOL_1, "TSY: CMmONStoreTsy::GetInfoL");
TInt ret( KErrNone );
@@ -988,12 +994,12 @@
// Don't send request if pb init is still ongoing
// instead create an ADN book store and wait for it to initilize
-TFLOGSTRING2( "TSY: CMmONStoreTsy::GetInfoL iPBList->GetNumberOfObjects() = %d", iMmPhone->PBList()->GetNumberOfObjects());
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_GETINFOL_2, "TSY: CMmONStoreTsy::GetInfoL iPBList->GetNumberOfObjects() = %d", iMmPhone->PBList()->GetNumberOfObjects());
CMmPhoneBookStoreTsy* pbStore = NULL;
for( TInt i = 0; (i < iMmPhone->PBList()->GetNumberOfObjects()) && (NULL == pbStore) ; i++ )
{
pbStore = iMmPhone->PBList()->GetMmPBByIndex( i );
-TFLOGSTRING2( "TSY: CMmONStoreTsy::GetInfoL index = %d", i);
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_GETINFOL_3, "TSY: CMmONStoreTsy::GetInfoL index = %d", i);
if( (pbStore->GetPhonebookType() != KADNPhoneBook) && (pbStore->GetPhonebookType() != KFDNPhoneBook ) )
{
pbStore = NULL;
@@ -1001,12 +1007,12 @@
else
{
-TFLOGSTRING("TSY: CMmONStoreTsy::GetInfoL - found ADN or FDN store");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_GETINFOL_4, "TSY: CMmONStoreTsy::GetInfoL - found ADN or FDN store");
}
}
if(NULL == pbStore)
{
-TFLOGSTRING("TSY: CMmONStoreTsy::GetInfoL - no ADN nor FDN store- creating ADN");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_GETINFOL_5, "TSY: CMmONStoreTsy::GetInfoL - no ADN nor FDN store- creating ADN");
pbStore = CMmPhoneBookStoreTsy::NewL( iMmPhone, KETelIccAdnPhoneBook );
TInt addPBSucceeded = iMmPhone->PBList()->AddObject( pbStore );
if(addPBSucceeded != KErrNone)
@@ -1022,13 +1028,13 @@
if ( !pbStore->IsPBInitDone())
{
-TFLOGSTRING("TSY: CMmONStoreTsy::GetInfoL - waiting for phone book to be initilized");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_GETINFOL_6, "TSY: CMmONStoreTsy::GetInfoL - waiting for phone book to be initilized");
// Save tsy req handle type
iReqHandleType = EMultimodeONStoreGetInfo;
return KErrNone;
}
-TFLOGSTRING("TSY: CMmONStoreTsy::GetInfoL - PBInit done, complete");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_GETINFOL_7, "TSY: CMmONStoreTsy::GetInfoL - PBInit done, complete");
// Request to GSM extension, get used entries,
// -1 as a index param-> specified location param not needed
@@ -1057,7 +1063,7 @@
TInt aResult,
CMmDataPackage* aDataPackage )
{
-TFLOGSTRING2("TSY: CMmONStoreTsy::CompleteGetInfo - Result: %d", aResult );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_COMPLETEGETINFO_1, "TSY: CMmONStoreTsy::CompleteGetInfo - Result: %d", aResult );
// Reset req handle. Returns the deleted req handle
TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
@@ -1082,9 +1088,9 @@
*iONStoreInfoChanged = iONStoreInfo;
-TFLOGSTRING3("TSY: CMmONStoreTsy::CompleteGetInfo - Name: %S, Type: %d", &iONStoreInfoChanged->iName, iONStoreInfoChanged->iType );
-TFLOGSTRING3("TSY: CMmONStoreTsy::CompleteGetInfo - Total entries: %d, Used entries: %d", iONStoreInfoChanged->iTotalEntries, iONStoreInfoChanged->iUsedEntries );
-TFLOGSTRING3("TSY: CMmONStoreTsy::CompleteGetInfo - Max Number length: %d, Max Name length: %d", iONStoreInfoChanged->iNumberLen, iONStoreInfoChanged->iTextLen );
+OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_COMPLETEGETINFO_2, "TSY: CMmONStoreTsy::CompleteGetInfo - Name: %S, Type: %d", iONStoreInfoChanged->iName, iONStoreInfoChanged->iType );
+OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_COMPLETEGETINFO_3, "TSY: CMmONStoreTsy::CompleteGetInfo - Total entries: %d, Used entries: %d", iONStoreInfoChanged->iTotalEntries, iONStoreInfoChanged->iUsedEntries );
+OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_COMPLETEGETINFO_4, "TSY: CMmONStoreTsy::CompleteGetInfo - Max Number length: %d, Max Name length: %d", iONStoreInfoChanged->iNumberLen, iONStoreInfoChanged->iTextLen );
}
// NULL the pointer to info supplied to TSY from the client
@@ -1103,7 +1109,7 @@
//
void CMmONStoreTsy::SetInfo()
{
-TFLOGSTRING("TSY: CMmONStoreTsy::SetInfo");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_SETINFO_1, "TSY: CMmONStoreTsy::SetInfo");
// The name of the store
iONStoreInfo.iName = KETelOwnNumberStore;
@@ -1135,7 +1141,7 @@
TInt CMmONStoreTsy::GetInfoCancel(
const TTsyReqHandle aTsyReqHandle )
{
-TFLOGSTRING("TSY: CMmONStoreTsy::GetInfoCancel");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_GETINFOCANCEL_1, "TSY: CMmONStoreTsy::GetInfoCancel");
iTsyReqHandleStore->ResetTsyReqHandle( EMultimodeONStoreGetInfo );
@@ -1155,7 +1161,7 @@
RMobilePhoneStore::TMobileStoreEvent* aEvent,
TInt* aIndex )
{
-TFLOGSTRING("TSY: CMmONStoreTsy::NotifyStoreEvent");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_NOTIFYSTOREEVENT_1, "TSY: CMmONStoreTsy::NotifyStoreEvent");
TTsyReqHandle requestHandle = iTsyReqHandleStore->GetTsyReqHandle(
EMultimodeONStoreNotifyStoreEvent );
@@ -1182,7 +1188,7 @@
void CMmONStoreTsy::CompleteNotifyStoreEvent(
TInt aLocation )
{
-TFLOGSTRING("TSY: CMmONStoreTsy::CompleteNotifyStoreEvent");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_COMPLETENOTIFYSTOREEVENT_1, "TSY: CMmONStoreTsy::CompleteNotifyStoreEvent");
// Reset request handle. Returns the deleted req handle
TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
EMultimodeONStoreNotifyStoreEvent );
@@ -1211,7 +1217,7 @@
TInt CMmONStoreTsy::NotifyStoreEventCancel(
const TTsyReqHandle aTsyReqHandle )
{
-TFLOGSTRING("TSY: CMmONStoreTsy::NotifyStoreEventCancel");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_NOTIFYSTOREEVENTCANCEL_1, "TSY: CMmONStoreTsy::NotifyStoreEventCancel");
// Reset req handle. Returns the deleted req handle
TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
EMultimodeONStoreNotifyStoreEvent );
@@ -1238,7 +1244,7 @@
const RMobilePhone::TClientId* aId,
TInt* aBufSize )
{
-TFLOGSTRING("TSY: CMmONStoreTsy::ReadAllPhase1L");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_READALLPHASE1L_1, "TSY: CMmONStoreTsy::ReadAllPhase1L");
// Init return value
TInt ret( KErrNone );
@@ -1281,12 +1287,12 @@
TInt aError,
CMmDataPackage* aDataPackage )
{
-TFLOGSTRING("TSY: CMmONStoreTsy::InternalRetrieveONListReadSizeL");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_INTERNALRETRIEVEONLISTREADSIZEL_1, "TSY: CMmONStoreTsy::InternalRetrieveONListReadSizeL");
if ( KErrNone == aError )
{
TInt size;
aDataPackage->UnPackData( size );
-TFLOGSTRING2("TSY: CMmONStoreTsy::InternalRetrieveONListReadSizeL size=%d",size);
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_INTERNALRETRIEVEONLISTREADSIZEL_2, "TSY: CMmONStoreTsy::InternalRetrieveONListReadSizeL size=%d",size);
if( 0 < size )
{
*iReadAllBufSizePtr = size;
@@ -1295,7 +1301,7 @@
}
else
{
-TFLOGSTRING2("TSY: CMmONStoreTsy::InternalRetrieveONListReadSizeL size is %d", size);
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_INTERNALRETRIEVEONLISTREADSIZEL_3, "TSY: CMmONStoreTsy::InternalRetrieveONListReadSizeL size is %d", size);
CompleteReadAllPhase1Req( KErrNotFound );
}
}
@@ -1315,7 +1321,7 @@
//
void CMmONStoreTsy::MakeInternalRetrieveONListReadReqL()
{
-TFLOGSTRING("TSY: CMmONStoreTsy::MakeInternalRetrieveONListReadReqL");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_MAKEINTERNALRETRIEVEONLISTREADREQL_1, "TSY: CMmONStoreTsy::MakeInternalRetrieveONListReadReqL");
// Read one entry from the PhoneBook.
TInt ret = iMmONStoreExtInterface->
ReadL( EMmTsyONStoreReadEntryIPC,iReadAllONStoreIndex );
@@ -1342,7 +1348,7 @@
TInt aError,
CMmDataPackage* aDataPackage)
{
-TFLOGSTRING("TSY: CMmONStoreTsy::InternalRetrieveONListReadEntryL");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_INTERNALRETRIEVEONLISTREADENTRYL_1, "TSY: CMmONStoreTsy::InternalRetrieveONListReadEntryL");
if ( KErrNone == aError )
{
// Check if there is data to save
@@ -1388,7 +1394,7 @@
//
TInt CMmONStoreTsy::CompleteReadAllPhase1L()
{
-TFLOGSTRING("TSY: CMmONStoreTsy::CompleteReadAllPhase1L");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_COMPLETEREADALLPHASE1L_1, "TSY: CMmONStoreTsy::CompleteReadAllPhase1L");
// Reset req handle. Returns the deleted req handle
TTsyReqHandle reqHandle = iTsyReqHandleStore->GetTsyReqHandle(
EMultimodeONStoreReadAll );
@@ -1467,7 +1473,7 @@
void CMmONStoreTsy::CompleteReadAllPhase1Req(
TInt aResult )
{
-TFLOGSTRING("TSY: CMmONStoreTsy::CompleteReadAllPhase1Req");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_COMPLETEREADALLPHASE1REQ_1, "TSY: CMmONStoreTsy::CompleteReadAllPhase1Req");
// Reset req handle. Returns the deleted req handle
TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
EMultimodeONStoreReadAll );
@@ -1496,7 +1502,7 @@
//
void CMmONStoreTsy::DeleteONStoreListArrayElements()
{
-TFLOGSTRING("TSY: CMmONStoreTsy::DeleteONStoreListArrayElements");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_DELETEONSTORELISTARRAYELEMENTS_1, "TSY: CMmONStoreTsy::DeleteONStoreListArrayElements");
while( 0 == !iONStoreListArray->Count() )
{
// Delete list member
@@ -1519,7 +1525,7 @@
const RMobilePhone::TClientId* aId,
TDes8* aBuffer )
{
-TFLOGSTRING("TSY: CMmONStoreTsy::ReadAllPhase2");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_READALLPHASE2_1, "TSY: CMmONStoreTsy::ReadAllPhase2");
// Initialize ret value
TInt ret( KErrCorrupt );
@@ -1576,7 +1582,7 @@
TInt CMmONStoreTsy::ReadAllCancel(
const TTsyReqHandle aTsyReqHandle )
{
-TFLOGSTRING("TSY: CMmONStoreTsy::ReadAllCancel");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_READALLCANCEL_1, "TSY: CMmONStoreTsy::ReadAllCancel");
// Reset req handle. Returns the deleted req handle
TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
EMultimodeONStoreReadAll );
@@ -1604,7 +1610,7 @@
const TTsyReqHandle aTsyReqHandle,
TDes8* aBuffer )
{
-TFLOGSTRING("TSY: CMmONStoreTsy::StoreAllL");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_STOREALLL_1, "TSY: CMmONStoreTsy::StoreAllL");
// Init return value
TInt ret( KErrNone );
@@ -1624,7 +1630,7 @@
// StoreAll overwrites ON phone store. So, first delete all store.
ret = iMmONStoreExtInterface->DeleteAllL(
EMmTsyONStoreDeleteAllIPC );
-TFLOGSTRING2("CMmONStoreTsy::StoreAllL - DeleteAllL() ret: %d", ret);
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_STOREALLL_2, "CMmONStoreTsy::StoreAllL - DeleteAllL() ret: %d", ret);
// Message construction failed or phonet sender returned error
if ( KErrNone != ret )
@@ -1653,13 +1659,13 @@
TInt aError,
CMmDataPackage* aDataPackage )
{
-TFLOGSTRING2("CMmONStoreTsy::InternalStoreAllGetSizeL %d",aError);
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_INTERNALSTOREALLGETSIZEL_1, "CMmONStoreTsy::InternalStoreAllGetSizeL %d",aError);
if ( KErrNone == aError )
{
TInt size;
aDataPackage->UnPackData( size );
-TFLOGSTRING2("CMmONStoreTsy::InternalStoreAllGetSizeL size %d", size);
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_INTERNALSTOREALLGETSIZEL_2, "CMmONStoreTsy::InternalStoreAllGetSizeL size %d", size);
// Check the size of ONStore and the ONList size from Client
// Client's ONList size should not be greater than ONStore size
if ( size > 0 && size >= iStoreAllONListSize )
@@ -1701,7 +1707,7 @@
//
void CMmONStoreTsy::MakeInternalStoreAllWriteReqL()
{
-TFLOGSTRING("CMmONStoreTsy::MakeInternalStoreAllWriteReqL ");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_MAKEINTERNALSTOREALLWRITEREQL_1, "CMmONStoreTsy::MakeInternalStoreAllWriteReqL ");
// Create ONList and push it to cleanup stack
CMobilePhoneONList* aONList=CMobilePhoneONList::NewL();
CleanupStack::PushL(aONList);
@@ -1777,7 +1783,7 @@
void CMmONStoreTsy::InternalStoreAllWriteEntryL(
TInt aResult )
{
-TFLOGSTRING2("CMmONStoreTsy::InternalStoreAllWriteEntryL %d",aResult);
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_INTERNALSTOREALLWRITEENTRYL_1, "CMmONStoreTsy::InternalStoreAllWriteEntryL %d",aResult);
TTsyReqHandle storeAllRequestHandle =
iTsyReqHandleStore->GetTsyReqHandle(
@@ -1786,7 +1792,7 @@
if ( EMultimodeONStoreReqHandleUnknown == storeAllRequestHandle )
{
// The request has been cancelled or bad req handle
-TFLOGSTRING("The ON store request has been cancelled or bad req handle");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_INTERNALSTOREALLWRITEENTRYL_2, "The ON store request has been cancelled or bad req handle");
return;
}
@@ -1810,7 +1816,7 @@
void CMmONStoreTsy::CompleteStoreAll(
TInt aResult )
{
-TFLOGSTRING2("CMmONStoreTsy::CompleteStoreAll %d",aResult);
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_COMPLETESTOREALL_1, "CMmONStoreTsy::CompleteStoreAll %d",aResult);
// Reset req handle. Returns the deleted req handle
TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
EMultimodeONStoreStoreAll );
@@ -1848,7 +1854,7 @@
TInt CMmONStoreTsy::StoreAllCancel(
TTsyReqHandle aTsyReqHandle )
{
-TFLOGSTRING("CMmONStoreTsy::StoreAllCancel");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_STOREALLCANCEL_1, "CMmONStoreTsy::StoreAllCancel");
// Reset req handle. Returns the deleted req handle
TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
EMultimodeONStoreStoreAll );
@@ -1905,7 +1911,7 @@
const TTsyReqHandle aTsyReqHandle,
const TInt aError )
{
-TFLOGSTRING3("TSY: CMmONStoreTsy::ReqCompleted Completed - Handle:%d Error:%d", aTsyReqHandle, aError);
+OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_REQCOMPLETED_1, "TSY: CMmONStoreTsy::ReqCompleted Completed - Handle:%d Error:%d", aTsyReqHandle, aError);
CTelObject::ReqCompleted( aTsyReqHandle, aError );
}
@@ -1992,7 +1998,7 @@
TInt aReqHandleType,
TInt aError )
{
-TFLOGSTRING3( "TSY: CMmONStoreTsy::Complete - ReqHandleType: %d Error: %d", aReqHandleType, aError );
+OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_COMPLETE_1, "TSY: CMmONStoreTsy::Complete - ReqHandleType: %d Error: %d", aReqHandleType, aError );
//All possible TSY req handle types are listed in the
//switch case below.
switch( aReqHandleType )
@@ -2039,7 +2045,7 @@
//
void CMmONStoreTsy::PhoneBookStoreInitCompleteL(TInt aError)
{
- TFLOGSTRING("TSY: CMmONStoreTsy::PhoneBookStoreInitCompleteL ");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_PHONEBOOKSTOREINITCOMPLETEL_1, "TSY: CMmONStoreTsy::PhoneBookStoreInitCompleteL ");
TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( EMultimodeONStoreGetInfo );
if( EMultimodeONStoreReqHandleUnknown != reqHandle )
{