[project @ 2002-06-19 20:45:14 by sof]

[ghc-hetmet.git] / ghc / includes / TSO.h

diff --git a/ghc/includes/TSO.h b/ghc/includes/TSO.h
index 6630581..06e8636 100644 (file)
--- a/ghc/includes/TSO.h
+++ b/ghc/includes/TSO.h
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: TSO.h,v 1.20 2001/03/22 03:51:09 hwloidl Exp $
+ * $Id: TSO.h,v 1.26 2002/04/10 11:43:44 stolz Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -97,11 +97,7 @@ typedef enum {
 } StgTSOWhatNext;
 
 /*
- * We are completely paranoid and make thread IDs 64 bits to avoid
- * having to worry about overflow.  A little calculation shows that
- * even doing 10^6 forks per second would take 35 million years to
- * overflow a 64 bit thread ID :-)
- *
+ * Thread IDs are 32 bits.
  */
 typedef StgWord32 StgThreadID;
 
@@ -148,6 +144,9 @@ typedef enum {
   , BlockedOnGA  // blocked on a remote closure represented by a Global Address
   , BlockedOnGA_NoSend // same as above but without sending a Fetch message
 #endif
+#if defined(RTS_SUPPORTS_THREADS)
+  , BlockedOnCCall 
+#endif
 } StgTSOBlockReason;
 
 typedef union {
@@ -179,6 +178,9 @@ typedef struct StgTSO_ {
   StgTSOBlockInfo    block_info;
   struct StgTSO_*    blocked_exceptions;
   StgThreadID        id;
+#ifdef DEBUG
+  char*              label;
+#endif
 
   StgTSOTickyInfo    ticky; 
   StgTSOProfInfo     prof;
@@ -192,7 +194,7 @@ typedef struct StgTSO_ {
   StgPtr             sp;
   StgUpdateFrame*    su;
   
-  StgWord            stack[0];
+  StgWord            stack[FLEXIBLE_ARRAY];
 } StgTSO;
 
 /* -----------------------------------------------------------------------------
@@ -267,7 +269,7 @@ typedef struct StgTSO_ {
 extern StgTSO dummy_tso;
 
 #define TSO_STRUCT_SIZE \
-   ((int)&(dummy_tso).stack - (int)&(dummy_tso).header)
+   ((char *)&dummy_tso.stack - (char *)&dummy_tso.header)
 
 #define TSO_STRUCT_SIZEW (TSO_STRUCT_SIZE / sizeof(W_))