From 4b99ba98d094a4b20ac20100ccbeab3a6b88a3e1 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Tue, 16 Apr 2019 15:11:40 +0200 Subject: [PATCH] util: hash: Append to hash buckets when adding new entries MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In cases when the hash function for a name collides with other entry already in the hash we prepend to the bucket. This creates a 'stack effect' on the buckets if we then iterate through the hash. Normally this is not a problem, but in tests we want deterministic results. Since it does not matter where we add the entry and it's usually more probable that a different entry will be accessed next change it to append to the end of the bucket. Luckily we already iterate throught the bucket once thus we can easily find the last entry and just connect the new entry after it. Signed-off-by: Peter Krempa Reviewed-by: Daniel P. Berrangé --- src/util/virhash.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/util/virhash.c b/src/util/virhash.c index 4907c1124f..0e30106041 100644 --- a/src/util/virhash.c +++ b/src/util/virhash.c @@ -316,6 +316,7 @@ virHashAddOrUpdateEntry(virHashTablePtr table, const void *name, { size_t key, len = 0; virHashEntryPtr entry; + virHashEntryPtr last = NULL; void *new_name; if ((table == NULL) || (name == NULL)) @@ -337,6 +338,7 @@ virHashAddOrUpdateEntry(virHashTablePtr table, const void *name, return -1; } } + last = entry; len++; } @@ -347,8 +349,11 @@ virHashAddOrUpdateEntry(virHashTablePtr table, const void *name, entry->name = new_name; entry->payload = userdata; - entry->next = table->table[key]; - table->table[key] = entry; + + if (last) + last->next = entry; + else + table->table[key] = entry; table->nbElems++; -- GitLab