]> xenbits.xensource.com Git - xen.git/commit
rbtree: low level optimizations in rb_erase()
authorMichel Lespinasse <walken@google.com>
Wed, 3 Jan 2018 11:42:07 +0000 (12:42 +0100)
committerJan Beulich <jbeulich@suse.com>
Wed, 3 Jan 2018 11:42:07 +0000 (12:42 +0100)
commit5c3b0ccff9c2b8cb36befc003d3c46caca046e6f
tree92b72b6ea322497861a58a3f63dd3898d367c760
parent4da1856bc03c7c5d6c0a4a9e8815d6373dc0a0de
rbtree: low level optimizations in rb_erase()

Various minor optimizations in rb_erase():
- Avoid multiple loading of node->__rb_parent_color when computing parent
  and color information (possibly not in close sequence, as there might
  be further branches in the algorithm)
- In the 1-child subcase of case 1, copy the __rb_parent_color field from
  the erased node to the child instead of recomputing it from the desired
  parent and color
- When searching for the erased node's successor, differentiate between
  cases 2 and 3 based on whether any left links were followed. This avoids
  a condition later down.
- In case 3, keep a pointer to the erased node's right child so we don't
  have to refetch it later to adjust its parent.
- In the no-childs subcase of cases 2 and 3, place the rebalance assigment
  last so that the compiler can remove the following if(rebalance) test.

Also, added some comments to illustrate cases 2 and 3.

Signed-off-by: Michel Lespinasse <walken@google.com>
Acked-by: Rik van Riel <riel@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
[Linux commit 4f035ad67f4633c233cb3642711d49b4efc9c82d]

Ported to Xen.

Signed-off-by: Praveen Kumar <kpraveen.lkml@gmail.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
xen/common/rbtree.c