MCL/sf/mw/mds: comparison harvester/server/src/harvesterao.cpp

equal deleted inserted replaced

-:c53acadfccc6
+:acef663c1218
 const TInt KPlaceholderQueueSize = 99;
 const TInt KContainerPlaceholderQueueSize = 10;
 const TInt KObjectDefStrSize = 20;
-const TInt KCacheItemCountForEventCaching = 1;
+const TInt KHarvesterAOCustomPriority = 5;
 _LIT( KTAGDaemonName, "ThumbAGDaemon" );
 _LIT( KTAGDaemonExe, "thumbagdaemon.exe" );
 _LIT(KInUse, "InUse");
 // ---------------------------------------------------------------------------
 // CHarvesterAO
 // ---------------------------------------------------------------------------
 //
-CHarvesterAO::CHarvesterAO() : CActive( CActive::EPriorityStandard )
+CHarvesterAO::CHarvesterAO() : CActive( KHarvesterAOCustomPriority)
 {
 WRITELOG( "CHarvesterAO::CHarvesterAO() - begin" );
 iServerPaused = ETrue;
 iNextRequest = ERequestIdle;
 iContextEngineInitialized = EFalse;
 iMdeSessionInitialized = EFalse;
-iHarvesting = EFalse;
 }
 // ---------------------------------------------------------------------------
 // ~CHarvesterAO
 // ---------------------------------------------------------------------------
 //
 void CHarvesterAO::StartMonitoring()
 {
 WRITELOG( "CHarvesterAO::StartMonitoring()" );
-TInt count( iMonitorPluginArray.Count() );
+const TInt count( iMonitorPluginArray.Count() );
 for ( TInt i = 0; i < count; i++ )
 {
 iMonitorPluginArray[i]->StartMonitoring( *iQueue, iMdESession, NULL,
 		iHarvesterPluginFactory );
 //
 void CHarvesterAO::StopMonitoring()
 {
 WRITELOG( "CHarvesterAO::StopMonitoring()" );
-TInt count( iMonitorPluginArray.Count() );
+const TInt count( iMonitorPluginArray.Count() );
 for ( TInt i = 0; i < count; i++ )
 {
 iMonitorPluginArray[i]->StopMonitoring();
 }
 // ---------------------------------------------------------------------------
 //
 void CHarvesterAO::PauseMonitoring()
 {
 WRITELOG( "CHarvesterAO::PauseMonitoring()" );
-TInt count( iMonitorPluginArray.Count() );
+const TInt count( iMonitorPluginArray.Count() );
 for ( TInt i = 0; i<count; i++ )
 {
 iMonitorPluginArray[i]->PauseMonitoring();
 }
 //
 void CHarvesterAO::ResumeMonitoring()
 {
 WRITELOG( "CHarvesterAO::ResumeMonitoring()" );
-TInt count( iMonitorPluginArray.Count() );
+const TInt count( iMonitorPluginArray.Count() );
 for ( TInt i=0; i < count; i++ )
 {
 iMonitorPluginArray[i]->ResumeMonitoring( *iQueue, iMdESession, NULL,
 		iHarvesterPluginFactory );
 	{
 	WRITELOG1( "CHarvesterAO::HandleUnmount(%d)", aMediaId );
 TUint32 mediaId(0);
 TUint removed(0);
-TInt err(0);
 CHarvesterData* hd = NULL;
 #ifdef _DEBUG
 WRITELOG1( "CHarvesterAO::HandleUnmount() iReadyPHArray.Count() = %d", iReadyPHArray.Count() );
 #endif
 		TRAP_IGNORE( iHarvesterEventManager->DecreaseItemCountL( EHEObserverTypePlaceholder, iReadyPHArray.Count() ) );
 		TRAP_IGNORE( iHarvesterEventManager->DecreaseItemCountL( EHEObserverTypeMMC, iReadyPHArray.Count()) );
 		iReadyPHArray.ResetAndDestroy();
 		}
+TInt err( KErrNone );
 #ifdef _DEBUG
 	WRITELOG1( "CHarvesterAO::HandleUnmount() iPHArray.Count() = %d", iPHArray.Count() );
 #endif
 if( iPHArray.Count() > 0 )
 {
 	iMediaIdUtil->RemoveMediaId( aMediaId );
 	removed = 0;
 	RPointerArray<CHarvesterPluginInfo>& hpiArray = iHarvesterPluginFactory->GetPluginInfos();
-	if( hpiArray.Count() > 0 )
+	const TInt arrayCount( hpiArray.Count() );
+	if( arrayCount > 0 )
 		{
 		RArray<TItemId> placeholders;
-		TUint32 mediaId(0);
+		TUint32 mediaId( 0 );
-		TInt err(0);
+		TInt err( KErrNone );
-		for( TInt i = hpiArray.Count(); --i >= 0; )
+		for( TInt i = arrayCount; --i >= 0; )
 			{
 			CHarvesterPluginInfo* hpi = hpiArray[i];
 			for( TInt j = hpi->iQueue.Count(); --j >= 0; )
 				{
 				CHarvesterData* hd = hpi->iQueue[j];
 RImplInfoPtrArray infoArray;
 TCleanupItem cleanupItem( MdsUtils::CleanupEComArray, &infoArray );
 CleanupStack::PushL( cleanupItem );
 CComposerPlugin::ListImplementationsL( infoArray );
-TInt count( 0 );
+const TInt count( infoArray.Count() );
-count = infoArray.Count();
 for ( TInt i=0; i < count; i++ )
 {
 TUid uid = infoArray[i]->ImplementationUid();
 CComposerPlugin* plugin = NULL;
 //
 void CHarvesterAO::StopComposers()
 {
 WRITELOG( "CHarvesterAO::StopComposers()" );
-for ( TInt i = iComposerPluginArray.Count(); --i >= 0; )
+const TInt count( iComposerPluginArray.Count() );
+for ( TInt i = count; --i >= 0; )
 {
 iComposerPluginArray[i]->RemoveSession();
 }
 WRITELOG( "CHarvesterAO::StopComposers() - end" );
 //
 TBool CHarvesterAO::IsComposingReady()
 {
 WRITELOG( "CHarvesterAO::IsComposingReady()" );
-for ( TInt i = iComposerPluginArray.Count(); --i >= 0; )
+const TInt count( iComposerPluginArray.Count() );
+for ( TInt i = count; --i >= 0; )
 {
 if ( iComposerPluginArray[i]->IsComposingComplete() == EFalse )
 {
 return EFalse;
 }
 		    phData = CPlaceholderData::NewL();
 		    CleanupStack::PushL( phData );
 		    TEntry* entry = new (ELeave) TEntry();
 		    CleanupStack::PushL( entry );
 		    const TDesC& uri = hd->Uri();
-		    TInt err = iFs.Entry( uri, *entry );
+		    const TInt err = iFs.Entry( uri, *entry );
 		    if ( err != KErrNone )
 		    	{
 		    	WRITELOG( "CHarvesterAO::HandlePlaceholdersL() - cannot create placeholder data object for camera. file does not exists" );
 	    		// notify observer
 	    	    HarvestCompleted( hd->ClientId(), hd->Uri(), err );
 	mdeObject->AddTimePropertyL( *iPropDefs->iLastModifiedDatePropertyDef, phData->Modified() );
 	// set origin
 		mdeObject->AddUint8PropertyL( *iPropDefs->iOriginPropertyDef, hd->Origin() );
-	CPlaceholderData* ph = static_cast<CPlaceholderData*>( hd->ClientData() );
+	CPlaceholderData* ph = NULL;
-	    TInt isPreinstalled = ph->Preinstalled();
+	if( hd->TakeSnapshot() )
+	    {
+	    ph = static_cast<CPlaceholderData*>( hd->ClientData() );
+	    }
+	else
+	    {
+	    ph = phData;
+	    }
+	    const TInt isPreinstalled = ph->Preinstalled();
 	    if( isPreinstalled == MdeConstants::MediaObject::EPreinstalled )
 	    	{
 	    	WRITELOG("CHarvesterAO::HandlePlaceholdersL() - preinstalled");
 	    	mdeObject->AddInt32PropertyL( *iPropDefs->iPreinstalledPropertyDef, isPreinstalled );
 	    	}
 	    hd->SetEventType( EHarvesterEdit );
 		// skip
 		if( hd->TakeSnapshot() )
 			{
 			fastHarvestPlaceholderCount++;
 			hd->SetObjectType( EFastHarvest );
 		iReadyPHArray.Append( hd );
 		iPHArray.Remove( i );
 		}
-	TInt objectCount = mdeObjectArray.Count();
+	const TInt objectCount = mdeObjectArray.Count();
 if( objectCount > 0 )
 		{
 		// add object to mde
 		iMdEHarvesterSession->AutoLockL( mdeObjectArray );
 			iHarvesterEventManager->SendEventL( EHEObserverTypePlaceholder, EHEStateStarted,
 					iHarvesterEventManager->ItemCount( EHEObserverTypePlaceholder ) );
 			}
 #ifdef _DEBUG
-		for (TInt i = 0; i < mdeObjectArray.Count(); ++i)
+		for (TInt i = 0; i < objectCount; ++i)
 			{
 			CMdEObject* mdeObject = mdeObjectArray[i];
 			if(mdeObject->Id() == 0)
 				{
 				WRITELOG1( "CHarvesterAO::HandlePlaceholdersL() - failed to add: %S", &mdeObject->Uri() );
 	        	if( locData )
 	        		{
 	        		WRITELOG( "CHarvesterAO::HarvestingCompleted() - Creating location object. " );
 	        		RLocationObjectManipulator lo;
-	        		TInt loError = KErrNone;
+	        		const TInt loError = lo.Connect();
-	        		loError = lo.Connect();
 	        		if (loError == KErrNone)
 	        			{
 	        			TInt err = lo.CreateLocationObject( *locData, aHD->MdeObject().Id() );
 	        			if( err != KErrNone )
 			return;
 }
 else
 {
 WRITELOG1( "CHarvesterAO::HarvestingCompleted() - unknown error: %d", errorCode );
+delete aHD;
+aHD = NULL;
 }
 WRITELOG( "==============================ERROR done =========================" );
 }
 }
 else
 	{
 WRITELOG( "CHarvesterAO::HandleSessionOpened() - error creating mde harvester session" );
 	}
+TRAPD( ohTrap, iMdeObjectHandler = CMdeObjectHandler::NewL( *iMdESession ) );
+if ( ohTrap != KErrNone )
+{
+WRITELOG( "CHarvesterAO::HandleSessionOpened() - ObjectHandler creation failed" );
+}
 #ifdef _DEBUG
 TRAP( errorTrap, PreallocateNamespaceL( aSession.GetDefaultNamespaceDefL() ) );
 if ( errorTrap != KErrNone )
 {
 WRITELOG( "CHarvesterAO::HandleSessionOpened() - error loading default schema" );
 	}
 else
 	{
 	WRITELOG( "CHarvesterAO::HandleSessionOpened() - couldn't create on demand observer" );
 	}
-	TRAPD( ohTrap, iMdeObjectHandler = CMdeObjectHandler::NewL( *iMdESession ) );
-	if ( ohTrap != KErrNone )
-				{
-				WRITELOG( "CHarvesterAO::HandleSessionOpened() - ObjectHandler creation failed" );
-				}
 // Initializing pause indicator
 iServerPaused = EFalse;
 #ifdef _DEBUG
 WRITELOG( "HarvesterThread::HandleSessionOpened() - Succeeded!" );
 {
 // no more items in queue
 case ERequestIdle:
 {
 WRITELOG( "CHarvesterAO::RunL - ERequestIdle" );
+iReadyPHArray.Compress();
+iContainerPHArray.Compress();
+iPHArray.Compress();
 }
 break;
 // data added to harvester queue
 case ERequestHarvest:
 WRITELOG( "CHarvesterAO::RunL - ERequestHarvest" );
 // harvest new items first...
 if ( iQueue->ItemsInQueue() > 0 )
 {
-if ( !iHarvesting )
-	{
-	iHarvesting = ETrue;
-	iHarvesterEventManager->SendEventL( EHEObserverTypeOverall, EHEStateStarted );
-	// This next line is for caching the harvester started event for observers registering
-	// after harvesting has already started
-	iHarvesterEventManager->IncreaseItemCount( EHEObserverTypeOverall, KCacheItemCountForEventCaching );
-	}
 ReadItemFromQueueL();
 				SetNextRequest( ERequestHarvest );
 }
 // no more items to harvest
 				if(iReadyPHArray.Count() > 0)
 		{
 #ifdef _DEBUG
 		WRITELOG1("CHarvesterAO::RunL - items in ready pharray: %d", iReadyPHArray.Count() );
 #endif
-		for ( TInt i = iReadyPHArray.Count(); --i >= 0; )
+		const TInt beginIndex( iReadyPHArray.Count() );
+		TInt endIndex( beginIndex - KPlaceholderQueueSize );
+		if( endIndex < 0 )
+		    {
+		    endIndex = 0;
+		    }
+		for ( TInt i = beginIndex; --i >= endIndex; )
 			{
 		CheckFileExtensionAndHarvestL( iReadyPHArray[i] );
 		iReadyPHArray.Remove( i );
 			}
+		if( iReadyPHArray.Count() )
+		    {
+		    SetNextRequest( ERequestHarvest );
+		    break;
+		    }
 		iReadyPHArray.Reset();
 		}
-				if ( iHarvesting && !UnharvestedItemsLeftInPlugins() &&
-					 !iReHarvester->ItemsInQueue() )
-					{
-					iHarvesting = EFalse;
-					iHarvesterEventManager->SendEventL( EHEObserverTypeOverall, EHEStateFinished );
-					iHarvesterEventManager->DecreaseItemCountL( EHEObserverTypeOverall, KCacheItemCountForEventCaching );
-				    iReadyPHArray.Compress();
-				    iContainerPHArray.Compress();
-				    iPHArray.Compress();
-					}
 SetNextRequest( ERequestIdle );
 }
 }
 break;
 aMessage.Complete( err );
 }
 return;
 }
 #ifdef _DEBUG
 const TInt count = albumIds.Count();
 for (TInt i = 0; i < count; ++i)
 {
 WRITELOG2( "RHarvesterClient::HarvestFileWithUID - album id[%d]: %d", i, albumIds[i] );
 }
 #endif
 delete albumIdBuf;
 albumIdBuf = NULL;
 #ifdef _DEBUG
 	}
 TBool CHarvesterAO::UnharvestedItemsLeftInPlugins()
 	{
 	RPointerArray<CHarvesterPluginInfo>& infos = iHarvesterPluginFactory->GetPluginInfos();
-	TInt count = infos.Count();
+	const TInt count = infos.Count();
 	for ( TInt i = count; --i >= 0; )
 		{
 		if ( infos[i]->iQueue.Count() > 0 )
 			{
 			return ETrue;

changeset 1	acef663c1218
parent 0	c53acadfccc6
child 2	b73a2e62868f