projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix Trac #4240: -ddump-minimal-imports
[ghc-hetmet.git]
/
rts
/
Schedule.h
diff --git
a/rts/Schedule.h
b/rts/Schedule.h
index
0db2b1e
..
a00d81a
100644
(file)
--- a/
rts/Schedule.h
+++ b/
rts/Schedule.h
@@
-14,7
+14,7
@@
#include "Capability.h"
#include "Trace.h"
#include "Capability.h"
#include "Trace.h"
-BEGIN_RTS_PRIVATE
+#include "BeginPrivate.h"
/* initScheduler(), exitScheduler()
* Called from STG : no
/* initScheduler(), exitScheduler()
* Called from STG : no
@@
-118,8
+118,10
@@
appendToRunQueue (Capability *cap, StgTSO *tso)
ASSERT(tso->_link == END_TSO_QUEUE);
if (cap->run_queue_hd == END_TSO_QUEUE) {
cap->run_queue_hd = tso;
ASSERT(tso->_link == END_TSO_QUEUE);
if (cap->run_queue_hd == END_TSO_QUEUE) {
cap->run_queue_hd = tso;
+ tso->block_info.prev = END_TSO_QUEUE;
} else {
setTSOLink(cap, cap->run_queue_tl, tso);
} else {
setTSOLink(cap, cap->run_queue_tl, tso);
+ setTSOPrev(cap, tso, cap->run_queue_tl);
}
cap->run_queue_tl = tso;
traceEventThreadRunnable (cap, tso);
}
cap->run_queue_tl = tso;
traceEventThreadRunnable (cap, tso);
@@
-135,6
+137,10
@@
EXTERN_INLINE void
pushOnRunQueue (Capability *cap, StgTSO *tso)
{
setTSOLink(cap, tso, cap->run_queue_hd);
pushOnRunQueue (Capability *cap, StgTSO *tso)
{
setTSOLink(cap, tso, cap->run_queue_hd);
+ tso->block_info.prev = END_TSO_QUEUE;
+ if (cap->run_queue_hd != END_TSO_QUEUE) {
+ setTSOPrev(cap, cap->run_queue_hd, tso);
+ }
cap->run_queue_hd = tso;
if (cap->run_queue_tl == END_TSO_QUEUE) {
cap->run_queue_tl = tso;
cap->run_queue_hd = tso;
if (cap->run_queue_tl == END_TSO_QUEUE) {
cap->run_queue_tl = tso;
@@
-149,6
+155,9
@@
popRunQueue (Capability *cap)
StgTSO *t = cap->run_queue_hd;
ASSERT(t != END_TSO_QUEUE);
cap->run_queue_hd = t->_link;
StgTSO *t = cap->run_queue_hd;
ASSERT(t != END_TSO_QUEUE);
cap->run_queue_hd = t->_link;
+ if (t->_link != END_TSO_QUEUE) {
+ t->_link->block_info.prev = END_TSO_QUEUE;
+ }
t->_link = END_TSO_QUEUE; // no write barrier req'd
if (cap->run_queue_hd == END_TSO_QUEUE) {
cap->run_queue_tl = END_TSO_QUEUE;
t->_link = END_TSO_QUEUE; // no write barrier req'd
if (cap->run_queue_hd == END_TSO_QUEUE) {
cap->run_queue_tl = END_TSO_QUEUE;
@@
-156,6
+165,8
@@
popRunQueue (Capability *cap)
return t;
}
return t;
}
+extern void removeFromRunQueue (Capability *cap, StgTSO *tso);
+
/* Add a thread to the end of the blocked queue.
*/
#if !defined(THREADED_RTS)
/* Add a thread to the end of the blocked queue.
*/
#if !defined(THREADED_RTS)
@@
-203,7
+214,7
@@
emptyThreadQueues(Capability *cap)
#endif /* !IN_STG_CODE */
#endif /* !IN_STG_CODE */
-END_RTS_PRIVATE
+#include "EndPrivate.h"
#endif /* SCHEDULE_H */
#endif /* SCHEDULE_H */