From: laijs@cn.fujitsu.com (Lai Jiangshan)
Subject: [ltt-dev] [PATCH 1/9] Fix arguments order
Date: Mon, 14 Nov 2011 12:50:51 +0800 [thread overview]
Message-ID: <1321246259-21223-2-git-send-email-laijs@cn.fujitsu.com> (raw)
In-Reply-To: <1321246259-21223-1-git-send-email-laijs@cn.fujitsu.com>
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
next prev parent reply other threads:[~2011-11-14 4:50 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-14 4:50 [ltt-dev] [PATCH 0/9] change lfht test Lai Jiangshan
2011-11-14 4:50 ` Lai Jiangshan [this message]
2011-11-14 12:57 ` [ltt-dev] [PATCH 1/9] Fix arguments order Mathieu Desnoyers
2011-11-14 4:50 ` [ltt-dev] [PATCH 2/9] keep the last position for failed lookup Lai Jiangshan
2011-11-15 11:10 ` Mathieu Desnoyers
2011-11-16 8:33 ` Lai Jiangshan
2011-11-14 4:50 ` [ltt-dev] [PATCH 3/9] add cds_lfht_add_at() Lai Jiangshan
2011-11-15 8:23 ` Lai Jiangshan
2011-11-15 11:07 ` Mathieu Desnoyers
2011-11-18 14:29 ` Mathieu Desnoyers
2011-11-21 3:15 ` Lai Jiangshan
2011-11-22 9:41 ` Mathieu Desnoyers
2011-11-14 4:50 ` [ltt-dev] [PATCH 4/9] new random generator Lai Jiangshan
2011-11-15 11:17 ` Mathieu Desnoyers
2011-11-14 4:50 ` [ltt-dev] [PATCH 5/9] use random value for hash value directly Lai Jiangshan
2011-11-15 11:20 ` Mathieu Desnoyers
2011-11-16 8:41 ` Lai Jiangshan
2011-11-14 4:50 ` [ltt-dev] [PATCH 6/9] test hash value Confilict with buckets Lai Jiangshan
2011-11-15 11:22 ` Mathieu Desnoyers
2011-11-16 8:53 ` Lai Jiangshan
2011-11-14 4:50 ` [ltt-dev] [PATCH 7/9] add identical-hash-value-chain test Lai Jiangshan
2011-11-15 11:24 ` Mathieu Desnoyers
2011-11-16 8:55 ` Lai Jiangshan
2011-11-14 4:50 ` [ltt-dev] [PATCH 8/9] add duplicated node test Lai Jiangshan
2011-11-15 11:31 ` Mathieu Desnoyers
2011-11-16 9:16 ` Lai Jiangshan
2011-11-14 4:50 ` [ltt-dev] [PATCH 9/9] change strategy for AR_RANDOM Lai Jiangshan
2011-11-15 11:35 ` Mathieu Desnoyers
2011-11-16 9:26 ` Lai Jiangshan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1321246259-21223-2-git-send-email-laijs@cn.fujitsu.com \
--to=laijs@cn.fujitsu.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox