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

equal deleted inserted replaced

-:c461c7fa72c2
+:81125601ee77
 iRamFull = EFalse;
 iDiskFull = EFalse;
 iManualPauseEnabled = EFalse;
 iFastHarvestNeeded = EFalse;
 iHarvestingPlaceholders = EFalse;
+iUnmountDetected = EFalse;
 }
 // ---------------------------------------------------------------------------
 // ~CHarvesterAO
 // ---------------------------------------------------------------------------
 iReadyPHArray.Close();
 iContainerPHArray.ResetAndDestroy();
 iContainerPHArray.Close();
+iTempReadyPHArray.ResetAndDestroy();
+iTempReadyPHArray.Close();
 	delete iHarvesterOomAO;
 delete iRestoreWatcher;
 	delete iOnDemandAO;
 	delete iMdEHarvesterSession;
 	delete iMdESession;
 // ---------------------------------------------------------------------------
 //
 void CHarvesterAO::HandleUnmount( TUint32 aMediaId )
 	{
 WRITELOG1( "CHarvesterAO::HandleUnmount(%d)", aMediaId );
+iUnmountDetected = ETrue;
 if( !iServerPaused )
 {
 // Stop harvesting for unmount
 PauseMonitoring();
 }
 WRITELOG1( "CHarvesterAO::HandleUnmount() DecreaseItemCountL iContainerPHArray %d", removed);
 TRAP_IGNORE( iHarvesterEventManager->DecreaseItemCountL( EHEObserverTypePlaceholder, removed) );
 }
+removed = 0;
+#ifdef _DEBUG
+WRITELOG1( "CHarvesterAO::HandleUnmount() iTempReadyPHArray.Count() = %d", iTempReadyPHArray.Count() );
+#endif
+arrayCount = iTempReadyPHArray.Count();
+if( arrayCount > 0 )
+{
+for( TInt i=arrayCount-1; i>= 0; i--)
+{
+hd = iTempReadyPHArray[i];
+err = iMediaIdUtil->GetMediaId( hd->Uri(), mediaId );
+if( err == KErrNone && mediaId == aMediaId )
+{
+WRITELOG1( "CHarvesterAO::HandleUnmount() remove iTempReadyPHArray %d", i);
+delete hd;
+hd = NULL;
+iTempReadyPHArray.Remove( i );
+removed++;
+arrayCount--;
+}
+}
+if( iTempReadyPHArray.Count() == 0 )
+{
+iTempReadyPHArray.Compress();
+}
+WRITELOG1( "CHarvesterAO::HandleUnmount() DecreaseItemCountL iTempReadyPHArray %d", removed);
+TRAP_IGNORE( iHarvesterEventManager->DecreaseItemCountL( EHEObserverTypePlaceholder, removed) );
+}
 removed = 0;
 	const TUint count = iQueue->ItemsInQueue();
 	WRITELOG1( "CHarvesterAO::HandleUnmount() iQueue.Count() = %d", count );
 	if( count > 0 )
 // make sure that when HandlePlaceholdersL leaves, iPHArray is cleared
 if ( err != KErrNone )
 {
 iPHArray.ResetAndDestroy();
+iTempReadyPHArray.ResetAndDestroy();
 User::Leave( err );
 }
 TInt count( iReadyPHArray.Count() );
 for( TInt i = 0; i < count; i++ )
 {
 CheckFileExtensionAndHarvestL( iReadyPHArray[i] );
+if( iUnmountDetected )
+{
+break;
+}
 iReadyPHArray.Remove( i );
 // correct the index so harvesting order remains ok
 i--;
 count--;
 }
 	        	iPHArray.Append( hd );
 	    		}
 	    	else
 	    		{
 	    		CheckFileExtensionAndHarvestL( hd );
+	    		if( iUnmountDetected )
+	    		    {
+	    		    iQueue->Append( hd );
+	    		    return;
+	    		    }
 	    		}
 		}
 	if( iPHArray.Count() > 0 )
 		{
 	    	// make sure that when HandlePlaceholdersL leaves, iPHArray is cleared
 	    	if ( err != KErrNone )
 	    		{
 	    		iPHArray.ResetAndDestroy();
+	    		iTempReadyPHArray.ResetAndDestroy();
 	    		User::Leave( err );
 	    		}
 		}
 	}
 else
 {
 SetPriority( KHarvesterPriorityHarvestingPlugin );
 }
 iHarvestingPlaceholders = EFalse;
 CheckFileExtensionAndHarvestL( hd );
+if( iUnmountDetected )
+{
+iQueue->Append( hd );
+}
 	}
 }
 // ---------------------------------------------------------------------------
 // HandlePlaceholdersL
 		if( !CheckForCameraItem( hd, objDefStr ) )
 		    {
 		    iHarvesterPluginFactory->GetObjectDefL( *hd, objDefStr );
 		    }
+		// GetObjectDef can cause context switch, and if unmount happens when this execution is
+		// interrupted, the ph arrays can be invalid. Thus, abort whole run, and start over to make sure
+		// the arrays are valid.
+		if( iUnmountDetected )
+		    {
+		    WRITELOG( "CHarvesterAO::HandlePlaceholdersL() - Unmount detected during execution!" );
+		    for( TInt y( iTempReadyPHArray.Count() -1 ); y >=0; y-- )
+		        {
+		        CHarvesterData* hd = iTempReadyPHArray[y];
+		        iPHArray.Insert( hd, 0 );
+		        }
+		    iTempReadyPHArray.Reset();
+		    CleanupStack::PopAndDestroy( &mdeObjectArray );
+		    return;
+		    }
 		if( objDefStr.Length() == 0 ||
 		    ( objDefStr == KInUse ) )
 			{
+		    WRITELOG( "CHarvesterAO::HandlePlaceholdersL() - no objectDef or in use, failing harvesting" );
 			const TInt error( KErrUnknown );
 // notify observer, notification is needed even if file is not supported
 HarvestCompleted( hd->ClientId(), hd->Uri(), error );
 			delete hd;
 			hd = NULL;
 	    CleanupStack::PopAndDestroy( phData );
 	    CleanupStack::Pop( mdeObject );
-		iReadyPHArray.Append( hd );
+	    iTempReadyPHArray.Append( hd );
 		iPHArray.Remove( i );
 i--;
 endindex--;
 		}
+	const TInt tempArrayCount( iTempReadyPHArray.Count() );
+	for( TInt i( 0 ); i < tempArrayCount; i++ )
+	    {
+	    CHarvesterData* hd = iTempReadyPHArray[i];
+	    iReadyPHArray.Append( hd );
+	    }
+	iTempReadyPHArray.Reset();
 	const TInt objectCount = mdeObjectArray.Count();
 if( objectCount > 0 )
 		{
 		}
 	iPHArray.ResetAndDestroy();
 	CleanupStack::PopAndDestroy( &mdeObjectArray );
+	WRITELOG( "CHarvesterAO::HandlePlaceholdersL() - end" );
 	}
 // ---------------------------------------------------------------------------
 // CheckFileExtensionAndHarvestL
 // ---------------------------------------------------------------------------
 	{
 	objectExisted = EFalse;
 	WRITELOG1( "CHarvesterAO::CheckFileExtensionAndHarvestL() - no mdeobject. URI: %S", &uri );
 	    TBuf<KObjectDefStrSize> objDefStr;
 		iHarvesterPluginFactory->GetObjectDefL( *aHD, objDefStr );
+// GetObjectDef can cause context switch, and if unmount happens when this execution is
+// interrupted, the ph data can be invalid. Thus, abort whole run, and start over to make sure
+// the data is valid.
+if( iUnmountDetected )
+{
+return;
+}
 		if( objDefStr.Length() == 0 )
 			{
 			WRITELOG( "CHarvesterAO::CheckFileExtensionAndHarvestL() - cannot get object definition" );
 			isError = ETrue;
 // ---------------------------------------------------------------------------
 //
 TInt CHarvesterAO::PauseHarvester()
 {
 WRITELOG( "CHarvesterAO::PauseHarvester()" );
-Cancel();
 iHarvesterPluginFactory->PauseHarvester( ETrue );
 iServerPaused = ETrue;
-if( !iRamFull && !iDiskFull )
+if( !iRamFull && !iDiskFull && !iUnmountDetected )
 {
 iManualPauseEnabled = ETrue;
 }
 // Everything is paused
 {
 WRITELOG( "CHarvesterAO::ResumeHarvesterL()" );
 iHarvesterPluginFactory->PauseHarvester( EFalse );
 iServerPaused = EFalse;
+if( !iManualPauseEnabled &&
+iNextRequest == ERequestIdle )
+{
+SetNextRequest( ERequestHarvest );
+}
 iManualPauseEnabled = EFalse;
-SetNextRequest( ERequestHarvest );
 }
 // ---------------------------------------------------------------------------
 // RunL
 // ---------------------------------------------------------------------------
 // check if pause is requested
 if ( this->iServerPaused && iNextRequest != ERequestPause && iNextRequest != ERequestResume)
 	{
 	iNextRequest = ERequestIdle;
 	}
+// Reset unmount flag, as unmount is handled before RunL is called again after aborted harvesting run
+iUnmountDetected = EFalse;
 User::LeaveIfError( iStatus.Int() );
 switch( iNextRequest )
 {
 // no more items in queue
 case ERequestIdle:
 {
 WRITELOG( "CHarvesterAO::RunL - ERequestIdle" );
 iReadyPHArray.Compress();
 iContainerPHArray.Compress();
 iPHArray.Compress();
+iTempReadyPHArray.Compress();
 }
 break;
 // data added to harvester queue
 case ERequestHarvest:
 WRITELOG( "CHarvesterAO::RunL - ERequestHarvest" );
 // harvest new items first...
 if ( iQueue->ItemsInQueue() > 0 )
 {
+WRITELOG( "CHarvesterAO::RunL - Items in queue - calling ReadItemFromQueueL()" );
 ReadItemFromQueueL();
 				SetNextRequest( ERequestHarvest );
 				break;
 }
 // no more items to handle from main queue
 else
 {
+WRITELOG( "CHarvesterAO::RunL - No items in main queue" );
 // All registered fast harvested items or placeholders handled at this point
 // if container files to harvest, handle those next
 if( iContainerPHArray.Count() > 0 )
 	{
+WRITELOG( "CHarvesterAO::RunL - Items in iContainterPHArray - requesting ERequestContainerPlaceholder handling" );
 iFastHarvestNeeded = EFalse;
 iHarvestingPlaceholders = EFalse;
 SetPriority( KHarvesterPriorityHarvestingPlugin );
 	SetNextRequest( ERequestContainerPlaceholder );
 	break;
 	}
 else if( iHarvestingPlaceholders || iFastHarvestNeeded )
 {
+WRITELOG( "CHarvesterAO::RunL - No items in iContainerPHArray" );
+WRITELOG( "CHarvesterAO::RunL - PlaceholderHarvesting or FastHarvesting were enabled -> reset" );
+WRITELOG( "CHarvesterAO::RunL - next request for ERequestHarvest handling" );
 // reset to default priority
 iFastHarvestNeeded = EFalse;
 iHarvestingPlaceholders = EFalse;
 SetPriority( KHarvesterPriorityHarvestingPlugin );
 SetNextRequest( ERequestHarvest );
 break;
 }
+WRITELOG( "CHarvesterAO::RunL - starting handling of iReadyPHArray items" );
 const TInt arrayCount( iReadyPHArray.Count() );
 				if( arrayCount > 0 )
 		{
 #ifdef _DEBUG
 		    endIndex = arrayCount;
 		    }
 		for( TInt i = 0; i < endIndex; i++ )
 			{
 		CheckFileExtensionAndHarvestL( iReadyPHArray[i] );
+		if( iUnmountDetected )
+		    {
+		    break;
+		    }
 		iReadyPHArray.Remove( i );
 // correct the index so harvesting order remains ok
 i--;
 endIndex--;
 			}
 	    	// make sure that when HandlePlaceholdersL leaves, iPHArray is cleared
 	    	if ( err != KErrNone )
 	    		{
 	    	    iContainerPHArray.ResetAndDestroy();
 	    		iPHArray.ResetAndDestroy();
+	    		iTempReadyPHArray.ResetAndDestroy();
 	    		User::Leave( err );
 	    		}
 	    	SetNextRequest( ERequestHarvest );
 	}
 break;
 WRITELOG( "CHarvesterAO::ContextSnapshotStatus() - successfully completed" );
 }
 if( aHD->Origin() == MdeConstants::Object::ECamera )
 	{
 aHD->MdeObject().SetPlaceholder( EFalse );
+TRAP_IGNORE( iHarvesterEventManager->DecreaseItemCountL( EHEObserverTypePlaceholder ) );
 	TRAPD(mdeError, iMdeObjectHandler->SetMetadataObjectL( *aHD ) );
 	if(mdeError != KErrNone)
 	{
 	WRITELOG( "==============================ERROR===============================" );
 WRITELOG( "CHarvesterAO::HarvestingCompleted() - cannot set metadata object" );

changeset 31	81125601ee77
parent 28	c461c7fa72c2
child 35	f727727520eb