FCL/sf/mw/remoteconn: comparison mtpdataproviders/mtppictbridgedp/src/cmtppictbridgedpsendobjectinfo.cpp

equal deleted inserted replaced

-:a5deb6b96675
+:63cf70d3ecd8
 #include "mtppictbridgedpconst.h"
 #include "cmtppictbridgeprinter.h"
 #include "cptpserver.h"
 #include "cmtpconnection.h"
 #include "cmtpconnectionmgr.h"
+#include "mtpdebug.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "cmtppictbridgedpsendobjectinfoTraces.h"
+#endif
 /**
 Verification data for the SendObjectInfo request
 */
 const TMTPRequestElementInfo KMTPSendObjectInfoPolicy[] =
 /**
 Destructor
 */
 CMTPPictBridgeDpSendObjectInfo::~CMTPPictBridgeDpSendObjectInfo()
 {
-__FLOG_VA((_L8(">> CMTPPictBridgeDpSendObjectInfo::~CMTPPictBridgeDpSendObjectInfo iProgress=%d iNoRollback=%d "), iProgress, iNoRollback));
+OstTraceFunctionEntry0( CMTPPICTBRIDGEDPSENDOBJECTINFO_CMTPPICTBRIDGEDPSENDOBJECTINFO_DES_ENTRY );
-__FLOG_2(_L8("iProgress:%d NoRollback:%d"),iProgress,iNoRollback);
+OstTraceExt2( TRACE_NORMAL, CMTPPICTBRIDGEDPSENDOBJECTINFO_CMTPPICTBRIDGEDPSENDOBJECTINFO,
+"iProgress=%d iNoRollback=%d ", iProgress, iNoRollback );
 if ((iProgress == EObjectInfoSucceed ||
 iProgress == EObjectInfoFail ||
 iProgress == EObjectInfoInProgress) && !iNoRollback)
 {
 delete iParentSuidP;
 delete iReceivedObjectP;
 delete iObjectInfoP;
 delete iObjectPropList;
-__FLOG(_L8("<< CMTPPictBridgeDpSendObjectInfo::~CMTPPictBridgeDpSendObjectInfo"));
+OstTraceFunctionExit0( CMTPPICTBRIDGEDPSENDOBJECTINFO_CMTPPICTBRIDGEDPSENDOBJECTINFO_DES_EXIT );
-__FLOG_CLOSE;
 }
 /**
 Standard c++ constructor
 @param aFramework    The data provider framework
 Verify the request
 @return EMTPRespCodeOK if request is verified, otherwise one of the error response codes
 */
 TMTPResponseCode CMTPPictBridgeDpSendObjectInfo::CheckRequestL()
 {
-__FLOG(_L8(">> CMTPPictBridgeDpSendObjectInfo::CheckRequestL"));
+OstTraceFunctionEntry0( CMTPPICTBRIDGEDPSENDOBJECTINFO_CHECKREQUESTL_ENTRY );
 TMTPResponseCode result = CheckSendingStateL();
 if (result != EMTPRespCodeOK)
 {
+OstTraceFunctionExit0( CMTPPICTBRIDGEDPSENDOBJECTINFO_CHECKREQUESTL_EXIT );
 return result;
 }
 if (iProgress == EObjectNone)    //this is the SendObjectInfo phase
 {
 if (iPreviousTransactionID + 1 != Request().Uint32(TMTPTypeRequest::ERequestTransactionID))
 {
 result = EMTPRespCodeNoValidObjectInfo;
 }
 }
-__FLOG_VA((_L8("<< CMTPPictBridgeDpSendObjectInfo::CheckRequestL 0x%04x"), result));
+OstTrace1( TRACE_NORMAL, CMTPPICTBRIDGEDPSENDOBJECTINFO_CHECKREQUESTL, "result 0x%04x", result );
+OstTraceFunctionExit0( DUP1_CMTPPICTBRIDGEDPSENDOBJECTINFO_CHECKREQUESTL_EXIT );
 return result;
 }
 TBool CMTPPictBridgeDpSendObjectInfo::HasDataphase() const
 {
 NOTE: SendObjectInfo has to be comes before SendObject requests.  To maintain the state information
 between the two requests, the two requests are combined together in one request processor.
 */
 void CMTPPictBridgeDpSendObjectInfo::ServiceL()
 {
-__FLOG(_L8(">> CMTPPictBridgeDpSendObjectInfo::ServiceL"));
+OstTraceFunctionEntry0( CMTPPICTBRIDGEDPSENDOBJECTINFO_SERVICEL_ENTRY );
 if (iProgress == EObjectNone)
 {
 if ( EMTPOpCodeSendObjectInfo == iOperationCode )
 {
 ServiceSendObjectInfoL();
 }
 }
 else
 {
 ServiceSendObjectL();
 }
-__FLOG(_L8("<< CMTPPictBridgeDpSendObjectInfo::ServiceL"));
+OstTraceFunctionExit0( CMTPPICTBRIDGEDPSENDOBJECTINFO_SERVICEL_EXIT );
 }
 /**
 Second-phase construction
 */
 void CMTPPictBridgeDpSendObjectInfo::ConstructL()
 {
-__FLOG_OPEN(KMTPSubsystem, KComponent);
+OstTraceFunctionEntry0( CMTPPICTBRIDGEDPSENDOBJECTINFO_CONSTRUCTL_ENTRY );
-__FLOG(_L8(">> CMTPPictBridgeDpSendObjectInfo::ConstructL"));
 iExpectedSendObjectRequest.SetUint16(TMTPTypeRequest::ERequestOperationCode, EMTPOpCodeSendObject);
 iReceivedObjectP = CMTPObjectMetaData::NewL();
 iReceivedObjectP->SetUint(CMTPObjectMetaData::EDataProviderId, iFramework.DataProviderId());
 iDpSingletons.OpenL(iFramework);
 iNoRollback = EFalse;
-__FLOG(_L8("<< CMTPPictBridgeDpSendObjectInfo::ConstructL"));
+OstTraceFunctionExit0( CMTPPICTBRIDGEDPSENDOBJECTINFO_CONSTRUCTL_EXIT );
 }
 /**
 Override to match both the SendObjectInfo and SendObject requests
 @param aRequest    The request to match
 @param aConnection The connection from which the request comes
 @return ETrue if the processor can handle the request, otherwise EFalse
 */
 TBool CMTPPictBridgeDpSendObjectInfo::Match(const TMTPTypeRequest& aRequest, MMTPConnection& aConnection) const
 {
-__FLOG(_L8(">> CMTPPictBridgeDpSendObjectInfo::Match"));
+OstTraceFunctionEntry0( CMTPPICTBRIDGEDPSENDOBJECTINFO_MATCH_ENTRY );
 TBool result = EFalse;
 TUint16 operationCode = aRequest.Uint16(TMTPTypeRequest::ERequestOperationCode);
 if ((operationCode == EMTPOpCodeSendObjectInfo ||
 operationCode == EMTPOpCodeSendObject ||
 operationCode == EMTPOpCodeSendObjectPropList) &&
 &iConnection == &aConnection)
 {
 result = ETrue;
 }
-__FLOG(_L8("<< CMTPPictBridgeDpSendObjectInfo::Match"));
+OstTraceFunctionExit0( CMTPPICTBRIDGEDPSENDOBJECTINFO_MATCH_EXIT );
 return result;
 }
 /**
 Override to handle the response phase of SendObjectInfo and SendObject requests
 @return EFalse
 */
 TBool CMTPPictBridgeDpSendObjectInfo::DoHandleResponsePhaseL()
 {
-__FLOG_VA((_L8(">> CMTPPictBridgeDpSendObjectInfo::DoHandleResponsePhaseL iProgress==%d opCode==0x%x"),iProgress, iOperationCode));
+OstTraceFunctionEntry0( CMTPPICTBRIDGEDPSENDOBJECTINFO_DOHANDLERESPONSEPHASEL_ENTRY );
+OstTraceExt2( TRACE_NORMAL, CMTPPICTBRIDGEDPSENDOBJECTINFO_DOHANDLERESPONSEPHASEL,
+"iProgress==%d opCode==0x%x",iProgress, iOperationCode );
 //to check if the sending/receiving data is successful
 TBool successful = !iCancelled;
 if (iProgress == EObjectInfoInProgress)
 {
 if (iOperationCode == EMTPOpCodeSendObjectInfo)
 }
 else if (iProgress == ESendObjectInProgress)
 {
 successful = DoHandleSendObjectCompleteL();
 iProgress = (successful ? ESendObjectSucceed : ESendObjectFail);
 }
-__FLOG(_L8("<< CMTPPictBridgeDpSendObjectInfo::DoHandleResponsePhaseL"));
+OstTraceFunctionExit0( CMTPPICTBRIDGEDPSENDOBJECTINFO_DOHANDLERESPONSEPHASEL_EXIT );
 return EFalse;
 }
 /**
 Override to handle the completing phase of SendObjectInfo and SendObject requests
 @return ETrue if succesfully received the file, otherwise EFalse
 */
 TBool CMTPPictBridgeDpSendObjectInfo::DoHandleCompletingPhaseL()
 {
-__FLOG_VA((_L8(">> CMTPPictBridgeDpSendObjectInfo::DoHandleCompletingPhaseL iProgress==%d opCode==0x%x"),iProgress, iOperationCode));
+OstTraceFunctionEntry0( CMTPPICTBRIDGEDPSENDOBJECTINFO_DOHANDLECOMPLETINGPHASEL_ENTRY );
+OstTraceExt2( TRACE_NORMAL, CMTPPICTBRIDGEDPSENDOBJECTINFO_DOHANDLECOMPLETINGPHASEL,
+" iProgress==%d opCode==0x%x",iProgress, iOperationCode );
 TBool result = ETrue;
 CMTPRequestProcessor::DoHandleCompletingPhaseL();
 if (iProgress == EObjectInfoSucceed)
 {
 if (( iOperationCode == EMTPOpCodeSendObjectInfo ) || ( iOperationCode == EMTPOpCodeSendObjectPropList ))
 iPreviousTransactionID++;
 }
 iProgress = EObjectInfoSucceed;
 result = EFalse;
 }
-__FLOG_2(_L8("<< CMTPPictBridgeDpSendObjectInfo::DoHandleCompletingPhaseL result:%d progress %d"),result,iProgress);
+OstTraceExt2( TRACE_NORMAL, DUP1_CMTPPICTBRIDGEDPSENDOBJECTINFO_DOHANDLECOMPLETINGPHASEL,
+" result:%d progress %d",result,iProgress );
+OstTraceFunctionExit0( CMTPPICTBRIDGEDPSENDOBJECTINFO_DOHANDLECOMPLETINGPHASEL_EXIT );
 return result;
 }
 /**
 Verify if the SendObject request comes after SendObjectInfo request
 @return EMTPRespCodeOK if SendObject request comes after a valid SendObjectInfo request, otherwise
 EMTPRespCodeNoValidObjectInfo
 */
 TMTPResponseCode CMTPPictBridgeDpSendObjectInfo::CheckSendingStateL()
 {
-__FLOG(_L8(">> CMTPPictBridgeDpSendObjectInfo::CheckSendingStateL"));
+OstTraceFunctionEntry0( CMTPPICTBRIDGEDPSENDOBJECTINFO_CHECKSENDINGSTATEL_ENTRY );
 TMTPResponseCode result = EMTPRespCodeOK;
 iOperationCode = Request().Uint16(TMTPTypeRequest::ERequestOperationCode);
 if (iOperationCode == EMTPOpCodeSendObject)
 {
 if (iOperationCode == EMTPOpCodeSendObjectInfo || iOperationCode == EMTPOpCodeSendObjectPropList)
 {
 // Not finished SendObjectInfo/SendObject pair detected, need to remove the object reservation that was created, unless the object already existed
 if (!iNoRollback )
 {
-__FLOG(_L8("  CMTPPictBridgeDpSendObjectInfo::CheckSendingStateL ... Rolling back!"));
+OstTrace0( TRACE_NORMAL, CMTPPICTBRIDGEDPSENDOBJECTINFO_CHECKSENDINGSTATEL,
+"  CMTPPictBridgeDpSendObjectInfo::CheckSendingStateL ... Rolling back!" );
 Rollback();
 }
 delete iObjectInfoP;
 iObjectInfoP = NULL;
 iProgress = EObjectNone;
 }
 }
 else
 {
+OstTrace1( TRACE_ERROR, DUP1_CMTPPICTBRIDGEDPSENDOBJECTINFO_CHECKSENDINGSTATEL,
+"Progress %d is invalid here!", iProgress);
 User::Leave( KErrGeneral );
 }
-__FLOG(_L8("<< CMTPPictBridgeDpSendObjectInfo::CheckSendingStateL"));
+OstTraceFunctionExit0( CMTPPICTBRIDGEDPSENDOBJECTINFO_CHECKSENDINGSTATEL_EXIT );
 return result;
 }
 /**
 SendObjectInfo request handler
 /**
 Get a default parent object, if the request does not specify a parent object.
 */
 void CMTPPictBridgeDpSendObjectInfo::GetDefaultParentObjectL()
 {
-__FLOG(_L8(">> CMTPPictBridgeDpSendObjectInfo::GetDefaultParentObjectL"));
+OstTraceFunctionEntry0( CMTPPICTBRIDGEDPSENDOBJECTINFO_GETDEFAULTPARENTOBJECTL_ENTRY );
 if (iStorageId == KMTPStorageDefault)
 {
 iStorageId = iFramework.StorageMgr().DefaultStorageId();
 }
 TInt drive(static_cast<TDriveNumber>(iFramework.StorageMgr().DriveNumber(iStorageId)));
-User::LeaveIfError(drive);
+LEAVEIFERROR(drive,
+OstTrace1( TRACE_ERROR, CMTPPICTBRIDGEDPSENDOBJECTINFO_GETDEFAULTPARENTOBJECTL,
+"Can't identify drive number for storage %d", iStorageId ));
 // Obtain the root of the drive.  Logical storages can sometimes have a filesystem root
 // other than <drive>:\ .  For example an MP3 DP might have a root of c:\media\music\
 delete iParentSuidP;
 iParentSuidP = NULL;
 iParentSuidP=(iFramework.StorageMgr().StorageL(iStorageId).DesC(CMTPStorageMetaData::EStorageSuid)).AllocL();
 iReceivedObjectP->SetUint(CMTPObjectMetaData::EParentHandle, KMTPHandleNoParent);
-__FLOG(_L8("<< CMTPPictBridgeDpSendObjectInfo::GetDefaultParentObjectL"));
+OstTraceFunctionExit0( CMTPPICTBRIDGEDPSENDOBJECTINFO_GETDEFAULTPARENTOBJECTL_EXIT );
 }
 /**
 Get parent object and storage id
 @return EMTPRespCodeOK if successful, otherwise, EMTPRespCodeInvalidParentObject
 */
 TMTPResponseCode CMTPPictBridgeDpSendObjectInfo::GetParentObjectAndStorageIdL()
 {
-__FLOG(_L8(">> CMTPPictBridgeDpSendObjectInfo::GetParentObjectAndStorageIdL"));
+OstTraceFunctionEntry0( CMTPPICTBRIDGEDPSENDOBJECTINFO_GETPARENTOBJECTANDSTORAGEIDL_ENTRY );
 __ASSERT_DEBUG(iRequestChecker, Panic(EMTPPictBridgeDpRequestCheckNull));
 iStorageId = Request().Uint32(TMTPTypeRequest::ERequestParameter1);
 iParentHandle = Request().Uint32(TMTPTypeRequest::ERequestParameter2);
 //does not take ownership
 iParentSuidP = NULL;
 iParentSuidP = parentObjectInfo->DesC(CMTPObjectMetaData::ESuid).AllocL();
 iReceivedObjectP->SetUint(CMTPObjectMetaData::EParentHandle, iParentHandle);
 }
-__FLOG_VA((_L16("<< CMTPPictBridgeDpSendObjectInfo::GetParentObjectAndStorageIdL %S"), iParentSuidP));
+OstTraceExt1( TRACE_NORMAL, CMTPPICTBRIDGEDPSENDOBJECTINFO_GETPARENTOBJECTANDSTORAGEIDL,
+"iParentSuidP: %S", *iParentSuidP );
+OstTraceFunctionExit0( CMTPPICTBRIDGEDPSENDOBJECTINFO_GETPARENTOBJECTANDSTORAGEIDL_EXIT );
 return EMTPRespCodeOK;
 }
 /**
 Handling the completing phase of SendObjectInfo request
 @return ETrue if the specified object can be saved on the specified location, otherwise, EFalse
 */
 TBool CMTPPictBridgeDpSendObjectInfo::DoHandleSendObjectInfoCompleteL()
 {
-__FLOG(_L8(">> CMTPPictBridgeDpSendObjectInfo::DoHandleSendObjectInfoCompleteL"));
+OstTraceFunctionEntry0( CMTPPICTBRIDGEDPSENDOBJECTINFO_DOHANDLESENDOBJECTINFOCOMPLETEL_ENTRY );
 TBool result(ETrue);
 TUint16 format(iObjectInfoP->Uint16L(CMTPTypeObjectInfo::EObjectFormat));
 result = IsFormatValid(TMTPFormatCode(format));
 {
 result &= !Exists(iFullPath);
 if (!result)
 {
 // Object with the same name already exists.
-__FLOG(_L8("   no rollback"));
+OstTrace0( TRACE_NORMAL, DUP1_CMTPPICTBRIDGEDPSENDOBJECTINFO_ROLLBACK, "   no rollback" );
 			iNoRollback = ETrue;
 SendResponseL(EMTPRespCodeAccessDenied);
 }
 }
 */
 iPictBridgeDP.PtpServer()->Printer()->DpsDiscovery(iFullPath, &iConnection);
 TRAPD(err, CreateFsObjectL());
 if (err != KErrNone)
 {
-__FLOG_1(_L8("Fail to create fs object %d"),err);
+OstTrace1( TRACE_WARNING, CMTPPICTBRIDGEDPSENDOBJECTINFO_DOHANDLESENDOBJECTINFOCOMPLETEL,
+"Fail to create fs object %d", err );
 SendResponseL(ErrorToMTPError(err));
 result = EFalse;
 }
 else
 {
 ReserveObjectL();
 }
 }
-__FLOG(_L8("<< CMTPPictBridgeDpSendObjectInfo::DoHandleSendObjectInfoCompleteL"));
+OstTraceFunctionExit0( CMTPPICTBRIDGEDPSENDOBJECTINFO_DOHANDLESENDOBJECTINFOCOMPLETEL_EXIT );
 return result;
 }
 TBool CMTPPictBridgeDpSendObjectInfo::DoHandleSendObjectPropListCompleteL()
 {
-__FLOG(_L8(">> CMTPPictBridgeDpSendObjectInfo::DoHandleSendObjectPropListCompleteL"));
+OstTraceFunctionEntry0( CMTPPICTBRIDGEDPSENDOBJECTINFO_DOHANDLESENDOBJECTPROPLISTCOMPLETEL_ENTRY );
 TBool result(ETrue);
 TMTPResponseCode responseCode( GetParentObjectAndStorageIdL() );
 if ( responseCode != EMTPRespCodeOK )
 {
 SendResponseL( responseCode );
 iReceivedObjectP->SetUint(CMTPObjectMetaData::EFormatCode, iRequest->Uint32( TMTPTypeRequest::ERequestParameter3 ));
 iPictBridgeDP.PtpServer()->Printer()->DpsDiscovery(iFullPath, &iConnection);
 TRAPD(err, CreateFsObjectL());
 if ( err != KErrNone )
 {
-__FLOG_1(_L8("Fail to create fs object %d"),err);
+OstTrace1( TRACE_WARNING, CMTPPICTBRIDGEDPSENDOBJECTINFO_DOHANDLESENDOBJECTPROPLISTCOMPLETEL,
+"Fail to create fs object %d", err );
 SendResponseL(ErrorToMTPError(err));
 result = EFalse;
 }
 else
 {
 ReserveObjectL();
 }
 }
-__FLOG(_L8("<< CMTPPictBridgeDpSendObjectInfo::DoHandleSendObjectPropListCompleteL"));
+OstTraceFunctionExit0( CMTPPICTBRIDGEDPSENDOBJECTINFO_DOHANDLESENDOBJECTPROPLISTCOMPLETEL_EXIT );
 return result;
 }
 /**
 */
 TBool CMTPPictBridgeDpSendObjectInfo::IsFormatValid(TMTPFormatCode aFormat) const
 {
-__FLOG_VA((_L8(">> CMTPPictGetObjectPropDesc::IsFormatValid %d"),aFormat));
+OstTraceFunctionEntry0( CMTPPICTBRIDGEDPSENDOBJECTINFO_ISFORMATVALID_ENTRY );
+OstTrace1( TRACE_NORMAL, CMTPPICTBRIDGEDPSENDOBJECTINFO_ISFORMATVALID, "aFormat : %d", aFormat );
 TInt count(sizeof(KMTPValidCodeExtensionMappings) / sizeof(KMTPValidCodeExtensionMappings[0]));
 for(TInt i = 0; i < count; i++)
 {
 if (KMTPValidCodeExtensionMappings[i].iFormatCode == aFormat)
 {
-__FLOG(_L8("<< CMTPPictGetObjectPropDesc::IsFormatValid ETrue"));
+OstTraceFunctionExit0( CMTPPICTBRIDGEDPSENDOBJECTINFO_ISFORMATVALID_EXIT );
 return ETrue;
 }
 }
-__FLOG(_L8("<< CMTPPictGetObjectPropDesc::IsFormatValid EFalse"));
+OstTraceFunctionExit0( DUP1_CMTPPICTBRIDGEDPSENDOBJECTINFO_ISFORMATVALID_EXIT );
 return EFalse;
 }
 /**
 Handling the completing phase of SendObject request
 @return ETrue if the object has been successfully saved on the device, otherwise, EFalse
 */
 TBool CMTPPictBridgeDpSendObjectInfo::DoHandleSendObjectCompleteL()
 {
-__FLOG_VA((_L8(">> CMTPPictGetObjectPropDesc::DoHandleSendObjectCompleteL size=%d cancelled=%d"), iObjectSize, iCancelled));
+OstTraceFunctionEntry0( CMTPPICTBRIDGEDPSENDOBJECTINFO_DOHANDLESENDOBJECTCOMPLETEL_ENTRY );
+OstTraceExt2( TRACE_NORMAL, CMTPPICTBRIDGEDPSENDOBJECTINFO_DOHANDLESENDOBJECTCOMPLETEL,
+" size=%d cancelled=%d", iObjectSize, iCancelled );
 TBool result(ETrue);
 delete iFileReceivedP;
 iFileReceivedP = NULL;
 TEntry fileEntry;
-User::LeaveIfError(iFramework.Fs().Entry(iFullPath, fileEntry));
+LEAVEIFERROR(iFramework.Fs().Entry(iFullPath, fileEntry),
+OstTraceExt2( TRACE_ERROR, DUP2_CMTPPICTBRIDGEDPSENDOBJECTINFO_DOHANDLESENDOBJECTCOMPLETEL,
+"Can't get entry details for %S! error code %d", iFullPath, munged_err ));
 if (fileEntry.FileSize() != iObjectSize)
 {
-__FLOG_VA((_L8("   sizes differ %d!=%d"),fileEntry.FileSize(), iObjectSize));
+OstTraceExt2( TRACE_NORMAL, DUP1_CMTPPICTBRIDGEDPSENDOBJECTINFO_DOHANDLESENDOBJECTCOMPLETEL,
+"   sizes differ %d!=%d", (TUint32)fileEntry.FileSize(), (TUint32)iObjectSize);
 iFramework.RouteRequestUnregisterL(iExpectedSendObjectRequest, iConnection);
 iFramework.Fs().Delete(iFullPath);
 iFramework.ObjectMgr().UnreserveObjectHandleL(*iReceivedObjectP);
 TMTPResponseCode responseCode = EMTPRespCodeObjectTooLarge;
 //on receiving the corresponding SendObject request.  With Associations however
 //we commit the object straight away as the SendObject phase is often absent
 //with folder creation.
 TRAPD(err, iFramework.ObjectMgr().CommitReservedObjectHandleL(*iReceivedObjectP));
-__FLOG_VA((_L8(" Entry error %d"),err));
+OstTrace1( TRACE_NORMAL, DUP3_CMTPPICTBRIDGEDPSENDOBJECTINFO_DOHANDLESENDOBJECTCOMPLETEL,  " Entry error %d", err);
 if( KErrAlreadyExists == err )
 {
 iReceivedObjectP->SetUint(CMTPObjectMetaData::EHandle, iFramework.ObjectMgr().HandleL(iFullPath));
 }
 else
 {
 User::LeaveIfError(err);
 }
 SendResponseL(EMTPRespCodeOK);
 }
-__FLOG(_L8("<< CMTPPictGetObjectPropDesc::DoHandleSendObjectCompleteL"));
+OstTraceFunctionExit0( CMTPPICTBRIDGEDPSENDOBJECTINFO_DOHANDLESENDOBJECTCOMPLETEL_EXIT );
 return result;
 }
 /**
 Get the full path name of the object to be saved
 on return, contains the full path name of the object to be saved
 @return ETrue if the name is valid, EFalse otherwise
 */
 TBool CMTPPictBridgeDpSendObjectInfo::GetFullPathNameL(const TDesC& aFileName)
 {
-__FLOG_VA((_L16(">> CMTPPictBridgeDpSendObjectInfo::GetFullPathNameL file %S"), &aFileName));
+OstTraceFunctionEntry0( CMTPPICTBRIDGEDPSENDOBJECTINFO_GETFULLPATHNAMEL_ENTRY );
+OstTraceExt1( TRACE_NORMAL, CMTPPICTBRIDGEDPSENDOBJECTINFO_GETFULLPATHNAMEL, "file %S", aFileName );
 TBool result(EFalse);
 if (aFileName.Length() > 0)
 {
 iFullPath = *iParentSuidP;
 if (iFullPath.Length() + aFileName.Length() < iFullPath.MaxLength())
 iFullPath.Append(aFileName);
 result = iFramework.Fs().IsValidName(iFullPath);
 }
 }
-__FLOG_VA((_L16("<< CMTPPictBridgeDpSendObjectInfo::GetFullPathNameL full path %S"), &iFullPath));
+OstTraceExt1( TRACE_NORMAL, DUP1_CMTPPICTBRIDGEDPSENDOBJECTINFO_GETFULLPATHNAMEL, "full path %S", iFullPath );
+OstTraceFunctionExit0( CMTPPICTBRIDGEDPSENDOBJECTINFO_GETFULLPATHNAMEL_EXIT );
 return result;
 }
 /**
 Check if the object is too large
 return ret;
 }
 TMTPResponseCode CMTPPictBridgeDpSendObjectInfo::VerifyObjectPropListL( TInt& aInvalidParameterIndex )
 {
-__FLOG(_L8(">> CMTPPictBridgeDpSendObjectInfo::VerifyObjectPropListL"));
+OstTraceFunctionEntry0( CMTPPICTBRIDGEDPSENDOBJECTINFO_VERIFYOBJECTPROPLISTL_ENTRY );
 TMTPResponseCode responseCode( EMTPRespCodeOK );
 const TUint KCount( iObjectPropList->NumberOfElements() );
 iObjectPropList->ResetCursor();
 for ( TUint i(0); (i < KCount); i++ )
 {
 {
 break;
 }
 }
-__FLOG(_L8("<< CMTPPictBridgeDpSendObjectInfo::VerifyObjectPropListL"));
+OstTraceFunctionExit0( CMTPPICTBRIDGEDPSENDOBJECTINFO_VERIFYOBJECTPROPLISTL_EXIT );
 return responseCode;
 }
 TMTPResponseCode CMTPPictBridgeDpSendObjectInfo::ExtractPropertyL( const CMTPTypeObjectPropListElement& aElement )
 {
-__FLOG(_L8(">> CMTPPictBridgeDpSendObjectInfo::ExtractPropertyL"));
+OstTraceFunctionEntry0( CMTPPICTBRIDGEDPSENDOBJECTINFO_EXTRACTPROPERTYL_ENTRY );
 TMTPResponseCode responseCode(EMTPRespCodeOK);
 switch ( aElement.Uint16L(CMTPTypeObjectPropListElement::EPropertyCode) )
 {
 case EMTPObjectPropCodeObjectFileName:
 {
 	break;
 default:
 break;
 }
-__FLOG(_L8("<< CMTPPictBridgeDpSendObjectInfo::ExtractPropertyL"));
+OstTraceFunctionExit0( CMTPPICTBRIDGEDPSENDOBJECTINFO_EXTRACTPROPERTYL_EXIT );
 return responseCode;
 }
 TMTPResponseCode CMTPPictBridgeDpSendObjectInfo::CheckPropCodeL( const CMTPTypeObjectPropListElement& aElement ) const
 {
-__FLOG(_L8(">> CMTPPictBridgeDpSendObjectInfo::CheckPropCodeL"));
+OstTraceFunctionEntry0( CMTPPICTBRIDGEDPSENDOBJECTINFO_CHECKPROPCODEL_ENTRY );
 TMTPResponseCode responseCode( EMTPRespCodeOK );
 switch( aElement.Uint16L( CMTPTypeObjectPropListElement::EPropertyCode ))
 {
 case EMTPObjectPropCodeStorageID:
 {
 {
 responseCode = EMTPRespCodeInvalidObjectPropCode;
 }
 break;
 }
-__FLOG(_L8("<< CMTPPictBridgeDpSendObjectInfo::CheckPropCodeL"));
+OstTraceFunctionExit0( CMTPPICTBRIDGEDPSENDOBJECTINFO_CHECKPROPCODEL_EXIT );
 return responseCode;
 }
 TMTPResponseCode CMTPPictBridgeDpSendObjectInfo::MatchStoreAndParentL() const
 {
-__FLOG(_L8(">> CMTPPictBridgeDpSendObjectInfo::MatchStoreAndParentL"));
+OstTraceFunctionEntry0( CMTPPICTBRIDGEDPSENDOBJECTINFO_MATCHSTOREANDPARENTL_ENTRY );
 TMTPResponseCode ret = EMTPRespCodeOK;
 const TUint32 storeId(Request().Uint32(TMTPTypeRequest::ERequestParameter1));
 const TUint32 parentHandle(Request().Uint32(TMTPTypeRequest::ERequestParameter2));
 if (parentHandle != KMTPHandleAll && parentHandle != KMTPHandleNone)
 {
 if (parentObjInfo->Uint(CMTPObjectMetaData::EStorageId) != storeId)
 {
 ret = EMTPRespCodeInvalidObjectHandle;
 }
 }
-__FLOG(_L8("<< CMTPPictBridgeDpSendObjectInfo::MatchStoreAndParentL"));
+OstTraceFunctionExit0( CMTPPICTBRIDGEDPSENDOBJECTINFO_MATCHSTOREANDPARENTL_EXIT );
 return ret;
 }
 /**
 Reserves space for and assigns an object handle to the received object, then
 sends a success response.
 */
 void CMTPPictBridgeDpSendObjectInfo::ReserveObjectL()
 {
-__FLOG(_L8(">> CMTPPictBridgeDpSendObjectInfo::ReserveObjectL"));
+OstTraceFunctionEntry0( CMTPPICTBRIDGEDPSENDOBJECTINFO_RESERVEOBJECTL_ENTRY );
 iReceivedObjectP->SetUint(CMTPObjectMetaData::EStorageId, iStorageId);
 iReceivedObjectP->SetDesCL(CMTPObjectMetaData::ESuid, iFullPath);
 iFramework.ObjectMgr().ReserveObjectHandleL(*iReceivedObjectP, iObjectSize);
 TUint32 parameters[3];
 parameters[0] = iStorageId;
 parameters[1] = iParentHandle;
 parameters[2] = iReceivedObjectP->Uint(CMTPObjectMetaData::EHandle);
 SendResponseL(EMTPRespCodeOK, (sizeof(parameters) / sizeof(parameters[0])), parameters);
-__FLOG(_L8("<< CMTPPictBridgeDpSendObjectInfo::ReserveObjectL"));
+OstTraceFunctionExit0( CMTPPICTBRIDGEDPSENDOBJECTINFO_RESERVEOBJECTL_EXIT );
 }
 void CMTPPictBridgeDpSendObjectInfo::CreateFsObjectL()
 {
-__FLOG(_L8(">> CMTPPictBridgeDpSendObjectInfo::CreateFsObjectL"));
+OstTraceFunctionEntry0( CMTPPICTBRIDGEDPSENDOBJECTINFO_CREATEFSOBJECTL_ENTRY );
 delete iFileReceivedP;
 iFileReceivedP = NULL;
 iFileReceivedP = CMTPTypeFile::NewL(iFramework.Fs(), iFullPath, EFileWrite);
 iFileReceivedP->SetSizeL(iObjectSize);
-__FLOG(_L8("<< CMTPPictBridgeDpSendObjectInfo::CreateFsObjectL"));
+OstTraceFunctionExit0( CMTPPICTBRIDGEDPSENDOBJECTINFO_CREATEFSOBJECTL_EXIT );
 }
 void CMTPPictBridgeDpSendObjectInfo::Rollback()
 {
-__FLOG(_L8(">> CMTPPictBridgeDpSendObjectInfo::Rollback"));
+OstTraceFunctionEntry0( CMTPPICTBRIDGEDPSENDOBJECTINFO_ROLLBACK_ENTRY );
 // Delete this object from file system.
 delete iFileReceivedP;
 iFileReceivedP=NULL;
 TInt err=iFramework.Fs().Delete(iFullPath);
-__FLOG_VA((_L16(">> CMTPPictBridgeDpSendObjectInfo::Rollback deleted %S with return code %d"), &iFullPath, err));
+OstTraceExt2( TRACE_NORMAL, CMTPPICTBRIDGEDPSENDOBJECTINFO_ROLLBACK,
+"deleted %S with return code %d", iFullPath, err );
 TRAP_IGNORE(iFramework.ObjectMgr().UnreserveObjectHandleL(*iReceivedObjectP));
-__FLOG(_L8("<< CMTPPictBridgeDpSendObjectInfo::Rollback"));
+OstTraceFunctionExit0( CMTPPICTBRIDGEDPSENDOBJECTINFO_ROLLBACK_EXIT );
 }
 TMTPResponseCode CMTPPictBridgeDpSendObjectInfo::ErrorToMTPError(TInt aError) const
 {
 TMTPResponseCode resp = EMTPRespCodeGeneralError;

changeset 47	63cf70d3ecd8
parent 38	48c22c726cf9