Made number of threads and number of iterations configurable. Decreased stack size...

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

diff --git a/drd/tests/rwlock_test.c b/drd/tests/rwlock_test.c
index 1c490c73bc9bdbdb629c6553c251e93fc37a4d18..c182f894084bb1ba652d088f1b830eb9aaace6cf 100644 (file)
--- a/drd/tests/rwlock_test.c
+++ b/drd/tests/rwlock_test.c
@@ -8,20 +8,25 @@
 
 #define _GNU_SOURCE 1
 
+#include <assert.h>
+#include <limits.h>  /* PTHREAD_STACK_MIN */
 #include <pthread.h>
 #include <stdio.h>
-
-#define NUM_ITERATIONS 1000
+#include <stdlib.h>  /* malloc() */
+#include <string.h>  /* strerror() */
+#include <unistd.h>  /* getopt() */
 
 static pthread_rwlock_t s_rwlock;
 static int s_counter;
+static int s_num_threads = 10;
+static int s_num_iterations = 1000;
 
 static void* thread_func(void* arg)
 {
   int i;
   int sum = 0;
 
-  for (i = 0; i < NUM_ITERATIONS; i++)
+  for (i = s_num_iterations; i > 0; i--)
   {
     pthread_rwlock_rdlock(&s_rwlock);
     sum += s_counter;
@@ -36,23 +41,57 @@ static void* thread_func(void* arg)
 
 int main(int argc, char** argv)
 {
-  const int thread_count = 10;
-  pthread_t tid[thread_count];
+  pthread_attr_t attr;
+  pthread_t* tid;
+  int threads_created;
+  int optchar;
+  int err;
   int i;
 
+  while ((optchar = getopt(argc, argv, "i:t:")) != EOF)
+  {
+    switch (optchar)
+    {
+    case 'i':
+      s_num_iterations = atoi(optarg);
+      break;
+    case 't':
+      s_num_threads = atoi(optarg);
+      break;
+    default:
+      fprintf(stderr, "Error: unknown option '%c'.\n", optchar);
+      return 1;
+    }
+  }
+
   pthread_rwlock_init(&s_rwlock, NULL);
-  for (i = 0; i < thread_count; i++)
+
+  pthread_attr_init(&attr);
+  err = pthread_attr_setstacksize(&attr, PTHREAD_STACK_MIN + 4096);
+  assert(err == 0);
+
+  tid = calloc(s_num_threads, sizeof(*tid));
+  threads_created = 0;
+  for (i = 0; i < s_num_threads; i++)
   {
-    pthread_create(&tid[i], 0, thread_func, 0);
+    err = pthread_create(&tid[i], &attr, thread_func, 0);
+    if (err)
+      printf("failed to create thread %d: %s\n", i, strerror(err));
+    else
+      threads_created++;
   }
 
-  for (i = 0; i < thread_count; i++)
+  pthread_attr_destroy(&attr);
+
+  for (i = 0; i < s_num_threads; i++)
   {
-    pthread_join(tid[i], 0);
+    if (tid[i])
+      pthread_join(tid[i], 0);
   }
+  free(tid);
 
   fprintf(stderr, "s_counter - thread_count * iterations = %d\n",
-          s_counter - thread_count * NUM_ITERATIONS);
+          s_counter - threads_created * s_num_iterations);
   fprintf(stderr, "Finished.\n");
 
   return 0;