On 25/05/16 04:13, Emilio G. Cota wrote:
> Reviewed-by: Alex Bennée <alex.ben...@linaro.org>
> Reviewed-by: Richard Henderson <r...@twiddle.net>
> Signed-off-by: Emilio G. Cota <c...@braap.org>
Acked-by: Sergey Fedorov <sergey.fedo...@linaro.org>
> ---
> tests/.gitignore | 1 +
> tests/Makefile | 6 ++-
> tests/test-qht.c | 159
> +++++++++++++++++++++++++++++++++++++++++++++++++++++++
> 3 files changed, 165 insertions(+), 1 deletion(-)
> create mode 100644 tests/test-qht.c
>
> diff --git a/tests/.gitignore b/tests/.gitignore
> index 7c0d156..ffde5d2 100644
> --- a/tests/.gitignore
> +++ b/tests/.gitignore
> @@ -50,6 +50,7 @@ test-qdev-global-props
> test-qemu-opts
> test-qdist
> test-qga
> +test-qht
> test-qmp-commands
> test-qmp-commands.h
> test-qmp-event
> diff --git a/tests/Makefile b/tests/Makefile
> index a5af20b..8589b11 100644
> --- a/tests/Makefile
> +++ b/tests/Makefile
> @@ -72,6 +72,8 @@ check-unit-y += tests/test-rcu-list$(EXESUF)
> gcov-files-test-rcu-list-y = util/rcu.c
> check-unit-y += tests/test-qdist$(EXESUF)
> gcov-files-test-qdist-y = util/qdist.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)
> @@ -395,7 +397,8 @@ test-obj-y = tests/check-qint.o tests/check-qstring.o
> tests/check-qdict.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/test-qdist.o
> + tests/test-qdist.o \
> + tests/test-qht.o
>
> $(test-obj-y): QEMU_INCLUDES += -Itests
> QEMU_CFLAGS += -I$(SRC_PATH)/tests
> @@ -435,6 +438,7 @@ 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-qdist$(EXESUF): tests/test-qdist.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..c8eb930
> --- /dev/null
> +++ b/tests/test-qht.c
> @@ -0,0 +1,159 @@
> +/*
> + * Copyright (C) 2016, Emilio G. Cota <c...@braap.org>
> + *
> + * License: GNU GPL, version 2 or later.
> + * See the COPYING file in the top-level directory.
> + */
> +#include "qemu/osdep.h"
> +#include <glib.h>
> +#include "qemu/qht.h"
> +
> +#define N 5000
> +
> +static struct qht ht;
> +static int32_t arr[N * 2];
> +
> +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 = 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 = arr[i];
> + g_assert_true(qht_remove(&ht, &arr[i], hash));
> + }
> +}
> +
> +static void check(int a, int b, bool expected)
> +{
> + struct qht_stats stats;
> + int i;
> +
> + for (i = a; i < b; i++) {
> + void *p;
> + uint32_t hash;
> + int32_t val;
> +
> + val = i;
> + hash = i;
> + p = qht_lookup(&ht, is_equal, &val, hash);
> + g_assert_true(!!p == expected);
> + }
> + qht_statistics_init(&ht, &stats);
> + if (stats.used_head_buckets) {
> + g_assert_cmpfloat(qdist_avg(&stats.chain), >=, 1.0);
> + }
> + g_assert_cmpuint(stats.head_buckets, >, 0);
> + qht_statistics_destroy(&stats);
> +}
> +
> +static void count_func(struct qht *ht, void *p, uint32_t hash, void *userp)
> +{
> + unsigned int *curr = userp;
> +
> + (*curr)++;
> +}
> +
> +static void check_n(size_t expected)
> +{
> + struct qht_stats stats;
> +
> + qht_statistics_init(&ht, &stats);
> + g_assert_cmpuint(stats.entries, ==, expected);
> + qht_statistics_destroy(&stats);
> +}
> +
> +static void iter_check(unsigned int count)
> +{
> + unsigned int curr = 0;
> +
> + qht_iter(&ht, count_func, &curr);
> + g_assert_cmpuint(curr, ==, count);
> +}
> +
> +static void qht_do_test(unsigned int mode, size_t init_entries)
> +{
> + qht_init(&ht, 0, mode);
> +
> + insert(0, N);
> + check(0, N, true);
> + check_n(N);
> + check(-N, -1, false);
> + iter_check(N);
> +
> + rm(101, 102);
> + check_n(N - 1);
> + insert(N, N * 2);
> + check_n(N + N - 1);
> + rm(N, N * 2);
> + check_n(N - 1);
> + insert(101, 102);
> + check_n(N);
> +
> + rm(10, 200);
> + check_n(N - 190);
> + insert(150, 200);
> + check_n(N - 190 + 50);
> + insert(10, 150);
> + check_n(N);
> +
> + rm(1, 2);
> + check_n(N - 1);
> + qht_reset_size(&ht, 0);
> + check_n(0);
> + check(0, N, false);
> +
> + qht_destroy(&ht);
> +}
> +
> +static void qht_test(unsigned int mode)
> +{
> + qht_do_test(mode, 0);
> + qht_do_test(mode, 1);
> + qht_do_test(mode, 2);
> + qht_do_test(mode, 8);
> + qht_do_test(mode, 16);
> + qht_do_test(mode, 8192);
> + qht_do_test(mode, 16384);
> +}
> +
> +static void test_default(void)
> +{
> + qht_test(0);
> +}
> +
> +static void test_resize(void)
> +{
> + qht_test(QHT_MODE_AUTO_RESIZE);
> +}
> +
> +int main(int argc, char *argv[])
> +{
> + g_test_init(&argc, &argv, NULL);
> + g_test_add_func("/qht/mode/default", test_default);
> + g_test_add_func("/qht/mode/resize", test_resize);
> + return g_test_run();
> +}
