projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2003-11-17 14:47:52 by simonmar]
[ghc-hetmet.git]
/
ghc
/
includes
/
TSO.h
diff --git
a/ghc/includes/TSO.h
b/ghc/includes/TSO.h
index
7c6e1c0
..
f72d3bb
100644
(file)
--- a/
ghc/includes/TSO.h
+++ b/
ghc/includes/TSO.h
@@
-1,5
+1,5
@@
/* -----------------------------------------------------------------------------
/* -----------------------------------------------------------------------------
- * $Id: TSO.h,v 1.31 2003/07/03 15:14:58 sof 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 {
@@
-194,12
+209,13
@@
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* */
/* The thread stack... */
StgWord stack_size; /* stack size in *words* */