* 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;
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) {
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