projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix #3741, simplifying things in the process
[ghc-hetmet.git]
/
rts
/
Capability.c
diff --git
a/rts/Capability.c
b/rts/Capability.c
index
9294949
..
f4fdd70
100644
(file)
--- a/
rts/Capability.c
+++ b/
rts/Capability.c
@@
-213,7
+213,6
@@
initCapability( Capability *cap, nat i )
cap->no = i;
cap->in_haskell = rtsFalse;
cap->no = i;
cap->in_haskell = rtsFalse;
- cap->in_gc = rtsFalse;
cap->run_queue_hd = END_TSO_QUEUE;
cap->run_queue_tl = END_TSO_QUEUE;
cap->run_queue_hd = END_TSO_QUEUE;
cap->run_queue_tl = END_TSO_QUEUE;
@@
-253,6
+252,7
@@
initCapability( Capability *cap, nat i )
cap->free_trec_headers = NO_TREC;
cap->transaction_tokens = 0;
cap->context_switch = 0;
cap->free_trec_headers = NO_TREC;
cap->transaction_tokens = 0;
cap->context_switch = 0;
+ cap->pinned_object_block = NULL;
}
/* ---------------------------------------------------------------------------
}
/* ---------------------------------------------------------------------------
@@
-830,6
+830,7
@@
static void
freeCapability (Capability *cap)
{
stgFree(cap->mut_lists);
freeCapability (Capability *cap)
{
stgFree(cap->mut_lists);
+ stgFree(cap->saved_mut_lists);
#if defined(THREADED_RTS)
freeSparkPool(cap->sparks);
#endif
#if defined(THREADED_RTS)
freeSparkPool(cap->sparks);
#endif