diff -r a179b74831c9 -r c1f20ce4abcf userlibandfileserver/fileserver/sfile/sf_memory_man.cpp --- a/userlibandfileserver/fileserver/sfile/sf_memory_man.cpp Thu Aug 19 11:14:22 2010 +0300 +++ b/userlibandfileserver/fileserver/sfile/sf_memory_man.cpp Tue Aug 31 16:34:26 2010 +0300 @@ -81,7 +81,7 @@ TInt r = UserHal::MemoryInfo(meminfo); ASSERT(r==KErrNone); User::LeaveIfError(r); - iLowMemoryThreshold = (meminfo().iTotalRamInBytes * TGlobalCacheMemorySettings::LowMemoryThreshold()) / 100; + iLowMemoryThreshold = (TInt) (meminfo().iTotalRamInBytes * (TGlobalCacheMemorySettings::LowMemoryThreshold() / 100.00)); TChunkCreateInfo createInfo; createInfo.SetCache(iSizeInBytes); createInfo.SetOwner(EOwnerProcess); @@ -287,6 +287,10 @@ */ void CCacheMemoryManagerFactory::CreateL() { + // Panic in DEBUG mode when GlobalCacheMemorySize is set as a negative value. + ASSERT(TGlobalCacheMemorySettings::CacheSize() >= 0); + ASSERT(TGlobalCacheMemorySettings::LowMemoryThreshold() >= 0); + if (TGlobalCacheMemorySettings::CacheSize() > 0) iCacheMemoryManager = CCacheMemoryManager::NewL(TGlobalCacheMemorySettings::CacheSize()); else @@ -337,12 +341,12 @@ iLowMemoryThreshold = lowMemoryThreshold; } -TInt TGlobalCacheMemorySettings::CacheSize() +TInt32 TGlobalCacheMemorySettings::CacheSize() { return iCacheSizeInBytes; } -TInt TGlobalCacheMemorySettings::LowMemoryThreshold() +TInt32 TGlobalCacheMemorySettings::LowMemoryThreshold() { return iLowMemoryThreshold; }