FCL/sf/mw/imghandling: comparison imagehandlingutilities/thumbnailmanager/thumbnailclient/src/thumbnailmanagerimpl.cpp

equal deleted inserted replaced

-:6257223ede8a
+:9d4d3445ce6e
 #include "thumbnailmanageruids.hrh"
 #include "thumbnailmanagerprivatecrkeys.h"
 #include "thumbnailpanic.h"
 #include "thumbnaildata.h"
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "thumbnailmanagerimplTraces.h"
-#endif
 const TInt KThumbnailMimeTypeListGranularity = 8;
 // ---------------------------------------------------------------------------
 //
 CThumbnailManagerImpl::~CThumbnailManagerImpl()
 {
 TN_DEBUG1( "CThumbnailManagerImpl::~CThumbnailManagerImpl() - start" );
-	OstTrace0( TRACE_NORMAL, CTHUMBNAILMANAGERIMPL_CTHUMBNAILMANAGERIMPL, "CThumbnailManagerImpl::~CThumbnailManagerImpl - start" );
 delete iRequestQueue;
 iRequestQueue = NULL;
 iSession.Close();
 if ( sessionCount > 0)
 {
 if( --sessionCount == 0 )
 {
 		    TN_DEBUG1( "CThumbnailManagerImpl::~CThumbnailManagerImpl() - Disconnect FBS" );
-OstTrace0( TRACE_NORMAL, DUP1_CTHUMBNAILMANAGERIMPL_CTHUMBNAILMANAGERIMPL, "CThumbnailManagerImpl::~CThumbnailManagerImpl - Disconnect FBS" );
 iFbsSession.Disconnect();
 }
 	    TN_DEBUG2( "CThumbnailManagerImpl::~CThumbnailManagerImpl() - update sessionCount == %d to TLS", sessionCount );
-OstTrace1( TRACE_NORMAL, DUP2_CTHUMBNAILMANAGERIMPL_CTHUMBNAILMANAGERIMPL, "CThumbnailManagerImpl::~CThumbnailManagerImpl - update sessionCount == %d to TLS", sessionCount );
 Dll::SetTls( (TAny*)sessionCount );
 }
 delete iMimeTypeList;
 iMimeTypeList = NULL;
 	TN_DEBUG1( "CThumbnailManagerImpl::~CThumbnailManagerImpl() - end" );
-OstTrace0( TRACE_NORMAL, DUP3_CTHUMBNAILMANAGERIMPL_CTHUMBNAILMANAGERIMPL, "CThumbnailManagerImpl::~CThumbnailManagerImpl - end" );
 }
 // ---------------------------------------------------------------------------
 // CThumbnailManagerImpl::NewLC()
 KThumbnailDefaultDisplayMode ), iFlags( EDefaultFlags ), iQualityPreference
 ( EOptimizeForQuality ), iRequestId( 0 )
 {
 // No implementation required
 TN_DEBUG1( "CThumbnailManagerImpl::CThumbnailManagerImpl()" );
-OstTrace0( TRACE_NORMAL, DUP4_CTHUMBNAILMANAGERIMPL_CTHUMBNAILMANAGERIMPL, "CThumbnailManagerImpl::CThumbnailManagerImpl" );
 }
 // ---------------------------------------------------------------------------
 // CThumbnailManagerImpl::ConstructL()
 // ---------------------------------------------------------------------------
 //
 void CThumbnailManagerImpl::ConstructL()
 {
 TN_DEBUG1( "CThumbnailManagerImpl::ConstructL - start");
-OstTrace0( TRACE_NORMAL, CTHUMBNAILMANAGERIMPL_CONSTRUCTL, "CThumbnailManagerImpl::ConstructL - start" );
 User::LeaveIfError( iSession.Connect());
 User::LeaveIfError( iFs.Connect());
 User::LeaveIfError( iFs.ShareProtected());
 // We need to connect to Fbs (first user in this thread)
 // Maintain a reference count in TLS
 User::LeaveIfError( iFbsSession.Connect());
 Dll::SetTls( (TAny*)1 );
 TN_DEBUG2( "CThumbnailManagerImpl::ConstructL() - update sessionCount == %d to TLS", 1 );
-OstTrace1( TRACE_NORMAL, DUP1_CTHUMBNAILMANAGERIMPL_CONSTRUCTL, "CThumbnailManagerImpl::ConstructL - update sessionCount == %d to TLS", 1 );
 }
 else
 {
 TInt sessionCount = (TInt)Dll::Tls();
 if( sessionCount++ > 0 )
 {
 // Increase the reference count in TLS
 Dll::SetTls( (TAny*)sessionCount );
 TN_DEBUG2( "CThumbnailManagerImpl::ConstructL() - update sessionCount == %d to TLS", sessionCount );
-OstTrace1( TRACE_NORMAL, DUP2_CTHUMBNAILMANAGERIMPL_CONSTRUCTL, "CThumbnailManagerImpl::ConstructL - update sessionCount == %d to TLS", sessionCount );
 }
 else
 {
 // Fbs connection was available in the beginning, no need to
 // increase the reference count
 TN_DEBUG1( "CThumbnailManagerImpl::ConstructL - no need to update sessionCount");
-OstTrace0( TRACE_NORMAL, DUP3_CTHUMBNAILMANAGERIMPL_CONSTRUCTL, "CThumbnailManagerImpl::ConstructL - no need to update sessionCount" );
 }
 }
 // request processor
 iRequestQueue = CThumbnailRequestQueue::NewL();
 TN_DEBUG1( "CThumbnailManagerImpl::ConstructL - end");
-OstTrace0( TRACE_NORMAL, DUP4_CTHUMBNAILMANAGERIMPL_CONSTRUCTL, "CThumbnailManagerImpl::ConstructL - end" );
 }
 // ---------------------------------------------------------------------------
 // CThumbnailManagerImpl::GetThumbnailL
 CThumbnailObjectSource& aObjectSource, TAny* aClientData /*= NULL*/, const
 TInt aPriority, TBool aGeneratePersistentSizesOnly)
 {
 iRequestId++;
 TN_DEBUG4( "CThumbnailManagerImpl::GetThumbnailL() URI==%S, iThumbnailSize==%d, req %d", &aObjectSource.Uri(), iThumbnailSize, iRequestId );
-OstTraceExt3( TRACE_NORMAL, CTHUMBNAILMANAGERIMPL_GETTHUMBNAILL, "CThumbnailManagerImpl::GetThumbnailL;aObjectSource.Uri()=%S;iThumbnailSize=%d;iRequestId=%d", aObjectSource.Uri(), iThumbnailSize, iRequestId );
 __ASSERT_DEBUG(( iRequestId > 0 ), ThumbnailPanic( EThumbnailWrongId ));
 TInt priority = ValidatePriority(aPriority);
 ( iFs, iSession, iObserver, iRequestObserver, iRequestId, priority, iRequestQueue );
 CleanupStack::PushL( getThumbnailActive );
 if(aObjectSource.Id() > 0)
 {
-getThumbnailActive->GetThumbnailL( aObjectSource.Uri(), aObjectSource.Id(),
+getThumbnailActive->GetThumbnailL( aObjectSource.Uri(), aObjectSource.Id(), iFlags,
-aObjectSource.MimeType(),iFlags, iQualityPreference, iSize, iDisplayMode,
+iQualityPreference, iSize, iDisplayMode, priority, aClientData, aGeneratePersistentSizesOnly,
-priority, aClientData, aGeneratePersistentSizesOnly, KNullDesC, iThumbnailSize);
+KNullDesC, iThumbnailSize);
 }
 else if ( aObjectSource.Uri().Length())
 {
-getThumbnailActive->GetThumbnailL( aObjectSource.Uri(), aObjectSource.Id(),
+getThumbnailActive->GetThumbnailL( aObjectSource.Uri(), aObjectSource.Id(), iFlags,
-aObjectSource.MimeType(), iFlags, iQualityPreference, iSize, iDisplayMode,
+iQualityPreference, iSize, iDisplayMode, priority, aClientData, aGeneratePersistentSizesOnly,
-priority, aClientData, aGeneratePersistentSizesOnly, KNullDesC, iThumbnailSize );
+KNullDesC, iThumbnailSize );
 }
 else
 {
-getThumbnailActive->GetThumbnailL( aObjectSource.FileHandle(), aObjectSource.Id(),
+getThumbnailActive->GetThumbnailL( aObjectSource.FileHandle(), aObjectSource.Id(), iFlags,
-aObjectSource.MimeType(), iFlags, iQualityPreference, iSize, iDisplayMode,
+iQualityPreference, iSize, iDisplayMode, priority, aClientData, aGeneratePersistentSizesOnly,
-priority, aClientData, aGeneratePersistentSizesOnly, KNullDesC, iThumbnailSize );
+KNullDesC, iThumbnailSize );
 }
 iRequestQueue->AddRequestL( getThumbnailActive );
 CleanupStack::Pop( getThumbnailActive );
 iRequestQueue->Process();
 TN_DEBUG2( "CThumbnailManagerImpl::GetThumbnailL() - request ID: %d", iRequestId );
-OstTrace1( TRACE_NORMAL, DUP1_CTHUMBNAILMANAGERIMPL_GETTHUMBNAILL, "CThumbnailManagerImpl::GetThumbnailL;iRequestId=%u", iRequestId );
 return iRequestId;
 }
 // ---------------------------------------------------------------------------
 TThumbnailRequestId CThumbnailManagerImpl::GetThumbnailL( const TThumbnailId
 aThumbnailId, TAny* aClientData /*= NULL*/, TInt aPriority)
 {
 iRequestId++;
 TN_DEBUG4( "CThumbnailManagerImpl::GetThumbnailL() aThumbnailId==%d, iThumbnailSize==%d, req %d", aThumbnailId, iThumbnailSize, iRequestId );
-OstTraceExt3( TRACE_NORMAL, DUP2_CTHUMBNAILMANAGERIMPL_GETTHUMBNAILL, "CThumbnailManagerImpl::GetThumbnailL;aThumbnailId=%u;iThumbnailSize=%u;iRequestId=%u", aThumbnailId, iThumbnailSize, iRequestId );
 __ASSERT_DEBUG(( iRequestId > 0 ), ThumbnailPanic( EThumbnailWrongId ));
 TInt priority = ValidatePriority(aPriority);
 CThumbnailRequestActive* getThumbnailActive = CThumbnailRequestActive::NewL
 ( iFs, iSession, iObserver, iRequestObserver, iRequestId, priority, iRequestQueue );
 CleanupStack::PushL( getThumbnailActive );
-getThumbnailActive->GetThumbnailL( KNullDesC, aThumbnailId, KNullDesC8,
+getThumbnailActive->GetThumbnailL( KNullDesC, aThumbnailId, iFlags,
-iFlags, iQualityPreference, iSize, iDisplayMode, priority, aClientData,
+iQualityPreference, iSize, iDisplayMode, priority, aClientData,
 EFalse, KNullDesC, iThumbnailSize );
 iRequestQueue->AddRequestL( getThumbnailActive );
 CleanupStack::Pop( getThumbnailActive );
 iRequestQueue->Process();
 TN_DEBUG2( "CThumbnailManagerImpl::GetThumbnailL() - request ID: %d", iRequestId );
-OstTrace1( TRACE_NORMAL, DUP3_CTHUMBNAILMANAGERIMPL_GETTHUMBNAILL, "CThumbnailManagerImpl::GetThumbnailL;iRequestId=%u", iRequestId );
 return iRequestId;
 }
 ( iFs, iSession, iObserver, iRequestObserver, iRequestId, priority, iRequestQueue );
 CleanupStack::PushL( getThumbnailActive );
 if ( aObjectSource.Uri().Length())
 {
-getThumbnailActive->GetThumbnailL( aObjectSource.Uri(), aObjectSource.Id(),
+getThumbnailActive->GetThumbnailL( aObjectSource.Uri(), aObjectSource.Id(), iFlags,
-aObjectSource.MimeType(), iFlags, iQualityPreference, iSize, iDisplayMode,
+iQualityPreference, iSize, iDisplayMode, priority, aClientData,
-priority, aClientData, EFalse, aTargetUri, iThumbnailSize );
+EFalse, aTargetUri, iThumbnailSize );
 }
 else
 {
 getThumbnailActive->GetThumbnailL( aObjectSource.FileHandle(), aObjectSource.Id(),
-aObjectSource.MimeType(), iFlags, iQualityPreference, iSize, iDisplayMode,
+iFlags, iQualityPreference, iSize, iDisplayMode, priority, aClientData,
-priority, aClientData, EFalse, aTargetUri, iThumbnailSize );
+EFalse, aTargetUri, iThumbnailSize );
 }
 iRequestQueue->AddRequestL( getThumbnailActive );
 CleanupStack::Pop( getThumbnailActive );
 iRequestQueue->Process();
 TN_DEBUG2( "CThumbnailManagerImpl::ImportThumbnailL() - request ID: %d", iRequestId );
-OstTrace1( TRACE_NORMAL, CTHUMBNAILMANAGERIMPL_IMPORTTHUMBNAILL, "CThumbnailManagerImpl::ImportThumbnailL;iRequestId=%u", iRequestId );
 return iRequestId;
 }
 // ---------------------------------------------------------------------------
 CleanupStack::Pop( getThumbnailActive );
 iRequestQueue->Process();
 TN_DEBUG2( "CThumbnailManagerImpl::SetThumbnailL() - request ID: %d", iRequestId );
-OstTrace1( TRACE_NORMAL, CTHUMBNAILMANAGERIMPL_SETTHUMBNAILL, "CThumbnailManagerImpl::SetThumbnailL;iRequestId=%u", iRequestId );
 return iRequestId;
 }
 // ---------------------------------------------------------------------------
 TThumbnailRequestId CThumbnailManagerImpl::CreateThumbnails(
 	CThumbnailObjectSource& aObjectSource, TInt aPriority )
 	{
 	TRAPD(err,
 		TN_DEBUG2( "CThumbnailManagerImpl::CreateThumbnails() aObjectSource==%S ", &aObjectSource.Uri() );
-		OstTraceExt1( TRACE_NORMAL, CTHUMBNAILMANAGERIMPL_CREATETHUMBNAILS, "CThumbnailManagerImpl::CreateThumbnails;aObjectSource.Uri()=%S", aObjectSource.Uri() );
 		iRequestId++;
 		__ASSERT_DEBUG(( iRequestId > 0 ), ThumbnailPanic( EThumbnailWrongId ));
 		TInt priority = ValidatePriority(aPriority);
 						 aObjectSource.Uri(), EUnknownThumbnailSize, EFalse);
 			}
 		else if( !aObjectSource.Buffer() )
 			{
 			getThumbnailActive->GetThumbnailL( aObjectSource.Id(),
-						 aObjectSource.Uri(), aObjectSource.MimeType(), iFlags,
+						 aObjectSource.Uri(), iFlags, iQualityPreference, iSize,
-						 iQualityPreference, iSize, iDisplayMode, priority, NULL,
+						 iDisplayMode, priority, NULL, ETrue, aObjectSource.Uri(),
-						 ETrue, aObjectSource.Uri(), EUnknownThumbnailSize);
+						 EUnknownThumbnailSize);
 			}
 		else
 			{
 			// from buffer
 			getThumbnailActive->SetThumbnailL( aObjectSource.GetBufferOwnership(),
 		CleanupStack::Pop( getThumbnailActive );
 		iRequestQueue->Process();
 		TN_DEBUG2( "CThumbnailManagerImpl::CreateThumbnails() - request ID: %d", iRequestId );
-		OstTrace1( TRACE_NORMAL, DUP1_CTHUMBNAILMANAGERIMPL_CREATETHUMBNAILS, "CThumbnailManagerImpl::CreateThumbnails;iRequestId=%u", iRequestId );
 	);
 	if( err != KErrNone)
 	    {
 	    return err;
 aObjectSource )
 {
 	TRAP_IGNORE(
 		iRequestId++;
 		TN_DEBUG2( "CThumbnailManagerImpl::DeleteThumbnails() URI==%S ", &aObjectSource.Uri() );
-		OstTraceExt1( TRACE_NORMAL, CTHUMBNAILMANAGERIMPL_DELETETHUMBNAILS, "CThumbnailManagerImpl::DeleteThumbnails;aObjectSource.Uri()=%S", aObjectSource.Uri() );
 		__ASSERT_DEBUG(( iRequestId > 0 ), ThumbnailPanic( EThumbnailWrongId ));
 		CThumbnailRequestActive* getThumbnailActive = CThumbnailRequestActive::NewL
 			( iFs, iSession, iObserver, iRequestObserver, iRequestId, CActive::EPriorityIdle,
 void CThumbnailManagerImpl::DeleteThumbnails( const TThumbnailId aItemId )
 {
 	TRAP_IGNORE(
 		iRequestId++;
 		TN_DEBUG2( "CThumbnailManagerImpl::DeleteThumbnails() aItemId==%d ", aItemId );
-		OstTrace1( TRACE_NORMAL, DUP1_CTHUMBNAILMANAGERIMPL_DELETETHUMBNAILS, "CThumbnailManagerImpl::DeleteThumbnails;aItemId=%u", aItemId );
 		__ASSERT_DEBUG(( iRequestId > 0 ), ThumbnailPanic( EThumbnailWrongId ));
 		CThumbnailRequestActive* getThumbnailActive = CThumbnailRequestActive::NewL
 			( iFs, iSession, iObserver, iRequestObserver, iRequestId, CActive::EPriorityIdle,
 TInt CThumbnailManagerImpl::CancelRequest( const TThumbnailRequestId aId )
 {
 __ASSERT_DEBUG(( iRequestId > 0 ), ThumbnailPanic( EThumbnailWrongId ));
 TN_DEBUG2( "CThumbnailManagerImpl::CancelRequest() - request ID: %d", aId );
-OstTrace1( TRACE_NORMAL, CTHUMBNAILMANAGERIMPL_CANCELREQUEST, "CThumbnailManagerImpl::CancelRequest;aId=%u", aId );
 return iRequestQueue->CancelRequest(aId);
 }
 __ASSERT_DEBUG(( iRequestId > 0 ), ThumbnailPanic( EThumbnailWrongId ));
 TInt priority = ValidatePriority(aNewPriority);
 TN_DEBUG2( "CThumbnailManagerImpl::ChangePriority() - request ID: %d", aId );
-OstTrace1( TRACE_NORMAL, CTHUMBNAILMANAGERIMPL_CHANGEPRIORITY, "CThumbnailManagerImpl::ChangePriority;aId=%u", aId );
 return iRequestQueue->ChangePriority(aId, priority);
 }
 // ---------------------------------------------------------------------------
 const TInt aOrientation, const TInt64 aModified,
 TInt aPriority )
 {
 iRequestId++;
 TN_DEBUG4( "CThumbnailManagerImpl::UpdateThumbnailsL() URI==%S, aItemId==%d, req %d", &aPath, aItemId, iRequestId);
-OstTraceExt3( TRACE_NORMAL, CTHUMBNAILMANAGERIMPL_UPDATETHUMBNAILSL, "CThumbnailManagerImpl::UpdateThumbnailsL;aPath=%S;aItemId=%d;iRequestId=%d", aPath, aItemId, iRequestId );
 __ASSERT_DEBUG(( iRequestId > 0 ), ThumbnailPanic( EThumbnailWrongId ));
 TInt priority = ValidatePriority(aPriority);
 TThumbnailRequestId CThumbnailManagerImpl::RenameThumbnailsL( const TDesC& aCurrentPath,
 const TDesC& aNewPath, TInt aPriority )
 {
 iRequestId++;
 TN_DEBUG3( "CThumbnailManagerImpl::RenameThumbnailsL() URI==%S, req %d", &aCurrentPath, iRequestId);
-OstTraceExt1( TRACE_NORMAL, CTHUMBNAILMANAGERIMPL_RENAMETHUMBNAILSL, "CThumbnailManagerImpl::RenameThumbnailsL;aCurrentPath=%S", aCurrentPath );
 __ASSERT_DEBUG(( iRequestId > 0 ), ThumbnailPanic( EThumbnailWrongId ));
 TInt priority = ValidatePriority(aPriority);
 TInt CThumbnailManagerImpl::ValidatePriority( const TInt aPriority )
 {
 if (aPriority < CActive::EPriorityIdle)
 {
 TN_DEBUG2( "CThumbnailManagerImpl::ValidatePriority() - priority %d too low for CActive", aPriority );
-OstTrace1( TRACE_NORMAL, CTHUMBNAILMANAGERIMPL_VALIDATEPRIORITY, "CThumbnailManagerImpl::ValidatePriority  - priority too low for CActive;aPriority=%d", aPriority );
 return CActive::EPriorityIdle;
 }
 else if (aPriority > CActive::EPriorityHigh)
 {
 TN_DEBUG2( "CThumbnailManagerImpl::ValidatePriority() - priority %d too high for CActive", aPriority );
-OstTrace1( TRACE_NORMAL, DUP1_CTHUMBNAILMANAGERIMPL_VALIDATEPRIORITY, "CThumbnailManagerImpl::ValidatePriority - priority too high for CActive;aPriority=%d", aPriority );
 return CActive::EPriorityHigh;
 }
 else
 {
 return aPriority;

branch	RCL_3
changeset 41	9d4d3445ce6e
parent 40	6257223ede8a
child 47	3d743e824514