tools lib rbtree: pick some improvements from the kernel rbtree code

acmel · akpm00 · commit bbed8b9ffed1 · 2024-05-08T08:41:27.000-07:00
The tools/lib/rbtree.c code came from the kernel. Remove 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. Until then pick the improvements from: b0687c1 ("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. Link: https://lkml.kernel.org/r/ZigZzeFoukzRKG1Q@x1 Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Ian Rogers <irogers@google.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Kan Liang <kan.liang@linux.intel.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Noah Goldstein <goldstein.w.n@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
diff --git a/tools/include/linux/rbtree_augmented.h b/tools/include/linux/rbtree_augmented.h
@@ -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
diff --git a/tools/lib/rbtree.c b/tools/lib/rbtree.c
@@ -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)

Original file line number	Diff line number	Diff line change
`@@ -158,13 +158,13 @@ RB_DECLARE_CALLBACKS(RBSTATIC, RBNAME, \`
`158`	`158`
`159`	`159`	`static inline void rb_set_parent(struct rb_node rb, struct rb_node p)`
`160`	`160`	`{`
`161`		`- rb->__rb_parent_color = rb_color(rb) \| (unsigned long)p;`
	`161`	`+ rb->__rb_parent_color = rb_color(rb) + (unsigned long)p;`
`162`	`162`	`}`
`163`	`163`
`164`	`164`	`static inline void rb_set_parent_color(struct rb_node *rb,`
`165`	`165`	`struct rb_node *p, int color)`
`166`	`166`	`{`
`167`		`- rb->__rb_parent_color = (unsigned long)p \| color;`
	`167`	`+ rb->__rb_parent_color = (unsigned long)p + color;`
`168`	`168`	`}`
`169`	`169`
`170`	`170`	`static inline void`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@`
`58`	`58`
`59`	`59`	`static inline void rb_set_black(struct rb_node *rb)`
`60`	`60`	`{`
`61`		`- rb->__rb_parent_color \|= RB_BLACK;`
	`61`	`+ rb->__rb_parent_color += RB_BLACK;`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`static inline struct rb_node rb_red_parent(struct rb_node red)`