From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Mon, 19 Sep 2011 20:07:18 +0000 (-0400)
Subject: rculfhash: simplify lfht_new API with inline wrapper
X-Git-Tag: v0.7.0~43^2~144
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=7a9dcf9bf15667662e61b44c611a7f4c39b10dcf;p=urcu.git

rculfhash: simplify lfht_new API with inline wrapper

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

diff --git a/rculfhash.c b/rculfhash.c
index 6ac53ea..ce1cbb7 100644
--- a/rculfhash.c
+++ b/rculfhash.c
@@ -1050,7 +1050,7 @@ void fini_table(struct cds_lfht *ht,
 	}
 }
 
-struct cds_lfht *cds_lfht_new(cds_lfht_hash_fct hash_fct,
+struct cds_lfht *_cds_lfht_new(cds_lfht_hash_fct hash_fct,
 			cds_lfht_compare_fct compare_fct,
 			unsigned long hash_seed,
 			unsigned long init_size,
diff --git a/tests/test_urcu_hash.c b/tests/test_urcu_hash.c
index 7485d98..273283e 100644
--- a/tests/test_urcu_hash.c
+++ b/tests/test_urcu_hash.c
@@ -750,10 +750,7 @@ int main(int argc, char **argv)
 	count_writer = malloc(sizeof(*count_writer) * nr_writers);
 	test_ht = cds_lfht_new(test_hash, test_compare, 0x42UL,
 			init_hash_size,
-			opt_auto_resize ? CDS_LFHT_AUTO_RESIZE : 0,
-			call_rcu, synchronize_rcu, rcu_read_lock,
-			rcu_read_unlock, rcu_thread_offline,
-			rcu_thread_online);
+			opt_auto_resize ? CDS_LFHT_AUTO_RESIZE : 0);
 	ret = populate_hash();
 	assert(!ret);
         err = create_all_cpu_call_rcu_data(0);
diff --git a/urcu/rculfhash.h b/urcu/rculfhash.h
index 4e0b197..d8f2f5f 100644
--- a/urcu/rculfhash.h
+++ b/urcu/rculfhash.h
@@ -80,12 +80,9 @@ enum {
 };
 
 /*
- * cds_lfht_new - allocate a hash table.
- *
- * init_size must be power of two.
- * Return NULL on error.
+ * _cds_lfht_new - API used by cds_lfht_new wrapper. Do not use directly.
  */
-struct cds_lfht *cds_lfht_new(cds_lfht_hash_fct hash_fct,
+struct cds_lfht *_cds_lfht_new(cds_lfht_hash_fct hash_fct,
 			cds_lfht_compare_fct compare_fct,
 			unsigned long hash_seed,
 			unsigned long init_size,
@@ -98,6 +95,27 @@ struct cds_lfht *cds_lfht_new(cds_lfht_hash_fct hash_fct,
 			void (*cds_lfht_rcu_thread_offline)(void),
 			void (*cds_lfht_rcu_thread_online)(void));
 
+/*
+ * cds_lfht_new - allocate a hash table.
+ *
+ * init_size must be power of two.
+ * Return NULL on error.
+ * Note: the RCU flavor must be already included before the hash table header.
+ */
+static inline
+struct cds_lfht *cds_lfht_new(cds_lfht_hash_fct hash_fct,
+			cds_lfht_compare_fct compare_fct,
+			unsigned long hash_seed,
+			unsigned long init_size,
+			int flags)
+{
+	return _cds_lfht_new(hash_fct, compare_fct, hash_seed,
+			init_size, flags,
+			call_rcu, synchronize_rcu, rcu_read_lock,
+			rcu_read_unlock, rcu_thread_offline,
+			rcu_thread_online);
+}
+
 /*
  * cds_lfht_destroy - destroy a hash table.
  *