projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
change throwTo to use tryWakeupThread rather than unblockOne
[ghc-hetmet.git]
/
rts
/
Messages.c
diff --git
a/rts/Messages.c
b/rts/Messages.c
index
2b40f76
..
6a7c64d
100644
(file)
--- a/
rts/Messages.c
+++ b/
rts/Messages.c
@@
-114,11
+114,9
@@
loop:
switch (r) {
case THROWTO_SUCCESS:
switch (r) {
case THROWTO_SUCCESS:
- ASSERT(t->source->sp[0] == (StgWord)&stg_block_throwto_info);
- t->source->sp += 3;
- unblockOne(cap, t->source);
// this message is done
// this message is done
- unlockClosure((StgClosure*)m, &stg_IND_info);
+ unlockClosure((StgClosure*)m, &stg_MSG_NULL_info);
+ tryWakeupThread(cap, t->source);
break;
case THROWTO_BLOCKED:
// unlock the message
break;
case THROWTO_BLOCKED:
// unlock the message
@@
-137,7
+135,7
@@
loop:
}
return;
}
}
return;
}
- else if (i == &stg_IND_info)
+ else if (i == &stg_IND_info || i == &stg_MSG_NULL_info)
{
// message was revoked
return;
{
// message was revoked
return;