]> git.proxmox.com Git - mirror_frr.git/blobdiff - lib/openbsd-tree.h
Merge pull request #12798 from donaldsharp/rib_match_multicast
[mirror_frr.git] / lib / openbsd-tree.h
index aa80c1134ae482a8351981c653a1fb2e663f66ad..4f3985bbca04c4449a578e25671788091df82228 100644 (file)
@@ -1,32 +1,16 @@
+// SPDX-License-Identifier: ISC AND BSD-2-Clause
 /*     $OpenBSD: tree.h,v 1.14 2015/05/25 03:07:49 deraadt Exp $       */
 /*
  * 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_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
  * This file defines data structures for different types of trees:
  * splay trees and red-black trees.
        for ((x) = SPLAY_MIN(name, head); (x) != NULL;                         \
             (x) = SPLAY_NEXT(name, head, x))
 
-/* 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)
+/*
+ * Copyright (c) 2016 David Gwynne <dlg@openbsd.org>
+ */
 
 #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)
+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 rbt_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 RB_HEAD(_name, _type)                                                  \
+       struct _name {                                                         \
+               struct rbt_tree rbh_root;                                      \
+       }
 
-/* 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)  \
+#define RB_ENTRY(_type)        struct rb_entry
+
+static inline void _rb_init(struct rbt_tree *rbt)
+{
+       rbt->rbt_root = NULL;
+}
+
+static inline int _rb_empty(const struct rbt_tree *rbt)
+{
+       return (rbt->rbt_root == NULL);
+}
+
+void *_rb_insert(const struct rb_type *, struct rbt_tree *, void *);
+void *_rb_remove(const struct rb_type *, struct rbt_tree *, void *);
+void *_rb_find(const struct rb_type *, const struct rbt_tree *, const void *);
+void *_rb_nfind(const struct rb_type *, const struct rbt_tree *, const void *);
+void *_rb_root(const struct rb_type *, const struct rbt_tree *);
+void *_rb_min(const struct rb_type *, const struct rbt_tree *);
+void *_rb_max(const struct rb_type *, const struct rbt_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 RB_INITIALIZER(_head)  { { NULL } }
+
+#define RB_PROTOTYPE(_name, _type, _field, _cmp)                               \
+       extern const struct rb_type *const _name##_RB_TYPE;                    \
+                                                                               \
+       __attribute__((__unused__)) static inline void _name##_RB_INIT(        \
+               struct _name *head)                                            \
        {                                                                      \
-               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;                    \
+               _rb_init(&head->rbh_root);                                     \
        }                                                                      \
                                                                                \
-       attr void name##_RB_REMOVE_COLOR(                                      \
-               struct name *head, struct type *parent, struct type *elm)      \
+       __attribute__((__unused__)) static inline struct _type                 \
+               *_name##_RB_INSERT(struct _name *head, 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;                       \
+               return (struct _type *)_rb_insert(_name##_RB_TYPE,             \
+                                                 &head->rbh_root, elm);       \
        }                                                                      \
                                                                                \
-       attr struct type *name##_RB_REMOVE(struct name *head,                  \
-                                          struct type *elm)                   \
+       __attribute__((__unused__)) static inline 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);                                                  \
+               return (struct _type *)_rb_remove(_name##_RB_TYPE,             \
+                                                 &head->rbh_root, elm);       \
        }                                                                      \
                                                                                \
-       /* Inserts a node into the RB tree */                                  \
-       attr struct type *name##_RB_INSERT(struct name *head,                  \
-                                          struct type *elm)                   \
+       __attribute__((__unused__)) static inline struct _type                 \
+               *_name##_RB_FIND(const struct _name *head,                     \
+                                const struct _type *key)                      \
        {                                                                      \
-               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);                                                 \
+               return (struct _type *)_rb_find(_name##_RB_TYPE,               \
+                                               &head->rbh_root, key);         \
        }                                                                      \
                                                                                \
-       /* Finds the node with the same key as elm */                          \
-       attr struct type *name##_RB_FIND(struct name *head, struct type *elm)  \
+       __attribute__((__unused__)) static inline struct _type                 \
+               *_name##_RB_NFIND(const struct _name *head,                    \
+                                 const struct _type *key)                     \
        {                                                                      \
-               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);                                                 \
+               return (struct _type *)_rb_nfind(_name##_RB_TYPE,              \
+                                                &head->rbh_root, key);        \
        }                                                                      \
                                                                                \
-       /* Finds the first node greater than or equal to the search key */     \
-       attr struct type *name##_RB_NFIND(struct name *head, struct type *elm) \
+       __attribute__((__unused__)) static inline struct _type                 \
+               *_name##_RB_ROOT(const struct _name *head)                     \
        {                                                                      \
-               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);                                                  \
+               return (struct _type *)_rb_root(_name##_RB_TYPE,               \
+                                               &head->rbh_root);              \
        }                                                                      \
                                                                                \
-       /* ARGSUSED */                                                         \
-       attr struct type *name##_RB_NEXT(struct type *elm)                     \
+       __attribute__((__unused__)) static inline int _name##_RB_EMPTY(        \
+               const struct _name *head)                                      \
        {                                                                      \
-               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);                                                  \
+               return _rb_empty(&head->rbh_root);                             \
        }                                                                      \
                                                                                \
-       /* ARGSUSED */                                                         \
-       attr struct type *name##_RB_PREV(struct type *elm)                     \
+       __attribute__((__unused__)) static inline struct _type                 \
+               *_name##_RB_MIN(const struct _name *head)                      \
        {                                                                      \
-               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);                                                  \
+               return (struct _type *)_rb_min(_name##_RB_TYPE,                \
+                                              &head->rbh_root);               \
        }                                                                      \
                                                                                \
-       attr struct type *name##_RB_MINMAX(struct name *head, int val)         \
+       __attribute__((__unused__)) static inline struct _type                 \
+               *_name##_RB_MAX(const struct _name *head)                      \
        {                                                                      \
-               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);                                               \
+               return (struct _type *)_rb_max(_name##_RB_TYPE,                \
+                                              &head->rbh_root);               \
+       }                                                                      \
+                                                                               \
+       __attribute__((__unused__)) static inline struct _type                 \
+               *_name##_RB_NEXT(struct _type *elm)                            \
+       {                                                                      \
+               return (struct _type *)_rb_next(_name##_RB_TYPE, elm);         \
+       }                                                                      \
+                                                                               \
+       __attribute__((__unused__)) static inline struct _type                 \
+               *_name##_RB_PREV(struct _type *elm)                            \
+       {                                                                      \
+               return (struct _type *)_rb_prev(_name##_RB_TYPE, elm);         \
+       }                                                                      \
+                                                                               \
+       __attribute__((__unused__)) static inline struct _type                 \
+               *_name##_RB_LEFT(struct _type *elm)                            \
+       {                                                                      \
+               return (struct _type *)_rb_left(_name##_RB_TYPE, elm);         \
+       }                                                                      \
+                                                                               \
+       __attribute__((__unused__)) static inline struct _type                 \
+               *_name##_RB_RIGHT(struct _type *elm)                           \
+       {                                                                      \
+               return (struct _type *)_rb_right(_name##_RB_TYPE, elm);        \
+       }                                                                      \
+                                                                               \
+       __attribute__((__unused__)) static inline struct _type                 \
+               *_name##_RB_PARENT(struct _type *elm)                          \
+       {                                                                      \
+               return (struct _type *)_rb_parent(_name##_RB_TYPE, elm);       \
+       }                                                                      \
+                                                                               \
+       __attribute__((__unused__)) static inline void _name##_RB_SET_LEFT(    \
+               struct _type *elm, struct _type *left)                         \
+       {                                                                      \
+               _rb_set_left(_name##_RB_TYPE, elm, left);                      \
+       }                                                                      \
+                                                                               \
+       __attribute__((__unused__)) static inline void _name##_RB_SET_RIGHT(   \
+               struct _type *elm, struct _type *right)                        \
+       {                                                                      \
+               _rb_set_right(_name##_RB_TYPE, elm, right);                    \
+       }                                                                      \
+                                                                               \
+       __attribute__((__unused__)) static inline void _name##_RB_SET_PARENT(  \
+               struct _type *elm, struct _type *parent)                       \
+       {                                                                      \
+               _rb_set_parent(_name##_RB_TYPE, elm, parent);                  \
+       }                                                                      \
+                                                                               \
+       __attribute__((__unused__)) static inline void _name##_RB_POISON(      \
+               struct _type *elm, unsigned long poison)                       \
+       {                                                                      \
+               _rb_poison(_name##_RB_TYPE, elm, poison);                      \
+       }                                                                      \
+                                                                               \
+       __attribute__((__unused__)) static inline int _name##_RB_CHECK(        \
+               struct _type *elm, unsigned long poison)                       \
+       {                                                                      \
+               return _rb_check(_name##_RB_TYPE, elm, poison);                \
        }
 
-#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_GENERATE_INTERNAL(_name, _type, _field, _cmp, _aug)                 \
+       static int _name##_RB_COMPARE(const void *lptr, const void *rptr)      \
+       {                                                                      \
+               const struct _type *l = lptr, *r = rptr;                       \
+               return _cmp(l, r);                                             \
+       }                                                                      \
+       static const struct rb_type _name##_RB_INFO = {                        \
+               _name##_RB_COMPARE, _aug, offsetof(struct _type, _field),      \
+       };                                                                     \
+       const struct rb_type *const _name##_RB_TYPE = &_name##_RB_INFO;
 
-#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))
+#define RB_GENERATE_AUGMENT(_name, _type, _field, _cmp, _aug)                  \
+       static void _name##_RB_AUGMENT(void *ptr)                              \
+       {                                                                      \
+               struct _type *p = ptr;                                         \
+               return _aug(p);                                                \
+       }                                                                      \
+       RB_GENERATE_INTERNAL(_name, _type, _field, _cmp, _name##_RB_AUGMENT)
+
+#define RB_GENERATE(_name, _type, _field, _cmp)                                \
+       RB_GENERATE_INTERNAL(_name, _type, _field, _cmp, NULL)
+
+#define RB_INIT(_name, _head)          _name##_RB_INIT(_head)
+#define RB_INSERT(_name, _head, _elm)  _name##_RB_INSERT(_head, _elm)
+#define RB_REMOVE(_name, _head, _elm)  _name##_RB_REMOVE(_head, _elm)
+#define RB_FIND(_name, _head, _key)    _name##_RB_FIND(_head, _key)
+#define RB_NFIND(_name, _head, _key)   _name##_RB_NFIND(_head, _key)
+#define RB_ROOT(_name, _head)          _name##_RB_ROOT(_head)
+#define RB_EMPTY(_name, _head)         _name##_RB_EMPTY(_head)
+#define RB_MIN(_name, _head)           _name##_RB_MIN(_head)
+#define RB_MAX(_name, _head)           _name##_RB_MAX(_head)
+#define RB_NEXT(_name, _elm)           _name##_RB_NEXT(_elm)
+#define RB_PREV(_name, _elm)           _name##_RB_PREV(_elm)
+#define RB_LEFT(_name, _elm)           _name##_RB_LEFT(_elm)
+#define RB_RIGHT(_name, _elm)          _name##_RB_RIGHT(_elm)
+#define RB_PARENT(_name, _elm)         _name##_RB_PARENT(_elm)
+#define RB_SET_LEFT(_name, _elm, _l)   _name##_RB_SET_LEFT(_elm, _l)
+#define RB_SET_RIGHT(_name, _elm, _r)  _name##_RB_SET_RIGHT(_elm, _r)
+#define RB_SET_PARENT(_name, _elm, _p) _name##_RB_SET_PARENT(_elm, _p)
+#define RB_POISON(_name, _elm, _p)     _name##_RB_POISON(_elm, _p)
+#define RB_CHECK(_name, _elm, _p)      _name##_RB_CHECK(_elm, _p)
+
+#define RB_FOREACH(_e, _name, _head)                                           \
+       for ((_e) = RB_MIN(_name, (_head)); (_e) != NULL;                      \
+            (_e) = RB_NEXT(_name, (_e)))
+
+#define RB_FOREACH_SAFE(_e, _name, _head, _n)                                  \
+       for ((_e) = RB_MIN(_name, (_head));                                    \
+            (_e) != NULL && ((_n) = RB_NEXT(_name, (_e)), 1); (_e) = (_n))
+
+#define RB_FOREACH_REVERSE(_e, _name, _head)                                   \
+       for ((_e) = RB_MAX(_name, (_head)); (_e) != NULL;                      \
+            (_e) = RB_PREV(_name, (_e)))
+
+#define RB_FOREACH_REVERSE_SAFE(_e, _name, _head, _n)                          \
+       for ((_e) = RB_MAX(_name, (_head));                                    \
+            (_e) != NULL && ((_n) = RB_PREV(_name, (_e)), 1); (_e) = (_n))
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* _SYS_TREE_H_ */