s/NDEBUG/NVALGRIND/g in base/dynamic_annotations.* to allow...

base/dynamic_annotations.h

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This file defines dynamic annotations for use with dynamic analysis
 // tool such as valgrind, PIN, etc.
 //
 // Dynamic annotation is a source code annotation that affects
 // the generated code (that is, the annotation is not a comment).
 // Each such annotation is attached to a particular
 // instruction and/or to a particular object (address) in the program.
 //
 // The annotations that should be used by users are macros in all upper-case
 // (e.g., ANNOTATE_NEW_MEMORY).
 //
 // Actual implementation of these macros may differ depending on the
 // dynamic analysis tool being used.
 //
 // This file supports the following dynamic analysis tools:
-// - None (NDEBUG is defined).
+// - None (NVALGRIND is defined).
 //    Macros are defined empty.
-// - ThreadSanitizer (NDEBUG is not defined).
+// - ThreadSanitizer (NVALGRIND is not defined).
 //    Macros are defined as calls to non-inlinable empty functions
 //    that are intercepted by ThreadSanitizer.
 //
 #ifndef BASE_DYNAMIC_ANNOTATIONS_H_
 #define BASE_DYNAMIC_ANNOTATIONS_H_
 
-// All the annotation macros are in effect only in debug mode.
-#ifndef NDEBUG
-// Debug build.
+#include "base/third_party/valgrind/valgrind.h"
 
+#ifndef NVALGRIND
 // -------------------------------------------------------------
 // Annotations useful when implementing condition variables such as CondVar,
 // using conditional critical sections (Await/LockWhen) and when constructing
 // user-defined synchronization mechanisms.
 //
 // The annotations ANNOTATE_HAPPENS_BEFORE() and ANNOTATE_HAPPENS_AFTER() can
 // be used to define happens-before arcs in user-defined synchronization
 // mechanisms:  the race detector will infer an arc from the former to the
 // latter when they share the same argument pointer.
 //
@@ skipping 259 matching lines @@
     class static_var ## _annotator {                                \
      public:                                                        \
       static_var ## _annotator() {                                  \
         ANNOTATE_BENIGN_RACE(&static_var,                           \
           # static_var ": " description);                           \
       }                                                             \
     };                                                              \
     static static_var ## _annotator the ## static_var ## _annotator;\
   }
 
-#else  // NDEBUG is defined
-// Release build, empty macros.
+#else
+// NVALGRIND is defined, empty macros.
 
 #define ANNOTATE_RWLOCK_CREATE(lock) // empty
 #define ANNOTATE_RWLOCK_DESTROY(lock) // empty
 #define ANNOTATE_RWLOCK_ACQUIRED(lock, is_w) // empty
 #define ANNOTATE_RWLOCK_RELEASED(lock, is_w) // empty
 #define ANNOTATE_CONDVAR_LOCK_WAIT(cv, lock) // empty
 #define ANNOTATE_CONDVAR_WAIT(cv) // empty
 #define ANNOTATE_CONDVAR_SIGNAL(cv) // empty
 #define ANNOTATE_CONDVAR_SIGNAL_ALL(cv) // empty
 #define ANNOTATE_HAPPENS_BEFORE(obj) // empty
@@ skipping 13 matching lines @@
 #define ANNOTATE_IGNORE_READS_BEGIN() // empty
 #define ANNOTATE_IGNORE_READS_END() // empty
 #define ANNOTATE_IGNORE_WRITES_BEGIN() // empty
 #define ANNOTATE_IGNORE_WRITES_END() // empty
 #define ANNOTATE_IGNORE_READS_AND_WRITES_BEGIN() // empty
 #define ANNOTATE_IGNORE_READS_AND_WRITES_END() // empty
 #define ANNOTATE_NO_OP(arg) // empty
 #define ANNOTATE_UNPROTECTED_READ(x) (x)
 #define ANNOTATE_BENIGN_RACE_STATIC(static_var, description)  // empty
 
-#endif  // NDEBUG
+#endif  // NVALGRIND
 
 // Return non-zero value if running under valgrind.
 extern "C" int RunningOnValgrind();
 
 #endif  // BASE_DYNAMIC_ANNOTATIONS_H_