X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu%2Frculfhash.h;h=95fff09b61869d7575f048c37546355f94f87d77;hp=8f501ea29b7b1e549c9b2d87f9ecf2e769251af0;hb=cf77d1fac55a2b5c711d26b6fff22c68cf52dc72;hpb=01dbfa62037e08aa2d08ab0e721267ccdd99b947 diff --git a/urcu/rculfhash.h b/urcu/rculfhash.h index 8f501ea..95fff09 100644 --- a/urcu/rculfhash.h +++ b/urcu/rculfhash.h @@ -21,6 +21,8 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Include this file _after_ including your URCU flavor. */ #include @@ -80,12 +82,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 +93,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.