From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dedi548.your-server.de (dedi548.your-server.de [85.10.215.148]) by sourceware.org (Postfix) with ESMTPS id 5EA493870889 for ; Mon, 19 Oct 2020 16:05:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 5EA493870889 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embedded-brains.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=sebastian.huber@embedded-brains.de Received: from sslproxy02.your-server.de ([78.47.166.47]) by dedi548.your-server.de with esmtpsa (TLSv1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.92.3) (envelope-from ) id 1kUXf1-0004Oa-DM for newlib@sourceware.org; Mon, 19 Oct 2020 18:05:23 +0200 Received: from [82.100.198.138] (helo=mail.embedded-brains.de) by sslproxy02.your-server.de with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92) (envelope-from ) id 1kUXf1-0002lf-AL for newlib@sourceware.org; Mon, 19 Oct 2020 18:05:23 +0200 Received: from localhost (localhost.localhost [127.0.0.1]) by mail.embedded-brains.de (Postfix) with ESMTP id 056C02A165B for ; Mon, 19 Oct 2020 18:04:11 +0200 (CEST) Received: from mail.embedded-brains.de ([127.0.0.1]) by localhost (zimbra.eb.localhost [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id ZhGXl5Vf0Tez for ; Mon, 19 Oct 2020 18:04:10 +0200 (CEST) Received: from localhost (localhost.localhost [127.0.0.1]) by mail.embedded-brains.de (Postfix) with ESMTP id 6DE532A1610 for ; Mon, 19 Oct 2020 18:04:10 +0200 (CEST) X-Virus-Scanned: amavisd-new at zimbra.eb.localhost Received: from mail.embedded-brains.de ([127.0.0.1]) by localhost (zimbra.eb.localhost [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id p3wm6fAwajBW for ; Mon, 19 Oct 2020 18:04:10 +0200 (CEST) Received: from linux-diu0.suse (unknown [192.168.96.161]) by mail.embedded-brains.de (Postfix) with ESMTP id 544A22A1681 for ; Mon, 19 Oct 2020 18:04:10 +0200 (CEST) From: Sebastian Huber To: newlib@sourceware.org Subject: [PATCH 02/11] Correct the use of RB_AUGMENT in the RB_TREE Date: Mon, 19 Oct 2020 18:05:15 +0200 Message-Id: <20201019160522.15408-3-sebastian.huber@embedded-brains.de> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201019160522.15408-1-sebastian.huber@embedded-brains.de> References: <20201019160522.15408-1-sebastian.huber@embedded-brains.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Authenticated-Sender: smtp-embedded@poldinet.de X-Virus-Scanned: Clear (ClamAV 0.102.4/25962/Mon Oct 19 15:57:02 2020) X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: newlib@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Newlib mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Oct 2020 16:05:26 -0000 From: dougm macros so that is invoked at the root of every subtree that changes in an insert or delete, and only once, and ordered from the bottom of the tree = to the top. For intel_gas.c, the only user of RB_AUGMENT I can find, change the augmenting routine so that it does not climb from entry to tree root on e= very call, and remove a 'tree correcting' function that can be supplanted by p= roper tree augmentation. Reviewed by: kib Tested by: pho Differential Revision: https://reviews.freebsd.org/D23189 --- newlib/libc/include/sys/tree.h | 88 +++++++++++++++------------------- 1 file changed, 38 insertions(+), 50 deletions(-) diff --git a/newlib/libc/include/sys/tree.h b/newlib/libc/include/sys/tre= e.h index 0eacf951d..5c31ff2ea 100644 --- a/newlib/libc/include/sys/tree.h +++ b/newlib/libc/include/sys/tree.h @@ -335,8 +335,12 @@ struct { \ RB_COLOR(red, field) =3D RB_RED; \ } while (/*CONSTCOND*/ 0) =20 +/* + * Something to be invoked in a loop at the root of every modified subtr= ee, + * from the bottom up to the root, to update augmented node data. + */ #ifndef RB_AUGMENT -#define RB_AUGMENT(x) do {} while (0) +#define RB_AUGMENT(x) break #endif =20 #define RB_ROTATE_LEFT(head, elm, tmp, field) do { \ @@ -344,7 +348,6 @@ struct { \ if ((RB_RIGHT(elm, field) =3D RB_LEFT(tmp, field)) !=3D NULL) { \ RB_PARENT(RB_LEFT(tmp, field), field) =3D (elm); \ } \ - RB_AUGMENT(elm); \ if ((RB_PARENT(tmp, field) =3D RB_PARENT(elm, field)) !=3D NULL) { \ if ((elm) =3D=3D RB_LEFT(RB_PARENT(elm, field), field)) \ RB_LEFT(RB_PARENT(elm, field), field) =3D (tmp); \ @@ -354,9 +357,7 @@ struct { \ (head)->rbh_root =3D (tmp); \ RB_LEFT(tmp, field) =3D (elm); \ RB_PARENT(elm, field) =3D (tmp); \ - RB_AUGMENT(tmp); \ - if ((RB_PARENT(tmp, field))) \ - RB_AUGMENT(RB_PARENT(tmp, field)); \ + RB_AUGMENT(elm); \ } while (/*CONSTCOND*/ 0) =20 #define RB_ROTATE_RIGHT(head, elm, tmp, field) do { \ @@ -364,7 +365,6 @@ struct { \ if ((RB_LEFT(elm, field) =3D RB_RIGHT(tmp, field)) !=3D NULL) { \ RB_PARENT(RB_RIGHT(tmp, field), field) =3D (elm); \ } \ - RB_AUGMENT(elm); \ if ((RB_PARENT(tmp, field) =3D RB_PARENT(elm, field)) !=3D NULL) { \ if ((elm) =3D=3D RB_LEFT(RB_PARENT(elm, field), field)) \ RB_LEFT(RB_PARENT(elm, field), field) =3D (tmp); \ @@ -374,9 +374,7 @@ struct { \ (head)->rbh_root =3D (tmp); \ RB_RIGHT(tmp, field) =3D (elm); \ RB_PARENT(elm, field) =3D (tmp); \ - RB_AUGMENT(tmp); \ - if ((RB_PARENT(tmp, field))) \ - RB_AUGMENT(RB_PARENT(tmp, field)); \ + RB_AUGMENT(elm); \ } while (/*CONSTCOND*/ 0) =20 /* Generates prototypes and inline functions */ @@ -571,62 +569,49 @@ name##_RB_REMOVE(struct name *head, struct type *el= m) \ else if (RB_RIGHT(elm, field) =3D=3D NULL) \ child =3D RB_LEFT(elm, field); \ else { \ - struct type *left; \ - elm =3D RB_RIGHT(elm, field); \ - while ((left =3D RB_LEFT(elm, field)) !=3D NULL) \ - elm =3D left; \ - child =3D RB_RIGHT(elm, field); \ - parent =3D RB_PARENT(elm, field); \ - color =3D RB_COLOR(elm, field); \ - if (child) \ - RB_PARENT(child, field) =3D parent; \ - if (parent) { \ - if (RB_LEFT(parent, field) =3D=3D elm) \ - RB_LEFT(parent, field) =3D child; \ - else \ - RB_RIGHT(parent, field) =3D child; \ - RB_AUGMENT(parent); \ - } else \ - RB_ROOT(head) =3D child; \ - if (RB_PARENT(elm, field) =3D=3D old) \ - parent =3D elm; \ - (elm)->field =3D (old)->field; \ - if (RB_PARENT(old, field)) { \ - if (RB_LEFT(RB_PARENT(old, field), field) =3D=3D old)\ - RB_LEFT(RB_PARENT(old, field), field) =3D elm;\ + elm =3D RB_RIGHT(old, field); \ + if ((child =3D RB_LEFT(elm, field)) =3D=3D NULL) { \ + child =3D RB_RIGHT(elm, field); \ + RB_RIGHT(old, field) =3D child; \ + RB_PARENT(elm, field) =3D elm; \ + } else { \ + do \ + elm =3D child; \ + while ((child =3D RB_LEFT(elm, field)) !=3D NULL); \ + child =3D RB_RIGHT(elm, field); \ + RB_PARENT(RB_RIGHT(old, field), field) =3D elm; \ + } \ + RB_PARENT(RB_LEFT(old, field), field) =3D elm; \ + parent =3D RB_PARENT(old, field); \ + if (parent !=3D NULL) { \ + if (RB_LEFT(parent, field) =3D=3D old) \ + RB_LEFT(parent, field) =3D elm; \ else \ - RB_RIGHT(RB_PARENT(old, field), field) =3D elm;\ - RB_AUGMENT(RB_PARENT(old, field)); \ + RB_RIGHT(parent, field) =3D elm; \ } else \ RB_ROOT(head) =3D elm; \ - RB_PARENT(RB_LEFT(old, field), field) =3D elm; \ - if (RB_RIGHT(old, field)) \ - RB_PARENT(RB_RIGHT(old, field), field) =3D elm; \ - if (parent) { \ - left =3D parent; \ - do { \ - RB_AUGMENT(left); \ - } while ((left =3D RB_PARENT(left, field)) !=3D NULL); \ - } \ - goto color; \ } \ parent =3D RB_PARENT(elm, field); \ color =3D RB_COLOR(elm, field); \ - if (child) \ + if (child !=3D NULL) \ RB_PARENT(child, field) =3D parent; \ - if (parent) { \ + if (parent !=3D NULL) { \ if (RB_LEFT(parent, field) =3D=3D elm) \ RB_LEFT(parent, field) =3D child; \ else \ RB_RIGHT(parent, field) =3D child; \ - RB_AUGMENT(parent); \ } else \ RB_ROOT(head) =3D child; \ -color: \ + if (elm !=3D old) \ + (elm)->field =3D (old)->field; \ if (color =3D=3D RB_BLACK) \ name##_RB_REMOVE_COLOR(head, parent, child); \ + while (parent !=3D NULL) { \ + RB_AUGMENT(parent); \ + parent =3D RB_PARENT(parent, field); \ + } \ return (old); \ -} \ +} =20 #define RB_GENERATE_INSERT(name, type, field, cmp, attr) \ /* Inserts a node into the RB tree */ \ @@ -653,10 +638,13 @@ name##_RB_INSERT(struct name *head, struct type *el= m) \ RB_LEFT(parent, field) =3D elm; \ else \ RB_RIGHT(parent, field) =3D elm; \ - RB_AUGMENT(parent); \ } else \ RB_ROOT(head) =3D elm; \ name##_RB_INSERT_COLOR(head, elm); \ + while (elm !=3D NULL) { \ + RB_AUGMENT(elm); \ + elm =3D RB_PARENT(elm, field); \ + } \ return (NULL); \ } =20 --=20 2.26.2