From patchwork Sat Apr 30 03:33:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Emilio Cota X-Patchwork-Id: 8986561 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 5653CBF29F for ; Sat, 30 Apr 2016 03:39:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 64A3B201CE for ; Sat, 30 Apr 2016 03:39:55 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 55E75201CD for ; Sat, 30 Apr 2016 03:39:54 +0000 (UTC) Received: from localhost ([::1]:57211 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1awLl0-0005m8-Dq for patchwork-qemu-devel@patchwork.kernel.org; Fri, 29 Apr 2016 23:39:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59284) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1awLfW-0004Id-JS for qemu-devel@nongnu.org; Fri, 29 Apr 2016 23:34:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1awLfA-00006L-18 for qemu-devel@nongnu.org; Fri, 29 Apr 2016 23:34:05 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:33198) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1awLf7-0008TW-PL for qemu-devel@nongnu.org; Fri, 29 Apr 2016 23:33:47 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id DAC3320B15 for ; Fri, 29 Apr 2016 23:33:21 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute4.internal (MEProxy); Fri, 29 Apr 2016 23:33:21 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=braap.org; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-sasl-enc :x-sasl-enc; s=mesmtp; bh=d2T4G5tHrLjAHMm71fX+jAxcJyU=; b=kDBngU V84syjlCO/gZ6TrV0rOiu6wWeoM7YcLw1GIWmlpnZz2zQt2p2zn3zVtRyFvvMTxs T15vSgpawH8C32io8UHX7yLFdy5rNAVnrfT31c+vEELvugMjxrrU/0YKxAwJoK4A C3F1SB4OFvcgF0iGwlvz2Ogz7JILZlbowmnT8= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-sasl-enc:x-sasl-enc; s=smtpout; bh=d2T4G5tHrLjAHMm 71fX+jAxcJyU=; b=fH8vownVA2/rusRijMjpdBPuRj/YvqFhp7jjDXFPoW5J97w Psvreds7Kwwxjopn6XjsWuKllBrM56J2uzXsaHQmn/MeI/yt28ukhtbqf8AMyCNc ChuWTAfXPkMXl+qQlrTqJVJ2zFt6LBjpzP77nkzKs5ssI8YPAJBf2FtAUfhM= X-Sasl-enc: OvBIso5cPmiiCaOg+lxcg6GZxE8DkMybU/wXEt6ClP4c 1461987201 Received: from localhost (flamenco.cs.columbia.edu [128.59.20.216]) by mail.messagingengine.com (Postfix) with ESMTPA id 87E4EC00013; Fri, 29 Apr 2016 23:33:21 -0400 (EDT) From: "Emilio G. Cota" To: QEMU Developers , MTTCG Devel Date: Fri, 29 Apr 2016 23:33:15 -0400 Message-Id: <1461987197-31264-13-git-send-email-cota@braap.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1461987197-31264-1-git-send-email-cota@braap.org> References: <1461987197-31264-1-git-send-email-cota@braap.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 66.111.4.29 Subject: [Qemu-devel] [PATCH v4 12/14] qht: add test program X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Sergey Fedorov , Richard Henderson , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Peter Crosthwaite Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Reviewed-by: Alex Bennée Signed-off-by: Emilio G. Cota Reviewed-by: Richard Henderson --- tests/.gitignore | 1 + tests/Makefile | 5 +- tests/test-qht.c | 177 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 182 insertions(+), 1 deletion(-) create mode 100644 tests/test-qht.c diff --git a/tests/.gitignore b/tests/.gitignore index 384d2fd..c6e680d 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -49,6 +49,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 d770bf8..0ab10af 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -70,6 +70,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) @@ -392,7 +394,7 @@ 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 @@ -431,6 +433,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..c8866e8 --- /dev/null +++ b/tests/test-qht.c @@ -0,0 +1,177 @@ +#include "qemu/osdep.h" +#include +#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); +} + +static void test_mru_lookup(void) +{ + qht_test(QHT_MODE_MRU_LOOKUP); +} + +static void test_mru_all(void) +{ + qht_test(QHT_MODE_MRU_LOOKUP | QHT_MODE_MRU_INSERT); +} + +static void test_mru_all_resize(void) +{ + qht_test(QHT_MODE_MRU_LOOKUP | QHT_MODE_MRU_INSERT | QHT_MODE_AUTO_RESIZE); +} + +static void test_mru_insert_resize(void) +{ + qht_test(QHT_MODE_AUTO_RESIZE | QHT_MODE_MRU_INSERT); +} + +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); + g_test_add_func("/qht/mode/mru_lookup", test_mru_lookup); + g_test_add_func("/qht/mode/mru_all", test_mru_all); + g_test_add_func("/qht/mode/mru_all_with_resize", test_mru_all_resize); + g_test_add_func("/qht/mode/mru_insert_with_resize", test_mru_insert_resize); + return g_test_run(); +}