projects
/
userspace-rcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cds_lfht_replace: add checks for old/new node hash/value match
[userspace-rcu.git]
/
urcu
/
rculfhash.h
diff --git
a/urcu/rculfhash.h
b/urcu/rculfhash.h
index 6ea00de3557f381bcd7172b7a8260d85e9d54734..96dc5a023aa6d4958b24bf316269463ed114b62a 100644
(file)
--- a/
urcu/rculfhash.h
+++ b/
urcu/rculfhash.h
@@
-325,11
+325,16
@@
struct cds_lfht_node *cds_lfht_add_replace(struct cds_lfht *ht,
* cds_lfht_replace - replace a node pointer to by iter within hash table.
* @ht: the hash table.
* @old_iter: the iterator position of the node to replace.
* cds_lfht_replace - replace a node pointer to by iter within hash table.
* @ht: the hash table.
* @old_iter: the iterator position of the node to replace.
- * @now_node: the new node to try using for replacement.
+ * @hash: the node's hash.
+ * @match: the key match function.
+ * @key: the node's key.
+ * @new_node: the new node to use as replacement.
*
* Return 0 if replacement is successful, negative value otherwise.
*
* Return 0 if replacement is successful, negative value otherwise.
- * Replacing a NULL old node or an already removed node will fail with a
- * negative value.
+ * Replacing a NULL old node or an already removed node will fail with
+ * -ENOENT.
+ * If the hash or value of the node to replace and the new node differ,
+ * this function returns -EINVAL without proceeding to the replacement.
* Old node can be looked up with cds_lfht_lookup and cds_lfht_next.
* RCU read-side lock must be held between lookup and replacement.
* Call with rcu_read_lock held.
* Old node can be looked up with cds_lfht_lookup and cds_lfht_next.
* RCU read-side lock must be held between lookup and replacement.
* Call with rcu_read_lock held.
@@
-348,20
+353,24
@@
struct cds_lfht_node *cds_lfht_add_replace(struct cds_lfht *ht,
* guarantee that a combination of add_replace and add_unique updates
* will never generate duplicated keys.
*/
* guarantee that a combination of add_replace and add_unique updates
* will never generate duplicated keys.
*/
-int cds_lfht_replace(struct cds_lfht *ht, struct cds_lfht_iter *old_iter,
+int cds_lfht_replace(struct cds_lfht *ht,
+ struct cds_lfht_iter *old_iter,
+ unsigned long hash,
+ cds_lfht_match_fct match,
+ const void *key,
struct cds_lfht_node *new_node);
/*
* cds_lfht_del - remove node pointed to by iterator from hash table.
* @ht: the hash table.
struct cds_lfht_node *new_node);
/*
* cds_lfht_del - remove node pointed to by iterator from hash table.
* @ht: the hash table.
- * @
iter: the iterator position of
the node to delete.
+ * @
node:
the node to delete.
*
* Return 0 if the node is successfully removed, negative value
* otherwise.
*
* Return 0 if the node is successfully removed, negative value
* otherwise.
- *
Replac
ing a NULL node or an already removed node will fail with a
+ *
Delet
ing a NULL node or an already removed node will fail with a
* negative value.
* negative value.
- * Node can be looked up with cds_lfht_lookup and cds_lfht_next
.
- * cds_lfht_iter_get_node.
+ * Node can be looked up with cds_lfht_lookup and cds_lfht_next
,
+ *
followed by use of
cds_lfht_iter_get_node.
* RCU read-side lock must be held between lookup and removal.
* Call with rcu_read_lock held.
* Threads calling this API need to be registered RCU read-side threads.
* RCU read-side lock must be held between lookup and removal.
* Call with rcu_read_lock held.
* Threads calling this API need to be registered RCU read-side threads.
@@
-369,7
+378,7
@@
int cds_lfht_replace(struct cds_lfht *ht, struct cds_lfht_iter *old_iter,
* freeing the memory reserved for old node (which can be accessed with
* cds_lfht_iter_get_node).
*/
* freeing the memory reserved for old node (which can be accessed with
* cds_lfht_iter_get_node).
*/
-int cds_lfht_del(struct cds_lfht *ht, struct cds_lfht_
iter *iter
);
+int cds_lfht_del(struct cds_lfht *ht, struct cds_lfht_
node *node
);
/*
* cds_lfht_resize - Force a hash table resize
/*
* cds_lfht_resize - Force a hash table resize
This page took
0.035293 seconds
and
4
git commands to generate.