FCL/sf/app/search: comparison harvesterplugins/file/src/cfilemonitor.cpp

equal deleted inserted replaced

-:ccd0fd43f247
+:208a4ba3894c
 #include <pathinfo.h>
 #include "cfilemonitor.h"
 #include "cfolderrenamedharvester.h"
 #include "harvesterserverlogger.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "cfilemonitorTraces.h"
+#endif
 // -----------------------------------------------------------------------------
 // CFileMonitor::NewL
 // -----------------------------------------------------------------------------
 //
 //
 CFileMonitor::CFileMonitor( CFilePlugin& aFilePlugin, RFs* aFsSession ) :
 CActive(CActive::EPriorityStandard),
 iFilePlugin( aFilePlugin )
 {
+OstTraceFunctionEntry0( CFILEMONITOR_CFILEMONITOR_ENTRY );
 CPIXLOGSTRING("ENTER CFileMonitor::CFileMonitor");
 CActiveScheduler::Add(this);
 iFsSession = aFsSession;
 CPIXLOGSTRING("END CFileMonitor::CFileMonitor");
+OstTraceFunctionExit0( CFILEMONITOR_CFILEMONITOR_EXIT );
 }
 // -----------------------------------------------------------------------------
 // CFileMonitor::~CFileMonitor
 // -----------------------------------------------------------------------------
 // CFileMonitor::RunError
 // -----------------------------------------------------------------------------
 //
 TInt CFileMonitor::RunError( TInt aError )
 	{
+	OstTrace1( TRACE_NORMAL, CFILEMONITOR_RUNERROR, "CFileMonitor::RunError;aError=%d", aError );
 	CPIXLOGSTRING2( "CFileMonitor::RunError %d", aError );
 	return KErrNone;
 	}
 // -----------------------------------------------------------------------------
 // CFileMonitor::RunL
 // -----------------------------------------------------------------------------
 //
 void CFileMonitor::RunL()
 {
+OstTraceFunctionEntry0( CFILEMONITOR_RUNL_ENTRY );
 CPIXLOGSTRING("ENTER CFileMonitor::RunL");
 Deque();
 CActiveScheduler::Add( this );
 /*
 /*
 * IMPORTANT:
 * Rename of whole directory happens as change to every file in dir.
 * We get an event of every file in dir.
 */
+OstTrace1( TRACE_NORMAL, DUP1_CFILEMONITOR_RUNL, "CFileMonitor::RunL;status.iFileEventType=%d", status.iFileEventType );
 CPIXLOGSTRING2("CFileMonitor::RunL, status.iFileEventType: %i", status.iFileEventType );
 switch(status.iFileEventType)
 		{
 		case EFastFindFileCreated:
 			{
+			OstTraceExt1( TRACE_NORMAL, DUP4_CFILEMONITOR_RUNL, "CFileMonitor::RunL;EFastFindFileCreated old=%S", fileNameOld );
 			CPIXLOGSTRING2("CFileMonitor::RunL, EFastFindFileCreated old = %S", &fileNameOld);
+			OstTraceExt1( TRACE_NORMAL, DUP2_CFILEMONITOR_RUNL, "CFileMonitor::RunL;EFastFindFileCreated new=%S", fileNameNew );
 			CPIXLOGSTRING2("CFileMonitor::RunL, EFastFindFileCreated new = %S", &fileNameNew);
 // File creation (for example over PC suite) gives fileNameOld as the created files, fileNameOld is empty.
-iFilePlugin.CreateFileIndexItemL(fileNameOld, ECPixAddAction);
+iFilePlugin.CreateContentIndexItemL(fileNameOld, ECPixAddAction);
+iFilePlugin.CreateFolderFileIndexItemL(fileNameOld, ECPixAddAction, false);
 			}
 		break;
 		case EFastFindFileModified:
 			{
 			// Decided to block the CPiXHarvesterServer thread rather than introduce
 			// new active object state into the CFileMonitor.
 			User::After(50000); // 0.05 seconds
+			OstTraceExt1( TRACE_NORMAL, DUP3_CFILEMONITOR_RUNL, "CFileMonitor::RunL;EFastFindFileModified old=%S", fileNameOld );
 			CPIXLOGSTRING2("CFileMonitor::RunL, EFastFindFileModified old = %S", &fileNameOld);
+			OstTraceExt1( TRACE_NORMAL, DUP5_CFILEMONITOR_RUNL, "CFileMonitor::RunL;EFastFindFileModified new=%S", fileNameNew );
 			CPIXLOGSTRING2("CFileMonitor::RunL, EFastFindFileModified new = %S", &fileNameNew);
 			// File copy, fileNameOld contains the file name, fileNameNew is empty
-			iFilePlugin.CreateFileIndexItemL(fileNameOld, ECPixUpdateAction);
+			iFilePlugin.CreateContentIndexItemL(fileNameOld, ECPixUpdateAction);
+			iFilePlugin.CreateFolderFileIndexItemL(fileNameOld, ECPixUpdateAction, false);
 			}
 		break;
 		case EFastFindFileRenamed:
 			{
+			OstTraceExt1( TRACE_NORMAL, DUP6_CFILEMONITOR_RUNL, "CFileMonitor::RunL;EFastFindFileRenamed old=%S", fileNameOld );
 			CPIXLOGSTRING2("CFileMonitor::RunL, EFastFindFileRenamed old = %S", &fileNameOld);
+			OstTraceExt1( TRACE_NORMAL, DUP7_CFILEMONITOR_RUNL, "CFileMonitor::RunL;EFastFindFileRenamed new=%S", fileNameNew );
 			CPIXLOGSTRING2("CFileMonitor::RunL, EFastFindFileRenamed new = %S", &fileNameNew);
 			TEntry entry;
 			if ( iFsSession->Entry( fileNameNew, entry ) == KErrNone )
 				{
 				if ( !entry.IsDir() )
 					{
 					if (fileNameOld.Length()>0 && fileNameOld.Compare(fileNameNew)!=0)
 						{
-						iFilePlugin.CreateFileIndexItemL(fileNameOld, ECPixRemoveAction);
+						iFilePlugin.CreateContentIndexItemL(fileNameOld, ECPixRemoveAction);
+						iFilePlugin.CreateFolderFileIndexItemL(fileNameOld, ECPixRemoveAction, false);
 						}
-					iFilePlugin.CreateFileIndexItemL(fileNameNew, ECPixUpdateAction);
+					iFilePlugin.CreateContentIndexItemL(fileNameNew, ECPixUpdateAction);
+					iFilePlugin.CreateFolderFileIndexItemL(fileNameNew, ECPixUpdateAction, false);
 					}
 				else
 					{
 					iFolderRenamedHarvester->StartL(fileNameOld, fileNameNew);
 					}
 			}
 		break;
 		case EFastFindFileReplaced:
 			{
+			OstTraceExt1( TRACE_NORMAL, DUP8_CFILEMONITOR_RUNL, "CFileMonitor::RunL;EFastFindFileReplaced old=%S", fileNameOld );
 			CPIXLOGSTRING2("CFileMonitor::RunL, EFastFindFileReplaced old = %S", &fileNameOld);
+			OstTraceExt1( TRACE_NORMAL, DUP9_CFILEMONITOR_RUNL, "CFileMonitor::RunL;EFastFindFileReplaced new=%S", fileNameNew );
 			CPIXLOGSTRING2("CFileMonitor::RunL, EFastFindFileReplaced new = %S", &fileNameNew);
 			// File rename (funnily), fileNameOld contains the old file name, fileNameNew the new name
 			if (fileNameOld.Length()>0 && fileNameOld.Compare(fileNameNew)!=0)
-				iFilePlugin.CreateFileIndexItemL(fileNameOld, ECPixRemoveAction);
+			    {
-			iFilePlugin.CreateFileIndexItemL(fileNameNew, ECPixUpdateAction);
+				iFilePlugin.CreateContentIndexItemL(fileNameOld, ECPixRemoveAction);
+				iFilePlugin.CreateFolderFileIndexItemL(fileNameOld, ECPixRemoveAction, false);
+			    }
+			iFilePlugin.CreateContentIndexItemL(fileNameNew, ECPixUpdateAction);
+			iFilePlugin.CreateFolderFileIndexItemL(fileNameOld, ECPixUpdateAction, false);
 			}
 		break;
 		case EFastFindFileDeleted:
 			{
+			OstTraceExt1( TRACE_NORMAL, DUP10_CFILEMONITOR_RUNL, "CFileMonitor::RunL;EFastFindFileDeleted old=%S", fileNameOld );
 			CPIXLOGSTRING2("CFileMonitor::RunL, EFastFindFileDeleted old = %S", &fileNameOld);
+			OstTraceExt1( TRACE_NORMAL, DUP11_CFILEMONITOR_RUNL, "CFileMonitor::RunL;EFastFindFileDeleted new=%S", fileNameNew );
 			CPIXLOGSTRING2("CFileMonitor::RunL, EFastFindFileDeleted new = %S", &fileNameNew);
 			// File delete, fileNameOld contains the name of the deleted file
-			iFilePlugin.CreateFileIndexItemL(fileNameOld, ECPixRemoveAction);
+			iFilePlugin.CreateContentIndexItemL(fileNameOld, ECPixRemoveAction);
-			}
+			iFilePlugin.CreateFolderFileIndexItemL(fileNameOld, ECPixRemoveAction, false);
-		break;
+			}
+		break;
+		case EFastFindDirCreated:
+{
+iFilePlugin.CreateFolderFileIndexItemL(fileNameOld, ECPixAddAction);
+}
+break;
+		case EFastFindDirDeleted:
+{
+iFilePlugin.CreateFolderFileIndexItemL(fileNameOld, ECPixRemoveAction);
+}
+break;
 		default:
 			{
+			OstTraceExt1( TRACE_NORMAL, DUP12_CFILEMONITOR_RUNL, "CFileMonitor::RunL;unknown event old=%S", fileNameOld );
 			CPIXLOGSTRING2("CFileMonitor::RunL, unknown event old = %S", &fileNameOld);
+			OstTraceExt1( TRACE_NORMAL, DUP13_CFILEMONITOR_RUNL, "CFileMonitor::RunL;unknown event new=%S", fileNameNew );
 			CPIXLOGSTRING2("CFileMonitor::RunL, unknown event new = %S", &fileNameNew);
 			}
 		break;
 		}
 ResetStatus();
 iEngine.RegisterNotification(iPckg, iStatus);
 CPIXLOGSTRING("END CFileMonitor::RunL");
-SetActive();
+OstTraceFunctionExit0( CFILEMONITOR_RUNL_EXIT );
+SetActive();
 }
 // -----------------------------------------------------------------------------
 // CFileMonitor::StartMonitoring
 // -----------------------------------------------------------------------------
 //
 TBool CFileMonitor::StartMonitoring()
 	{
-	CPIXLOGSTRING("ENTER CFileMonitor::StartMonitoring")
+	OstTraceFunctionEntry0( CFILEMONITOR_STARTMONITORING_ENTRY );
+	CPIXLOGSTRING("ENTER CFileMonitor::StartMonitoring");
 if ( !IsActive() )
 		{
-		CPIXLOGSTRING("CFileMonitor::StartMonitoring - IF ")
+		OstTrace0( TRACE_NORMAL, CFILEMONITOR_STARTMONITORING, "CFileMonitor::StartMonitoring - IF" );
+		CPIXLOGSTRING("CFileMonitor::StartMonitoring - IF ");
 		iEngine.Enable();
 		ResetStatus();
 	    iEngine.RegisterNotification( iPckg, iStatus );
 	    SetActive();
 		}
 	CPIXLOGSTRING("END CFileMonitor::StartMonitoring");
+	OstTraceFunctionExit0( CFILEMONITOR_STARTMONITORING_EXIT );
 	return ETrue;
 	}
 // ---------------------------------------------------------------------------
 // CFileMonitor::ResetStatus
 // ---------------------------------------------------------------------------
 //
 void CFileMonitor::ResetStatus()
 {
+OstTrace0( TRACE_NORMAL, CFILEMONITOR_RESETSTATUS, "CFileMonitor::ResetStatus" );
 CPIXLOGSTRING( "CFileMonitor::ResetStatus" );
 TFastFindFSPStatus& status = iPckg();
 status.iDriveNumber = 0;
 // CFileMonitor::Initialize
 // -----------------------------------------------------------------------------
 //
 TInt CFileMonitor::Initialize()
 {
+OstTraceFunctionEntry0( CFILEMONITOR_INITIALIZE_ENTRY );
 CPIXLOGSTRING("ENTER CFileMonitor::Initialize");
 TInt err = OpenEngine();
+OstTrace1( TRACE_NORMAL, CFILEMONITOR_INITIALIZE, "CFileMonitor::Initialize;OpenEngine=%d", err );
 CPIXLOGSTRING2("CFileMonitor::Initialize - OpenEngine: %i", err );
 	if ( err != KErrNone )
 		{
+		OstTrace0( TRACE_NORMAL, DUP1_CFILEMONITOR_INITIALIZE, "CFileMonitor::Initialize if( err != KErrNone )" );
 		CPIXLOGSTRING("CFileMonitor::Initialize if( err != KErrNone ) ");
+		OstTraceFunctionExit0( CFILEMONITOR_INITIALIZE_EXIT );
 		return err;
 		}
 	CPIXLOGSTRING("END CFileMonitor::Initialize");
+	OstTraceFunctionExit0( DUP1_CFILEMONITOR_INITIALIZE_EXIT );
 	return err;
 }
 // -----------------------------------------------------------------------------
 // CFileMonitor::Release
 User::LeaveIfError( RFs::DriveToChar( aDriveNumber, chr ) );
 notificationPath.Append( chr );
 notificationPath.Append( KExcludePathSystem );
 iEngine.AddIgnorePath( notificationPath );
+	OstTraceExt1( TRACE_NORMAL, CFILEMONITOR_ADDNOTIFICATIONPATHSL, "CFileMonitor::AddNotificationPathsL;AddIgnorePath=%S", notificationPath );
 	CPIXLOGSTRING2("CFileMonitor::AddNotificationPathsL - AddIgnorePath: %S", &notificationPath );
 notificationPath.Zero();
 // As index databases are located under \\Private\\ path,
 // this ignore path will mean index databases are also ignored.
 notificationPath.Append( chr );
 notificationPath.Append( KExcludePathPrivate );
 iEngine.AddIgnorePath( notificationPath );
+OstTraceExt1( TRACE_NORMAL, DUP1_CFILEMONITOR_ADDNOTIFICATIONPATHSL, "CFileMonitor::AddNotificationPathsL;AddIgnorePath=%S", notificationPath );
 CPIXLOGSTRING2("CFileMonitor::AddNotificationPathsL - AddIgnorePath: %S", &notificationPath );
 notificationPath.Zero();
 // Maps data must not be indexed
 notificationPath.Append( chr );
 notificationPath.Append( KExcludePathMapsCities );
 iEngine.AddIgnorePath( notificationPath );
+OstTraceExt1( TRACE_NORMAL, DUP2_CFILEMONITOR_ADDNOTIFICATIONPATHSL, "CFileMonitor::AddNotificationPathsL;AddIgnorePath=%S", notificationPath );
 CPIXLOGSTRING2("CFileMonitor::AddNotificationPathsL - AddIgnorePath: %S", &notificationPath );
 notificationPath.Zero();
 User::LeaveIfError( PathInfo::GetRootPath( notificationPath, aDriveNumber ) );
 iEngine.AddNotificationPath( notificationPath );
+OstTraceExt1( TRACE_NORMAL, DUP3_CFILEMONITOR_ADDNOTIFICATIONPATHSL, "CFileMonitor::AddNotificationPathsL;AddIgnorePath=%S", notificationPath );
 CPIXLOGSTRING2("CFileMonitor::AddNotificationPathsL - AddNotificationPath: %S", &notificationPath );
 }
 // -----------------------------------------------------------------------------
 // CFileMonitor::RemoveNotificationPaths
 RFs::DriveToChar( aDriveNumber, chr );
 ignorePath.Append( chr );
 ignorePath.Append( KExcludePathSystem );
 iEngine.RemoveIgnorePath( ignorePath );
+OstTraceExt1( TRACE_NORMAL, CFILEMONITOR_REMOVENOTIFICATIONPATHS, "CFileMonitor::RemoveNotificationPaths;RemoveIgnorePath=%S", ignorePath );
 CPIXLOGSTRING2("CFileMonitor::RemoveNotificationPaths - RemoveIgnorePath: %S", &ignorePath );
 ignorePath.Zero();
 // As index databases are located under \\Private\\ path,
 // this ignore path will mean index databases are also ignored.
 ignorePath.Append( chr );
 ignorePath.Append( KExcludePathPrivate );
 iEngine.RemoveIgnorePath( ignorePath );
+OstTraceExt1( TRACE_NORMAL, DUP1_CFILEMONITOR_REMOVENOTIFICATIONPATHS, "CFileMonitor::RemoveNotificationPaths;RemoveIgnorePath=%S", ignorePath );
 CPIXLOGSTRING2("CFileMonitor::RemoveNotificationPaths - RemoveIgnorePath: %S", &ignorePath );
 ignorePath.Zero();
 // Maps
 ignorePath.Append( chr );
 ignorePath.Append( KExcludePathMapsCities );
 iEngine.RemoveIgnorePath( ignorePath );
+OstTraceExt1( TRACE_NORMAL, DUP2_CFILEMONITOR_REMOVENOTIFICATIONPATHS, "CFileMonitor::RemoveNotificationPaths;RemoveIgnorePath=%S", ignorePath );
 CPIXLOGSTRING2("CFileMonitor::RemoveNotificationPaths - RemoveIgnorePath: %S", &ignorePath );
 ignorePath.Zero();
 PathInfo::GetRootPath( ignorePath, aDriveNumber );
 iEngine.RemoveNotificationPath( ignorePath );
+OstTraceExt1( TRACE_NORMAL, DUP3_CFILEMONITOR_REMOVENOTIFICATIONPATHS, "CFileMonitor::RemoveNotificationPaths;RemoveIgnorePath=%S", ignorePath );
 CPIXLOGSTRING2("CFileMonitor::RemoveNotificationPaths - RemoveNotificationPath: %S", &ignorePath );
 }
 // -----------------------------------------------------------------------------
 // CFileMonitor::Enable

changeset 2	208a4ba3894c
parent 0	ccd0fd43f247
child 26	367228f82b66