X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=test_urcu.c;h=39408a0bdd6d7141915b66222a9d64a7f655a7c3;hp=db0b68ca2d18cc58cc0bd163a938375773ec660c;hb=1430ee0bdca4cb454d534ef7fc84af3e0692f26b;hpb=ad6ce6ae8c2ac890aff362a641019eb8a7473625

diff --git a/test_urcu.c b/test_urcu.c
index db0b68c..39408a0 100644
--- a/test_urcu.c
+++ b/test_urcu.c
@@ -17,93 +17,179 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <assert.h>
+#include <sys/syscall.h>
+
+#if defined(_syscall0)
+_syscall0(pid_t, gettid)
+#elif defined(__NR_gettid)
+static inline pid_t gettid(void)
+{
+	return syscall(__NR_gettid);
+}
+#else
+#warning "use pid as tid"
+static inline pid_t gettid(void)
+{
+	return getpid();
+}
+#endif
+
 #include "urcu.h"
 
 struct test_array {
 	int a;
-	int b;
-	char c[200];
 };
 
 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
+
+/*
+ * returns 0 if test should end.
+ */
+static int test_duration(void)
+{
+	if (duration_interval++ >= DURATION_TEST_DELAY) {
+		duration_interval = 0;
+		if (time(NULL) - start_time >= duration)
+			return 0;
+	}
+	return 1;
+}
+
 #define NR_READ 10
 #define NR_WRITE 9
 
+pthread_mutex_t rcu_copy_mutex = PTHREAD_MUTEX_INITIALIZER;
+
+void rcu_copy_mutex_lock(void)
+{
+	int ret;
+	ret = pthread_mutex_lock(&rcu_copy_mutex);
+	if (ret) {
+		perror("Error in pthread mutex lock");
+		exit(-1);
+	}
+}
+
+void rcu_copy_mutex_unlock(void)
+{
+	int ret;
+
+	ret = pthread_mutex_unlock(&rcu_copy_mutex);
+	if (ret) {
+		perror("Error in pthread mutex unlock");
+		exit(-1);
+	}
+}
 
 void *thr_reader(void *arg)
 {
-	int qparity, i, j;
 	struct test_array *local_ptr;
 
-	printf("thread %s, thread id : %lu, pid %lu\n",
-			"reader", pthread_self(), (unsigned long)getpid());
-	sleep(2);
+	printf("thread_begin %s, thread id : %lx, tid %lu\n",
+			"reader", pthread_self(), (unsigned long)gettid());
 
 	urcu_register_thread();
 
-	for (i = 0; i < 100000; 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);
-		}
+	for (;;) {
+		rcu_read_lock();
+		local_ptr = rcu_dereference(test_rcu_pointer);
+		if (local_ptr)
+			assert(local_ptr->a == 8);
+		rcu_read_unlock();
+		if (!test_duration())
+			break;
 	}
 
 	urcu_unregister_thread();
 
+	printf("thread_end %s, thread id : %lx, tid %lu\n",
+			"reader", pthread_self(), (unsigned long)gettid());
 	return ((void*)1);
 
 }
 
 void *thr_writer(void *arg)
 {
-	int i;
 	struct test_array *new, *old;
 
-	printf("thread %s, thread id : %lu, pid %lu\n",
-			"writer", pthread_self(), (unsigned long)getpid());
-	sleep(2);
+	printf("thread_begin %s, thread id : %lx, tid %lu\n",
+			"writer", pthread_self(), (unsigned long)gettid());
 
-	for (i = 0; i < 10000000; i++) {
+	for (;;) {
 		new = malloc(sizeof(struct test_array));
-		rcu_write_lock();
+		rcu_copy_mutex_lock();
 		old = test_rcu_pointer;
-		if (old) {
+		if (old)
 			assert(old->a == 8);
-			assert(old->b == 12);
-			assert(old->c[55] == 2);
-		}
-		new->c[55] = 2;
-		new->b = 12;
 		new->a = 8;
 		old = urcu_publish_content((void **)&test_rcu_pointer, new);
-		rcu_write_unlock();
+		rcu_copy_mutex_unlock();
 		/* can be done after unlock */
-		if (old) {
+		if (old)
 			old->a = 0;
-			old->b = 0;
-			old->c[55] = 0;
-		}
 		free(old);
+		if (!test_duration())
+			break;
 		usleep(1);
 	}
 
+	printf("thread_end %s, thread id : %lx, tid %lu\n",
+			"writer", pthread_self(), (unsigned long)gettid());
 	return ((void*)2);
 }
 
-int main()
+void show_usage(int argc, char **argv)
+{
+	printf("Usage : %s duration (s)", argv[0]);
+#ifdef DEBUG_YIELD
+	printf(" [-r] [-w] (yield reader and/or writer)");
+#endif
+	printf("\n");
+}
+
+int main(int argc, char **argv)
 {
 	int err;
 	pthread_t tid_reader[NR_READ], tid_writer[NR_WRITE];
 	void *tret;
 	int i;
 
+	if (argc < 2) {
+		show_usage(argc, argv);
+		return -1;
+	}
+
+	err = sscanf(argv[1], "%lu", &duration);
+	if (err != 1) {
+		show_usage(argc, argv);
+		return -1;
+	}
+
+#ifdef DEBUG_YIELD
+	for (i = 2; i < argc; i++) {
+		if (argv[i][0] != '-')
+			continue;
+		switch (argv[i][1]) {
+		case 'r':
+			yield_active |= YIELD_READ;
+			break;
+		case 'w':
+			yield_active |= YIELD_WRITE;
+			break;
+		}
+	}
+#endif
+
+	printf("running test for %lu seconds.\n", duration);
+	start_time = time(NULL);
+	printf("thread %-6s, thread id : %lx, tid %lu\n",
+			"main", pthread_self(), (unsigned long)gettid());
+
 	for (i = 0; i < NR_READ; i++) {
 		err = pthread_create(&tid_reader[i], NULL, thr_reader, NULL);
 		if (err != 0)
@@ -115,9 +201,7 @@ int main()
 			exit(1);
 	}
 
-	sleep(10);
-
-	for (i = 0; i < NR_WRITE; i++) {
+	for (i = 0; i < NR_READ; i++) {
 		err = pthread_join(tid_reader[i], &tret);
 		if (err != 0)
 			exit(1);
@@ -127,6 +211,7 @@ int main()
 		if (err != 0)
 			exit(1);
 	}
+	free(test_rcu_pointer);
 
 	return 0;
 }