X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FTicky.c;h=7d95b0c7fa89d48bc27c4c83e11a8c0342393eb2;hb=272a418428beede04a9c4ae027474878c59d6ca1;hp=e8ed6ef5102821105c4eced9693221ab6e320b37;hpb=a9e75a0516966c35d0a9e3736f3491498bf4a910;p=ghc-hetmet.git diff --git a/ghc/rts/Ticky.c b/ghc/rts/Ticky.c index e8ed6ef..7d95b0c 100644 --- a/ghc/rts/Ticky.c +++ b/ghc/rts/Ticky.c @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------------- - * $Id: Ticky.c,v 1.4 1999/03/05 12:02:33 kw217 Exp $ + * $Id: Ticky.c,v 1.17 2002/12/11 15:36:54 simonmar Exp $ * * (c) The AQUA project, Glasgow University, 1992-1997 * (c) The GHC Team, 1998-1999 @@ -10,6 +10,7 @@ #if defined(TICKY_TICKY) #define TICKY_C /* define those variables */ +#include "PosixSource.h" #include "Rts.h" #include "RtsFlags.h" #include "Ticky.h" @@ -31,12 +32,12 @@ PrintTickyInfo(void) { unsigned long i; unsigned long tot_allocs = /* total number of things allocated */ - ALLOC_FUN_ctr + ALLOC_THK_ctr + ALLOC_CON_ctr + ALLOC_TUP_ctr + + ALLOC_FUN_ctr + ALLOC_SE_THK_ctr + ALLOC_UP_THK_ctr + ALLOC_CON_ctr + ALLOC_TUP_ctr + ALLOC_TSO_ctr + #ifdef PAR ALLOC_FMBQ_ctr + ALLOC_FME_ctr + ALLOC_BF_ctr + #endif - ALLOC_BH_ctr + ALLOC_UPD_PAP_ctr + ALLOC_PRIM_ctr; + ALLOC_BH_ctr + ALLOC_PAP_ctr + ALLOC_PRIM_ctr; unsigned long tot_adm_wds = /* total number of admin words allocated */ ALLOC_FUN_adm + ALLOC_THK_adm + ALLOC_CON_adm + ALLOC_TUP_adm + @@ -44,7 +45,7 @@ PrintTickyInfo(void) #ifdef PAR ALLOC_FMBQ_adm + ALLOC_FME_adm + ALLOC_BF_adm + #endif - ALLOC_BH_adm + ALLOC_UPD_PAP_adm + ALLOC_PRIM_adm; + ALLOC_BH_adm + ALLOC_PAP_adm + ALLOC_PRIM_adm; unsigned long tot_gds_wds = /* total number of words of ``good stuff'' allocated */ ALLOC_FUN_gds + ALLOC_THK_gds + ALLOC_CON_gds + ALLOC_TUP_gds + @@ -53,7 +54,7 @@ PrintTickyInfo(void) ALLOC_FMBQ_gds + ALLOC_FME_gds + ALLOC_BF_gds + #endif - ALLOC_BH_gds + ALLOC_UPD_PAP_gds + ALLOC_PRIM_gds; + ALLOC_BH_gds + ALLOC_PAP_gds + ALLOC_PRIM_gds; unsigned long tot_slp_wds = /* total number of ``slop'' words allocated */ ALLOC_FUN_slp + ALLOC_THK_slp + ALLOC_CON_slp + ALLOC_TUP_slp + @@ -61,32 +62,39 @@ PrintTickyInfo(void) #ifdef PAR ALLOC_FMBQ_slp + ALLOC_FME_slp + ALLOC_BF_slp + #endif - ALLOC_BH_slp + ALLOC_UPD_PAP_slp + ALLOC_PRIM_slp; + ALLOC_BH_slp + ALLOC_PAP_slp + ALLOC_PRIM_slp; unsigned long tot_wds = /* total words */ tot_adm_wds + tot_gds_wds + tot_slp_wds; + unsigned long tot_thk_enters = ENT_STATIC_THK_ctr + ENT_DYN_THK_ctr; + unsigned long tot_con_enters = ENT_STATIC_CON_ctr + ENT_DYN_CON_ctr; + unsigned long tot_fun_direct_enters = ENT_STATIC_FUN_DIRECT_ctr + ENT_DYN_FUN_DIRECT_ctr; + unsigned long tot_ind_enters = ENT_STATIC_IND_ctr + ENT_DYN_IND_ctr; + + // This is the number of function calls which went via a + // slow/unknown application (one of the stg_ap_ functions). + unsigned long tot_fun_slow_enters = + SLOW_CALL_ctr - SLOW_CALL_BUILT_PAP_ctr - SLOW_CALL_NEW_PAP_ctr; + unsigned long tot_enters = - ENT_CON_ctr + ENT_FUN_DIRECT_ctr + - ENT_IND_ctr + ENT_PAP_ctr + ENT_THK_ctr; + tot_con_enters + tot_fun_direct_enters + + tot_ind_enters + ENT_PERM_IND_ctr + ENT_PAP_ctr + tot_thk_enters; unsigned long jump_direct_enters = tot_enters - ENT_VIA_NODE_ctr; - unsigned long bypass_enters = - ENT_FUN_DIRECT_ctr - - (ENT_FUN_STD_ctr - UPD_PAP_IN_NEW_ctr); unsigned long tot_returns = - RET_NEW_ctr + RET_OLD_ctr + RET_UNBOXED_TUP_ctr + - RET_SEMI_IN_HEAP_ctr + RET_SEMI_BY_DEFAULT_ctr/*?*/; + RET_NEW_ctr + RET_OLD_ctr + RET_UNBOXED_TUP_ctr; unsigned long tot_returns_of_new = RET_NEW_ctr; + unsigned long con_updates = UPD_CON_IN_NEW_ctr + UPD_CON_IN_PLACE_ctr; unsigned long pap_updates = UPD_PAP_IN_NEW_ctr + UPD_PAP_IN_PLACE_ctr; - unsigned long tot_updates = UPD_EXISTING_ctr + UPD_SQUEEZED_ctr + pap_updates; + unsigned long tot_updates = UPD_SQUEEZED_ctr + pap_updates + con_updates; - unsigned long tot_new_updates = UPD_NEW_IND_ctr; - unsigned long tot_old_updates = UPD_OLD_IND_ctr; + unsigned long tot_new_updates = UPD_NEW_IND_ctr + UPD_NEW_PERM_IND_ctr; + unsigned long tot_old_updates = UPD_OLD_IND_ctr + UPD_OLD_PERM_IND_ctr; unsigned long tot_gengc_updates = tot_new_updates + tot_old_updates; FILE *tf = RtsFlags.TickyFlags.tickyFile; @@ -109,10 +117,14 @@ PrintTickyInfo(void) fprintf(tf,"\t\t%5.1f %5.1f %5.1f %5.1f %5.1f", ALLOC_HISTO_MAGIC(FUN)); fprintf(tf,"\n%7ld (%5.1f%%) thunks", - ALLOC_THK_ctr, - PC(INTAVG(ALLOC_THK_ctr, tot_allocs))); - if (ALLOC_THK_ctr != 0) + ALLOC_SE_THK_ctr + ALLOC_UP_THK_ctr, + PC(INTAVG(ALLOC_SE_THK_ctr + ALLOC_UP_THK_ctr, tot_allocs))); + +#define ALLOC_THK_ctr (ALLOC_UP_THK_ctr + ALLOC_SE_THK_ctr) + /* hack to make ALLOC_HISTO_MAGIC still work for THK */ + if ((ALLOC_SE_THK_ctr + ALLOC_UP_THK_ctr) != 0) fprintf(tf,"\t\t\t\t%5.1f %5.1f %5.1f %5.1f %5.1f", ALLOC_HISTO_MAGIC(THK)); +#undef ALLOC_THK_ctr fprintf(tf,"\n%7ld (%5.1f%%) data values", ALLOC_CON_ctr, @@ -139,10 +151,10 @@ PrintTickyInfo(void) fprintf(tf,"\t\t\t%5.1f %5.1f %5.1f %5.1f %5.1f", ALLOC_HISTO_MAGIC(PRIM)); fprintf(tf,"\n%7ld (%5.1f%%) partial applications", - ALLOC_UPD_PAP_ctr, - PC(INTAVG(ALLOC_UPD_PAP_ctr, tot_allocs))); - if (ALLOC_UPD_PAP_ctr != 0) - fprintf(tf,"\t\t%5.1f %5.1f %5.1f %5.1f %5.1f", ALLOC_HISTO_MAGIC(UPD_PAP)); + ALLOC_PAP_ctr, + PC(INTAVG(ALLOC_PAP_ctr, tot_allocs))); + if (ALLOC_PAP_ctr != 0) + fprintf(tf,"\t\t%5.1f %5.1f %5.1f %5.1f %5.1f", ALLOC_HISTO_MAGIC(PAP)); fprintf(tf,"\n%7ld (%5.1f%%) thread state objects", ALLOC_TSO_ctr, @@ -177,22 +189,23 @@ PrintTickyInfo(void) jump_direct_enters, PC(INTAVG(jump_direct_enters,tot_enters))); fprintf(tf,"%7ld (%5.1f%%) thunks\n", - ENT_THK_ctr, - PC(INTAVG(ENT_THK_ctr,tot_enters))); + tot_thk_enters, + PC(INTAVG(tot_thk_enters,tot_enters))); fprintf(tf,"%7ld (%5.1f%%) data values\n", - ENT_CON_ctr, - PC(INTAVG(ENT_CON_ctr,tot_enters))); - fprintf(tf,"%7ld (%5.1f%%) function values\n\t\t [of which %ld (%.1f%%) bypassed arg-satisfaction chk]\n", - ENT_FUN_DIRECT_ctr, - PC(INTAVG(ENT_FUN_DIRECT_ctr,tot_enters)), - bypass_enters, - PC(INTAVG(bypass_enters,ENT_FUN_DIRECT_ctr))); - fprintf(tf,"%7ld (%5.1f%%) partial applications\n", - ENT_PAP_ctr, - PC(INTAVG(ENT_PAP_ctr,tot_enters))); - fprintf(tf,"%7ld (%5.1f%%) indirections\n", - ENT_IND_ctr, - PC(INTAVG(ENT_IND_ctr,tot_enters))); + tot_con_enters, + PC(INTAVG(tot_con_enters,tot_enters))); + fprintf(tf,"%7ld (%5.1f%%) normal indirections\n", + tot_ind_enters, + PC(INTAVG(tot_ind_enters,tot_enters))); + fprintf(tf,"%7ld (%5.1f%%) permanent indirections\n", + ENT_PERM_IND_ctr, + PC(INTAVG(ENT_PERM_IND_ctr,tot_enters))); + + fprintf(tf,"\nCALLS: %ld of which %ld (%.lf%%) were slow/unknown calls\n\t\t [the rest went direct to the fast entry point]\n", + tot_fun_direct_enters, + tot_fun_slow_enters, + PC(INTAVG(tot_fun_slow_enters,tot_fun_direct_enters)) + ); fprintf(tf,"\nRETURNS: %ld\n", tot_returns); fprintf(tf,"%7ld (%5.1f%%) from entering a new constructor\n\t\t [the rest from entering an existing constructor]\n", @@ -224,8 +237,6 @@ PrintTickyInfo(void) UPDF_PUSHED_ctr, UPDF_OMITTED_ctr); - fprintf(tf,"\nSEQ FRAMES: %ld", SEQF_PUSHED_ctr); - fprintf(tf,"\nCATCH FRAMES: %ld", CATCHF_PUSHED_ctr); if (UPDF_RCC_PUSHED_ctr != 0) @@ -234,30 +245,33 @@ PrintTickyInfo(void) UPDF_RCC_OMITTED_ctr); fprintf(tf,"\nUPDATES: %ld\n", tot_updates); - fprintf(tf,"%7ld (%5.1f%%) data values\n", - UPD_CON_IN_NEW_ctr, - PC(INTAVG(UPD_CON_IN_NEW_ctr,tot_updates))); + fprintf(tf,"%7ld (%5.1f%%) data values\n\t\t [%ld in place, %ld allocated new space]\n", + con_updates, + PC(INTAVG(con_updates,tot_updates)), + UPD_CON_IN_PLACE_ctr, UPD_CON_IN_NEW_ctr); fprintf(tf,"%7ld (%5.1f%%) partial applications\n\t\t [%ld in place, %ld allocated new space]\n", pap_updates, PC(INTAVG(pap_updates,tot_updates)), UPD_PAP_IN_PLACE_ctr, UPD_PAP_IN_NEW_ctr); - fprintf(tf,"%7ld (%5.1f%%) updates to existing heap objects (%ld by squeezing)\n", - UPD_EXISTING_ctr + UPD_SQUEEZED_ctr, - PC(INTAVG(UPD_EXISTING_ctr + UPD_SQUEEZED_ctr, tot_updates)), - UPD_SQUEEZED_ctr); + fprintf(tf,"%7ld (%5.1f%%) updates by squeezing\n", + UPD_SQUEEZED_ctr, + PC(INTAVG(UPD_SQUEEZED_ctr, tot_updates))); - fprintf(tf, "UPD_CON_IN_NEW: %7ld: ", UPD_CON_IN_NEW_ctr); + fprintf(tf, "\nUPD_CON_IN_NEW: %7ld: ", UPD_CON_IN_NEW_ctr); for (i = 0; i < 9; i++) { fprintf(tf, "%7ld", UPD_CON_IN_NEW_hst[i]); } fprintf(tf, "\n"); + fprintf(tf, "UPD_CON_IN_PLACE: %7ld: ", UPD_CON_IN_PLACE_ctr); + for (i = 0; i < 9; i++) { fprintf(tf, "%7ld", UPD_CON_IN_PLACE_hst[i]); } + fprintf(tf, "\n"); fprintf(tf, "UPD_PAP_IN_NEW: %7ld: ", UPD_PAP_IN_NEW_ctr); for (i = 0; i < 9; i++) { fprintf(tf, "%7ld", UPD_PAP_IN_NEW_hst[i]); } fprintf(tf, "\n"); if (tot_gengc_updates != 0) { - fprintf(tf,"\nNEW GEN UPDATES: %ld (%5.1f%%)\n", + fprintf(tf,"\nNEW GEN UPDATES: %9ld (%5.1f%%)\n", tot_new_updates, PC(INTAVG(tot_new_updates,tot_gengc_updates))); - fprintf(tf,"\nOLD GEN UPDATES: %ld (%5.1f%%)\n", + fprintf(tf,"OLD GEN UPDATES: %9ld (%5.1f%%)\n", tot_old_updates, PC(INTAVG(tot_old_updates,tot_gengc_updates))); } @@ -265,9 +279,7 @@ PrintTickyInfo(void) fprintf(tf,"\nTotal bytes copied during GC: %ld\n", GC_WORDS_COPIED_ctr * sizeof(W_)); -#if 0 printRegisteredCounterInfo(tf); -#endif fprintf(tf,"\n**************************************************\n"); @@ -278,6 +290,9 @@ PrintTickyInfo(void) #define PR_CTR(ctr) \ do { fprintf(tf,"%7ld " #ctr "\n", ctr); } while(0) +/* COND_PR_CTR takes a boolean; if false then msg is the printname rather than ctr */ +#define COND_PR_CTR(ctr,b,msg) \ + if (b) { fprintf(tf,"%7ld " #ctr "\n", ctr); } else { fprintf(tf,"%7ld " msg "\n", ctr); } #define PR_HST(hst,i) \ do { fprintf(tf,"%7ld " #hst "_" #i "\n", hst[i]); } while(0) @@ -293,7 +308,8 @@ PrintTickyInfo(void) PR_HST(ALLOC_FUN_hst,2); PR_HST(ALLOC_FUN_hst,3); PR_HST(ALLOC_FUN_hst,4); - PR_CTR(ALLOC_THK_ctr); + PR_CTR(ALLOC_UP_THK_ctr); + PR_CTR(ALLOC_SE_THK_ctr); PR_CTR(ALLOC_THK_adm); PR_CTR(ALLOC_THK_gds); PR_CTR(ALLOC_THK_slp); @@ -338,15 +354,15 @@ PrintTickyInfo(void) PR_HST(ALLOC_PRIM_hst,2); PR_HST(ALLOC_PRIM_hst,3); PR_HST(ALLOC_PRIM_hst,4); - PR_CTR(ALLOC_UPD_PAP_ctr); - PR_CTR(ALLOC_UPD_PAP_adm); - PR_CTR(ALLOC_UPD_PAP_gds); - PR_CTR(ALLOC_UPD_PAP_slp); - PR_HST(ALLOC_UPD_PAP_hst,0); - PR_HST(ALLOC_UPD_PAP_hst,1); - PR_HST(ALLOC_UPD_PAP_hst,2); - PR_HST(ALLOC_UPD_PAP_hst,3); - PR_HST(ALLOC_UPD_PAP_hst,4); + PR_CTR(ALLOC_PAP_ctr); + PR_CTR(ALLOC_PAP_adm); + PR_CTR(ALLOC_PAP_gds); + PR_CTR(ALLOC_PAP_slp); + PR_HST(ALLOC_PAP_hst,0); + PR_HST(ALLOC_PAP_hst,1); + PR_HST(ALLOC_PAP_hst,2); + PR_HST(ALLOC_PAP_hst,3); + PR_HST(ALLOC_PAP_hst,4); PR_CTR(ALLOC_TSO_ctr); PR_CTR(ALLOC_TSO_adm); @@ -389,19 +405,50 @@ PrintTickyInfo(void) #endif PR_CTR(ENT_VIA_NODE_ctr); - PR_CTR(ENT_CON_ctr); - PR_CTR(ENT_FUN_STD_ctr); - PR_CTR(ENT_FUN_DIRECT_ctr); - PR_CTR(ENT_IND_ctr); + PR_CTR(ENT_STATIC_CON_ctr); + PR_CTR(ENT_DYN_CON_ctr); + PR_CTR(ENT_STATIC_FUN_DIRECT_ctr); + PR_CTR(ENT_DYN_FUN_DIRECT_ctr); + PR_CTR(ENT_STATIC_IND_ctr); + PR_CTR(ENT_DYN_IND_ctr); + +/* The counters ENT_PERM_IND and UPD_{NEW,OLD}_PERM_IND are not dumped + * at the end of execution unless update squeezing is turned off (+RTS + * -Z =RtsFlags.GcFlags.squeezeUpdFrames), as they will be wrong + * otherwise. Why? Because for each update frame squeezed out, we + * count an UPD_NEW_PERM_IND *at GC time* (i.e., too early). And + * further, when we enter the closure that has been updated, we count + * the ENT_PERM_IND, but we then enter the PERM_IND that was built for + * the next update frame below, and so on down the chain until we + * finally reach the value. Thus we count many new ENT_PERM_INDs too + * early. + * + * This of course refers to the -ticky version that uses PERM_INDs to + * determine the number of closures entered 0/1/>1. KSW 1999-04. */ + COND_PR_CTR(ENT_PERM_IND_ctr,RtsFlags.GcFlags.squeezeUpdFrames == rtsFalse,"E!NT_PERM_IND_ctr requires +RTS -Z"); + + PR_CTR(ENT_AP_ctr); PR_CTR(ENT_PAP_ctr); - PR_CTR(ENT_THK_ctr); + PR_CTR(ENT_AP_STACK_ctr); + PR_CTR(ENT_BH_ctr); + PR_CTR(ENT_STATIC_THK_ctr); + PR_CTR(ENT_DYN_THK_ctr); + + PR_CTR(SLOW_CALL_ctr); + PR_CTR(SLOW_CALL_BUILT_PAP_ctr); + PR_CTR(SLOW_CALL_NEW_PAP_ctr); + PR_HST(SLOW_CALL_hst,0); + PR_HST(SLOW_CALL_hst,1); + PR_HST(SLOW_CALL_hst,2); + PR_HST(SLOW_CALL_hst,3); + PR_HST(SLOW_CALL_hst,4); + PR_HST(SLOW_CALL_hst,5); + PR_HST(SLOW_CALL_hst,6); + PR_HST(SLOW_CALL_hst,7); PR_CTR(RET_NEW_ctr); PR_CTR(RET_OLD_ctr); - PR_CTR(RET_SEMI_BY_DEFAULT_ctr); - PR_CTR(RET_SEMI_IN_HEAP_ctr); - PR_CTR(RET_SEMI_FAILED_IND_ctr); - PR_CTR(RET_SEMI_FAILED_UNEVAL_ctr); + PR_CTR(RET_UNBOXED_TUP_ctr); PR_CTR(VEC_RETURN_ctr); PR_HST(RET_NEW_hst,0); @@ -422,15 +469,15 @@ PrintTickyInfo(void) PR_HST(RET_OLD_hst,6); PR_HST(RET_OLD_hst,7); PR_HST(RET_OLD_hst,8); - PR_HST(RET_SEMI_IN_HEAP_hst,0); - PR_HST(RET_SEMI_IN_HEAP_hst,1); - PR_HST(RET_SEMI_IN_HEAP_hst,2); - PR_HST(RET_SEMI_IN_HEAP_hst,3); - PR_HST(RET_SEMI_IN_HEAP_hst,4); - PR_HST(RET_SEMI_IN_HEAP_hst,5); - PR_HST(RET_SEMI_IN_HEAP_hst,6); - PR_HST(RET_SEMI_IN_HEAP_hst,7); - PR_HST(RET_SEMI_IN_HEAP_hst,8); + PR_HST(RET_UNBOXED_TUP_hst,0); + PR_HST(RET_UNBOXED_TUP_hst,1); + PR_HST(RET_UNBOXED_TUP_hst,2); + PR_HST(RET_UNBOXED_TUP_hst,3); + PR_HST(RET_UNBOXED_TUP_hst,4); + PR_HST(RET_UNBOXED_TUP_hst,5); + PR_HST(RET_UNBOXED_TUP_hst,6); + PR_HST(RET_UNBOXED_TUP_hst,7); + PR_HST(RET_UNBOXED_TUP_hst,8); PR_HST(RET_VEC_RETURN_hst,0); PR_HST(RET_VEC_RETURN_hst,1); PR_HST(RET_VEC_RETURN_hst,2); @@ -441,22 +488,24 @@ PrintTickyInfo(void) PR_HST(RET_VEC_RETURN_hst,7); PR_HST(RET_VEC_RETURN_hst,8); - PR_CTR(RET_SEMI_loads_avoided); - PR_CTR(UPDF_OMITTED_ctr); PR_CTR(UPDF_PUSHED_ctr); - PR_CTR(SEQF_PUSHED_ctr); PR_CTR(CATCHF_PUSHED_ctr); PR_CTR(UPDF_RCC_PUSHED_ctr); PR_CTR(UPDF_RCC_OMITTED_ctr); - PR_CTR(UPD_EXISTING_ctr); PR_CTR(UPD_SQUEEZED_ctr); PR_CTR(UPD_CON_IN_NEW_ctr); + PR_CTR(UPD_CON_IN_PLACE_ctr); PR_CTR(UPD_PAP_IN_NEW_ctr); PR_CTR(UPD_PAP_IN_PLACE_ctr); + PR_CTR(UPD_BH_UPDATABLE_ctr); + PR_CTR(UPD_BH_SINGLE_ENTRY_ctr); + PR_CTR(UPD_CAF_BH_UPDATABLE_ctr); + PR_CTR(UPD_CAF_BH_SINGLE_ENTRY_ctr); + PR_HST(UPD_CON_IN_NEW_hst,0); PR_HST(UPD_CON_IN_NEW_hst,1); PR_HST(UPD_CON_IN_NEW_hst,2); @@ -477,7 +526,11 @@ PrintTickyInfo(void) PR_HST(UPD_PAP_IN_NEW_hst,8); PR_CTR(UPD_NEW_IND_ctr); + /* see comment on ENT_PERM_IND_ctr */ + COND_PR_CTR(UPD_NEW_PERM_IND_ctr,RtsFlags.GcFlags.squeezeUpdFrames == rtsFalse,"U!PD_NEW_PERM_IND_ctr requires +RTS -Z"); PR_CTR(UPD_OLD_IND_ctr); + /* see comment on ENT_PERM_IND_ctr */ + COND_PR_CTR(UPD_OLD_PERM_IND_ctr,RtsFlags.GcFlags.squeezeUpdFrames == rtsFalse,"U!PD_OLD_PERM_IND_ctr requires +RTS -Z"); PR_CTR(GC_SEL_ABANDONED_ctr); PR_CTR(GC_SEL_MINOR_ctr); @@ -486,42 +539,46 @@ PrintTickyInfo(void) PR_CTR(GC_WORDS_COPIED_ctr); } -#if 0 /* Data structure used in ``registering'' one of these counters. */ -struct ent_counter *ListOfEntryCtrs = NULL; /* root of list of them */ +StgEntCounter *ticky_entry_ctrs = NULL; /* root of list of them */ /* To print out all the registered-counter info: */ static void printRegisteredCounterInfo (FILE *tf) { - struct ent_counter *p; + StgEntCounter *p; - if ( ListOfEntryCtrs != NULL ) { - fprintf(tf,"\n**************************************************\n"); + if ( ticky_entry_ctrs != NULL ) { + fprintf(tf,"\n**************************************************\n\n"); } - - for (p = ListOfEntryCtrs; p != NULL; p = p->link) { - /* common stuff first; then the wrapper info if avail */ - fprintf(tf, "%-40s%u\t%u\t%u\t%-16s%ld", - p->f_str, + fprintf(tf, "%11s%11s%11s %6s%6s %-11s%-30s\n", + "Entries", "Slow ent", "Allocs", "Arity", "Stack", "Kinds", "Function"); + fprintf(tf, "--------------------------------------------------------------------------------\n"); + /* Function name at the end so it doesn't mess up the tabulation */ + + for (p = ticky_entry_ctrs; p != NULL; p = p->link) { + fprintf(tf, "%11ld%11ld %6u%6u %-11s%-30s", + p->entry_count, + p->allocs, p->arity, - p->Astk_args, - p->Bstk_args, - p->f_arg_kinds, - p->ctr); - - if ( p->wrap_str == NULL ) { - fprintf(tf, "\n"); - - } else { - fprintf(tf, "\t%s\t%s\n", - p->wrap_str, - p->wrap_arg_kinds); - } + p->stk_args, + p->arg_kinds, + p->str); + + fprintf(tf, "\n"); + } } -#endif + +/* Catch-all top-level counter struct. Allocations from CAFs will go + * here. + */ +StgEntCounter top_ct + = { 0, 0, 0, + "TOP", "", + 0, 0, NULL }; #endif /* TICKY_TICKY */ +