Alexandre Julliard : ntdll: Disable debug flags when running on Valgrind.

Alexandre Julliard julliard at winehq.org
Fri Jan 29 10:56:30 CST 2010


Module: wine
Branch: master
Commit: a75ae7936eb2581cdc6a7a5050ae79add0cb4ab1
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a75ae7936eb2581cdc6a7a5050ae79add0cb4ab1

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Thu Jan 28 19:42:31 2010 +0100

ntdll: Disable debug flags when running on Valgrind.

The extra debug checks cause more harm than good under Valgrind.

---

 dlls/ntdll/heap.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c
index 1055ce0..07fec3f 100644
--- a/dlls/ntdll/heap.c
+++ b/dlls/ntdll/heap.c
@@ -1406,6 +1406,8 @@ void heap_set_debug_flags( HANDLE handle )
         flags |= HEAP_VALIDATE | HEAP_VALIDATE_ALL |
                  HEAP_TAIL_CHECKING_ENABLED | HEAP_FREE_CHECKING_ENABLED;
 
+    if (RUNNING_ON_VALGRIND) flags = 0; /* no sense in validating since Valgrind catches accesses */
+
     heap->flags |= flags;
     heap->force_flags |= flags & ~(HEAP_VALIDATE | HEAP_DISABLE_COALESCE_ON_FREE);
 




More information about the wine-cvs mailing list