lfq baseline: check for empty list

[urcu.git] / tests / test_lfq_baseline.c

diff --git a/tests/test_lfq_baseline.c b/tests/test_lfq_baseline.c
index 4f0eba21a8651a1ba0bd92a4c76b620373c8a2f6..c35d8941bb6980c8933f518db12413e544ee70c6 100644 (file)
--- a/tests/test_lfq_baseline.c
+++ b/tests/test_lfq_baseline.c
@@ -242,9 +242,12 @@ void *thr_dequeuer(void *_count)
                struct test *node;
 
                test_mutex_lock();
-               node = cds_list_first_entry(&q, struct test, node);
-               if (node)
+               if (!cds_list_empty(&q)) {
+                       node = cds_list_first_entry(&q, struct test, node);
                        cds_list_del(&node->node);
+               } else {
+                       node = NULL;
+               }
                test_mutex_unlock();
 
                if (node) {
@@ -273,7 +276,11 @@ void test_end(unsigned long long *nr_dequeues)
        struct test *node;
 
        do {
-               node = cds_list_first_entry(&q, struct test, node);
+               if (!cds_list_empty(&q)) {
+                       node = cds_list_first_entry(&q, struct test, node);
+               } else {
+                       node = NULL;
+               }
                if (node) {
                        cds_list_del(&node->node);
                        free(node);     /* no more concurrent access */