X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FBlockAlloc.c;h=9b0135428935ac8d3c6a2e1767adf59e936c2a94;hb=03a9ff01812afc81eb5236fd3063cbec44cf469e;hp=65205f8ff6a919ffbe84f232864ad1cb3c977c56;hpb=bc5c802181b513216bc88f0d1ec9574157ee05fe;p=ghc-hetmet.git

diff --git a/ghc/rts/BlockAlloc.c b/ghc/rts/BlockAlloc.c
index 65205f8..9b01354 100644
--- a/ghc/rts/BlockAlloc.c
+++ b/ghc/rts/BlockAlloc.c
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: BlockAlloc.c,v 1.10 2001/08/14 13:40:09 sewardj Exp $
  *
  * (c) The GHC Team 1998-2000
  * 
@@ -22,12 +21,17 @@
 #include "RtsUtils.h"
 #include "BlockAlloc.h"
 #include "MBlock.h"
+#include "Storage.h"
+
+#include <string.h>
 
 static void    initMBlock(void *mblock);
 static bdescr *allocMegaGroup(nat mblocks);
 static void    freeMegaGroup(bdescr *bd);
 
-static bdescr *free_list;
+// In SMP mode, the free list is protected by sm_mutex.  In the
+// threaded RTS, it is protected by the Capability.
+static bdescr *free_list = NULL;
 
 /* -----------------------------------------------------------------------------
    Initialisation
@@ -35,14 +39,14 @@ static bdescr *free_list;
 
 void initBlockAllocator(void)
 {
-  free_list = NULL;
+    // The free list starts off NULL
 }
 
 /* -----------------------------------------------------------------------------
    Allocation
    -------------------------------------------------------------------------- */
 
-static inline void
+STATIC_INLINE void
 initGroup(nat n, bdescr *head)
 {
   bdescr *bd;
@@ -50,9 +54,11 @@ initGroup(nat n, bdescr *head)
 
   if (n != 0) {
     head->blocks = n;
-    head->free = head->start;
+    head->free   = head->start;
+    head->link   = NULL;
     for (i=1, bd = head+1; i < n; i++, bd++) {
       bd->free = 0;
+      bd->blocks = 0;
       bd->link = head;
     }
   }
@@ -64,6 +70,7 @@ allocGroup(nat n)
   void *mblock;
   bdescr *bd, **last;
 
+  ASSERT_SM_LOCK();
   ASSERT(n != 0);
 
   if (n > BLOCKS_PER_MBLOCK) {
@@ -76,9 +83,8 @@ allocGroup(nat n)
       *last = bd->link;
       /* no initialisation necessary - this is already a
        * self-contained block group. */
-#ifdef DEBUG
       bd->free = bd->start;	/* block isn't free now */
-#endif
+      bd->link = NULL;
       return bd;
     }
     if (bd->blocks >  n) {	/* block too big... */
@@ -102,11 +108,31 @@ allocGroup(nat n)
 }
 
 bdescr *
+allocGroup_lock(nat n)
+{
+    bdescr *bd;
+    ACQUIRE_SM_LOCK;
+    bd = allocGroup(n);
+    RELEASE_SM_LOCK;
+    return bd;
+}
+
+bdescr *
 allocBlock(void)
 {
   return allocGroup(1);
 }
 
+bdescr *
+allocBlock_lock(void)
+{
+    bdescr *bd;
+    ACQUIRE_SM_LOCK;
+    bd = allocBlock();
+    RELEASE_SM_LOCK;
+    return bd;
+}
+
 /* -----------------------------------------------------------------------------
    Any request larger than BLOCKS_PER_MBLOCK needs a megablock group.
    First, search the free list for enough contiguous megablocks to
@@ -191,19 +217,21 @@ allocMegaGroup(nat n)
  * pointer to the newly enlarged group p.
  */
 
-static inline bdescr *
+STATIC_INLINE bdescr *
 coalesce(bdescr *p)
 {
   bdescr *bd, *q;
-  nat i;
+  nat i, blocks;
 
   q = p->link;
   if (q != NULL && p->start + p->blocks * BLOCK_SIZE_W == q->start) {
     /* can coalesce */
     p->blocks += q->blocks;
     p->link    = q->link;
-    for (i = 0, bd = q; i < q->blocks; bd++, i++) {
+    blocks = q->blocks;
+    for (i = 0, bd = q; i < blocks; bd++, i++) {
 	bd->free = 0;
+	bd->blocks = 0;
 	bd->link = p;
     }
     return p;
@@ -216,19 +244,20 @@ freeGroup(bdescr *p)
 {
   bdescr *bd, *last;
   
+  ASSERT_SM_LOCK();
+
   /* are we dealing with a megablock group? */
   if (p->blocks > BLOCKS_PER_MBLOCK) {
     freeMegaGroup(p);
     return;
   }
 
-#ifdef DEBUG
+
   p->free = (void *)-1;  /* indicates that this block is free */
   p->step = NULL;
   p->gen_no = 0;
   /* fill the block group with garbage if sanity checking is on */
   IF_DEBUG(sanity,memset(p->start, 0xaa, p->blocks * BLOCK_SIZE));
-#endif
 
   /* find correct place in free list to place new group */
   last = NULL;
@@ -253,16 +282,25 @@ freeGroup(bdescr *p)
   IF_DEBUG(sanity, checkFreeListSanity());
 }
 
+void
+freeGroup_lock(bdescr *p)
+{
+    ACQUIRE_SM_LOCK;
+    freeGroup(p);
+    RELEASE_SM_LOCK;
+}
+
 static void
 freeMegaGroup(bdescr *p)
 {
   nat n;
+  void *q = p;
 
-  n = p->blocks * BLOCK_SIZE / MBLOCK_SIZE + 1;
-  for (; n > 0; (W_)p += MBLOCK_SIZE, n--) {
-    initMBlock((void *)((W_)p & ~MBLOCK_MASK));
-    initGroup(BLOCKS_PER_MBLOCK, p);
-    freeGroup(p);
+  n = ((bdescr *)q)->blocks * BLOCK_SIZE / MBLOCK_SIZE + 1;
+  for (; n > 0; q += MBLOCK_SIZE, n--) {
+    initMBlock(MBLOCK_ROUND_DOWN(q));
+    initGroup(BLOCKS_PER_MBLOCK, (bdescr *)q);
+    freeGroup((bdescr *)q);
   }
 }
 
@@ -277,6 +315,14 @@ freeChain(bdescr *bd)
   }
 }
 
+void
+freeChain_lock(bdescr *bd)
+{
+    ACQUIRE_SM_LOCK;
+    freeChain(bd);
+    RELEASE_SM_LOCK;
+}
+
 static void
 initMBlock(void *mblock)
 {
@@ -291,7 +337,7 @@ initMBlock(void *mblock)
 
   /* Initialise the start field of each block descriptor
    */
-  for (; block <= LAST_BLOCK(mblock); bd += 1, (lnat)block += BLOCK_SIZE) {
+  for (; block <= LAST_BLOCK(mblock); bd += 1, block += BLOCK_SIZE) {
     bd->start = block;
   }
 }
@@ -301,6 +347,18 @@ initMBlock(void *mblock)
    -------------------------------------------------------------------------- */
 
 #ifdef DEBUG
+static void
+checkWellFormedGroup( bdescr *bd )
+{
+    nat i;
+
+    for (i = 1; i < bd->blocks; i++) {
+	ASSERT(bd[i].blocks == 0);
+	ASSERT(bd[i].free   == 0);
+	ASSERT(bd[i].link   == bd);
+    }
+}
+
 void
 checkFreeListSanity(void)
 {
@@ -308,9 +366,10 @@ checkFreeListSanity(void)
 
   for (bd = free_list; bd != NULL; bd = bd->link) {
     IF_DEBUG(block_alloc,
-	     fprintf(stderr,"group at 0x%x, length %d blocks\n", 
-		     (nat)bd->start, bd->blocks));
+	     debugBelch("group at 0x%p, length %d blocks\n", 
+			bd->start, bd->blocks));
     ASSERT(bd->blocks > 0);
+    checkWellFormedGroup(bd);
     if (bd->link != NULL) {
       /* make sure we're fully coalesced */
       ASSERT(bd->start + bd->blocks * BLOCK_SIZE_W != bd->link->start);