projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't dump simplifier iterations with -dverbose-core2core
[ghc-hetmet.git]
/
rts
/
Threads.c
diff --git
a/rts/Threads.c
b/rts/Threads.c
index
b550cc6
..
d7b5f41
100644
(file)
--- a/
rts/Threads.c
+++ b/
rts/Threads.c
@@
-485,7
+485,7
@@
unblockOne_ (Capability *cap, StgTSO *tso,
{
StgTSO *next;
{
StgTSO *next;
- ASSERT(get_itbl(tso)->type == TSO);
+ // NO, might be a WHITEHOLE: ASSERT(get_itbl(tso)->type == TSO);
ASSERT(tso->why_blocked != NotBlocked);
tso->why_blocked = NotBlocked;
ASSERT(tso->why_blocked != NotBlocked);
tso->why_blocked = NotBlocked;
@@
-657,13
+657,13
@@
awakenBlockedQueue(Capability *cap, StgTSO *tso)
* used by Control.Concurrent for error checking.
* ------------------------------------------------------------------------- */
* used by Control.Concurrent for error checking.
* ------------------------------------------------------------------------- */
-StgBool
+HsBool
rtsSupportsBoundThreads(void)
{
#if defined(THREADED_RTS)
rtsSupportsBoundThreads(void)
{
#if defined(THREADED_RTS)
- return rtsTrue;
+ return HS_BOOL_TRUE;
#else
#else
- return rtsFalse;
+ return HS_BOOL_FALSE;
#endif
}
#endif
}
@@
-707,8
+707,8
@@
printThreadBlockage(StgTSO *tso)
debugBelch("is blocked on an MVar @ %p", tso->block_info.closure);
break;
case BlockedOnException:
debugBelch("is blocked on an MVar @ %p", tso->block_info.closure);
break;
case BlockedOnException:
- debugBelch("is blocked on delivering an exception to thread %d",
- tso->block_info.tso->id);
+ debugBelch("is blocked on delivering an exception to thread %lu",
+ (unsigned long)tso->block_info.tso->id);
break;
case BlockedOnBlackHole:
debugBelch("is blocked on a black hole");
break;
case BlockedOnBlackHole:
debugBelch("is blocked on a black hole");
@@
-744,7
+744,7
@@
printThreadBlockage(StgTSO *tso)
void
printThreadStatus(StgTSO *t)
{
void
printThreadStatus(StgTSO *t)
{
- debugBelch("\tthread %4d @ %p ", t->id, (void *)t);
+ debugBelch("\tthread %4lu @ %p ", (unsigned long)t->id, (void *)t);
{
void *label = lookupThreadLabel(t->id);
if (label) debugBelch("[\"%s\"] ",(char *)label);
{
void *label = lookupThreadLabel(t->id);
if (label) debugBelch("[\"%s\"] ",(char *)label);