From: John Hodge Date: Sat, 19 Jun 2010 12:56:54 +0000 (+0800) Subject: Cleaning up and attempting to fix these darn heisenbugs X-Git-Tag: rel0.06~140 X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=fae7520daf355d4646ba73c46a2e701e5ef4e9f5;p=tpg%2Facess2.git Cleaning up and attempting to fix these darn heisenbugs --- diff --git a/Kernel/arch/x86_64/proc.c b/Kernel/arch/x86_64/proc.c index 4d502100..934bee90 100644 --- a/Kernel/arch/x86_64/proc.c +++ b/Kernel/arch/x86_64/proc.c @@ -349,7 +349,6 @@ void Proc_Start(void) tThread *Proc_GetCurThread(void) { #if USE_MP - //return gaCPUs[ gaAPIC_to_CPU[gpMP_LocalAPIC->ID.Val&0xFF] ].Current; return gaCPUs[ GetCPUNum() ].Current; #else return gCurrentThread; diff --git a/Kernel/heap.c b/Kernel/heap.c index 8d1db7d3..1863f56f 100644 --- a/Kernel/heap.c +++ b/Kernel/heap.c @@ -136,6 +136,8 @@ void *malloc(size_t Bytes) // Get required size Bytes = (Bytes + sizeof(tHeapHead) + sizeof(tHeapFoot) + BLOCK_SIZE-1) & ~(BLOCK_SIZE-1); + //if(glHeap) + // Debug("glHeap = %i", glHeap); // Lock Heap LOCK(&glHeap); @@ -147,11 +149,11 @@ void *malloc(size_t Bytes) { // Alignment Check if( head->Size & (BLOCK_SIZE-1) ) { + RELEASE(&glHeap); // Release spinlock #if WARNINGS Log_Warning("Heap", "Size of heap address %p is invalid not aligned (0x%x)", head, head->Size); Heap_Dump(); #endif - RELEASE(&glHeap); return NULL; } @@ -159,11 +161,11 @@ void *malloc(size_t Bytes) if(head->Magic == MAGIC_USED) continue; // Error check if(head->Magic != MAGIC_FREE) { + RELEASE(&glHeap); // Release spinlock #if WARNINGS Log_Warning("Heap", "Magic of heap address %p is invalid (0x%x)", head, head->Magic); Heap_Dump(); #endif - RELEASE(&glHeap); // Release spinlock return NULL; } @@ -177,7 +179,6 @@ void *malloc(size_t Bytes) #if DEBUG_TRACE Log("[Heap ] Malloc'd %p (%i bytes), returning to %p", head->Data, head->Size, __builtin_return_address(0)); #endif - RELEASE(&glHeap); return head->Data; } @@ -207,10 +208,10 @@ void *malloc(size_t Bytes) // Check size if(best->Size == Bytes) { best->Magic = MAGIC_USED; // Mark block as used + 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)); #endif - RELEASE(&glHeap); // Release spinlock return best->Data; } } diff --git a/Kernel/vfs/acls.c b/Kernel/vfs/acls.c index 4a65be69..1c1b6cfe 100644 --- a/Kernel/vfs/acls.c +++ b/Kernel/vfs/acls.c @@ -27,7 +27,7 @@ int VFS_CheckACL(tVFS_Node *Node, Uint Permissions) // Root only file?, fast return if( Node->NumACLs == 0 ) { - Log("VFS_CheckACL - %p inaccesable, NumACLs = 0", Node); + Log("VFS_CheckACL - %p inaccesable, NumACLs = 0, uid=%i", Node, uid); return 0; } diff --git a/Usermode/Applications/login_src/main.c b/Usermode/Applications/login_src/main.c index 456974fc..353c90a3 100644 --- a/Usermode/Applications/login_src/main.c +++ b/Usermode/Applications/login_src/main.c @@ -18,9 +18,10 @@ int main(int argc, char *argv[]) int status = 0; tUserInfo *uinfo; + printf("\x1B[2J"); // Clear Screen + for(;;) { - printf("\x1B[2J"); // Clear Screen // Validate User for(;;) {