projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2004-02-12 02:04:59 by mthomas]
[ghc-hetmet.git]
/
ghc
/
includes
/
TSO.h
diff --git
a/ghc/includes/TSO.h
b/ghc/includes/TSO.h
index
6630581
..
f72d3bb
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.33 2003/11/12 17:27:05 sof Exp $
*
* (c) The GHC Team, 1998-1999
*
*
* (c) The GHC Team, 1998-1999
*
@@
-41,15
+41,21
@@
typedef struct {
CostCentreStack *CCCS; /* thread's current CCS */
} StgTSOProfInfo;
#else /* !PROFILING */
CostCentreStack *CCCS; /* thread's current CCS */
} StgTSOProfInfo;
#else /* !PROFILING */
+# if defined(SUPPORTS_EMPTY_STRUCTS)
typedef struct {
typedef struct {
+ /* empty */
} StgTSOProfInfo;
} StgTSOProfInfo;
+# endif
#endif /* PROFILING */
#if defined(PAR)
typedef StgTSOStatBuf StgTSOParInfo;
#else /* !PAR */
#endif /* PROFILING */
#if defined(PAR)
typedef StgTSOStatBuf StgTSOParInfo;
#else /* !PAR */
+# if defined(SUPPORTS_EMPTY_STRUCTS)
typedef struct {
typedef struct {
+ /* empty */
} StgTSOParInfo;
} StgTSOParInfo;
+# endif
#endif /* PAR */
#if defined(DIST)
#endif /* PAR */
#if defined(DIST)
@@
-59,15
+65,21
@@
typedef struct {
StgInt revalSlot;
} StgTSODistInfo;
#else /* !DIST */
StgInt revalSlot;
} StgTSODistInfo;
#else /* !DIST */
+# if defined(SUPPORTS_EMPTY_STRUCTS)
typedef struct {
typedef struct {
+ /* empty */
} StgTSODistInfo;
} StgTSODistInfo;
+# endif
#endif /* DIST */
#if defined(GRAN)
typedef StgTSOStatBuf StgTSOGranInfo;
#else /* !GRAN */
#endif /* DIST */
#if defined(GRAN)
typedef StgTSOStatBuf StgTSOGranInfo;
#else /* !GRAN */
+# if defined(SUPPORTS_EMPTY_STRUCTS)
typedef struct {
typedef struct {
+ /* empty */
} StgTSOGranInfo;
} StgTSOGranInfo;
+# endif
#endif /* GRAN */
#endif /* GRAN */
@@
-75,8
+87,11
@@
typedef struct {
typedef struct {
} StgTSOTickyInfo;
#else /* !TICKY_TICKY */
typedef struct {
} StgTSOTickyInfo;
#else /* !TICKY_TICKY */
+# if defined(SUPPORTS_EMPTY_STRUCTS)
typedef struct {
typedef struct {
+ /* empty */
} StgTSOTickyInfo;
} StgTSOTickyInfo;
+# endif
#endif /* TICKY_TICKY */
typedef enum {
#endif /* TICKY_TICKY */
typedef enum {
@@
-88,20
+103,15
@@
typedef enum {
* The what_next field of a TSO indicates how the thread is to be run.
*/
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 */
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;
/*
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;
*/
typedef StgWord32 StgThreadID;
@@
-144,16
+154,36
@@
typedef enum {
BlockedOnRead,
BlockedOnWrite,
BlockedOnDelay
BlockedOnRead,
BlockedOnWrite,
BlockedOnDelay
+#if defined(mingw32_TARGET_OS)
+ , BlockedOnDoProc
+#endif
#if defined(PAR)
, 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(PAR)
, 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;
} StgTSOBlockReason;
+#if defined(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;
typedef union {
StgClosure *closure;
struct StgTSO_ *tso;
int fd;
+#if defined(mingw32_TARGET_OS)
+ StgAsyncIOResult* async_result;
+#endif
unsigned int target;
} StgTSOBlockInfo;
unsigned int target;
} StgTSOBlockInfo;
@@
-179,20
+209,20
@@
typedef struct StgTSO_ {
StgTSOBlockInfo block_info;
struct StgTSO_* blocked_exceptions;
StgThreadID id;
StgTSOBlockInfo block_info;
struct StgTSO_* blocked_exceptions;
StgThreadID id;
-
- StgTSOTickyInfo ticky;
- StgTSOProfInfo prof;
- StgTSOParInfo par;
- StgTSOGranInfo gran;
- StgTSODistInfo dist;
+ int saved_errno;
+
+ MAYBE_EMPTY_STRUCT(StgTSOTickyInfo,ticky)
+ MAYBE_EMPTY_STRUCT(StgTSOProfInfo,prof)
+ MAYBE_EMPTY_STRUCT(StgTSOParInfo,par)
+ MAYBE_EMPTY_STRUCT(StgTSOGranInfo,gran)
+ MAYBE_EMPTY_STRUCT(StgTSODistInfo,dist)
/* The thread stack... */
StgWord stack_size; /* stack size in *words* */
StgWord max_stack_size; /* maximum stack size in *words* */
StgPtr sp;
/* The thread stack... */
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;
/* -----------------------------------------------------------------------------
} StgTSO;
/* -----------------------------------------------------------------------------
@@
-267,7
+297,7
@@
typedef struct StgTSO_ {
extern StgTSO dummy_tso;
#define TSO_STRUCT_SIZE \
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_))
#define TSO_STRUCT_SIZEW (TSO_STRUCT_SIZE / sizeof(W_))