use a red-black tree to search for a matching vendor ID rather than traversing
a list with ~25000 entries
This commit is contained in:
parent
6433b4cd22
commit
a817647b20
@ -1,15 +1,16 @@
|
||||
# $OpenBSD: Makefile,v 1.48 2018/07/21 14:14:01 jasper Exp $
|
||||
# $OpenBSD: Makefile,v 1.49 2018/07/24 18:59:20 jasper Exp $
|
||||
|
||||
COMMENT= monitor arp & rarp requests
|
||||
|
||||
DISTNAME= arpwatch-2.1a15
|
||||
REVISION= 17
|
||||
REVISION= 18
|
||||
CATEGORIES= net
|
||||
|
||||
MASTER_SITES= ftp://ftp.ee.lbl.gov/
|
||||
|
||||
MAINTAINER= Jasper Lievisse Adriaanse <jasper@openbsd.org>
|
||||
|
||||
# BSD
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
|
||||
WANTLIB= c pcap
|
||||
|
@ -1,8 +1,10 @@
|
||||
$OpenBSD: patch-db_c,v 1.1 2018/05/15 19:10:24 jasper Exp $
|
||||
$OpenBSD: patch-db_c,v 1.2 2018/07/24 18:59:20 jasper Exp $
|
||||
|
||||
ignore 0.0.0.0
|
||||
https://sources.debian.org/patches/arpwatch/2.1a15-6/25ignore_zero_ip/
|
||||
|
||||
remove DECnet remnants
|
||||
|
||||
Index: db.c
|
||||
--- db.c.orig
|
||||
+++ db.c
|
||||
@ -18,3 +20,20 @@ Index: db.c
|
||||
/* Lookup ip address */
|
||||
ap = ainfo_find(a);
|
||||
|
||||
@@ -124,14 +129,11 @@ ent_add(register u_int32_t a, register u_char *e, time
|
||||
ep = ap->elist[1];
|
||||
if (MEMCMP(e, ep->e, 6) == 0) {
|
||||
/*
|
||||
- * Suppress report when less than
|
||||
- * FLIPFLOP_DELTA and one of the two ethernet
|
||||
- * addresses is a DECnet logical.
|
||||
+ * Suppress report when less than FLIPFLOP_DELTA.
|
||||
*/
|
||||
t2 = ap->elist[0]->t;
|
||||
e2 = ap->elist[0]->e;
|
||||
- if (t - t2 < FLIPFLIP_DELTA &&
|
||||
- (isdecnet(e) || isdecnet(e2)))
|
||||
+ if (t - t2 < FLIPFLIP_DELTA)
|
||||
dosyslog(LOG_INFO,
|
||||
"suppressed DECnet flip flop", a, e, e2);
|
||||
else
|
||||
|
@ -1,12 +1,128 @@
|
||||
$OpenBSD: patch-ec_c,v 1.1 2018/05/15 19:10:24 jasper Exp $
|
||||
$OpenBSD: patch-ec_c,v 1.2 2018/07/24 18:59:20 jasper Exp $
|
||||
|
||||
zero-pad MAC address to match ifconfig(8) output
|
||||
https://sources.debian.org/patches/arpwatch/2.1a15-6/33_bug315215_zero-pad-MAC/
|
||||
|
||||
remove DECnet remnants
|
||||
|
||||
use a red-black tree instead of linked list for searching vendor IDs
|
||||
|
||||
Index: ec.c
|
||||
--- ec.c.orig
|
||||
+++ ec.c
|
||||
@@ -218,7 +218,7 @@ e2str(register u_char *e)
|
||||
@@ -58,20 +58,28 @@ struct rtentry;
|
||||
#include "arpwatch.h"
|
||||
#include "ec.h"
|
||||
#include "util.h"
|
||||
+#include "tree.h"
|
||||
|
||||
/* Basic data structure */
|
||||
-struct ecent {
|
||||
+struct ecnode {
|
||||
+ RB_ENTRY(ecnode) entry;
|
||||
u_int32_t o; /* first 3 octets */
|
||||
char *text; /* associated text */
|
||||
};
|
||||
|
||||
-static struct ecent *list;
|
||||
-static u_int ec_last = 0;
|
||||
-static u_int ec_len = 0;
|
||||
-
|
||||
/* Forwards */
|
||||
-static int ec_a2o(char *, u_int32_t *);
|
||||
+int ocmp(struct ecnode *, struct ecnode *);
|
||||
|
||||
+/* Compare two ecnode addresses */
|
||||
+int
|
||||
+ocmp(struct ecnode *e1, struct ecnode *e2)
|
||||
+{
|
||||
+ return (e1->o < e2->o ? -1 : e1->o > e2->o);
|
||||
+}
|
||||
+
|
||||
+RB_HEAD(ectree, ecnode) head = RB_INITIALIZER(&head);
|
||||
+RB_GENERATE(ectree, ecnode, entry, ocmp);
|
||||
+
|
||||
/* Convert an 3 octets from an ethernet address to a u_int32_t */
|
||||
static int
|
||||
ec_a2o(register char *cp, register u_int32_t *op)
|
||||
@@ -91,23 +99,18 @@ ec_a2o(register char *cp, register u_int32_t *op)
|
||||
int
|
||||
ec_add(register u_int32_t o, register char *text)
|
||||
{
|
||||
+ struct ecnode *n;
|
||||
|
||||
- if (ec_last >= ec_len) {
|
||||
- if (list == NULL) {
|
||||
- ec_len = 512;
|
||||
- list = malloc(ec_len * sizeof(*list));
|
||||
- } else {
|
||||
- ec_len *= 2;
|
||||
- list = realloc(list, ec_len * sizeof(*list));
|
||||
- }
|
||||
- if (list == NULL) {
|
||||
- syslog(LOG_ERR, "ec_add(): malloc: %m");
|
||||
- exit(1);
|
||||
- }
|
||||
+ if ((n = malloc(sizeof(struct ecnode))) == NULL) {
|
||||
+ syslog(LOG_ERR, "%s: malloc\n", __func__);
|
||||
+ return (0);
|
||||
}
|
||||
- list[ec_last].o = o;
|
||||
- list[ec_last].text = savestr(text);
|
||||
- ++ec_last;
|
||||
+
|
||||
+ n->o = o;
|
||||
+ n->text = savestr(text);
|
||||
+
|
||||
+ RB_INSERT(ectree, &head, n);
|
||||
+
|
||||
return (1);
|
||||
}
|
||||
|
||||
@@ -115,16 +118,16 @@ ec_add(register u_int32_t o, register char *text)
|
||||
char *
|
||||
ec_find(register u_char *e)
|
||||
{
|
||||
- u_int32_t o;
|
||||
- register int i;
|
||||
+ struct ecnode find, *res;
|
||||
+ u_int32_t o = 0;
|
||||
|
||||
- o = 0;
|
||||
BCOPY(e, &o, 3);
|
||||
- for (i = 0; i < ec_last; ++i)
|
||||
- if (list[i].o == o)
|
||||
- return (list[i].text);
|
||||
-
|
||||
- return (NULL);
|
||||
+ find.o = o;
|
||||
+ res = RB_FIND(ectree, &head, &find);
|
||||
+ if (res == NULL)
|
||||
+ return (NULL);
|
||||
+ else
|
||||
+ return res->text;
|
||||
}
|
||||
|
||||
/* Loop through the ethernet code database */
|
||||
@@ -182,17 +185,6 @@ ec_loop(register FILE *f, ec_process fn, register cons
|
||||
return (1);
|
||||
}
|
||||
|
||||
-/* DECnet local logical address prefix */
|
||||
-static u_char decnet[3] = { 0xaa, 0x0, 0x4 };
|
||||
-
|
||||
-/* Returns true if an ethernet address is decnet, else false */
|
||||
-int
|
||||
-isdecnet(register u_char *e)
|
||||
-{
|
||||
-
|
||||
- return (MEMCMP(e, decnet, sizeof(decnet)) == 0);
|
||||
-}
|
||||
-
|
||||
/* Convert an ascii ethernet string to ethernet address */
|
||||
int
|
||||
str2e(register char *str, register u_char *e)
|
||||
@@ -218,7 +210,7 @@ e2str(register u_char *e)
|
||||
{
|
||||
static char str[32];
|
||||
|
||||
|
765
net/arpwatch/patches/patch-tree_h
Normal file
765
net/arpwatch/patches/patch-tree_h
Normal file
@ -0,0 +1,765 @@
|
||||
$OpenBSD: patch-tree_h,v 1.1 2018/07/24 18:59:20 jasper Exp $
|
||||
|
||||
use a red-black tree instead of linked list for searching vendor IDs
|
||||
|
||||
Index: tree.h
|
||||
--- tree.h.orig
|
||||
+++ tree.h
|
||||
@@ -0,0 +1,757 @@
|
||||
+/*
|
||||
+ * Copyright 2002 Niels Provos <provos@citi.umich.edu>
|
||||
+ * All rights reserved.
|
||||
+ *
|
||||
+ * Redistribution and use in source and binary forms, with or without
|
||||
+ * modification, are permitted provided that the following conditions
|
||||
+ * are met:
|
||||
+ * 1. Redistributions of source code must retain the above copyright
|
||||
+ * notice, this list of conditions and the following disclaimer.
|
||||
+ * 2. Redistributions in binary form must reproduce the above copyright
|
||||
+ * notice, this list of conditions and the following disclaimer in the
|
||||
+ * documentation and/or other materials provided with the distribution.
|
||||
+ *
|
||||
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
||||
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
||||
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
||||
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
||||
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
+ */
|
||||
+
|
||||
+#ifndef _SYS_TREE_H_
|
||||
+#define _SYS_TREE_H_
|
||||
+
|
||||
+#include <sys/_null.h>
|
||||
+
|
||||
+/*
|
||||
+ * A red-black tree is a binary search tree with the node color as an
|
||||
+ * extra attribute. It fulfills a set of conditions:
|
||||
+ * - every search path from the root to a leaf consists of the
|
||||
+ * same number of black nodes,
|
||||
+ * - each red node (except for the root) has a black parent,
|
||||
+ * - each leaf node is black.
|
||||
+ *
|
||||
+ * Every operation on a red-black tree is bounded as O(lg n).
|
||||
+ * The maximum height of a red-black tree is 2lg (n+1).
|
||||
+ */
|
||||
+
|
||||
+/* Macros that define a red-black tree */
|
||||
+#define RB_HEAD(name, type) \
|
||||
+struct name { \
|
||||
+ struct type *rbh_root; /* root of the tree */ \
|
||||
+}
|
||||
+
|
||||
+#define RB_INITIALIZER(root) \
|
||||
+ { NULL }
|
||||
+
|
||||
+#define RB_INIT(root) do { \
|
||||
+ (root)->rbh_root = NULL; \
|
||||
+} while (0)
|
||||
+
|
||||
+#define RB_BLACK 0
|
||||
+#define RB_RED 1
|
||||
+#define RB_ENTRY(type) \
|
||||
+struct { \
|
||||
+ struct type *rbe_left; /* left element */ \
|
||||
+ struct type *rbe_right; /* right element */ \
|
||||
+ struct type *rbe_parent; /* parent element */ \
|
||||
+ int rbe_color; /* node color */ \
|
||||
+}
|
||||
+
|
||||
+#define RB_LEFT(elm, field) (elm)->field.rbe_left
|
||||
+#define RB_RIGHT(elm, field) (elm)->field.rbe_right
|
||||
+#define RB_PARENT(elm, field) (elm)->field.rbe_parent
|
||||
+#define RB_COLOR(elm, field) (elm)->field.rbe_color
|
||||
+#define RB_ROOT(head) (head)->rbh_root
|
||||
+#define RB_EMPTY(head) (RB_ROOT(head) == NULL)
|
||||
+
|
||||
+#define RB_SET(elm, parent, field) do { \
|
||||
+ RB_PARENT(elm, field) = parent; \
|
||||
+ RB_LEFT(elm, field) = RB_RIGHT(elm, field) = NULL; \
|
||||
+ RB_COLOR(elm, field) = RB_RED; \
|
||||
+} while (0)
|
||||
+
|
||||
+#define RB_SET_BLACKRED(black, red, field) do { \
|
||||
+ RB_COLOR(black, field) = RB_BLACK; \
|
||||
+ RB_COLOR(red, field) = RB_RED; \
|
||||
+} while (0)
|
||||
+
|
||||
+#ifndef RB_AUGMENT
|
||||
+#define RB_AUGMENT(x) do {} while (0)
|
||||
+#endif
|
||||
+
|
||||
+#define RB_ROTATE_LEFT(head, elm, tmp, field) do { \
|
||||
+ (tmp) = RB_RIGHT(elm, field); \
|
||||
+ if ((RB_RIGHT(elm, field) = RB_LEFT(tmp, field))) { \
|
||||
+ RB_PARENT(RB_LEFT(tmp, field), field) = (elm); \
|
||||
+ } \
|
||||
+ RB_AUGMENT(elm); \
|
||||
+ if ((RB_PARENT(tmp, field) = RB_PARENT(elm, field))) { \
|
||||
+ if ((elm) == RB_LEFT(RB_PARENT(elm, field), field)) \
|
||||
+ RB_LEFT(RB_PARENT(elm, field), field) = (tmp); \
|
||||
+ else \
|
||||
+ RB_RIGHT(RB_PARENT(elm, field), field) = (tmp); \
|
||||
+ } else \
|
||||
+ (head)->rbh_root = (tmp); \
|
||||
+ RB_LEFT(tmp, field) = (elm); \
|
||||
+ RB_PARENT(elm, field) = (tmp); \
|
||||
+ RB_AUGMENT(tmp); \
|
||||
+ if ((RB_PARENT(tmp, field))) \
|
||||
+ RB_AUGMENT(RB_PARENT(tmp, field)); \
|
||||
+} while (0)
|
||||
+
|
||||
+#define RB_ROTATE_RIGHT(head, elm, tmp, field) do { \
|
||||
+ (tmp) = RB_LEFT(elm, field); \
|
||||
+ if ((RB_LEFT(elm, field) = RB_RIGHT(tmp, field))) { \
|
||||
+ RB_PARENT(RB_RIGHT(tmp, field), field) = (elm); \
|
||||
+ } \
|
||||
+ RB_AUGMENT(elm); \
|
||||
+ if ((RB_PARENT(tmp, field) = RB_PARENT(elm, field))) { \
|
||||
+ if ((elm) == RB_LEFT(RB_PARENT(elm, field), field)) \
|
||||
+ RB_LEFT(RB_PARENT(elm, field), field) = (tmp); \
|
||||
+ else \
|
||||
+ RB_RIGHT(RB_PARENT(elm, field), field) = (tmp); \
|
||||
+ } else \
|
||||
+ (head)->rbh_root = (tmp); \
|
||||
+ RB_RIGHT(tmp, field) = (elm); \
|
||||
+ RB_PARENT(elm, field) = (tmp); \
|
||||
+ RB_AUGMENT(tmp); \
|
||||
+ if ((RB_PARENT(tmp, field))) \
|
||||
+ RB_AUGMENT(RB_PARENT(tmp, field)); \
|
||||
+} while (0)
|
||||
+
|
||||
+/* Generates prototypes and inline functions */
|
||||
+#define RB_PROTOTYPE(name, type, field, cmp) \
|
||||
+ RB_PROTOTYPE_INTERNAL(name, type, field, cmp,)
|
||||
+#define RB_PROTOTYPE_STATIC(name, type, field, cmp) \
|
||||
+ RB_PROTOTYPE_INTERNAL(name, type, field, cmp, __attribute__((__unused__)) static)
|
||||
+#define RB_PROTOTYPE_INTERNAL(name, type, field, cmp, attr) \
|
||||
+attr void name##_RB_INSERT_COLOR(struct name *, struct type *); \
|
||||
+attr void name##_RB_REMOVE_COLOR(struct name *, struct type *, struct type *);\
|
||||
+attr struct type *name##_RB_REMOVE(struct name *, struct type *); \
|
||||
+attr struct type *name##_RB_INSERT(struct name *, struct type *); \
|
||||
+attr struct type *name##_RB_FIND(struct name *, struct type *); \
|
||||
+attr struct type *name##_RB_NFIND(struct name *, struct type *); \
|
||||
+attr struct type *name##_RB_NEXT(struct type *); \
|
||||
+attr struct type *name##_RB_PREV(struct type *); \
|
||||
+attr struct type *name##_RB_MINMAX(struct name *, int); \
|
||||
+ \
|
||||
+
|
||||
+/* Main rb operation.
|
||||
+ * Moves node close to the key of elm to top
|
||||
+ */
|
||||
+#define RB_GENERATE(name, type, field, cmp) \
|
||||
+ RB_GENERATE_INTERNAL(name, type, field, cmp,)
|
||||
+#define RB_GENERATE_STATIC(name, type, field, cmp) \
|
||||
+ RB_GENERATE_INTERNAL(name, type, field, cmp, __attribute__((__unused__)) static)
|
||||
+#define RB_GENERATE_INTERNAL(name, type, field, cmp, attr) \
|
||||
+attr void \
|
||||
+name##_RB_INSERT_COLOR(struct name *head, struct type *elm) \
|
||||
+{ \
|
||||
+ struct type *parent, *gparent, *tmp; \
|
||||
+ while ((parent = RB_PARENT(elm, field)) && \
|
||||
+ RB_COLOR(parent, field) == RB_RED) { \
|
||||
+ gparent = RB_PARENT(parent, field); \
|
||||
+ if (parent == RB_LEFT(gparent, field)) { \
|
||||
+ tmp = RB_RIGHT(gparent, field); \
|
||||
+ if (tmp && RB_COLOR(tmp, field) == RB_RED) { \
|
||||
+ RB_COLOR(tmp, field) = RB_BLACK; \
|
||||
+ RB_SET_BLACKRED(parent, gparent, field);\
|
||||
+ elm = gparent; \
|
||||
+ continue; \
|
||||
+ } \
|
||||
+ if (RB_RIGHT(parent, field) == elm) { \
|
||||
+ RB_ROTATE_LEFT(head, parent, tmp, field);\
|
||||
+ tmp = parent; \
|
||||
+ parent = elm; \
|
||||
+ elm = tmp; \
|
||||
+ } \
|
||||
+ RB_SET_BLACKRED(parent, gparent, field); \
|
||||
+ RB_ROTATE_RIGHT(head, gparent, tmp, field); \
|
||||
+ } else { \
|
||||
+ tmp = RB_LEFT(gparent, field); \
|
||||
+ if (tmp && RB_COLOR(tmp, field) == RB_RED) { \
|
||||
+ RB_COLOR(tmp, field) = RB_BLACK; \
|
||||
+ RB_SET_BLACKRED(parent, gparent, field);\
|
||||
+ elm = gparent; \
|
||||
+ continue; \
|
||||
+ } \
|
||||
+ if (RB_LEFT(parent, field) == elm) { \
|
||||
+ RB_ROTATE_RIGHT(head, parent, tmp, field);\
|
||||
+ tmp = parent; \
|
||||
+ parent = elm; \
|
||||
+ elm = tmp; \
|
||||
+ } \
|
||||
+ RB_SET_BLACKRED(parent, gparent, field); \
|
||||
+ RB_ROTATE_LEFT(head, gparent, tmp, field); \
|
||||
+ } \
|
||||
+ } \
|
||||
+ RB_COLOR(head->rbh_root, field) = RB_BLACK; \
|
||||
+} \
|
||||
+ \
|
||||
+attr void \
|
||||
+name##_RB_REMOVE_COLOR(struct name *head, struct type *parent, struct type *elm) \
|
||||
+{ \
|
||||
+ struct type *tmp; \
|
||||
+ while ((elm == NULL || RB_COLOR(elm, field) == RB_BLACK) && \
|
||||
+ elm != RB_ROOT(head)) { \
|
||||
+ if (RB_LEFT(parent, field) == elm) { \
|
||||
+ tmp = RB_RIGHT(parent, field); \
|
||||
+ if (RB_COLOR(tmp, field) == RB_RED) { \
|
||||
+ RB_SET_BLACKRED(tmp, parent, field); \
|
||||
+ RB_ROTATE_LEFT(head, parent, tmp, field);\
|
||||
+ tmp = RB_RIGHT(parent, field); \
|
||||
+ } \
|
||||
+ if ((RB_LEFT(tmp, field) == NULL || \
|
||||
+ RB_COLOR(RB_LEFT(tmp, field), field) == RB_BLACK) &&\
|
||||
+ (RB_RIGHT(tmp, field) == NULL || \
|
||||
+ RB_COLOR(RB_RIGHT(tmp, field), field) == RB_BLACK)) {\
|
||||
+ RB_COLOR(tmp, field) = RB_RED; \
|
||||
+ elm = parent; \
|
||||
+ parent = RB_PARENT(elm, field); \
|
||||
+ } else { \
|
||||
+ if (RB_RIGHT(tmp, field) == NULL || \
|
||||
+ RB_COLOR(RB_RIGHT(tmp, field), field) == RB_BLACK) {\
|
||||
+ struct type *oleft; \
|
||||
+ if ((oleft = RB_LEFT(tmp, field)))\
|
||||
+ RB_COLOR(oleft, field) = RB_BLACK;\
|
||||
+ RB_COLOR(tmp, field) = RB_RED; \
|
||||
+ RB_ROTATE_RIGHT(head, tmp, oleft, field);\
|
||||
+ tmp = RB_RIGHT(parent, field); \
|
||||
+ } \
|
||||
+ RB_COLOR(tmp, field) = RB_COLOR(parent, field);\
|
||||
+ RB_COLOR(parent, field) = RB_BLACK; \
|
||||
+ if (RB_RIGHT(tmp, field)) \
|
||||
+ RB_COLOR(RB_RIGHT(tmp, field), field) = RB_BLACK;\
|
||||
+ RB_ROTATE_LEFT(head, parent, tmp, field);\
|
||||
+ elm = RB_ROOT(head); \
|
||||
+ break; \
|
||||
+ } \
|
||||
+ } else { \
|
||||
+ tmp = RB_LEFT(parent, field); \
|
||||
+ if (RB_COLOR(tmp, field) == RB_RED) { \
|
||||
+ RB_SET_BLACKRED(tmp, parent, field); \
|
||||
+ RB_ROTATE_RIGHT(head, parent, tmp, field);\
|
||||
+ tmp = RB_LEFT(parent, field); \
|
||||
+ } \
|
||||
+ if ((RB_LEFT(tmp, field) == NULL || \
|
||||
+ RB_COLOR(RB_LEFT(tmp, field), field) == RB_BLACK) &&\
|
||||
+ (RB_RIGHT(tmp, field) == NULL || \
|
||||
+ RB_COLOR(RB_RIGHT(tmp, field), field) == RB_BLACK)) {\
|
||||
+ RB_COLOR(tmp, field) = RB_RED; \
|
||||
+ elm = parent; \
|
||||
+ parent = RB_PARENT(elm, field); \
|
||||
+ } else { \
|
||||
+ if (RB_LEFT(tmp, field) == NULL || \
|
||||
+ RB_COLOR(RB_LEFT(tmp, field), field) == RB_BLACK) {\
|
||||
+ struct type *oright; \
|
||||
+ if ((oright = RB_RIGHT(tmp, field)))\
|
||||
+ RB_COLOR(oright, field) = RB_BLACK;\
|
||||
+ RB_COLOR(tmp, field) = RB_RED; \
|
||||
+ RB_ROTATE_LEFT(head, tmp, oright, field);\
|
||||
+ tmp = RB_LEFT(parent, field); \
|
||||
+ } \
|
||||
+ RB_COLOR(tmp, field) = RB_COLOR(parent, field);\
|
||||
+ RB_COLOR(parent, field) = RB_BLACK; \
|
||||
+ if (RB_LEFT(tmp, field)) \
|
||||
+ RB_COLOR(RB_LEFT(tmp, field), field) = RB_BLACK;\
|
||||
+ RB_ROTATE_RIGHT(head, parent, tmp, field);\
|
||||
+ elm = RB_ROOT(head); \
|
||||
+ break; \
|
||||
+ } \
|
||||
+ } \
|
||||
+ } \
|
||||
+ if (elm) \
|
||||
+ RB_COLOR(elm, field) = RB_BLACK; \
|
||||
+} \
|
||||
+ \
|
||||
+attr struct type * \
|
||||
+name##_RB_REMOVE(struct name *head, struct type *elm) \
|
||||
+{ \
|
||||
+ struct type *child, *parent, *old = elm; \
|
||||
+ int color; \
|
||||
+ if (RB_LEFT(elm, field) == NULL) \
|
||||
+ child = RB_RIGHT(elm, field); \
|
||||
+ else if (RB_RIGHT(elm, field) == NULL) \
|
||||
+ child = RB_LEFT(elm, field); \
|
||||
+ else { \
|
||||
+ struct type *left; \
|
||||
+ elm = RB_RIGHT(elm, field); \
|
||||
+ while ((left = RB_LEFT(elm, field))) \
|
||||
+ elm = left; \
|
||||
+ child = RB_RIGHT(elm, field); \
|
||||
+ parent = RB_PARENT(elm, field); \
|
||||
+ color = RB_COLOR(elm, field); \
|
||||
+ if (child) \
|
||||
+ RB_PARENT(child, field) = parent; \
|
||||
+ if (parent) { \
|
||||
+ if (RB_LEFT(parent, field) == elm) \
|
||||
+ RB_LEFT(parent, field) = child; \
|
||||
+ else \
|
||||
+ RB_RIGHT(parent, field) = child; \
|
||||
+ RB_AUGMENT(parent); \
|
||||
+ } else \
|
||||
+ RB_ROOT(head) = child; \
|
||||
+ if (RB_PARENT(elm, field) == old) \
|
||||
+ parent = elm; \
|
||||
+ (elm)->field = (old)->field; \
|
||||
+ if (RB_PARENT(old, field)) { \
|
||||
+ if (RB_LEFT(RB_PARENT(old, field), field) == old)\
|
||||
+ RB_LEFT(RB_PARENT(old, field), field) = elm;\
|
||||
+ else \
|
||||
+ RB_RIGHT(RB_PARENT(old, field), field) = elm;\
|
||||
+ RB_AUGMENT(RB_PARENT(old, field)); \
|
||||
+ } else \
|
||||
+ RB_ROOT(head) = elm; \
|
||||
+ RB_PARENT(RB_LEFT(old, field), field) = elm; \
|
||||
+ if (RB_RIGHT(old, field)) \
|
||||
+ RB_PARENT(RB_RIGHT(old, field), field) = elm; \
|
||||
+ if (parent) { \
|
||||
+ left = parent; \
|
||||
+ do { \
|
||||
+ RB_AUGMENT(left); \
|
||||
+ } while ((left = RB_PARENT(left, field))); \
|
||||
+ } \
|
||||
+ goto color; \
|
||||
+ } \
|
||||
+ parent = RB_PARENT(elm, field); \
|
||||
+ color = RB_COLOR(elm, field); \
|
||||
+ if (child) \
|
||||
+ RB_PARENT(child, field) = parent; \
|
||||
+ if (parent) { \
|
||||
+ if (RB_LEFT(parent, field) == elm) \
|
||||
+ RB_LEFT(parent, field) = child; \
|
||||
+ else \
|
||||
+ RB_RIGHT(parent, field) = child; \
|
||||
+ RB_AUGMENT(parent); \
|
||||
+ } else \
|
||||
+ RB_ROOT(head) = child; \
|
||||
+color: \
|
||||
+ if (color == RB_BLACK) \
|
||||
+ name##_RB_REMOVE_COLOR(head, parent, child); \
|
||||
+ return (old); \
|
||||
+} \
|
||||
+ \
|
||||
+/* Inserts a node into the RB tree */ \
|
||||
+attr struct type * \
|
||||
+name##_RB_INSERT(struct name *head, struct type *elm) \
|
||||
+{ \
|
||||
+ struct type *tmp; \
|
||||
+ struct type *parent = NULL; \
|
||||
+ int comp = 0; \
|
||||
+ tmp = RB_ROOT(head); \
|
||||
+ while (tmp) { \
|
||||
+ parent = tmp; \
|
||||
+ comp = (cmp)(elm, parent); \
|
||||
+ if (comp < 0) \
|
||||
+ tmp = RB_LEFT(tmp, field); \
|
||||
+ else if (comp > 0) \
|
||||
+ tmp = RB_RIGHT(tmp, field); \
|
||||
+ else \
|
||||
+ return (tmp); \
|
||||
+ } \
|
||||
+ RB_SET(elm, parent, field); \
|
||||
+ if (parent != NULL) { \
|
||||
+ if (comp < 0) \
|
||||
+ RB_LEFT(parent, field) = elm; \
|
||||
+ else \
|
||||
+ RB_RIGHT(parent, field) = elm; \
|
||||
+ RB_AUGMENT(parent); \
|
||||
+ } else \
|
||||
+ RB_ROOT(head) = elm; \
|
||||
+ name##_RB_INSERT_COLOR(head, elm); \
|
||||
+ return (NULL); \
|
||||
+} \
|
||||
+ \
|
||||
+/* Finds the node with the same key as elm */ \
|
||||
+attr struct type * \
|
||||
+name##_RB_FIND(struct name *head, struct type *elm) \
|
||||
+{ \
|
||||
+ struct type *tmp = RB_ROOT(head); \
|
||||
+ int comp; \
|
||||
+ while (tmp) { \
|
||||
+ comp = cmp(elm, tmp); \
|
||||
+ if (comp < 0) \
|
||||
+ tmp = RB_LEFT(tmp, field); \
|
||||
+ else if (comp > 0) \
|
||||
+ tmp = RB_RIGHT(tmp, field); \
|
||||
+ else \
|
||||
+ return (tmp); \
|
||||
+ } \
|
||||
+ return (NULL); \
|
||||
+} \
|
||||
+ \
|
||||
+/* Finds the first node greater than or equal to the search key */ \
|
||||
+attr struct type * \
|
||||
+name##_RB_NFIND(struct name *head, struct type *elm) \
|
||||
+{ \
|
||||
+ struct type *tmp = RB_ROOT(head); \
|
||||
+ struct type *res = NULL; \
|
||||
+ int comp; \
|
||||
+ while (tmp) { \
|
||||
+ comp = cmp(elm, tmp); \
|
||||
+ if (comp < 0) { \
|
||||
+ res = tmp; \
|
||||
+ tmp = RB_LEFT(tmp, field); \
|
||||
+ } \
|
||||
+ else if (comp > 0) \
|
||||
+ tmp = RB_RIGHT(tmp, field); \
|
||||
+ else \
|
||||
+ return (tmp); \
|
||||
+ } \
|
||||
+ return (res); \
|
||||
+} \
|
||||
+ \
|
||||
+/* ARGSUSED */ \
|
||||
+attr struct type * \
|
||||
+name##_RB_NEXT(struct type *elm) \
|
||||
+{ \
|
||||
+ if (RB_RIGHT(elm, field)) { \
|
||||
+ elm = RB_RIGHT(elm, field); \
|
||||
+ while (RB_LEFT(elm, field)) \
|
||||
+ elm = RB_LEFT(elm, field); \
|
||||
+ } else { \
|
||||
+ if (RB_PARENT(elm, field) && \
|
||||
+ (elm == RB_LEFT(RB_PARENT(elm, field), field))) \
|
||||
+ elm = RB_PARENT(elm, field); \
|
||||
+ else { \
|
||||
+ while (RB_PARENT(elm, field) && \
|
||||
+ (elm == RB_RIGHT(RB_PARENT(elm, field), field)))\
|
||||
+ elm = RB_PARENT(elm, field); \
|
||||
+ elm = RB_PARENT(elm, field); \
|
||||
+ } \
|
||||
+ } \
|
||||
+ return (elm); \
|
||||
+} \
|
||||
+ \
|
||||
+/* ARGSUSED */ \
|
||||
+attr struct type * \
|
||||
+name##_RB_PREV(struct type *elm) \
|
||||
+{ \
|
||||
+ if (RB_LEFT(elm, field)) { \
|
||||
+ elm = RB_LEFT(elm, field); \
|
||||
+ while (RB_RIGHT(elm, field)) \
|
||||
+ elm = RB_RIGHT(elm, field); \
|
||||
+ } else { \
|
||||
+ if (RB_PARENT(elm, field) && \
|
||||
+ (elm == RB_RIGHT(RB_PARENT(elm, field), field))) \
|
||||
+ elm = RB_PARENT(elm, field); \
|
||||
+ else { \
|
||||
+ while (RB_PARENT(elm, field) && \
|
||||
+ (elm == RB_LEFT(RB_PARENT(elm, field), field)))\
|
||||
+ elm = RB_PARENT(elm, field); \
|
||||
+ elm = RB_PARENT(elm, field); \
|
||||
+ } \
|
||||
+ } \
|
||||
+ return (elm); \
|
||||
+} \
|
||||
+ \
|
||||
+attr struct type * \
|
||||
+name##_RB_MINMAX(struct name *head, int val) \
|
||||
+{ \
|
||||
+ struct type *tmp = RB_ROOT(head); \
|
||||
+ struct type *parent = NULL; \
|
||||
+ while (tmp) { \
|
||||
+ parent = tmp; \
|
||||
+ if (val < 0) \
|
||||
+ tmp = RB_LEFT(tmp, field); \
|
||||
+ else \
|
||||
+ tmp = RB_RIGHT(tmp, field); \
|
||||
+ } \
|
||||
+ return (parent); \
|
||||
+}
|
||||
+
|
||||
+#define RB_NEGINF -1
|
||||
+#define RB_INF 1
|
||||
+
|
||||
+#define RB_INSERT(name, x, y) name##_RB_INSERT(x, y)
|
||||
+#define RB_REMOVE(name, x, y) name##_RB_REMOVE(x, y)
|
||||
+#define RB_FIND(name, x, y) name##_RB_FIND(x, y)
|
||||
+#define RB_NFIND(name, x, y) name##_RB_NFIND(x, y)
|
||||
+#define RB_NEXT(name, x, y) name##_RB_NEXT(y)
|
||||
+#define RB_PREV(name, x, y) name##_RB_PREV(y)
|
||||
+#define RB_MIN(name, x) name##_RB_MINMAX(x, RB_NEGINF)
|
||||
+#define RB_MAX(name, x) name##_RB_MINMAX(x, RB_INF)
|
||||
+
|
||||
+#define RB_FOREACH(x, name, head) \
|
||||
+ for ((x) = RB_MIN(name, head); \
|
||||
+ (x) != NULL; \
|
||||
+ (x) = name##_RB_NEXT(x))
|
||||
+
|
||||
+#define RB_FOREACH_SAFE(x, name, head, y) \
|
||||
+ for ((x) = RB_MIN(name, head); \
|
||||
+ ((x) != NULL) && ((y) = name##_RB_NEXT(x), 1); \
|
||||
+ (x) = (y))
|
||||
+
|
||||
+#define RB_FOREACH_REVERSE(x, name, head) \
|
||||
+ for ((x) = RB_MAX(name, head); \
|
||||
+ (x) != NULL; \
|
||||
+ (x) = name##_RB_PREV(x))
|
||||
+
|
||||
+#define RB_FOREACH_REVERSE_SAFE(x, name, head, y) \
|
||||
+ for ((x) = RB_MAX(name, head); \
|
||||
+ ((x) != NULL) && ((y) = name##_RB_PREV(x), 1); \
|
||||
+ (x) = (y))
|
||||
+
|
||||
+
|
||||
+/*
|
||||
+ * Copyright (c) 2016 David Gwynne <dlg@openbsd.org>
|
||||
+ *
|
||||
+ * Permission to use, copy, modify, and distribute this software for any
|
||||
+ * purpose with or without fee is hereby granted, provided that the above
|
||||
+ * copyright notice and this permission notice appear in all copies.
|
||||
+ *
|
||||
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
||||
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
||||
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
||||
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
||||
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
+ */
|
||||
+
|
||||
+struct rb_type {
|
||||
+ int (*t_compare)(const void *, const void *);
|
||||
+ void (*t_augment)(void *);
|
||||
+ unsigned int t_offset; /* offset of rb_entry in type */
|
||||
+};
|
||||
+
|
||||
+struct rb_tree {
|
||||
+ struct rb_entry *rbt_root;
|
||||
+};
|
||||
+
|
||||
+struct rb_entry {
|
||||
+ struct rb_entry *rbt_parent;
|
||||
+ struct rb_entry *rbt_left;
|
||||
+ struct rb_entry *rbt_right;
|
||||
+ unsigned int rbt_color;
|
||||
+};
|
||||
+
|
||||
+#define RBT_HEAD(_name, _type) \
|
||||
+struct _name { \
|
||||
+ struct rb_tree rbh_root; \
|
||||
+}
|
||||
+
|
||||
+#define RBT_ENTRY(_type) struct rb_entry
|
||||
+
|
||||
+static inline void
|
||||
+_rb_init(struct rb_tree *rbt)
|
||||
+{
|
||||
+ rbt->rbt_root = NULL;
|
||||
+}
|
||||
+
|
||||
+static inline int
|
||||
+_rb_empty(struct rb_tree *rbt)
|
||||
+{
|
||||
+ return (rbt->rbt_root == NULL);
|
||||
+}
|
||||
+
|
||||
+void *_rb_insert(const struct rb_type *, struct rb_tree *, void *);
|
||||
+void *_rb_remove(const struct rb_type *, struct rb_tree *, void *);
|
||||
+void *_rb_find(const struct rb_type *, struct rb_tree *, const void *);
|
||||
+void *_rb_nfind(const struct rb_type *, struct rb_tree *, const void *);
|
||||
+void *_rb_root(const struct rb_type *, struct rb_tree *);
|
||||
+void *_rb_min(const struct rb_type *, struct rb_tree *);
|
||||
+void *_rb_max(const struct rb_type *, struct rb_tree *);
|
||||
+void *_rb_next(const struct rb_type *, void *);
|
||||
+void *_rb_prev(const struct rb_type *, void *);
|
||||
+void *_rb_left(const struct rb_type *, void *);
|
||||
+void *_rb_right(const struct rb_type *, void *);
|
||||
+void *_rb_parent(const struct rb_type *, void *);
|
||||
+void _rb_set_left(const struct rb_type *, void *, void *);
|
||||
+void _rb_set_right(const struct rb_type *, void *, void *);
|
||||
+void _rb_set_parent(const struct rb_type *, void *, void *);
|
||||
+void _rb_poison(const struct rb_type *, void *, unsigned long);
|
||||
+int _rb_check(const struct rb_type *, void *, unsigned long);
|
||||
+
|
||||
+#define RBT_INITIALIZER(_head) { { NULL } }
|
||||
+
|
||||
+#define RBT_PROTOTYPE(_name, _type, _field, _cmp) \
|
||||
+extern const struct rb_type *const _name##_RBT_TYPE; \
|
||||
+ \
|
||||
+__unused static inline void \
|
||||
+_name##_RBT_INIT(struct _name *head) \
|
||||
+{ \
|
||||
+ _rb_init(&head->rbh_root); \
|
||||
+} \
|
||||
+ \
|
||||
+__unused static inline struct _type * \
|
||||
+_name##_RBT_INSERT(struct _name *head, struct _type *elm) \
|
||||
+{ \
|
||||
+ return _rb_insert(_name##_RBT_TYPE, &head->rbh_root, elm); \
|
||||
+} \
|
||||
+ \
|
||||
+__unused static inline struct _type * \
|
||||
+_name##_RBT_REMOVE(struct _name *head, struct _type *elm) \
|
||||
+{ \
|
||||
+ return _rb_remove(_name##_RBT_TYPE, &head->rbh_root, elm); \
|
||||
+} \
|
||||
+ \
|
||||
+__unused static inline struct _type * \
|
||||
+_name##_RBT_FIND(struct _name *head, const struct _type *key) \
|
||||
+{ \
|
||||
+ return _rb_find(_name##_RBT_TYPE, &head->rbh_root, key); \
|
||||
+} \
|
||||
+ \
|
||||
+__unused static inline struct _type * \
|
||||
+_name##_RBT_NFIND(struct _name *head, const struct _type *key) \
|
||||
+{ \
|
||||
+ return _rb_nfind(_name##_RBT_TYPE, &head->rbh_root, key); \
|
||||
+} \
|
||||
+ \
|
||||
+__unused static inline struct _type * \
|
||||
+_name##_RBT_ROOT(struct _name *head) \
|
||||
+{ \
|
||||
+ return _rb_root(_name##_RBT_TYPE, &head->rbh_root); \
|
||||
+} \
|
||||
+ \
|
||||
+__unused static inline int \
|
||||
+_name##_RBT_EMPTY(struct _name *head) \
|
||||
+{ \
|
||||
+ return _rb_empty(&head->rbh_root); \
|
||||
+} \
|
||||
+ \
|
||||
+__unused static inline struct _type * \
|
||||
+_name##_RBT_MIN(struct _name *head) \
|
||||
+{ \
|
||||
+ return _rb_min(_name##_RBT_TYPE, &head->rbh_root); \
|
||||
+} \
|
||||
+ \
|
||||
+__unused static inline struct _type * \
|
||||
+_name##_RBT_MAX(struct _name *head) \
|
||||
+{ \
|
||||
+ return _rb_max(_name##_RBT_TYPE, &head->rbh_root); \
|
||||
+} \
|
||||
+ \
|
||||
+__unused static inline struct _type * \
|
||||
+_name##_RBT_NEXT(struct _type *elm) \
|
||||
+{ \
|
||||
+ return _rb_next(_name##_RBT_TYPE, elm); \
|
||||
+} \
|
||||
+ \
|
||||
+__unused static inline struct _type * \
|
||||
+_name##_RBT_PREV(struct _type *elm) \
|
||||
+{ \
|
||||
+ return _rb_prev(_name##_RBT_TYPE, elm); \
|
||||
+} \
|
||||
+ \
|
||||
+__unused static inline struct _type * \
|
||||
+_name##_RBT_LEFT(struct _type *elm) \
|
||||
+{ \
|
||||
+ return _rb_left(_name##_RBT_TYPE, elm); \
|
||||
+} \
|
||||
+ \
|
||||
+__unused static inline struct _type * \
|
||||
+_name##_RBT_RIGHT(struct _type *elm) \
|
||||
+{ \
|
||||
+ return _rb_right(_name##_RBT_TYPE, elm); \
|
||||
+} \
|
||||
+ \
|
||||
+__unused static inline struct _type * \
|
||||
+_name##_RBT_PARENT(struct _type *elm) \
|
||||
+{ \
|
||||
+ return _rb_parent(_name##_RBT_TYPE, elm); \
|
||||
+} \
|
||||
+ \
|
||||
+__unused static inline void \
|
||||
+_name##_RBT_SET_LEFT(struct _type *elm, struct _type *left) \
|
||||
+{ \
|
||||
+ return _rb_set_left(_name##_RBT_TYPE, elm, left); \
|
||||
+} \
|
||||
+ \
|
||||
+__unused static inline void \
|
||||
+_name##_RBT_SET_RIGHT(struct _type *elm, struct _type *right) \
|
||||
+{ \
|
||||
+ return _rb_set_right(_name##_RBT_TYPE, elm, right); \
|
||||
+} \
|
||||
+ \
|
||||
+__unused static inline void \
|
||||
+_name##_RBT_SET_PARENT(struct _type *elm, struct _type *parent) \
|
||||
+{ \
|
||||
+ return _rb_set_parent(_name##_RBT_TYPE, elm, parent); \
|
||||
+} \
|
||||
+ \
|
||||
+__unused static inline void \
|
||||
+_name##_RBT_POISON(struct _type *elm, unsigned long poison) \
|
||||
+{ \
|
||||
+ return _rb_poison(_name##_RBT_TYPE, elm, poison); \
|
||||
+} \
|
||||
+ \
|
||||
+__unused static inline int \
|
||||
+_name##_RBT_CHECK(struct _type *elm, unsigned long poison) \
|
||||
+{ \
|
||||
+ return _rb_check(_name##_RBT_TYPE, elm, poison); \
|
||||
+}
|
||||
+
|
||||
+#define RBT_GENERATE_INTERNAL(_name, _type, _field, _cmp, _aug) \
|
||||
+static int \
|
||||
+_name##_RBT_COMPARE(const void *lptr, const void *rptr) \
|
||||
+{ \
|
||||
+ const struct _type *l = lptr, *r = rptr; \
|
||||
+ return _cmp(l, r); \
|
||||
+} \
|
||||
+static const struct rb_type _name##_RBT_INFO = { \
|
||||
+ _name##_RBT_COMPARE, \
|
||||
+ _aug, \
|
||||
+ offsetof(struct _type, _field), \
|
||||
+}; \
|
||||
+const struct rb_type *const _name##_RBT_TYPE = &_name##_RBT_INFO
|
||||
+
|
||||
+#define RBT_GENERATE_AUGMENT(_name, _type, _field, _cmp, _aug) \
|
||||
+static void \
|
||||
+_name##_RBT_AUGMENT(void *ptr) \
|
||||
+{ \
|
||||
+ struct _type *p = ptr; \
|
||||
+ return _aug(p); \
|
||||
+} \
|
||||
+RBT_GENERATE_INTERNAL(_name, _type, _field, _cmp, _name##_RBT_AUGMENT)
|
||||
+
|
||||
+#define RBT_GENERATE(_name, _type, _field, _cmp) \
|
||||
+ RBT_GENERATE_INTERNAL(_name, _type, _field, _cmp, NULL)
|
||||
+
|
||||
+#define RBT_INIT(_name, _head) _name##_RBT_INIT(_head)
|
||||
+#define RBT_INSERT(_name, _head, _elm) _name##_RBT_INSERT(_head, _elm)
|
||||
+#define RBT_REMOVE(_name, _head, _elm) _name##_RBT_REMOVE(_head, _elm)
|
||||
+#define RBT_FIND(_name, _head, _key) _name##_RBT_FIND(_head, _key)
|
||||
+#define RBT_NFIND(_name, _head, _key) _name##_RBT_NFIND(_head, _key)
|
||||
+#define RBT_ROOT(_name, _head) _name##_RBT_ROOT(_head)
|
||||
+#define RBT_EMPTY(_name, _head) _name##_RBT_EMPTY(_head)
|
||||
+#define RBT_MIN(_name, _head) _name##_RBT_MIN(_head)
|
||||
+#define RBT_MAX(_name, _head) _name##_RBT_MAX(_head)
|
||||
+#define RBT_NEXT(_name, _elm) _name##_RBT_NEXT(_elm)
|
||||
+#define RBT_PREV(_name, _elm) _name##_RBT_PREV(_elm)
|
||||
+#define RBT_LEFT(_name, _elm) _name##_RBT_LEFT(_elm)
|
||||
+#define RBT_RIGHT(_name, _elm) _name##_RBT_RIGHT(_elm)
|
||||
+#define RBT_PARENT(_name, _elm) _name##_RBT_PARENT(_elm)
|
||||
+#define RBT_SET_LEFT(_name, _elm, _l) _name##_RBT_SET_LEFT(_elm, _l)
|
||||
+#define RBT_SET_RIGHT(_name, _elm, _r) _name##_RBT_SET_RIGHT(_elm, _r)
|
||||
+#define RBT_SET_PARENT(_name, _elm, _p) _name##_RBT_SET_PARENT(_elm, _p)
|
||||
+#define RBT_POISON(_name, _elm, _p) _name##_RBT_POISON(_elm, _p)
|
||||
+#define RBT_CHECK(_name, _elm, _p) _name##_RBT_CHECK(_elm, _p)
|
||||
+
|
||||
+#define RBT_FOREACH(_e, _name, _head) \
|
||||
+ for ((_e) = RBT_MIN(_name, (_head)); \
|
||||
+ (_e) != NULL; \
|
||||
+ (_e) = RBT_NEXT(_name, (_e)))
|
||||
+
|
||||
+#define RBT_FOREACH_SAFE(_e, _name, _head, _n) \
|
||||
+ for ((_e) = RBT_MIN(_name, (_head)); \
|
||||
+ (_e) != NULL && ((_n) = RBT_NEXT(_name, (_e)), 1); \
|
||||
+ (_e) = (_n))
|
||||
+
|
||||
+#define RBT_FOREACH_REVERSE(_e, _name, _head) \
|
||||
+ for ((_e) = RBT_MAX(_name, (_head)); \
|
||||
+ (_e) != NULL; \
|
||||
+ (_e) = RBT_PREV(_name, (_e)))
|
||||
+
|
||||
+#define RBT_FOREACH_REVERSE_SAFE(_e, _name, _head, _n) \
|
||||
+ for ((_e) = RBT_MAX(_name, (_head)); \
|
||||
+ (_e) != NULL && ((_n) = RBT_PREV(_name, (_e)), 1); \
|
||||
+ (_e) = (_n))
|
||||
+
|
||||
+#endif /* _SYS_TREE_H_ */
|
Loading…
Reference in New Issue
Block a user