diff -r a179b74831c9 -r c1f20ce4abcf userlibandfileserver/fileserver/sfile/sf_dir.cpp --- a/userlibandfileserver/fileserver/sfile/sf_dir.cpp Thu Aug 19 11:14:22 2010 +0300 +++ b/userlibandfileserver/fileserver/sfile/sf_dir.cpp Tue Aug 31 16:34:26 2010 +0300 @@ -17,6 +17,10 @@ #include "sf_std.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "sf_dirTraces.h" +#endif + LOCAL_C CDirCB* GetDirFromHandle(TInt aHandle,CSessionFs* aSession) // // Get the dir control block from its handle. @@ -52,19 +56,18 @@ { TEntry e; - TRACE1(UTF::EBorder, UTraceModuleFileSys::ECDirCBReadL, EF32TraceUidFileSys, &aDir); + OstTrace1(TRACE_FILESYSTEM, FSYS_ECDIRCBREADL2, "fsDirReadPacked this %x", &aDir); aDir.ReadL(e); - TRACE5(UTF::EBorder, UTraceModuleFileSys::ECDirCBReadLRet, EF32TraceUidFileSys, - KErrNone, e.iAtt, I64LOW(e.iModified.Int64()), I64HIGH(e.iModified.Int64()), e.iSize); + OstTraceExt5(TRACE_FILESYSTEM, FSYS_ECDIRCBREADL2RET, "fsDirReadPacked r %d att %x modified %x:%x size %d", (TUint) KErrNone, (TUint) e.iAtt, (TUint) I64HIGH(e.iModified.Int64()), (TUint) I64LOW(e.iModified.Int64()), (TUint) e.iSize); TInt len=EntrySize(e, EFalse); TInt rLen=EntrySize(e, ETrue); TEntry* pX=PtrAdd(pE,rLen); if (pX>pEnd) { - TRACE1(UTF::EBorder, UTraceModuleFileSys::ECDirCBStoreLongEntryNameL, EF32TraceUidFileSys, &aDir); + OstTrace1(TRACE_FILESYSTEM, FSYS_ECDIRCBSTORELONGENTRYNAMEL, "fsDirReadPacked this %x", &aDir); aDir.StoreLongEntryNameL(e.iName); - TRACE1(UTF::EBorder, UTraceModuleFileSys::ECDirCBStoreLongEntryNameLRet, EF32TraceUidFileSys, KErrNone); + OstTrace1(TRACE_FILESYSTEM, FSYS_ECDIRCBSTORELONGENTRYNAMELRET, "fsDirReadPacked r %d", KErrNone); aDir.SetPending(ETrue); break; @@ -113,7 +116,8 @@ CFsPlugin* plugin = NULL; //Get the next plugin which is mounted on this drive (IsMounted called in NextPlugin) //Do not check whether we're registered for current operation (in case not registered for EFsDirOpen) - while(FsPluginManager::NextPlugin(plugin,(CFsMessageRequest*)aRequest,(TBool)ETrue,(TBool)EFalse)==KErrNone && plugin) + FsPluginManager::ReadLockChain(); //!Check operation + while(FsPluginManager::NextPlugin(plugin,(CFsMessageRequest*)aRequest,(TBool)EFalse)==KErrNone && plugin) { if(plugin->IsRegistered(EFsDirReadOne) || plugin->IsRegistered(EFsDirReadPacked) || @@ -126,6 +130,7 @@ break; } } + FsPluginManager::UnlockChain(); TPtrC8 pH((TUint8*)&h,sizeof(TInt)); TRAP(r,aRequest->WriteL(KMsgPtr3,pH)) @@ -163,10 +168,10 @@ return(r); TEntry e; - TRACE1(UTF::EBorder, UTraceModuleFileSys::ECDirCBReadL, EF32TraceUidFileSys, &dir); + OstTrace1(TRACE_FILESYSTEM, FSYS_ECDIRCBREADL1, "this %x", &dir); TRAP(r,dir->ReadL(e)) - TRACE5(UTF::EBorder, UTraceModuleFileSys::ECDirCBReadLRet, EF32TraceUidFileSys, - KErrNone, e.iAtt, I64LOW(e.iModified.Int64()), I64HIGH(e.iModified.Int64()), e.iSize); + OstTraceExt5(TRACE_FILESYSTEM, FSYS_ECDIRCBREADL1RET, "r %d att %x modified %x:%x size %d", (TUint) KErrNone, (TUint) e.iAtt, (TUint) I64HIGH(e.iModified.Int64()), (TUint) I64LOW(e.iModified.Int64()), (TUint) e.iSize); + if (r==KErrNone)