X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=includes%2FRtsTypes.h;h=79bbf1fccf0898311f4a8f796454b76b2cab867e;hb=1d141bd52e6eea321e90cd11059f726094dd50be;hp=9e8c7b847b8b4c78227bbe81a992a9c00d9596dc;hpb=0065d5ab628975892cea1ec7303f968c3338cbe1;p=ghc-hetmet.git diff --git a/includes/RtsTypes.h b/includes/RtsTypes.h index 9e8c7b8..79bbf1f 100644 --- a/includes/RtsTypes.h +++ b/includes/RtsTypes.h @@ -1,8 +1,10 @@ -/* - Time-stamp: <2005-03-30 12:02:33 simonmar> - - RTS specific types. -*/ +/* ----------------------------------------------------------------------------- + * + * (c) The GHC Team, 1998-2008 + * + * RTS-specific types. + * + * ---------------------------------------------------------------------------*/ /* ------------------------------------------------------------------------- Generally useful typedefs @@ -39,50 +41,4 @@ typedef enum { typedef ullong rtsTime; -#if defined(PAR) -/* types only needed in the parallel system */ -typedef struct hashtable ParHashTable; -typedef struct hashlist ParHashList; - -/* typedef double REAL_TIME; */ -/* typedef W_ TIME; */ -/* typedef GlobalTaskId Proc; */ -typedef int GlobalTaskId; -typedef GlobalTaskId PEs; -typedef unsigned int rtsWeight; -typedef int rtsPacket; -typedef int OpCode; - -/* Global addresses i.e. unique ids in a parallel setup; needed in Closures.h*/ -typedef struct { - union { - StgPtr plc; - struct { - GlobalTaskId gtid; - int slot; - } gc; - } payload; - rtsWeight weight; -} globalAddr; - -/* (GA, LA) pairs */ -typedef struct gala { - globalAddr ga; - StgPtr la; - struct gala *next; - rtsBool preferred; -} GALA; - -#elif defined(GRAN) - -/* - * GlobalTaskId is dummy in GranSim; - * we define it to have cleaner code in the RTS - */ -typedef int GlobalTaskId; -typedef lnat rtsTime; -typedef StgWord PEs; - -#endif - #endif /* RTS_TYPES_H */