X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fheap.c;h=a9e9931fe4ede32462c4732013b923b7e7c0b4be;hb=refs%2Ftags%2Frel0.10;hp=a569578c99052eee1dffc1b44abf4b8eacbced97;hpb=9d85201216cb35e1b1e051b1d7cdc38eaa5befa4;p=tpg%2Facess2.git

diff --git a/Kernel/heap.c b/Kernel/heap.c
index a569578c..a9e9931f 100644
--- a/Kernel/heap.c
+++ b/Kernel/heap.c
@@ -62,6 +62,11 @@ void *Heap_Extend(int Bytes)
 	if( (tVAddr)gHeapEnd == MM_KHEAP_MAX )
 		return NULL;
 	
+	if( Bytes == 0 ) {
+		Log_Warning("Heap", "Heap_Extend called with Bytes=%i", Bytes);
+		return NULL;
+	}
+	
 	// Bounds Check
 	if( (tVAddr)gHeapEnd + ((Bytes+0xFFF)&~0xFFF) > MM_KHEAP_MAX ) {
 		Bytes = MM_KHEAP_MAX - (tVAddr)gHeapEnd;
@@ -206,9 +211,11 @@ void *Heap_Allocate(const char *File, int Line, size_t __Bytes)
 			head->Magic = MAGIC_USED;
 			head->File = File;
 			head->Line = Line;
+			head->ValidSize = __Bytes;
+			head->AllocateTime = now();
 			Mutex_Release(&glHeap);	// Release spinlock
 			#if DEBUG_TRACE
-			Log("[Heap   ] Malloc'd %p (%i bytes), returning to %p", head->Data, head->Size,  __builtin_return_address(0));
+			Debug("[Heap   ] Malloc'd %p (%i bytes), returning to %p", head->Data, head->Size,  __builtin_return_address(0));
 			#endif
 			return head->Data;
 		}
@@ -241,9 +248,11 @@ void *Heap_Allocate(const char *File, int Line, size_t __Bytes)
 			best->Magic = MAGIC_USED;	// Mark block as used
 			best->File = File;
 			best->Line = Line;
+			best->ValidSize = __Bytes;
+			best->AllocateTime = now();
 			Mutex_Release(&glHeap);	// Release spinlock
 			#if DEBUG_TRACE
-			Log("[Heap   ] Malloc'd %p (%i bytes), returning to %p", best->Data, best->Size, __builtin_return_address(0));
+			Debug("[Heap   ] Malloc'd %p (%i bytes), returning to %s:%i", best->Data, best->Size, File, Line);
 			#endif
 			return best->Data;
 		}
@@ -264,11 +273,11 @@ void *Heap_Allocate(const char *File, int Line, size_t __Bytes)
 	best->Magic = MAGIC_USED;	// Mark block as used
 	best->File = File;
 	best->Line = Line;
+	best->AllocateTime = now();
 	
 	Mutex_Release(&glHeap);	// Release spinlock
 	#if DEBUG_TRACE
-	Log_Debug("Heap", "newhead(%p)->Size = 0x%x", newhead, newhead->Size);
-	Log_Debug("Heap", "Malloc'd %p (0x%x bytes), returning to %s:%i",
+	Debug("[Heap   ] Malloc'd %p (0x%x bytes), returning to %s:%i",
 		best->Data, best->Size, File, Line);
 	#endif
 	return best->Data;
@@ -280,18 +289,17 @@ void *Heap_Allocate(const char *File, int Line, size_t __Bytes)
  */
 void Heap_Deallocate(void *Ptr)
 {
-	tHeapHead	*head;
+	tHeapHead	*head = (void*)( (Uint)Ptr - sizeof(tHeapHead) );
 	tHeapFoot	*foot;
 	
-	#if DEBUG_TRACE
-	Log_Log("Heap", "free: Ptr = %p", Ptr);
-	Log_Log("Heap", "free: Returns to %p", __builtin_return_address(0));
-	#endif
-	
 	// INVLPTR is returned from Heap_Allocate when the allocation
 	// size is zero.
 	if( Ptr == INVLPTR )	return;
 	
+	#if DEBUG_TRACE
+	Debug("[Heap   ] free: %p freed by %p (%i old)", Ptr, __builtin_return_address(0), now()-head->AllocateTime);
+	#endif
+	
 	// Alignment Check
 	if( (Uint)Ptr & (sizeof(Uint)-1) ) {
 		Log_Warning("Heap", "free - Passed a non-aligned address (%p)", Ptr);
@@ -314,7 +322,7 @@ void Heap_Deallocate(void *Ptr)
 	}
 	if(head->Magic != MAGIC_USED) {
 		Log_Warning("Heap", "free - Magic value is invalid (%p, 0x%x)", head, head->Magic);
-		Log_Notice("Heap", "Allocated %s:%i", head->File, head->Line);
+		Log_Notice("Heap", "Allocated by %s:%i", head->File, head->Line);
 		return;
 	}
 	
@@ -322,12 +330,12 @@ void Heap_Deallocate(void *Ptr)
 	foot = (void*)( (Uint)head + head->Size - sizeof(tHeapFoot) );
 	if(foot->Head != head) {
 		Log_Warning("Heap", "free - Footer backlink is incorrect (%p, 0x%x)", head, foot->Head);
-		Log_Notice("Heap", "Allocated %s:%i", head->File, head->Line);
+		Log_Notice("Heap", "Allocated by %s:%i", head->File, head->Line);
 		return;
 	}
 	if(foot->Magic != MAGIC_FOOT) {
 		Log_Warning("Heap", "free - Footer magic is invalid (%p, %p = 0x%x)", head, &foot->Magic, foot->Magic);
-		Log_Notice("Heap", "Allocated %s:%i", head->File, head->Line);
+		Log_Notice("Heap", "Allocated by %s:%i", head->File, head->Line);
 		return;
 	}
 	
@@ -561,7 +569,7 @@ void Heap_Dump(void)
 		return ;
 
 	#if !VERBOSE_DUMP
-	Log_Log("Heap", "%p (0x%llx): 0x%08lx (%i) %4C",
+	Log_Log("Heap", "%p (%P): 0x%08lx %i %4C",
 		head, MM_GetPhysAddr((Uint)head), head->Size, head->ValidSize, &head->Magic);
 	Log_Log("Heap", "%p %4C", foot->Head, &foot->Magic);
 	if(head->File) {
@@ -580,7 +588,7 @@ void Heap_Dump(void)
 	head = foot->Head;
 	while( (tVAddr)head >= (tVAddr)badHead )
 	{
-		Log_Log("Heap", "%p (0x%llx): 0x%08lx %i %4C",
+		Log_Log("Heap", "%p (%P): 0x%08lx %i %4C",
 			head, MM_GetPhysAddr((Uint)head), head->Size, head->ValidSize, &head->Magic);
 		Log_Log("Heap", "%p %4C", foot->Head, &foot->Magic);
 		if(head->File)
@@ -659,8 +667,14 @@ void Heap_Stats(void)
 		
 		// Print the block info?
 		#if 1
-		Log_Debug("Heap", "%p - 0x%x (%i) Owned by %s:%i",
-			head, head->Size, head->ValidSize, head->File, head->Line);
+		if( head->Magic == MAGIC_FREE )
+			Log_Debug("Heap", "%p (%P) - 0x%x free",
+				head->Data, MM_GetPhysAddr((tVAddr)&head->Data), head->Size);
+		else
+			Log_Debug("Heap", "%p (%P) - 0x%x (%i) Owned by %s:%i (%lli ms old)",
+				head->Data, MM_GetPhysAddr((tVAddr)&head->Data), head->Size, head->ValidSize, head->File, head->Line,
+				now() - head->AllocateTime
+				);
 		#endif
 	}