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

equal deleted inserted replaced

-:4bdfb6b5c9b4
+:b67379558a75
 iActiveCount = 0;
 // set auto create values from cenrep
 CheckAutoCreateValuesL();
-iPeriodicTimer = CPeriodic::NewL(CActive::EPriorityIdle);
+iPeriodicTimer = CPeriodic::NewL(CActive::EPriorityStandard);
 iMountTimer = CPeriodic::NewL(CActive::EPriorityUserInput);
 SetForceRun( EFalse );
 {
 TThumbnailGenerationItem item;
 item.iItemId = aIDArray[i];
 item.iItemType = aItemType;
-SetGenerationItemType(item, aItemType);
+SetGenerationItemAction(item, aItemType);
 if(iPHHarvesting)
 {
 item.iPlaceholder = ETrue;
 }
 TN_DEBUG1( "CThumbAGProcessor::AddToQueueL() - PH  harvesting active, treat like add" );
 for (int i=0; i<aIDArray.Count(); i++)
 {
 TThumbnailGenerationItem item;
 item.iItemId = aIDArray[i];
+item.iItemType = aItemType;
 TInt itemIndex = iGenerationQueue.FindInOrder(item, Compare);
 if (itemIndex >= 0)
 {
 else
 {
 TN_DEBUG1( "CThumbAGProcessor::AddToQueueL() - append");
 item.iPlaceholder = EFalse;
-SetGenerationItemType( item, 0 );
+SetGenerationItemAction( item, aItemType );
 AppendProcessingQueue( item );
 }
 }
 }
 else
 for (int i=0; i<aIDArray.Count(); i++)
 {
 TThumbnailGenerationItem item;
 item.iItemId = aIDArray[i];
+item.iItemType = aItemType;
 itemIndex = iGenerationQueue.FindInOrder(item, Compare);
 if (itemIndex >= 0)
 {
 }
 }
 else
 {
 TN_DEBUG1( "CThumbAGProcessor::AddToQueueL() - append");
-SetGenerationItemType( item, 0 );
+SetGenerationItemAction( item, aItemType);
 item.iPlaceholder = EFalse;
 AppendProcessingQueue( item );
 }
 }
 }
 for (int i=0; i<aIDArray.Count(); i++)
 {
 TThumbnailGenerationItem item;
 item.iItemId = aIDArray[i];
+item.iItemType = aItemType;
 TInt itemIndex = iGenerationQueue.FindInOrder(item, Compare);
 if(itemIndex >= 0)
 {
 // ---------------------------------------------------------------------------
 // CThumbAGProcessor::QueryForPlaceholders()
 // ---------------------------------------------------------------------------
 //
-void CThumbAGProcessor::QueryPlaceholdersL()
+void CThumbAGProcessor::QueryPlaceholdersL(TBool aPresent)
 {
 TN_DEBUG1( "CThumbAGProcessor::QueryPlaceholdersL" );
 __ASSERT_DEBUG((iMdESession), User::Panic(_L("CThumbAGProcessor::QueryPlaceholdersL() !iMdeSession "), KErrBadHandle));
 __ASSERT_DEBUG((iDefNamespace), User::Panic(_L("CThumbAGProcessor::QueryPlaceholdersL() !iDefNamespace "), KErrBadHandle));
 CMdELogicCondition& rootCondition = iQueryPlaceholders->Conditions();
 rootCondition.SetOperator( ELogicConditionOperatorOr );
 CMdEObjectCondition& imagePHObjectCondition = rootCondition.AddObjectConditionL(imageObjDef);
 imagePHObjectCondition.SetPlaceholderOnly( ETrue );
-imagePHObjectCondition.SetNotPresent( ETrue );
+imagePHObjectCondition.SetNotPresent( aPresent );
 CMdEObjectCondition& videoPHObjectCondition = rootCondition.AddObjectConditionL(videoObjDef);
 videoPHObjectCondition.SetPlaceholderOnly( ETrue );
-videoPHObjectCondition.SetNotPresent( ETrue );
+videoPHObjectCondition.SetNotPresent( aPresent );
 CMdEObjectCondition& audioPHObjectCondition = rootCondition.AddObjectConditionL(audioObjDef);
 audioPHObjectCondition.SetPlaceholderOnly( ETrue );
-audioPHObjectCondition.SetNotPresent( ETrue );
+audioPHObjectCondition.SetNotPresent( aPresent );
 iQueryPlaceholders->FindL(KMaxTInt, KMaxQueryBatchSize);
 TN_DEBUG1( "CThumbAGProcessor::QueryPlaceholdersL - end" );
 }
 iInit2 = ETrue;
 iGenerationQueue.Reset();
 iQueryQueue.Reset();
-TRAP_IGNORE(QueryPlaceholdersL());
+		//query all not present placeholders
+TRAP_IGNORE(QueryPlaceholdersL( ETrue ));
 		//query all items after PH query
 iDoQueryAllItems = ETrue;
 TN_DEBUG1( "CThumbAGProcessor::RunL() - Initialisation 1 done" );
 ActivateAO();
 return;
 __ASSERT_DEBUG((err == KErrNone), User::Panic(_L("CThumbAGProcessor::RunL(), !iHarvesterClient "), err));
 if(  err == KErrNone )
 {
 TN_DEBUG1( "CThumbAGProcessor::RunL() add iHarvesterClient observer");
-err = iHarvesterClient.AddHarvesterEventObserver( *this, EHEObserverTypeOverall | EHEObserverTypeMMC | EHEObserverTypePlaceholder, 10 );
+err = iHarvesterClient.AddHarvesterEventObserver( *this, EHEObserverTypeOverall | EHEObserverTypeMMC | EHEObserverTypePlaceholder, 20 );
 TN_DEBUG2( "CThumbAGProcessor::RunL() iHarvesterClient observer err = %d", err);
 if( !err )
 {
 TN_DEBUG1( "CThumbAGProcessor::RunL() add iHarvesterClient observer failed");
 //Handle completed MDS Query
 if( iQueryReady && iProcessingCount)
 {
 TInt err(KErrNone);
 //if force or non forced
-if((iForceRun && iModify ) || (!iForceRun && !iModify ))
+		//if unknown items or mount timer is active, abort processing
+if(((iForceRun && iModify ) || (!iForceRun && !iModify )) && !iUnknownItemCount && !iMountTimer->IsActive())
 {
 TN_DEBUG1( "CThumbAGProcessor::RunL() - iQueryReady START" );
 const CMdEObject* object = &iQuery->Result( iProcessingCount-1 );
 iProcessingCount--;
 }
 }
 //force is coming, but executing non-forced query complete-> cancel old
 else
 {
-			//cancel query and move items back to original processing queue
+			//cancel query
+TN_DEBUG1( "CThumbAGProcessor::RunL() - cancel processing query" );
 DeleteAndCancelQuery( ETrue );
 	        ActivateAO();
 return;
 }
 TN_DEBUG1( "CThumbAGProcessor::HarvestingUpdated -- MDS placeholder harvesterin started");
 }
 else
 {
 TN_DEBUG1( "CThumbAGProcessor::HarvestingUpdated -- MDS placeholder harvesting finished");
-TRAP_IGNORE(QueryPlaceholdersL());
+//query present placeholders
+TRAP_IGNORE(QueryPlaceholdersL( EFalse ));
+iDoQueryAllItems = EFalse;
 iPHHarvestingItemsLeftTemp = 0;
 }
 }
 //restart mount timout if PH item count is increasing durin MMC harvesting
 UpdatePSValues(EFalse, ETrue);
 iMMCHarvestingItemsLeftTemp = 0;
 }
 else
 {
+				//activate timeout if overall harvesting is not active
+if(!iHarvesting)
+{
+StartTimeout();
+}
 TN_DEBUG1( "CThumbAGProcessor::HarvestingUpdated -- MDS MMC harvesting finished ");
 }
 }
 //restart mount timout if MMC item count is still increasing
 // CThumbAGProcessor::StopTimeout()
 // ---------------------------------------------------------------------------
 //
 void CThumbAGProcessor::CancelTimeout()
 {
+TN_DEBUG1( "CThumbAGProcessor::CancelTimeout()");
 if(iPeriodicTimer->IsActive())
 {
 iPeriodicTimer->Cancel();
 }
 }
 {
 TN_DEBUG1( "CThumbAGProcessor::ActivateAO() - FORMATTING - DAEMON ON PAUSE");
 return;
 }
 //check if forced run needs to continue
 if ( iModifyItemCount || iUnknownItemCount > 0 )
 {
 SetForceRun( ETrue );
 }
 if( iGenerationQueue.Count() )
 {
 daemonProcessing = ETrue;
 }
+else
+{
+daemonProcessing = EFalse;
+}
 if( daemonProcessing != iPreviousDaemonProcessing)
 {
 TN_DEBUG2( "CThumbAGProcessor::UpdatePSValues() update KDaemonProcessing == %d", daemonProcessing);
 iPreviousDaemonProcessing = daemonProcessing;
 iVideoItemCount=0;
 iAudioItemCount=0;
 for(TInt i=0; i < iGenerationQueue.Count(); i++)
 {
 TThumbnailGenerationItem& item = iGenerationQueue[i];
 if(item.iItemAction == EGenerationItemActionModify)
 {
 iModifyItemCount++;
 }
 }
 }
 TN_DEBUG2( "CThumbAGProcessor::UpdateItemCounts() iActiveCount = %d",
 iActiveCount);
+TN_DEBUG2( "CThumbAGProcessor::UpdateItemCounts() iPreviousItemsLeft = %d",
+iPreviousItemsLeft);
 TN_DEBUG5( "CThumbAGProcessor::UpdateItemCounts() iHarvesting == %d, iMMCHarvesting == %d, iPHHarvesting == %d, iMPXHarvesting == %d",
 iHarvesting, iMMCHarvesting, iPHHarvesting, iMPXHarvesting);
 TN_DEBUG5( "CThumbAGProcessor::UpdateItemCounts() iIdle = %d, iForegroundRun = %d, timer = %d, iForceRun = %d",
 iIdle, iForegroundRun, iPeriodicTimer->IsActive(), iForceRun);
 TN_DEBUG4( "CThumbAGProcessor::UpdateItemCounts() iModify = %d, iQueryReady = %d, iProcessingCount = %d",
 iModify, iQueryReady, iProcessingCount);
 TN_DEBUG2( "CThumbAGProcessor::UpdateItemCounts() iMountTimer = %d", iMountTimer->IsActive());
-TN_DEBUG3( "CThumbAGProcessor::UpdateItemCounts() ProcessingQueue = %d, iQueryQueue = %d",
+TN_DEBUG3( "CThumbAGProcessor::UpdateItemCounts() iGenerationQueue = %d, iQueryQueue = %d",
 iGenerationQueue.Count(), iQueryQueue.Count());
 TN_DEBUG5( "CThumbAGProcessor::UpdateItemCounts() iAddItemCount=%d, i2ndAddItemCount=%d, iModifyItemCount=%d, iDeleteItemCount=%d",
 iAddItemCount, i2ndAddItemCount, iModifyItemCount, iDeleteItemCount );
 TN_DEBUG3( "CThumbAGProcessor::UpdateItemCounts() iUnknownItemCount=%d, iPlaceholderItemCount=%d",
 iUnknownItemCount, iPlaceholderItemCount);
 TN_DEBUG4( "CThumbAGProcessor::UpdateItemCounts() iAudioItemCount=%d, iVideoItemCount=%d, iImageItemCount=%d",
 iAudioItemCount, iVideoItemCount, iImageItemCount);
 TN_DEBUG2( "CThumbAGProcessor::UpdateItemCounts() iCameraItemCount=%d", iCameraItemCount);
+//compress queues when empty
+if(!iGenerationQueue.Count())
+{
+iGenerationQueue.Compress();
+}
+if(!iQueryQueue.Count())
+{
+iQueryQueue.Compress();
+}
 }
 // ---------------------------------------------------------------------------
 // CThumbAGProcessor::MountTimerCallBack()
 {
 TN_DEBUG1( "CThumbAGProcessor::MountTimerCallBack()");
 CThumbAGProcessor* self = static_cast<CThumbAGProcessor*>( aAny );
 self->iMountTimer->Cancel();
+//activate timeout if overall or mmc harvestig is not active
+if(!self->iHarvesting && !self->iMMCHarvesting )
+{
+self->ActivateAO();
+}
 return KErrNone; // Return value ignored by CPeriodic
 }
 // ---------------------------------------------------------------------------

changeset 30	b67379558a75
parent 29	4bdfb6b5c9b4
child 31	d429f823a6b7
child 36	c5df59b4ae2d