[project @ 2000-03-20 09:42:49 by andy]

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

diff --git a/ghc/includes/TSO.h b/ghc/includes/TSO.h
index 2b81f76..4de0562 100644 (file)
--- a/ghc/includes/TSO.h
+++ b/ghc/includes/TSO.h
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: TSO.h,v 1.11 2000/01/22 18:00:03 simonmar Exp $
+ * $Id: TSO.h,v 1.14 2000/03/20 09:42:49 andy Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -72,7 +72,7 @@ typedef enum {
 } StgTSOState;
 
 /*
- * The whatNext field of a TSO indicates how the thread is to be run. 
+ * The what_next field of a TSO indicates how the thread is to be run. 
  */
 typedef enum {
   ThreadEnterGHC,              /* enter top thunk on stack */
@@ -130,7 +130,11 @@ typedef union {
   StgClosure *closure;
   struct StgTSO_ *tso;
   int fd;
+#if defined(INTERPRETER) && !defined(HAVE_SETITIMER)
+  unsigned int target;
+#else
   unsigned int delay;
+#endif
 #if defined(PAR)
   globalAddr ga;
 #endif
@@ -144,10 +148,12 @@ typedef union {
 
 typedef struct StgTSO_ {
   StgHeader          header;
-  struct StgTSO_*    link;
-  /* SDM and HWL agree that it would be cool to have a list of all TSOs */
-  StgMutClosure *    mut_link; /* TSO's are mutable of course! */
-  StgTSOWhatNext     whatNext;
+
+  struct StgTSO_*    link;          /* Links threads onto blocking queues */
+  StgMutClosure *    mut_link;      /* TSO's are mutable of course! */
+  struct StgTSO_*    global_link;    /* Links all threads together */
+  
+  StgTSOWhatNext     what_next;
   StgTSOBlockReason  why_blocked;
   StgTSOBlockInfo    block_info;
   struct StgTSO_*    blocked_exceptions;
@@ -201,12 +207,12 @@ typedef struct StgTSO_ {
 
    A zombie thread has the following properties:
       
-      tso->whatNext == ThreadComplete or ThreadKilled
+      tso->what_next == ThreadComplete or ThreadKilled
       tso->link     ==  (could be on some queue somewhere)
       tso->su       ==  tso->stack + tso->stack_size
       tso->sp       ==  tso->stack + tso->stack_size - 1 (i.e. top stack word)
-      tso->sp[0]    ==  return value of thread, if whatNext == ThreadComplete,
-                        exception             , if whatNext == ThreadKilled
+      tso->sp[0]    ==  return value of thread, if what_next == ThreadComplete,
+                        exception             , if what_next == ThreadKilled
 
       (tso->sp is left pointing at the top word on the stack so that
       the return value or exception will be retained by a GC).