"evac'ing suspended TSO %lu", (unsigned long)task->suspended_tso->id);
evac(user, (StgClosure **)(void *)&task->suspended_tso);
}
+
+#if defined(THREADED_RTS)
+ markSparkQueue (evac, user, cap);
+#endif
}
-
+
#if !defined(THREADED_RTS)
evac(user, (StgClosure **)(void *)&blocked_queue_hd);
evac(user, (StgClosure **)(void *)&blocked_queue_tl);
#endif
}
-// Sparks are not roots for GC, so we don't mark them in
-// markSomeCapabilities(). Instead, we traverse the spark queues
-// after GC and throw away any that are unreachable.
-void
-updateCapabilitiesPostGC (void)
-{
-#if defined(THREADED_RTS)
- nat i;
- for (i = 0; i < n_capabilities; i++) {
- updateSparkQueue (&capabilities[i]);
- }
-#endif // THREADED_RTS
-}
-
// This function is used by the compacting GC to thread all the
// pointers from spark queues.
void
// FOr the GC:
void markSomeCapabilities (evac_fn evac, void *user, nat i0, nat delta);
void markCapabilities (evac_fn evac, void *user);
-void updateCapabilitiesPostGC (void);
void traverseSparkQueues (evac_fn evac, void *user);
/* -----------------------------------------------------------------------------
* -------------------------------------------------------------------------- */
void
-updateSparkQueue (Capability *cap)
+markSparkQueue (evac_fn evac, void *user, 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)) {
+ evac(user,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);
debugTrace(DEBUG_sched,
- "updated %d sparks and pruned %d sparks",
+ "marked %d sparks, pruned %d sparks",
n, pruned_sparks);
debugTrace(DEBUG_sched,
void initSparkPools (void);
void freeSparkPool (StgSparkPool *pool);
void createSparkThread (Capability *cap, StgClosure *p);
-void updateSparkQueue (Capability *cap);
+void markSparkQueue (evac_fn evac, void *user, Capability *cap);
void traverseSparkQueue(evac_fn evac, void *user, Capability *cap);
INLINE_HEADER void discardSparks (StgSparkPool *pool);
// Update pointers from the Task list
update_task_list();
- // Update pointers from capabilities (probably just the spark queues)
- updateCapabilitiesPostGC();
-
// Now see which stable names are still alive.
gcStablePtrTable();