[project @ 2003-04-28 09:57:12 by simonmar]

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

diff --git a/ghc/includes/TSO.h b/ghc/includes/TSO.h
index 6630581..c99a7cd 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.30 2003/02/21 05:34:15 sof Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -88,20 +88,15 @@ typedef enum {
  * The what_next field of a TSO indicates how the thread is to be run. 
  */
 typedef enum {
-  ThreadEnterGHC,              /* enter top thunk on stack */
   ThreadRunGHC,                        /* return to address on top of stack */
-  ThreadEnterInterp,           /* enter top thunk on stack (w/ interpreter) */
+  ThreadInterpret,             /* interpret this thread */
   ThreadKilled,                        /* thread has died, don't run it */
   ThreadRelocated,             /* thread has moved, link points to new locn */
   ThreadComplete               /* thread has finished */
 } 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,12 +143,29 @@ 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
+  , BlockedOnCCall_NoUnblockExc // same as above but don't unblock async exceptions
+                               // in resumeThread()
+#endif
 } StgTSOBlockReason;
 
+#ifdef mingw32_TARGET_OS
+/* results from an async I/O request + it's ID. */
+typedef struct {
+  unsigned int reqID;
+  int          len;
+  int          errCode;
+} StgAsyncIOResult;
+#endif
+
 typedef union {
   StgClosure *closure;
   struct StgTSO_ *tso;
   int fd;
+#ifdef mingw32_TARGET_OS
+  StgAsyncIOResult* async_result;
+#endif
   unsigned int target;
 } StgTSOBlockInfo;
 
@@ -190,9 +202,8 @@ typedef struct StgTSO_ {
   StgWord           stack_size;     /* stack size in *words* */
   StgWord            max_stack_size; /* maximum stack size in *words* */
   StgPtr             sp;
-  StgUpdateFrame*    su;
   
-  StgWord            stack[0];
+  StgWord            stack[FLEXIBLE_ARRAY];
 } StgTSO;
 
 /* -----------------------------------------------------------------------------
@@ -267,7 +278,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_))