From nobody Mon Jun 05 08:36:09 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QZRlY5tF2z4bLsh; Mon, 5 Jun 2023 08:36:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QZRlY52J2z3xK5; Mon, 5 Jun 2023 08:36:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685954169; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f1aJyFYmHfzSC6qvD9J3pNPpVYAB7r7A0wg2Mt54eyE=; b=h7apJzIXsGtptJSpoHGON7J+vuYvH43dUmOdhse2XitZPjxP6NlNl08NA9OzyFX8u3FPUI b9XqbebLkgLGSKzjtlr1bIRFsq4NGqnZryAHMdHfyIgY+jsB37R7rfpobvxQEwzI3xrfmZ 2tN8iWZhWvXBXAL1J589DBbon5UNSP0/u8mYpIOesPxHbUBVB1wGMMcYIaj0omQTJJc+nn fznYs0MaWCrn2SN6ZlZ2sG6KjZfcckrHQjx62vHQRtNo8KGFYS9br9fGgFkgpFuJZ3A7H6 Sx/0XwLb3ylX+pjXPOFF1znzw8zJRsAwZTcNyhL2VyKWb9hgqXWI4CmGJIzoFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685954169; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f1aJyFYmHfzSC6qvD9J3pNPpVYAB7r7A0wg2Mt54eyE=; b=cuEtRjJZjFhgD77ZMsUBcx/QPpmxOcdmpDQsfcpzWFQ4i/JT2QX4C+VHD24q83wuiY2rrD cCB6mgm7WPwQTg8492Hgu6OZAbSbRCrzjHWz9vFJiC+oTNh9WbgcQxpY763odFKig4r8kf AlcNV5F3O0inK2aWC413236D4Q1bz/U1meTCk92lHdeCUoNGm/JBZNyV6U587Qf0x28bxv ExTfpXYjZWRA5uUdRAkR7xJd2HWcAmVkdqesFZ1z5dNvzyEf76lGtKrBmZTOhbrfckGSy2 CP0CME2eOjFqgNcGelHjU+rdB7RJyEkHVmcQaGYuoIAkrGeW3TznP7s5u6j40A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685954169; a=rsa-sha256; cv=none; b=NWnbvV+dDqeW/UQw3pb4XnhJgcNdKkUe3crv11q3iTJ0yV84htm1hY7eDs2WpXBtag7Spi vTsliWDNgtELRagi3BKQn2B7/BYebc1s3x5VkNWjD+pVx6/FmNMk10T6zaLhrKPYr03ytN oLidK7VBrDA8Zaekr/0sKoVNsl/h9yxWY95EvBANmMcWOPbURfUHJuvh+9xGUVO4kPYUuh Ebp3eDDH6LnvjyJC62VvasC8QULuUzsD59f26iQ3y8ba5QCL9+5X93jMj+iCKb/xfi/OuO iFdJ7qbRRLUV7BaRUS5rwwyzJfYA1vRLmcxeMc4E8A3ReD1bMFovj43YFRQn0g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QZRlY45V9zgPt; Mon, 5 Jun 2023 08:36:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3558a9GC024494; Mon, 5 Jun 2023 08:36:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3558a99i024493; Mon, 5 Jun 2023 08:36:09 GMT (envelope-from git) Date: Mon, 5 Jun 2023 08:36:09 GMT Message-Id: <202306050836.3558a99i024493@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: d4fb56c08fb9 - stable/13 - unr(9) iterator: add naive test List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d4fb56c08fb971916d87483f74ae3f1b4adf2e91 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d4fb56c08fb971916d87483f74ae3f1b4adf2e91 commit d4fb56c08fb971916d87483f74ae3f1b4adf2e91 Author: Konstantin Belousov AuthorDate: 2023-05-13 01:32:25 +0000 Commit: Konstantin Belousov CommitDate: 2023-06-05 08:35:01 +0000 unr(9) iterator: add naive test (cherry picked from commit 12db3c914fe0a985de1e393ee964c9cda5b3e0ca) --- sys/kern/subr_unit.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 89 insertions(+), 2 deletions(-) diff --git a/sys/kern/subr_unit.c b/sys/kern/subr_unit.c index 236ca9915740..2be7a27064ad 100644 --- a/sys/kern/subr_unit.c +++ b/sys/kern/subr_unit.c @@ -1189,15 +1189,93 @@ test_alloc_unr_specific(struct unrhdr *uh, u_int i, char a[]) } } +#define TBASE 7 +#define XSIZE 10 +#define ISIZE 1000 + +static int +test_iter_compar(const void *a, const void *b) +{ + return (*(const int *)a - *(const int *)b); +} + +static void +test_iter_fill(int *vals, struct unrhdr *uh, int i, int v, int *res) +{ + int x; + + vals[i] = v; + x = alloc_unr_specific(uh, v); + if (x != v) { + VPRINTF("alloc_unr_specific failed %d %d\n", x, v); + *res = 1; + } +} + static void test_iter(void) { + struct unrhdr *uh; + void *ihandle; + int vals[ISIZE]; + int i, j, v, x, res; + + res = 0; + uh = new_unrhdr(TBASE, INT_MAX, NULL); + for (i = 0; i < XSIZE; i++) { + vals[i] = i + TBASE; + x = alloc_unr_specific(uh, i + TBASE); + if (x != i + TBASE) { + VPRINTF("alloc_unr_specific failed %d %d\n", x, + i + TBASE); + res = 1; + } + } + for (; i < ISIZE; i++) { + for (;;) { +again: + v = arc4random_uniform(INT_MAX); + if (v < TBASE) + goto again; + for (j = 0; j < i; j++) { + if (v == vals[j] || v + 1 == vals[j]) + goto again; + } + break; + } + test_iter_fill(vals, uh, i, v, &res); + i++, v++; + if (i < ISIZE) + test_iter_fill(vals, uh, i, v, &res); + } + qsort(vals, ISIZE, sizeof(vals[0]), test_iter_compar); + + ihandle = create_iter_unr(uh); + i = 0; + while ((v = next_iter_unr(ihandle)) != -1) { + if (vals[i] != v) { + VPRINTF("iter %d: iter %d != val %d\n", i, v, vals[i]); + if (res == 0) { + if (verbose) + print_unrhdr(uh); + res = 1; + } + } else { + VPRINTF("iter %d: val %d\n", i, v); + } + i++; + } + free_iter_unr(ihandle); + clean_unrhdr(uh); + clear_unrhdr(uh); + delete_unrhdr(uh); + exit(res); } static void usage(char **argv) { - printf("%s [-h] [-r REPETITIONS] [-v]\n", argv[0]); + printf("%s [-h] [-i] [-r REPETITIONS] [-v]\n", argv[0]); } int @@ -1209,11 +1287,16 @@ main(int argc, char **argv) long reps = 1, m; int ch; u_int i; + bool testing_iter; verbose = false; + testing_iter = false; - while ((ch = getopt(argc, argv, "hr:v")) != -1) { + while ((ch = getopt(argc, argv, "hir:v")) != -1) { switch (ch) { + case 'i': + testing_iter = true; + break; case 'r': errno = 0; reps = strtol(optarg, NULL, 0); @@ -1234,6 +1317,10 @@ main(int argc, char **argv) } setbuf(stdout, NULL); + + if (testing_iter) + test_iter(); + uh = new_unrhdr(0, count - 1, NULL); print_unrhdr(uh);