X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu%2Frculfhash.h;h=bc9f232d65deb6632f9c19a84dceb2a6e901a377;hp=4e0b1975a37be667f6a3306b72167ac79aa6efa9;hb=f22dd01d7941170a1b1b0275344a6e6cd83dbcc6;hpb=5f51139190536f948f9571fdf3c97cf0198356d0 diff --git a/urcu/rculfhash.h b/urcu/rculfhash.h index 4e0b197..bc9f232 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, @@ -98,6 +97,33 @@ 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. + * @hash_fct: the hashing function. + * @compare_fct: the key comparison function. + * @hash_seed: the seed for hash function. + * @init_size: number of nodes to allocate initially. 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. + * + * 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. *