small debug output improvements

[ghc-hetmet.git] / rts / sm / GCUtils.c

diff --git a/rts/sm/GCUtils.c b/rts/sm/GCUtils.c
index 61b72b6..98e6f8a 100644 (file)
--- a/rts/sm/GCUtils.c
+++ b/rts/sm/GCUtils.c
@@ -12,73 +12,176 @@
  * ---------------------------------------------------------------------------*/
 
 #include "Rts.h"
+#include "RtsFlags.h"
 #include "Storage.h"
 #include "GC.h"
 #include "GCUtils.h"
+#include "Printer.h"
+#include "Trace.h"
+
+#ifdef THREADED_RTS
+SpinLock gc_alloc_block_sync;
+#endif
+
+bdescr *
+allocBlock_sync(void)
+{
+    bdescr *bd;
+    ACQUIRE_SPIN_LOCK(&gc_alloc_block_sync);
+    bd = allocBlock();
+    RELEASE_SPIN_LOCK(&gc_alloc_block_sync);
+    return bd;
+}
+
+void
+freeChain_sync(bdescr *bd)
+{
+    ACQUIRE_SPIN_LOCK(&gc_alloc_block_sync);
+    freeChain(bd);
+    RELEASE_SPIN_LOCK(&gc_alloc_block_sync);
+}
 
 /* -----------------------------------------------------------------------------
-   Allocate a new to-space block in the given step.
+   Workspace utilities
    -------------------------------------------------------------------------- */
 
 bdescr *
-gc_alloc_block(step *stp)
+grab_todo_block (step_workspace *ws)
 {
-    bdescr *bd = allocBlock();
-    bd->gen_no = stp->gen_no;
-    bd->step = stp;
-    bd->link = NULL;
+    bdescr *bd;
+    step *stp;
 
-    // blocks in to-space in generations up to and including N
-    // get the BF_EVACUATED flag.
-    if (stp->gen_no <= N) {
-       bd->flags = BF_EVACUATED;
-    } else {
-       bd->flags = 0;
+    stp = ws->stp;
+    bd = NULL;
+
+    if (ws->buffer_todo_bd)
+    {
+       bd = ws->buffer_todo_bd;
+       ASSERT(bd->link == NULL);
+       ws->buffer_todo_bd = NULL;
+       return bd;
     }
 
-    // Start a new to-space block, chain it on after the previous one.
-    if (stp->hp_bd != NULL) {
-       stp->hp_bd->free = stp->hp;
-       stp->hp_bd->link = bd;
+    ACQUIRE_SPIN_LOCK(&stp->sync_todo);
+    if (stp->todos) {
+       bd = stp->todos;
+        if (stp->todos == stp->todos_last) {
+            stp->todos_last = NULL;
+        }
+       stp->todos = bd->link;
+        stp->n_todos--;
+       bd->link = NULL;
+    }  
+    RELEASE_SPIN_LOCK(&stp->sync_todo);
+    return bd;
+}
+
+static void
+push_todo_block (bdescr *bd, step *stp)
+{
+    ASSERT(bd->link == NULL);
+    ACQUIRE_SPIN_LOCK(&stp->sync_todo);
+    if (stp->todos_last == NULL) {
+        stp->todos_last = bd;
+        stp->todos = bd;
+    } else {
+        stp->todos_last->link = bd;
+        stp->todos_last = bd;
     }
+    stp->n_todos++;
+    trace(TRACE_gc|DEBUG_gc, "step %d, n_todos: %d", stp->abs_no, stp->n_todos);
+    RELEASE_SPIN_LOCK(&stp->sync_todo);
+}
 
-    stp->hp_bd = bd;
-    stp->hp    = bd->start;
-    stp->hpLim = stp->hp + BLOCK_SIZE_W;
+void
+push_scan_block (bdescr *bd, step_workspace *ws)
+{
+    ASSERT(bd != NULL);
+    ASSERT(bd->link == NULL);
 
-    stp->n_blocks++;
-    new_blocks++;
+    // update stats: this is a block that has been copied & scavenged
+    gct->copied += bd->free - bd->start;
 
-    return bd;
+    // put the scan block on the ws->scavd_list.
+    bd->link = ws->scavd_list;
+    ws->scavd_list = bd;
+    ws->n_scavd_blocks ++;
+
+    IF_DEBUG(sanity, 
+            ASSERT(countBlocks(ws->scavd_list) == ws->n_scavd_blocks));
 }
 
-bdescr *
-gc_alloc_scavd_block(step *stp)
+StgPtr
+gc_alloc_todo_block (step_workspace *ws)
 {
-    bdescr *bd = allocBlock();
-    bd->gen_no = stp->gen_no;
-    bd->step = stp;
+    bdescr *bd;
+
+    if (ws->todo_bd != NULL) {
+        ws->todo_bd->free = ws->todo_free;
+    }
+
+    // If we already have a todo block, it must be full, so we push it
+    // out: first to the buffer_todo_bd, then to the step.  BUT, don't
+    // push out the block out if it is already the scan block.
+    if (ws->todo_bd != NULL && ws->scan_bd != ws->todo_bd) {
+       ASSERT(ws->todo_bd->link == NULL);
+        if (ws->buffer_todo_bd == NULL) {
+            // If the global todo list is empty, push this block
+            // out immediately rather than caching it in
+            // buffer_todo_bd, because there might be other threads
+            // waiting for work.
+            if (ws->stp->todos == NULL) {
+                push_todo_block(ws->todo_bd, ws->stp);
+            } else {
+                ws->buffer_todo_bd = ws->todo_bd;
+            }
+        } else {            
+           ASSERT(ws->buffer_todo_bd->link == NULL);
+           push_todo_block(ws->buffer_todo_bd, ws->stp);
+            ws->buffer_todo_bd = ws->todo_bd;
+        }
+       ws->todo_bd = NULL;
+    }      
+
+    bd = allocBlock_sync();
+
+    bd->gen_no = ws->stp->gen_no;
+    bd->step = ws->stp;
+    bd->link = NULL;
 
     // blocks in to-space in generations up to and including N
     // get the BF_EVACUATED flag.
-    if (stp->gen_no <= N) {
+    if (ws->stp->gen_no <= N) {
        bd->flags = BF_EVACUATED;
     } else {
        bd->flags = 0;
     }
+       
+    ws->todo_bd = bd;
+    ws->todo_free = bd->start;
+    ws->todo_lim  = bd->start + BLOCK_SIZE_W;
 
-    bd->link = stp->blocks;
-    stp->blocks = bd;
+    return ws->todo_free;
+}
 
-    if (stp->scavd_hp != NULL) {
-       Bdescr(stp->scavd_hp)->free = stp->scavd_hp;
-    }
-    stp->scavd_hp    = bd->start;
-    stp->scavd_hpLim = stp->scavd_hp + BLOCK_SIZE_W;
+/* -----------------------------------------------------------------------------
+ * Debugging
+ * -------------------------------------------------------------------------- */
 
-    stp->n_blocks++;
-    new_scavd_blocks++;
+#if DEBUG
+void
+printMutableList(generation *gen)
+{
+    bdescr *bd;
+    StgPtr p;
 
-    return bd;
-}
+    debugBelch("mutable list %p: ", gen->mut_list);
 
+    for (bd = gen->mut_list; bd != NULL; bd = bd->link) {
+       for (p = bd->start; p < bd->free; p++) {
+           debugBelch("%p (%s), ", (void *)*p, info_type((StgClosure *)*p));
+       }
+    }
+    debugBelch("\n");
+}
+#endif /* DEBUG */