|
From: <sv...@va...> - 2009-07-01 18:46:34
|
Author: bart
Date: 2009-07-01 19:46:27 +0100 (Wed, 01 Jul 2009)
New Revision: 10398
Log:
Switched to the just introduced ANNOTATE_*() macro's.
Modified:
trunk/drd/tests/annotate_rwlock.c
Modified: trunk/drd/tests/annotate_rwlock.c
===================================================================
--- trunk/drd/tests/annotate_rwlock.c 2009-07-01 18:45:45 UTC (rev 10397)
+++ trunk/drd/tests/annotate_rwlock.c 2009-07-01 18:46:27 UTC (rev 10398)
@@ -67,7 +67,7 @@
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 @@
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 @@
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);
|