* 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 *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!)
- evac(user,sparkp);
spark = *sparkp;
if (!closure_SHOULD_SPARK(spark)) {
pruned_sparks++;
PAR_TICKY_MARK_SPARK_QUEUE_END(n);
- debugTrace(DEBUG_sched,
- "marked %d sparks, 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;
void initSparkPools (void);
void freeSparkPool (StgSparkPool *pool);
void createSparkThread (Capability *cap, StgClosure *p);
-void markSparkQueue (evac_fn evac, void *user, Capability *cap);
+void pruneSparkQueues (void);
void traverseSparkQueue(evac_fn evac, void *user, Capability *cap);
INLINE_HEADER void discardSparks (StgSparkPool *pool);
// 1. thread the roots
markCapabilities((evac_fn)thread_root, NULL);
- // spark queues
- traverseSparkQueues((evac_fn)thread_root, NULL);
-
// the weak pointer lists...
if (weak_ptr_list != NULL) {
thread((void *)&weak_ptr_list);
// Update the stable pointer hash table.
updateStablePtrTable(major_gc);
+ // Remove useless sparks from the spark pools
+#ifdef THREADED_RTS
+ pruneSparkQueues();
+#endif
+
// check sanity after GC
IF_DEBUG(sanity, checkSanity());