rbtree: adjust node color in __rb_erase_color() only when necessary

In __rb_erase_color(), we were always setting a node to black after
exiting the main loop.  And in one case, after fixing up the tree to
satisfy all rbtree invariants, we were setting the current node to root
just to guarantee a loop exit, at which point the root would be set to
black.  However this is not necessary, as the root of an rbtree is already
known to be black.  The only case where the color flip is required is when
we exit the loop due to the current node being red, and it's easiest to
just do the flip at that point instead of doing it after the loop.

[adrian.hunter@intel.com: perf tools: fix build for another rbtree.c change]
Signed-off-by: Michel Lespinasse <walken@google.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Acked-by: David Woodhouse <David.Woodhouse@intel.com>
Cc: Rik van Riel <riel@redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Daniel Santos <daniel.santos@pobox.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/lib/rbtree.c b/lib/rbtree.c
index 41cf19b2fe51e6f59044ac43e5e04748e1e2642a..baf7c835c57c90515e97151dd8c30ed0142f07c9 100644 (file)
--- a/lib/rbtree.c
+++ b/lib/rbtree.c
@@ -259,10 +259,22 @@ static void __rb_erase_color(struct rb_node *node, struct rb_node *parent,
 {
        struct rb_node *other;
 
-       while ((!node || rb_is_black(node)) && node != root->rb_node)
-       {
-               if (parent->rb_left == node)
-               {
+       while (true) {
+               /*
+                * Loop invariant: all leaf paths going through node have a
+                * black node count that is 1 lower than other leaf paths.
+                *
+                * If node is red, we can flip it to black to adjust.
+                * If node is the root, all leaf paths go through it.
+                * Otherwise, we need to adjust the tree through color flips
+                * and tree rotations as per one of the 4 cases below.
+                */
+               if (node && rb_is_red(node)) {
+                       rb_set_black(node);
+                       break;
+               } else if (!parent) {
+                       break;
+               } else if (parent->rb_left == node) {
                        other = parent->rb_right;
                        if (rb_is_red(other))
                        {
@@ -291,12 +303,9 @@ static void __rb_erase_color(struct rb_node *node, struct rb_node *parent,
                                rb_set_black(parent);
                                rb_set_black(other->rb_right);
                                __rb_rotate_left(parent, root);
-                               node = root->rb_node;
                                break;
                        }
-               }
-               else
-               {
+               } else {
                        other = parent->rb_left;
                        if (rb_is_red(other))
                        {
@@ -325,13 +334,10 @@ static void __rb_erase_color(struct rb_node *node, struct rb_node *parent,
                                rb_set_black(parent);
                                rb_set_black(other->rb_left);
                                __rb_rotate_right(parent, root);
-                               node = root->rb_node;
                                break;
                        }
                }
        }
-       if (node)
-               rb_set_black(node);
 }
 
 void rb_erase(struct rb_node *node, struct rb_root *root)

diff --git a/tools/perf/util/include/linux/rbtree.h b/tools/perf/util/include/linux/rbtree.h
index 2a030c5af3aa2062082d87b1604b9980a1006844..9bcdc844b330b2c4f9af7435b054caa7d759dcf0 100644 (file)
--- a/tools/perf/util/include/linux/rbtree.h
+++ b/tools/perf/util/include/linux/rbtree.h
@@ -1,2 +1,3 @@
 #include <stdbool.h>
+#include <stdbool.h>
 #include "../../../../include/linux/rbtree.h"