Merge branch 'master' into urcu/rcuja-range

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/README b/README
index ce498b939938868e06334e1e7d0aec87a5b5506f..c7403f8da1ca35e8d9734d74ed47e5fdabf3f7fd 100644 (file)
--- a/README
+++ b/README
@@ -27,9 +27,10 @@ ARCHITECTURES SUPPORTED
 -----------------------
 
 Currently, Linux x86 (i386, i486, i586, i686), x86 64-bit, PowerPC 32/64,
-S390, S390x, ARM, Alpha, ia64 and Sparcv9 32/64 are supported. Tested on
-Linux, FreeBSD 8.2/9.0, and Cygwin. Should also work on: Android, NetBSD 5,
-OpenBSD, Darwin (more testing needed before claiming support for these OS).
+S390, S390x, ARM, MIPS, Alpha, ia64 and Sparcv9 32/64 are supported.
+Tested on Linux, FreeBSD 8.2/8.3/9.0/9.1/10.0 i386/amd64, and Cygwin.
+Should also work on: Android, NetBSD 5, OpenBSD, Darwin (more testing
+needed before claiming support for these OS).
 
 Linux ARM depends on running a Linux kernel 2.6.15 or better, GCC 4.4 or
 better.

diff --git a/tests/api.h b/tests/api.h
index 2b876565c991351a86f3c61748addc1d20b1a68a..dced0d8d204e15b84252f1f374f7b5027d12490b 100644 (file)
--- a/tests/api.h
+++ b/tests/api.h
@@ -151,9 +151,10 @@ static int __smp_thread_id(void)
        }
        spin_lock(&__thread_id_map_mutex);
        for (i = 0; i < NR_THREADS; i++) {
-               if (__thread_id_map[i] == tid)
+               if (__thread_id_map[i] == tid) {
                        spin_unlock(&__thread_id_map_mutex);
                        return i;
+               }
        }
        spin_unlock(&__thread_id_map_mutex);
        fprintf(stderr, "smp_thread_id: Rogue thread, id: %lu(%#lx)\n",

diff --git a/tests/test_urcu_lfs.c b/tests/test_urcu_lfs.c
index 67ccaa25f3f9911e77acbc22d62f43ba6d84ed1c..9636f5bb0da7a935f3e52092d0b3cbef1278cea8 100644 (file)
--- a/tests/test_urcu_lfs.c
+++ b/tests/test_urcu_lfs.c
@@ -274,6 +274,7 @@ void do_test_pop_all(enum test_sync sync)
 static void *thr_dequeuer(void *_count)
 {
        unsigned long long *count = _count;
+       unsigned int counter = 0;
 
        printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n",
                        "dequeuer", (unsigned long) pthread_self(),
@@ -291,8 +292,6 @@ static void *thr_dequeuer(void *_count)
        assert(test_pop || test_pop_all);
 
        for (;;) {
-               unsigned int counter = 0;
-
                if (test_pop && test_pop_all) {
                        /* both pop and pop all */
                        if (counter & 1)

diff --git a/tests/test_urcu_wfcq.c b/tests/test_urcu_wfcq.c
index cb1cc23ed91aa575ea9667a4594ec9269dc3b1b6..a3bd7e556031eef71c19b1be5e811ae5daaebdf6 100644 (file)
--- a/tests/test_urcu_wfcq.c
+++ b/tests/test_urcu_wfcq.c
@@ -285,7 +285,7 @@ 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(),

diff --git a/tests/test_urcu_wfs.c b/tests/test_urcu_wfs.c
index a379fa39176c9453f1249748da21409b08e4c92f..043d842e73b5a4b93c9b462120add91bae1c5e23 100644 (file)
--- a/tests/test_urcu_wfs.c
+++ b/tests/test_urcu_wfs.c
@@ -270,7 +270,7 @@ static void do_test_pop_all(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(),

diff --git a/urcu/rculfhash.h b/urcu/rculfhash.h
index 9c382120111c34d31d86fd80e9206d575626534a..4c400ce81e5b534fcef71b6fec40142ac27ecea4 100644 (file)
--- a/urcu/rculfhash.h
+++ b/urcu/rculfhash.h
@@ -177,7 +177,8 @@ struct cds_lfht *cds_lfht_new(unsigned long init_size,
  * Return 0 on success, negative error value on error.
  * Threads calling this API need to be registered RCU read-side threads.
  * cds_lfht_destroy should *not* be called from a RCU read-side critical
- * section.
+ * section. It should *not* be called from a call_rcu thread context
+ * neither.
  */
 extern
 int cds_lfht_destroy(struct cds_lfht *ht, pthread_attr_t **attr);