lkml.org 
[lkml]   [2012]   [Jul]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 06/13] rbtree: break out of rb_insert_color loop after tree rotation
    Date
    It is a well known property of rbtrees that insertion never requires
    more than two tree rotations. In our implementation, after one loop
    iteration identified one or two necessary tree rotations, we would iterate
    and look for more. However at that point the node's parent would always
    be black, which would cause us to exit the loop.

    We can make the code flow more obvious by just adding a break statement
    after the tree rotations, where we know we are done. Additionally, in the
    cases where two tree rotations are necessary, we don't have to update the
    'node' pointer as it wouldn't be used until the next loop iteration, which
    we now avoid due to this break statement.

    Signed-off-by: Michel Lespinasse <walken@google.com>
    ---
    lib/rbtree.c | 14 ++++----------
    1 files changed, 4 insertions(+), 10 deletions(-)

    diff --git a/lib/rbtree.c b/lib/rbtree.c
    index d0ec339..19bee6c 100644
    --- a/lib/rbtree.c
    +++ b/lib/rbtree.c
    @@ -109,18 +109,15 @@ void rb_insert_color(struct rb_node *node, struct rb_root *root)
    }
    }

    - if (parent->rb_right == node)
    - {
    - register struct rb_node *tmp;
    + if (parent->rb_right == node) {
    __rb_rotate_left(parent, root);
    - tmp = parent;
    parent = node;
    - node = tmp;
    }

    rb_set_black(parent);
    rb_set_red(gparent);
    __rb_rotate_right(gparent, root);
    + break;
    } else {
    {
    register struct rb_node *uncle = gparent->rb_left;
    @@ -134,18 +131,15 @@ void rb_insert_color(struct rb_node *node, struct rb_root *root)
    }
    }

    - if (parent->rb_left == node)
    - {
    - register struct rb_node *tmp;
    + if (parent->rb_left == node) {
    __rb_rotate_right(parent, root);
    - tmp = parent;
    parent = node;
    - node = tmp;
    }

    rb_set_black(parent);
    rb_set_red(gparent);
    __rb_rotate_left(gparent, root);
    + break;
    }
    }

    --
    1.7.7.3


    \
     
     \ /
      Last update: 2012-07-10 02:01    [W:0.024 / U:180.520 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site