MCL/sf/mw/web: comparison webengine/osswebengine/MemoryManager/Src/MemoryPool.cpp

equal deleted inserted replaced

-:800203832575
+:30342f40acbf
 #include <hal.h>
 #include <avkon.hrh>
 #include <avkon.rsg>
 #include <StringLoader.h>
 #include <WebKit.rsg>
+#include "MemoryLogger.h"
 // CONSTANTS
 // CLASS DECLARATIONS
 //-----------------------------------------------------------------------------
 // CMemoryPool::CollectMemory
 //-----------------------------------------------------------------------------
 void CMemoryPool::CollectMemory(TUint aSize)
 {
+MEM_LOG("CMemoryPool::CollectMemory - run");
 if( iIsCollecting ) return;
 iIsCollecting = ETrue;
 for( TInt i=0; i<iCollectors.Count(); ++i )
 {
 iCollectors[i]->Collect(aSize);
 }
-User::CompressAllHeaps();
 iIsCollecting = EFalse;
-	if (iStopScheduler)
+	if (iStopScheduler && !iIsStopping )
 		iStopScheduler->Start( CStopScheduler::ECheckMemory, aSize );
 }
 //-----------------------------------------------------------------------------
 // CMemoryPool::RestoreCollectors
 #ifdef __NEW_ALLOCATOR__
 //-----------------------------------------------------------------------------
 // CNewSymbianHeapPool::FreeMemory
 //-----------------------------------------------------------------------------
-TUint CNewSymbianHeapPool::FreeMemory(TFreeMem& /*aFree*/ )
+TUint CNewSymbianHeapPool::FreeMemory(TFreeMem& aFree )
 {
 // TODO: implement free_memory
-return KMaxTUint;
+aFree.iPool = 0;
-//    return free_memory( aFree.iPool, aFree.iHeap, aFree.iHal );
+aFree.iHeap = 0;
+TInt freeRAM;
+if(HAL::Get(HALData::EMemoryRAMFree, freeRAM) == KErrNone)
+aFree.iHal = freeRAM;
+else
+aFree.iHal = 0;
+return KMaxTUint; // not fully implemented
 }
 //-----------------------------------------------------------------------------
 // CNewSymbianHeapPool::DoAlloc
 //-----------------------------------------------------------------------------
 TAny* CNewSymbianHeapPool::DoAlloc( TUint aSize )
 {
 TAny *p = iAlloc->Alloc( aSize );
-if (!p)
+if(iAlloc->isLowSystemMemory && p) // use this a pre OOM indicator
+{
+iStopScheduler->Start( CStopScheduler::ECheckMemory, 0 );
+iAlloc->isLowSystemMemory = 0; // reset so that we don't check before next request for RAM
+}
+if (!p) {
 ShowOOMDialog();
+MEM_LOG("CNewSymbianHeapPool::DoAlloc - failed");
+}
 return p;
 }
 //-----------------------------------------------------------------------------
 // CNewSymbianHeapPool::ReAllocate
 {
 // reset the status for next allocation
 iMemStatus &= ~ERescueOOM;
 TAny* p = iAlloc->ReAlloc( aPtr, aSize );
+if(iAlloc->isLowSystemMemory && p) // use this a pre OOM indicator
+{
+iStopScheduler->Start( CStopScheduler::ECheckMemory, 0 );
+iAlloc->isLowSystemMemory = 0; // reset so that we don't check before next request for RAM
+}
 // check memory manager status
 if( !p || iMemStatus & ERescueOOM )
 {
 ShowOOMDialog();
 if( !iIsCollecting )
 if( !p )
 			p = iAlloc->ReAlloc( aPtr, aSize );
 NotifyAndStop();
 }
+#ifdef OOM_LOGGING
+if(!p)
+MEM_LOG("CNewSymbianHeapPool::ReAllocate - failed");
+#endif
 return p;
 }
 //-----------------------------------------------------------------------------
 	// if we still haven't got enough RAM, we should stop the browser from going any further just yet.
 	if (req < 0)
 		{
 		iMemStatus |= ECheckOOM;
 		NotifyAndStop();
+#ifdef OOM_LOGGING
+		MEM_LOG("CNewSymbianHeapPool::PreCheck - failed !!");
+		DumpHeapLogs(aTotalSize);
+#endif
 		return EFalse;
 		}
 	return ETrue;
 	}
 }
 }
 void CNewSymbianHeapPool::ShowOOMDialog()
 {
+MEM_LOG("CNewSymbianHeapPool::ShowOOMDialog - called");
 // Don't show it if we did once already
 if (iOOMDisplayed)
 return;
 // If we got OOM, show a dialog (if the dialog was initted properly to begin with)
 {
 iOOMDisplayed = EFalse;
 }
 #ifdef OOM_LOGGING
-void CNewSymbianHeapPool::DumpHeapLogs()
+void CNewSymbianHeapPool::DumpHeapLogs(TInt aFailSize)
 {
-iAlloc->dump_heap_logs(0);
+iAlloc->dump_heap_logs(aFailSize);
 iAlloc->dump_dl_free_chunks();
 }
 #endif
 #endif
 // END OF FILE

branch	RCL_3
changeset 46	30342f40acbf
parent 35	1f3c3f2f5b0a
child 47	e1bea15f9a39