X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=test_urcu.c;h=17061f81a250d5f12f7e4836d7caf81835cd43d4;hp=37bd43695a8264c0dfc9cce877e942c9995535bf;hb=cdcb92bbb9e54201e0982844e3ca9cb4fd9b31e5;hpb=b1b5ce8f610ee61647b10d93d7a61b5fbf1f2ccd

diff --git a/test_urcu.c b/test_urcu.c
index 37bd436..17061f8 100644
--- a/test_urcu.c
+++ b/test_urcu.c
@@ -1,3 +1,13 @@
+/*
+ * test_urcu.c
+ *
+ * Userspace RCU library - test program
+ *
+ * Copyright February 2009 - Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
+ *
+ * Distributed under GPLv2
+ */
+
 #include <stdio.h>
 #include <pthread.h>
 #include <stdlib.h>
@@ -18,29 +28,31 @@ struct test_array {
 static struct test_array *test_rcu_pointer;
 
 #define NR_READ 10
-#define NR_WRITE 5
+#define NR_WRITE 9
 
 
 void *thr_reader(void *arg)
 {
-	int qparity, i;
+	int qparity, i, j;
 	struct test_array *local_ptr;
 
 	printf("thread %s, thread id : %lu, pid %lu\n",
-			"reader", pthread_self(), getpid());
+			"reader", pthread_self(), (unsigned long)getpid());
 	sleep(2);
 
 	urcu_register_thread();
 
-	for (i = 0; i < 1000000; i++) {
-		qparity = rcu_read_lock();
-		local_ptr = rcu_dereference(test_rcu_pointer);
-		if (local_ptr) {
-			assert(local_ptr->a == 8);
-			assert(local_ptr->b == 12);
-			assert(local_ptr->c[55] == 2);
+	for (i = 0; i < 1000; i++) {
+		for (j = 0; j < 100000000; j++) {
+			qparity = rcu_read_lock();
+			local_ptr = rcu_dereference(test_rcu_pointer);
+			if (local_ptr) {
+				assert(local_ptr->a == 8);
+				assert(local_ptr->b == 12);
+				assert(local_ptr->c[55] == 2);
+			}
+			rcu_read_unlock(qparity);
 		}
-		rcu_read_unlock(qparity);
 	}
 
 	urcu_unregister_thread();
@@ -55,10 +67,10 @@ void *thr_writer(void *arg)
 	struct test_array *new, *old;
 
 	printf("thread %s, thread id : %lu, pid %lu\n",
-			"writer", pthread_self(), getpid());
+			"writer", pthread_self(), (unsigned long)getpid());
 	sleep(2);
 
-	for (i = 0; i < 1000000; i++) {
+	for (i = 0; i < 100000; i++) {
 		rcu_write_lock();
 		new = malloc(sizeof(struct test_array));
 		old = test_rcu_pointer;
@@ -67,13 +79,19 @@ void *thr_writer(void *arg)
 			assert(old->b == 12);
 			assert(old->c[55] == 2);
 		}
-		assert(new->a = 8);
-		assert(new->b = 12);
-		assert(new->c[55] = 2);
-		old = urcu_publish_content(&test_rcu_pointer, new);
+		new->a = 8;
+		new->b = 12;
+		new->c[55] = 2;
+		old = urcu_publish_content((void **)&test_rcu_pointer, new);
 		rcu_write_unlock();
 		/* can be done after unlock */
+		if (old) {
+			old->a = 0;
+			old->b = 0;
+			old->c[55] = 0;
+		}
 		free(old);
+		usleep(1);
 	}
 
 	return ((void*)2);