FCL/sf/mw/imghandling: comparison imagehandlingutilities/thumbnailmanager/thumbagdaemon/src/thumbagimageobserver.cpp

equal deleted inserted replaced

-:6257223ede8a
+:9d4d3445ce6e
 #include "thumbagimageobserver.h"
 #include "thumbnaillog.h"
 #include "thumbnailmanagerconstants.h"
 #include "thumbnailmanagerprivatecrkeys.h"
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "thumbagimageobserverTraces.h"
-#endif
 // ---------------------------------------------------------------------------
 // NewLC
 // ---------------------------------------------------------------------------
 //
 CThumbAGImageObserver* CThumbAGImageObserver::NewLC(CThumbAGProcessor* aProcessor)
 {
 TN_DEBUG1( "CThumbAGImageObserver::NewLC() - begin" );
-OstTrace0( TRACE_FATAL, CTHUMBAGIMAGEOBSERVER_NEWLC, "CThumbAGImageObserver::NewLC - begin" );
 	CThumbAGImageObserver* self = new (ELeave) CThumbAGImageObserver(aProcessor);
 	CleanupStack::PushL( self );
 	self->ConstructL();
 	return self;
 // ---------------------------------------------------------------------------
 //
 CThumbAGImageObserver* CThumbAGImageObserver::NewL(CThumbAGProcessor* aProcessor)
 	{
 	TN_DEBUG1( "CThumbAGImageObserver::NewL() - begin" );
-OstTrace0( TRACE_FATAL, CTHUMBAGIMAGEOBSERVER_NEWL, "CThumbAGImageObserver::NewL - begin" );
 	CThumbAGImageObserver* self = CThumbAGImageObserver::NewLC(aProcessor);
 	CleanupStack::Pop( self );
 	return self;
 	}
 // ---------------------------------------------------------------------------
 //
 void CThumbAGImageObserver::ConstructL()
 	{
 	TN_DEBUG1( "CThumbAGImageObserver::ConstructL() - begin" );
-	OstTrace0( TRACE_FATAL, CTHUMBAGIMAGEOBSERVER_CONSTRUCTL, "CThumbAGImageObserver::ConstructL - begin" );
 #ifdef _DEBUG
 iAddCounter = 0;
 iModCounter = 0;
 #endif
 InitializeL();
 	TN_DEBUG1( "CThumbAGImageObserver::ConstructL() - end" );
-	OstTrace0( TRACE_FATAL, DUP1_CTHUMBAGIMAGEOBSERVER_CONSTRUCTL, "CThumbAGImageObserver::ConstructL - end" );
 	}
 // ---------------------------------------------------------------------------
 // ~CThumbAGImageObserver
 // ---------------------------------------------------------------------------
 //
 void CThumbAGImageObserver::InitializeL()
 {
 TN_DEBUG1( "CThumbAGImageObserver::InitializeL() - begin" );
-OstTrace0( TRACE_FATAL, CTHUMBAGIMAGEOBSERVER_INITIALIZEL, "CThumbAGImageObserver::InitializeL - begin" );
 TN_DEBUG1( "CThumbAGImageObserver::InitializeL() - create observers" );
-OstTrace0( TRACE_FATAL, DUP1_CTHUMBAGIMAGEOBSERVER_INITIALIZEL, "CThumbAGImageObserver::InitializeL - create observers" );
 // create shutdown observer
 if(iMDSShutdownObserver)
 {
 delete iMDSShutdownObserver;
 {
 iReconnect = CPeriodic::NewL(CActive::EPriorityIdle);
 }
 TN_DEBUG1( "CThumbAGImageObserver::InitializeL() - connect to MDS" );
-OstTrace0( TRACE_FATAL, DUP2_CTHUMBAGIMAGEOBSERVER_INITIALIZEL, "CThumbAGImageObserver::InitializeL - connect to MDS" );
 if(iMdESession)
 {
 TRAP_IGNORE( iMdESession->RemoveObjectObserverL( *this ) );
 TRAP_IGNORE( iMdESession->RemoveObjectObserverL( *this ) );
 iMdESession = CMdESession::NewL( *this );
 iSessionError = EFalse;
 TN_DEBUG1( "CThumbAGImageObserver::InitializeL() - end" );
-OstTrace0( TRACE_FATAL, DUP3_CTHUMBAGIMAGEOBSERVER_INITIALIZEL, "CThumbAGImageObserver::InitializeL - end" );
 }
 // ---------------------------------------------------------------------------
 // ~CThumbAGImageObserver
 // ---------------------------------------------------------------------------
 //
 CThumbAGImageObserver::~CThumbAGImageObserver()
 {
 TN_DEBUG1( "CThumbAGImageObserver::~CThumbAGImageObserver() - begin" );
-OstTrace0( TRACE_FATAL, CTHUMBAGIMAGEOBSERVER_CTHUMBAGIMAGEOBSERVER, "CThumbAGImageObserver::~CThumbAGImageObserver - begin" );
 iShutdown = ETrue;
 delete iMDSShutdownObserver;
 iMDSShutdownObserver = NULL;
 delete iMdESession;
 iMdESession = NULL;
 }
 TN_DEBUG1( "CThumbAGImageObserver::~CThumbAGImageObserver() - end" );
-OstTrace0( TRACE_FATAL, DUP1_CTHUMBAGIMAGEOBSERVER_CTHUMBAGIMAGEOBSERVER, "CThumbAGImageObserver::~CThumbAGImageObserver - end" );
 }
 // -----------------------------------------------------------------------------
 // CThumbAGImageObserver::HandleSessionOpened
 // -----------------------------------------------------------------------------
 //
 void CThumbAGImageObserver::HandleSessionOpened( CMdESession& /* aSession */, TInt aError )
 {
 TN_DEBUG1( "CThumbAGImageObserver::HandleSessionOpened");
-OstTrace0( TRACE_FATAL, CTHUMBAGIMAGEOBSERVER_HANDLESESSIONOPENED, "CThumbAGImageObserver::HandleSessionOpened" );
 if (aError == KErrNone)
 {
 TRAPD( err, AddObserversL() );
 if (err != KErrNone)
 {
 TN_DEBUG2( "CThumbAGImageObserver::HandleSessionOpened, AddObserversL error == %d", err );
-OstTrace1( TRACE_FATAL, DUP1_CTHUMBAGIMAGEOBSERVER_HANDLESESSIONOPENED, "CThumbAGImageObserver::HandleSessionOpened, AddObserversL error;err=%d", err );
 }
 }
 else
 {
 TN_DEBUG2( "CThumbAGImageObserver::HandleSessionOpened error == %d", aError );
-OstTrace1( TRACE_FATAL, DUP2_CTHUMBAGIMAGEOBSERVER_HANDLESESSIONOPENED, "CThumbAGImageObserver::HandleSessionOpened;aError=%d", aError );
 }
 }
 // -----------------------------------------------------------------------------
 // CThumbAGImageObserver::HandleSessionError
 // -----------------------------------------------------------------------------
 //
 void CThumbAGImageObserver::HandleSessionError( CMdESession& /*aSession*/, TInt aError )
 {
 TN_DEBUG2( "CThumbAGImageObserver::HandleSessionError == %d", aError );
-OstTrace1( TRACE_FATAL, CTHUMBAGIMAGEOBSERVER_HANDLESESSIONERROR, "CThumbAGImageObserver::HandleSessionError;aError=%d", aError );
 if (aError != KErrNone && !iSessionError)
 {
 iSessionError = ETrue;
 if (!iShutdown)
 {
 iReconnect->Start( KMdEReconnect, KMdEReconnect,
 TCallBack(ReconnectCallBack, this));
 TN_DEBUG1( "CThumbAGImageObserver::HandleSessionError() - reconnect timer started" );
-OstTrace0( TRACE_FATAL, DUP1_CTHUMBAGIMAGEOBSERVER_HANDLESESSIONERROR, "CThumbAGImageObserver::HandleSessionError - reconnect timer started" );
 }
 }
 }
 }
 void CThumbAGImageObserver::HandleObjectNotification( CMdESession& /*aSession*/,
 TObserverNotificationType aType,
 const RArray<TItemId>& aObjectIdArray )
 {
 TN_DEBUG1( "CThumbAGImageObserver::HandleObjectNotification() - begin" );
-OstTrace0( TRACE_FATAL, CTHUMBAGIMAGEOBSERVER_HANDLEOBJECTNOTIFICATION, "CThumbAGImageObserver::HandleObjectNotification - begin" );
 // no processor or shutting down
 if (iShutdown || !iProcessor)
 {
 return;
 #ifdef _DEBUG
 if (aType == ENotifyAdd)
 {
 TN_DEBUG2( "CThumbAGImageObserver::HandleObjectNotification() - ENotifyAdd %d", aObjectIdArray.Count() );
-OstTrace1( TRACE_FATAL, DUP1_CTHUMBAGIMAGEOBSERVER_HANDLEOBJECTNOTIFICATION, "CThumbAGImageObserver::HandleObjectNotification - ENotifyAdd;aObjectIdArray.Count()=%d", aObjectIdArray.Count() );
 iAddCounter = aObjectIdArray.Count();
 }
 else if (aType == ENotifyModify)
 {
 TN_DEBUG2( "CThumbAGImageObserver::HandleObjectNotification() - ENotifyModify %d", aObjectIdArray.Count() );
-OstTrace1( TRACE_FATAL, DUP2_CTHUMBAGIMAGEOBSERVER_HANDLEOBJECTNOTIFICATION, "CThumbAGImageObserver::HandleObjectNotification - ENotifyModify;aObjectIdArray.Count()=%d", aObjectIdArray.Count() );
 iModCounter = aObjectIdArray.Count();
 }
 #endif
 if ( (aType == ENotifyAdd || aType == ENotifyModify) && aObjectIdArray.Count() > 0 )
 {
 TN_DEBUG1( "CThumbAGImageObserver::HandleObjectNotification() - AddToQueueL" );
-		OstTrace0( TRACE_FATAL, DUP3_CTHUMBAGIMAGEOBSERVER_HANDLEOBJECTNOTIFICATION, "CThumbAGImageObserver::HandleObjectNotification - AddToQueueL" );
 // Add event to processing queue by type and enable force run
 RPointerArray<HBufC> dummyArray;
 TRAPD(err, iProcessor->AddToQueueL(aType, EGenerationItemTypeImage, aObjectIdArray, dummyArray, EFalse));
 if (err != KErrNone)
 {
 TN_DEBUG1( "CThumbAGImageObserver::HandleObjectNotification() - error adding to queue" );
-OstTrace0( TRACE_FATAL, DUP4_CTHUMBAGIMAGEOBSERVER_HANDLEOBJECTNOTIFICATION, "CThumbAGImageObserver::HandleObjectNotification - error adding to queue" );
 }
 }
 else
 {
 TN_DEBUG1( "CThumbAGImageObserver::HandleObjectNotification() - bad notification" );
-OstTrace0( TRACE_FATAL, DUP5_CTHUMBAGIMAGEOBSERVER_HANDLEOBJECTNOTIFICATION, "CThumbAGImageObserver::HandleObjectNotification - bad notification" );
 }
 #ifdef _DEBUG
 TN_DEBUG3( "CThumbAGImageObserver::IN-COUNTERS---------- Add = %d Modify = %d", iAddCounter, iModCounter );
-OstTraceExt2( TRACE_FATAL, DUP6_CTHUMBAGIMAGEOBSERVER_HANDLEOBJECTNOTIFICATION, "CThumbAGImageObserver::HIN-COUNTERS---------- Add, Modify;iAddCounter=%u;iModCounter=%u", iAddCounter, iModCounter );
 iModCounter = 0;
 iAddCounter = 0;
 #endif
 TN_DEBUG1( "CThumbAGImageObserver::HandleObjectNotification() - end" );
-OstTrace0( TRACE_FATAL, DUP7_CTHUMBAGIMAGEOBSERVER_HANDLEOBJECTNOTIFICATION, "CThumbAGImageObserver::HandleObjectNotification - end" );
 }
 // ---------------------------------------------------------------------------
 // CThumbAGImageObserver::AddObserversL
 // ---------------------------------------------------------------------------
 //
 void CThumbAGImageObserver::AddObserversL()
 {
 TN_DEBUG1( "CThumbAGImageObserver::AddObserversL() - begin" );
-OstTrace0( TRACE_FATAL, CTHUMBAGIMAGEOBSERVER_ADDOBSERVERSL, "CThumbAGImageObserver::AddObserversL - begin" );
 CMdENamespaceDef& defaultNamespace = iMdESession->GetDefaultNamespaceDefL();
 CMdEObjectDef& objectDef = defaultNamespace.GetObjectDefL( MdeConstants::Object::KBaseObject );
 CMdEPropertyDef& originPropDef = objectDef.GetPropertyDefL( MdeConstants::Object::KOriginProperty );
 CMdEObjectDef& imageDef = defaultNamespace.GetObjectDefL( MdeConstants::Image::KImageObject );
 iMdESession->AddObjectObserverL( *this, modifyCondition, ENotifyModify );
 CleanupStack::Pop( 6, addCondition );
 TN_DEBUG1( "CThumbAGImageObserver::AddObserversL() - end" );
-OstTrace0( TRACE_FATAL, DUP1_CTHUMBAGIMAGEOBSERVER_ADDOBSERVERSL, "CThumbAGImageObserver::AddObserversL - end" );
 }
 // -----------------------------------------------------------------------------
 // CThumbAGCameraObserver::ShutdownNotification
 // -----------------------------------------------------------------------------
 //
 void CThumbAGImageObserver::ShutdownNotification()
 {
 TN_DEBUG1( "CThumbAGImageObserver::ShutdownNotification()" );
-OstTrace0( TRACE_FATAL, CTHUMBAGIMAGEOBSERVER_SHUTDOWNNOTIFICATION, "CThumbAGImageObserver::ShutdownNotification" );
 if (!iShutdown)
 {
 TN_DEBUG1( "CThumbAGImageObserver::ShutdownNotification() shutdown" );
-OstTrace0( TRACE_FATAL, DUP1_CTHUMBAGIMAGEOBSERVER_SHUTDOWNNOTIFICATION, "CThumbAGImageObserver::ShutdownNotification - shutdown" );
 iShutdown = ETrue;
 }
 }
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 //
 TInt CThumbAGImageObserver::ReconnectCallBack(TAny* aAny)
 {
 TN_DEBUG1( "CThumbAGImageObserver::ReconnectCallBack() - reinitialize");
-OstTrace0( TRACE_FATAL, CTHUMBAGIMAGEOBSERVER_RECONNECTCALLBACK, "CThumbAGImageObserver::ReconnectCallBack - reinitialize" );
 CThumbAGImageObserver* self = static_cast<CThumbAGImageObserver*>( aAny );
 self->iReconnect->Cancel();
 // reconnect to MDS
 TRAP_IGNORE( self->InitializeL() );
 TN_DEBUG1( "CThumbAGImageObserver::ReconnectCallBack() - done");
-OstTrace0( TRACE_FATAL, DUP1_CTHUMBAGIMAGEOBSERVER_RECONNECTCALLBACK, "CThumbAGImageObserver::ReconnectCallBack - done" );
 return KErrNone;
 }

branch	RCL_3
changeset 41	9d4d3445ce6e
parent 40	6257223ede8a
child 50	60bb012f1157