X-Git-Url: https://git.lttng.org/?p=userspace-rcu.git;a=blobdiff_plain;f=tests%2Fbenchmark%2Ftest_urcu_hash.h;h=47b2ae3ea5f3523c06a5a67fb835b823ebe78fcf;hp=b35acdb88330d41c8ff2f73307730c181443bc32;hb=014775106c60f02818ca755b331f887030bd440f;hpb=e1c0b55cbcc602bdff8b9778d911c35515f48cc3

diff --git a/tests/benchmark/test_urcu_hash.h b/tests/benchmark/test_urcu_hash.h
index b35acdb..47b2ae3 100644
--- a/tests/benchmark/test_urcu_hash.h
+++ b/tests/benchmark/test_urcu_hash.h
@@ -23,7 +23,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include <stdio.h>
 #include <pthread.h>
 #include <stdlib.h>
@@ -32,14 +31,14 @@
 #include <sys/wait.h>
 #include <unistd.h>
 #include <stdio.h>
-#include <assert.h>
 #include <errno.h>
 #include <signal.h>
 
+#include <urcu/assert.h>
 #include <urcu/tls-compat.h>
-#include <urcu/rand-compat.h>
-#include "cpuset.h"
+#include <compat-rand.h>
 #include "thread-id.h"
+#include "../common/debug-yield.h"
 
 #define DEFAULT_HASH_SIZE	32
 #define DEFAULT_MIN_ALLOC_SIZE	1
@@ -249,10 +248,11 @@ uint32_t hash_u32(
 
 	/*----------------------------------- handle the last 3 uint32_t's */
 	switch (length) {	/* all the case statements fall through */
-	case 3: c += k[2];
-	case 2: b += k[1];
+	case 3: c += k[2]; /* fall through */
+	case 2: b += k[1]; /* fall through */
 	case 1: a += k[0];
 		final(a, b, c);
+		/* fall through */
 	case 0:			/* case 0: nothing left to add */
 		break;
 	}
@@ -285,10 +285,11 @@ void hashword2(
 
 	/*----------------------------------- handle the last 3 uint32_t's */
 	switch (length) {	/* all the case statements fall through */
-	case 3: c += k[2];
-	case 2: b += k[1];
+	case 3: c += k[2]; /* fall through */
+	case 2: b += k[1]; /* fall through */
 	case 1: a += k[0];
 		final(a, b, c);
+		/* fall through */
 	case 0:			/* case 0: nothing left to add */
 		break;
 	}
@@ -303,7 +304,7 @@ unsigned long test_hash_mix(const void *_key, size_t length, unsigned long seed)
 {
 	unsigned int key = (unsigned int) _key;
 
-	assert(length == sizeof(unsigned int));
+	urcu_posix_assert(length == sizeof(unsigned int));
 	return hash_u32(&key, 1, seed);
 }
 #else
@@ -319,7 +320,7 @@ unsigned long test_hash_mix(const void *_key, size_t length, unsigned long seed)
 		uint32_t v32[2];
 	} key;
 
-	assert(length == sizeof(unsigned long));
+	urcu_posix_assert(length == sizeof(unsigned long));
 	v.v64 = (uint64_t) seed;
 	key.v64 = (uint64_t) _key;
 	hashword2(key.v32, 2, &v.v32[0], &v.v32[1]);
@@ -344,7 +345,7 @@ unsigned long test_hash(const void *_key, size_t length,
 	} else {
 		unsigned long v;
 
-		assert(length == sizeof(unsigned long));
+		urcu_posix_assert(length == sizeof(unsigned long));
 		v = (unsigned long) _key;
 		return v % nr_hash_chains;
 	}
@@ -366,7 +367,7 @@ static inline
 void cds_lfht_test_lookup(struct cds_lfht *ht, void *key, size_t key_len,
 		struct cds_lfht_iter *iter)
 {
-	assert(key_len == sizeof(unsigned long));
+	urcu_posix_assert(key_len == sizeof(unsigned long));
 
 	cds_lfht_lookup(ht, test_hash(key, key_len, TEST_HASH_SEED),
 			test_match, key, iter);