Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Shayne Fletcher
Glasgow Haskell Compiler
Commits
2f861d14
Commit
2f861d14
authored
Mar 13, 2006
by
Simon Marlow
Browse files
fix bug in previous patch to this file
parent
0dbbf193
Changes
1
Hide whitespace changes
Inline
Side-by-side
ghc/rts/Capability.c
View file @
2f861d14
...
...
@@ -59,16 +59,17 @@ anyWorkForMe( Capability *cap, Task *task )
// can't be sure that we have the right capability: the thread
// might be woken up on some other capability, and task->cap
// could change under our feet.
return
(
!
emptyRunQueue
(
cap
)
&&
cap
->
run_queue_hd
->
bound
==
task
)
;
return
!
emptyRunQueue
(
cap
)
&&
cap
->
run_queue_hd
->
bound
==
task
;
}
else
{
// A vanilla worker task runs if either (a) there is a
// lightweight thread at the head of the run queue, or (b)
// there are sparks to execute, or (c) there is some other
// global condition to check, such as threads blocked on
// blackholes.
return
((
!
emptyRunQueue
(
cap
)
&&
cap
->
run_queue_hd
->
bound
==
NULL
)
||
!
emptySparkPoolCap
(
cap
)
||
globalWorkToDo
());
// A vanilla worker task runs if either there is a lightweight
// thread at the head of the run queue, or the run queue is
// empty and (there are sparks to execute, or there is some
// other global condition to check, such as threads blocked on
// blackholes).
if
(
emptyRunQueue
(
cap
))
{
return
!
emptySparkPoolCap
(
cap
)
||
globalWorkToDo
();
}
else
return
cap
->
run_queue_hd
->
bound
==
NULL
;
}
}
#endif
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment