--- a/telephonyserver/etelserverandcore/SETEL/ET_PHONE.CPP Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserver/etelserverandcore/SETEL/ET_PHONE.CPP Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1997-2009 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"
@@ -17,12 +17,6 @@
@file
*/
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "ET_PHONETraces.h"
-#endif
-
#include "ET_SSTD.H"
#include "et_record.h"
#include "et_phone_util.h"
@@ -74,7 +68,7 @@
void CReqEntry::CompleteAndDeque(TInt aError)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CREQENTRY_COMPLETEANDDEQUE_1, "CReqEntry::CompleteAndDeque");
+ LOGTEXT("CReqEntry::CompleteAndDeque");
// if client does not interested in this request do not completed
if (iClientInterested)
{
@@ -201,7 +195,7 @@
iRead=0;
iOverFlow=EFalse;
iBufferFull=EFalse;
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBUFFER_INCREAD_1, "ETel:\tiRead incremented to %d", iRead);
+ LOGTEXT2("ETel:\tiRead incremented to %d", iRead);
}
void CBuffer::IncWrite()
@@ -223,7 +217,7 @@
iOverFlow=ETrue;
}
}
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBUFFER_INCWRITE_1, "ETel:\tiWrite incremented to %d", iWrite);
+ LOGTEXT2("ETel:\tiWrite incremented to %d", iWrite);
}
TUint8* CBuffer::CurrentSlotData1(TWhichSlot aWhichSlot) const
@@ -355,12 +349,12 @@
{
if (iDestroyDummySubSession==NULL)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELOBJECT_CREATEDUMMYSESSIONOBJECTL_1, "CDestroyDummySubSession object does not already exist and will be created.");
+ LOGTEXT("CDestroyDummySubSession object does not already exist and will be created.");
iDestroyDummySubSession = CDestroyDummySubSession::NewL(aTelSession->TelServer(),this);
}
else
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELOBJECT_CREATEDUMMYSESSIONOBJECTL_2, "CDestroyDummySubSession object already exists and will not be created");
+ LOGTEXT("CDestroyDummySubSession object already exists and will not be created");
}
}
@@ -371,14 +365,14 @@
// function is called.
//
{
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELOBJECT_CREATEDUMMYSESSION_1, "CreateDummySession() with iDestroyDummySubSession = %x", iDestroyDummySubSession);
+ LOGTEXT2("CreateDummySession() with iDestroyDummySubSession = %x", iDestroyDummySubSession);
iCreateDummy=aCreateDummy;
if (iDestroyDummySubSession->iOpen == EFalse)
{
if ( IsActiveReq(aSession,aSubSessionHandle) || aCreateDummy)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELOBJECT_CREATEDUMMYSESSION_2, "About to create dummy session");
+ LOGTEXT("About to create dummy session");
__ASSERT_ALWAYS(aSession!=NULL,Fault(EEtelFaultBadTelSessionPointer));
CObject* theObj=this;
while(theObj->Owner())
@@ -393,7 +387,7 @@
// has been previously allocated upon the CTelObject creation (by calling
// CreateDummySessionObjectL() )
iTelServer->Inc();
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELOBJECT_CREATEDUMMYSESSION_3, "Added a Dummy Session, producing server's session count of %d", iTelServer->Count());
+ LOGTEXT2("Added a Dummy Session, producing server's session count of %d", iTelServer->Count());
iDestroyDummySubSession->iTelServer = iTelServer;
iDestroyDummySubSession->iTelObject = this;
@@ -452,7 +446,7 @@
ret=ETrue;
}
}
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELOBJECT_ISACTIVEREQ_1, "IsActiveReq found %d active reqs", iActiveReqCount);
+ LOGTEXT2("IsActiveReq found %d active reqs", iActiveReqCount);
return ret;
}
@@ -463,7 +457,7 @@
// Only go through the list once set the count to zero at start to count number of requests
//
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELOBJECT_CANCELACTIVEREQ_1, "Entered CancelActiveReq");
+ LOGTEXT("Entered CancelActiveReq");
CReqEntry* reqEntry=NULL;
TDblQueIter<CReqEntry> iter(PhoneOwner()->ReqActiveList());
while(reqEntry=iter++,reqEntry!=NULL) // go through the list from begin to end
@@ -476,7 +470,7 @@
{
if (reqEntry->iPlacedRequest)
{
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELOBJECT_CANCELACTIVEREQ_2, "Calling Cancel Service ActiveReq TsyReq=%d", reqEntry->iTsyReqHandle);
+ LOGTEXT2("Calling Cancel Service ActiveReq TsyReq=%d", reqEntry->iTsyReqHandle);
reqEntry->iCancelFnCalled=ETrue;
CancelService(reqEntry->iFunction,reqEntry->iTsyReqHandle);
@@ -502,7 +496,7 @@
}
else
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELOBJECT_CANCELACTIVEREQ_3, "Destroying request");
+ LOGTEXT("Destroying request");
DestroyReq(reqEntry);
CheckAndDestroyDummySubSession();
}
@@ -957,7 +951,7 @@
//
{
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELOBJECT_GENERALREQ_1, "CTelObject::GeneralReq - IPC=%d", aMessage.Function());
+ LOGTEXT2("CTelObject::GeneralReq - IPC=%d", aMessage.Function());
RECORD_IPC(aMessage,aSession,this,aFromFlowControlResume);
if (aFromFlowControlResume && !aFromFlowControlResume){ ; } // avoid compiler warning when ETEL_RECORDER is not defined
@@ -1127,7 +1121,7 @@
TInt error = ResolveError(updatedReqEntry->iSession,aError); // set error as either low or high byte
ipc=updatedReqEntry->iFunction;
- OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CTELOBJECT_REQCOMPLETED_1, "CTelObject::ReqCompleted, IPC=%d, TsyHandle=%d, Error=%d", ipc, aTsyReqHandle, aError);
+ LOGTEXT4("CTelObject::ReqCompleted, IPC=%d, TsyHandle=%d, Error=%d", ipc, aTsyReqHandle, aError);
TReqMode reqMode = updatedReqEntry->iReqMode;
TBool ret=EFalse;
@@ -1275,7 +1269,7 @@
if (iActiveReqCount)
{
iActiveReqCount--;
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELOBJECT_CHECKANDDESTROYDUMMYSUBSESSION_1, "In CheckAndDestroyDummySubSession(), iActiveReqCount down to %d", iActiveReqCount);
+ LOGTEXT2("In CheckAndDestroyDummySubSession(), iActiveReqCount down to %d", iActiveReqCount);
if ((iActiveReqCount==0) && (iCreateDummy==FALSE))
{
__ASSERT_ALWAYS(iDestroyDummySubSession!=NULL,Fault(EEtelFaultBadTelSessionPointer));
@@ -1492,7 +1486,7 @@
//
{
__ASSERT_ALWAYS(aReqEntry!=NULL,Fault(EEtelFaultCompleteReqWithoutReqEntry));
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELOBJECT_WRITEBACKANDCOMPLETEREQ_1, "CTelObject::WriteBackAndCompleteReq");
+ LOGTEXT("CTelObject::WriteBackAndCompleteReq");
TInt basicMessageType = (aReqEntry->iMessage.Int1() & ~KPriorityClientReq);
switch (basicMessageType)
@@ -1839,7 +1833,7 @@
__ASSERT_ALWAYS(aReqEntry!=NULL,Fault(EEtelFaultCallTsyServiceWithoutReqPackage));
TTsyReqHandle tsyReqHandle=aReqEntry->iTsyReqHandle;
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSUBSESSIONEXTBASE_SERVICEEXTFUNC_1, "Entered ServiceExtFunc with TSY handle %d", tsyReqHandle);
+ LOGTEXT2("Entered ServiceExtFunc with TSY handle %d", tsyReqHandle);
TInt ret=KErrNone;
TInt basicMessageType = aMessage.Int1() & ~(KPriorityClientReq);
@@ -2039,7 +2033,7 @@
{
if (iLibUnloader)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CPHONEFACTORYBASE_DTOR_1, "About to call iLibUnloader");
+ LOGTEXT("About to call iLibUnloader");
iLibUnloader->Call();
}
}