X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=test_urcu.c;h=73fbc4e204e13b032a5830e9149974f32ff7cd19;hb=ae878d0dcc291dba7c5722eed13294195a64409e;hp=93bc013b4a3a3575e598ef10eb61096871db7aa1;hpb=cf380c2fd2f85e3fba4826991fb748255bdc9b76;p=urcu.git

diff --git a/test_urcu.c b/test_urcu.c
index 93bc013..73fbc4e 100644
--- a/test_urcu.c
+++ b/test_urcu.c
@@ -40,6 +40,8 @@ struct test_array {
 	int a;
 };
 
+static int no_writer_delay;
+
 static struct test_array *test_rcu_pointer;
 
 static unsigned long duration;
@@ -86,9 +88,44 @@ void rcu_copy_mutex_unlock(void)
 	}
 }
 
+/*
+ * malloc/free are reusing memory areas too quickly, which does not let us
+ * test races appropriately. Use a large circular array for allocations.
+ * ARRAY_SIZE is larger than NR_WRITE, which insures we never run over our tail.
+ */
+#define ARRAY_SIZE (1048576 * NR_WRITE)
+#define ARRAY_POISON 0xDEADBEEF
+static int array_index;
+static struct test_array test_array[ARRAY_SIZE];
+
+static struct test_array *test_array_alloc(void)
+{
+	struct test_array *ret;
+	int index;
+
+	rcu_copy_mutex_lock();
+	index = array_index % ARRAY_SIZE;
+	assert(test_array[index].a == ARRAY_POISON ||
+		test_array[index].a == 0);
+	ret = &test_array[index];
+	array_index++;
+	if (array_index == ARRAY_SIZE)
+		array_index = 0;
+	rcu_copy_mutex_unlock();
+	return ret;
+}
+
+static void test_array_free(struct test_array *ptr)
+{
+	if (!ptr)
+		return;
+	rcu_copy_mutex_lock();
+	ptr->a = ARRAY_POISON;
+	rcu_copy_mutex_unlock();
+}
+
 void *thr_reader(void *arg)
 {
-	int qparity;
 	struct test_array *local_ptr;
 
 	printf("thread_begin %s, thread id : %lx, tid %lu\n",
@@ -97,11 +134,12 @@ void *thr_reader(void *arg)
 	urcu_register_thread();
 
 	for (;;) {
-		rcu_read_lock(&qparity);
+		rcu_read_lock();
 		local_ptr = rcu_dereference(test_rcu_pointer);
+		debug_yield_read();
 		if (local_ptr)
 			assert(local_ptr->a == 8);
-		rcu_read_unlock(&qparity);
+		rcu_read_unlock();
 		if (!test_duration())
 			break;
 	}
@@ -122,21 +160,22 @@ void *thr_writer(void *arg)
 			"writer", pthread_self(), (unsigned long)gettid());
 
 	for (;;) {
-		new = malloc(sizeof(struct test_array));
+		new = test_array_alloc();
 		rcu_copy_mutex_lock();
 		old = test_rcu_pointer;
 		if (old)
 			assert(old->a == 8);
 		new->a = 8;
-		old = urcu_publish_content((void **)&test_rcu_pointer, new);
+		old = urcu_publish_content(&test_rcu_pointer, new);
 		rcu_copy_mutex_unlock();
 		/* can be done after unlock */
 		if (old)
 			old->a = 0;
-		free(old);
+		test_array_free(old);
 		if (!test_duration())
 			break;
-		usleep(1);
+		if (!no_writer_delay)
+			usleep(1);
 	}
 
 	printf("thread_end %s, thread id : %lx, tid %lu\n",
@@ -144,6 +183,16 @@ void *thr_writer(void *arg)
 	return ((void*)2);
 }
 
+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] (disable writer delay)");
+	printf("\n");
+}
+
 int main(int argc, char **argv)
 {
 	int err;
@@ -152,32 +201,33 @@ int main(int argc, char **argv)
 	int i;
 
 	if (argc < 2) {
-		printf("Usage : %s duration (s) [-r] [-w] "
-		       "(yield reader and/or writer)\n", argv[0]);
+		show_usage(argc, argv);
 		return -1;
 	}
 
 	err = sscanf(argv[1], "%lu", &duration);
 	if (err != 1) {
-		printf("Usage : %s duration (s) [-r] [-w] "
-		       "(yield reader and/or writer)\n", argv[0]);
+		show_usage(argc, argv);
 		return -1;
 	}
 
-#ifdef DEBUG_YIELD
 	for (i = 2; i < argc; i++) {
 		if (argv[i][0] != '-')
 			continue;
 		switch (argv[i][1]) {
+#ifdef DEBUG_YIELD
 		case 'r':
 			yield_active |= YIELD_READ;
 			break;
 		case 'w':
 			yield_active |= YIELD_WRITE;
 			break;
+#endif
+		case 'n':
+			no_writer_delay = 1;
+			break;
 		}
 	}
-#endif
 
 	printf("running test for %lu seconds.\n", duration);
 	start_time = time(NULL);
@@ -205,7 +255,7 @@ int main(int argc, char **argv)
 		if (err != 0)
 			exit(1);
 	}
-	free(test_rcu_pointer);
+	test_array_free(test_rcu_pointer);
 
 	return 0;
 }