From: Florian Krohm Date: Sun, 9 Aug 2015 20:55:39 +0000 (+0000) Subject: When profiling memory events in memcheck, event counts larget X-Git-Tag: svn/VALGRIND_3_11_0~141 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=70bfaf9c9f798c36ad32bcddfaf5c9735622b8dd;p=thirdparty%2Fvalgrind.git 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 40bb31eef8..3493fb5bcd 100644 --- 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 8af7e17ecd..14a1d6ade0 100644 --- 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]); }