summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorEdward Z. Yang <ezyang@cs.stanford.edu>2014-07-01 14:43:50 +0100
committerEdward Z. Yang <ezyang@cs.stanford.edu>2014-07-01 06:44:48 -0700
commit5f3c5384df59717ca8013c5df8d1f65692867825 (patch)
treef58945bed197a028713d432c3ec01d40d2f8ac10 /includes
parent94c47f570f23f157f06c77782977210cbfbd2bd1 (diff)
downloadhaskell-5f3c5384df59717ca8013c5df8d1f65692867825.tar.gz
Partially fix #9003 by reverting bad numbering.
Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>
Diffstat (limited to 'includes')
-rw-r--r--includes/rts/Constants.h28
1 files changed, 15 insertions, 13 deletions
diff --git a/includes/rts/Constants.h b/includes/rts/Constants.h
index 842c37b369..6fd0dc0dfc 100644
--- a/includes/rts/Constants.h
+++ b/includes/rts/Constants.h
@@ -202,32 +202,34 @@
*/
#define NotBlocked 0
#define BlockedOnMVar 1
-#define BlockedOnMVarRead 2
-#define BlockedOnBlackHole 3
-#define BlockedOnRead 4
-#define BlockedOnWrite 5
-#define BlockedOnDelay 6
-#define BlockedOnSTM 7
+#define BlockedOnMVarRead 14 /* TODO: renumber me, see #9003 */
+#define BlockedOnBlackHole 2
+#define BlockedOnRead 3
+#define BlockedOnWrite 4
+#define BlockedOnDelay 5
+#define BlockedOnSTM 6
/* Win32 only: */
-#define BlockedOnDoProc 8
+#define BlockedOnDoProc 7
/* Only relevant for PAR: */
/* blocked on a remote closure represented by a Global Address: */
-#define BlockedOnGA 9
+#define BlockedOnGA 8
/* same as above but without sending a Fetch message */
-#define BlockedOnGA_NoSend 10
+#define BlockedOnGA_NoSend 9
/* Only relevant for THREADED_RTS: */
-#define BlockedOnCCall 11
-#define BlockedOnCCall_Interruptible 12
+#define BlockedOnCCall 10
+#define BlockedOnCCall_Interruptible 11
/* same as above but permit killing the worker thread */
/* Involved in a message sent to tso->msg_cap */
-#define BlockedOnMsgThrowTo 13
+#define BlockedOnMsgThrowTo 12
/* The thread is not on any run queues, but can be woken up
by tryWakeupThread() */
-#define ThreadMigrating 14
+#define ThreadMigrating 13
+
+/* WARNING WARNING top number is BlockedOnMVarRead 14, not 13!! */
/*
* These constants are returned to the scheduler by a thread that has