commit 3a42fb88cfb660772c77ef010708a2b21f501980
author nethercote <nethercote@a5019735-40e9-0310-863c-91ae7b9d1cf9> Tue Aug 03 18:08:50 2004 +0000
committer nethercote <nethercote@a5019735-40e9-0310-863c-91ae7b9d1cf9> Tue Aug 03 18:08:50 2004 +0000
tree 37b5308d19a99ace3bcab72b35942172a693d2af
parent caee10dbcff1f0e9338b2fb5d7c9997547df0bf9

Tweak stats printing -- use more consistent function names, improve output
formatting slightly, etc.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@2561 a5019735-40e9-0310-863c-91ae7b9d1cf9

coregrind/vg_main.c

diff --git a/coregrind/vg_main.c b/coregrind/vg_main.c
index ed14246..7c8f50e 100644
--- a/coregrind/vg_main.c
+++ b/coregrind/vg_main.c
@@ -206,12 +206,15 @@
    return (b == 0 ? 0 : a / b);
 }
 
-static void show_counts ( void )
+static void print_all_stats ( void )
 {
+   // Translation stats
    VG_(message)(Vg_DebugMsg,
-		"    TT/TC: %d tc sectors discarded.",
+                "    TT/TC: %d tc sectors discarded.",
                 VG_(number_of_tc_discards) );
    VG_(message)(Vg_DebugMsg,
+                "           %d tt_fast misses.", VG_(tt_fast_misses));
+   VG_(message)(Vg_DebugMsg,
                 "           %d chainings, %d unchainings.",
                 VG_(bb_enchain_count), VG_(bb_dechain_count) );
    VG_(message)(Vg_DebugMsg,
@@ -227,22 +230,40 @@
                 VG_(overall_out_tsize),
                 safe_idiv(10*VG_(overall_out_tsize), VG_(overall_out_osize)));
    VG_(message)(Vg_DebugMsg,
-      " dispatch: %llu jumps (bb entries), of which %u (%lu%%) were unchained.",
+      " dispatch: %llu jumps (bb entries); of them %u (%lu%%) unchained.",
       VG_(bbs_done), 
       VG_(unchained_jumps_done),
       ((ULong)(100) * (ULong)(VG_(unchained_jumps_done)))
          / ( VG_(bbs_done)==0 ? 1 : VG_(bbs_done) )
    );
 
+   // Scheduler stats
    VG_(print_scheduler_stats)();
-   VG_(message)(Vg_DebugMsg,
-      "           %d tt_fast misses.", VG_(tt_fast_misses));
 
+   // Reg-alloc stats
    VG_(print_reg_alloc_stats)();
    VG_(message)(Vg_DebugMsg, 
                 "   sanity: %d cheap, %d expensive checks.",
                 sanity_fast_count, sanity_slow_count );
+
+   // C call stats
    VG_(print_ccall_stats)();
+
+   // UInstr histogram 
+   if (VG_(clo_verbosity) > 3)
+      VG_(print_UInstr_histogram)();
+
+   // Memory stats
+   if (0) {
+      VG_(message)(Vg_DebugMsg, "");
+      VG_(message)(Vg_DebugMsg, 
+         "------ Valgrind's internal memory use stats follow ------" );
+      VG_(mallocSanityCheckAll)();
+      VG_(print_all_arena_stats)();
+      VG_(message)(Vg_DebugMsg, 
+         "------ Valgrind's ExeContext management stats follow ------" );
+      VG_(print_ExeContext_stats)();
+   }
 }
 
 
@@ -3011,7 +3032,7 @@
 
    /* Print out file descriptor summary and stats. */
    if (VG_(clo_track_fds))
-      VG_(fd_stats)();
+      VG_(show_open_fds)();
 
    if (VG_(needs).core_errors || VG_(needs).skin_errors)
       VG_(show_all_errors)();
@@ -3021,22 +3042,8 @@
    VG_(do_sanity_checks)( True /*include expensive checks*/ );
 
    if (VG_(clo_verbosity) > 1)
-      show_counts();
+      print_all_stats();
 
-   if (VG_(clo_verbosity) > 3)
-      VG_(print_UInstr_histogram)();
-
-   if (0) {
-      VG_(message)(Vg_DebugMsg, "");
-      VG_(message)(Vg_DebugMsg, 
-         "------ Valgrind's internal memory use stats follow ------" );
-      VG_(mallocSanityCheckAll)();
-      VG_(show_all_arena_stats)();
-      VG_(message)(Vg_DebugMsg, 
-         "------ Valgrind's ExeContext management stats follow ------" );
-      VG_(show_ExeContext_stats)();
-   }
- 
    if (VG_(clo_profile))
       VGP_(done_profiling)();