Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Glasgow Haskell Compiler
GHC
Commits
948c01bd
Commit
948c01bd
authored
Aug 05, 2009
by
Simon Marlow
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
profiling build fixes
parent
a53ccca7
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
14 additions
and
8 deletions
+14
-8
includes/rts/prof/CCS.h
includes/rts/prof/CCS.h
+0
-2
includes/rts/prof/LDV.h
includes/rts/prof/LDV.h
+9
-4
rts/LdvProfile.c
rts/LdvProfile.c
+1
-0
rts/LdvProfile.h
rts/LdvProfile.h
+0
-1
rts/RetainerProfile.c
rts/RetainerProfile.c
+1
-0
rts/RetainerProfile.h
rts/RetainerProfile.h
+0
-1
rts/sm/Evac.c
rts/sm/Evac.c
+1
-0
rts/sm/GC.c
rts/sm/GC.c
+1
-0
rts/sm/Scav.c
rts/sm/Scav.c
+1
-0
No files found.
includes/rts/prof/CCS.h
View file @
948c01bd
...
@@ -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); \
...
...
includes/rts/prof/LDV.h
View file @
948c01bd
...
@@ -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 */
...
...
rts/LdvProfile.c
View file @
948c01bd
...
@@ -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"
...
...
rts/LdvProfile.h
View file @
948c01bd
...
@@ -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
);
...
...
rts/RetainerProfile.c
View file @
948c01bd
...
@@ -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?
...
...
rts/RetainerProfile.h
View file @
948c01bd
...
@@ -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
);
...
...
rts/sm/Evac.c
View file @
948c01bd
...
@@ -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
;
...
...
rts/sm/GC.c
View file @
948c01bd
...
@@ -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"
...
...
rts/sm/Scav.c
View file @
948c01bd
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment