From nobody Mon Dec 29 17:19:16 2025 X-Original-To: dev-commits-src-all@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 4dg2yD5gbJz6M4nm for ; Mon, 29 Dec 2025 17:19:16 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dg2yD2BgNz3C0C for ; Mon, 29 Dec 2025 17:19:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767028756; 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=mib+1ecjjZeZ9DO4KXLJPZDK8GXq81ivnQARm1+QKmE=; b=jdqfwXsJuIVLUet0EzvdMhZ4e2WM3GnOVaJslhDmJaC5sm6kdDdjmsbZI7zTuhUNxeK7CC 64N0sZX0GZXS8u6Y4wCQoc2cD9yt3h1+NZLDq1Li0r2OraYQeBGhHjoDE/reR38Ojp8hMF 4OY94231ObxRi5DF2hbnMoq6Nem9khrPVs29h9mIgVi5lfOX61LoSRwzz3l7ZNTGpuj/+e UgUy3gcPNQcHtQ9FHNo3rxZeuGtE+eXL6MczUIPlslBnxvExBTI3irX+3DXNJT7DpRlbrt Mvmn26cffSVPs0Jzau7EikvD9Pux75TjvoimjhLUUTkV1Z/c/bCdURdLs7o7fA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767028756; 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=mib+1ecjjZeZ9DO4KXLJPZDK8GXq81ivnQARm1+QKmE=; b=cv50X66W+0AwnPH9A/T2fgB0WsdIVBXkC2m+tNTcgfIfcpeRjaVq+evMXebzA1Llfs0kLy zgyQG0Scj9XF8UX3vsKMMU0AAcHF0WY3vKkNBvBWf4CCw+79SuzW0M47VqxKlTJICPas3d dVjOgnOxADhz9uGVeNaE78st4zJbGu6Fj4J/iJeiI2Fqg01GfHkYRx7M2gumq8RDC1Yb+y 9ejXB9X0/+500qdTLFtFDSONV+UNu9IJ6Zpndjx3+VWPMUFCOiC8+rQA8W6V88CQ55a2wc JRNQIY8MJr4iMqUbxNIXnXYwvCzH5AYbZc4Hb9HAuIgacPGCjII74cUFq4SGRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767028756; a=rsa-sha256; cv=none; b=g7lk4Ocjdl6xwq+E9rz+3B7sJiADArW3+/qOpaPJUBGaIVzkZFxtZViyBzKNbvnlu0nLLD Cbd7qlCOxnL8Qo03kMM2ilodhc5Hl9Edsiv0w/aOrAuQF7D3HGSGc50fP50Xpl0oO05+z7 KrSLvAwfa4imueVmkszagvs2ucjuA9jqSD3aKfv/eXnjZDGbKsffMzt7WMu5gBxvXCatd/ gwoxVs+7DWGFALLbxOyj/wz5r+5HcG86MIw/jlZ8EQy0AXv+NemOfzotP9MoQLK4TfL3vl H+IYaJjpcPiaYs68kBGO0Cew5GvQ/l2thyNMFoJ2N1GwvGiL0PPNCVC35AQpwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dg2yD1X7fz84p for ; Mon, 29 Dec 2025 17:19:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30207 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 17:19:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: b8c99e7d912f - main - libc: add glibc-compatible tdestroy(3) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: b8c99e7d912f0dad84cec80f8c4331646b87a3ec Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 17:19:16 +0000 Message-Id: <6952b814.30207.47661323@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b8c99e7d912f0dad84cec80f8c4331646b87a3ec commit b8c99e7d912f0dad84cec80f8c4331646b87a3ec Author: Konstantin Belousov AuthorDate: 2025-12-25 23:38:25 +0000 Commit: Konstantin Belousov CommitDate: 2025-12-29 17:18:55 +0000 libc: add glibc-compatible tdestroy(3) The function clears the whole tree. Relnotes: yes Reviewed by: alc, emaste Discussed with: dougm Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D54365 --- include/search.h | 1 + lib/libc/stdlib/Makefile.inc | 1 + lib/libc/stdlib/Symbol.map | 1 + lib/libc/stdlib/tdestroy.c | 68 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 71 insertions(+) diff --git a/include/search.h b/include/search.h index 0615da2b42ba..5ac25a0d491f 100644 --- a/include/search.h +++ b/include/search.h @@ -77,6 +77,7 @@ void twalk(const posix_tnode *, void (*)(const posix_tnode *, VISIT, int)); int hcreate_r(size_t, struct hsearch_data *); void hdestroy_r(struct hsearch_data *); int hsearch_r(ENTRY, ACTION, ENTRY **, struct hsearch_data *); +void tdestroy(void *, void (*)(void *)); #endif __END_DECLS diff --git a/lib/libc/stdlib/Makefile.inc b/lib/libc/stdlib/Makefile.inc index 37a927b0597b..e46a8d7340b2 100644 --- a/lib/libc/stdlib/Makefile.inc +++ b/lib/libc/stdlib/Makefile.inc @@ -67,6 +67,7 @@ MISRCS+= \ strtouq.c \ system.c \ tdelete.c \ + tdestroy.c \ tfind.c \ tsearch.c \ twalk.c diff --git a/lib/libc/stdlib/Symbol.map b/lib/libc/stdlib/Symbol.map index 8b7e97c3cbdc..03a6d0b543ac 100644 --- a/lib/libc/stdlib/Symbol.map +++ b/lib/libc/stdlib/Symbol.map @@ -134,6 +134,7 @@ FBSD_1.8 { FBSD_1.9 { memalignment; recallocarray; + tdestroy; }; FBSDprivate_1.0 { diff --git a/lib/libc/stdlib/tdestroy.c b/lib/libc/stdlib/tdestroy.c new file mode 100644 index 000000000000..c324e151da11 --- /dev/null +++ b/lib/libc/stdlib/tdestroy.c @@ -0,0 +1,68 @@ +/* + * Copyright 2025 The FreeBSD Foundation + * + * SPDX-License-Identifier: BSD-2-Clause + * + * This software was developed by Konstantin Belousov + * under sponsorship from the FreeBSD Foundation. + */ + +#define _SEARCH_PRIVATE +#include +#include + +static void +nul_node_free(void *node __unused) +{ +} + +/* Find the leftmost node. */ +static posix_tnode * +tdestroy_find_leftmost(posix_tnode *tn) +{ + while (tn->llink != NULL) + tn = tn->llink; + return (tn); +} + +/* + * This algorithm for non-recursive non-allocating destruction of the tree + * is described in + * https://codegolf.stackexchange.com/questions/478/free-a-binary-tree/489#489P + * and in https://devblogs.microsoft.com/oldnewthing/20251107-00/?p=111774. + */ +void +tdestroy(void *rootp, void (*node_free)(void *)) +{ + posix_tnode *tn, *tn_leftmost, *xtn; + + tn = rootp; + if (tn == NULL) + return; + if (node_free == NULL) + node_free = nul_node_free; + tn_leftmost = tn; + + while (tn != NULL) { + /* + * Make the right subtree the left subtree of the + * leftmost node, and recalculate the leftmost. + */ + tn_leftmost = tdestroy_find_leftmost(tn_leftmost); + if (tn->rlink != NULL) { + tn_leftmost->llink = tn->rlink; + tn_leftmost = tn_leftmost->llink; + } + + /* + * At this point, all children of tn have been + * arranged to be reachable via tn->left. We can + * safely delete the current node and advance to its + * left child as the new root. + */ + xtn = tn->llink; + node_free(tn->key); + free(tn); + tn = xtn; + } +}