Reverted r10511.

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

diff --git a/drd/tests/rwlock_test.c b/drd/tests/rwlock_test.c
index 34d99dae033e5e98fba07622ff47a32083cd13ad..1c490c73bc9bdbdb629c6553c251e93fc37a4d18 100644 (file)
--- a/drd/tests/rwlock_test.c
+++ b/drd/tests/rwlock_test.c
@@ -10,45 +10,25 @@
 
 #include <pthread.h>
 #include <stdio.h>
-#include <string.h>  // strerror()
-
 
 #define NUM_ITERATIONS 1000
 
-#define PTH_CALL(expr)                                  \
-  do                                                    \
-  {                                                     \
-    int err = (expr);                                   \
-    if ((err) != 0)                                     \
-    {                                                   \
-      fprintf(stderr,                                   \
-              "%s:%d %s returned error code %d (%s)\n", \
-              __FILE__,                                 \
-              __LINE__,                                 \
-              #expr,                                    \
-              err,                                      \
-              strerror(err));                           \
-    }                                                   \
-  } while (0)
-
-
 static pthread_rwlock_t s_rwlock;
 static int s_counter;
 
-
 static void* thread_func(void* arg)
 {
   int i;
   int sum = 0;
 
-  for (i = 0; i < 1000; i++)
+  for (i = 0; i < NUM_ITERATIONS; i++)
   {
-    PTH_CALL(pthread_rwlock_rdlock(&s_rwlock));
+    pthread_rwlock_rdlock(&s_rwlock);
     sum += s_counter;
-    PTH_CALL(pthread_rwlock_unlock(&s_rwlock));
-    PTH_CALL(pthread_rwlock_wrlock(&s_rwlock));
+    pthread_rwlock_unlock(&s_rwlock);
+    pthread_rwlock_wrlock(&s_rwlock);
     s_counter++;
-    PTH_CALL(pthread_rwlock_unlock(&s_rwlock));
+    pthread_rwlock_unlock(&s_rwlock);
   }
 
   return 0;
@@ -60,15 +40,15 @@ int main(int argc, char** argv)
   pthread_t tid[thread_count];
   int i;
 
-  PTH_CALL(pthread_rwlock_init(&s_rwlock, NULL));
+  pthread_rwlock_init(&s_rwlock, NULL);
   for (i = 0; i < thread_count; i++)
   {
-    PTH_CALL(pthread_create(&tid[i], 0, thread_func, 0));
+    pthread_create(&tid[i], 0, thread_func, 0);
   }
 
   for (i = 0; i < thread_count; i++)
   {
-    PTH_CALL(pthread_join(tid[i], 0));
+    pthread_join(tid[i], 0);
   }
 
   fprintf(stderr, "s_counter - thread_count * iterations = %d\n",