X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu%2Frculfhash.h;h=c88740097c885beb07acb2f3d5ce80e7df94745f;hp=d989221ae889c6726672dcb8e1f95023fa7c1586;hb=848d408839fe4f829db477644c776eba166a0e9a;hpb=a42cc6594389e8f88cc49e36a7779afdb6529135

diff --git a/urcu/rculfhash.h b/urcu/rculfhash.h
index d989221..c887400 100644
--- a/urcu/rculfhash.h
+++ b/urcu/rculfhash.h
@@ -2,37 +2,81 @@
 #define _URCU_RCULFHASH_H
 
 #include <stdint.h>
+#include <urcu-call-rcu.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct rcu_ht_node {
+	/* cache-hot for iteration */
+	struct rcu_ht_node *next;
+	unsigned long reverse_hash;
+	void *key;
+	unsigned int key_len;
+	unsigned int dummy;
+	/* cache-cold for iteration */
+	struct rcu_head head;
+};
+
+struct rcu_ht;
 
 /*
  * Caution !
- * Ensure writer threads are registered as urcu readers and with with
- * urcu-defer.
- * Ensure reader threads are registered as urcu readers.
+ * Ensure reader and writer threads are registered as urcu readers.
  */
 
-typedef uint32_t (*ht_hash_fct)(void *key, uint32_t length, uint32_t initval);
+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,
+		  size_t key_len)
+{
+	node->key = key;
+	node->key_len = key_len;
+	node->dummy = 0;
+}
 
 /*
  * init_size must be power of two.
  */
-struct rcu_ht *ht_new(ht_hash_fct hash_fct, void (*free_fct)(void *data),
-		      unsigned long init_size, uint32_t keylen,
-		      uint32_t hashseed);
-
-int ht_delete_all(struct rcu_ht *ht);
+struct rcu_ht *ht_new(ht_hash_fct hash_fct,
+		      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)));
 
 int ht_destroy(struct rcu_ht *ht);
+/* Count the number of nodes in the hash table. Call with rcu_read_lock held. */
+void ht_count_nodes(struct rcu_ht *ht,
+		unsigned long *count,
+		unsigned long *removed);
 
-void *ht_lookup(struct rcu_ht *ht, void *key);
+/* Call with rcu_read_lock held. */
+struct rcu_ht_node *ht_lookup(struct rcu_ht *ht, void *key, size_t key_len);
 
-int ht_add(struct rcu_ht *ht, void *key, void *data);
+/* Call with rcu_read_lock held. */
+void ht_add(struct rcu_ht *ht, struct rcu_ht_node *node);
 
-int ht_delete(struct rcu_ht *ht, void *key);
+/*
+ * Call with rcu_read_lock held.
+ * Returns the node added upon success.
+ * Returns the unique node already present upon failure. If ht_add_unique fails,
+ * the node passed as parameter should be freed by the caller.
+ */
+struct rcu_ht_node *ht_add_unique(struct rcu_ht *ht, struct rcu_ht_node *node);
 
-void *ht_steal(struct rcu_ht *ht, void *key);
+/* Call with rcu_read_lock held. */
+int ht_remove(struct rcu_ht *ht, struct rcu_ht_node *node);
 
 void ht_resize(struct rcu_ht *ht, int growth);
 
-uint32_t ht_jhash(void *key, uint32_t length, uint32_t initval);
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* _URCU_RCULFHASH_H */