Move the ExeContext stats message earlier, and print it when verbosity == 2,

rather than only when verbosity == 3, as they're only three lines.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3329

diff --git a/coregrind/vg_execontext.c b/coregrind/vg_execontext.c
index d05fc3b544377521322a60861b93d5da05275689..35680df388009086a9edaee3874933ed0f97f3a2 100644 (file)
--- a/coregrind/vg_execontext.c
+++ b/coregrind/vg_execontext.c
@@ -86,12 +86,12 @@ void VG_(print_ExeContext_stats) ( void )
 {
    init_ExeContext_storage();
    VG_(message)(Vg_DebugMsg, 
-      "exectx: %d lists, %d contexts (avg %d per list)",
+      "   exectx: %d lists, %d contexts (avg %d per list)",
       VG_N_EC_LISTS, ec_totstored, 
       ec_totstored / VG_N_EC_LISTS 
    );
    VG_(message)(Vg_DebugMsg, 
-      "exectx: %d searches, %d full compares (%d per 1000)",
+      "   exectx: %d searches, %d full compares (%d per 1000)",
       ec_searchreqs, ec_searchcmps, 
       ec_searchreqs == 0 
          ? 0 
@@ -99,7 +99,7 @@ void VG_(print_ExeContext_stats) ( void )
            / ((ULong)ec_searchreqs )) 
    );
    VG_(message)(Vg_DebugMsg, 
-      "exectx: %d cmp2, %d cmp4, %d cmpAll",
+      "   exectx: %d cmp2, %d cmp4, %d cmpAll",
       ec_cmp2s, ec_cmp4s, ec_cmpAlls 
    );
 }

diff --git a/coregrind/vg_main.c b/coregrind/vg_main.c
index 1793fafcd5c80fa08c79442e886f44c9782483f6..3eca777d766d6929885f90a3051da06c747a544f 100644 (file)
--- a/coregrind/vg_main.c
+++ b/coregrind/vg_main.c
@@ -185,6 +185,8 @@ static void print_all_stats ( void )
                 "   sanity: %d cheap, %d expensive checks.",
                 sanity_fast_count, sanity_slow_count );
 
+   VG_(print_ExeContext_stats)();
+
    // Memory stats
    if (VG_(clo_verbosity) > 2) {
       VG_(message)(Vg_DebugMsg, "");
@@ -194,10 +196,6 @@ static void print_all_stats ( void )
       VG_(print_all_arena_stats)();
       VG_(message)(Vg_DebugMsg, "");
       //VG_(print_shadow_stats)();
-      VG_(message)(Vg_DebugMsg, "");
-      VG_(message)(Vg_DebugMsg, 
-         "------ Valgrind's ExeContext management stats follow ------" );
-      VG_(print_ExeContext_stats)();
    }
 }