mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QDict: Small terminology change

Browse Source 
Let's call a 'hash' only what is returned by our hash function,
anything else is a 'bucket'.

This helps avoiding confusion with regard to how we traverse
our table.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
This commit is contained in:
Luiz Capitulino 2010-06-07 15:45:22 -03:00
parent 83aba69ec0
commit c8bc3cd72b
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
check-qdict.c
View File

@ -50,7 +50,7 @@ START_TEST(qdict_put_obj_test)
qdict_put_obj(qdict, "", QOBJECT(qint_from_int(num))); qdict_put_obj(qdict, "", QOBJECT(qint_from_int(num)));
fail_unless(qdict_size(qdict) == 1); fail_unless(qdict_size(qdict) == 1);
ent = QLIST_FIRST(&qdict->table[12345 % QDICT_HASH_SIZE]); ent = QLIST_FIRST(&qdict->table[12345 % QDICT_BUCKET_MAX]);
qi = qobject_to_qint(ent->value); qi = qobject_to_qint(ent->value);
fail_unless(qint_get_int(qi) == num); fail_unless(qint_get_int(qi) == num);

24
qdict.c
View File

@ -86,11 +86,11 @@ static QDictEntry *alloc_entry(const char *key, QObject *value)
* qdict_find(): List lookup function * qdict_find(): List lookup function
*/ */
static QDictEntry *qdict_find(const QDict *qdict, static QDictEntry *qdict_find(const QDict *qdict,
const char *key, unsigned int hash) const char *key, unsigned int bucket)
{ {
QDictEntry *entry; QDictEntry *entry;
QLIST_FOREACH(entry, &qdict->table[hash], next) QLIST_FOREACH(entry, &qdict->table[bucket], next)
if (!strcmp(entry->key, key)) if (!strcmp(entry->key, key))
return entry; return entry;
@ -110,11 +110,11 @@ static QDictEntry *qdict_find(const QDict *qdict,
*/ */
void qdict_put_obj(QDict *qdict, const char *key, QObject *value) void qdict_put_obj(QDict *qdict, const char *key, QObject *value)
{ {
unsigned int hash; unsigned int bucket;
QDictEntry *entry; QDictEntry *entry;
hash = tdb_hash(key) % QDICT_HASH_SIZE; bucket = tdb_hash(key) % QDICT_BUCKET_MAX;
entry = qdict_find(qdict, key, hash); entry = qdict_find(qdict, key, bucket);
if (entry) { if (entry) {
/* replace key's value */ /* replace key's value */
qobject_decref(entry->value); qobject_decref(entry->value);
@ -122,7 +122,7 @@ void qdict_put_obj(QDict *qdict, const char *key, QObject *value)
} else { } else {
/* allocate a new entry */ /* allocate a new entry */
entry = alloc_entry(key, value); entry = alloc_entry(key, value);
QLIST_INSERT_HEAD(&qdict->table[hash], entry, next); QLIST_INSERT_HEAD(&qdict->table[bucket], entry, next);
qdict->size++; qdict->size++;
} }
} }
@ -137,7 +137,7 @@ QObject *qdict_get(const QDict *qdict, const char *key)
{ {
QDictEntry *entry; QDictEntry *entry;
entry = qdict_find(qdict, key, tdb_hash(key) % QDICT_HASH_SIZE); entry = qdict_find(qdict, key, tdb_hash(key) % QDICT_BUCKET_MAX);
return (entry == NULL ? NULL : entry->value); return (entry == NULL ? NULL : entry->value);
} }
@ -148,8 +148,8 @@ QObject *qdict_get(const QDict *qdict, const char *key)
*/ */
int qdict_haskey(const QDict *qdict, const char *key) int qdict_haskey(const QDict *qdict, const char *key)
{ {
unsigned int hash = tdb_hash(key) % QDICT_HASH_SIZE; unsigned int bucket = tdb_hash(key) % QDICT_BUCKET_MAX;
return (qdict_find(qdict, key, hash) == NULL ? 0 : 1); return (qdict_find(qdict, key, bucket) == NULL ? 0 : 1);
} }
/** /**
@ -318,7 +318,7 @@ void qdict_iter(const QDict *qdict,
int i; int i;
QDictEntry *entry; QDictEntry *entry;
for (i = 0; i < QDICT_HASH_SIZE; i++) { for (i = 0; i < QDICT_BUCKET_MAX; i++) {
QLIST_FOREACH(entry, &qdict->table[i], next) QLIST_FOREACH(entry, &qdict->table[i], next)
iter(entry->key, entry->value, opaque); iter(entry->key, entry->value, opaque);
} }
@ -347,7 +347,7 @@ void qdict_del(QDict *qdict, const char *key)
{ {
QDictEntry *entry; QDictEntry *entry;
entry = qdict_find(qdict, key, tdb_hash(key) % QDICT_HASH_SIZE); entry = qdict_find(qdict, key, tdb_hash(key) % QDICT_BUCKET_MAX);
if (entry) { if (entry) {
QLIST_REMOVE(entry, next); QLIST_REMOVE(entry, next);
qentry_destroy(entry); qentry_destroy(entry);
@ -366,7 +366,7 @@ static void qdict_destroy_obj(QObject *obj)
assert(obj != NULL); assert(obj != NULL);
qdict = qobject_to_qdict(obj); qdict = qobject_to_qdict(obj);
for (i = 0; i < QDICT_HASH_SIZE; i++) { for (i = 0; i < QDICT_BUCKET_MAX; i++) {
QDictEntry *entry = QLIST_FIRST(&qdict->table[i]); QDictEntry *entry = QLIST_FIRST(&qdict->table[i]);
while (entry) { while (entry) {
QDictEntry *tmp = QLIST_NEXT(entry, next); QDictEntry *tmp = QLIST_NEXT(entry, next);

4
qdict.h
View File

@ -18,7 +18,7 @@
#include "qemu-queue.h" #include "qemu-queue.h"
#include <stdint.h> #include <stdint.h>
#define QDICT_HASH_SIZE 512 #define QDICT_BUCKET_MAX 512
typedef struct QDictEntry { typedef struct QDictEntry {
char *key; char *key;
@ -29,7 +29,7 @@ typedef struct QDictEntry {
typedef struct QDict { typedef struct QDict {
QObject_HEAD; QObject_HEAD;
size_t size; size_t size;
QLIST_HEAD(,QDictEntry) table[QDICT_HASH_SIZE]; QLIST_HEAD(,QDictEntry) table[QDICT_BUCKET_MAX];
} QDict; } QDict;
/* Object API */ /* Object API */