Turn off tons of debug printing.

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

diff --git a/coregrind/vg_memory.c b/coregrind/vg_memory.c
index ebfd51a0d8a8fff8d48aac2c627742e189197c11..34b165e326e3ab965bc9437732f99ab6b1f54711 100644 (file)
--- a/coregrind/vg_memory.c
+++ b/coregrind/vg_memory.c
@@ -35,7 +35,7 @@
 /* Define to debug the memory-leak-detector. */
 /* #define VG_DEBUG_LEAKCHECK */
 
-static const Bool mem_debug = True; //False;
+static const Bool mem_debug = False;
 
 /*--------------------------------------------------------------*/
 /*---                                                        ---*/
@@ -701,7 +701,8 @@ void VG_(mprotect_range)(Addr a, SizeT len, UInt prot)
 
    if (debug)
       VG_(printf)("\nmprotect_range(%p, %d, %x)\n", a, len, prot);
-   show_segments( "mprotect_range(before)" );
+
+   if (0) show_segments( "mprotect_range(before)" );
 
    /* Everything must be page-aligned */
    vg_assert((a & (VKI_PAGE_SIZE-1)) == 0);
@@ -713,7 +714,7 @@ void VG_(mprotect_range)(Addr a, SizeT len, UInt prot)
    r = find_segment(a);
    vg_assert(r != -1);
    segments[r].prot = prot;
-   show_segments( "mprotect_range(after)");
+   if (0) show_segments( "mprotect_range(after)");
 
    return;
 
@@ -750,6 +751,14 @@ Addr VG_(find_map_space)(Addr addr, SizeT len, Bool for_client)
 
    Bool fixed;
 
+   if (debug) {
+      VG_(printf)("\n\n");
+      VG_(printf)("find_map_space(%p, %d, %d) ...\n",
+                  addr, len, for_client);
+   }
+
+   if (0) show_segments("find_map_space: start");
+
    if (addr == 0) {
       fixed = False;
    } else {
@@ -844,7 +853,7 @@ Addr VG_(find_map_space)(Addr addr, SizeT len, Bool for_client)
       ret = 0; /* not found */
 
    if (debug)
-      VG_(printf)("find_map_space(%p, %d, %d) -> %p\n",
+      VG_(printf)("find_map_space(%p, %d, %d) -> %p\n\n",
                   addr, len, for_client, ret);
 
    return ret;
@@ -885,7 +894,7 @@ vg_assert(0);
       ret += VKI_PAGE_SIZE; /* skip leading redzone */
 
    if (debug)
-      VG_(printf)("find_map_space(%p, %d, %d) -> %p\n",
+      VG_(printf)("find_map_space(%p, %d, %d) -> %p\n\n",
                  addr, len, for_client, ret);
    
    return ret;

diff --git a/coregrind/vg_syscalls.c b/coregrind/vg_syscalls.c
index f31f82afcdf6507bb8302a841537036b5b291014..e9a9f442a5d37725a99f0749a8a6d78c3e6dde6f 100644 (file)
--- a/coregrind/vg_syscalls.c
+++ b/coregrind/vg_syscalls.c
@@ -847,7 +847,7 @@ void buf_and_len_post_check( ThreadId tid, Int res,
 static Addr do_brk(Addr newbrk)
 {
    Addr ret = VG_(brk_limit);
-   static const Bool debug = True; //False;
+   static const Bool debug = False;
    Segment *seg;
    Addr current, newaddr;
 
@@ -856,7 +856,7 @@ static Addr do_brk(Addr newbrk)
       VG_(printf)("\ndo_brk: brk_base=%p brk_limit=%p newbrk=%p\n",
                  VG_(brk_base), VG_(brk_limit), newbrk);
 
-   show_segments("in_brk");
+   if (0) show_segments("in_brk");
 
    if (newbrk < VG_(brk_base) || newbrk >= VG_(client_end))
       return VG_(brk_limit);