[project @ 2006-01-06 16:30:17 by simonmar]

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

diff --git a/ghc/includes/TSO.h b/ghc/includes/TSO.h
index 958527c..747c070 100644 (file)
--- a/ghc/includes/TSO.h
+++ b/ghc/includes/TSO.h
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: TSO.h,v 1.38 2004/11/10 02:13:12 wolfgang Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -85,8 +84,8 @@ typedef StgWord32 StgThreadID;
  */
 typedef unsigned int StgThreadReturnCode;
 
-#if defined(mingw32_TARGET_OS)
-/* results from an async I/O request + it's ID. */
+#if defined(mingw32_HOST_OS)
+/* results from an async I/O request + its request ID. */
 typedef struct {
   unsigned int reqID;
   int          len;
@@ -97,9 +96,9 @@ typedef struct {
 typedef union {
   StgClosure *closure;
   struct StgTSO_ *tso;
-  StgInt fd;   // StgInt instead of int, so that it's the same size as the ptrs
-#if defined(mingw32_TARGET_OS)
-  StgAsyncIOResult* async_result;
+  StgInt fd;   /* StgInt instead of int, so that it's the same size as the ptrs */
+#if defined(mingw32_HOST_OS)
+  StgAsyncIOResult *async_result;
 #endif
   StgWord target;
 } StgTSOBlockInfo;
@@ -125,20 +124,20 @@ typedef union {
 typedef struct StgTSO_ {
   StgHeader          header;
 
-  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 */
+  struct StgTSO_*    link;          /* Links threads onto blocking queues */
+  struct StgTSO_*    global_link;    /* Links all threads together */
   
-  StgWord16           what_next;  // Values defined in Constants.h
-  StgWord16           why_blocked;  // Values defined in Constants.h
+  StgWord16           what_next;  /* Values defined in Constants.h */
+  StgWord16           why_blocked;  /* Values defined in Constants.h */
   StgTSOBlockInfo    block_info;
   struct StgTSO_*    blocked_exceptions;
   StgThreadID        id;
   int                saved_errno;
-  struct StgMainThread_* main;
+  struct Task_*      bound;          // non-NULL for a bound thread
+  struct StgTRecHeader_ *trec;       /* STM transaction record */
   
 #ifdef TICKY_TICKY
-  // TICKY-specific stuff would go here.
+  /* TICKY-specific stuff would go here. */
 #endif
 #ifdef PROFILING
    StgTSOProfInfo prof;
@@ -183,6 +182,8 @@ typedef struct StgTSO_ {
         BlockedOnBlackHole     the BLACKHOLE_BQ     the BLACKHOLE_BQ's queue
        
         BlockedOnMVar          the MVAR             the MVAR's queue
+
+       BlockedOnSTM           END_TSO_QUEUE        STM wait queue(s)
        
         BlockedOnException     the TSO              TSO->blocked_exception
 
@@ -239,7 +240,11 @@ extern StgTSO dummy_tso;
 
 
 /* this is the NIL ptr for a TSO queue (e.g. runnable queue) */
+#if IN_STG_CODE
+#define END_TSO_QUEUE  (stg_END_TSO_QUEUE_closure)
+#else
 #define END_TSO_QUEUE  ((StgTSO *)(void*)&stg_END_TSO_QUEUE_closure)
+#endif
 
 #if defined(PAR) || defined(GRAN)
 /* this is the NIL ptr for a blocking queue */