Switched to the just introduced ANNOTATE_*() macro's.

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

diff --git a/drd/tests/annotate_rwlock.c b/drd/tests/annotate_rwlock.c
index fbd7e043fb72bddac2b281cca938d675816cf074..1d4ee859af0d76e04d554d581b6c38a9d5420a4e 100644 (file)
--- a/drd/tests/annotate_rwlock.c
+++ b/drd/tests/annotate_rwlock.c
@@ -67,7 +67,7 @@ static void rwlock_rdlock(rwlock_t* p)
   assert(p->writer_count >= 0);
   assert(p->reader_count == 0 || p->writer_count == 0);
   __sync_fetch_and_sub(&p->locked, 1);
-  ANNOTATE_RWLOCK_ACQUIRED(p, 0);
+  ANNOTATE_READERLOCK_ACQUIRED(p);
 }
 
 static void rwlock_wrlock(rwlock_t* p)
@@ -86,7 +86,7 @@ static void rwlock_wrlock(rwlock_t* p)
   assert(p->writer_count >= 0);
   assert(p->reader_count == 0 || p->writer_count == 0);
   __sync_fetch_and_sub(&p->locked, 1);
-  ANNOTATE_RWLOCK_ACQUIRED(p, 1);
+  ANNOTATE_WRITERLOCK_ACQUIRED(p);
 }
 
 static void rwlock_unlock(rwlock_t* p)
@@ -96,12 +96,12 @@ static void rwlock_unlock(rwlock_t* p)
   if (p->reader_count > 0)
   {
     p->reader_count--;
-    ANNOTATE_RWLOCK_RELEASED(p, 0);
+    ANNOTATE_READERLOCK_RELEASED(p);
   }
   else
   {
     p->writer_count--;
-    ANNOTATE_RWLOCK_RELEASED(p, 1);
+    ANNOTATE_WRITERLOCK_RELEASED(p);
   }
   assert(p->reader_count >= 0);
   assert(p->writer_count >= 0);