Documentation and refactoring in CCS related code

- Remove REGISTER_CC and REGISTER_CCS macros, add functions registerCC
  and registerCCS to Profiling.c.

- Reduce scope of symbols: CC_LIST, CCS_LIST, CC_ID, CCS_ID

- Document CC_LIST and CCS_LIST

2 files changed, 0 insertions, 36 deletions

diff --git a/includes/rts/prof/CCS.h b/includes/rts/prof/CCS.h
index 89c9fd2b13..e385a9b8fc 100644
--- a/includes/rts/prof/CCS.h
+++ b/includes/rts/prof/CCS.h
@@ -166,9 +166,6 @@ extern CostCentreStack CCS_IDLE[];       // capability is idle
 
 #endif /* IN_STG_CODE */
 
-extern unsigned int RTS_VAR(CC_ID);     // global ids
-extern unsigned int RTS_VAR(CCS_ID);
-
 extern unsigned int RTS_VAR(era);
 
 /* -----------------------------------------------------------------------------
@@ -179,36 +176,7 @@ CostCentreStack * pushCostCentre (CostCentreStack *, CostCentre *);
 void              enterFunCCS    (StgRegTable *reg, CostCentreStack *);
 CostCentre *mkCostCentre (char *label, char *module, char *srcloc);
 
-/* -----------------------------------------------------------------------------
-   Registering CCs and CCSs
-
-   Registering a CC or CCS consists of
-     - assigning it a unique ID
-     - linking it onto the list of registered CCs/CCSs
-
-   Cost centres are registered at startup by a C constructor function
-   generated by the compiler in the _stub.c file for each module.  The
-   macros below are invoked by that C code to register CCs and CCSs.
- -------------------------------------------------------------------------- */
-
 extern CostCentre * RTS_VAR(CC_LIST);               // registered CC list
-extern CostCentreStack * RTS_VAR(CCS_LIST);         // registered CCS list
-
-#define REGISTER_CC(cc)                                 \
-        do {                                            \
-        if ((cc)->link == (CostCentre *)0) {            \
-            (cc)->link = CC_LIST;                       \
-            CC_LIST = (cc);                             \
-            (cc)->ccID = CC_ID++;                       \
-        }} while(0)
-
-#define REGISTER_CCS(ccs)                               \
-        do {                                            \
-        if ((ccs)->prevStack == (CostCentreStack *)0) { \
-          (ccs)->prevStack = CCS_LIST;                  \
-          CCS_LIST = (ccs);                             \
-          (ccs)->ccsID = CCS_ID++;                      \
-        }} while(0)
 
 /* -----------------------------------------------------------------------------
  * Declaring Cost Centres & Cost Centre Stacks.
diff --git a/includes/stg/MiscClosures.h b/includes/stg/MiscClosures.h
index c13b5ff052..8c4cb9fc8c 100644
--- a/includes/stg/MiscClosures.h
+++ b/includes/stg/MiscClosures.h
@@ -523,12 +523,8 @@ extern StgWord RTS_VAR(stable_name_table);
 // Profiling.c
 extern unsigned int RTS_VAR(era);
 extern unsigned int RTS_VAR(entering_PAP);
-extern StgWord      RTS_VAR(CC_LIST);          /* registered CC list */
-extern StgWord      RTS_VAR(CCS_LIST);         /* registered CCS list */
 extern StgWord      CCS_OVERHEAD[];
 extern StgWord      CCS_SYSTEM[];
-extern unsigned int RTS_VAR(CC_ID);            /* global ids */
-extern unsigned int RTS_VAR(CCS_ID);
 
 // Calls to these rts functions are generated directly
 // by codegen (see compiler/codeGen/StgCmmProf.hs)