FCL/sf/mw/remoteconn: comparison mtpfws/mtpfw/dataproviders/devdp/src/cmtpgetdeviceinfo.cpp

equal deleted inserted replaced

-:a5deb6b96675
+:63cf70d3ecd8
 #include "mtpdevdppanic.h"
 #include "mtpdevicedpconst.h"
 #include "rmtpdevicedpsingletons.h"
 #include "cmtpdevicedpconfigmgr.h"
 #include "cmtpservicemgr.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "cmtpgetdeviceinfoTraces.h"
+#endif
 // Class constants.
-__FLOG_STMT(_LIT8(KComponent,"GetDeviceInfo");)
 /**
 This identifies, in hundredths, the PTP version this device can support
 */
 static const TUint16 KMTPStandardVersion = 100;
 /**
 Destructor.
 */
 CMTPGetDeviceInfo::~CMTPGetDeviceInfo()
 {
-__FLOG(_L8("~CMTPGetDeviceInfo - Entry"));
+OstTraceFunctionEntry0( CMTPGETDEVICEINFO_CMTPGETDEVICEINFO_ENTRY );
 delete iDeviceInfo;
 iDpSingletons.Close();
 iSingletons.Close();
-__FLOG(_L8("~CMTPGetDeviceInfo - Exit"));
+OstTraceFunctionExit0( CMTPGETDEVICEINFO_CMTPGETDEVICEINFO_EXIT );
-__FLOG_CLOSE;
 }
 /**
 Constructor.
 */
 /**
 GetDeviceInfo request handler. Build and send device info data set.
 */
 void CMTPGetDeviceInfo::ServiceL()
 {
-__FLOG(_L8("ServiceL - Entry"));
+OstTraceFunctionEntry0( CMTPGETDEVICEINFO_SERVICEL_ENTRY );
 if (!iDpSingletons.DeviceDataStore().Enumerated())
 {
-__FLOG(_L8("MTPExtensionReady not ready, reschedule request"));
+OstTrace0(TRACE_NORMAL, CMTPGETDEVICEINFO_SERVICEL,
+"MTPExtensionReady not ready, reschedule request");
 iDpSingletons.DeviceDataStore().RegisterPendingRequest();
 RegisterPendingRequest();
+OstTraceFunctionExit0( CMTPGETDEVICEINFO_SERVICEL_EXIT );
 return;
 }
 BuildDeviceInfoL();
 SendDataL(*iDeviceInfo);
-__FLOG(_L8("ServiceL - Exit"));
+OstTraceFunctionExit0( DUP1_CMTPGETDEVICEINFO_SERVICEL_EXIT );
 }
 /**
 Second-phase constructor.
 */
 void CMTPGetDeviceInfo::ConstructL()
 {
-__FLOG_OPEN(KMTPSubsystem, KComponent);
+OstTraceFunctionEntry0( CMTPGETDEVICEINFO_CONSTRUCTL_ENTRY );
-__FLOG(_L8("ConstructL - Entry"));
 iSingletons.OpenL();
 iDpSingletons.OpenL(iFramework);
 iDeviceInfo = CMTPTypeDeviceInfo::NewL();
-__FLOG(_L8("ConstructL - Exit"));
+OstTraceFunctionExit0( CMTPGETDEVICEINFO_CONSTRUCTL_EXIT );
 }
 /**
 Populates device info data set
 */
 void CMTPGetDeviceInfo::BuildDeviceInfoL()
 {
-__FLOG(_L8("BuildDeviceInfoL - Entry"));
+OstTraceFunctionEntry0( CMTPGETDEVICEINFO_BUILDDEVICEINFOL_ENTRY );
 CMTPDeviceDataStore& device(iDpSingletons.DeviceDataStore());
 iDeviceInfo->SetUint16L(CMTPTypeDeviceInfo::EStandardVersion, KMTPStandardVersion);
 if(iDpSingletons.DeviceDataStore().IsConnectMac())
 {
-__FLOG(_L8("Connect Mac = ETrue"));
+OstTrace0(TRACE_NORMAL, CMTPGETDEVICEINFO_BUILDDEVICEINFOL, "Connect Mac = ETrue");
 iDeviceInfo->SetUint32L(CMTPTypeDeviceInfo::EMTPVendorExtensionID, KMTPVendorExtensionId_Mac);
 iDeviceInfo->SetUint16L(CMTPTypeDeviceInfo::EMTPVersion, KMTPVersion);
 RBuf  mtpExtensions;
 mtpExtensions.CleanupClosePushL();
 mtpExtensions.CreateL(0);
 iDeviceInfo->SetStringL(CMTPTypeDeviceInfo::EMTPExtensions, mtpExtensions);
 CleanupStack::PopAndDestroy(&mtpExtensions);
 }
 else
 {
-__FLOG(_L8("Connect Mac = EFalse"));
+OstTrace0(TRACE_NORMAL, DUP1_CMTPGETDEVICEINFO_BUILDDEVICEINFOL, "Connect Mac = EFalse");
 iDeviceInfo->SetUint32L(CMTPTypeDeviceInfo::EMTPVendorExtensionID, KMTPVendorExtensionId);
 iDeviceInfo->SetUint16L(CMTPTypeDeviceInfo::EMTPVersion, KMTPVersion);
 iDeviceInfo->SetStringL(CMTPTypeDeviceInfo::EMTPExtensions, iDpSingletons.DeviceDataStore().MTPExtensions());
 }
 SetSupportedOperationsL(dps);
 SetSupportedEventsL(dps);
 SetSupportedDevicePropertiesL(dps);
 SetSupportedCaptureFormatsL(dps);
 SetSupportedPlaybackFormatsL(dps);
-__FLOG(_L8("BuildDeviceInfoL - Exit"));
+OstTraceFunctionExit0( CMTPGETDEVICEINFO_BUILDDEVICEINFOL_EXIT );
 }
 /**
 Populates the supported operations field in the device info data set
 It enumerates the installed data provider plugins and retrieves the supported operations
 @param aDpController    A reference to the data provider controller
 */
 void CMTPGetDeviceInfo::SetSupportedOperationsL(CMTPDataProviderController& aDpController)
 {
-__FLOG(_L8("SetSupportedOperationsL - Entry"));
+OstTraceFunctionEntry0( CMTPGETDEVICEINFO_SETSUPPORTEDOPERATIONSL_ENTRY );
 TInt count = aDpController.Count();
 RArray<TUint> supportedOperations(KMTPArrayGranularity);
 CleanupClosePushL(supportedOperations);
 const TInt32 KMTPImplementationUidDeviceDp(0x102827AF);
 CMTPTypeArray* mtpOperationsArray = CMTPTypeArray::NewL(EMTPTypeAUINT16, supportedOperations);
 CleanupStack::PopAndDestroy(&supportedOperations);
 CleanupStack::PushL(mtpOperationsArray); //unnecessary if Set operation below does not leave,
 iDeviceInfo->SetL(CMTPTypeDeviceInfo::EOperationsSupported, *mtpOperationsArray);
 CleanupStack::PopAndDestroy(mtpOperationsArray);
-__FLOG(_L8("SetSupportedOperationsL - Exit"));
+OstTraceFunctionExit0( CMTPGETDEVICEINFO_SETSUPPORTEDOPERATIONSL_EXIT );
 }
 /**
 Populates the supported events field in the device info data set
 It enumerates the installed data provider plugins and retrieves the supported events
 @param aDpController    A reference to the data provider controller
 */
 void CMTPGetDeviceInfo::SetSupportedEventsL(CMTPDataProviderController& aDpController)
 {
-__FLOG(_L8("SetSupportedEventsL - Entry"));
+OstTraceFunctionEntry0( CMTPGETDEVICEINFO_SETSUPPORTEDEVENTSL_ENTRY );
 TInt count = aDpController.Count();
 RArray<TUint> supportedEvents(KMTPArrayGranularity);
 CleanupClosePushL(supportedEvents);
 while(count--)
 {
 CMTPTypeArray* mtpEventArray = CMTPTypeArray::NewL(EMTPTypeAUINT16, supportedEvents);
 CleanupStack::PopAndDestroy(&supportedEvents);
 CleanupStack::PushL(mtpEventArray); //unnecessary if Set operation below does not leave,
 iDeviceInfo->SetL(CMTPTypeDeviceInfo::EEventsSupported, *mtpEventArray);
 CleanupStack::PopAndDestroy(mtpEventArray);
-__FLOG(_L8("SetSupportedEventsL - Exit"));
+OstTraceFunctionExit0( CMTPGETDEVICEINFO_SETSUPPORTEDEVENTSL_EXIT );
 }
 /**
 Populates the supported device properties field in the device info data set
 */
 void CMTPGetDeviceInfo::SetSupportedDevicePropertiesL(CMTPDataProviderController& aDpController)
 	{
-	__FLOG(_L8("SetSupportedDevicePropertiesL - Entry"));
+	OstTraceFunctionEntry0( CMTPGETDEVICEINFO_SETSUPPORTEDDEVICEPROPERTIESL_ENTRY );
 TInt count = aDpController.Count();
 RArray<TUint> supportedOperations(KMTPArrayGranularity);
 CleanupClosePushL(supportedOperations);
 const TInt32 KMTPImplementationUidDeviceDp(0x102827AF);
 const TInt32 KMTPImplementationUidFileDp(0x102827B0);
 CMTPTypeArray* mtpOperationsArray = CMTPTypeArray::NewL(EMTPTypeAUINT16, supportedOperations);
 CleanupStack::PopAndDestroy(&supportedOperations);
 CleanupStack::PushL(mtpOperationsArray); //unnecessary if Set operation below does not leave,
 iDeviceInfo->SetL(CMTPTypeDeviceInfo::EDevicePropertiesSupported, *mtpOperationsArray);
 CleanupStack::PopAndDestroy(mtpOperationsArray);
-	__FLOG(_L8("SetSupportedDevicePropertiesL - Exit"));
+	OstTraceFunctionExit0( CMTPGETDEVICEINFO_SETSUPPORTEDDEVICEPROPERTIESL_EXIT );
 	}
 /**
 Populates the supported capture formats field in the device info data set
 It enumerates the installed data provider plugins and retrieves the supported capture formats
 @param aDpController    A reference to the data provider controller
 */
 void CMTPGetDeviceInfo::SetSupportedCaptureFormatsL(CMTPDataProviderController& aDpController)
 {
-__FLOG(_L8("SetSupportedCaptureFormatsL - Entry"));
+OstTraceFunctionEntry0( CMTPGETDEVICEINFO_SETSUPPORTEDCAPTUREFORMATSL_ENTRY );
 TInt count = aDpController.Count();
 RArray<TUint> supportedCaptureFormats(KMTPArrayGranularity);
 CleanupClosePushL(supportedCaptureFormats);
 //get the formt supported information from the devdp rss file
 //and store it into the CArrayFix by passing the reference of the array.
 CleanupClosePushL(orderedFormats);
 //get the count form the formt supported struct.
 TRAPD(errorCode,iDpSingletons.ConfigMgr().GetRssConfigInfoArrayL(orderedFormats, EDevDpFormats));
 if(KErrNone != errorCode)
 	  {
-	  __FLOG(_L8("There is an issue in reading format info from rss file "));
+OstTrace0(TRACE_WARNING, CMTPGETDEVICEINFO_SETSUPPORTEDCAPTUREFORMATSL,
+"There is an issue in reading format info from rss file ");
 	  }
 while(count--)
 {
 AddToArrayL(supportedCaptureFormats, aDpController.DataProviderByIndexL(count).SupportedCodes(EObjectCaptureFormats));
 	RemoveServiceFormat(supportedCaptureFormats);
 #ifdef _DEBUG
 	for(TInt i =0 ; i < supportedCaptureFormats.Count(); i++)
 	{
-	__FLOG_VA((_L8("Playback formats = %d"), supportedCaptureFormats[i]));
+OstTrace1(TRACE_NORMAL, DUP1_CMTPGETDEVICEINFO_SETSUPPORTEDCAPTUREFORMATSL,
+"Playback formats = %d ", supportedCaptureFormats[i]);
 	}
 #endif
 	//before deleting make sure all the elements are added to supportedPlaybackFormats
 	CleanupStack::PopAndDestroy(&orderedFormats);
 CMTPTypeArray* mtpCaptureFormatArray = CMTPTypeArray::NewL(EMTPTypeAUINT16, supportedCaptureFormats);
 CleanupStack::PopAndDestroy(&supportedCaptureFormats);
 CleanupStack::PushL(mtpCaptureFormatArray); //unnecessary if Set operation below does not leave,
 iDeviceInfo->SetL(CMTPTypeDeviceInfo::ECaptureFormats, *mtpCaptureFormatArray);
 CleanupStack::PopAndDestroy(mtpCaptureFormatArray);
-__FLOG(_L8("SetSupportedCaptureFormatsL - Exit"));
+OstTraceFunctionExit0( CMTPGETDEVICEINFO_SETSUPPORTEDCAPTUREFORMATSL_EXIT );
 }
 /**
 Populates the supported playback formats field in the device info data set
 It enumerates the installed data provider plugins and retrieves the supported playback formats
 @param aDpController    A reference to the data provider controller
 */
 void CMTPGetDeviceInfo::SetSupportedPlaybackFormatsL(CMTPDataProviderController& aDpController)
 {
-__FLOG(_L8("SetSupportedPlaybackFormatsL - Entry"));
+OstTraceFunctionEntry0( CMTPGETDEVICEINFO_SETSUPPORTEDPLAYBACKFORMATSL_ENTRY );
 TInt count = aDpController.Count();
 RArray<TUint> supportedPlaybackFormats(KMTPArrayGranularity);
 CleanupClosePushL(supportedPlaybackFormats);
 //get the formt supported information from the devdp rss file
 CleanupClosePushL(orderedFormats);
 //get the count form the formt supported struct.
 TRAPD(errorCode,iDpSingletons.ConfigMgr().GetRssConfigInfoArrayL(orderedFormats, EDevDpFormats));
 	if(KErrNone != errorCode)
 		{
-		__FLOG(_L8("There is an issue in reading format info from rss file "));
+OstTrace0(TRACE_WARNING, CMTPGETDEVICEINFO_SETSUPPORTEDPLAYBACKFORMATSL,
+"There is an issue in reading format info from rss file ");
 		}
 while(count--)
 {
 AddToArrayL(supportedPlaybackFormats, aDpController.DataProviderByIndexL(count).SupportedCodes(EObjectPlaybackFormats));
 	RemoveServiceFormat(supportedPlaybackFormats);
 #ifdef _DEBUG
 	for(TInt i =0 ; i < supportedPlaybackFormats.Count(); i++)
 	{
-	__FLOG_VA((_L8("Playback formats = %d"), supportedPlaybackFormats[i]));
+OstTrace1(TRACE_NORMAL, DUP1_CMTPGETDEVICEINFO_SETSUPPORTEDPLAYBACKFORMATSL,
+"Playback formats = %d ", supportedPlaybackFormats[i]);
 	}
 #endif
 //before deleting make sure all the elements are added to supportedPlaybackFormats
 CleanupStack::PopAndDestroy(&orderedFormats);
 CMTPTypeArray* mtpPlaybackFormatArray = CMTPTypeArray::NewL(EMTPTypeAUINT16, supportedPlaybackFormats);
 CleanupStack::PopAndDestroy(&supportedPlaybackFormats);
 CleanupStack::PushL(mtpPlaybackFormatArray); //unnecessary if Set operation below does not leave,
 iDeviceInfo->SetL(CMTPTypeDeviceInfo::EPlaybackFormats, *mtpPlaybackFormatArray);
 CleanupStack::PopAndDestroy(mtpPlaybackFormatArray);
-__FLOG(_L8("SetSupportedPlaybackFormatsL - Exit"));
+OstTraceFunctionExit0( CMTPGETDEVICEINFO_SETSUPPORTEDPLAYBACKFORMATSL_EXIT );
 }
 /**
 Add elements from source array to the destination array without duplication
 @param aDestArray    The destination array
 for (TInt i(0); (i < count); i++)
 {
 // Apply filter
 if(aSrcArray[i] == EMTPOpCodeResetDevicePropValue)
 {
-__FLOG_VA((_L8("Filter ignored operation: %d"), aSrcArray[i]));
+OstTrace1(TRACE_NORMAL, CMTPGETDEVICEINFO_ADDTOARRAYL, "Filter ignored operation: %d", aSrcArray[i]);
 continue;
 }
 TInt err(aDestArray.InsertInOrder(aSrcArray[i]));
 if ((err != KErrNone) && (err != KErrAlreadyExists))
 {
+OstTrace1( TRACE_ERROR, DUP1_CMTPGETDEVICEINFO_ADDTOARRAYL,
+"Add elements from source array to the destination array error! error code %d", err );
 User::Leave(err);
 }
 }
 }
 if(aSrcArray[i] == EMTPOpCodeGetObjectPropList ||
 aSrcArray[i] == EMTPOpCodeSetObjectPropList||
 aSrcArray[i] == EMTPOpCodeSendObjectPropList ||
 			aSrcArray[i] == EMTPOpCodeGetFormatCapabilities )
 {
-__FLOG_VA((_L8("Filter ignored operation: %d"), aSrcArray[i]));
+OstTrace1(TRACE_NORMAL, CMTPGETDEVICEINFO_ADDTOARRAYWITHFILTERL,
+"Filter ignored operation: %d", aSrcArray[i]);
 continue;
 }
 TInt err(aDestArray.InsertInOrder(aSrcArray[i]));
 if ((err != KErrNone) && (err != KErrAlreadyExists))
 {
+OstTrace1( TRACE_ERROR, DUP1_CMTPGETDEVICEINFO_ADDTOARRAYWITHFILTERL,
+"Add elements from source array to the destination array error! error code %d", err );
 User::Leave(err);
 }
 }
 }
 void CMTPGetDeviceInfo::RemoveServiceFormat(RArray<TUint>& aSupportedCaptureFormats)
 	{
-	__FLOG(_L8("RemovetServiceFormat - Entry"));
+	OstTraceFunctionEntry0( CMTPGETDEVICEINFO_REMOVESERVICEFORMAT_ENTRY );
 	TInt count = aSupportedCaptureFormats.Count();
 	count--;
 	while(count>=0)
 		{
 if(iSingletons.ServiceMgr().IsServiceFormatCode( aSupportedCaptureFormats[count] ))
 aSupportedCaptureFormats.Remove(count);
 count--;
 		}
-	__FLOG(_L8("RemovetServiceFormat - Exit"));
+	OstTraceFunctionExit0( CMTPGETDEVICEINFO_REMOVESERVICEFORMAT_EXIT );
 	}

changeset 47	63cf70d3ecd8
parent 38	48c22c726cf9