|
From: <sv...@va...> - 2009-05-31 18:00:43
|
Author: bart
Date: 2009-05-31 19:00:39 +0100 (Sun, 31 May 2009)
New Revision: 10185
Log:
Reverted some of the DRD customizations.
Modified:
trunk/drd/tests/tsan_unittest.cpp
Modified: trunk/drd/tests/tsan_unittest.cpp
===================================================================
--- trunk/drd/tests/tsan_unittest.cpp 2009-05-31 18:00:12 UTC (rev 10184)
+++ trunk/drd/tests/tsan_unittest.cpp 2009-05-31 18:00:39 UTC (rev 10185)
@@ -1515,7 +1515,7 @@
for (int j = i; j < N; j++) {
GLOB[j] = j;
}
- ANNOTATE_HAPPENS_BEFORE(reinterpret_cast<void*>(BOUNDARY+1));
+ ANNOTATE_CONDVAR_SIGNAL(reinterpret_cast<void*>(BOUNDARY+1));
BOUNDARY++;
usleep(1000);
}
@@ -1526,7 +1526,7 @@
do {
n = BOUNDARY;
if (n == 0) continue;
- ANNOTATE_HAPPENS_AFTER_REPEATEDLY(reinterpret_cast<void*>(n));
+ ANNOTATE_CONDVAR_WAIT(reinterpret_cast<void*>(n));
for (int i = 0; i < n; i++) {
CHECK(GLOB[i] == i);
}
@@ -1568,7 +1568,7 @@
for (int j = i; j < N; j++) {
GLOB[j] = j;
}
- ANNOTATE_HAPPENS_BEFORE(reinterpret_cast<void*>(BOUNDARY+1));
+ ANNOTATE_CONDVAR_SIGNAL(reinterpret_cast<void*>(BOUNDARY+1));
BOUNDARY++;
usleep(1000);
}
@@ -1579,7 +1579,7 @@
do {
n = BOUNDARY;
if (n == 0) continue;
- ANNOTATE_HAPPENS_AFTER_REPEATEDLY(reinterpret_cast<void*>(n));
+ ANNOTATE_CONDVAR_WAIT(reinterpret_cast<void*>(n));
for (int i = 0; i < n; i++) {
if(GLOB[i] == i) {
GLOB[i]++;
|