diff -r 2c19c7cf5550 -r c20dd21d1eb4 mtptransports/mtpptpiptransport/ptpipcontroller/src/cptpipcontroller.cpp
--- a/mtptransports/mtpptpiptransport/ptpipcontroller/src/cptpipcontroller.cpp	Fri Aug 20 17:43:33 2010 +0800
+++ b/mtptransports/mtpptpiptransport/ptpipcontroller/src/cptpipcontroller.cpp	Fri Sep 03 18:38:04 2010 +0800
@@ -14,18 +14,22 @@
 //
 
 #include "cptpipcontroller.h"	// Cptpipcontroller	
+#include "mtpdebug.h"
 
 #include <mtp/tmtptypeuint128.h>
 #include "ptpipsocketpublish.h"
 #include <in_sock.h>
 #include "ptpipprotocolconstants.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "cptpipcontrollerTraces.h"
+#endif
+
 
 
  
 _LIT_SECURITY_POLICY_PASS(KAllowReadAll);
 _LIT_SECURITY_POLICY_C1(KProcPolicy,ECapability_None);
-__FLOG_STMT(_LIT8(KComponent,"PTPIPController");)
-
 
 #define PTPIP_INIT_COMMAND_REQUEST	1
 #define PTPIP_INIT_COMMAND_ACK		2
@@ -43,9 +47,11 @@
 
 EXPORT_C CPTPIPController* CPTPIPController::NewLC()
 	{
+	OstTraceFunctionEntry0( CPTPIPCONTROLLER_NEWLC_ENTRY );
 	CPTPIPController* self = new (ELeave) CPTPIPController;
 	CleanupStack::PushL(self);
 	self->ConstructL();
+	OstTraceFunctionExit0( CPTPIPCONTROLLER_NEWLC_EXIT );
 	return self;
 	}
 
@@ -54,8 +60,10 @@
 */
 EXPORT_C CPTPIPController* CPTPIPController::NewL()
 	{
+	OstTraceFunctionEntry0( CPTPIPCONTROLLER_NEWL_ENTRY );
 	CPTPIPController* self = CPTPIPController::NewLC();
 	CleanupStack::Pop(1);
+	OstTraceFunctionExit0( CPTPIPCONTROLLER_NEWL_EXIT );
 	return self;
 	}
 
@@ -63,10 +71,12 @@
 CPTPIPController::CPTPIPController():
 		CActive(EPriorityStandard),iDeviceGUID()
 	{
+	OstTraceFunctionEntry0( CPTPIPCONTROLLER_CPTPIPCONTROLLER_ENTRY );
 	iCtrlState=EIdle;
 	iTransportId=TUid::Uid(KMTPPTPIPTransportImplementationUid);
 	iCounter=0;
 	CActiveScheduler::Add(this);
+	OstTraceFunctionExit0( CPTPIPCONTROLLER_CPTPIPCONTROLLER_EXIT );
 	}
 
 /*
@@ -75,7 +85,7 @@
 */
 void CPTPIPController::ConstructL()
 	{
-   	 __FLOG_OPEN(KMTPSubsystem, KComponent);	 
+   	 OstTraceFunctionEntry0( CPTPIPCONTROLLER_CONSTRUCTL_ENTRY );	 
 	 iCmdHandler = CPTPIPSocketHandler::NewL();
 	 iEvtHandler = CPTPIPSocketHandler::NewL();
 	 iFilter=CPTPIPHostFilterInterface::NewL();
@@ -92,6 +102,7 @@
 	iDeviceFriendlyName = HBufC16::NewL(100);
 	TPtr16 name = iDeviceFriendlyName->Des();	
 	TInt result=iRepository->Get(param,name);		
+	OstTraceFunctionExit0( CPTPIPCONTROLLER_CONSTRUCTL_EXIT );
 	}
 
 /*
@@ -99,6 +110,7 @@
 */
 EXPORT_C CPTPIPController::~CPTPIPController()
 	{
+	OstTraceFunctionEntry0( DUP1_CPTPIPCONTROLLER_CPTPIPCONTROLLER_ENTRY );
 	delete iCmdHandler;
    	delete iEvtHandler;
    	delete iFilter; 
@@ -111,13 +123,14 @@
 	iIsConnectedToMTP = EFalse;
 	iProperty.Close();
 	iConnectionState.Close();
-   	__FLOG_CLOSE;
+	OstTraceFunctionExit0( DUP1_CPTPIPCONTROLLER_CPTPIPCONTROLLER_EXIT );
 	}
 
 
 
 EXPORT_C RSocket& CPTPIPController::NewSocketL()
 	{
+	OstTraceFunctionEntry0( CPTPIPCONTROLLER_NEWSOCKETL_ENTRY );
 	iCounter++;
 	if(iCounter==1)
 	return iCmdHandler->Socket();
@@ -131,6 +144,7 @@
 	}
 TInt  CPTPIPController::CheckMTPConnection()
 {
+	OstTraceFunctionEntry0( CPTPIPCONTROLLER_CHECKMTPCONNECTION_ENTRY );
 	TInt error = KErrNone;
 	if(iIsConnectedToMTP == EFalse)
 		{
@@ -141,6 +155,7 @@
 		iIsConnectedToMTP = ETrue;		
 		error = iMTP.IsAvailable(iTransportId);
 		}
+    OstTraceFunctionExit0( CPTPIPCONTROLLER_CHECKMTPCONNECTION_EXIT );
     return error;
 }
 /*
@@ -148,9 +163,10 @@
 @return ETrue on succes EFalse on failure*/
 TBool CPTPIPController::Validate()
 	{
+	OstTraceFunctionEntry0( CPTPIPCONTROLLER_VALIDATE_ENTRY );
 	if(iCtrlState==EIdle || iCtrlState==EInitEvtAwaited)
 	return ETrue;
-	else 
+	else
 	return EFalse;
 	}
 
@@ -162,12 +178,14 @@
 */ 
 EXPORT_C void CPTPIPController::SocketAccepted(TRequestStatus& aStatus)
 	{
+   	OstTraceFunctionEntry0( CPTPIPCONTROLLER_SOCKETACCEPTED_ENTRY );
    	iCallerStatus=&aStatus;
    	aStatus=KRequestPending;    	   		
 	TBool result=Validate();
 	if(result==EFalse)
 		{
 		User::RequestComplete(iCallerStatus,KErrServerBusy);
+		OstTraceFunctionExit0( CPTPIPCONTROLLER_SOCKETACCEPTED_EXIT );
 		return;
 		}
 	
@@ -177,6 +195,7 @@
         if(CompareHost(iEvtHandler->Socket())==EFalse)
         	{       
         	User::RequestComplete(iCallerStatus,KErrServerBusy);	
+        	OstTraceFunctionExit0( DUP1_CPTPIPCONTROLLER_SOCKETACCEPTED_EXIT );
         	return;
  			}
     	}
@@ -202,6 +221,7 @@
       	}
       	
       Schedule();        
+	OstTraceFunctionExit0( DUP2_CPTPIPCONTROLLER_SOCKETACCEPTED_EXIT );
 	}
 	
 	
@@ -211,6 +231,7 @@
 */	
 TBool CPTPIPController::CompareHost(RSocket& aSocket)
 	{
+     OstTraceFunctionEntry0( CPTPIPCONTROLLER_COMPAREHOST_ENTRY );
      
 	TInetAddr  thisaddr, newAddr;
      
@@ -218,10 +239,12 @@
 	aSocket.RemoteName(newAddr);	
     if(newAddr.Address() == thisaddr.Address())
     	{
+		OstTraceFunctionExit0( CPTPIPCONTROLLER_COMPAREHOST_EXIT );
 		return ETrue;
     	}
     else
     	{
+   	 	OstTraceFunctionExit0( DUP1_CPTPIPCONTROLLER_COMPAREHOST_EXIT );
    	 	return EFalse;
     	}
 
@@ -232,10 +255,12 @@
 */
 void CPTPIPController::Schedule()
 	{	 
+ 	OstTraceFunctionEntry0( CPTPIPCONTROLLER_SCHEDULE_ENTRY );
  	iStatus = KRequestPending; 
  	TRequestStatus* status(&iStatus);  
     SetActive();
     User::RequestComplete(status, KErrNone);	 
+	OstTraceFunctionExit0( CPTPIPCONTROLLER_SCHEDULE_EXIT );
 	}
 
 /*
@@ -244,6 +269,7 @@
 */
 TInt  CPTPIPController::PublishSocketNamePair()
 	{
+	OstTraceFunctionEntry0( CPTPIPCONTROLLER_PUBLISHSOCKETNAMEPAIR_ENTRY );
 	TName iCommandSocketSysName,iEventSocketSysName;			  
    	iCmdHandler->Socket().Name(iCommandSocketSysName);
    	iEvtHandler->Socket().Name(iEventSocketSysName);
@@ -269,6 +295,7 @@
 	
     error=RProperty::Set(KPropertyUid,EEventSocketName,iEventSocketSysName);  
 	
+	OstTraceFunctionExit0( CPTPIPCONTROLLER_PUBLISHSOCKETNAMEPAIR_EXIT );
 	return error;
 	}
 	
@@ -278,6 +305,7 @@
  */
 TInt CPTPIPController::EnableSocketTransfer()
 	{
+	OstTraceFunctionEntry0( CPTPIPCONTROLLER_ENABLESOCKETTRANSFER_ENTRY );
 	TInt err;
 	err = iCmdHandler->Socket().SetOpt(KSOEnableTransfer, KSOLSocket,KProcPolicy().Package());	
 	
@@ -285,6 +313,7 @@
 	
 	err = iEvtHandler->Socket().SetOpt(KSOEnableTransfer, KSOLSocket,KProcPolicy().Package());
 	
+	 OstTraceFunctionExit0( CPTPIPCONTROLLER_ENABLESOCKETTRANSFER_EXIT );
 	 return err;
 	}	
 
@@ -295,10 +324,12 @@
 */
 EXPORT_C TInt CPTPIPController::SetDeviceGUID(TDesC8& aDeviceGUID)
 	{	     
+    OstTraceFunctionEntry0( CPTPIPCONTROLLER_SETDEVICEGUID_ENTRY );
     TInt size = aDeviceGUID.Size();
     if (size != 16) return KErrArgument;
 	TMTPTypeUint128  guid(aDeviceGUID);	
 	iDeviceGUID = guid;	
+	OstTraceFunctionExit0( CPTPIPCONTROLLER_SETDEVICEGUID_EXIT );
 	return KErrNone;
 	}
 
@@ -308,20 +339,23 @@
 */    
 EXPORT_C void CPTPIPController::SetDeviceFriendlyName(TDesC16* aDeviceFreindlyName)
 	{
+	OstTraceFunctionEntry0( CPTPIPCONTROLLER_SETDEVICEFRIENDLYNAME_ENTRY );
 	delete iDeviceFriendlyName;
 	
 	TRAPD(err, iDeviceFriendlyName=aDeviceFreindlyName->AllocL());
 	
 	if(err != KErrNone)
 		{
-		 __FLOG_VA((_L8("CPTPIPController::SetDeviceFriendlyName ERROR = %d\n"), err));	
+		OstTrace1( TRACE_NORMAL, CPTPIPCONTROLLER_SETDEVICEFRIENDLYNAME, "CPTPIPController::SetDeviceFriendlyName ERROR = %d\n", err );
 		}
 	
+	OstTraceFunctionExit0( CPTPIPCONTROLLER_SETDEVICEFRIENDLYNAME_EXIT );
 	}
 	
 
 void CPTPIPController::Reset()
 	{
+	OstTraceFunctionEntry0( CPTPIPCONTROLLER_RESET_ENTRY );
 	iCmdHandler->Socket().Close();
 	iEvtHandler->Socket().Close();
 	if(iIsConnectedToMTP)
@@ -329,7 +363,8 @@
 	TInt stopStatus=iMTP.StopTransport(iTransportId);
 	if (KErrNone != stopStatus)
 	{
-	 __FLOG_VA((_L8("CPTPIPController::Reset ERROR = %d\n"), stopStatus));	
+	 OstTrace1( TRACE_NORMAL, CPTPIPCONTROLLER_RESET, "CPTPIPController::Reset ERROR = %d\n", stopStatus );
+	 
 	}	
 		
 	}
@@ -342,27 +377,34 @@
 	iCtrlState = EIdle;	
 	iCmdHandler->State()=EReadState;
 	iEvtHandler->State()=EReadState;
+	OstTraceFunctionExit0( CPTPIPCONTROLLER_RESET_EXIT );
 	}
 
 EXPORT_C void CPTPIPController::StopTransport()
 	{
+	OstTraceFunctionEntry0( CPTPIPCONTROLLER_STOPTRANSPORT_ENTRY );
 	Reset();
+	OstTraceFunctionExit0( CPTPIPCONTROLLER_STOPTRANSPORT_EXIT );
 	}
 
 
 
 void CPTPIPController:: CheckAndHandleErrorL(TInt  aError)
 	{		
+	OstTraceFunctionEntry0( CPTPIPCONTROLLER_CHECKANDHANDLEERRORL_ENTRY );
 	if(aError != KErrNone)
 		{
 		Reset();							
-		__FLOG_VA((_L8("PTPIP Controller CheckAndHandleErrorL, Error = %d"), aError));	
-		User::Leave(aError);
+		OstTrace1( TRACE_NORMAL, CPTPIPCONTROLLER_CHECKANDHANDLEERRORL, "PTPIP Controller CheckAndHandleErrorL, Error = %d", aError );
+		LEAVEIFERROR( aError, 
+		        OstTrace1( TRACE_ERROR, DUP1_CPTPIPCONTROLLER_CHECKANDHANDLEERRORL, "error code is %d", aError ));
 		}
+	OstTraceFunctionExit0( CPTPIPCONTROLLER_CHECKANDHANDLEERRORL_EXIT );
 	}
 	
 void CPTPIPController:: CheckInitFailL(TInt aError)	
 	{
+	OstTraceFunctionEntry0( CPTPIPCONTROLLER_CHECKINITFAILL_ENTRY );
 	
 	TInitFailReason reason = EInitFailUnSpecified;
 		
@@ -381,9 +423,10 @@
 		else
 		iEvtHandler->WriteToSocket(iInitFailed,iStatus);	
 		StartTimer(30);
-		__FLOG_VA((_L8("PTPIP Controller Error, Error = %d"), aError));
-		User::Leave(aError);					
+		LEAVEIFERROR( aError, 
+		        OstTrace1( TRACE_NORMAL, CPTPIPCONTROLLER_CHECKINITFAILL, "PTPIP Controller Error, Error = %d", aError ));				
 		}	
+	OstTraceFunctionExit0( CPTPIPCONTROLLER_CHECKINITFAILL_EXIT );
 	}	
 
 /*
@@ -391,19 +434,24 @@
 */
 EXPORT_C void CPTPIPController::OnTimeOut()
 	{
+	OstTraceFunctionEntry0( CPTPIPCONTROLLER_ONTIMEOUT_ENTRY );
 	TRequestStatus* status(&iStatus);
 	User::RequestComplete(status,KErrTimedOut);
+	OstTraceFunctionExit0( CPTPIPCONTROLLER_ONTIMEOUT_EXIT );
 	}
 	
 void CPTPIPController::StartTimer(TInt aSecond)	
 	{	
-		iTimer->IssueRequest(aSecond);
-		iStatus = KRequestPending;	
-		SetActive(); 	
+	OstTraceFunctionEntry0( CPTPIPCONTROLLER_STARTTIMER_ENTRY );
+	iTimer->IssueRequest(aSecond);
+	iStatus = KRequestPending;	
+	SetActive(); 	
+	OstTraceFunctionExit0( CPTPIPCONTROLLER_STARTTIMER_EXIT );
 	}
 	
 void CPTPIPController::RunL()
 	{
+	OstTraceFunctionEntry0( CPTPIPCONTROLLER_RUNL_ENTRY );
 	
 	TInt StatusError=iStatus.Int();
 		
@@ -544,6 +592,7 @@
 
   	} 
  	
+	OstTraceFunctionExit0( CPTPIPCONTROLLER_RUNL_EXIT );
 	}
 
 /*
@@ -551,6 +600,7 @@
 */
 TInt CPTPIPController::RunError(TInt aErr)	
 	{			
+   		OstTraceFunctionEntry0( CPTPIPCONTROLLER_RUNERROR_ENTRY );
    		if(iCtrlState != EWaitForInitFail)
    		{ 
    		User::RequestComplete(iCallerStatus,aErr);   			
@@ -562,6 +612,7 @@
 		iIsConnectedToMTP = EFalse; 			   	
    		}
    		//Return KErrNone back to RunL()
+   		OstTraceFunctionExit0( CPTPIPCONTROLLER_RUNERROR_EXIT );
    		return KErrNone;
 	}
 	
@@ -570,15 +621,19 @@
 
 void CPTPIPController::DoCancel()
 	{
+    OstTraceFunctionEntry0( CPTPIPCONTROLLER_DOCANCEL_ENTRY );
 
+	OstTraceFunctionExit0( CPTPIPCONTROLLER_DOCANCEL_EXIT );
 	}
 	
 TInt CPTPIPController::ParseInitPacketL()
 {
+		OstTraceFunctionEntry0( CPTPIPCONTROLLER_PARSEINITPACKETL_ENTRY );
 		TUint32 length(iInitCmdReq->Uint32L(CPTPIPInitCmdRequest::ELength));
 		TUint32 type(iInitCmdReq->Uint32L(CPTPIPInitCmdRequest::EPktType));
 		if(type != PTPIP_INIT_COMMAND_REQUEST) 
 			{
+			OstTraceFunctionExit0( CPTPIPCONTROLLER_PARSEINITPACKETL_EXIT );
 			return KErrBadHandle;	
 			}
 		
@@ -588,11 +643,13 @@
 		TDesC& name = iInitCmdReq->HostFriendlyName();
 		iHostFriendlyName = &name;
 		TUint32 version(iInitCmdReq->Uint32L(CPTPIPInitCmdRequest::EVersion));
+		OstTraceFunctionExit0( DUP1_CPTPIPCONTROLLER_PARSEINITPACKETL_EXIT );
 		return KErrNone;
 }
 
 TInt CPTPIPController::ParseEvtPacket()
 {
+		OstTraceFunctionEntry0( CPTPIPCONTROLLER_PARSEEVTPACKET_ENTRY );
 		TUint32 length(iInitEvtReq.Uint32(TPTPIPInitEvtRequest::ELength));
 		TUint32 type(iInitEvtReq.Uint32(TPTPIPInitEvtRequest::EType));	
 		if(type != PTPIP_INIT_EVENT_REQUEST) return KErrBadHandle;
@@ -600,13 +657,16 @@
 		if(conNumber !=PTPIP_FIXED_CONNECTION_ID)
 			{ 
 			// We are supporting only one connection,So connection Id is fixed.
+			OstTraceFunctionExit0( CPTPIPCONTROLLER_PARSEEVTPACKET_EXIT );
 			return KErrBadHandle;
 			}
 
+		OstTraceFunctionExit0( DUP1_CPTPIPCONTROLLER_PARSEEVTPACKET_EXIT );
 		return KErrNone;
 }
 void CPTPIPController::BuildInitAckL()
 {	
+	OstTraceFunctionEntry0( CPTPIPCONTROLLER_BUILDINITACKL_ENTRY );
 	iInitCmdAck->SetUint32L(CPTPIPInitCmdAck::EPktType,PTPIP_INIT_COMMAND_ACK);
 	// We are supporting only one connection,So connection Id is fixed
 	iInitCmdAck->SetUint32L(CPTPIPInitCmdAck::EConNumber,PTPIP_FIXED_CONNECTION_ID);
@@ -617,17 +677,22 @@
 	iInitCmdAck->SetUint32L(CPTPIPInitCmdAck::EVersion,PTPIP_PRPTOCOL_VERSION);
 	TUint64 size =  iInitCmdAck->Size();
 	iInitCmdAck->SetUint32L(CPTPIPInitCmdAck::ELength,(TUint32)size);	
+	OstTraceFunctionExit0( CPTPIPCONTROLLER_BUILDINITACKL_EXIT );
 }
 
 void CPTPIPController::BuildInitFailL(TInitFailReason aReason)
 {	
+	OstTraceFunctionEntry0( CPTPIPCONTROLLER_BUILDINITFAILL_ENTRY );
 	iInitFailed.SetUint32(TPTPIPInitFailed::ELength,iInitFailed.Size());
 	iInitFailed.SetUint32(TPTPIPInitFailed::EType,PTPIP_INIT_FAIL);
 	iInitFailed.SetUint32(TPTPIPInitFailed::EReason,aReason);		
+	OstTraceFunctionExit0( CPTPIPCONTROLLER_BUILDINITFAILL_EXIT );
 }
 
 TBool E32Dll()
 {
+	OstTraceFunctionEntry0( _E32DLL_ENTRY );
+	OstTraceFunctionExit0( _E32DLL_EXIT );
 	return ETrue;
 }