Fix tests: use of uninitialized variables
[urcu.git] / tests / test_urcu_wfcq.c
index 939bf7a7bc77a5459d0ce683d9e72c0c40d9820b..f04c9bd8b6874424bf830f722787c6e531e415eb 100644 (file)
 #include <unistd.h>
 #include <stdio.h>
 #include <assert.h>
-#include <sched.h>
 #include <errno.h>
 
 #include <urcu/arch.h>
 #include <urcu/tls-compat.h>
-
-#ifdef __linux__
-#include <syscall.h>
-#endif
+#include <urcu/uatomic.h>
+#include "cpuset.h"
+#include "thread-id.h"
 
 /* hardcoded number of CPUs */
 #define NR_CPUS 16384
 
-#if defined(_syscall0)
-_syscall0(pid_t, gettid)
-#elif defined(__NR_gettid)
-static inline pid_t gettid(void)
-{
-       return syscall(__NR_gettid);
-}
-#else
-#warning "use pid as tid"
-static inline pid_t gettid(void)
-{
-       return getpid();
-}
-#endif
-
 #ifndef DYNAMIC_LINK_TEST
 #define _LGPL_SOURCE
 #endif
-#include <urcu.h>
 #include <urcu/wfcqueue.h>
 
 enum test_sync {
@@ -109,12 +91,6 @@ static int use_affinity = 0;
 
 pthread_mutex_t affinity_mutex = PTHREAD_MUTEX_INITIALIZER;
 
-#ifndef HAVE_CPU_SET_T
-typedef unsigned long cpu_set_t;
-# define CPU_ZERO(cpuset) do { *(cpuset) = 0; } while(0)
-# define CPU_SET(cpu, cpuset) do { *(cpuset) |= (1UL << (cpu)); } while(0)
-#endif
-
 static void set_affinity(void)
 {
 #if HAVE_SCHED_SETAFFINITY
@@ -168,6 +144,7 @@ static DEFINE_URCU_TLS(unsigned long long, nr_successful_dequeues);
 static DEFINE_URCU_TLS(unsigned long long, nr_successful_enqueues);
 static DEFINE_URCU_TLS(unsigned long long, nr_empty_dest_enqueues);
 static DEFINE_URCU_TLS(unsigned long long, nr_splice);
+static DEFINE_URCU_TLS(unsigned long long, nr_dequeue_last);
 
 static unsigned int nr_enqueuers;
 static unsigned int nr_dequeuers;
@@ -180,9 +157,8 @@ static void *thr_enqueuer(void *_count)
        unsigned long long *count = _count;
        bool was_nonempty;
 
-       printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n",
-                       "enqueuer", (unsigned long) pthread_self(),
-                       (unsigned long) gettid());
+       printf_verbose("thread_begin %s, tid %lu\n",
+                       "enqueuer", urcu_get_thread_id());
 
        set_affinity();
 
@@ -213,14 +189,13 @@ fail:
        count[0] = URCU_TLS(nr_enqueues);
        count[1] = URCU_TLS(nr_successful_enqueues);
        count[2] = URCU_TLS(nr_empty_dest_enqueues);
-       printf_verbose("enqueuer thread_end, thread id : %lx, tid %lu, "
-                      "enqueues %llu successful_enqueues %llu, "
-                      "empty_dest_enqueues %llu\n",
-                      pthread_self(),
-                       (unsigned long) gettid(),
-                      URCU_TLS(nr_enqueues),
-                      URCU_TLS(nr_successful_enqueues),
-                      URCU_TLS(nr_empty_dest_enqueues));
+       printf_verbose("enqueuer thread_end, tid %lu, "
+                       "enqueues %llu successful_enqueues %llu, "
+                       "empty_dest_enqueues %llu\n",
+                       urcu_get_thread_id(),
+                       URCU_TLS(nr_enqueues),
+                       URCU_TLS(nr_successful_enqueues),
+                       URCU_TLS(nr_empty_dest_enqueues));
        return ((void*)1);
 
 }
@@ -228,11 +203,17 @@ fail:
 static void do_test_dequeue(enum test_sync sync)
 {
        struct cds_wfcq_node *node;
+       int state;
 
        if (sync == TEST_SYNC_MUTEX)
-               node = cds_wfcq_dequeue_blocking(&head, &tail);
+               node = cds_wfcq_dequeue_with_state_blocking(&head, &tail,
+                               &state);
        else
-               node = __cds_wfcq_dequeue_blocking(&head, &tail);
+               node = __cds_wfcq_dequeue_with_state_blocking(&head, &tail,
+                               &state);
+
+       if (state & CDS_WFCQ_STATE_LAST)
+               URCU_TLS(nr_dequeue_last)++;
 
        if (node) {
                free(node);
@@ -263,6 +244,7 @@ static void do_test_splice(enum test_sync sync)
                break;
        case CDS_WFCQ_RET_DEST_EMPTY:
                URCU_TLS(nr_splice)++;
+               URCU_TLS(nr_dequeue_last)++;
                /* ok */
                break;
        case CDS_WFCQ_RET_DEST_NON_EMPTY:
@@ -283,11 +265,10 @@ static void do_test_splice(enum test_sync sync)
 static void *thr_dequeuer(void *_count)
 {
        unsigned long long *count = _count;
-       unsigned int counter;
+       unsigned int counter = 0;
 
-       printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n",
-                       "dequeuer", (unsigned long) pthread_self(),
-                       (unsigned long) gettid());
+       printf_verbose("thread_begin %s, tid %lu\n",
+                       "dequeuer", urcu_get_thread_id());
 
        set_affinity();
 
@@ -315,26 +296,31 @@ static void *thr_dequeuer(void *_count)
                        loop_sleep(rduration);
        }
 
-       printf_verbose("dequeuer thread_end, thread id : %lx, tid %lu, "
-                      "dequeues %llu, successful_dequeues %llu, "
-                      "nr_splice %llu\n",
-                      pthread_self(),
-                       (unsigned long) gettid(),
-                      URCU_TLS(nr_dequeues), URCU_TLS(nr_successful_dequeues),
-                      URCU_TLS(nr_splice));
+       printf_verbose("dequeuer thread_end, tid %lu, "
+                       "dequeues %llu, successful_dequeues %llu, "
+                       "nr_splice %llu\n",
+                       urcu_get_thread_id(),
+                       URCU_TLS(nr_dequeues), URCU_TLS(nr_successful_dequeues),
+                       URCU_TLS(nr_splice));
        count[0] = URCU_TLS(nr_dequeues);
        count[1] = URCU_TLS(nr_successful_dequeues);
        count[2] = URCU_TLS(nr_splice);
+       count[3] = URCU_TLS(nr_dequeue_last);
        return ((void*)2);
 }
 
-static void test_end(unsigned long long *nr_dequeues)
+static void test_end(unsigned long long *nr_dequeues,
+               unsigned long long *nr_dequeue_last)
 {
        struct cds_wfcq_node *node;
+       int state;
 
        do {
-               node = cds_wfcq_dequeue_blocking(&head, &tail);
+               node = cds_wfcq_dequeue_with_state_blocking(&head, &tail,
+                               &state);
                if (node) {
+                       if (state & CDS_WFCQ_STATE_LAST)
+                               (*nr_dequeue_last)++;
                        free(node);
                        (*nr_dequeues)++;
                }
@@ -343,17 +329,19 @@ static void test_end(unsigned long long *nr_dequeues)
 
 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(" [-q] (test dequeue)");
-       printf(" [-s] (test splice, enabled by default)");
-       printf(" [-M] (use mutex external synchronization)");
-       printf("      Note: default: no external synchronization used.");
-       printf(" [-f] (force user-provided synchronization)");
-       printf(" [-w] Wait for dequeuer to empty queue");
+       printf("Usage : %s nr_dequeuers nr_enqueuers duration (s) <OPTIONS>\n",
+               argv[0]);
+       printf("OPTIONS:\n");
+       printf("        [-d delay] (enqueuer period (in loops))\n");
+       printf("        [-c duration] (dequeuer period (in loops))\n");
+       printf("        [-v] (verbose output)\n");
+       printf("        [-a cpu#] [-a cpu#]... (affinity)\n");
+       printf("        [-q] (test dequeue)\n");
+       printf("        [-s] (test splice, enabled by default)\n");
+       printf("        [-M] (use mutex external synchronization)\n");
+       printf("                Note: default: no external synchronization used.\n");
+       printf("        [-f] (force user-provided synchronization)\n");
+       printf("        [-w] Wait for dequeuer to empty queue\n");
        printf("\n");
 }
 
@@ -367,7 +355,7 @@ int main(int argc, char **argv)
        unsigned long long tot_successful_enqueues = 0,
                           tot_successful_dequeues = 0,
                           tot_empty_dest_enqueues = 0,
-                          tot_splice = 0;
+                          tot_splice = 0, tot_dequeue_last = 0;
        unsigned long long end_dequeues = 0;
        int i, a, retval = 0;
 
@@ -473,14 +461,13 @@ int main(int argc, char **argv)
                printf_verbose("Wait for dequeuers to empty queue.\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",
-                       "main", (unsigned long) pthread_self(),
-                       (unsigned long) gettid());
-
-       tid_enqueuer = malloc(sizeof(*tid_enqueuer) * nr_enqueuers);
-       tid_dequeuer = malloc(sizeof(*tid_dequeuer) * nr_dequeuers);
-       count_enqueuer = malloc(3 * sizeof(*count_enqueuer) * nr_enqueuers);
-       count_dequeuer = malloc(3 * sizeof(*count_dequeuer) * nr_dequeuers);
+       printf_verbose("thread %-6s, tid %lu\n",
+                       "main", urcu_get_thread_id());
+
+       tid_enqueuer = calloc(nr_enqueuers, sizeof(*tid_enqueuer));
+       tid_dequeuer = calloc(nr_dequeuers, sizeof(*tid_dequeuer));
+       count_enqueuer = calloc(nr_enqueuers, 3 * sizeof(*count_enqueuer));
+       count_dequeuer = calloc(nr_dequeuers, 4 * sizeof(*count_dequeuer));
        cds_wfcq_init(&head, &tail);
 
        next_aff = 0;
@@ -493,7 +480,7 @@ int main(int argc, char **argv)
        }
        for (i = 0; i < nr_dequeuers; i++) {
                err = pthread_create(&tid_dequeuer[i], NULL, thr_dequeuer,
-                                    &count_dequeuer[3 * i]);
+                                    &count_dequeuer[4 * i]);
                if (err != 0)
                        exit(1);
        }
@@ -533,34 +520,37 @@ int main(int argc, char **argv)
                err = pthread_join(tid_dequeuer[i], &tret);
                if (err != 0)
                        exit(1);
-               tot_dequeues += count_dequeuer[3 * i];
-               tot_successful_dequeues += count_dequeuer[3 * i + 1];
-               tot_splice += count_dequeuer[3 * i + 2];
+               tot_dequeues += count_dequeuer[4 * i];
+               tot_successful_dequeues += count_dequeuer[4 * i + 1];
+               tot_splice += count_dequeuer[4 * i + 2];
+               tot_dequeue_last += count_dequeuer[4 * i + 3];
        }
        
-       test_end(&end_dequeues);
+       test_end(&end_dequeues, &tot_dequeue_last);
 
        printf_verbose("total number of enqueues : %llu, dequeues %llu\n",
                       tot_enqueues, tot_dequeues);
        printf_verbose("total number of successful enqueues : %llu, "
                       "enqueues to empty dest : %llu, "
-                      "successful dequeues %llu, ",
-                      "splice : %llu\n",
+                      "successful dequeues %llu, "
+                      "splice : %llu, dequeue_last : %llu\n",
                       tot_successful_enqueues,
                       tot_empty_dest_enqueues,
                       tot_successful_dequeues,
-                      tot_splice);
+                      tot_splice, tot_dequeue_last);
        printf("SUMMARY %-25s testdur %4lu nr_enqueuers %3u wdelay %6lu "
                "nr_dequeuers %3u "
                "rdur %6lu nr_enqueues %12llu nr_dequeues %12llu "
                "successful enqueues %12llu enqueues to empty dest %12llu "
                "successful dequeues %12llu splice %12llu "
+               "dequeue_last %llu "
                "end_dequeues %llu nr_ops %12llu\n",
                argv[0], duration, nr_enqueuers, wdelay,
                nr_dequeuers, rduration, tot_enqueues, tot_dequeues,
                tot_successful_enqueues,
                tot_empty_dest_enqueues,
-               tot_successful_dequeues, tot_splice, end_dequeues,
+               tot_successful_dequeues, tot_splice, tot_dequeue_last,
+               end_dequeues,
                tot_enqueues + tot_dequeues);
 
        if (tot_successful_enqueues != tot_successful_dequeues + end_dequeues) {
@@ -576,12 +566,11 @@ int main(int argc, char **argv)
         * exactly as many empty queues than the number of non-empty
         * src splice.
         */
-       if (test_wait_empty && test_splice && !test_dequeue
-                       && tot_empty_dest_enqueues != tot_splice) {
+       if (tot_empty_dest_enqueues != tot_dequeue_last) {
                printf("WARNING! Discrepancy between empty enqueue (%llu) and "
-                       "number of non-empty splice (%llu)\n",
+                       "number of dequeue of last element (%llu)\n",
                        tot_empty_dest_enqueues,
-                       tot_splice);
+                       tot_dequeue_last);
                retval = 1;
        }
        free(count_enqueuer);
This page took 0.026863 seconds and 4 git commands to generate.