LGPL relicensing part 2

[urcu.git] / test_urcu.c

diff --git a/test_urcu.c b/test_urcu.c
index 3a28474561977675c6932663055c3cb8d2e2fc19..72cceebdd331473d35e516721a9640cf2a3a737f 100644 (file)
--- a/test_urcu.c
+++ b/test_urcu.c
@@ -5,7 +5,19 @@
  *
  * Copyright February 2009 - Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
  *
- * Distributed under GPLv2
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include <stdio.h>
@@ -34,6 +46,11 @@ static inline pid_t gettid(void)
 }
 #endif
 
+#ifndef DYNAMIC_LINK_TEST
+#define _LGPL_SOURCE
+#else
+#define debug_yield_read()
+#endif
 #include "urcu.h"
 
 struct test_array {
@@ -47,14 +64,25 @@ static struct test_array *test_rcu_pointer;
 static unsigned long duration;
 static time_t start_time;
 static unsigned long __thread duration_interval;
-#define DURATION_TEST_DELAY 100
+#define DURATION_TEST_DELAY_WRITE 4
+#define DURATION_TEST_DELAY_READ 100
 
 /*
  * returns 0 if test should end.
  */
-static int test_duration(void)
+static int test_duration_write(void)
+{
+       if (duration_interval++ >= DURATION_TEST_DELAY_WRITE) {
+               duration_interval = 0;
+               if (time(NULL) - start_time >= duration)
+                       return 0;
+       }
+       return 1;
+}
+
+static int test_duration_read(void)
 {
-       if (duration_interval++ >= DURATION_TEST_DELAY) {
+       if (duration_interval++ >= DURATION_TEST_DELAY_READ) {
                duration_interval = 0;
                if (time(NULL) - start_time >= duration)
                        return 0;
@@ -135,7 +163,7 @@ void *thr_reader(void *_count)
        printf("thread_begin %s, thread id : %lx, tid %lu\n",
                        "reader", pthread_self(), (unsigned long)gettid());
 
-       urcu_register_thread();
+       rcu_register_thread();
 
        for (;;) {
                rcu_read_lock();
@@ -145,11 +173,11 @@ void *thr_reader(void *_count)
                        assert(local_ptr->a == 8);
                rcu_read_unlock();
                nr_reads++;
-               if (!test_duration())
+               if (!test_duration_read())
                        break;
        }
 
-       urcu_unregister_thread();
+       rcu_unregister_thread();
 
        *count = nr_reads;
        printf("thread_end %s, thread id : %lx, tid %lu\n",
@@ -173,14 +201,14 @@ void *thr_writer(void *_count)
                if (old)
                        assert(old->a == 8);
                new->a = 8;
-               old = urcu_publish_content(&test_rcu_pointer, new);
+               old = rcu_publish_content(&test_rcu_pointer, new);
                rcu_copy_mutex_unlock();
                /* can be done after unlock */
                if (old)
                        old->a = 0;
                test_array_free(old);
                nr_writes++;
-               if (!test_duration())
+               if (!test_duration_write())
                        break;
                if (!no_writer_delay)
                        usleep(1);
@@ -270,6 +298,7 @@ int main(int argc, char **argv)
                        exit(1);
                tot_writes += count_writer[i];
        }
+       
        printf("total number of reads : %llu, writes %llu\n", tot_reads,
               tot_writes);
        test_array_free(test_rcu_pointer);