tools lib rbtree: Pick some improvements from the kernel rbtree code
PATCH 1/1 tools lib rbtree: Pick some improvements from the kernel rbtree code
The tools/lib/rbtree.c code came from the kernel, removing the EXPORT_SYMBOL() that make sense only there, unfortunately it is not being checked with tools/perf/check_headers.sh, will try to remedy this, till then pick the improvements from:
b0687c1119b4e8c8 ("lib/rbtree: use '+' instead of '|' for setting color.")
That I noticed by doing:
diff -u tools/lib/rbtree.c lib/rbtree.c
diff -u tools/include/linux/rbtree_augmented.h include/linux/rbtree_augmented.h
There is one other cases, but lets pick it in separate patches.
Cc Adrian Hunter <[email protected]>
Cc Ian Rogers <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Kan Liang <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Andrew Morton <[email protected]>
Cc Noah Goldstein <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/include/linux/rbtree_augmented.h | 4 ++-- tools/lib/rbtree.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
tools/include/linux/rbtree_augmented.h +2 -2
@@ -158,13 +158,13 @@ RB_DECLARE_CALLBACKS(RBSTATIC, RBNAME, \static inline void rb_set_parent (struct rb_node *rb,struct rb_node *p) { - rb->__rb_parent_color =rb_color (rb) | (unsigned long )p; + rb->__rb_parent_color =rb_color (rb) + (unsigned long )p; }static inline void rb_set_parent_color (struct rb_node *rb,struct rb_node *p,int color) { - rb->__rb_parent_color = (unsigned long )p | color; + rb->__rb_parent_color = (unsigned long )p + color; } static inline void
tools/lib/rbtree.c +1 -1
@@ -58,7 +58,7 @@static inline void rb_set_black (struct rb_node *rb) { - rb->__rb_parent_color |=RB_BLACK ; + rb->__rb_parent_color +=RB_BLACK ; }static inline struct rb_node *rb_red_parent (struct rb_node *red)
Signature · 1 line
2.44.0