Commit 948c01bd authored by Simon Marlow's avatar Simon Marlow

profiling build fixes

parent a53ccca7
...@@ -176,7 +176,6 @@ extern CostCentreStack * RTS_VAR(CCS_LIST); /* registered CCS list */ ...@@ -176,7 +176,6 @@ extern CostCentreStack * RTS_VAR(CCS_LIST); /* registered CCS list */
#define REGISTER_CC(cc) \ #define REGISTER_CC(cc) \
do { \ do { \
extern CostCentre cc[]; \
if ((cc)->link == (CostCentre *)0) { \ if ((cc)->link == (CostCentre *)0) { \
(cc)->link = CC_LIST; \ (cc)->link = CC_LIST; \
CC_LIST = (cc); \ CC_LIST = (cc); \
...@@ -185,7 +184,6 @@ extern CostCentreStack * RTS_VAR(CCS_LIST); /* registered CCS list */ ...@@ -185,7 +184,6 @@ extern CostCentreStack * RTS_VAR(CCS_LIST); /* registered CCS list */
#define REGISTER_CCS(ccs) \ #define REGISTER_CCS(ccs) \
do { \ do { \
extern CostCentreStack ccs[]; \
if ((ccs)->prevStack == (CostCentreStack *)0) { \ if ((ccs)->prevStack == (CostCentreStack *)0) { \
(ccs)->prevStack = CCS_LIST; \ (ccs)->prevStack = CCS_LIST; \
CCS_LIST = (ccs); \ CCS_LIST = (ccs); \
......
...@@ -23,17 +23,22 @@ ...@@ -23,17 +23,22 @@
* because retainer profiling also expects LDVW(c) to be initialised * because retainer profiling also expects LDVW(c) to be initialised
* to zero. * to zero.
*/ */
#ifndef CMINUSMINUS
#define LDV_RECORD_CREATE(c) \
LDVW((c)) = ((StgWord)RTS_DEREF(era) << LDV_SHIFT) | LDV_STATE_CREATE
#endif
#ifdef CMINUSMINUS #ifdef CMINUSMINUS
#define LDV_RECORD_DEAD_FILL_SLOP_DYNAMIC(c) \ #define LDV_RECORD_DEAD_FILL_SLOP_DYNAMIC(c) \
foreign "C" LDV_recordDead_FILL_SLOP_DYNAMIC(c "ptr") foreign "C" LDV_recordDead_FILL_SLOP_DYNAMIC(c "ptr")
#else #else
#define LDV_RECORD_CREATE(c) \
LDVW((c)) = ((StgWord)RTS_DEREF(era) << LDV_SHIFT) | LDV_STATE_CREATE
void LDV_recordDead_FILL_SLOP_DYNAMIC( StgClosure *p );
#define LDV_RECORD_DEAD_FILL_SLOP_DYNAMIC(c) \ #define LDV_RECORD_DEAD_FILL_SLOP_DYNAMIC(c) \
LDV_recordDead_FILL_SLOP_DYNAMIC(c) LDV_recordDead_FILL_SLOP_DYNAMIC(c)
#endif #endif
#else /* !PROFILING */ #else /* !PROFILING */
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include "Rts.h" #include "Rts.h"
#include "Profiling.h" #include "Profiling.h"
#include "LdvProfile.h"
#include "Stats.h" #include "Stats.h"
#include "RtsUtils.h" #include "RtsUtils.h"
#include "Schedule.h" #include "Schedule.h"
......
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
#include "ProfHeap.h" #include "ProfHeap.h"
extern void LDV_recordDead_FILL_SLOP_DYNAMIC( StgClosure *p );
extern void LdvCensusForDead ( nat ); extern void LdvCensusForDead ( nat );
extern void LdvCensusKillAll ( void ); extern void LdvCensusKillAll ( void );
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include "Stats.h" #include "Stats.h"
#include "ProfHeap.h" #include "ProfHeap.h"
#include "Apply.h" #include "Apply.h"
#include "sm/Storage.h" // for END_OF_STATIC_LIST
/* /*
Note: what to change in order to plug-in a new retainer profiling scheme? Note: what to change in order to plug-in a new retainer profiling scheme?
......
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
extern void initRetainerProfiling ( void ); extern void initRetainerProfiling ( void );
extern void endRetainerProfiling ( void ); extern void endRetainerProfiling ( void );
extern void printRetainer ( FILE *, retainer );
extern void retainerProfile ( void ); extern void retainerProfile ( void );
extern void resetStaticObjectForRetainerProfiling( StgClosure *static_objects ); extern void resetStaticObjectForRetainerProfiling( StgClosure *static_objects );
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include "Compact.h" #include "Compact.h"
#include "Prelude.h" #include "Prelude.h"
#include "Trace.h" #include "Trace.h"
#include "LdvProfile.h"
#if defined(PROF_SPIN) && defined(THREADED_RTS) && defined(PARALLEL_GC) #if defined(PROF_SPIN) && defined(THREADED_RTS) && defined(PARALLEL_GC)
StgWord64 whitehole_spin = 0; StgWord64 whitehole_spin = 0;
......
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#endif #endif
#include "Trace.h" #include "Trace.h"
#include "RetainerProfile.h" #include "RetainerProfile.h"
#include "LdvProfile.h"
#include "RaiseAsync.h" #include "RaiseAsync.h"
#include "Papi.h" #include "Papi.h"
#include "Stable.h" #include "Stable.h"
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include "Trace.h" #include "Trace.h"
#include "Sanity.h" #include "Sanity.h"
#include "Capability.h" #include "Capability.h"
#include "LdvProfile.h"
static void scavenge_stack (StgPtr p, StgPtr stack_end); static void scavenge_stack (StgPtr p, StgPtr stack_end);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment