* Out of memory message was using 'bytes have already been allocated.'

  while this nr is in fact the total anonymously mmap-ed.
  Change the message so as to reflect the shown number.
* Show also the total anonymous mmaped in non OOM memory statistics

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

diff --git a/coregrind/m_gdbserver/server.c b/coregrind/m_gdbserver/server.c
index 9b30e678a51abfe877991e6976a5afab4403e72b..cf228a5facb2cb1eb95592685713b84319c86ae0 100644 (file)
--- a/coregrind/m_gdbserver/server.c
+++ b/coregrind/m_gdbserver/server.c
@@ -157,7 +157,9 @@ void VG_(print_all_stats) (Bool memory_stats, Bool tool_stats)
       VG_(message)(Vg_DebugMsg, 
          "------ Valgrind's internal memory use stats follow ------\n" );
       VG_(sanity_check_malloc_all)();
-      VG_(message)(Vg_DebugMsg, "------\n" );
+       VG_(message)(Vg_DebugMsg,
+                    "------ %llu bytes have already been mmap-ed ANONYMOUS.\n",
+                    VG_(am_get_anonsize_total)());
       VG_(print_all_arena_stats)();
       if (VG_(clo_profile_heap))
          VG_(print_arena_cc_analysis) ();

diff --git a/coregrind/m_mallocfree.c b/coregrind/m_mallocfree.c
index 1f543c9d151cec4f0a260000e5c16cfe0c13f043..51441b87e89c9b1bcf1dcb8f383ababb4e46121b 100644 (file)
--- a/coregrind/m_mallocfree.c
+++ b/coregrind/m_mallocfree.c
@@ -758,7 +758,7 @@ void VG_(out_of_memory_NORETURN) ( const HChar* who, SizeT szB )
       "\n"
       "    Valgrind's memory management: out of memory:\n"
       "       %s's request for %llu bytes failed.\n"
-      "       %llu bytes have already been allocated.\n"
+      "       %llu bytes have already been mmap-ed ANONYMOUS.\n"
       "    Valgrind cannot continue.  Sorry.\n\n"
       "    There are several possible reasons for this.\n"
       "    - You have some kind of memory limit in place.  Look at the\n"