Back out part of the previous commit that shouldn't have gone in, and
tidy up a little.
/* -----------------------------------------------------------------------------
/* -----------------------------------------------------------------------------
- * $Id: StgProf.h,v 1.11 2001/10/03 13:57:42 simonmar Exp $
+ * $Id: StgProf.h,v 1.12 2001/10/18 13:19:49 simonmar Exp $
*
* (c) The GHC Team, 1998
*
*
* (c) The GHC Team, 1998
*
/* used for accumulating costs at the end of the run... */
unsigned long time_ticks;
/* used for accumulating costs at the end of the run... */
unsigned long time_ticks;
- unsigned long long mem_alloc;
+ unsigned long mem_alloc;
struct _CostCentreStack *prevStack;
struct _IndexTable *indexTable;
struct _CostCentreStack *prevStack;
struct _IndexTable *indexTable;
- unsigned long long scc_count;
+ unsigned long scc_count;
unsigned long time_ticks;
unsigned long time_ticks;
- unsigned long long mem_alloc;
+ unsigned long mem_alloc;
unsigned long mem_resid;
unsigned long inherited_ticks;
unsigned long mem_resid;
unsigned long inherited_ticks;
- unsigned long long inherited_alloc;
+ unsigned long inherited_alloc;
CostCentre *root;
} CostCentreStack;
CostCentre *root;
} CostCentreStack;
* The rest is PROFILING only...
* ---------------------------------------------------------------------------*/
* The rest is PROFILING only...
* ---------------------------------------------------------------------------*/
-#define CCS_ALLOC(ccs, amount) doNothing()
-#define ENTER_CC_PAP_CL(r) doNothing()
-#define ENTER_CCS_PAP_CL(r) doNothing()
-
-#else /* PROFILING... */
-
/* -----------------------------------------------------------------------------
* Constants
* ---------------------------------------------------------------------------*/
/* -----------------------------------------------------------------------------
* Constants
* ---------------------------------------------------------------------------*/
#define CC_IS_CAF 'c' /* 'c' => *is* a CAF cc */
#define CC_IS_BORING 'B' /* 'B' => *not* a CAF/sub cc */
#define CC_IS_CAF 'c' /* 'c' => *is* a CAF cc */
#define CC_IS_BORING 'B' /* 'B' => *not* a CAF/sub cc */
/* -----------------------------------------------------------------------------
/* -----------------------------------------------------------------------------
- * Data Structures
- * ---------------------------------------------------------------------------*/
-/*
- * IndexTable
- */
+ * Data Structures
+ * ---------------------------------------------------------------------------*/
typedef struct _IndexTable {
CostCentre *cc;
typedef struct _IndexTable {
CostCentre *cc;
/* temp EW */
#define STATIC_CCS_REF(ccs) (ccs)
/* temp EW */
#define STATIC_CCS_REF(ccs) (ccs)
+/* -----------------------------------------------------------------------------
+ When not profiling, these macros do nothing...
+ -------------------------------------------------------------------------- */
+#else /* !PROFILING */
+
+#define CCS_ALLOC(ccs, amount) doNothing()
+#define ENTER_CC_PAP_CL(r) doNothing()
+#define ENTER_CCS_PAP_CL(r) doNothing()
+
#endif /* PROFILING */
#endif /* STGPROF_H */
#endif /* PROFILING */
#endif /* STGPROF_H */