X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=includes%2FStorage.h;h=caa7c1d16d1f9119c80482cd6edc22956a81ec8a;hb=df9195e35a6e7c4bce8737e6930d73781ac6cb58;hp=28225d7545113393c430fcb62255de350526e1b7;hpb=2aa877f8588da099351ef51efca3605fd87ea768;p=ghc-hetmet.git

diff --git a/includes/Storage.h b/includes/Storage.h
index 28225d7..caa7c1d 100644
--- a/includes/Storage.h
+++ b/includes/Storage.h
@@ -55,19 +55,21 @@
 typedef struct step_ {
     unsigned int         no;		// step number in this generation
     unsigned int         abs_no;	// absolute step number
-    int                  is_compacted;	// compact this step? (old gen only)
 
     struct generation_ * gen;		// generation this step belongs to
     unsigned int         gen_no;        // generation number (cached)
 
     bdescr *             blocks;	// blocks in this step
     unsigned int         n_blocks;	// number of blocks
+    unsigned int         n_words;       // number of words
 
     struct step_ *       to;		// destination step for live objects
 
     bdescr *             large_objects;	 // large objects (doubly linked)
     unsigned int         n_large_blocks; // no. of blocks used by large objs
 
+    StgTSO *             threads;       // threads in this step
+                                        // linked via global_link
 
     // ------------------------------------
     // Fields below are used during GC only
@@ -84,17 +86,26 @@ typedef struct step_ {
                                         //    and scavenged_large_objects
 #endif
 
+    int          mark;			// mark (not copy)? (old gen only)
+    int          compact;		// compact (not sweep)? (old gen only)
+
     bdescr *     old_blocks;	        // bdescr of first from-space block
     unsigned int n_old_blocks;		// number of blocks in from-space
+    unsigned int live_estimate;         // for sweeping: estimate of live data
     
     bdescr *     todos;		        // blocks waiting to be scavenged
+    bdescr *     todos_last;
     unsigned int n_todos;               // count of above
 
+    bdescr *     part_blocks;           // partially-full scanned blocks
+    unsigned int n_part_blocks;         // count of above
+
     bdescr *     scavenged_large_objects;  // live large objs after GC (d-link)
     unsigned int n_scavenged_large_blocks; // size (not count) of above
 
     bdescr *     bitmap;  		// bitmap for compacting collection
 
+    StgTSO *     old_threads;
 
 } step;
 
@@ -108,6 +119,7 @@ typedef struct generation_ {
     
     // stats information
     unsigned int collections;
+    unsigned int par_collections;
     unsigned int failed_promotions;
 
     // temporary use during GC:
@@ -120,7 +132,7 @@ extern generation * RTS_VAR(g0);
 extern step * RTS_VAR(g0s0);
 extern generation * RTS_VAR(oldest_gen);
 extern step * RTS_VAR(all_steps);
-extern nat total_steps;
+extern nat RTS_VAR(total_steps);
 
 /* -----------------------------------------------------------------------------
    Initialisation / De-initialisation
@@ -172,10 +184,10 @@ extern void freeStorage(void);
 
    -------------------------------------------------------------------------- */
 
-extern StgPtr  allocate        ( nat n );
-extern StgPtr  allocateInGen   ( generation *g, nat n );
-extern StgPtr  allocateLocal   ( Capability *cap, nat n );
-extern StgPtr  allocatePinned  ( nat n );
+extern StgPtr  allocate        ( lnat n );
+extern StgPtr  allocateInGen   ( generation *g, lnat n );
+extern StgPtr  allocateLocal   ( Capability *cap, lnat n );
+extern StgPtr  allocatePinned  ( lnat n );
 extern lnat    allocatedBytes  ( void );
 
 extern bdescr * RTS_VAR(small_alloc_list);
@@ -348,7 +360,7 @@ void dirty_MUT_VAR(StgRegTable *reg, StgClosure *p);
    -------------------------------------------------------------------------- */
 
 #define LOOKS_LIKE_INFO_PTR(p) \
-   (p && LOOKS_LIKE_INFO_PTR_NOT_NULL(p))
+    (p && (IS_FORWARDING_PTR(p) || LOOKS_LIKE_INFO_PTR_NOT_NULL(p)))
 
 #define LOOKS_LIKE_INFO_PTR_NOT_NULL(p) \
    (((StgInfoTable *)(INFO_PTR_TO_STRUCT(p)))->type != INVALID_OBJECT && \
@@ -530,16 +542,17 @@ extern void     resizeNurseries      ( nat blocks );
 extern void     resizeNurseriesFixed ( nat blocks );
 extern lnat     countNurseryBlocks   ( void );
 
+
 /* -----------------------------------------------------------------------------
    Functions from GC.c 
    -------------------------------------------------------------------------- */
 
-typedef void (*evac_fn)(StgClosure **);
+typedef void (*evac_fn)(void *user, StgClosure **root);
 
 extern void         threadPaused ( Capability *cap, StgTSO * );
 extern StgClosure * isAlive      ( StgClosure *p );
-extern void         markCAFs     ( evac_fn evac );
-extern void         GetRoots     ( evac_fn evac );
+extern void         markCAFs     ( evac_fn evac, void *user );
+extern void         GetRoots     ( evac_fn evac, void *user );
 
 /* -----------------------------------------------------------------------------
    Stats 'n' DEBUG stuff
@@ -576,11 +589,14 @@ extern void newDynCAF(StgClosure *);
 extern void move_TSO(StgTSO *src, StgTSO *dest);
 extern StgTSO *relocate_stack(StgTSO *dest, ptrdiff_t diff);
 
-extern StgClosure * RTS_VAR(scavenged_static_objects);
 extern StgWeak    * RTS_VAR(old_weak_ptr_list);
 extern StgWeak    * RTS_VAR(weak_ptr_list);
 extern StgClosure * RTS_VAR(caf_list);
 extern StgClosure * RTS_VAR(revertible_caf_list);
 extern StgTSO     * RTS_VAR(resurrected_threads);
 
+#define IS_FORWARDING_PTR(p) ((((StgWord)p) & 1) != 0)
+#define MK_FORWARDING_PTR(p) (((StgWord)p) | 1)
+#define UN_FORWARDING_PTR(p) (((StgWord)p) - 1)
+
 #endif /* STORAGE_H */