Rename struct _CostCentreStack to struct CostCentreStack_ for consistency
authorSimon Marlow <marlowsd@gmail.com>
Wed, 4 Jan 2012 15:23:15 +0000 (15:23 +0000)
committerSimon Marlow <marlowsd@gmail.com>
Thu, 5 Jan 2012 15:20:17 +0000 (15:20 +0000)
Needed by #5357

includes/rts/prof/CCS.h
includes/stg/Regs.h

index 3639e49..2492bb3 100644 (file)
@@ -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;
 
index 0608c8e..1f22c60 100644 (file)
@@ -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 */