[project @ 2001-12-10 17:59:54 by sof]

[ghc-hetmet.git] / ghc / rts / Ticky.c

diff --git a/ghc/rts/Ticky.c b/ghc/rts/Ticky.c
index dbbdcdb..a24e7d0 100644 (file)
--- a/ghc/rts/Ticky.c
+++ b/ghc/rts/Ticky.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Ticky.c,v 1.10 1999/10/13 16:39:24 simonmar Exp $
+ * $Id: Ticky.c,v 1.13 2001/08/14 13:40:09 sewardj 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"
@@ -550,19 +551,20 @@ printRegisteredCounterInfo (FILE *tf)
     if ( ticky_entry_ctrs != NULL ) {
       fprintf(tf,"\n**************************************************\n\n");
     }
-    fprintf(tf, "%-30s %6s%6s    %-16s%-11s%-11s\n",
-           "Function", "Arity", "Stack", "Kinds", "Entries",
-           "Allocs");
+    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, "%-30s%6u%6u     %-11s%11ld%11ld",
-               p->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->arg_kinds,
-               p->ctr,
-               p->allocs);
+               p->str);
 
        fprintf(tf, "\n");
 
@@ -575,7 +577,7 @@ printRegisteredCounterInfo (FILE *tf)
 StgEntCounter top_ct
        = { 0, 0, 0,
            "TOP", "",
-           0, 0, NULL };
+           0, 0, 0, NULL };
 
 #endif /* TICKY_TICKY */