FCL/sf/mw/remoteconn: comparison mtpfws/mtpfw/dataproviders/proxydp/src/cmtpdeleteobjectproplist.cpp

equal deleted inserted replaced

-:a5deb6b96675
+:63cf70d3ecd8
 #include "cmtpdeleteobjectproplist.h"
 #include "mtpproxydppanic.h"
 #include "cmtpdataprovidercontroller.h"
 #include "cmtpobjectmgr.h"
 #include "cmtpdataprovider.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "cmtpdeleteobjectproplistTraces.h"
+#endif
 // Class constants.
-__FLOG_STMT(_LIT8(KComponent,"DeleteObjectPropList");)
 /**
 Verification data for the DeleteObjectPropList request
 */
 /**
 Destructor
 */
 CMTPDeleteObjectPropList::~CMTPDeleteObjectPropList()
 {
-__FLOG(_L8("~CMTPDeleteObjectPropList - Entry"));
+OstTraceFunctionEntry0( CMTPDELETEOBJECTPROPLIST_CMTPDELETEOBJECTPROPLIST_DES_ENTRY );
 delete iDeleteObjectPropList;
 iSingletons.Close();
 iTargetDps.Close();
 iSubDatasets.ResetAndDestroy();
-__FLOG(_L8("~CMTPDeleteObjectPropList - Exit"));
+OstTraceFunctionExit0( CMTPDELETEOBJECTPROPLIST_CMTPDELETEOBJECTPROPLIST_DES_EXIT );
-__FLOG_CLOSE;
 }
 CMTPDeleteObjectPropList::CMTPDeleteObjectPropList(MMTPDataProviderFramework& aFramework, MMTPConnection& aConnection):
 CMTPRequestProcessor( aFramework, aConnection, (sizeof(KMTPDeleteObjectPropListPolicy) / sizeof(TMTPRequestElementInfo)), KMTPDeleteObjectPropListPolicy )
 {
 }
 void CMTPDeleteObjectPropList::ConstructL()
 {
-__FLOG_OPEN(KMTPSubsystem, KComponent);
+OstTraceFunctionEntry0( CMTPDELETEOBJECTPROPLIST_CONSTRUCTL_ENTRY );
-__FLOG(_L8("ConstructL - Entry"));
 iSingletons.OpenL();
-__FLOG(_L8("ConstructL - Exit"));
+OstTraceFunctionExit0( CMTPDELETEOBJECTPROPLIST_CONSTRUCTL_EXIT );
 }
 void CMTPDeleteObjectPropList::ServiceL()
 {
-__FLOG(_L8("ServiceL - Entry"));
+OstTraceFunctionEntry0( CMTPDELETEOBJECTPROPLIST_SERVICEL_ENTRY );
 delete iDeleteObjectPropList;
 iTargetDps.Reset();
 iSubDatasets.Reset();
 iDeleteObjectPropList = CMTPTypeDeleteObjectPropList::NewL();
 ReceiveDataL(*iDeleteObjectPropList);
-__FLOG(_L8("ServiceL - Exit"));
+OstTraceFunctionExit0( CMTPDELETEOBJECTPROPLIST_SERVICEL_EXIT );
 }
 TBool CMTPDeleteObjectPropList::DoHandleResponsePhaseL()
 {
-__FLOG(_L8("DoHandleResponsePhaseL - Entry"));
+OstTraceFunctionEntry0( CMTPDELETEOBJECTPROPLIST_DOHANDLERESPONSEPHASEL_ENTRY );
 //if the ObjectHandle is 0x00000000,
 //discard the received data and return Invalid_ObjectHandle error code
 if ( Request().Uint32(TMTPTypeRequest::ERequestParameter1) == KMTPHandleNone )
 {
 	     iCurrentTarget = 0;
 	     Schedule(KErrNone);
 	 }
 }
-__FLOG(_L8("DoHandleResponsePhaseL - Exit"));
+OstTraceFunctionExit0( CMTPDELETEOBJECTPROPLIST_DOHANDLERESPONSEPHASEL_EXIT );
 return EFalse;
 }
 void CMTPDeleteObjectPropList::BuildSubRequestsL()
 {
-__FLOG(_L8("BuildSubRequests - Entry"));
+OstTraceFunctionEntry0( CMTPDELETEOBJECTPROPLIST_BUILDSUBREQUESTSL_ENTRY );
 TInt count(iDeleteObjectPropList->NumberOfElements());
 TInt dpid(0);
 TInt index(-1);
 TInt tmpDpid(-1);
 iSubDatasets[index]->AppendL( element );
 }
 CleanupStack::Pop(element);
 }
-__FLOG(_L8("BuildSubRequests - Exit"));
+OstTraceFunctionExit0( CMTPDELETEOBJECTPROPLIST_BUILDSUBREQUESTSL_EXIT );
 }
 TBool CMTPDeleteObjectPropList::HasDataphase() const
 {
-__FLOG(_L8("HasDataphase - Entry"));
-__FLOG(_L8("HasDataphase - Exit"));
 return ETrue;
 }
 #ifdef _DEBUG
 }
 void CMTPDeleteObjectPropList::ProxySendDataL(const MMTPType& /*aData*/, const TMTPTypeRequest&  /*aRequest*/, MMTPConnection& /* aConnection */, TRequestStatus& /*aStatus*/)
 {
-__FLOG(_L8("ProxySendDataL - Entry"));
+OstTraceFunctionEntry0( CMTPDELETEOBJECTPROPLIST_PROXYSENDDATAL_ENTRY );
 Panic(EMTPWrongRequestPhase);
-__FLOG(_L8("ProxySendDataL - Exit"));
+OstTraceFunctionExit0( CMTPDELETEOBJECTPROPLIST_PROXYSENDDATAL_EXIT );
 }
 /**
 Send the corresponding response for the request is routed by Proxy DP
 ProxySendResponseL will complete the request of framework's AO, then switch the transaction phase to TranscationComplete
 void CMTPDeleteObjectPropList::ProxySendResponseL(const TMTPTypeResponse& aResponse, const TMTPTypeRequest& aRequest, MMTPConnection& aConnection, TRequestStatus& aStatus)
 #else
 void CMTPDeleteObjectPropList::ProxySendResponseL(const TMTPTypeResponse& aResponse, const TMTPTypeRequest& /*aRequest*/, MMTPConnection& /*aConnection*/, TRequestStatus& aStatus)
 #endif
 {
-__FLOG(_L8("ProxySendResponseL - Entry"));
+OstTraceFunctionEntry0( CMTPDELETEOBJECTPROPLIST_PROXYSENDRESPONSEL_ENTRY );
 __ASSERT_DEBUG(((iRequest == &aRequest) && (&iConnection == &aConnection)), Panic(EMTPNotSameRequestProxy));
 MMTPType::CopyL(aResponse, iResponse);
 TRequestStatus* status = &aStatus;
 User::RequestComplete(status, KErrNone);
-__FLOG(_L8("ProxySendResponseL - Exit"));
+OstTraceFunctionExit0( CMTPDELETEOBJECTPROPLIST_PROXYSENDRESPONSEL_EXIT );
 }
 /**
 Complete the transaction phase for the request is routed by Proxy DP
 void CMTPDeleteObjectPropList::ProxyTransactionCompleteL(const TMTPTypeRequest& aRequest, MMTPConnection& aConnection)
 #else
 void CMTPDeleteObjectPropList::ProxyTransactionCompleteL(const TMTPTypeRequest& /*aRequest*/, MMTPConnection& /*aConnection*/)
 #endif
 {
-__FLOG(_L8("ProxyTransactionCompleteL - Entry"));
+OstTraceFunctionEntry0( CMTPDELETEOBJECTPROPLIST_PROXYTRANSACTIONCOMPLETEL_ENTRY );
 __ASSERT_DEBUG(((iRequest == &aRequest) && (&iConnection == &aConnection)), Panic(EMTPNotSameRequestProxy));
 const TUint16 KResponseCode(iResponse.Uint16(TMTPTypeResponse::EResponseCode));
 TInt err((KResponseCode == EMTPRespCodeOK) ? KErrNone : KErrGeneral);
 if (err == KErrNone)
 iResponse.SetUint16(TMTPTypeResponse::EResponseCode, EMTPRespCodeInvalidObjectHandle );
 }
 }
 Schedule(err);
-__FLOG(_L8("ProxyTransactionCompleteL - Exit"));
+OstTraceFunctionExit0( CMTPDELETEOBJECTPROPLIST_PROXYTRANSACTIONCOMPLETEL_EXIT );
 }
 void CMTPDeleteObjectPropList::SendResponseL(TUint16 aCode)
 {
-__FLOG(_L8("SendResponseL - Entry"));
+OstTraceFunctionEntry0( CMTPDELETEOBJECTPROPLIST_SENDRESPONSEL_ENTRY );
 const TMTPTypeRequest& req(Request());
 iResponse.SetUint16(TMTPTypeResponse::EResponseCode, aCode);
 iResponse.SetUint32(TMTPTypeResponse::EResponseSessionID, req.Uint32(TMTPTypeRequest::ERequestSessionID));
 iResponse.SetUint32(TMTPTypeResponse::EResponseTransactionID, req.Uint32(TMTPTypeRequest::ERequestTransactionID));
 iFramework.SendResponseL(iResponse, req, Connection());
-__FLOG(_L8("SendResponseL - Exit"));
+OstTraceFunctionExit0( CMTPDELETEOBJECTPROPLIST_SENDRESPONSEL_EXIT );
 }
 void CMTPDeleteObjectPropList::RunL()
 {
-__FLOG(_L8("RunL - Entry"));
+OstTraceFunctionEntry0( CMTPDELETEOBJECTPROPLIST_RUNL_ENTRY );
 if ( (iStatus == KErrNone) && (iCurrentTarget < iTargetDps.Count()) )
 {
 TUint id(iTargetDps[iCurrentTarget]);
 else
 {
 //Any error will stop the process, and send the corresponding response.
 SendResponseL(iResponse.Uint16(TMTPTypeResponse::EResponseCode));
 }
-__FLOG(_L8("RunL - Exit"));
+OstTraceFunctionExit0( CMTPDELETEOBJECTPROPLIST_RUNL_EXIT );
 }
 TInt CMTPDeleteObjectPropList::RunError(TInt /*aError*/)
 {
-__FLOG(_L8("RunError - Entry"));
+OstTraceFunctionEntry0( CMTPDELETEOBJECTPROPLIST_RUNERROR_ENTRY );
 TRAP_IGNORE(SendResponseL(EMTPRespCodeGeneralError));
-__FLOG(_L8("RunError - Exit"));
+OstTraceFunctionExit0( CMTPDELETEOBJECTPROPLIST_RUNERROR_EXIT );
 return KErrNone;
 }
 /**
 Completes the current asynchronous request with the specified
 completion code.
 @param aError The asynchronous request completion request.
 */
 void CMTPDeleteObjectPropList::Schedule(TInt aError)
 {
-__FLOG(_L8("Schedule - Entry"));
+OstTraceFunctionEntry0( CMTPDELETEOBJECTPROPLIST_SCHEDULE_ENTRY );
 TRequestStatus* status = &iStatus;
 User::RequestComplete(status, aError);
 SetActive();
-__FLOG(_L8("Schedule - Exit"));
+OstTraceFunctionExit0( CMTPDELETEOBJECTPROPLIST_SCHEDULE_EXIT );
 }

changeset 47	63cf70d3ecd8
parent 38	48c22c726cf9
child 52	866b4af7ffbe