diff -r c1f20ce4abcf -r 3e88ff8f41d5 userlibandfileserver/fileserver/sfile/sf_debug.cpp --- a/userlibandfileserver/fileserver/sfile/sf_debug.cpp Tue Aug 31 16:34:26 2010 +0300 +++ b/userlibandfileserver/fileserver/sfile/sf_debug.cpp Wed Sep 01 12:34:56 2010 +0100 @@ -19,9 +19,8 @@ #include #include "f32image.h" #include -#include #include "sf_file_cache.h" -#include "sf_memory_man.h" + #if defined(_DEBUG) || defined(_DEBUG_RELEASE) @@ -622,128 +621,6 @@ TInt r=aRequest->Write(2,pkgBuf); return r; } - // Check if the file is in 'file sequential/non-rugged file' mode - case KControlIoIsFileSequential: - { - TDrive* drive = aRequest->Drive(); - if(!drive) - return KErrNotSupported; - - // RFs::ControlIO uses narrow descriptors, so convert narrow back to wide - TBuf8 fileNameNarrow; - TInt r = aRequest->Read(2, fileNameNarrow); - if (r != KErrNone) - return r; - TFileName fileNameWide; - fileNameWide.Copy(fileNameNarrow); - - // Locate the file - CFileCB* file = drive->LocateFile(fileNameWide); - if(!file) - return KErrNotFound; - - // isFileSequential = 1 or 0 for EFileSequential mode enabled or disabled respectively - TUint8 isFileSequential = (file->IsSequentialMode() != 0); - TPtr8 pkgBuf(&isFileSequential,1,1); - aRequest->Write(3, pkgBuf); - - return KErrNone; - } - case KControlIoGlobalCacheConfig: - // read ESTART.TXT file for global memory settings - { - TGlobalCacheConfig globalCacheConfig; - TInt32 rel; - - const TInt KByteToByteShift = 10; - _LIT8(KLitSectionNameCacheMemory,"CacheMemory"); - - if (F32Properties::GetInt(KLitSectionNameCacheMemory, _L8("GlobalCacheMemorySize"), rel)) - globalCacheConfig.iGlobalCacheSizeInBytes = rel << KByteToByteShift; - else - globalCacheConfig.iGlobalCacheSizeInBytes = KErrNotFound; - - if (F32Properties::GetInt(KLitSectionNameCacheMemory, _L8("LowMemoryThreshold"), rel)) - globalCacheConfig.iGlobalLowMemoryThreshold = rel; - else - globalCacheConfig.iGlobalLowMemoryThreshold = KErrNotFound; - - TPckgBuf pkgBuf(globalCacheConfig); - TInt r=aRequest->Write(2,pkgBuf); - return r; - } - case KControlIoGlobalCacheInfo: - // get system's current global cache memory info - { - TGlobalCacheInfo info; - info.iGlobalCacheSizeInBytes = TGlobalCacheMemorySettings::CacheSize(); - info.iGlobalLowMemoryThreshold = TGlobalCacheMemorySettings::LowMemoryThreshold(); - TPckgBuf pkgBuf(info); - TInt r=aRequest->Write(2,pkgBuf); - return r; - } - case KControlIoDirCacheConfig: - // read ESTART.TXT file for per-drive directory cache settings - { - TInt driveNumber = aRequest->Drive()->DriveNumber(); - TDirCacheConfig dirCacheConfig; - TInt32 rel; - dirCacheConfig.iDrive = driveNumber; - TBuf8<32> driveSection; - driveSection.Format(_L8("Drive%c"), 'A' + driveNumber); - - if (F32Properties::GetInt(driveSection, _L8("FAT_LeafDirCacheSize"), rel)) - dirCacheConfig.iLeafDirCacheSize = rel; - else - dirCacheConfig.iLeafDirCacheSize = KErrNotFound; - - if (F32Properties::GetInt(driveSection, _L8("FAT_DirCacheSizeMin"), rel)) - dirCacheConfig.iDirCacheSizeMin = rel << KByteToByteShift; - else - dirCacheConfig.iDirCacheSizeMin = KErrNotFound; - - if (F32Properties::GetInt(driveSection, _L8("FAT_DirCacheSizeMax"), rel)) - dirCacheConfig.iDirCacheSizeMax = rel << KByteToByteShift; - else - dirCacheConfig.iDirCacheSizeMax = KErrNotFound; - - TPckgBuf pkgBuf(dirCacheConfig); - TInt r=aRequest->Write(2,pkgBuf); - return r; - } - case KControlIoDirCacheInfo: - // get system's current per-drive directory cache settings - // currently only supports FAT file system - { - TFSName fsName; - aRequest->Drive()->CurrentMount().FileSystemName(fsName); - if (fsName.CompareF(KFileSystemName_FAT) == 0) - { - // 16 is the control cmd used for FAT - // see EFATDirCacheInfo in FAT code please. - const TInt KFATDirCacheInfo = 16; - return(aRequest->Drive()->ControlIO(aRequest->Message(),KFATDirCacheInfo,param1,param2)); - } - return KErrNotSupported; - } - case KControlIoSimulateMemoryLow: - { - CCacheMemoryManager* cacheMemManager = CCacheMemoryManagerFactory::CacheMemoryManager(); - if (cacheMemManager) - cacheMemManager->SetMemoryLow(ETrue); - else - return KErrNotSupported; - return KErrNone; - } - case KControlIoStopSimulateMemoryLow: - { - CCacheMemoryManager* cacheMemManager = CCacheMemoryManagerFactory::CacheMemoryManager(); - if (cacheMemManager) - cacheMemManager->SetMemoryLow(EFalse); - else - return KErrNotSupported; - return KErrNone; - } } #endif