From patchwork Tue May 8 07:29:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 10385485 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8905560353 for ; Tue, 8 May 2018 07:30:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6A52928B04 for ; Tue, 8 May 2018 07:30:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5C1DD28CFA; Tue, 8 May 2018 07:30:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 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.wl.linuxfoundation.org (Postfix) with ESMTPS id B5B6A28B04 for ; Tue, 8 May 2018 07:30:26 +0000 (UTC) Received: from localhost ([::1]:49735 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fFx4p-0003k5-Rj for patchwork-qemu-devel@patchwork.kernel.org; Tue, 08 May 2018 03:30:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34272) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fFx3t-0003RF-8a for qemu-devel@nongnu.org; Tue, 08 May 2018 03:29:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fFx3q-000799-3b for qemu-devel@nongnu.org; Tue, 08 May 2018 03:29:25 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:49242 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fFx3p-00078d-R1 for qemu-devel@nongnu.org; Tue, 08 May 2018 03:29:22 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 60E65818F6E5; Tue, 8 May 2018 07:29:15 +0000 (UTC) Received: from xz-mi.nay.redhat.com (dhcp-14-151.nay.redhat.com [10.66.14.151]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7AEB52022EE0; Tue, 8 May 2018 07:29:08 +0000 (UTC) From: Peter Xu To: qemu-devel@nongnu.org Date: Tue, 8 May 2018 15:29:07 +0800 Message-Id: <20180508072907.18959-1-peterx@redhat.com> In-Reply-To: <20180504030811.28111-1-peterx@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Tue, 08 May 2018 07:29:15 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Tue, 08 May 2018 07:29:15 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'peterx@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH v2 11/10] tests: add interval tree unit test 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: Tian Kevin , "Michael S . Tsirkin" , Jason Wang , Peter Xu , Alex Williamson , Jintack Lim Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Peter Xu --- tests/test-interval-tree.c | 190 +++++++++++++++++++++++++++++++++++++ tests/Makefile.include | 2 + 2 files changed, 192 insertions(+) create mode 100644 tests/test-interval-tree.c diff --git a/tests/test-interval-tree.c b/tests/test-interval-tree.c new file mode 100644 index 0000000000..a0e3decca0 --- /dev/null +++ b/tests/test-interval-tree.c @@ -0,0 +1,190 @@ +/* + * Interval tree tests + * + * Copyright Red Hat, Inc. 2018 + * + * Authors: + * Peter Xu , + * + * This work is licensed under the terms of the GNU LGPL, version 2 or later. + * See the COPYING.LIB file in the top-level directory. + */ + +#include "qemu/osdep.h" +#include "qemu/interval-tree.h" + +static ITRange ranges[2]; +static int range_i; + +static void ranges_reset(void) +{ + memset(&ranges, 0, sizeof(ranges)); + range_i = 0; +} + +static gboolean ranges_iterate(ITValue start, ITValue end) +{ + g_assert(range_i < ARRAY_SIZE(ranges)); + ranges[range_i].start = start; + ranges[range_i].end = end; + range_i++; + return FALSE; +} + +static void ranges_check(void) +{ + g_assert(range_i == 2); + g_assert(ranges[0].start == 10 && ranges[0].end == 19); + g_assert(ranges[1].start == 30 && ranges[1].end == 39); +} + +static void test_interval_tree_common(void) +{ + int ret; + ITTree *tree = it_tree_new(); + ITRange *range; + + g_assert(tree); + + /* Test insertion */ + ret = it_tree_insert(tree, 10, 19); + g_assert(ret == 0); + ret = it_tree_insert(tree, 30, 39); + g_assert(ret == 0); + ret = it_tree_insert(tree, 15, 19); + g_assert(ret == IT_ERR_OVERLAP); + ret = it_tree_insert(tree, 0, 99); + g_assert(ret == IT_ERR_OVERLAP); + + /* Test searching */ + range = it_tree_find(tree, 0, 9); + g_assert(range == NULL); + range = it_tree_find(tree, 10, 19); + g_assert(range->start == 10 && range->end == 19); + range = it_tree_find_value(tree, 15); + g_assert(range->start == 10 && range->end == 19); + range = it_tree_find(tree, 15, 99); + g_assert(range->start == 10 && range->end == 19); + range = it_tree_find_value(tree, 35); + g_assert(range->start == 30 && range->end == 39); + + /* Test iterations */ + ranges_reset(); + it_tree_foreach(tree, ranges_iterate); + ranges_check(); + + /* Remove one of them */ + ret = it_tree_remove(tree, 10, 19); + g_assert(ret == 0); + g_assert(!it_tree_find(tree, 10, 19)); + g_assert(it_tree_find(tree, 30, 39)); + + it_tree_destroy(tree); +} + +static void test_interval_tree_merging(void) +{ + int ret; + ITTree *tree = it_tree_new(); + ITRange *range; + + g_assert(tree); + + ret = it_tree_insert(tree, 10, 19); + g_assert(ret == 0); + ret = it_tree_insert(tree, 30, 39); + g_assert(ret == 0); + + /* Test left side merging */ + ret = it_tree_insert(tree, 40, 59); + g_assert(ret == 0); + range = it_tree_find(tree, 30, 39); + g_assert(range->start == 30 && range->end == 59); + + /* Test right side merging */ + ret = it_tree_insert(tree, 0, 9); + g_assert(ret == 0); + range = it_tree_find(tree, 10, 19); + g_assert(range->start == 0 && range->end == 19); + + /* Test bidirectional merging */ + ret = it_tree_insert(tree, 20, 29); + g_assert(ret == 0); + range = it_tree_find(tree, 20, 29); + g_assert(range->start == 0 && range->end == 59); + range = it_tree_find(tree, 0, 29); + g_assert(range->start == 0 && range->end == 59); + range = it_tree_find(tree, 40, 45); + g_assert(range->start == 0 && range->end == 59); + + it_tree_destroy(tree); +} + +static void test_interval_tree_removal(void) +{ + int ret; + ITTree *tree = it_tree_new(); + ITRange *range; + + g_assert(tree); + + ret = it_tree_insert(tree, 10, 19); + g_assert(ret == 0); + ret = it_tree_insert(tree, 30, 39); + g_assert(ret == 0); + + /* + * Remove some useless areas, which should not remove any existing + * ranges in the tree + */ + ret = it_tree_remove(tree, 0, 9); + g_assert(ret == 0); + ret = it_tree_remove(tree, 50, 99); + g_assert(ret == 0); + ret = it_tree_remove(tree, 20, 29); + g_assert(ret == 0); + /* Make sure the elements are not removed */ + g_assert(it_tree_find(tree, 10, 19)); + g_assert(it_tree_find(tree, 30, 39)); + + /* Remove left subset of a range */ + ret = it_tree_remove(tree, 0, 14); + g_assert(ret == 0); + range = it_tree_find(tree, 10, 19); + g_assert(range->start == 15 && range->end == 19); + it_tree_insert(tree, 10, 15); + + /* Remove right subset of a range */ + ret = it_tree_remove(tree, 35, 45); + g_assert(ret == 0); + range = it_tree_find(tree, 30, 39); + g_assert(range->start == 30 && range->end == 34); + it_tree_insert(tree, 35, 39); + + /* Remove covers more than one range */ + ret = it_tree_remove(tree, 0, 40); + g_assert(ret == 0); + g_assert(!it_tree_find(tree, 10, 19)); + g_assert(!it_tree_find(tree, 30, 39)); + it_tree_insert(tree, 10, 19); + it_tree_insert(tree, 30, 39); + + /* Remove in the middle */ + ret = it_tree_remove(tree, 12, 16); + g_assert(ret == 0); + range = it_tree_find_value(tree, 10); + g_assert(range->start == 10 && range->end == 11); + range = it_tree_find_value(tree, 17); + g_assert(range->start == 17 && range->end == 19); + + it_tree_destroy(tree); +} + +int main(int argc, char *argv[]) +{ + g_test_init(&argc, &argv, NULL); + g_test_add_func("/interval-tree/common", test_interval_tree_common); + g_test_add_func("/interval-tree/merging", test_interval_tree_merging); + g_test_add_func("/interval-tree/removal", test_interval_tree_removal); + return g_test_run(); +} diff --git a/tests/Makefile.include b/tests/Makefile.include index 3b9a5e31a2..db1e6c93db 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -169,6 +169,7 @@ check-unit-y += tests/ptimer-test$(EXESUF) gcov-files-ptimer-test-y = hw/core/ptimer.c check-unit-y += tests/test-qapi-util$(EXESUF) gcov-files-test-qapi-util-y = qapi/qapi-util.c +check-unit-y += tests/test-interval-tree$(EXESUF) check-block-$(CONFIG_POSIX) += tests/qemu-iotests-quick.sh @@ -642,6 +643,7 @@ tests/test-qht-par$(EXESUF): tests/test-qht-par.o tests/qht-bench$(EXESUF) $(tes tests/qht-bench$(EXESUF): tests/qht-bench.o $(test-util-obj-y) tests/test-bufferiszero$(EXESUF): tests/test-bufferiszero.o $(test-util-obj-y) tests/atomic_add-bench$(EXESUF): tests/atomic_add-bench.o $(test-util-obj-y) +tests/test-interval-tree$(EXESUF): tests/test-interval-tree.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\