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

equal deleted inserted replaced

-:2c19c7cf5550
+:c20dd21d1eb4
 #include "cmtpparserrouter.h"
 #include "mtpproxydppanic.h"
 #include "cmtpobjectbrowser.h"
 #include "mtpdppanic.h"
 #include "cmtpobjectmgr.h"
+#include "OstTraceDefinitions.h"
-__FLOG_STMT( _LIT8( KComponent,"PrxyCopyObj" ); )
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "cmtpcopyobjectTraces.h"
+#endif
 const TUint KInvalidDpId = 0xFF;
 /**
 Verification data for the CopyObject request
 */
 /**
 Destructor
 */
 CMTPCopyObject::~CMTPCopyObject()
 {
+OstTraceFunctionEntry0( CMTPCOPYOBJECT_CMTPCOPYOBJECT_DES_ENTRY );
 iSingletons.Close();
 iTargetDps.Close();
 iNewHandleParentStack.Close();
 iHandleDepths.Close();
 iHandles.Close();
 delete iObjBrowser;
+OstTraceFunctionExit0( CMTPCOPYOBJECT_CMTPCOPYOBJECT_DES_EXIT );
-__FLOG( _L8("+/-Dtor") );
-__FLOG_CLOSE;
 }
 /**
 Constructor
 */
 CMTPCopyObject::CMTPCopyObject(MMTPDataProviderFramework& aFramework, MMTPConnection& aConnection) :
 CMTPRequestProcessor(aFramework, aConnection, sizeof(KMTPCopyObjectPolicy)/sizeof(TMTPRequestElementInfo), KMTPCopyObjectPolicy)
 {
-__FLOG_OPEN( KMTPSubsystem, KComponent );
-__FLOG( _L8("+/-Ctor") );
 }
 /**
 Second phase constructor.
 */
 void CMTPCopyObject::ConstructL()
 {
-__FLOG( _L8("+ConstructL") );
+OstTraceFunctionEntry0( CMTPCOPYOBJECT_CONSTRUCTL_ENTRY );
 iSingletons.OpenL();
 iOwnerDp = KInvalidDpId;
-__FLOG( _L8("-ConstructL") );
+OstTraceFunctionExit0( CMTPCOPYOBJECT_CONSTRUCTL_EXIT );
 }
 /**
 DeleteObject request handler
 */
 void CMTPCopyObject::ServiceL()
 {
-__FLOG( _L8("+ServiceL") );
+OstTraceFunctionEntry0( CMTPCOPYOBJECT_SERVICEL_ENTRY );
 iTargetDps.Reset();
 CMTPParserRouter& router(iSingletons.Router());
 CMTPParserRouter::TRoutingParameters params(Request(), iConnection);
 router.ParseOperationRequestL(params);
 router.RouteOperationRequestL(params, iTargetDps);
 BrowseHandlesL();
-__FLOG( _L8("-ServiceL") );
+OstTraceFunctionExit0( CMTPCOPYOBJECT_SERVICEL_EXIT );
 }
 void CMTPCopyObject::ProxyReceiveDataL(MMTPType& /*aData*/, const TMTPTypeRequest& /*aRequest*/, MMTPConnection& /*aConnection*/, TRequestStatus& /*aStatus*/)
 {
 Panic(EMTPWrongRequestPhase);
 void CMTPCopyObject::ProxySendResponseL(const TMTPTypeResponse& aResponse, const TMTPTypeRequest& aRequest, MMTPConnection& aConnection, TRequestStatus& aStatus)
 #else
 void CMTPCopyObject::ProxySendResponseL(const TMTPTypeResponse& aResponse, const TMTPTypeRequest& /*aRequest*/, MMTPConnection& /*aConnection*/, TRequestStatus& aStatus)
 #endif
 {
-__FLOG( _L8("+ProxySendResponseL") );
+OstTraceFunctionEntry0( CMTPCOPYOBJECT_PROXYSENDRESPONSEL_ENTRY );
 __ASSERT_DEBUG(((&iCurrentRequest == &aRequest) && (&iConnection == &aConnection)), Panic(EMTPNotSameRequestProxy));
 if ( aStatus == KErrNone )
 {
 if ( iIsCopyingFolder )
 }
 MMTPType::CopyL(aResponse, iResponse);
 	TRequestStatus* status = &aStatus;
 	User::RequestComplete(status, KErrNone);
-__FLOG( _L8("-ProxySendResponseL") );
+	OstTraceFunctionExit0( CMTPCOPYOBJECT_PROXYSENDRESPONSEL_EXIT );
 }
 #ifdef _DEBUG
 void CMTPCopyObject::ProxyTransactionCompleteL(const TMTPTypeRequest& aRequest, MMTPConnection& aConnection)
 #else
 void CMTPCopyObject::ProxyTransactionCompleteL(const TMTPTypeRequest& /*aRequest*/, MMTPConnection& /*aConnection*/)
 #endif
 {
-__FLOG( _L8("+ProxyTransactionCompleteL") );
+OstTraceFunctionEntry0( CMTPCOPYOBJECT_PROXYTRANSACTIONCOMPLETEL_ENTRY );
 __ASSERT_DEBUG(((&iCurrentRequest == &aRequest) && (&iConnection == &aConnection)), Panic(EMTPNotSameRequestProxy));
 TInt err((iResponse.Uint16(TMTPTypeResponse::EResponseCode) == EMTPRespCodeOK) ? KErrNone : KErrGeneral);
 if (err == KErrNone)
 {
 iCurrentHandle--;
 }
 else
 {
 SendResponseL( iResponse.Uint16( TMTPTypeResponse::EResponseCode ) );
 }
-__FLOG( _L8("-ProxyTransactionCompleteL") );
+OstTraceFunctionExit0( CMTPCOPYOBJECT_PROXYTRANSACTIONCOMPLETEL_EXIT );
 }
 void CMTPCopyObject::RunL()
 {
-__FLOG( _L8("+RunL") );
+OstTraceFunctionEntry0( CMTPCOPYOBJECT_RUNL_ENTRY );
+OstTrace1( TRACE_NORMAL, CMTPCOPYOBJECT_RUNL, "iStatus == %d", iStatus.Int() );
-__FLOG_1( _L8("iStatus == %d"), iStatus.Int() );
 if ( iStatus == KErrNone )
 {
 NextObjectHandleL();
 if ( iOwnerDp != KInvalidDpId )
 {
 }
 else
 {
 SendResponseL( iResponse.Uint16( TMTPTypeResponse::EResponseCode ) );
 }
-__FLOG( _L8("-RunL") );
+OstTraceFunctionExit0( CMTPCOPYOBJECT_RUNL_EXIT );
 }
 TInt CMTPCopyObject::RunError(TInt /*aError*/)
 	{
 	TRAP_IGNORE(SendResponseL(EMTPRespCodeGeneralError));
 iFramework.SendResponseL(iResponse, req, Connection());
 }
 void CMTPCopyObject::BrowseHandlesL()
 {
-__FLOG( _L8("+BrowseHandlesL") );
+OstTraceFunctionEntry0( CMTPCOPYOBJECT_BROWSEHANDLESL_ENTRY );
 delete iObjBrowser;
 iObjBrowser = NULL;
 iObjBrowser = CMTPObjectBrowser::NewL( iFramework );
 CMTPObjectBrowser::TBrowseCallback callback = { CMTPCopyObject::OnBrowseObjectL, this };
 TUint32 handle = Request().Uint32( TMTPTypeRequest::ERequestParameter1 );
 TUint32 newHandleParent = Request().Uint32( TMTPTypeRequest::ERequestParameter3 );
 iNewHandleParentStack.AppendL( newHandleParent );
 iObjBrowser->GoL( KMTPFormatsAll, handle, KMaxTUint32, callback );
-__FLOG_1( _L8("iHandles.Count() = %d"), iHandles.Count() );
+OstTrace1( TRACE_NORMAL, CMTPCOPYOBJECT_BROWSEHANDLESL, "iHandles.Count() = %d", iHandles.Count() );
 if ( iHandles.Count() > 0 )
 {
 iCurrentHandle = iHandles.Count() - 1;
 Schedule( KErrNone );
 else
 {
 SendResponseL( EMTPRespCodeInvalidObjectHandle );
 }
-__FLOG( _L8("-BrowseHandlesL") );
+OstTraceFunctionExit0( CMTPCOPYOBJECT_BROWSEHANDLESL_EXIT );
 }
 void CMTPCopyObject::NextObjectHandleL()
 {
-__FLOG( _L8("+NextObjectHandleL") );
+OstTraceFunctionEntry0( CMTPCOPYOBJECT_NEXTOBJECTHANDLEL_ENTRY );
 __ASSERT_DEBUG( ( iNewHandleParentStack.Count() > 0 ), User::Invariant() );
 iOwnerDp = KInvalidDpId;
 if ( iCurrentHandle >=0 )
 {
-__FLOG_1( _L8("iCurrentHandle = %d"), iCurrentHandle );
+OstTrace1( TRACE_NORMAL, CMTPCOPYOBJECT_NEXTOBJECTHANDLEL, "iCurrentHandle = %d", iCurrentHandle );
 TUint32 handle = iHandles[iCurrentHandle];
 TUint32 depth = iHandleDepths[iCurrentHandle];
-__FLOG_1( _L8("depth = %d"), depth );
+OstTrace1( TRACE_NORMAL, DUP1_CMTPCOPYOBJECT_NEXTOBJECTHANDLEL, "depth = %d", depth );
 if ( iCurrentHandle != ( iHandles.Count() - 1 ) )
 {
 TUint32 previousDepth = iHandleDepths[iCurrentHandle+1];
-__FLOG_1( _L8("previousDepth = %d"), previousDepth );
+OstTrace1( TRACE_NORMAL, DUP2_CMTPCOPYOBJECT_NEXTOBJECTHANDLEL, "previousDepth = %d", previousDepth );
 if ( depth < previousDepth )
 {
 // Completed copying folder and all its sub-folder and files, pop all copied folders' handle which are not shallower than the current one.
 // Step 1: pop the previous handle itself if it is am empty folder
 {
 iResponse.SetUint32( TMTPTypeResponse::EResponseParameter1, iRespHandle );
 SendResponseL( iResponse.Uint16( TMTPTypeResponse::EResponseCode ) );
 }
-__FLOG( _L8("-NextObjectHandleL") );
+OstTraceFunctionExit0( CMTPCOPYOBJECT_NEXTOBJECTHANDLEL_EXIT );
 }
 void CMTPCopyObject::OnBrowseObjectL( TAny* aSelf, TUint aHandle, TUint32 aCurDepth )
 {
+OstTraceFunctionEntry0( CMTPCOPYOBJECT_ONBROWSEOBJECTL_ENTRY );
 CMTPCopyObject* self = reinterpret_cast< CMTPCopyObject* >( aSelf );
 if ( self->iTargetDps.Find(self->iSingletons.ObjectMgr().ObjectOwnerId(aHandle)) != KErrNotFound )
 {
 self->iHandles.AppendL( aHandle );
 self->iHandleDepths.AppendL( aCurDepth );
 }
-}
+OstTraceFunctionExit0( CMTPCOPYOBJECT_ONBROWSEOBJECTL_EXIT );
+}

changeset 49	c20dd21d1eb4
parent 29	3ae5cb0b4c02