X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FArena.c;h=653eb69706e1b9f7b4a4488fca9dc99dc090e341;hb=b2bd63f99d643f6b3eb30bb72bb9ae26d4183252;hp=b2b5ce2d5a5992bc2ea7d184cb911024415a1ca0;hpb=ab0e778ccfde61aed4c22679b24d175fc6cc9bf3;p=ghc-hetmet.git

diff --git a/rts/Arena.c b/rts/Arena.c
index b2b5ce2..653eb69 100644
--- a/rts/Arena.c
+++ b/rts/Arena.c
@@ -18,12 +18,12 @@
    which most allocations are small.
    -------------------------------------------------------------------------- */
 
+#include "PosixSource.h"
 #include "Rts.h"
+
 #include "RtsUtils.h"
 #include "Arena.h"
 
-#include <stdlib.h>
-
 // Each arena struct is allocated using malloc().
 struct _Arena {
     bdescr *current;
@@ -42,7 +42,7 @@ newArena( void )
     Arena *arena;
 
     arena = stgMallocBytes(sizeof(Arena), "newArena");
-    arena->current = allocBlock();
+    arena->current = allocBlock_lock();
     arena->current->link = NULL;
     arena->free = arena->current->start;
     arena->lim  = arena->current->start + BLOCK_SIZE_W;
@@ -81,11 +81,12 @@ arenaAlloc( Arena *arena, size_t size )
     } else {
 	// allocate a fresh block...
 	req_blocks =  (lnat)BLOCK_ROUND_UP(size) / BLOCK_SIZE;
-	bd = allocGroup(req_blocks);
+	bd = allocGroup_lock(req_blocks);
 	arena_blocks += req_blocks;
 
 	bd->gen_no  = 0;
-	bd->step    = NULL;
+	bd->gen     = NULL;
+        bd->dest_no = 0;
 	bd->flags   = 0;
 	bd->free    = bd->start;
 	bd->link    = arena->current;
@@ -106,7 +107,7 @@ arenaFree( Arena *arena )
 	next = bd->link;
 	arena_blocks -= bd->blocks;
 	ASSERT(arena_blocks >= 0);
-	freeGroup(bd);
+	freeGroup_lock(bd);
     }
     stgFree(arena);
 }