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

equal deleted inserted replaced

-:e1bea15f9a39
+:79859ed3eea9
 *
 *
 */
 #include "common.h"
-#include "StopScheduler.h"
-#include <hal.h>
 #ifdef TRACE_CHUNK_USAGE
 void TraceChunkUsage(TInt aChunkHandle, TUint8* aBase, TInt aChunkSize)
 	{
 	RDebug::Print(_L("MEM: c,%d,%d,%d"), aChunkHandle, aBase, aChunkSize);
 #endif
 #ifdef __NEW_ALLOCATOR__
 #include "MemoryLogger.h"
-#include "SymbianDLHeap.h"
+#include "SymbianDlHeap.h"
 _LIT(KDLHeapPanicCategory, "DL Heap");
 #define	GET_PAGE_SIZE(x)			UserHal::PageSizeInBytes(x)
 #define	__CHECK_CELL(p)
 #define __POWER_OF_2(x)				((TUint32)((x)^((x)-1))>=(TUint32)(x))
 		{
 		iAlign = 4;
 		}
 	iPageSize = 0;
 	iFlags = aSingleThread ? (ESingleThreaded|EFixedSize) : EFixedSize;
-	isLowSystemMemory = 0;
 	Init(0, 0, 0);
 	}
 UEXPORT_C RSymbianDLHeap::RSymbianDLHeap(TInt aChunkHandle, TInt aOffset, TInt aMinLength, TInt aMaxLength, TInt aGrowBy,
 			TInt aAlign, TBool aSingleThread)
-		: iMinLength(aMinLength), iMaxLength(aMaxLength), iOffset(aOffset), iChunkHandle(aChunkHandle),
+		: iMinLength(aMinLength), iMaxLength(aMaxLength), iOffset(aOffset), iChunkHandle(aChunkHandle), iNestingLevel(0), iAllocCount(0),
-		  iAlign(aAlign), iNestingLevel(0), iAllocCount(0), iFailType(ENone), iTestData(NULL), iChunkSize(aMinLength)
+			iAlign(aAlign),iFailType(ENone), iTestData(NULL), iChunkSize(aMinLength)
 	{
 	// TODO: Locked the page size to 4 KB - change this to pick up from the OS
 	GET_PAGE_SIZE(iPageSize);
 	__ASSERT_ALWAYS(aOffset >=0, User::Panic(KDLHeapPanicCategory, ETHeapNewBadOffset));
 	iGrowBy = _ALIGN_UP(aGrowBy, iPageSize);
 	iFlags = aSingleThread ? ESingleThreaded : 0;
-	isLowSystemMemory = 0;
 	// Initialise
 	// if the heap is created with aMinLength==aMaxLength then it cannot allocate slab or page memory
 	// so these sub-allocators should be disabled. Otherwise initialise with default values
 	if (aMinLength == aMaxLength)
 insert_chunk(m, r, rsize, npages_out);
 }
 return chunk2mem(v);
 }
 }
-//CORRUPTION_ERROR_ACTION(m);
+CORRUPTION_ERROR_ACTION(m);
 }
 return 0;
 }
 /* allocate a small request from the best fitting chunk in a treebin */
 insert_chunk(m, r, rsize, 0);
 }
 return chunk2mem(v);
 }
 }
-//CORRUPTION_ERROR_ACTION(m);
+CORRUPTION_ERROR_ACTION(m);
-//return 0;
+return 0;
 }
 inline void RSymbianDLHeap::init_top(mstate m, mchunkptr p, size_t psize)
 {
 	/* Ensure alignment */
 internal_free(m, oldmem);
 }
 return newmem;
 }
 }
-//return 0;
+return 0;
 }
 /* ----------------------------- statistics ------------------------------ */
 mallinfo RSymbianDLHeap::internal_mallinfo(mstate m) {
 struct mallinfo nm = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
 TInt chunkCnt = 0;
 if (is_initialized(m)) {
 size_t nfree = SIZE_T_ONE; /* top always free */
 size_t mfree = m->topsize + TOP_FOOT_SIZE;
 size_t sum = mfree;
 msegmentptr s = &m->seg;
-//  TInt tmp = (TUint8*)m->top - (TUint8*)s->base;
+TInt tmp = (TUint8*)m->top - (TUint8*)s->base;
 while (s != 0) {
 mchunkptr q = align_as_chunk(s->base);
 chunkCnt++;
 while (segment_holds(s, q) &&
 q != m->top && q->head != FENCEPOST_HEAD) {
 return nm;
 }
 void  RSymbianDLHeap::internal_malloc_stats(mstate m) {
 if (!PREACTION(m)) {
+size_t maxfp = 0;
 size_t fp = 0;
 size_t used = 0;
 check_malloc_state(m);
 if (is_initialized(m)) {
 msegmentptr s = &m->seg;
+maxfp = m->max_footprint;
 fp = m->footprint;
 used = fp - (m->topsize + TOP_FOOT_SIZE);
 while (s != 0) {
 mchunkptr q = align_as_chunk(s->base);
 #endif
 return mem;
 }
-//return 0;
+return 0;
 }
 void RSymbianDLHeap::dlfree(void* mem) {
 /*
 Consolidate freed chunks with preceeding or succeeding bordering
 							}
 						}
 						else
 						{
 size_t nsize = chunksize(next);
-//int next_chunk_unmapped = 0;
+int next_chunk_unmapped = 0;
 if( page_not_in_memory(next, nsize) ) {
-// next_chunk_unmapped = 1;
+next_chunk_unmapped = 1;
 unmapped_pages += ((tchunkptr)next)->npages;
 }
 							psize += nsize;
 							unlink_chunk(fm, next, nsize);
 // allocate pages in the chunk
 // if p is NULL, find an allocate the required number of pages (which must lie in the lower half)
 // otherwise commit the pages specified
 //
 {
-// Check for min threshold in system RAM to be left free
+ASSERT(p == floor(p, pagesize));
-TInt sysFreeRAM = 0;
+ASSERT(sz == ceiling(sz, pagesize));
-if(HAL::Get(HALData::EMemoryRAMFree, sysFreeRAM) == KErrNone)
+ASSERT(sz > 0);
-		{
-		if(sysFreeRAM < KStopThreshold) // 1MB
-	return 0;
-	    // check system memory level
-	if(sysFreeRAM < KGoodMemoryThreshold)
-	isLowSystemMemory = 1;
-	    else
-	    isLowSystemMemory = 0;
-		}
-ASSERT(p == floor(p, pagesize));
-ASSERT(sz == ceiling(sz, pagesize));
-ASSERT(sz > 0);
 	if (iChunkSize + sz > iMaxLength)
 		return 0;
 	RChunk chunk;
 		{	// grow, try and do this in place first
 		if (!map(offset(p, oldsz), sz-oldsz))
 			{
 			// need to allocate-copy-free
 			void* newp = map(0, sz);
-if(newp)
+			memcpy(newp, p, oldsz);
-{
+			unmap(p,oldsz);
-memcpy(newp, p, oldsz);
+			return newp;
-unmap(p,oldsz);
-return newp;
-}
-else
-{
-return 0;
-}
 			}
 		}
 	return p;
 }

branch	RCL_3
changeset 48	79859ed3eea9
parent 46	30342f40acbf
child 49	919f36ff910f