[ltt-dev] [PATCH 1/9] Fix arguments order
Lai Jiangshan
laijs at cn.fujitsu.com
Sun Nov 13 23:50:51 EST 2011
use: hash, match, key
Signed-off-by: Lai Jiangshan <laijs at cn.fujitsu.com>
---
rculfhash.c | 9 +++++----
tests/test_urcu_hash.c | 21 ++++++++++-----------
urcu/rculfhash.h | 26 +++++++++++++-------------
3 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/rculfhash.c b/rculfhash.c
index 41b774a..bda3bd6 100644
--- a/rculfhash.c
+++ b/rculfhash.c
@@ -1381,8 +1381,9 @@ struct cds_lfht *_cds_lfht_new(unsigned long init_size,
return ht;
}
-void cds_lfht_lookup(struct cds_lfht *ht, cds_lfht_match_fct match,
- unsigned long hash, void *key, struct cds_lfht_iter *iter)
+void cds_lfht_lookup(struct cds_lfht *ht, unsigned long hash,
+ cds_lfht_match_fct match, void *key,
+ struct cds_lfht_iter *iter)
{
struct cds_lfht_node *node, *next, *bucket;
unsigned long reverse_hash, size;
@@ -1498,9 +1499,9 @@ void cds_lfht_add(struct cds_lfht *ht, unsigned long hash,
}
struct cds_lfht_node *cds_lfht_add_unique(struct cds_lfht *ht,
+ unsigned long hash,
cds_lfht_match_fct match,
void *key,
- unsigned long hash,
struct cds_lfht_node *node)
{
unsigned long size;
@@ -1515,9 +1516,9 @@ struct cds_lfht_node *cds_lfht_add_unique(struct cds_lfht *ht,
}
struct cds_lfht_node *cds_lfht_add_replace(struct cds_lfht *ht,
+ unsigned long hash,
cds_lfht_match_fct match,
void *key,
- unsigned long hash,
struct cds_lfht_node *node)
{
unsigned long size;
diff --git a/tests/test_urcu_hash.c b/tests/test_urcu_hash.c
index 554f1e9..509767c 100644
--- a/tests/test_urcu_hash.c
+++ b/tests/test_urcu_hash.c
@@ -440,9 +440,8 @@ void cds_lfht_test_lookup(struct cds_lfht *ht, void *key, size_t key_len,
{
assert(key_len == sizeof(unsigned long));
- cds_lfht_lookup(ht, test_match,
- test_hash(key, key_len, TEST_HASH_SEED),
- key, iter);
+ cds_lfht_lookup(ht, test_hash(key, key_len, TEST_HASH_SEED),
+ test_match, key, iter);
}
void *thr_count(void *arg)
@@ -577,14 +576,14 @@ void *thr_writer(void *_count)
sizeof(void *));
rcu_read_lock();
if (add_unique) {
- ret_node = cds_lfht_add_unique(test_ht, test_match, node->key,
+ ret_node = cds_lfht_add_unique(test_ht,
test_hash(node->key, node->key_len, TEST_HASH_SEED),
- &node->node);
+ test_match, node->key, &node->node);
} else {
if (add_replace)
- ret_node = cds_lfht_add_replace(test_ht, test_match, node->key,
+ ret_node = cds_lfht_add_replace(test_ht,
test_hash(node->key, node->key_len, TEST_HASH_SEED),
- &node->node);
+ test_match, node->key, &node->node);
else
cds_lfht_add(test_ht,
test_hash(node->key, node->key_len, TEST_HASH_SEED),
@@ -674,14 +673,14 @@ static int populate_hash(void)
sizeof(void *));
rcu_read_lock();
if (add_unique) {
- ret_node = cds_lfht_add_unique(test_ht, test_match, node->key,
+ ret_node = cds_lfht_add_unique(test_ht,
test_hash(node->key, node->key_len, TEST_HASH_SEED),
- &node->node);
+ test_match, node->key, &node->node);
} else {
if (add_replace)
- ret_node = cds_lfht_add_replace(test_ht, test_match, node->key,
+ ret_node = cds_lfht_add_replace(test_ht,
test_hash(node->key, node->key_len, TEST_HASH_SEED),
- &node->node);
+ test_match, node->key, &node->node);
else
cds_lfht_add(test_ht,
test_hash(node->key, node->key_len, TEST_HASH_SEED),
diff --git a/urcu/rculfhash.h b/urcu/rculfhash.h
index 06e3eb9..c13d3df 100644
--- a/urcu/rculfhash.h
+++ b/urcu/rculfhash.h
@@ -71,8 +71,6 @@ struct cds_lfht;
* Ensure reader and writer threads are registered as urcu readers.
*/
-typedef unsigned long (*cds_lfht_hash_fct)(void *key, size_t length,
- unsigned long seed);
typedef int (*cds_lfht_match_fct)(struct cds_lfht_node *node, void *key);
/*
@@ -179,15 +177,17 @@ void cds_lfht_count_nodes(struct cds_lfht *ht,
/*
* cds_lfht_lookup - lookup a node by key.
* @ht: the hash table.
- * @match: the key match function.
* @hash: the key hash.
+ * @match: the key match function.
+ * @key: the current node key.
* @iter: Node, if found (output). *iter->node set to NULL if not found.
*
* Call with rcu_read_lock held.
* Threads calling this API need to be registered RCU read-side threads.
*/
-void cds_lfht_lookup(struct cds_lfht *ht, cds_lfht_match_fct match,
- unsigned long hash, void *key, struct cds_lfht_iter *iter);
+void cds_lfht_lookup(struct cds_lfht *ht, unsigned long hash,
+ cds_lfht_match_fct match, void *key,
+ struct cds_lfht_iter *iter);
/*
* cds_lfht_next_duplicate - get the next item with same key (after a lookup).
@@ -248,9 +248,9 @@ void cds_lfht_add(struct cds_lfht *ht, unsigned long hash,
/*
* cds_lfht_add_unique - add a node to hash table, if key is not present.
* @ht: the hash table.
+ * @hash: the node's hash.
* @match: the key match function.
* @key: the node's key.
- * @hash: the node's hash.
* @node: the node to try adding.
*
* Return the node added upon success.
@@ -266,17 +266,17 @@ void cds_lfht_add(struct cds_lfht *ht, unsigned long hash,
* add_unique and add_replace (see below).
*/
struct cds_lfht_node *cds_lfht_add_unique(struct cds_lfht *ht,
+ unsigned long hash,
cds_lfht_match_fct match,
void *key,
- unsigned long hash,
struct cds_lfht_node *node);
/*
* cds_lfht_add_replace - replace or add a node within hash table.
* @ht: the hash table.
+ * @hash: the node's hash.
* @match: the key match function.
* @key: the node's key.
- * @hash: the node's hash.
* @node: the node to add.
*
* Return the node replaced upon success. If no node matching the key
@@ -298,9 +298,9 @@ struct cds_lfht_node *cds_lfht_add_unique(struct cds_lfht *ht,
* will never generate duplicated keys.
*/
struct cds_lfht_node *cds_lfht_add_replace(struct cds_lfht *ht,
+ unsigned long hash,
cds_lfht_match_fct match,
void *key,
- unsigned long hash,
struct cds_lfht_node *node);
/*
@@ -373,8 +373,8 @@ void cds_lfht_resize(struct cds_lfht *ht, unsigned long new_size);
cds_lfht_next(ht, iter), \
node = cds_lfht_iter_get_node(iter))
-#define cds_lfht_for_each_duplicate(ht, match, hash, key, iter, node) \
- for (cds_lfht_lookup(ht, match, hash, key, iter), \
+#define cds_lfht_for_each_duplicate(ht, hash, match, key, iter, node) \
+ for (cds_lfht_lookup(ht, hash, match, key, iter), \
node = cds_lfht_iter_get_node(iter); \
node != NULL; \
cds_lfht_next_duplicate(ht, match, key, iter), \
@@ -389,9 +389,9 @@ void cds_lfht_resize(struct cds_lfht *ht, unsigned long new_size);
pos = caa_container_of(cds_lfht_iter_get_node(iter), \
typeof(*(pos)), member))
-#define cds_lfht_for_each_entry_duplicate(ht, match, hash, key, \
+#define cds_lfht_for_each_entry_duplicate(ht, hash, match, key, \
iter, pos, member) \
- for (cds_lfht_lookup(ht, match, hash, key, iter), \
+ for (cds_lfht_lookup(ht, hash, match, key, iter), \
pos = caa_container_of(cds_lfht_iter_get_node(iter), \
typeof(*(pos)), member); \
&(pos)->member != NULL; \
--
1.7.4.4
More information about the lttng-dev
mailing list