Revert 41938 - Merged third_party/tcmalloc/vendor/src(googleperftools r87) in...

third_party/tcmalloc/chromium/src/base/dynamic_annotations.h

 /* Copyright (c) 2008, Google Inc.
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  * 
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 185 matching lines @@
   //   }
   //   tmp->DoSomething();
   // }
   #define ANNOTATE_SWAP_MEMORY_RANGE(pointer, size)   \
     do {                                              \
       ANNOTATE_UNPUBLISH_MEMORY_RANGE(pointer, size); \
       ANNOTATE_PUBLISH_MEMORY_RANGE(pointer, size);   \
     } while (0)
 
   // Instruct the tool to create a happens-before arc between mu->Unlock() and
-  // mu->Lock(). This annotation may slow down the race detector and hide real
-  // races. Normally it is used only when it would be difficult to annotate each
-  // of the mutex's critical sections individually using the annotations above.
-  // This annotation makes sense only for hybrid race detectors. For pure
-  // happens-before detectors this is a no-op. For more details see
-  // http://code.google.com/p/data-race-test/wiki/PureHappensBeforeVsHybrid .
-  #define ANNOTATE_PURE_HAPPENS_BEFORE_MUTEX(mu) \
-    AnnotateMutexIsUsedAsCondVar(__FILE__, __LINE__, mu)
-
-  // Deprecated. Use ANNOTATE_PURE_HAPPENS_BEFORE_MUTEX.
+  // mu->Lock().  This annotation may slow down the race detector; normally it
+  // is used only when it would be difficult to annotate each of the mutex's
+  // critical sections individually using the annotations above.
   #define ANNOTATE_MUTEX_IS_USED_AS_CONDVAR(mu) \
     AnnotateMutexIsUsedAsCondVar(__FILE__, __LINE__, mu)
 
   // -------------------------------------------------------------
   // Annotations useful when defining memory allocators, or when memory that
   // was protected in one way starts to be protected in another.
 
   // Report that a new memory at "address" of size "size" has been allocated.
   // This might be used when the memory has been retrieved from a free list and
   // is about to be reused, or when a the locking discipline for a variable
@@ skipping 131 matching lines @@
   #define ANNOTATE_PUBLISH_MEMORY_RANGE(address, size) // empty
   #define ANNOTATE_UNPUBLISH_MEMORY_RANGE(address, size)  // empty
   #define ANNOTATE_SWAP_MEMORY_RANGE(address, size)  // empty
   #define ANNOTATE_PCQ_CREATE(pcq) // empty
   #define ANNOTATE_PCQ_DESTROY(pcq) // empty
   #define ANNOTATE_PCQ_PUT(pcq) // empty
   #define ANNOTATE_PCQ_GET(pcq) // empty
   #define ANNOTATE_NEW_MEMORY(address, size) // empty
   #define ANNOTATE_EXPECT_RACE(address, description) // empty
   #define ANNOTATE_BENIGN_RACE(address, description) // empty
-  #define ANNOTATE_PURE_HAPPENS_BEFORE_MUTEX(mu) // empty
   #define ANNOTATE_MUTEX_IS_USED_AS_CONDVAR(mu) // empty
   #define ANNOTATE_TRACE_MEMORY(arg) // empty
   #define ANNOTATE_THREAD_NAME(name) // empty
   #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
@@ skipping 88 matching lines @@
   #define ANNOTATE_UNPROTECTED_READ(x) (x)
   #define ANNOTATE_BENIGN_RACE_STATIC(static_var, description)  // empty
 
 #endif // !NDEBUG
 
 // Return non-zero value if running under valgrind.
 extern "C" int RunningOnValgrind();
 
 
 #endif  // BASE_DYNAMIC_ANNOTATIONS_H_