X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Ftest_urcu_lfs.c;h=816447f6c7f2d23aa9af110fbe7f56b652d891aa;hb=98fbc848f22e74b85d3c98bcf626ba7fd906a6e1;hp=9af846d1c782a724caeb41306e39aa29352ac0c4;hpb=cb8818f01ed341f21d9b6467365a66fda3fc6856;p=urcu.git

diff --git a/tests/test_urcu_lfs.c b/tests/test_urcu_lfs.c
index 9af846d..816447f 100644
--- a/tests/test_urcu_lfs.c
+++ b/tests/test_urcu_lfs.c
@@ -68,6 +68,16 @@ static inline pid_t gettid(void)
 #include <urcu.h>
 #include <urcu/cds.h>
 
+/*
+ * External synchronization used.
+ */
+enum test_sync {
+	TEST_SYNC_NONE = 0,
+	TEST_SYNC_RCU,
+};
+
+static enum test_sync test_sync;
+
 static volatile int test_go, test_stop;
 
 static unsigned long rduration;
@@ -85,10 +95,12 @@ static inline void loop_sleep(unsigned long loops)
 
 static int verbose_mode;
 
+static int test_pop, test_pop_all;
+
 #define printf_verbose(fmt, args...)		\
 	do {					\
 		if (verbose_mode)		\
-			printf(fmt, args);	\
+			printf(fmt, ## args);	\
 	} while (0)
 
 static unsigned int cpu_affinities[NR_CPUS];
@@ -165,7 +177,7 @@ struct test {
 
 static struct cds_lfs_stack s;
 
-void *thr_enqueuer(void *_count)
+static void *thr_enqueuer(void *_count)
 {
 	unsigned long long *count = _count;
 
@@ -217,7 +229,53 @@ void free_node_cb(struct rcu_head *head)
 	free(node);
 }
 
-void *thr_dequeuer(void *_count)
+static
+void do_test_pop(enum test_sync sync)
+{
+	struct cds_lfs_node *snode;
+
+	if (sync == TEST_SYNC_RCU)
+		rcu_read_lock();
+	snode = __cds_lfs_pop(&s);
+	if (sync == TEST_SYNC_RCU)
+		rcu_read_unlock();
+	if (snode) {
+		struct test *node;
+
+		node = caa_container_of(snode,
+			struct test, list);
+		if (sync == TEST_SYNC_RCU)
+			call_rcu(&node->rcu, free_node_cb);
+		else
+			free(node);
+		URCU_TLS(nr_successful_dequeues)++;
+	}
+	URCU_TLS(nr_dequeues)++;
+}
+
+static
+void do_test_pop_all(enum test_sync sync)
+{
+	struct cds_lfs_node *snode;
+	struct cds_lfs_head *head;
+	struct cds_lfs_node *n;
+
+	head = __cds_lfs_pop_all(&s);
+	cds_lfs_for_each_safe(head, snode, n) {
+		struct test *node;
+
+		node = caa_container_of(snode, struct test, list);
+		if (sync == TEST_SYNC_RCU)
+			call_rcu(&node->rcu, free_node_cb);
+		else
+			free(node);
+		URCU_TLS(nr_successful_dequeues)++;
+		URCU_TLS(nr_dequeues)++;
+	}
+
+}
+
+static void *thr_dequeuer(void *_count)
 {
 	unsigned long long *count = _count;
 
@@ -233,20 +291,25 @@ void *thr_dequeuer(void *_count)
 	}
 	cmm_smp_mb();
 
-	for (;;) {
-		struct cds_lfs_node *snode;
-
-		rcu_read_lock();
-		snode = cds_lfs_pop(&s);
-		rcu_read_unlock();
-		if (snode) {
-			struct test *node;
+	assert(test_pop || test_pop_all);
 
-			node = caa_container_of(snode, struct test, list);
-			call_rcu(&node->rcu, free_node_cb);
-			URCU_TLS(nr_successful_dequeues)++;
+	for (;;) {
+		unsigned int counter = 0;
+
+		if (test_pop && test_pop_all) {
+			/* both pop and pop all */
+			if (counter & 1)
+				do_test_pop(test_sync);
+			else
+				do_test_pop_all(test_sync);
+			counter++;
+		} else {
+			if (test_pop)
+				do_test_pop(test_sync);
+			else
+				do_test_pop_all(test_sync);
 		}
-		URCU_TLS(nr_dequeues)++;
+
 		if (caa_unlikely(!test_duration_dequeue()))
 			break;
 		if (caa_unlikely(rduration))
@@ -264,12 +327,12 @@ void *thr_dequeuer(void *_count)
 	return ((void*)2);
 }
 
-void test_end(struct cds_lfs_stack *s, unsigned long long *nr_dequeues)
+static void test_end(struct cds_lfs_stack *s, unsigned long long *nr_dequeues)
 {
 	struct cds_lfs_node *snode;
 
 	do {
-		snode = cds_lfs_pop(s);
+		snode = __cds_lfs_pop(s);
 		if (snode) {
 			struct test *node;
 
@@ -280,13 +343,17 @@ void test_end(struct cds_lfs_stack *s, unsigned long long *nr_dequeues)
 	} while (snode);
 }
 
-void show_usage(int argc, char **argv)
+static void show_usage(int argc, char **argv)
 {
 	printf("Usage : %s nr_dequeuers nr_enqueuers duration (s)", argv[0]);
 	printf(" [-d delay] (enqueuer period (in loops))");
 	printf(" [-c duration] (dequeuer period (in loops))");
 	printf(" [-v] (verbose output)");
 	printf(" [-a cpu#] [-a cpu#]... (affinity)");
+	printf(" [-p] (test pop)");
+	printf(" [-P] (test pop_all, enabled by default)");
+	printf(" [-R] (use RCU external synchronization)");
+	printf("      Note: default: no external synchronization used.");
 	printf("\n");
 }
 
@@ -356,12 +423,33 @@ int main(int argc, char **argv)
 		case 'v':
 			verbose_mode = 1;
 			break;
+		case 'p':
+			test_pop = 1;
+			break;
+		case 'P':
+			test_pop_all = 1;
+			break;
+		case 'R':
+			test_sync = TEST_SYNC_RCU;
+			break;
 		}
 	}
 
+	/* activate pop_all test by default */
+	if (!test_pop && !test_pop_all)
+		test_pop_all = 1;
+
 	printf_verbose("running test for %lu seconds, %u enqueuers, "
 		       "%u dequeuers.\n",
 		       duration, nr_enqueuers, nr_dequeuers);
+	if (test_pop)
+		printf_verbose("pop test activated.\n");
+	if (test_pop_all)
+		printf_verbose("pop_all test activated.\n");
+	if (test_sync == TEST_SYNC_RCU)
+		printf_verbose("External sync: RCU.\n");
+	else
+		printf_verbose("External sync: none.\n");
 	printf_verbose("Writer delay : %lu loops.\n", rduration);
 	printf_verbose("Reader duration : %lu loops.\n", wdelay);
 	printf_verbose("thread %-6s, thread id : %lx, tid %lu\n",