From nobody Thu Jul 7 05:20:33 2022 X-Original-To: dev-commits-src-main@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 9731A1CFF580; Thu, 7 Jul 2022 05:20:33 +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 4Ldl9Y3pMTz3J57; Thu, 7 Jul 2022 05:20:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657171233; 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=VxbA/o1lpf/OLW4F5JH2Gzz/DF5N3N7p/5TztRn76z8=; b=W2K3d+ZdEjt5+EVJBF4ef7QihMKP/9r+IQRhWq5EEd+4/+tnBQRLhL0cqt9Pgh/nHmaEjw IQj8JzjUuuMdNUoFV0KKxIV8iE2z8R9KZqEN+Q5SpS89FstkpQbGyVnW2oz5wQdFICzbTH vD27ygq0zKp00aZu6j9QzHPgt2wu+TNguLNv81wBrHIe/KaiYri0FOs1pXPzIi7yx15PyA +txYDntXeNukNYxBYq7pWiwzNAfmnskdMa6w0pKvPgrqCpF78BXZLBnE/pG4JGd3ya8oBJ LxTlZcjUCvtN8JBS5teqkNsjU4ejspta1ybJEMvjSKke91uy5aiqYEFtl9FoMg== 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 4Ldl9Y2sGFzWgw; Thu, 7 Jul 2022 05:20:33 +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 2675KXnb081581; Thu, 7 Jul 2022 05:20:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2675KX7c081580; Thu, 7 Jul 2022 05:20:33 GMT (envelope-from git) Date: Thu, 7 Jul 2022 05:20:33 GMT Message-Id: <202207070520.2675KX7c081580@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 86cdadbed44e - main - tree(3): allow the compare function to return any signed type List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 86cdadbed44ecd36469dfbc4f1e492dfe51fcd4e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657171233; 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=VxbA/o1lpf/OLW4F5JH2Gzz/DF5N3N7p/5TztRn76z8=; b=IInbLMCCvXOvd5fesHpuD+oUW7XSPxByVzVo/Nc47mVOxo9Jr7fGEwxia53TTdmYe/qssP jvu5o25edP9TMZj3hj3ZZsYzzw/SvU+Pag46B1aWBV4b7Z4+xzfqEdJoq9vKCtuiglCaMF rmnB8F8RwiHeTQcAvj0PGC1J7wyAK9mjibUtj7e/wnZRvwTG182eSTZU0iqlj4It9eDC67 yH39WwmZgXSBBcsahcynTxVSXq4tzz8z7CqkqicLFMLWYJQaaODBIBPNqGeGpEvQUQgq3x enLtTzP1zQbg0ry8ibUGwEbWlbuCQS9jKwcaQFkHu1zVB4k34UYbVVdXgKTupQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657171233; a=rsa-sha256; cv=none; b=XYiKQrJXZSLxJ0VTdmHwj0QTCj953aMWn3IWtU54krkjs8CPzo5mBM3FZ0eJLRTjDmCRX1 G5r4G8+gIN8Y4u0RPdnv8XJzIDTnUHBiWQcePX8bZj1j9HATWioidl9fiLRA7N7Pd2B5be Pdz8FYXfSLeNAf/ih2wIuUblWg4ipctyhkPrUPVT4EMq83AAKPFsO5n3FjzSGvrk1OM3rX DO36owz3Hm2DxoNWMZUrxT6q3MFBNjNf1kbt/RU4p0PGKiCexJnToAg9ipLBbxZScxWI6t 5IiRQQxj5OHs2fCkGS2l/oM4+Cp1CrPWR3CWFVGCocN+fLKAE+Wh9G2zacsC8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=86cdadbed44ecd36469dfbc4f1e492dfe51fcd4e commit 86cdadbed44ecd36469dfbc4f1e492dfe51fcd4e Author: Gleb Smirnoff AuthorDate: 2022-07-07 05:19:08 +0000 Commit: Gleb Smirnoff CommitDate: 2022-07-07 05:19:08 +0000 tree(3): allow the compare function to return any signed type This allows to write very short comparison function when we are comparing just pointer values: return ((intptr_t)((uintptr_t)a->ptr/2 - (uintptr_t)b->ptr/2)); Reviewed by: dougm, alc Differential revision: https://reviews.freebsd.org/D35722 --- sys/sys/tree.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/sys/tree.h b/sys/sys/tree.h index 3f48c07a70b1..1529b07dfcdb 100644 --- a/sys/sys/tree.h +++ b/sys/sys/tree.h @@ -176,7 +176,7 @@ name##_SPLAY_INSERT(struct name *head, struct type *elm) \ if (SPLAY_EMPTY(head)) { \ SPLAY_LEFT(elm, field) = SPLAY_RIGHT(elm, field) = NULL; \ } else { \ - int __comp; \ + __typeof(cmp(NULL, NULL)) __comp; \ name##_SPLAY(head, elm); \ __comp = (cmp)(elm, (head)->sph_root); \ if (__comp < 0) { \ @@ -219,7 +219,7 @@ void \ name##_SPLAY(struct name *head, struct type *elm) \ { \ struct type __node, *__left, *__right, *__tmp; \ - int __comp; \ + __typeof(cmp(NULL, NULL)) __comp; \ \ SPLAY_LEFT(&__node, field) = SPLAY_RIGHT(&__node, field) = NULL;\ __left = __right = &__node; \ @@ -694,7 +694,7 @@ name##_RB_INSERT(struct name *head, struct type *elm) \ { \ struct type *tmp; \ struct type *parent = NULL; \ - int comp = 0; \ + __typeof(cmp(NULL, NULL)) comp = 0; \ tmp = RB_ROOT(head); \ while (tmp) { \ parent = tmp; \ @@ -727,7 +727,7 @@ attr struct type * \ name##_RB_FIND(struct name *head, struct type *elm) \ { \ struct type *tmp = RB_ROOT(head); \ - int comp; \ + __typeof(cmp(NULL, NULL)) comp; \ while (tmp) { \ comp = cmp(elm, tmp); \ if (comp < 0) \ @@ -747,7 +747,7 @@ name##_RB_NFIND(struct name *head, struct type *elm) \ { \ struct type *tmp = RB_ROOT(head); \ struct type *res = NULL; \ - int comp; \ + __typeof(cmp(NULL, NULL)) comp; \ while (tmp) { \ comp = cmp(elm, tmp); \ if (comp < 0) { \