Marked the annotations ANNOTATE_MUTEX_IS_USED_AS_CONDVAR,

ANNOTATE_UNPUBLISH_MEMORY_RANGE and ANNOTATE_SWAP_MEMORY_RANGE as deprecated.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11082 a5019735-40e9-0310-863c-91ae7b9d1cf9

1 files changed, 5 insertions, 9 deletions

diff --git a/drd/drd.h b/drd/drd.h
index 64adfe99..a13635c1 100644
--- a/drd/drd.h
+++ b/drd/drd.h
@@ -141,12 +141,7 @@
  */
 #define ANNOTATE_CONDVAR_WAIT(cv) do { } while(0)
 
-/**
- * Tell DRD to consider the memory operations that happened before a mutex
- * unlock event and after the subsequent mutex lock event on the same mutex as
- * ordered. This is how DRD always behaves, so this macro has been defined
- * such that it has no effect.
- */
+/** Deprecated -- don't use this annotation. */
 #define ANNOTATE_MUTEX_IS_USED_AS_CONDVAR(mtx) do { } while(0)
 
 /**
@@ -156,11 +151,12 @@
  */
 #define ANNOTATE_PUBLISH_MEMORY_RANGE(addr, size) do { } while(0)
 
-/**
- * Tell DRD to undo the effect of ANNOTATE_PUBLISH_MEMORY_RANGE().
- */
+/** Deprecated -- don't use this annotation. */
 #define ANNOTATE_UNPUBLISH_MEMORY_RANGE(addr, size) do { } while(0)
 
+/** Deprecated -- don't use this annotation. */
+#define ANNOTATE_SWAP_MEMORY_RANGE(addr, size) do { } while(0)
+
 /** Tell DRD that a reader-writer lock object has been initialized. */
 #define ANNOTATE_RWLOCK_CREATE(rwlock) \
    DRDCL_(annotate_rwlock_create)(rwlock)