ck_hs: Add hash function wrapper to maintain opacity of ck_hs_t.

This is in the form of CK_HS_HASH(X, Y, Z) which expands to
Y(Z, X.seed).

include/ck_hs.h

@@ -83,6 +83,9 @@ typedef struct ck_hs_iterator ck_hs_iterator_t;
 
 #define CK_HS_ITERATOR_INITIALIZER { NULL, 0 }
 
+/* Convenience wrapper to table hash function. */
+#define CK_HS_HASH(T, F, K) F((K), (T)->seed)
+
 void ck_hs_iterator_init(ck_hs_iterator_t *);
 bool ck_hs_next(ck_hs_t *, ck_hs_iterator_t *, void **);
 bool ck_hs_init(ck_hs_t *, unsigned int, ck_hs_hash_cb_t *, ck_hs_compare_cb_t *, struct ck_malloc *, unsigned long, unsigned long);

regressions/ck_hs/benchmark/parallel_bytestring.c

@@ -154,7 +154,7 @@ set_remove(const char *value)
 {
 	unsigned long h;
 
-	h = (unsigned long)MurmurHash64A(value, strlen(value), hs.seed);
+	h = CK_HS_HASH(&hs, hs_hash, value);
 	return (bool)ck_hs_remove(&hs, h, value);
 }
 
@@ -164,7 +164,7 @@ set_replace(const char *value)
 	unsigned long h;
 	void *previous;
 
-	h = (unsigned long)MurmurHash64A(value, strlen(value), hs.seed);
+	h = CK_HS_HASH(&hs, hs_hash, value);
 	return ck_hs_set(&hs, h, value, &previous);
 }
 
@@ -174,7 +174,7 @@ set_get(const char *value)
 	unsigned long h;
 	void *v;
 
-	h = (unsigned long)MurmurHash64A(value, strlen(value), hs.seed);
+	h = CK_HS_HASH(&hs, hs_hash, value);
 	v = ck_hs_get(&hs, h, value);
 	return v;
 }
@@ -184,7 +184,7 @@ set_insert(const char *value)
 {
 	unsigned long h;
 
-	h = (unsigned long)MurmurHash64A(value, strlen(value), hs.seed);
+	h = CK_HS_HASH(&hs, hs_hash, value);
 	return ck_hs_put(&hs, h, value);
 }
 

regressions/ck_hs/benchmark/serial.c

@@ -102,7 +102,7 @@ set_remove(const char *value)
 {
 	unsigned long h;
 
-	h = hs_hash(value, hs.seed);
+	h = CK_HS_HASH(&hs, hs_hash, value);
 	ck_hs_remove(&hs, h, value);
 	return true;
 }
@@ -113,7 +113,7 @@ set_replace(const char *value)
 	unsigned long h;
 	void *previous;
 
-	h = hs_hash(value, hs.seed);
+	h = CK_HS_HASH(&hs, hs_hash, value);
 	ck_hs_set(&hs, h, value, &previous);
 	return previous != NULL;
 }
@@ -124,7 +124,7 @@ set_get(const char *value)
 	unsigned long h;
 	void *v;
 
-	h = hs_hash(value, hs.seed);
+	h = CK_HS_HASH(&hs, hs_hash, value);
 	v = ck_hs_get(&hs, h, value);
 	return v;
 }
@@ -134,7 +134,7 @@ set_insert(const char *value)
 {
 	unsigned long h;
 
-	h = hs_hash(value, hs.seed);
+	h = CK_HS_HASH(&hs, hs_hash, value);
 	return ck_hs_put(&hs, h, value);
 }