projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c1d326b
)
move an assertion
author
Simon Marlow
<marlowsd@gmail.com>
Thu, 13 Nov 2008 15:45:42 +0000
(15:45 +0000)
committer
Simon Marlow
<marlowsd@gmail.com>
Thu, 13 Nov 2008 15:45:42 +0000
(15:45 +0000)
rts/Capability.c
patch
|
blob
|
history
diff --git
a/rts/Capability.c
b/rts/Capability.c
index
9b5d81d
..
0b3c844
100644
(file)
--- a/
rts/Capability.c
+++ b/
rts/Capability.c
@@
-725,8
+725,6
@@
shutdownCapability (Capability *cap, Task *task, rtsBool safe)
{
nat i;
- ASSERT(sched_state == SCHED_SHUTTING_DOWN);
-
task->cap = cap;
// Loop indefinitely until all the workers have exited and there
@@
-736,6
+734,8
@@
shutdownCapability (Capability *cap, Task *task, rtsBool safe)
// isn't safe, for one thing).
for (i = 0; /* i < 50 */; i++) {
+ ASSERT(sched_state == SCHED_SHUTTING_DOWN);
+
debugTrace(DEBUG_sched,
"shutting down capability %d, attempt %d", cap->no, i);
ACQUIRE_LOCK(&cap->lock);