vserver 1.9.5.x5

[linux-2.6.git] / include / linux / prio_tree.h

diff --git a/include/linux/prio_tree.h b/include/linux/prio_tree.h
index 6356a51..db04abb 100644 (file)
--- a/include/linux/prio_tree.h
+++ b/include/linux/prio_tree.h
@@ -1,15 +1,38 @@
 #ifndef _LINUX_PRIO_TREE_H
 #define _LINUX_PRIO_TREE_H
 
+/*
+ * K&R 2nd ed. A8.3 somewhat obliquely hints that initial sequences of struct
+ * fields with identical types should end up at the same location. We'll use
+ * this until we can scrap struct raw_prio_tree_node.
+ *
+ * Note: all this could be done more elegantly by using unnamed union/struct
+ * fields. However, gcc 2.95.3 and apparently also gcc 3.0.4 don't support this
+ * language extension.
+ */
+
+struct raw_prio_tree_node {
+       struct prio_tree_node   *left;
+       struct prio_tree_node   *right;
+       struct prio_tree_node   *parent;
+};
+
 struct prio_tree_node {
        struct prio_tree_node   *left;
        struct prio_tree_node   *right;
        struct prio_tree_node   *parent;
+       unsigned long           start;
+       unsigned long           last;   /* last location _in_ interval */
 };
 
 struct prio_tree_root {
        struct prio_tree_node   *prio_tree_node;
-       unsigned int            index_bits;
+       unsigned short          index_bits;
+       unsigned short          raw;
+               /*
+                * 0: nodes are of type struct prio_tree_node
+                * 1: nodes are of type raw_prio_tree_node
+                */
 };
 
 struct prio_tree_iter {
@@ -29,14 +52,19 @@ static inline void prio_tree_iter_init(struct prio_tree_iter *iter,
        iter->root = root;
        iter->r_index = r_index;
        iter->h_index = h_index;
+       iter->cur = NULL;
 }
 
-#define INIT_PRIO_TREE_ROOT(ptr)       \
+#define __INIT_PRIO_TREE_ROOT(ptr, _raw)       \
 do {                                   \
        (ptr)->prio_tree_node = NULL;   \
        (ptr)->index_bits = 1;          \
+       (ptr)->raw = (_raw);            \
 } while (0)
 
+#define INIT_PRIO_TREE_ROOT(ptr)       __INIT_PRIO_TREE_ROOT(ptr, 0)
+#define INIT_RAW_PRIO_TREE_ROOT(ptr)   __INIT_PRIO_TREE_ROOT(ptr, 1)
+
 #define INIT_PRIO_TREE_NODE(ptr)                               \
 do {                                                           \
        (ptr)->left = (ptr)->right = (ptr)->parent = (ptr);     \
@@ -73,4 +101,20 @@ static inline int prio_tree_right_empty(const struct prio_tree_node *node)
        return node->right == node;
 }
 
+
+struct prio_tree_node *prio_tree_replace(struct prio_tree_root *root,
+                struct prio_tree_node *old, struct prio_tree_node *node);
+struct prio_tree_node *prio_tree_insert(struct prio_tree_root *root,
+                struct prio_tree_node *node);
+void prio_tree_remove(struct prio_tree_root *root, struct prio_tree_node *node);
+struct prio_tree_node *prio_tree_next(struct prio_tree_iter *iter);
+
+#define raw_prio_tree_replace(root, old, node) \
+       prio_tree_replace(root, (struct prio_tree_node *) (old), \
+           (struct prio_tree_node *) (node))
+#define raw_prio_tree_insert(root, node) \
+       prio_tree_insert(root, (struct prio_tree_node *) (node))
+#define raw_prio_tree_remove(root, node) \
+       prio_tree_remove(root, (struct prio_tree_node *) (node))
+
 #endif /* _LINUX_PRIO_TREE_H */