X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FSparks.c;h=2e9e61ca622c2a11a7d01cb4049319ce52815afb;hb=c1572a8968e1a0fac2c70e0172d5f304d560b2f3;hp=0f429e2c6c04d50f9f7d5052e6d99afdac830046;hpb=f86e7206ea94b48b94fb61007a1c5d55b8c60f45;p=ghc-hetmet.git

diff --git a/rts/Sparks.c b/rts/Sparks.c
index 0f429e2..2e9e61c 100644
--- a/rts/Sparks.c
+++ b/rts/Sparks.c
@@ -168,10 +168,10 @@ newSpark (StgRegTable *reg, StgClosure *p)
  * spark pool and the spark pool only contains sparkable closures 
  * -------------------------------------------------------------------------- */
 
-void
-markSparkQueue (evac_fn evac, void *user, Capability *cap)
+static void
+pruneSparkQueue (Capability *cap)
 { 
-    StgClosure **sparkp, **to_sparkp;
+    StgClosure *spark, **sparkp, **to_sparkp;
     nat n, pruned_sparks; // stats only
     StgSparkPool *pool;
     
@@ -184,27 +184,21 @@ markSparkQueue (evac_fn evac, void *user, Capability *cap)
     
     ASSERT_SPARK_POOL_INVARIANTS(pool);
     
-#if defined(PARALLEL_HASKELL)
-    // stats only
-    n = 0;
-    pruned_sparks = 0;
-#endif
-	
     sparkp = pool->hd;
     to_sparkp = pool->hd;
     while (sparkp != pool->tl) {
         ASSERT(*sparkp!=NULL);
         ASSERT(LOOKS_LIKE_CLOSURE_PTR(((StgClosure *)*sparkp)));
         // ToDo?: statistics gathering here (also for GUM!)
-        if (closure_SHOULD_SPARK(*sparkp)) {
-            evac(user, sparkp);
-            *to_sparkp++ = *sparkp;
+        spark = *sparkp;
+        if (!closure_SHOULD_SPARK(spark)) {
+            pruned_sparks++;
+        } else{
+            *to_sparkp++ = spark;
             if (to_sparkp == pool->lim) {
                 to_sparkp = pool->base;
             }
             n++;
-        } else {
-            pruned_sparks++;
         }
         sparkp++;
         if (sparkp == pool->lim) {
@@ -215,21 +209,39 @@ markSparkQueue (evac_fn evac, void *user, Capability *cap)
 	
     PAR_TICKY_MARK_SPARK_QUEUE_END(n);
 	
-#if defined(PARALLEL_HASKELL)
-    debugTrace(DEBUG_sched, 
-               "marked %d sparks and pruned %d sparks on [%x]",
-               n, pruned_sparks, mytid);
-#else
-    debugTrace(DEBUG_sched, 
-               "marked %d sparks and pruned %d sparks",
-               n, pruned_sparks);
-#endif
+    debugTrace(DEBUG_sched, "pruned %d sparks", pruned_sparks);
     
     debugTrace(DEBUG_sched,
-               "new spark queue len=%d; (hd=%p; tl=%p)\n",
+               "new spark queue len=%d; (hd=%p; tl=%p)",
                sparkPoolSize(pool), pool->hd, pool->tl);
 }
 
+void
+pruneSparkQueues (void)
+{
+    nat i;
+    for (i = 0; i < n_capabilities; i++) {
+        pruneSparkQueue(&capabilities[i]);
+    }
+}
+
+void
+traverseSparkQueue (evac_fn evac, void *user, Capability *cap)
+{
+    StgClosure **sparkp;
+    StgSparkPool *pool;
+    
+    pool = &(cap->r.rSparks);
+    sparkp = pool->hd;
+    while (sparkp != pool->tl) {
+        evac(user, sparkp);
+        sparkp++;
+        if (sparkp == pool->lim) {
+            sparkp = pool->base;
+        }
+    }
+}
+
 #else
 
 StgInt