X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FTicky.c;h=04734d550bb4462bd5c0bb5a1263476c4213da2c;hb=49c120b93b0688863d46582eee6b20bfbed6c077;hp=1828aa8bd0767988f47d930e2d709dc7a1270925;hpb=1e295cefb7bf257899dee252917c40f5850e8627;p=ghc-hetmet.git

diff --git a/ghc/rts/Ticky.c b/ghc/rts/Ticky.c
index 1828aa8..04734d5 100644
--- a/ghc/rts/Ticky.c
+++ b/ghc/rts/Ticky.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Ticky.c,v 1.8 1999/06/24 13:10:32 simonmar Exp $
+ * $Id: Ticky.c,v 1.16 2002/03/04 10:35:43 keithw 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"
@@ -66,14 +67,20 @@ PrintTickyInfo(void)
   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_fun_std_enters = ENT_STATIC_FUN_STD_ctr + ENT_DYN_FUN_STD_ctr;
+  unsigned long tot_ind_enters = ENT_STATIC_IND_ctr + ENT_DYN_IND_ctr;
+  
   unsigned long tot_enters =
-	ENT_CON_ctr + ENT_FUN_DIRECT_ctr +
-	ENT_IND_ctr + ENT_PERM_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);
+	tot_fun_direct_enters -
+	(tot_fun_std_enters - UPD_PAP_IN_NEW_ctr);
 
   unsigned long tot_returns =
 	RET_NEW_ctr + RET_OLD_ctr + RET_UNBOXED_TUP_ctr +
@@ -81,9 +88,10 @@ PrintTickyInfo(void)
 
   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 + UPD_NEW_PERM_IND_ctr;
   unsigned long tot_old_updates   = UPD_OLD_IND_ctr + UPD_OLD_PERM_IND_ctr;
@@ -181,22 +189,22 @@ 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)));
+	tot_con_enters,
+	PC(INTAVG(tot_con_enters,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)),
+	tot_fun_direct_enters,
+	PC(INTAVG(tot_fun_direct_enters,tot_enters)),
 	bypass_enters,
-	PC(INTAVG(bypass_enters,ENT_FUN_DIRECT_ctr)));
+	PC(INTAVG(bypass_enters,tot_fun_direct_enters)));
   fprintf(tf,"%7ld (%5.1f%%) partial applications\n",
 	ENT_PAP_ctr,
 	PC(INTAVG(ENT_PAP_ctr,tot_enters)));
   fprintf(tf,"%7ld (%5.1f%%) normal indirections\n",
-	ENT_IND_ctr,
-	PC(INTAVG(ENT_IND_ctr,tot_enters)));
+	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)));
@@ -241,30 +249,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)));
   }
@@ -398,10 +409,14 @@ 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_STD_ctr);
+  PR_CTR(ENT_DYN_FUN_STD_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
@@ -416,12 +431,13 @@ PrintTickyInfo(void)
  * 
  * 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 == rtsTrue,"E!NT_PERM_IND_ctr requires +RTS -Z");
+  COND_PR_CTR(ENT_PERM_IND_ctr,RtsFlags.GcFlags.squeezeUpdFrames == rtsFalse,"E!NT_PERM_IND_ctr requires +RTS -Z");
 
   PR_CTR(ENT_PAP_ctr);
   PR_CTR(ENT_AP_UPD_ctr);
   PR_CTR(ENT_BH_ctr);
-  PR_CTR(ENT_THK_ctr);
+  PR_CTR(ENT_STATIC_THK_ctr);
+  PR_CTR(ENT_DYN_THK_ctr);
 
   PR_CTR(RET_NEW_ctr);
   PR_CTR(RET_OLD_ctr);
@@ -488,9 +504,9 @@ PrintTickyInfo(void)
   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);
 
@@ -520,10 +536,10 @@ PrintTickyInfo(void)
 
   PR_CTR(UPD_NEW_IND_ctr);
   /* see comment on ENT_PERM_IND_ctr */
-  COND_PR_CTR(UPD_NEW_PERM_IND_ctr,RtsFlags.GcFlags.squeezeUpdFrames == rtsTrue,"U!PD_NEW_PERM_IND_ctr requires +RTS -Z");
+  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 == rtsTrue,"U!PD_OLD_PERM_IND_ctr requires +RTS -Z");
+  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);
@@ -534,31 +550,45 @@ PrintTickyInfo(void)
 
 /* Data structure used in ``registering'' one of these counters. */
 
-struct ent_counter *ticky_entry_ctrs = 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 ( ticky_entry_ctrs != NULL ) {
-    	fprintf(tf,"\n**************************************************\n");
+      fprintf(tf,"\n**************************************************\n\n");
     }
+    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, "%-40s%u\t%u\t%-16s%ld",
-		p->f_str,
+	fprintf(tf, "%11ld%11ld%11ld %6u%6u    %-11s%-30s",
+		p->entry_count,
+		p->slow_entry_count,
+		p->allocs,
 		p->arity,
 		p->stk_args,
-		p->f_arg_kinds,
-		p->ctr);
+		p->arg_kinds,
+		p->str);
 
 	fprintf(tf, "\n");
 
     }
 }
 
+/* Catch-all top-level counter struct.  Allocations from CAFs will go
+ * here.
+ */
+StgEntCounter top_ct
+	= { 0, 0, 0,
+	    "TOP", "",
+	    0, 0, 0, NULL };
+
 #endif /* TICKY_TICKY */