X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fincludes%2FStgProf.h;h=165475d8119775807676ca1488f790712e98edce;hb=de49ea3df4f59226585f9903cde457050c4691b6;hp=825c8461f1fe6581fb19e3124656894e8de85a16;hpb=db61851c5472bf565cd1da900b33d6e033fd743d;p=ghc-hetmet.git

diff --git a/ghc/includes/StgProf.h b/ghc/includes/StgProf.h
index 825c846..165475d 100644
--- a/ghc/includes/StgProf.h
+++ b/ghc/includes/StgProf.h
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: StgProf.h,v 1.14 2001/11/22 14:25:11 simonmar Exp $
+ * $Id: StgProf.h,v 1.17 2003/11/12 17:27:04 sof Exp $
  *
  * (c) The GHC Team, 1998
  *
@@ -20,7 +20,7 @@ typedef struct _CostCentre {
  
   /* used for accumulating costs at the end of the run... */
   unsigned long time_ticks;
-  unsigned long long mem_alloc;
+  ullong        mem_alloc;
 
   char is_caf;
 
@@ -35,14 +35,16 @@ typedef struct _CostCentreStack {
   struct _CostCentreStack *prevStack;
   struct _IndexTable *indexTable;
 
-  unsigned long long scc_count;
+  unsigned int selected;
+
+  ullong scc_count;
 
   unsigned long time_ticks;
-  unsigned long long mem_alloc;
-  unsigned long mem_resid;
+
+  ullong mem_alloc;
 
   unsigned long inherited_ticks;
-  unsigned long long inherited_alloc;
+  ullong inherited_alloc;
 
   CostCentre *root;
 } CostCentreStack;
@@ -181,10 +183,10 @@ extern CostCentreStack *CCS_LIST;         /* registered CCS list */
 	    cc 			: cc_ident,			\
 	    prevStack 		: NULL,				\
 	    indexTable 		: NULL,				\
+            selected            : 0,				\
 	    scc_count 		: 0,				\
 	    time_ticks 		: 0,				\
 	    mem_alloc 		: 0,				\
-	    mem_resid 		: 0,				\
 	    inherited_ticks 	: 0,				\
 	    inherited_alloc	: 0,				\
 	    root 		: 0,				\
@@ -197,8 +199,6 @@ extern CostCentreStack *CCS_LIST;         /* registered CCS list */
  * Time / Allocation Macros
  * ---------------------------------------------------------------------------*/
 
-#define CCS_TICK(ccs)  (ccs)->time_ticks++
-
 /* eliminate profiling overhead from allocation costs */
 #define CCS_ALLOC(ccs, size) (ccs)->mem_alloc += ((size)-sizeofW(StgProfHeader))