shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

lvmetad: different style for hash functions

Browse Source 
In lookup, return a count of entries with the
same key rather than the value from a second
entry with the same key.

Using some slightly different names.
This commit is contained in:
David Teigland 2015-11-17 10:19:04 -06:00
parent d42cedae58
commit 485d2ca945
4 changed files with 56 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
daemons/lvmetad/lvmetad-core.c
View File

@ -722,7 +722,7 @@ static response vg_lookup(lvmetad_state *s, request r)
response res = { 0 }; response res = { 0 };
const char *uuid = daemon_request_str(r, "uuid", NULL); const char *uuid = daemon_request_str(r, "uuid", NULL);
const char *name = daemon_request_str(r, "name", NULL); const char *name = daemon_request_str(r, "name", NULL);
const char *uuid2 = NULL; int count = 0;
buffer_init( &res.buffer ); buffer_init( &res.buffer );
@ -736,14 +736,14 @@ static response vg_lookup(lvmetad_state *s, request r)
lock_vgid_to_metadata(s); lock_vgid_to_metadata(s);
if (name && !uuid) if (name && !uuid)
uuid = dm_hash_lookup_multival(s->vgname_to_vgid, name, (void *)&uuid2); uuid = dm_hash_lookup_with_count(s->vgname_to_vgid, name, &count);
else if (uuid && !name) else if (uuid && !name)
name = dm_hash_lookup(s->vgid_to_vgname, uuid); name = dm_hash_lookup(s->vgid_to_vgname, uuid);
unlock_vgid_to_metadata(s); unlock_vgid_to_metadata(s);
if (name && uuid && uuid2) { if (name && uuid && (count > 1)) {
DEBUGLOG(s, "vg_lookup name %s found multiple vgids %s %s", DEBUGLOG(s, "vg_lookup name %s vgid %s found %d vgids",
name, uuid, uuid2); name, uuid, count);
return daemon_reply_simple("multiple", "reason = %s", "Multiple VGs found with same name", NULL); return daemon_reply_simple("multiple", "reason = %s", "Multiple VGs found with same name", NULL);
} }
@ -752,7 +752,7 @@ static response vg_lookup(lvmetad_state *s, request r)
} else { } else {
char *name_lookup = dm_hash_lookup(s->vgid_to_vgname, uuid); char *name_lookup = dm_hash_lookup(s->vgid_to_vgname, uuid);
char *uuid_lookup = dm_hash_lookup_withval(s->vgname_to_vgid, name, uuid, strlen(uuid) + 1); char *uuid_lookup = dm_hash_lookup_with_val(s->vgname_to_vgid, name, uuid, strlen(uuid) + 1);
/* FIXME: comment out these sanity checks when not testing */ /* FIXME: comment out these sanity checks when not testing */
@ -923,7 +923,7 @@ static int remove_metadata(lvmetad_state *s, const char *vgid, int update_pvids)
name_lookup = dm_hash_lookup(s->vgid_to_vgname, vgid); name_lookup = dm_hash_lookup(s->vgid_to_vgname, vgid);
outdated_pvs_lookup = dm_hash_lookup(s->vgid_to_outdated_pvs, vgid); outdated_pvs_lookup = dm_hash_lookup(s->vgid_to_outdated_pvs, vgid);
if (name_lookup) if (name_lookup)
vgid_lookup = dm_hash_lookup_withval(s->vgname_to_vgid, name_lookup, vgid, strlen(vgid) + 1); vgid_lookup = dm_hash_lookup_with_val(s->vgname_to_vgid, name_lookup, vgid, strlen(vgid) + 1);
/* remove hash table mappings */ /* remove hash table mappings */
@ -932,7 +932,7 @@ static int remove_metadata(lvmetad_state *s, const char *vgid, int update_pvids)
dm_hash_remove(s->vgid_to_vgname, vgid); dm_hash_remove(s->vgid_to_vgname, vgid);
dm_hash_remove(s->vgid_to_outdated_pvs, vgid); dm_hash_remove(s->vgid_to_outdated_pvs, vgid);
if (name_lookup) if (name_lookup)
dm_hash_remove_withval(s->vgname_to_vgid, name_lookup, vgid, strlen(vgid) + 1); dm_hash_remove_with_val(s->vgname_to_vgid, name_lookup, vgid, strlen(vgid) + 1);
unlock_vgid_to_metadata(s); unlock_vgid_to_metadata(s);
@ -1012,8 +1012,8 @@ static void _purge_metadata(lvmetad_state *s, const char *arg_name, const char *
lock_pvid_to_vgid(s); lock_pvid_to_vgid(s);
remove_metadata(s, arg_vgid, 1); remove_metadata(s, arg_vgid, 1);
if ((rem_vgid = dm_hash_lookup_withval(s->vgname_to_vgid, arg_name, arg_vgid, strlen(arg_vgid) + 1))) { if ((rem_vgid = dm_hash_lookup_with_val(s->vgname_to_vgid, arg_name, arg_vgid, strlen(arg_vgid) + 1))) {
dm_hash_remove_withval(s->vgname_to_vgid, arg_name, arg_vgid, strlen(arg_vgid) + 1); dm_hash_remove_with_val(s->vgname_to_vgid, arg_name, arg_vgid, strlen(arg_vgid) + 1);
dm_free(rem_vgid); dm_free(rem_vgid);
} }
unlock_pvid_to_vgid(s); unlock_pvid_to_vgid(s);
@ -1080,7 +1080,7 @@ static int _update_metadata_new_vgid(lvmetad_state *s,
dm_config_destroy(old_meta); dm_config_destroy(old_meta);
old_meta = NULL; old_meta = NULL;
dm_hash_remove_withval(s->vgname_to_vgid, arg_name, old_vgid, strlen(old_vgid) + 1); dm_hash_remove_with_val(s->vgname_to_vgid, arg_name, old_vgid, strlen(old_vgid) + 1);
dm_hash_remove(s->vgid_to_vgname, old_vgid); dm_hash_remove(s->vgid_to_vgname, old_vgid);
dm_free((char *)old_vgid); dm_free((char *)old_vgid);
old_vgid = NULL; old_vgid = NULL;
@ -1195,7 +1195,7 @@ static int _update_metadata_new_name(lvmetad_state *s,
old_meta = NULL; old_meta = NULL;
dm_hash_remove(s->vgid_to_vgname, arg_vgid); dm_hash_remove(s->vgid_to_vgname, arg_vgid);
dm_hash_remove_withval(s->vgname_to_vgid, old_name, arg_vgid, strlen(arg_vgid) + 1); dm_hash_remove_with_val(s->vgname_to_vgid, old_name, arg_vgid, strlen(arg_vgid) + 1);
dm_free((char *)old_name); dm_free((char *)old_name);
old_name = NULL; old_name = NULL;
@ -1345,13 +1345,13 @@ static int _update_metadata(lvmetad_state *s, const char *arg_name, const char *
const char *new_name = NULL; const char *new_name = NULL;
const char *old_vgid = NULL; const char *old_vgid = NULL;
const char *new_vgid = NULL; const char *new_vgid = NULL;
const char *old_vgid2 = NULL;
const char *new_metadata_vgid; const char *new_metadata_vgid;
int old_seq = -1; int old_seq = -1;
int new_seq = -1; int new_seq = -1;
int needs_repair = 0; int needs_repair = 0;
int abort_daemon = 0; int abort_daemon = 0;
int retval = 0; int retval = 0;
int count = 0;
if (!arg_vgid || !arg_name) { if (!arg_vgid || !arg_name) {
ERROR(s, "update_metadata missing args arg_vgid %s arg_name %s pvid %s", ERROR(s, "update_metadata missing args arg_vgid %s arg_name %s pvid %s",
@ -1372,7 +1372,7 @@ static int _update_metadata(lvmetad_state *s, const char *arg_name, const char *
lock_vgid_to_metadata(s); lock_vgid_to_metadata(s);
arg_name_lookup = dm_hash_lookup(s->vgid_to_vgname, arg_vgid); arg_name_lookup = dm_hash_lookup(s->vgid_to_vgname, arg_vgid);
arg_vgid_lookup = dm_hash_lookup_withval(s->vgname_to_vgid, arg_name, arg_vgid, strlen(arg_vgid) + 1); arg_vgid_lookup = dm_hash_lookup_with_val(s->vgname_to_vgid, arg_name, arg_vgid, strlen(arg_vgid) + 1);
/* /*
* A new VG when there is no existing record of the name or vgid args. * A new VG when there is no existing record of the name or vgid args.
@ -1404,7 +1404,7 @@ static int _update_metadata(lvmetad_state *s, const char *arg_name, const char *
} }
new_vgid = arg_vgid; new_vgid = arg_vgid;
old_vgid = dm_hash_lookup_multival(s->vgname_to_vgid, arg_name, (void *)&old_vgid2); old_vgid = dm_hash_lookup_with_count(s->vgname_to_vgid, arg_name, &count);
/* /*
* FIXME: this ensures that arg_name maps to only one existing * FIXME: this ensures that arg_name maps to only one existing
@ -1415,9 +1415,9 @@ static int _update_metadata(lvmetad_state *s, const char *arg_name, const char *
* But as it is now, the vgid arg to this function is the new * But as it is now, the vgid arg to this function is the new
* vgid and the existing VG is specified only by name. * vgid and the existing VG is specified only by name.
*/ */
if (old_vgid && old_vgid2) { if (old_vgid && (count > 1)) {
ERROR(s, "update_metadata arg_vgid %s arg_name %s found two vgids for name %s %s", ERROR(s, "update_metadata arg_vgid %s arg_name %s found %d vgids for name",
arg_vgid, arg_name, old_vgid, old_vgid2); arg_vgid, arg_name, count);
old_vgid = NULL; old_vgid = NULL;
} }

6
libdm/.exported_symbols.Base
View File

@ -92,9 +92,9 @@ dm_hash_lookup_binary
dm_hash_remove dm_hash_remove
dm_hash_remove_binary dm_hash_remove_binary
dm_hash_wipe dm_hash_wipe
dm_hash_lookup_withval dm_hash_lookup_with_val
dm_hash_lookup_multival dm_hash_lookup_with_count
dm_hash_remove_withval dm_hash_remove_with_val
dm_hash_insert_multival dm_hash_insert_multival
dm_is_dm_major dm_is_dm_major
dm_is_empty_dir dm_is_empty_dir

50
libdm/datastruct/hash.c
View File

@ -209,9 +209,9 @@ void dm_hash_remove(struct dm_hash_table *t, const char *key)
dm_hash_remove_binary(t, key, strlen(key) + 1); dm_hash_remove_binary(t, key, strlen(key) + 1);
} }
static struct dm_hash_node **_find_str_withval(struct dm_hash_table *t, static struct dm_hash_node **_find_str_with_val(struct dm_hash_table *t,
const void *key, const void *val, const void *key, const void *val,
uint32_t len, uint32_t val_len) uint32_t len, uint32_t val_len)
{ {
struct dm_hash_node **c; struct dm_hash_node **c;
unsigned h; unsigned h;
@ -265,12 +265,12 @@ int dm_hash_insert_multival(struct dm_hash_table *t, const char *key,
* Look through multiple entries with the same key for one that has a * Look through multiple entries with the same key for one that has a
* matching val and return that. If none have maching val, return NULL. * matching val and return that. If none have maching val, return NULL.
*/ */
void *dm_hash_lookup_withval(struct dm_hash_table *t, const char *key, void *dm_hash_lookup_with_val(struct dm_hash_table *t, const char *key,
const void *val, uint32_t val_len) const void *val, uint32_t val_len)
{ {
struct dm_hash_node **c; struct dm_hash_node **c;
c = _find_str_withval(t, key, val, strlen(key) + 1, val_len); c = _find_str_with_val(t, key, val, strlen(key) + 1, val_len);
return (c && *c) ? (*c)->data : 0; return (c && *c) ? (*c)->data : 0;
} }
@ -279,12 +279,12 @@ void *dm_hash_lookup_withval(struct dm_hash_table *t, const char *key,
* Look through multiple entries with the same key for one that has a * Look through multiple entries with the same key for one that has a
* matching val and remove that. * matching val and remove that.
*/ */
void dm_hash_remove_withval(struct dm_hash_table *t, const char *key, void dm_hash_remove_with_val(struct dm_hash_table *t, const char *key,
const void *val, uint32_t val_len) const void *val, uint32_t val_len)
{ {
struct dm_hash_node **c; struct dm_hash_node **c;
c = _find_str_withval(t, key, val, strlen(key) + 1, val_len); c = _find_str_with_val(t, key, val, strlen(key) + 1, val_len);
if (c && *c) { if (c && *c) {
struct dm_hash_node *old = *c; struct dm_hash_node *old = *c;
@ -295,28 +295,26 @@ void dm_hash_remove_withval(struct dm_hash_table *t, const char *key,
} }
/* /*
* Look for multiple entries with the same key. * Look up the value for a key and count how many
* entries have the same key.
* *
* If no entries have key, return NULL. * If no entries have key, return NULL and set count to 0.
* *
* If one entry has the key, the function returns the val, * If one entry has the key, the function returns the val,
* and sets val2 to NULL. * and sets count to 1.
* *
* If two entries have the key, the function returns the val * If N entries have the key, the function returns the val
* from the first entry, and the val2 arg is set to the val * from the first entry, and sets count to N.
* from the second entry.
*
* If more than two entries have the key, the function looks
* at only the first two.
*/ */
void *dm_hash_lookup_multival(struct dm_hash_table *t, const char *key, const void **val2) void *dm_hash_lookup_with_count(struct dm_hash_table *t, const char *key, int *count)
{ {
struct dm_hash_node **c; struct dm_hash_node **c;
struct dm_hash_node **c1 = NULL; struct dm_hash_node **c1 = NULL;
struct dm_hash_node **c2 = NULL;
uint32_t len = strlen(key) + 1; uint32_t len = strlen(key) + 1;
unsigned h; unsigned h;
*count = 0;
h = _hash(key, len) & (t->num_slots - 1); h = _hash(key, len) & (t->num_slots - 1);
for (c = &t->slots[h]; *c; c = &((*c)->next)) { for (c = &t->slots[h]; *c; c = &((*c)->next)) {
@ -324,20 +322,12 @@ void *dm_hash_lookup_multival(struct dm_hash_table *t, const char *key, const vo
continue; continue;
if (!memcmp(key, (*c)->key, len)) { if (!memcmp(key, (*c)->key, len)) {
if (!c1) { (*count)++;
if (!c1)
c1 = c; c1 = c;
} else if (!c2) {
c2 = c;
break;
}
} }
} }
if (!c2)
*val2 = NULL;
else
*val2 = (*c2)->data;
if (!c1) if (!c1)
return NULL; return NULL;
else else

32
libdm/libdevmapper.h
View File

@ -1854,27 +1854,27 @@ struct dm_hash_node *dm_hash_get_next(struct dm_hash_table *t, struct dm_hash_no
* entry with a matching key if one exists. Otherwise * entry with a matching key if one exists. Otherwise
* it adds a new entry. * it adds a new entry.
* *
* dm_hash_insert_withval() inserts a new entry if * dm_hash_insert_with_val() inserts a new entry if
* another entry with the same key already exists. * another entry with the same key already exists.
* val_len is the size of the data being inserted. * val_len is the size of the data being inserted.
* *
* If two entries with the same key exist, * If two entries with the same key exist,
* (added using dm_hash_insert_multival), then: * (added using dm_hash_insert_multival), then:
* . dm_hash_lookup() returns the first one it finds, and * . dm_hash_lookup() returns the first one it finds, and
* dm_hash_lookup_withval() returns the one with a matching * dm_hash_lookup_with_val() returns the one with a matching
* val_len/val. * val_len/val.
* . dm_hash_remove() removes the first one it finds, and * . dm_hash_remove() removes the first one it finds, and
* dm_hash_remove_withval() removes the one with a matching * dm_hash_remove_with_val() removes the one with a matching
* val_len/val. * val_len/val.
* *
* If a single entry with a given key exists, and it has * If a single entry with a given key exists, and it has
* zero val_len, then: * zero val_len, then:
* . dm_hash_lookup() returns it * . dm_hash_lookup() returns it
* . dm_hash_lookup_withval(val_len=0) returns it * . dm_hash_lookup_with_val(val_len=0) returns it
* . dm_hash_remove() removes it * . dm_hash_remove() removes it
* . dm_hash_remove_withval(val_len=0) removes it * . dm_hash_remove_with_val(val_len=0) removes it
* *
* dm_hash_lookup_multival() is a single call that will * dm_hash_lookup_with_count() is a single call that will
* both lookup a key's value and check if there is more * both lookup a key's value and check if there is more
* than one entry with the given key. * than one entry with the given key.
* *
@ -1884,24 +1884,22 @@ struct dm_hash_node *dm_hash_get_next(struct dm_hash_table *t, struct dm_hash_no
* both look up the value and indicate if multiple values * both look up the value and indicate if multiple values
* exist for the key.) * exist for the key.)
* *
* dm_hash_lookup_multival: * dm_hash_lookup_with_count:
* . If no entries exist, the function returns NULL, and * . If no entries exist, the function returns NULL, and
* the val2 arg is set to NULL. * the count is set to 0.
* . If only one entry exists, the value of that entry is * . If only one entry exists, the value of that entry is
* returned and the val2 arg is set to NULL. * returned and count is set to 1.
* . If more than one entry exists, the value of one entry * . If N entries exists, the value of the first entry is
* is returned and the val2 arg is set to the value of a * returned and count is set to N.
* second entry. Testing that the val2 arg is not NULL
* indicates that more than one entry exists.
*/ */
void *dm_hash_lookup_withval(struct dm_hash_table *t, const char *key, void *dm_hash_lookup_with_val(struct dm_hash_table *t, const char *key,
const void *val, uint32_t val_len);
void dm_hash_remove_with_val(struct dm_hash_table *t, const char *key,
const void *val, uint32_t val_len); const void *val, uint32_t val_len);
void dm_hash_remove_withval(struct dm_hash_table *t, const char *key,
const void *val, uint32_t val_len);
int dm_hash_insert_multival(struct dm_hash_table *t, const char *key, int dm_hash_insert_multival(struct dm_hash_table *t, const char *key,
const void *val, uint32_t val_len); const void *val, uint32_t val_len);
void *dm_hash_lookup_multival(struct dm_hash_table *t, const char *key, const void **val2); void *dm_hash_lookup_with_count(struct dm_hash_table *t, const char *key, int *count);
#define dm_hash_iterate(v, h) \ #define dm_hash_iterate(v, h) \