rculfhash: add unique

[urcu.git] / urcu / rculfhash.h

diff --git a/urcu/rculfhash.h b/urcu/rculfhash.h
index 1aa98c5618b25da6219e87c0e15ec60dfc2ea2e5..ed75431f9864e08b9668e29b86f10496f8110253 100644 (file)
--- a/urcu/rculfhash.h
+++ b/urcu/rculfhash.h
@@ -7,6 +7,7 @@
 struct rcu_ht_node {
        struct rcu_ht_node *next;
        void *key;
+       size_t key_len;
        unsigned long hash;
        unsigned long reverse_hash;
        unsigned int dummy;
@@ -21,12 +22,17 @@ struct rcu_ht;
  * Ensure reader and writer threads are registered as urcu readers.
  */
 
-typedef unsigned long (*ht_hash_fct)(void *hashseed, void *key);
+typedef unsigned long (*ht_hash_fct)(void *key, size_t length,
+                                    unsigned long seed);
+typedef unsigned long (*ht_compare_fct)(void *key1, size_t key1_len,
+                                       void *key2, size_t key2_len);
 
 static inline
-void ht_node_init(struct rcu_ht_node *node, void *key, void *value)
+void ht_node_init(struct rcu_ht_node *node, void *key,
+                 size_t key_len, void *value)
 {
        node->key = key;
+       node->key_len = key_len;
        node->value = value;
        node->dummy = 0;
 }
@@ -35,7 +41,8 @@ void ht_node_init(struct rcu_ht_node *node, void *key, void *value)
  * init_size must be power of two.
  */
 struct rcu_ht *ht_new(ht_hash_fct hash_fct,
-                     void *hashseed,
+                     ht_compare_fct compare_fct,
+                     unsigned long hash_seed,
                      unsigned long init_size,
                      void (*ht_call_rcu)(struct rcu_head *head,
                                void (*func)(struct rcu_head *head)));
@@ -43,11 +50,14 @@ struct rcu_ht *ht_new(ht_hash_fct hash_fct,
 int ht_destroy(struct rcu_ht *ht);
 
 /* Call with rcu_read_lock held. */
-struct rcu_ht_node *ht_lookup(struct rcu_ht *ht, void *key);
+struct rcu_ht_node *ht_lookup(struct rcu_ht *ht, void *key, size_t key_len);
 
 /* Call with rcu_read_lock held. */
 void ht_add(struct rcu_ht *ht, struct rcu_ht_node *node);
 
+/* Call with rcu_read_lock held. */
+int ht_add_unique(struct rcu_ht *ht, struct rcu_ht_node *node);
+
 /* Call with rcu_read_lock held. */
 int ht_remove(struct rcu_ht *ht, struct rcu_ht_node *node);