rculfhash: simplify lfht_new API with inline wrapper

[urcu.git] / urcu / rculfhash.h

diff --git a/urcu/rculfhash.h b/urcu/rculfhash.h
index 8f501ea29b7b1e549c9b2d87f9ecf2e769251af0..d8f2f5facff6d658573b073201ade5d67ad00a7c 100644 (file)
--- 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,
@@ -94,7 +91,30 @@ struct cds_lfht *cds_lfht_new(cds_lfht_hash_fct hash_fct,
                                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_read_unlock)(void),
+                       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.