Changeset 64939bc in rtems for cpukit/sapi/include/rtems/rbtree.h

Timestamp:

Jul 12, 2014, 7:22:22 PM (5 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

4.11, master

Children:

ed7a028

Parents:

7e119990

git-author:

Sebastian Huber <sebastian.huber@…> (07/12/14 19:22:22)

git-committer:

Joel Sherrill <joel.sherrill@…> (07/15/14 15:03:48)

Message:

rbtree: Reduce RBTree_Control size

Remove compare function and is unique indicator from the control
structure. Rename RBTree_Compare_function to RBTree_Compare. Rename
rtems_rbtree_compare_function to rtems_rbtree_compare. Provide C++
compatible initializers. Add compare function and is unique indicator
to _RBTree_Find(), _RBTree_Insert(), rtems_rbtree_find() and
rtems_rbtree_insert(). Remove _RBTree_Is_unique() and
rtems_rbtree_is_unique(). Remove compare function and is unique
indicator from _RBTree_Initialize_empty() and
rtems_rbtree_initialize_empty().

File:

• cpukit/sapi/include/rtems/rbtree.h (modified) (5 diffs)

cpukit/sapi/include/rtems/rbtree.h

@@ -56 +56 @@
 
 /**
- * @typedef rtems_rbtree_compare_function
- *
  * This type defines function pointers for user-provided comparison
  * function. The function compares two nodes in order to determine
  * the order in a red-black tree.
  */
-typedef RBTree_Compare_function rtems_rbtree_compare_function;
+typedef RBTree_Compare rtems_rbtree_compare;
 
 /**
@@ -94 +92 @@
  */
 RTEMS_INLINE_ROUTINE void rtems_rbtree_initialize(
-  rtems_rbtree_control          *the_rbtree,
-  rtems_rbtree_compare_function  compare_function,
-  void                          *starting_address,
-  size_t                         number_nodes,
-  size_t                         node_size,
-  bool                           is_unique
-)
-{
-  _RBTree_Initialize( the_rbtree, compare_function, starting_address,
+  rtems_rbtree_control *the_rbtree,
+  rtems_rbtree_compare  compare,
+  void                 *starting_address,
+  size_t                number_nodes,
+  size_t                node_size,
+  bool                  is_unique
+)
+{
+  _RBTree_Initialize( the_rbtree, compare, starting_address,
     number_nodes, node_size, is_unique);
 }
@@ -112 +110 @@
  */
 RTEMS_INLINE_ROUTINE void rtems_rbtree_initialize_empty(
-  rtems_rbtree_control          *the_rbtree,
-  rtems_rbtree_compare_function  compare_function,
-  bool                           is_unique
-)
-{
-  _RBTree_Initialize_empty( the_rbtree, compare_function, is_unique );
+  rtems_rbtree_control *the_rbtree
+)
+{
+  _RBTree_Initialize_empty( the_rbtree );
 }
 
@@ -278 +274 @@
 RTEMS_INLINE_ROUTINE rtems_rbtree_node* rtems_rbtree_find(
   const rtems_rbtree_control *the_rbtree,
-  const rtems_rbtree_node *the_node
-)
-{
-  return _RBTree_Find( the_rbtree, the_node );
+  const rtems_rbtree_node    *the_node,
+  rtems_rbtree_compare        compare,
+  bool                        is_unique
+)
+{
+  return _RBTree_Find( the_rbtree, the_node, compare, is_unique );
 }
 
@@ -386 +384 @@
 RTEMS_INLINE_ROUTINE rtems_rbtree_node *rtems_rbtree_insert(
   rtems_rbtree_control *the_rbtree,
-  rtems_rbtree_node *the_node
-)
-{
-  return _RBTree_Insert( the_rbtree, the_node );
-}
-
-/** 
- * @brief Determines whether the tree is unique.
- */
-RTEMS_INLINE_ROUTINE bool rtems_rbtree_is_unique(
-  const rtems_rbtree_control *the_rbtree
-)
-{
-  return _RBTree_Is_unique(the_rbtree);
+  rtems_rbtree_node    *the_node,
+  rtems_rbtree_compare  compare,
+  bool                  is_unique
+)
+{
+  return _RBTree_Insert( the_rbtree, the_node, compare, is_unique );
 }