[project @ 2002-12-04 12:06:28 by simonmar]

[ghc-hetmet.git] / ghc / rts / StoragePriv.h

diff --git a/ghc/rts/StoragePriv.h b/ghc/rts/StoragePriv.h
index add78a4..a45e42d 100644 (file)
--- a/ghc/rts/StoragePriv.h
+++ b/ghc/rts/StoragePriv.h
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: StoragePriv.h,v 1.17 2001/08/08 10:50:37 simonmar Exp $
+ * $Id: StoragePriv.h,v 1.22 2002/11/01 11:05:47 simonmar Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -28,9 +28,13 @@ extern StgTSO *relocate_stack(StgTSO *dest, ptrdiff_t diff);
 extern StgClosure *static_objects;
 extern StgClosure *scavenged_static_objects;
 
+extern StgWeak *old_weak_ptr_list;
+
 extern StgWeak    *weak_ptr_list;
 extern StgClosure *caf_list;
 
+extern StgTSO *resurrected_threads;
+
 extern bdescr *small_alloc_list;
 extern bdescr *large_alloc_list;
 extern bdescr *pinned_object_block;
@@ -40,7 +44,6 @@ extern StgPtr alloc_HpLim;
 
 extern bdescr *nursery;
 
-extern nat nursery_blocks;
 extern nat alloc_blocks;
 extern nat alloc_blocks_lim;
 
@@ -51,6 +54,7 @@ extern void     allocNurseries ( void );
 extern void     resetNurseries ( void );
 extern bdescr * allocNursery   ( bdescr *last_bd, nat blocks );
 extern void     resizeNursery  ( nat blocks );
+extern void     tidyAllocateLists ( void );
 
 /* Stats 'n' stuff */
 extern lnat calcAllocated  ( void );
@@ -77,12 +81,13 @@ dbl_link_onto(bdescr *bd, bdescr **list)
 #ifdef DEBUG
 extern void memInventory(void);
 extern void checkSanity(void);
+extern nat  countBlocks(bdescr *);
 #endif
 
 /* 
  * These three are used by the garbage collector when we have
- * dynamically-linked object modules.  (see ClosureMacros.h,
- * IS_CODE_PTR etc.). 
+ * dynamically-linked object modules.  (see Storage.h,
+ * IS_DATA_PTR etc.). 
  * Defined in Linker.c.
  */
 int is_dynamically_loaded_code_or_rodata_ptr ( void* p );
@@ -91,7 +96,8 @@ int is_not_dynamically_loaded_ptr            ( void* p );
 
 /* Functions from GC.c 
  */
-void threadPaused(StgTSO *);
-StgClosure *isAlive(StgClosure *p);
+extern void         threadPaused ( StgTSO * );
+extern StgClosure * isAlive      ( StgClosure *p );
+extern void         markCAFs     ( evac_fn evac );
 
 #endif /* STORAGEPRIV_H */