X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Ftest_urcu_lfs.c;h=b48a35fe0f1c77ebaf9806cc03422ce8567e74ba;hb=18ca7a5b5573e511a66f118ec863df82a6d247e4;hp=e02fa58b49f4e24acb910628ca31e1025352771b;hpb=94aec12284c03da90d879b4d55280f9cbf0e183a;p=urcu.git

diff --git a/tests/test_urcu_lfs.c b/tests/test_urcu_lfs.c
index e02fa58..b48a35f 100644
--- a/tests/test_urcu_lfs.c
+++ b/tests/test_urcu_lfs.c
@@ -189,11 +189,11 @@ void *thr_enqueuer(void *_count)
 		cds_lfs_push_rcu(&s, &node->list);
 		nr_successful_enqueues++;
 
-		if (unlikely(wdelay))
+		if (caa_unlikely(wdelay))
 			loop_sleep(wdelay);
 fail:
 		nr_enqueues++;
-		if (unlikely(!test_duration_enqueue()))
+		if (caa_unlikely(!test_duration_enqueue()))
 			break;
 	}
 
@@ -252,9 +252,9 @@ void *thr_dequeuer(void *_count)
 			nr_successful_dequeues++;
 		}
 		nr_dequeues++;
-		if (unlikely(!test_duration_dequeue()))
+		if (caa_unlikely(!test_duration_dequeue()))
 			break;
-		if (unlikely(rduration))
+		if (caa_unlikely(rduration))
 			loop_sleep(rduration);
 	}
 
@@ -379,7 +379,9 @@ int main(int argc, char **argv)
 	count_dequeuer = malloc(2 * sizeof(*count_dequeuer) * nr_dequeuers);
 	cds_lfs_init_rcu(&s);
 	err = create_all_cpu_call_rcu_data(0);
-	assert(!err);
+	if (err) {
+		printf("Per-CPU call_rcu() worker threads unavailable. Using default global worker thread.\n");
+	}
 
 	next_aff = 0;
 
@@ -446,6 +448,7 @@ int main(int argc, char **argv)
 		       tot_successful_enqueues,
 		       tot_successful_dequeues + end_dequeues);
 
+	free_all_cpu_call_rcu_data();
 	free(count_enqueuer);
 	free(count_dequeuer);
 	free(tid_enqueuer);