X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fincludes%2FTSO.h;h=19a162e0366c65064b0d77bf1f838c27ccfcade9;hb=6e5df3a4551b8d8b83e936b3f7b52edfc778ca8a;hp=d3a76ae589cd6320a86389f82d04cb9d091a7d6f;hpb=d37986fe8eef5554e6dbd6dbe83db0cce9f62280;p=ghc-hetmet.git diff --git a/ghc/includes/TSO.h b/ghc/includes/TSO.h index d3a76ae..19a162e 100644 --- a/ghc/includes/TSO.h +++ b/ghc/includes/TSO.h @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------------- - * $Id: TSO.h,v 1.13 2000/03/17 13:30:23 simonmar Exp $ + * $Id: TSO.h,v 1.27 2002/06/26 08:18:41 stolz Exp $ * * (c) The GHC Team, 1998-1999 * @@ -11,8 +11,10 @@ #define TSO_H #if defined(GRAN) || defined(PAR) -// magic marker for TSOs; debugging only + +#if DEBUG #define TSO_MAGIC 4321 +#endif typedef struct { StgInt pri; @@ -50,6 +52,17 @@ typedef struct { } StgTSOParInfo; #endif /* PAR */ +#if defined(DIST) +typedef struct { + StgThreadPriority priority; + StgInt revalTid; /* ToDo: merge both into 1 word */ + StgInt revalSlot; +} StgTSODistInfo; +#else /* !DIST */ +typedef struct { +} StgTSODistInfo; +#endif /* DIST */ + #if defined(GRAN) typedef StgTSOStatBuf StgTSOGranInfo; #else /* !GRAN */ @@ -77,18 +90,14 @@ typedef enum { typedef enum { ThreadEnterGHC, /* enter top thunk on stack */ ThreadRunGHC, /* return to address on top of stack */ - ThreadEnterHugs, /* enter top thunk on stack (w/ interpreter) */ + ThreadEnterInterp, /* enter top thunk on stack (w/ interpreter) */ 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; @@ -105,6 +114,16 @@ typedef enum { ThreadFinished } StgThreadReturnCode; +/* + * We distinguish between the various classes of threads in the system. + */ + +typedef enum { + AdvisoryPriority, + MandatoryPriority, + RevalPriority +} StgThreadPriority; + /* * Threads may be blocked for several reasons. A blocked thread will * have the reason in the why_blocked field of the TSO, and some @@ -122,7 +141,11 @@ typedef enum { BlockedOnWrite, BlockedOnDelay #if defined(PAR) - , BlockedOnGA // blocked on a remote closure represented by a Global Address + , 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 #endif } StgTSOBlockReason; @@ -130,10 +153,7 @@ typedef union { StgClosure *closure; struct StgTSO_ *tso; int fd; - unsigned int delay; -#if defined(PAR) - globalAddr ga; -#endif + unsigned int target; } StgTSOBlockInfo; /* @@ -142,6 +162,10 @@ typedef union { * storage manager, and won't be copied during garbage collection. */ +/* + * ToDo: make this structure sensible on a non-32-bit arch. + */ + typedef struct StgTSO_ { StgHeader header; @@ -149,24 +173,25 @@ typedef struct StgTSO_ { StgMutClosure * mut_link; /* TSO's are mutable of course! */ struct StgTSO_* global_link; /* Links all threads together */ - StgTSOWhatNext what_next; - StgTSOBlockReason why_blocked; + StgTSOWhatNext what_next : 16; + StgTSOBlockReason why_blocked : 16; StgTSOBlockInfo block_info; struct StgTSO_* blocked_exceptions; StgThreadID id; + StgTSOTickyInfo ticky; StgTSOProfInfo prof; StgTSOParInfo par; StgTSOGranInfo gran; - + StgTSODistInfo dist; + /* The thread stack... */ StgWord stack_size; /* stack size in *words* */ StgWord max_stack_size; /* maximum stack size in *words* */ StgPtr sp; StgUpdateFrame* su; - StgPtr splim; - StgWord stack[0]; + StgWord stack[FLEXIBLE_ARRAY]; } StgTSO; /* ----------------------------------------------------------------------------- @@ -176,7 +201,6 @@ typedef struct StgTSO_ { tso->stack < tso->sp < tso->stack+tso->stack_size tso->stack_size <= tso->max_stack_size - tso->splim == tso->stack + RESERVED_STACK_WORDS; RESERVED_STACK_WORDS is large enough for any heap-check or stack-check failure. @@ -185,7 +209,7 @@ typedef struct StgTSO_ { (a) smaller than a block, or (b) a multiple of BLOCK_SIZE - tso->block_reason tso->block_info location + tso->why_blocked tso->block_info location ---------------------------------------------------------------------- NotBlocked NULL runnable_queue, or running @@ -198,6 +222,8 @@ typedef struct StgTSO_ { BlockedOnRead NULL blocked_queue BlockedOnWrite NULL blocked_queue BlockedOnDelay NULL blocked_queue + BlockedOnGA closure TSO blocks on BQ of that closure + BlockedOnGA_NoSend closure TSO blocks on BQ of that closure tso->link == END_TSO_QUEUE, if the thread is currently running. @@ -223,6 +249,13 @@ typedef struct StgTSO_ { (StgTSO *)tso if threads are currently awaiting delivery of exceptions to this thread. + The 2 cases BlockedOnGA and BlockedOnGA_NoSend are needed in a GUM + setup only. They mark a TSO that has entered a FETCH_ME or + FETCH_ME_BQ closure, respectively; only the first TSO hitting the + closure will send a Fetch message. + Currently we have no separate code for blocking on an RBH; we use the + BlockedOnBlackHole case for that. -- HWL + ---------------------------------------------------------------------------- */ /* Workaround for a bug/quirk in gcc on certain architectures. @@ -233,7 +266,7 @@ typedef struct StgTSO_ { 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_))