X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu%2Frculfhash.h;h=7b9c5e4ebceef0e734f504e70acc569eb0e8ffd3;hp=d3018b7e438b6446ebac56bfa4bdc41ef695704d;hb=7b3893e462472cd25a19ac6f5ebc09aeb031ea60;hpb=0dcf48471eda28730279e5ead11e5411d23e3af0

diff --git a/urcu/rculfhash.h b/urcu/rculfhash.h
index d3018b7..7b9c5e4 100644
--- a/urcu/rculfhash.h
+++ b/urcu/rculfhash.h
@@ -29,6 +29,7 @@
 #include <stdint.h>
 #include <urcu/compiler.h>
 #include <urcu-call-rcu.h>
+#include <urcu-flavor.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -98,23 +99,19 @@ enum {
  * _cds_lfht_new - API used by cds_lfht_new wrapper. Do not use directly.
  */
 struct cds_lfht *_cds_lfht_new(unsigned long init_size,
-			unsigned long min_alloc_size,
+			unsigned long min_nr_alloc_buckets,
+			unsigned long max_nr_buckets,
 			int flags,
-			void (*cds_lfht_call_rcu)(struct rcu_head *head,
-				void (*func)(struct rcu_head *head)),
-			void (*cds_lfht_synchronize_rcu)(void),
-			void (*cds_lfht_rcu_read_lock)(void),
-			void (*cds_lfht_rcu_read_unlock)(void),
-			void (*cds_lfht_rcu_thread_offline)(void),
-			void (*cds_lfht_rcu_thread_online)(void),
-			void (*cds_lfht_rcu_register_thread)(void),
-			void (*cds_lfht_rcu_unregister_thread)(void),
+			const struct rcu_flavor_struct *flavor,
 			pthread_attr_t *attr);
 
 /*
  * cds_lfht_new - allocate a hash table.
- * @init_size: number of nodes to allocate initially. Must be power of two.
- * @min_alloc_size: the smallest allocation size to use. Must be power of two.
+ * @init_size: number of buckets to allocate initially. Must be power of two.
+ * @min_nr_alloc_buckets: the minimum number of allocated buckets.
+ *                        (must be power of two)
+ * @max_nr_buckets: the maximum number of hash table buckets allowed.
+ *                  (must be power of two)
  * @flags: hash table creation flags (can be combined with bitwise or: '|').
  *           0: no flags.
  *           CDS_LFHT_AUTO_RESIZE: automatically resize hash table.
@@ -137,15 +134,13 @@ struct cds_lfht *_cds_lfht_new(unsigned long init_size,
  */
 static inline
 struct cds_lfht *cds_lfht_new(unsigned long init_size,
-			unsigned long min_alloc_size,
+			unsigned long min_nr_alloc_buckets,
+			unsigned long max_nr_buckets,
 			int flags,
 			pthread_attr_t *attr)
 {
-	return _cds_lfht_new(init_size, min_alloc_size, flags,
-			call_rcu, synchronize_rcu, rcu_read_lock,
-			rcu_read_unlock, rcu_thread_offline,
-			rcu_thread_online, rcu_register_thread,
-			rcu_unregister_thread, attr);
+	return _cds_lfht_new(init_size, min_nr_alloc_buckets, max_nr_buckets,
+			flags, &rcu_flavor, attr);
 }
 
 /*