projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tweak newArray# documentation again
[ghc-hetmet.git]
/
rts
/
Sparks.c
diff --git
a/rts/Sparks.c
b/rts/Sparks.c
index
a17b78c
..
7e2556d
100644
(file)
--- a/
rts/Sparks.c
+++ b/
rts/Sparks.c
@@
-45,9
+45,9
@@
createSparkThread (Capability *cap)
StgTSO *tso;
tso = createIOThread (cap, RtsFlags.GcFlags.initialStkSize,
StgTSO *tso;
tso = createIOThread (cap, RtsFlags.GcFlags.initialStkSize,
- &base_GHCziConc_runSparks_closure);
+ (StgClosure *)runSparks_closure);
- traceSchedEvent(cap, EVENT_CREATE_SPARK_THREAD, 0, tso->id);
+ traceEventCreateSparkThread(cap, tso->id);
appendToRunQueue(cap,tso);
}
appendToRunQueue(cap,tso);
}
@@
-112,7
+112,7
@@
tryStealSpark (Capability *cap)
* -------------------------------------------------------------------------- */
void
* -------------------------------------------------------------------------- */
void
-pruneSparkQueue (evac_fn evac, void *user, Capability *cap)
+pruneSparkQueue (Capability *cap)
{
SparkPool *pool;
StgClosurePtr spark, tmp, *elements;
{
SparkPool *pool;
StgClosurePtr spark, tmp, *elements;
@@
-208,17
+208,21
@@
pruneSparkQueue (evac_fn evac, void *user, Capability *cap)
pruned_sparks++; // discard spark
cap->sparks_pruned++;
}
pruned_sparks++; // discard spark
cap->sparks_pruned++;
}
- } else {
- if (!(closure_flags[INFO_PTR_TO_STRUCT(info)->type] & _NS)) {
+ } else if (HEAP_ALLOCED(spark) &&
+ (Bdescr((P_)spark)->flags & BF_EVACUATED)) {
+ if (closure_SHOULD_SPARK(spark)) {
elements[botInd] = spark; // keep entry (new address)
elements[botInd] = spark; // keep entry (new address)
- evac (user, &elements[botInd]);
botInd++;
n++;
} else {
pruned_sparks++; // discard spark
cap->sparks_pruned++;
}
botInd++;
n++;
} else {
pruned_sparks++; // discard spark
cap->sparks_pruned++;
}
+ } else {
+ pruned_sparks++; // discard spark
+ cap->sparks_pruned++;
}
}
+
currInd++;
// in the loop, we may reach the bounds, and instantly wrap around
currInd++;
// in the loop, we may reach the bounds, and instantly wrap around