diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2012-01-04 15:23:15 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2012-01-05 15:20:17 +0000 |
| commit | 53fad2ab6cd5cd39717e74231d49444f1759fcd1 (patch) | |
| tree | 81e9d83725c262e51d276667db83689d1a0aa622 | |
| parent | e04da8a48ea5e8823b09f536330d6c7d796a93b5 (diff) | |
| download | haskell-53fad2ab6cd5cd39717e74231d49444f1759fcd1.tar.gz | |
Rename struct _CostCentreStack to struct CostCentreStack_ for consistency
Needed by #5357
| -rw-r--r-- | includes/rts/prof/CCS.h | 16 | ||||
| -rw-r--r-- | includes/stg/Regs.h | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/includes/rts/prof/CCS.h b/includes/rts/prof/CCS.h index 3639e49aa7..2492bb3bc1 100644 --- a/includes/rts/prof/CCS.h +++ b/includes/rts/prof/CCS.h @@ -29,7 +29,7 @@ int rts_isProfiled(void); * generator (compiler/codeGen/CgProf.hs). */ -typedef struct _CostCentre { +typedef struct CostCentre_ { StgInt ccID; // Unique Id, allocated by the RTS char * label; @@ -42,17 +42,17 @@ typedef struct _CostCentre { StgInt is_caf; // non-zero for a CAF cost centre - struct _CostCentre *link; + struct CostCentre_ *link; } CostCentre; -typedef struct _CostCentreStack { +typedef struct CostCentreStack_ { StgInt ccsID; // unique ID, allocated by the RTS CostCentre *cc; // Cost centre at the top of the stack - struct _CostCentreStack *prevStack; // parent - struct _IndexTable *indexTable; // children - struct _CostCentreStack *root; // root of stack + struct CostCentreStack_ *prevStack; // parent + struct IndexTable_ *indexTable; // children + struct CostCentreStack_ *root; // root of stack StgWord depth; // number of items in the stack StgWord64 scc_count; // Count of times this CCS is entered @@ -103,10 +103,10 @@ typedef struct _CostCentreStack { // subsequent times we push a certain CC on a CCS we get the same // result). -typedef struct _IndexTable { +typedef struct IndexTable_ { CostCentre *cc; CostCentreStack *ccs; - struct _IndexTable *next; + struct IndexTable_ *next; unsigned int back_edge; } IndexTable; diff --git a/includes/stg/Regs.h b/includes/stg/Regs.h index 0608c8e36d..1f22c60c30 100644 --- a/includes/stg/Regs.h +++ b/includes/stg/Regs.h @@ -80,7 +80,7 @@ typedef struct StgRegTable_ { StgPtr rSpLim; StgPtr rHp; StgPtr rHpLim; - struct _CostCentreStack * rCCCS; // current cost-centre-stack + struct CostCentreStack_ * rCCCS; // current cost-centre-stack struct StgTSO_ * rCurrentTSO; struct nursery_ * rNursery; struct bdescr_ * rCurrentNursery; /* Hp/HpLim point into this block */ |