From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48309) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aoExP-0000yW-6A for qemu-devel@nongnu.org; Thu, 07 Apr 2016 14:47:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aoEs6-0007lB-Eh for qemu-devel@nongnu.org; Thu, 07 Apr 2016 14:41:43 -0400 Received: from lists.gnu.org ([2001:4830:134:3::11]:47246) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aoEs6-0007kn-4q for qemu-devel@nongnu.org; Thu, 07 Apr 2016 14:41:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56276) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aoEAL-0002g4-Md for qemu-devel@nongnu.org; Thu, 07 Apr 2016 13:56:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aoDnR-0003XP-ST for qemu-devel@nongnu.org; Thu, 07 Apr 2016 13:32:48 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:57234) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aoDnR-0003W1-Ok for qemu-devel@nongnu.org; Thu, 07 Apr 2016 13:32:45 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 8CAF2214A9 for ; Thu, 7 Apr 2016 13:32:45 -0400 (EDT) From: "Emilio G. Cota" Date: Thu, 7 Apr 2016 13:32:37 -0400 Message-Id: <1460050358-25025-13-git-send-email-cota@braap.org> In-Reply-To: <1460050358-25025-1-git-send-email-cota@braap.org> References: <1460050358-25025-1-git-send-email-cota@braap.org> Subject: [Qemu-devel] [PATCH v2 12/13] qht: add test program List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: QEMU Developers , MTTCG Devel Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Paolo Bonzini , Peter Crosthwaite , Richard Henderson , Peter Maydell , Sergey Fedorov Signed-off-by: Emilio G. Cota --- tests/.gitignore | 1 + tests/Makefile | 6 ++- tests/test-qht.c | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 115 insertions(+), 1 deletion(-) create mode 100644 tests/test-qht.c diff --git a/tests/.gitignore b/tests/.gitignore index b7bf13e..d6d0700 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -47,6 +47,7 @@ test-qapi-visit.[ch] test-qdev-global-props test-qemu-opts test-qga +test-qht test-qmp-commands test-qmp-commands.h test-qmp-event diff --git a/tests/Makefile b/tests/Makefile index 45b9048..b5a99d6 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -68,6 +68,8 @@ check-unit-y += tests/rcutorture$(EXESUF) gcov-files-rcutorture-y = util/rcu.c check-unit-y += tests/test-rcu-list$(EXESUF) gcov-files-test-rcu-list-y = util/rcu.c +check-unit-y += tests/test-qht$(EXESUF) +gcov-files-test-qht-y = util/qht.c check-unit-y += tests/test-bitops$(EXESUF) check-unit-$(CONFIG_HAS_GLIB_SUBPROCESS_TESTS) += tests/test-qdev-global-props$(EXESUF) check-unit-y += tests/check-qom-interface$(EXESUF) @@ -387,7 +389,8 @@ test-obj-y = tests/check-qint.o tests/check-qstring.o tests/check-qdict.o \ tests/test-qmp-commands.o tests/test-visitor-serialization.o \ tests/test-x86-cpuid.o tests/test-mul64.o tests/test-int128.o \ tests/test-opts-visitor.o tests/test-qmp-event.o \ - tests/rcutorture.o tests/test-rcu-list.o + tests/rcutorture.o tests/test-rcu-list.o \ + tests/test-qht.o $(test-obj-y): QEMU_INCLUDES += -Itests QEMU_CFLAGS += -I$(SRC_PATH)/tests @@ -425,6 +428,7 @@ tests/test-cutils$(EXESUF): tests/test-cutils.o util/cutils.o tests/test-int128$(EXESUF): tests/test-int128.o tests/rcutorture$(EXESUF): tests/rcutorture.o $(test-util-obj-y) tests/test-rcu-list$(EXESUF): tests/test-rcu-list.o $(test-util-obj-y) +tests/test-qht$(EXESUF): tests/test-qht.o $(test-util-obj-y) tests/test-qdev-global-props$(EXESUF): tests/test-qdev-global-props.o \ hw/core/qdev.o hw/core/qdev-properties.o hw/core/hotplug.o\ diff --git a/tests/test-qht.c b/tests/test-qht.c new file mode 100644 index 0000000..45e29a2 --- /dev/null +++ b/tests/test-qht.c @@ -0,0 +1,109 @@ +#include "qemu/osdep.h" +#include "qemu/qht.h" +#include "exec/tb-hash-xx.h" + +#define N 5000 +#define SEED 1 + +static struct qht ht; +static int32_t arr[N]; + +/* + * We might be tempted to use val as the hash. However, val + * could be 0, and all hashes passed to qht must be !0. + */ +static inline uint32_t hash_func(uint32_t val) +{ + return tb_hash_func5(val, 0, 0, SEED); +} + +static bool is_equal(const void *obj, const void *userp) +{ + const int32_t *a = obj; + const int32_t *b = userp; + + return *a == *b; +} + +static void insert(int a, int b) +{ + int i; + + for (i = a; i < b; i++) { + uint32_t hash; + + arr[i] = i; + hash = hash_func(i); + + qht_insert(&ht, &arr[i], hash); + } +} + +static void rm(int init, int end) +{ + int i; + + for (i = init; i < end; i++) { + uint32_t hash; + + hash = hash_func(arr[i]); + assert(qht_remove(&ht, &arr[i], hash)); + } +} + +static void check(int a, int b, bool expected) +{ + int i; + + for (i = a; i < b; i++) { + void *p; + uint32_t hash; + int32_t val; + + val = i; + hash = hash_func(i); + p = qht_lookup(&ht, is_equal, &val, hash); + assert(!!p == expected); + } +} + +static void count_func(struct qht *ht, void *p, uint32_t hash, void *userp) +{ + unsigned int *curr = userp; + + (*curr)++; +} + +static void iter_check(unsigned int count) +{ + unsigned int curr = 0; + + qht_iter(&ht, count_func, &curr); + assert(curr == count); +} + +static void qht_test(unsigned int mode) +{ + qht_init(&ht, 0, mode); + + insert(0, N); + check(0, N, true); + check(-N, -1, false); + iter_check(N); + rm(1, 2); + qht_reset_size(&ht, 0); + check(0, N, false); + + qht_destroy(&ht); +} + +int main(int argc, char *argv[]) +{ + qht_test(0); + qht_test(QHT_MODE_MRU_LOOKUP); + qht_test(QHT_MODE_MRU_LOOKUP | QHT_MODE_MRU_INSERT); + qht_test(QHT_MODE_MRU_LOOKUP | QHT_MODE_MRU_INSERT | QHT_MODE_AUTO_RESIZE); + qht_test(QHT_MODE_AUTO_RESIZE | QHT_MODE_MRU_INSERT); + qht_test(QHT_MODE_MRU_LOOKUP | QHT_MODE_MRU_INSERT); + return 0; +} -- 2.5.0