X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Ftest_urcu_hash.c;h=fc2cfb286423228c43e96e1b3d27cd29b44b03b9;hb=1475579ca651164ea74eb0c9f727baad991098af;hp=b13b1bd6f125d18dfbf4d6c6e603d21a49c33bd3;hpb=cd1ae16ab299679750ce9d80579180951f8b877c;p=urcu.git

diff --git a/tests/test_urcu_hash.c b/tests/test_urcu_hash.c
index b13b1bd..fc2cfb2 100644
--- a/tests/test_urcu_hash.c
+++ b/tests/test_urcu_hash.c
@@ -151,6 +151,31 @@ static void set_affinity(void)
 	sched_setaffinity(0, sizeof(mask), &mask);
 }
 
+static enum {
+	AR_RANDOM = 0,
+	AR_ADD = 1,
+	AR_REMOVE = -1,
+} addremove;	/* 1: add, -1 remove, 0: random */
+
+static
+void sigusr1_handler(int signo)
+{
+	switch (addremove) {
+	case AR_ADD:
+		printf("Add/Remove: random.\n");
+		addremove = AR_RANDOM;
+		break;
+	case AR_RANDOM:
+		printf("Add/Remove: remove only.\n");
+		addremove = AR_REMOVE;
+		break;
+	case AR_REMOVE:
+		printf("Add/Remove: add only.\n");
+		addremove = AR_ADD;
+		break;
+	}
+}
+
 /*
  * returns 0 if test should end.
  */
@@ -412,7 +437,8 @@ void *thr_writer(void *_count)
 	cmm_smp_mb();
 
 	for (;;) {
-		if (add_only || rand_r(&rand_lookup) & 1) {
+		if ((addremove == AR_ADD || add_only)
+				|| (addremove == AR_RANDOM && rand_r(&rand_lookup) & 1)) {
 			node = malloc(sizeof(struct cds_lfht_node));
 			rcu_read_lock();
 			cds_lfht_node_init(node,
@@ -480,12 +506,19 @@ void *thr_writer(void *_count)
 	return ((void*)2);
 }
 
-static void populate_hash(void)
+static int populate_hash(void)
 {
 	struct cds_lfht_node *node, *ret_node;
 
 	if (!init_populate)
-		return;
+		return 0;
+
+	if (add_unique && init_populate * 10 > rand_pool) {
+		printf("WARNING: required to populate %lu nodes (-k), but random "
+"pool is quite small (%lu values) and we are in add_unique (-u) mode. Try with a "
+"larger random pool (-p option).\n", init_populate, rand_pool);
+		return -1;
+	}
 
 	while (nr_add < init_populate) {
 		node = malloc(sizeof(struct cds_lfht_node));
@@ -503,6 +536,7 @@ static void populate_hash(void)
 			nr_add++;
 		nr_writes++;
 	}
+	return 0;
 }
 
 void show_usage(int argc, char **argv)
@@ -534,6 +568,8 @@ int main(int argc, char **argv)
 		tot_add = 0, tot_add_exist = 0, tot_remove = 0;
 	unsigned long count, removed;
 	int i, a, ret;
+	struct sigaction act;
+	unsigned int remain;
 
 	if (argc < 4) {
 		show_usage(argc, argv);
@@ -630,6 +666,20 @@ int main(int argc, char **argv)
 		return -1;
 	}
 
+	memset(&act, 0, sizeof(act));
+	ret = sigemptyset(&act.sa_mask);
+	if (ret == -1) {
+		perror("sigemptyset");
+		return -1;
+	}
+	act.sa_handler = sigusr1_handler;
+	act.sa_flags = SA_RESTART;
+	ret = sigaction(SIGUSR1, &act, NULL);
+	if (ret == -1) {
+		perror("sigaction");
+		return -1;
+	}
+
 	printf_verbose("running test for %lu seconds, %u readers, %u writers.\n",
 		duration, nr_readers, nr_writers);
 	printf_verbose("Writer delay : %lu loops.\n", wdelay);
@@ -647,8 +697,9 @@ int main(int argc, char **argv)
 	count_reader = malloc(sizeof(*count_reader) * nr_readers);
 	count_writer = malloc(sizeof(*count_writer) * nr_writers);
 	test_ht = cds_lfht_new(test_hash, test_compare, 0x42UL,
-			 init_hash_size, call_rcu);
-	populate_hash();
+			 init_hash_size, call_rcu, synchronize_rcu);
+	ret = populate_hash();
+	assert(!ret);
         err = create_all_cpu_call_rcu_data(0);
         assert(!err);
 
@@ -671,7 +722,10 @@ int main(int argc, char **argv)
 
 	test_go = 1;
 
-	sleep(duration);
+	remain = duration;
+	do {
+		remain = sleep(remain);
+	} while (remain > 0);
 
 	test_stop = 1;