When profiling memory events in memcheck, event counts larget

than INT_MAX have been observed in practice. Make counters
64 bit entities.

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

diff --git a/memcheck/mc_include.h b/memcheck/mc_include.h
index 40bb31eef8313fdf36e91d4c6329aa661bd9550f..3493fb5bcd5d4eab97e2b99be73c15a605ae63ea 100644 (file)
--- a/memcheck/mc_include.h
+++ b/memcheck/mc_include.h
@@ -320,7 +320,7 @@ enum {
    MCPE_LAST
 };
 
-extern UInt MC_(event_ctr)[MCPE_LAST];
+extern ULong MC_(event_ctr)[MCPE_LAST];
 
 #  define PROF_EVENT(ev)                           \
    do { tl_assert((ev) >= 0 && (ev) < MCPE_LAST);  \

diff --git a/memcheck/mc_main.c b/memcheck/mc_main.c
index 8af7e17ecd4ed3c032ebaf4b47892b855d5967d5..14a1d6ade0f2e9378ee4ec825aeca6385205c749 100644 (file)
--- a/memcheck/mc_main.c
+++ b/memcheck/mc_main.c
@@ -6746,7 +6746,7 @@ static Bool mc_handle_client_request ( ThreadId tid, UWord* arg, UWord* ret )
 
 #ifdef MC_PROFILE_MEMORY
 
-UInt  MC_(event_ctr)[MCPE_LAST];
+ULong  MC_(event_ctr)[MCPE_LAST];
 
 /* Event counter names. Use the name of the function that increases the
    event counter. Drop any MC_() and mc_ prefices. */
@@ -6896,7 +6896,7 @@ static void done_prof_mem ( void )
       if (MC_(event_ctr)[i] > 0) {
          spaced = False;
          ++n;
-         VG_(printf)( "prof mem event %3d: %9u   %s\n", 
+         VG_(printf)( "prof mem event %3d: %11llu   %s\n", 
                       i, MC_(event_ctr)[i],
                       MC_(event_ctr_name)[i]);
       }