--- a/harvesterplugins/file/fastfindfileserverplugin/src/fastfindfileserverplugin.cpp Mon Apr 19 14:40:05 2010 +0300
+++ b/harvesterplugins/file/fastfindfileserverplugin/src/fastfindfileserverplugin.cpp Mon May 03 12:32:15 2010 +0300
@@ -18,6 +18,11 @@
#include <f32pluginutils.h>
#include "fastfindfileserverplugin.h"
#include "harvesterlog.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "fastfindfileserverpluginTraces.h"
+#endif
+
_LIT( KFastFindFileServerPlugin, "CPixFileServerPlugin" );
@@ -28,6 +33,7 @@
CFastFindFileServerPlugin::CFastFindFileServerPlugin()
: iFormatDriveNumber( -1 )
{
+ OstTrace0( TRACE_NORMAL, CFASTFINDFILESERVERPLUGIN_CFASTFINDFILESERVERPLUGIN, "CFastFindFileServerPlugin::CFastFindFileServerPlugin()" );
WRITELOG( "CFastFindFileServerPlugin::CFastFindFileServerPlugin()" );
}
@@ -37,6 +43,7 @@
//
CFastFindFileServerPlugin::~CFastFindFileServerPlugin()
{
+ OstTrace0( TRACE_NORMAL, DUP1_CFASTFINDFILESERVERPLUGIN_CFASTFINDFILESERVERPLUGIN, "CFastFindFileServerPlugin::~CFastFindFileServerPlugin()" );
WRITELOG( "CFastFindFileServerPlugin::~CFastFindFileServerPlugin()" );
TRAP_IGNORE( DisableL() );
@@ -61,6 +68,7 @@
//
CFastFindFileServerPlugin* CFastFindFileServerPlugin::NewL()
{
+ OstTrace0( TRACE_NORMAL, CFASTFINDFILESERVERPLUGIN_NEWL, "CFastFindFileServerPlugin::NewL()" );
WRITELOG( "CFastFindFileServerPlugin::NewL()" );
return new (ELeave) CFastFindFileServerPlugin;
}
@@ -71,6 +79,7 @@
//
void CFastFindFileServerPlugin::InitialiseL()
{
+ OstTrace0( TRACE_NORMAL, CFASTFINDFILESERVERPLUGIN_INITIALISEL, "CFastFindFileServerPlugin::InitializeL()" );
WRITELOG( "CFastFindFileServerPlugin::InitializeL()" );
User::LeaveIfError( iFsSession.Connect() );
}
@@ -81,6 +90,7 @@
//
void CFastFindFileServerPlugin::EnableL()
{
+ OstTrace0( TRACE_NORMAL, CFASTFINDFILESERVERPLUGIN_ENABLEL, "CFastFindFileServerPlugin::EnableL()" );
WRITELOG( "CFastFindFileServerPlugin::EnableL()" );
User::LeaveIfError( RegisterIntercept(EFsFileCreate, EPostIntercept) );
User::LeaveIfError( RegisterIntercept(EFsFileRename, EPostIntercept) );
@@ -88,6 +98,8 @@
User::LeaveIfError( RegisterIntercept(EFsDelete, EPostIntercept) );
// User::LeaveIfError( RegisterIntercept(EFsFileReplace, EPostIntercept) );
User::LeaveIfError( RegisterIntercept(EFsReplace, EPostIntercept) );
+ User::LeaveIfError( RegisterIntercept(EFsMkDir, EPostIntercept) );
+ User::LeaveIfError( RegisterIntercept(EFsRmDir, EPostIntercept) );
// User::LeaveIfError( RegisterIntercept(EFsFileModified, EPostIntercept) );
User::LeaveIfError( RegisterIntercept(EFsFileSetModified, EPostIntercept) );
User::LeaveIfError( RegisterIntercept(EFsFileSubClose, EPostIntercept) );
@@ -106,6 +118,7 @@
//
void CFastFindFileServerPlugin::DisableL()
{
+ OstTrace0( TRACE_NORMAL, CFASTFINDFILESERVERPLUGIN_DISABLEL, "CFastFindFileServerPlugin::DisableL()" );
WRITELOG( "CFastFindFileServerPlugin::DisableL()" );
User::LeaveIfError( UnregisterIntercept(EFsFileCreate, EPrePostIntercept) );
User::LeaveIfError( UnregisterIntercept(EFsFileRename, EPrePostIntercept) );
@@ -113,6 +126,8 @@
User::LeaveIfError( UnregisterIntercept(EFsDelete, EPrePostIntercept) );
// User::LeaveIfError( UnregisterIntercept(EFsFileReplace, EPrePostIntercept) );
User::LeaveIfError( UnregisterIntercept(EFsReplace, EPrePostIntercept) );
+ User::LeaveIfError( UnregisterIntercept(EFsMkDir, EPrePostIntercept) );
+ User::LeaveIfError( UnregisterIntercept(EFsRmDir, EPrePostIntercept) );
// User::LeaveIfError( UnregisterIntercept(EFsFileModified, EPrePostIntercept) );
User::LeaveIfError( UnregisterIntercept(EFsFileSetModified, EPrePostIntercept) );
User::LeaveIfError( UnregisterIntercept(EFsFileSubClose, EPrePostIntercept) );
@@ -132,6 +147,7 @@
//
void CFastFindFileServerPlugin::AddConnection()
{
+ OstTrace0( TRACE_NORMAL, CFASTFINDFILESERVERPLUGIN_ADDCONNECTION, "CFastFindFileServerPlugin::AddConnection()" );
WRITELOG( "CFastFindFileServerPlugin::AddConnection()" );
++iConnectionCount;
@@ -143,6 +159,7 @@
//
void CFastFindFileServerPlugin::RemoveConnection()
{
+ OstTrace0( TRACE_NORMAL, CFASTFINDFILESERVERPLUGIN_REMOVECONNECTION, "CFastFindFileServerPlugin::RemoveConnection()" );
WRITELOG( "CFastFindFileServerPlugin::RemoveConnection()" );
--iConnectionCount;
@@ -150,6 +167,7 @@
// remove notification request if this was last connection
if ( iConnectionCount <= 0 )
{
+ OstTrace0( TRACE_NORMAL, DUP1_CFASTFINDFILESERVERPLUGIN_REMOVECONNECTION, "CFastFindFileServerPlugin::RemoveConnection() last connection" );
WRITELOG( "CFastFindFileServerPlugin::RemoveConnection() last connection" );
iNotification = NULL;
@@ -162,6 +180,7 @@
//
TInt CFastFindFileServerPlugin::DoRequestL( TFsPluginRequest& aRequest )
{
+ OstTraceFunctionEntry0( CFASTFINDFILESERVERPLUGIN_DOREQUESTL_ENTRY );
TInt err = KErrNone;
TInt function = aRequest.Function();
const TBool formatFunction = function == EFsFormatOpen || function == EFsFormatSubClose;
@@ -172,9 +191,11 @@
if ( function == EFsFileSubClose && iCreatedFiles.Count() == 0 )
{
+ OstTraceFunctionExit0( CFASTFINDFILESERVERPLUGIN_DOREQUESTL_EXIT );
return KErrNone;
}
+ OstTrace1( TRACE_NORMAL, CFASTFINDFILESERVERPLUGIN_DOREQUESTL, "CFastFindFileServerPlugin::DoRequestL;Plugin function=%d", function );
WRITELOG1( "----- CFastFindFileServerPlugin::DoRequestL() - plugin function: %d -----", function );
TFileName fileName;
@@ -185,8 +206,25 @@
if ( !formatFunction )
{
GetName( &aRequest, fileName );
+ OstTraceExt1( TRACE_NORMAL, DUP1_CFASTFINDFILESERVERPLUGIN_DOREQUESTL, "CFastFindFileServerPlugin::DoRequestL;Filename=%S", fileName );
WRITELOG1( "CFastFindFileServerPlugin::DoRequestL() - fileName: %S", &fileName );
}
+
+ if ( function == EFsMkDir || function == EFsRmDir)
+ {
+ // This will return the folder path with trailing slash, remove it to match
+ // with the doc_id format
+ TFileName filePath;
+ GetPath(&aRequest, filePath);
+ if (filePath.Length() > 0)
+ {
+ TPtrC temppath( filePath.Left( filePath.Length() - 1 ) );
+ fileName.Zero();
+ fileName.Append(temppath);
+ }
+ OstTraceExt1( TRACE_NORMAL, DUP2_CFASTFINDFILESERVERPLUGIN_DOREQUESTL, "CFastFindFileServerPlugin::DoRequestL;Filename=%S", fileName );
+ WRITELOG1( "CFastFindFileServerPlugin::DoRequestL() - fileName: %S", &fileName );
+ }
// get process id
TUid processId = { 0 };
@@ -211,15 +249,20 @@
if ( function == EFsRename || function == EFsFileRename || function == EFsReplace )
{
GetNewName( &aRequest, newFileName );
+ OstTraceExt1( TRACE_NORMAL, DUP3_CFASTFINDFILESERVERPLUGIN_DOREQUESTL, "CFastFindFileServerPlugin::DoRequestL;New Filename=%S", newFileName );
WRITELOG1( "CFastFindFileServerPlugin::DoRequestL() - newFileName: %S", &newFileName );
if ( !CheckPath(newFileName) )
{
+ OstTrace0( TRACE_NORMAL, DUP4_CFASTFINDFILESERVERPLUGIN_DOREQUESTL, "CFastFindFileServerPlugin::DoRequestL() - path not supported" );
WRITELOG( "CFastFindFileServerPlugin::DoRequestL() - path not supported" );
+ OstTraceFunctionExit0( DUP1_CFASTFINDFILESERVERPLUGIN_DOREQUESTL_EXIT );
return KErrNone;
}
if ( !CheckAttribs(newFileName) )
{
+ OstTrace0( TRACE_NORMAL, DUP5_CFASTFINDFILESERVERPLUGIN_DOREQUESTL, "CFastFindFileServerPlugin::DoRequestL() - attribute check failed" );
WRITELOG( "CFastFindFileServerPlugin::DoRequestL() - attribute check failed" );
+ OstTraceFunctionExit0( DUP2_CFASTFINDFILESERVERPLUGIN_DOREQUESTL_EXIT );
return KErrNone;
}
}
@@ -227,13 +270,17 @@
{
if ( !CheckPath(fileName) )
{
+ OstTrace0( TRACE_NORMAL, DUP6_CFASTFINDFILESERVERPLUGIN_DOREQUESTL, "CFastFindFileServerPlugin::DoRequestL() - path not supported" );
WRITELOG( "CFastFindFileServerPlugin::DoRequestL() - path not supported" );
+ OstTraceFunctionExit0( DUP3_CFASTFINDFILESERVERPLUGIN_DOREQUESTL_EXIT );
return KErrNone;
}
if ( !CheckAttribs(fileName) )
{
+ OstTrace0( TRACE_NORMAL, DUP7_CFASTFINDFILESERVERPLUGIN_DOREQUESTL, "CFastFindFileServerPlugin::DoRequestL() - attribute check failed" );
WRITELOG( "CFastFindFileServerPlugin::DoRequestL() - attribute check failed" );
+ OstTraceFunctionExit0( DUP4_CFASTFINDFILESERVERPLUGIN_DOREQUESTL_EXIT );
return KErrNone;
}
}
@@ -241,12 +288,14 @@
TInt fileEventType = EFastFindFileUnknown;
TInt drvNumber = aRequest.DriveNumber();
+ OstTrace1( TRACE_NORMAL, DUP8_CFASTFINDFILESERVERPLUGIN_DOREQUESTL, "CFastFindFileServerPlugin::DoRequestL;Drive Number=%d", drvNumber );
WRITELOG1( "CFastFindFileServerPlugin::DoRequestL() - drive number: %d", drvNumber );
switch( function )
{
case EFsFileCreate:
{
+ OstTrace0( TRACE_NORMAL, DUP9_CFASTFINDFILESERVERPLUGIN_DOREQUESTL, "CFastFindFileServerPlugin::DoRequestL() - EFsFileCreate" );
WRITELOG( "CFastFindFileServerPlugin::DoRequestL() - EFsFileCreate" );
TFileName* fn = new (ELeave) TFileName;
@@ -254,11 +303,13 @@
fn->Copy( fileName );
iCreatedFiles.Append( fn );
User::LeaveIfError( UnregisterIntercept(EFsFileSetModified, EPrePostIntercept) );
+ OstTraceFunctionExit0( DUP5_CFASTFINDFILESERVERPLUGIN_DOREQUESTL_EXIT );
return KErrNone;
}
case EFsFileSubClose:
{
+ OstTrace0( TRACE_NORMAL, DUP10_CFASTFINDFILESERVERPLUGIN_DOREQUESTL, "CFastFindFileServerPlugin::DoRequestL() - EFsFileSubClose" );
WRITELOG( "CFastFindFileServerPlugin::DoRequestL() - EFsFileSubClose" );
TBool found = EFalse;
@@ -278,6 +329,7 @@
if ( !found )
{
+ OstTraceFunctionExit0( DUP6_CFASTFINDFILESERVERPLUGIN_DOREQUESTL_EXIT );
return KErrNone;
}
}
@@ -285,32 +337,38 @@
case EFsRename:
{
+ OstTraceExt1( TRACE_NORMAL, DUP11_CFASTFINDFILESERVERPLUGIN_DOREQUESTL, "CFastFindFileServerPlugin::DoRequestL() - EFsRenamed;New Filename=%S", newFileName );
WRITELOG1( "CFastFindFileServerPlugin::DoRequestL() - EFsRenamed, new file: %S", &newFileName );
fileEventType = EFastFindFileRenamed;
}
break;
case EFsFileRename:
+ OstTraceExt1( TRACE_NORMAL, DUP12_CFASTFINDFILESERVERPLUGIN_DOREQUESTL, "CFastFindFileServerPlugin::DoRequestL() - EFsFileRenamed;New Filename=%S", newFileName );
WRITELOG1( "CFastFindFileServerPlugin::DoRequestL() - EFsFileRenamed, new file: %S", &newFileName );
fileEventType = EFastFindFileRenamed;
break;
case EFsFileSetModified:
+ OstTrace0( TRACE_NORMAL, DUP13_CFASTFINDFILESERVERPLUGIN_DOREQUESTL, "CFastFindFileServerPlugin::DoRequestL() - EFsFileModified" );
WRITELOG( "CFastFindFileServerPlugin::DoRequestL() - EFsFileModified" );
fileEventType = EFastFindFileModified;
break;
case EFsReplace:
+ OstTraceExt1( TRACE_NORMAL, DUP14_CFASTFINDFILESERVERPLUGIN_DOREQUESTL, "CFastFindFileServerPlugin::DoRequestL() - EFsReplace;New Filename=%S", newFileName );
WRITELOG1( "CFastFindFileServerPlugin::DoRequestL() - EFsReplace, new file: %S", &newFileName );
fileEventType = EFastFindFileReplaced;
break;
case EFsDelete:
+ OstTrace0( TRACE_NORMAL, DUP15_CFASTFINDFILESERVERPLUGIN_DOREQUESTL, "CFastFindFileServerPlugin::DoRequestL() - EFsDelete" );
WRITELOG( "CFastFindFileServerPlugin::DoRequestL() - EFsDelete" );
fileEventType = EFastFindFileDeleted;
break;
case EFsFormatOpen:
+ OstTrace0( TRACE_NORMAL, DUP16_CFASTFINDFILESERVERPLUGIN_DOREQUESTL, "CFastFindFileServerPlugin::DoRequestL() - EFsFormatOpen" );
WRITELOG( "CFastFindFileServerPlugin::DoRequestL() - EFsFormatOpen" );
// get the drive letter
iFormatDriveNumber = drvNumber;
@@ -320,9 +378,11 @@
break;
case EFsFormatSubClose:
+ OstTrace0( TRACE_NORMAL, DUP17_CFASTFINDFILESERVERPLUGIN_DOREQUESTL, "CFastFindFileServerPlugin::DoRequestL() - EFsFormatSubClose" );
WRITELOG( "CFastFindFileServerPlugin::DoRequestL() - EFsFormatSubClose" );
if ( iFormatDriveNumber < 0 )
{
+ OstTraceFunctionExit0( DUP7_CFASTFINDFILESERVERPLUGIN_DOREQUESTL_EXIT );
return KErrNone;
}
drvNumber = iFormatDriveNumber;
@@ -333,14 +393,30 @@
processId.iUid = 1;
}
break;
-
+
+ case EFsMkDir:
+ OstTrace0( TRACE_NORMAL, DUP18_CFASTFINDFILESERVERPLUGIN_DOREQUESTL, "CFastFindFileServerPlugin::DoRequestL() - EFsMkDir" );
+ WRITELOG( "CFastFindFileServerPlugin::DoRequestL() - EFsMkDir" );
+ fileEventType = EFastFindDirCreated;
+
+ break;
+
+ case EFsRmDir:
+ OstTrace0( TRACE_NORMAL, DUP19_CFASTFINDFILESERVERPLUGIN_DOREQUESTL, "CFastFindFileServerPlugin::DoRequestL() - EFsRmDir" );
+ WRITELOG( "CFastFindFileServerPlugin::DoRequestL() - EFsRmDir" );
+ fileEventType = EFastFindDirDeleted;
+ break;
+
default:
+ OstTrace0( TRACE_NORMAL, DUP20_CFASTFINDFILESERVERPLUGIN_DOREQUESTL, "CFastFindFileServerPlugin::DoRequestL() - Unknown function" );
WRITELOG( "CFastFindFileServerPlugin::DoRequestL() - Unknown function" );
+ OstTraceFunctionExit0( DUP8_CFASTFINDFILESERVERPLUGIN_DOREQUESTL_EXIT );
return KErrNone;
}
if ( iNotification )
{
+ OstTrace0( TRACE_NORMAL, DUP21_CFASTFINDFILESERVERPLUGIN_DOREQUESTL, "CFastFindFileServerPlugin::DoRequestL() - iNotification found" );
WRITELOG( "CFastFindFileServerPlugin::DoRequestL() - iNotification found" );
TFastFindFSPStatusPckg clientStatusBuf;
TFastFindFSPStatus& clientStatus = clientStatusBuf();
@@ -356,10 +432,12 @@
TRAP( err, iNotification->WriteParam1L(clientStatusBuf) );
iNotification->Complete( err );
iNotification = NULL;
+ OstTrace0( TRACE_NORMAL, DUP22_CFASTFINDFILESERVERPLUGIN_DOREQUESTL, "CFastFindFileServerPlugin::DoRequestL() - iNotification complete" );
WRITELOG( "CFastFindFileServerPlugin::DoRequestL() - iNotification complete" );
}
else // no notification ready, put in the queue
{
+ OstTrace0( TRACE_NORMAL, DUP23_CFASTFINDFILESERVERPLUGIN_DOREQUESTL, "CFastFindFileServerPlugin::DoRequestL() - iNotification not found. Put in the queue" );
WRITELOG( "CFastFindFileServerPlugin::DoRequestL() - iNotification not found. Put in the queue" );
TFastFindFSPStatus* clientStatus = new (ELeave) TFastFindFSPStatus;
@@ -374,10 +452,12 @@
iQueue.Append( clientStatus ); // owenership is transferred
err = KErrNone;
+ OstTrace0( TRACE_NORMAL, DUP24_CFASTFINDFILESERVERPLUGIN_DOREQUESTL, "CFastFindFileServerPlugin::DoRequestL() - added to queue" );
WRITELOG( "CFastFindFileServerPlugin::DoRequestL() - added to queue" );
}
WRITELOG( "CFastFindFileServerPlugin::DoRequestL() - return" );
+ OstTraceFunctionExit0( DUP9_CFASTFINDFILESERVERPLUGIN_DOREQUESTL_EXIT );
return err;
}
@@ -409,6 +489,7 @@
CFastFindFileServerPluginConn* CFastFindFileServerPluginConn::NewL(
CFastFindFileServerPlugin& aPlugin )
{
+ OstTrace0( TRACE_NORMAL, CFASTFINDFILESERVERPLUGINCONN_NEWL, "CFastFindFileServerPluginConn::NewL()" );
WRITELOG( "CFastFindFileServerPluginConn::NewL()" );
return new (ELeave) CFastFindFileServerPluginConn( aPlugin );
}
@@ -422,6 +503,7 @@
CFastFindFileServerPlugin& aPlugin )
: iPlugin( aPlugin )
{
+ OstTrace0( TRACE_NORMAL, CFASTFINDFILESERVERPLUGINCONN_CFASTFINDFILESERVERPLUGINCONN, "CFastFindFileServerPluginConn::CFastFindFileServerPluginConn()" );
WRITELOG( "CFastFindFileServerPluginConn::CFastFindFileServerPluginConn()" );
iPlugin.AddConnection();
@@ -434,6 +516,7 @@
*/
CFastFindFileServerPluginConn::~CFastFindFileServerPluginConn()
{
+ OstTrace0( TRACE_NORMAL, DUP1_CFASTFINDFILESERVERPLUGINCONN_CFASTFINDFILESERVERPLUGINCONN, "CFastFindFileServerPluginConn::~CFastFindFileServerPluginConn()" );
WRITELOG( "CFastFindFileServerPluginConn::~CFastFindFileServerPluginConn()" );
iPlugin.RemoveConnection();
@@ -445,6 +528,7 @@
//
TInt CFastFindFileServerPluginConn::DoControl( CFsPluginConnRequest& aRequest )
{
+ OstTrace0( TRACE_NORMAL, CFASTFINDFILESERVERPLUGINCONN_DOCONTROL, "CFastFindFileServerPluginConn::DoControl()" );
WRITELOG( "CFastFindFileServerPluginConn::DoControl()" );
TInt err = KErrNotSupported;
@@ -454,6 +538,7 @@
{
case EFastFindFSPOpEnable:
{
+ OstTrace0( TRACE_NORMAL, DUP1_CFASTFINDFILESERVERPLUGINCONN_DOCONTROL, "CFastFindFileServerPluginConn::DoControl() - EFastFindFSPOpEnable" );
WRITELOG( "CFastFindFileServerPluginConn::DoControl() - EFastFindFSPOpEnable" );
TRAP( err, myPlugin.EnableL() );
break;
@@ -461,6 +546,7 @@
case EFastFindFSPOpDisable:
{
+ OstTrace0( TRACE_NORMAL, DUP2_CFASTFINDFILESERVERPLUGINCONN_DOCONTROL, "CFastFindFileServerPluginConn::DoControl() - EFastFindFSPOpDisable" );
WRITELOG( "CFastFindFileServerPluginConn::DoControl() - EFastFindFSPOpDisable" );
TRAP( err, myPlugin.DisableL() );
break;
@@ -468,6 +554,7 @@
default:
{
+ OstTrace0( TRACE_NORMAL, DUP3_CFASTFINDFILESERVERPLUGINCONN_DOCONTROL, "CFastFindFileServerPluginConn::DoControl() - Unknown Control" );
WRITELOG( "CFastFindFileServerPluginConn::DoControl() - Unknown Control" );
break;
}
@@ -483,6 +570,7 @@
//
void CFastFindFileServerPluginConn::DoRequest( CFsPluginConnRequest& aRequest )
{
+ OstTraceFunctionEntry0( CFASTFINDFILESERVERPLUGINCONN_DOREQUEST_ENTRY );
WRITELOG( "CFastFindFileServerPluginConn::DoRequest()" );
CFastFindFileServerPlugin& myPlugin = *(CFastFindFileServerPlugin*)Plugin();
@@ -490,6 +578,7 @@
{
case EFastFindFSPOpRegisterNotification:
{
+ OstTrace0( TRACE_NORMAL, CFASTFINDFILESERVERPLUGINCONN_DOREQUEST, "CFastFindFileServerPluginConn::DoRequest() - EFastFindFSPOpRegisterNotification" );
WRITELOG( "CFastFindFileServerPluginConn::DoControl() - EFastFindFSPOpRegisterNotification" );
TInt err = myPlugin.RegisterNotification( aRequest );
@@ -502,6 +591,7 @@
case EFastFindFSPOpAddNotificationPath:
{
+ OstTrace0( TRACE_NORMAL, DUP1_CFASTFINDFILESERVERPLUGINCONN_DOREQUEST, "CFastFindFileServerPluginConn::DoRequest() - EFastFindFSPOpAddNotificationPath" );
WRITELOG( "CFastFindFileServerPluginConn::DoControl() - EFastFindFSPOpAddNotificationPath" );
TInt err = myPlugin.AddNotificationPath( aRequest );
aRequest.Complete( err );
@@ -510,6 +600,7 @@
case EFastFindFSPOpRemoveNotificationPath:
{
+ OstTrace0( TRACE_NORMAL, DUP2_CFASTFINDFILESERVERPLUGINCONN_DOREQUEST, "CFastFindFileServerPluginConn::DoRequest() - EFastFindFSPOpRemoveNotificationPath" );
WRITELOG( "CFastFindFileServerPluginConn::DoControl() - EFastFindFSPOpRemoveNotificationPath" );
TInt err = myPlugin.RemoveNotificationPath( aRequest );
aRequest.Complete( err );
@@ -518,6 +609,7 @@
case EFastFindFSPOpAddIgnorePath:
{
+ OstTrace0( TRACE_NORMAL, DUP3_CFASTFINDFILESERVERPLUGINCONN_DOREQUEST, "CFastFindFileServerPluginConn::DoRequest() - EFastFindFSPOpAddIgnorePath" );
WRITELOG( "CFastFindFileServerPluginConn::DoControl() - EFastFindFSPOpAddIgnorePath" );
TInt err = myPlugin.AddIgnorePath( aRequest );
aRequest.Complete( err );
@@ -526,12 +618,14 @@
case EFastFindFSPOpRemoveIgnorePath:
{
+ OstTrace0( TRACE_NORMAL, DUP4_CFASTFINDFILESERVERPLUGINCONN_DOREQUEST, "CFastFindFileServerPluginConn::DoRequest() - EFastFindFSPOpRemoveIgnorePath" );
WRITELOG( "CFastFindFileServerPluginConn::DoControl() - EFastFindFSPOpRemoveIgnorePath" );
TInt err = myPlugin.RemoveIgnorePath( aRequest );
aRequest.Complete( err );
break;
}
}
+ OstTraceFunctionExit0( CFASTFINDFILESERVERPLUGINCONN_DOREQUEST_EXIT );
}
//-----------------------------------------------------------------------------
@@ -540,6 +634,7 @@
//
void CFastFindFileServerPluginConn::DoCancel( TInt /*aReqMask*/ )
{
+ OstTrace0( TRACE_NORMAL, CFASTFINDFILESERVERPLUGINCONN_DOCANCEL, "CFastFindFileServerPluginConn::DoCancel()" );
WRITELOG( "CFastFindFileServerPluginConn::DoCancel()" );
iRequestQue.DoCancelAll( KErrCancel );
}
@@ -550,6 +645,7 @@
//
CFsPluginConn* CFastFindFileServerPlugin::NewPluginConnL()
{
+ OstTrace0( TRACE_NORMAL, CFASTFINDFILESERVERPLUGIN_NEWPLUGINCONNL, "CFastFindFileServerPluginConn::NewPluginConnL()" );
WRITELOG( "CFastFindFileServerPluginConn::NewPluginConnL()" );
return CFastFindFileServerPluginConn::NewL( *this );
}
@@ -560,6 +656,7 @@
//
TInt CFastFindFileServerPlugin::RegisterNotification( CFsPluginConnRequest& aRequest )
{
+ OstTrace0( TRACE_NORMAL, CFASTFINDFILESERVERPLUGIN_REGISTERNOTIFICATION, "CFastFindFileServerPlugin::RegisterNotification()" );
WRITELOG( "CFastFindFileServerPlugin::RegisterNotification()" );
if ( iNotification )
@@ -571,6 +668,7 @@
if ( iQueue.Count() > 0 )
{
+ OstTrace0( TRACE_NORMAL, DUP1_CFASTFINDFILESERVERPLUGIN_REGISTERNOTIFICATION, "CFastFindFileServerPlugin::RegisterNotification() - item in queue" );
WRITELOG( "CFastFindFileServerPlugin::RegisterNotification() - item in queue" );
TFastFindFSPStatus* queueStatus = iQueue[0];
@@ -602,6 +700,7 @@
//
TInt CFastFindFileServerPlugin::AddNotificationPath( CFsPluginConnRequest& aRequest )
{
+ OstTrace0( TRACE_NORMAL, CFASTFINDFILESERVERPLUGIN_ADDNOTIFICATIONPATH, "CFastFindFileServerPlugin::AddNotificationPath()" );
WRITELOG( "CFastFindFileServerPlugin::AddNotificationPath()" );
TInt err = KErrNone;
@@ -627,6 +726,7 @@
}
}
+ OstTraceExt1( TRACE_NORMAL, DUP1_CFASTFINDFILESERVERPLUGIN_ADDNOTIFICATIONPATH, "CFastFindFileServerPlugin::AddNotificationPath;add path=%S", status.iFileName );
WRITELOG1( "CFastFindFileServerPlugin::AddNotificationPath() - add path: %S", &status.iFileName );
TFileName* fn = new TFileName;
@@ -654,6 +754,7 @@
//
TInt CFastFindFileServerPlugin::RemoveNotificationPath( CFsPluginConnRequest& aRequest )
{
+ OstTraceFunctionEntry0( CFASTFINDFILESERVERPLUGIN_REMOVENOTIFICATIONPATH_ENTRY );
WRITELOG( "CFastFindFileServerPlugin::RemoveNotificationPath()" );
TInt err = KErrNone;
@@ -662,6 +763,7 @@
if ( err != KErrNone )
{
+ OstTraceFunctionExit0( CFASTFINDFILESERVERPLUGIN_REMOVENOTIFICATIONPATH_EXIT );
return err;
}
@@ -677,6 +779,7 @@
TFileName* tf = iPaths[i];
if ( tf->Compare(status.iFileName) == 0 )
{
+ OstTraceExt1( TRACE_NORMAL, CFASTFINDFILESERVERPLUGIN_REMOVENOTIFICATIONPATH, "CFastFindFileServerPlugin::RemoveNotificationPath;remove path=%S", status.iFileName );
WRITELOG1( "CFastFindFileServerPlugin::RemoveNotificationPath() - remove path: %S", &status.iFileName );
delete tf;
tf = NULL;
@@ -690,6 +793,7 @@
err = KErrNotFound;
}
+ OstTraceFunctionExit0( DUP1_CFASTFINDFILESERVERPLUGIN_REMOVENOTIFICATIONPATH_EXIT );
return err;
}
@@ -699,6 +803,7 @@
//
TInt CFastFindFileServerPlugin::AddIgnorePath( CFsPluginConnRequest& aRequest )
{
+ OstTraceFunctionEntry0( CFASTFINDFILESERVERPLUGIN_ADDIGNOREPATH_ENTRY );
WRITELOG( "CFastFindFileServerPlugin::AddIgnorePath()" );
TInt err = KErrNone;
@@ -707,6 +812,7 @@
if ( err != KErrNone )
{
+ OstTraceFunctionExit0( CFASTFINDFILESERVERPLUGIN_ADDIGNOREPATH_EXIT );
return err;
}
@@ -722,11 +828,13 @@
TFileName* tf = iIgnorePaths[i];
if( tf->Compare(status.iFileName) == 0 )
{
+ OstTraceFunctionExit0( DUP1_CFASTFINDFILESERVERPLUGIN_ADDIGNOREPATH_EXIT );
return KErrNone;
}
}
}
+ OstTraceExt1( TRACE_NORMAL, CFASTFINDFILESERVERPLUGIN_ADDIGNOREPATH, "CFastFindFileServerPlugin::AddIgnorePath;add path=%S", status.iFileName );
WRITELOG1( "CFastFindFileServerPlugin::AddIgnorePath() - add path: %S", &status.iFileName );
TFileName* fn = new TFileName;
@@ -745,6 +853,7 @@
err = KErrNotFound;
}
+ OstTraceFunctionExit0( DUP2_CFASTFINDFILESERVERPLUGIN_ADDIGNOREPATH_EXIT );
return err;
}
@@ -754,6 +863,7 @@
//
TInt CFastFindFileServerPlugin::RemoveIgnorePath( CFsPluginConnRequest& aRequest )
{
+ OstTraceFunctionEntry0( CFASTFINDFILESERVERPLUGIN_REMOVEIGNOREPATH_ENTRY );
WRITELOG( "CFastFindFileServerPlugin::RemoveIgnorePath()" );
TInt err = KErrNone;
@@ -762,6 +872,7 @@
if ( err != KErrNone )
{
+ OstTraceFunctionExit0( CFASTFINDFILESERVERPLUGIN_REMOVEIGNOREPATH_EXIT );
return err;
}
@@ -777,6 +888,7 @@
TFileName* tf = iIgnorePaths[i];
if ( tf->Compare(status.iFileName) == 0 )
{
+ OstTraceExt1( TRACE_NORMAL, CFASTFINDFILESERVERPLUGIN_REMOVEIGNOREPATH, "CFastFindFileServerPlugin::RemoveIgnorePath;remove path=%S", status.iFileName );
WRITELOG1( "CFastFindFileServerPlugin::RemoveIgnorePath() - remove path: %S", &status.iFileName );
delete tf;
tf = NULL;
@@ -790,6 +902,7 @@
err = KErrNotFound;
}
+ OstTraceFunctionExit0( DUP1_CFASTFINDFILESERVERPLUGIN_REMOVEIGNOREPATH_EXIT );
return err;
}
@@ -898,6 +1011,7 @@
// @internalComponent
CFastFindFileServerPluginFactory::CFastFindFileServerPluginFactory()
{
+ OstTrace0( TRACE_NORMAL, CFASTFINDFILESERVERPLUGINFACTORY_CFASTFINDFILESERVERPLUGINFACTORY, "CFastFindFileServerPluginFactory::CFastFindFileServerPluginFactory()" );
WRITELOG( "CFastFindFileServerPluginFactory::CFastFindFileServerPluginFactory()" );
}
@@ -905,6 +1019,7 @@
// @internalComponent
TInt CFastFindFileServerPluginFactory::Install()
{
+ OstTrace0( TRACE_NORMAL, CFASTFINDFILESERVERPLUGINFACTORY_INSTALL, "CFastFindFileServerPluginFactory::Install()" );
WRITELOG( "CFastFindFileServerPluginFactory::Install()" );
iSupportedDrives = KPluginAutoAttach;
@@ -914,6 +1029,7 @@
// @internalComponent
TInt CFastFindFileServerPluginFactory::UniquePosition()
{
+ OstTrace0( TRACE_NORMAL, CFASTFINDFILESERVERPLUGINFACTORY_UNIQUEPOSITION, "CFastFindFileServerPluginFactory::UniquePosition()" );
WRITELOG( "CFastFindFileServerPluginFactory::UniquePosition()" );
return( KFastFindFSPluginPosition );
}
@@ -922,6 +1038,7 @@
// @internalComponent
CFsPlugin* CFastFindFileServerPluginFactory::NewPluginL()
{
+ OstTrace0( TRACE_NORMAL, CFASTFINDFILESERVERPLUGINFACTORY_NEWPLUGINL, "CFastFindFileServerPluginFactory::NewPluginL()" );
WRITELOG( "CFastFindFileServerPluginFactory::NewPluginL()" );
return CFastFindFileServerPlugin::NewL();
}
@@ -932,6 +1049,7 @@
{
EXPORT_C CFsPluginFactory* CreateFileSystem()
{
+ OstTrace0( TRACE_NORMAL, DUP1_CFASTFINDFILESERVERPLUGINFACTORY_NEWPLUGINL, "CFastFindFileServerPluginFactory::CreateFileSystem" );
WRITELOG( "CFastFindFileServerPluginFactory::CreateFileSystem" );
return( new CFastFindFileServerPluginFactory() );
}
@@ -958,6 +1076,8 @@
User::LeaveIfError( RegisterIntercept( EFsFileSize, EPreIntercept) );
User::LeaveIfError( RegisterIntercept( EFsFileRename, EPreIntercept) );
User::LeaveIfError( RegisterIntercept( EFsRename, EPreIntercept) );
+ User::LeaveIfError( RegisterIntercept( EFsMkDir, EPrePostIntercept) );
+ User::LeaveIfError( RegisterIntercept( EFsRmDir, EPrePostIntercept) );
User::LeaveIfError( RegisterIntercept( EFsFileOpen, EPreIntercept) );
User::LeaveIfError( RegisterIntercept( EFsFileTemp, EPreIntercept) );
User::LeaveIfError( RegisterIntercept( EFsFileUnLock, EPreIntercept) );
@@ -992,6 +1112,8 @@
User::LeaveIfError( UnregisterIntercept( EFsFileSize, EPrePostIntercept) );
User::LeaveIfError( UnregisterIntercept( EFsFileRename, EPrePostIntercept) );
User::LeaveIfError( UnregisterIntercept( EFsRename, EPrePostIntercept) );
+ User::LeaveIfError( UnregisterIntercept( EFsMkDir, EPrePostIntercept) );
+ User::LeaveIfError( UnregisterIntercept( EFsRmDir, EPrePostIntercept) );
User::LeaveIfError( UnregisterIntercept( EFsFileOpen, EPrePostIntercept) );
User::LeaveIfError( UnregisterIntercept( EFsFileTemp, EPrePostIntercept) );
User::LeaveIfError( UnregisterIntercept( EFsFileUnLock, EPrePostIntercept) );
@@ -1016,88 +1138,123 @@
switch ( aFunction )
{
case EFsFileDuplicate:
+ OstTrace0( TRACE_NORMAL, CFASTFINDFILESERVERPLUGIN_PRINTDEBUGEVENTS, "CFastFindFileServerPlugin::PrintDebugEvents() - EFsFileDuplicate" );
WRITELOG( "CFastFindFileServerPlugin::PrintDebugEvents() - EFsFileDuplicate" );
- break;
-
+ break;
case EFsFileCreate:
+ OstTrace0( TRACE_NORMAL, DUP1_CFASTFINDFILESERVERPLUGIN_PRINTDEBUGEVENTS, "CFastFindFileServerPlugin::PrintDebugEvents() - EFsFileCreate" );
WRITELOG( "CFastFindFileServerPlugin::PrintDebugEvents() - EFsFileCreate" );
break;
case EFsFileWrite:
+ OstTrace0( TRACE_NORMAL, DUP2_CFASTFINDFILESERVERPLUGIN_PRINTDEBUGEVENTS, "CFastFindFileServerPlugin::PrintDebugEvents() - EFsFileWrite" );
WRITELOG( "CFastFindFileServerPlugin::PrintDebugEvents() - EFsFileWrite" );
break;
case EFsFileFlush:
+ OstTrace0( TRACE_NORMAL, DUP3_CFASTFINDFILESERVERPLUGIN_PRINTDEBUGEVENTS, "CFastFindFileServerPlugin::PrintDebugEvents() - EFsFileFlush" );
WRITELOG( "CFastFindFileServerPlugin::PrintDebugEvents() - EFsFileFlush" );
break;
case EFsFileSetAtt:
+ OstTrace0( TRACE_NORMAL, DUP4_CFASTFINDFILESERVERPLUGIN_PRINTDEBUGEVENTS, "CFastFindFileServerPlugin::PrintDebugEvents() - EFsFileSetAtt" );
WRITELOG( "CFastFindFileServerPlugin::PrintDebugEvents() - EFsFileSetAtt" );
break;
case EFsFileChangeMode:
+ OstTrace0( TRACE_NORMAL, DUP5_CFASTFINDFILESERVERPLUGIN_PRINTDEBUGEVENTS, "CFastFindFileServerPlugin::PrintDebugEvents() - EFsFileChangeMode" );
WRITELOG( "CFastFindFileServerPlugin::PrintDebugEvents() - EFsFileChangeMode" );
break;
case EFsDelete:
+ OstTrace0( TRACE_NORMAL, DUP6_CFASTFINDFILESERVERPLUGIN_PRINTDEBUGEVENTS, "CFastFindFileServerPlugin::PrintDebugEvents() - EFsDelete" );
WRITELOG( "CFastFindFileServerPlugin::PrintDebugEvents() - EFsDelete" );
break;
case EFsFileAdopt:
+ OstTrace0( TRACE_NORMAL, DUP7_CFASTFINDFILESERVERPLUGIN_PRINTDEBUGEVENTS, "CFastFindFileServerPlugin::PrintDebugEvents() - EFsFileAdopt" );
WRITELOG( "CFastFindFileServerPlugin::PrintDebugEvents() - EFsFileAdopt" );
break;
case EFsFileReplace:
+ OstTrace0( TRACE_NORMAL, DUP8_CFASTFINDFILESERVERPLUGIN_PRINTDEBUGEVENTS, "CFastFindFileServerPlugin::PrintDebugEvents() - EFsFileReplace" );
WRITELOG( "CFastFindFileServerPlugin::PrintDebugEvents() - EFsFileReplace" );
break;
case EFsFileLock:
+ OstTrace0( TRACE_NORMAL, DUP9_CFASTFINDFILESERVERPLUGIN_PRINTDEBUGEVENTS, "CFastFindFileServerPlugin::PrintDebugEvents() - EFsFileLock" );
WRITELOG( "CFastFindFileServerPlugin::PrintDebugEvents() - EFsFileLock" );
break;
case EFsFileSize:
+ OstTrace0( TRACE_NORMAL, DUP10_CFASTFINDFILESERVERPLUGIN_PRINTDEBUGEVENTS, "CFastFindFileServerPlugin::PrintDebugEvents() - EFsFileSize" );
WRITELOG( "CFastFindFileServerPlugin::PrintDebugEvents() - EFsFileSize" );
break;
case EFsFileModified:
+ OstTrace0( TRACE_NORMAL, DUP11_CFASTFINDFILESERVERPLUGIN_PRINTDEBUGEVENTS, "CFastFindFileServerPlugin::PrintDebugEvents() - EFsFileModified" );
WRITELOG( "CFastFindFileServerPlugin::PrintDebugEvents() - EFsFileModified" );
break;
case EFsFileRename:
+ OstTrace0( TRACE_NORMAL, DUP12_CFASTFINDFILESERVERPLUGIN_PRINTDEBUGEVENTS, "CFastFindFileServerPlugin::PrintDebugEvents() - EFsFileRename" );
WRITELOG( "CFastFindFileServerPlugin::PrintDebugEvents() - EFsFileRename" );
break;
case EFsRename:
+ OstTrace0( TRACE_NORMAL, DUP13_CFASTFINDFILESERVERPLUGIN_PRINTDEBUGEVENTS, "CFastFindFileServerPlugin::PrintDebugEvents() - EFsRename" );
WRITELOG( "CFastFindFileServerPlugin::PrintDebugEvents() - EFsRename" );
- break;
+ break;
+ case EFsMkDir:
+ OstTrace0( TRACE_NORMAL, DUP14_CFASTFINDFILESERVERPLUGIN_PRINTDEBUGEVENTS, "CFastFindFileServerPlugin::PrintDebugEvents() - EFsMkDir" );
+ WRITELOG( "CFastFindFileServerPlugin::PrintDebugEvents() - EFsMkDir" );
+ break;
+ case EFsRmDir:
+ OstTrace0( TRACE_NORMAL, DUP15_CFASTFINDFILESERVERPLUGIN_PRINTDEBUGEVENTS, "CFastFindFileServerPlugin::PrintDebugEvents() - EFsRmDir" );
+ WRITELOG( "CFastFindFileServerPlugin::PrintDebugEvents() - EFsRmDir" );
+ break;
case EFsFileOpen:
+ OstTrace0( TRACE_NORMAL, DUP16_CFASTFINDFILESERVERPLUGIN_PRINTDEBUGEVENTS, "CFastFindFileServerPlugin::PrintDebugEvents() - EFsFileOpen" );
WRITELOG( "CFastFindFileServerPlugin::PrintDebugEvents() - EFsFileOpen" );
break;
case EFsFileTemp:
+ OstTrace0( TRACE_NORMAL, DUP17_CFASTFINDFILESERVERPLUGIN_PRINTDEBUGEVENTS, "CFastFindFileServerPlugin::PrintDebugEvents() - EFsFileTemp" );
WRITELOG( "CFastFindFileServerPlugin::PrintDebugEvents() - EFsFileTemp" );
break;
case EFsFileUnLock:
+ OstTrace0( TRACE_NORMAL, DUP18_CFASTFINDFILESERVERPLUGIN_PRINTDEBUGEVENTS, "CFastFindFileServerPlugin::PrintDebugEvents() - EFsFileUnLock" );
WRITELOG( "CFastFindFileServerPlugin::PrintDebugEvents() - EFsFileUnLock" );
break;
case EFsFileSetSize:
+ OstTrace0( TRACE_NORMAL, DUP19_CFASTFINDFILESERVERPLUGIN_PRINTDEBUGEVENTS, "CFastFindFileServerPlugin::PrintDebugEvents() - EFsFileSetSize" );
WRITELOG( "CFastFindFileServerPlugin::PrintDebugEvents() - EFsFileSetSize" );
break;
case EFsFileSetModified:
+ OstTrace0( TRACE_NORMAL, DUP20_CFASTFINDFILESERVERPLUGIN_PRINTDEBUGEVENTS, "CFastFindFileServerPlugin::PrintDebugEvents() - EFsFileSetModified" );
WRITELOG( "CFastFindFileServerPlugin::PrintDebugEvents() - EFsFileSetModified" );
break;
case EFsFileDrive:
+ OstTrace0( TRACE_NORMAL, DUP21_CFASTFINDFILESERVERPLUGIN_PRINTDEBUGEVENTS, "CFastFindFileServerPlugin::PrintDebugEvents() - EFsFileDrive" );
WRITELOG( "CFastFindFileServerPlugin::PrintDebugEvents() - EFsFileDrive" );
break;
case EFsReplace:
+ OstTrace0( TRACE_NORMAL, DUP22_CFASTFINDFILESERVERPLUGIN_PRINTDEBUGEVENTS, "CFastFindFileServerPlugin::PrintDebugEvents() - EFsReplace" );
WRITELOG( "CFastFindFileServerPlugin::PrintDebugEvents() - EFsReplace" );
break;
case EFsFileSubClose:
+ OstTrace0( TRACE_NORMAL, DUP23_CFASTFINDFILESERVERPLUGIN_PRINTDEBUGEVENTS, "CFastFindFileServerPlugin::PrintDebugEvents() - EFsFileSubClose" );
WRITELOG( "CFastFindFileServerPlugin::PrintDebugEvents() - EFsFileSubClose" );
break;
case EFsFileRead:
+ OstTrace0( TRACE_NORMAL, DUP24_CFASTFINDFILESERVERPLUGIN_PRINTDEBUGEVENTS, "CFastFindFileServerPlugin::PrintDebugEvents() - EFsFileRead" );
WRITELOG( "CFastFindFileServerPlugin::PrintDebugEvents() - EFsFileRead" );
break;
case EFsFileSeek:
+ OstTrace0( TRACE_NORMAL, DUP25_CFASTFINDFILESERVERPLUGIN_PRINTDEBUGEVENTS, "CFastFindFileServerPlugin::PrintDebugEvents() - EFsFileSeek" );
WRITELOG( "CFastFindFileServerPlugin::PrintDebugEvents() - EFsFileSeek" );
break;
case EFsFileAtt:
+ OstTrace0( TRACE_NORMAL, DUP26_CFASTFINDFILESERVERPLUGIN_PRINTDEBUGEVENTS, "CFastFindFileServerPlugin::PrintDebugEvents() - EFsFileAtt" );
WRITELOG( "CFastFindFileServerPlugin::PrintDebugEvents() - EFsFileAtt" );
break;
case EFsFileSet:
+ OstTrace0( TRACE_NORMAL, DUP27_CFASTFINDFILESERVERPLUGIN_PRINTDEBUGEVENTS, "CFastFindFileServerPlugin::PrintDebugEvents() - EFsFileSet" );
WRITELOG( "CFastFindFileServerPlugin::PrintDebugEvents() - EFsFileSet" );
break;
case EFsFileName:
+ OstTrace0( TRACE_NORMAL, DUP28_CFASTFINDFILESERVERPLUGIN_PRINTDEBUGEVENTS, "CFastFindFileServerPlugin::PrintDebugEvents() - EFsFileName" );
WRITELOG( "CFastFindFileServerPlugin::PrintDebugEvents() - EFsFileName" );
break;
case EFsDirOpen:
+ OstTrace0( TRACE_NORMAL, DUP29_CFASTFINDFILESERVERPLUGIN_PRINTDEBUGEVENTS, "CFastFindFileServerPlugin::PrintDebugEvents() - EFsDirOpen" );
WRITELOG( "CFastFindFileServerPlugin::PrintDebugEvents() - EFsDirOpen" );
break;
default: