projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2005-01-28 12:55:17 by simonmar]
[ghc-hetmet.git]
/
ghc
/
includes
/
TSO.h
diff --git
a/ghc/includes/TSO.h
b/ghc/includes/TSO.h
index
958527c
..
a0446b0
100644
(file)
--- a/
ghc/includes/TSO.h
+++ b/
ghc/includes/TSO.h
@@
-1,5
+1,5
@@
/* -----------------------------------------------------------------------------
/* -----------------------------------------------------------------------------
- * $Id: TSO.h,v 1.38 2004/11/10 02:13:12 wolfgang Exp $
+ * $Id: TSO.h,v 1.40 2005/01/28 12:55:53 simonmar Exp $
*
* (c) The GHC Team, 1998-1999
*
*
* (c) The GHC Team, 1998-1999
*
@@
-85,7
+85,7
@@
typedef StgWord32 StgThreadID;
*/
typedef unsigned int StgThreadReturnCode;
*/
typedef unsigned int StgThreadReturnCode;
-#if defined(mingw32_TARGET_OS)
+#if defined(mingw32_HOST_OS)
/* results from an async I/O request + it's ID. */
typedef struct {
unsigned int reqID;
/* results from an async I/O request + it's ID. */
typedef struct {
unsigned int reqID;
@@
-98,7
+98,7
@@
typedef union {
StgClosure *closure;
struct StgTSO_ *tso;
StgInt fd; // StgInt instead of int, so that it's the same size as the ptrs
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)
+#if defined(mingw32_HOST_OS)
StgAsyncIOResult* async_result;
#endif
StgWord target;
StgAsyncIOResult* async_result;
#endif
StgWord target;
@@
-136,6
+136,7
@@
typedef struct StgTSO_ {
StgThreadID id;
int saved_errno;
struct StgMainThread_* main;
StgThreadID id;
int saved_errno;
struct StgMainThread_* main;
+ struct StgTRecHeader_ *trec; // STM transaction record
#ifdef TICKY_TICKY
// TICKY-specific stuff would go here.
#ifdef TICKY_TICKY
// TICKY-specific stuff would go here.
@@
-183,6
+184,8
@@
typedef struct StgTSO_ {
BlockedOnBlackHole the BLACKHOLE_BQ the BLACKHOLE_BQ's queue
BlockedOnMVar the MVAR the MVAR's queue
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
BlockedOnException the TSO TSO->blocked_exception