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