* spark pool and the spark pool only contains sparkable closures
* -------------------------------------------------------------------------- */
-void
-updateSparkQueue (Capability *cap)
+static void
+pruneSparkQueue (Capability *cap)
{
StgClosure *spark, **sparkp, **to_sparkp;
nat n, pruned_sparks; // stats only
ASSERT(*sparkp!=NULL);
ASSERT(LOOKS_LIKE_CLOSURE_PTR(((StgClosure *)*sparkp)));
// ToDo?: statistics gathering here (also for GUM!)
- spark = isAlive(*sparkp);
- if (spark != NULL && closure_SHOULD_SPARK(spark)) {
+ 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);
- debugTrace(DEBUG_sched,
- "updated %d sparks and pruned %d sparks",
- n, pruned_sparks);
+ debugTrace(DEBUG_sched, "pruned %d sparks", pruned_sparks);
debugTrace(DEBUG_sched,
"new spark queue len=%d; (hd=%p; tl=%p)",
}
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;
pool = &(cap->r.rSparks);
sparkp = pool->hd;
while (sparkp != pool->tl) {
- evac(sparkp, user);
+ evac(user, sparkp);
sparkp++;
if (sparkp == pool->lim) {
sparkp = pool->base;