Changeset 69a6802b in rtems

Timestamp:

06/17/16 05:50:01 (7 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

5, master

Children:

9bfad8c

Parents:

768c483b

git-author:

Sebastian Huber <sebastian.huber@…> (06/17/16 05:50:01)

git-committer:

Sebastian Huber <sebastian.huber@…> (06/22/16 12:37:11)

Message:

score: Move _RBTree_Find()

The _RBTree_Find() is no longer used in the score. Move it to sapi and
make it rtems_rbtree_find(). Move corresponding types and support
functions to sapi.

Location:

cpukit

Files:

• sapi/Makefile.am (modified) (1 diff)
• sapi/include/rtems/rbtree.h (modified) (3 diffs)
• sapi/src/rbtreefind.c (added)
• sapi/src/rbtreeinsert.c (modified) (3 diffs)
• score/Makefile.am (modified) (1 diff)
• score/include/rtems/score/rbtree.h (modified) (2 diffs)
• score/include/rtems/score/rbtreeimpl.h (modified) (1 diff)
• score/src/rbtreefind.c (deleted)

cpukit/sapi/Makefile.am

@@ -41 +41 @@
 libsapi_a_SOURCES += src/delaynano.c
 libsapi_a_SOURCES += src/rbtree.c
+libsapi_a_SOURCES += src/rbtreefind.c
 libsapi_a_SOURCES += src/rbtreeinsert.c
 libsapi_a_SOURCES += src/profilingiterate.c

cpukit/sapi/include/rtems/rbtree.h

@@ -56 +56 @@
 
 /**
- * @copydoc RBTree_Compare_result
- */
-typedef RBTree_Compare_result rtems_rbtree_compare_result;
-
-/**
- * @copydoc RBTree_Compare
- */
-typedef RBTree_Compare rtems_rbtree_compare;
+ * @brief Integer type for compare results.
+ *
+ * The type is large enough to represent pointers and 32-bit signed integers.
+ *
+ * @see rtems_rbtree_compare.
+ */
+typedef long rtems_rbtree_compare_result;
+
+/**
+ * @brief Compares two red-black tree nodes.
+ *
+ * @param[in] first The first node.
+ * @param[in] second The second node.
+ *
+ * @retval positive The key value of the first node is greater than the one of
+ *   the second node.
+ * @retval 0 The key value of the first node is equal to the one of the second
+ *   node.
+ * @retval negative The key value of the first node is less than the one of the
+ *   second node.
+ */
+typedef rtems_rbtree_compare_result ( *rtems_rbtree_compare )(
+  const RBTree_Node *first,
+  const RBTree_Node *second
+);
 
 /**
@@ -256 +273 @@
 }
 
-/**
- * @copydoc _RBTree_Find()
- */
-RTEMS_INLINE_ROUTINE rtems_rbtree_node* rtems_rbtree_find(
+RTEMS_INLINE_ROUTINE bool rtems_rbtree_is_equal(
+  rtems_rbtree_compare_result compare_result
+)
+{
+  return compare_result == 0;
+}
+
+RTEMS_INLINE_ROUTINE bool rtems_rbtree_is_greater(
+  rtems_rbtree_compare_result compare_result
+)
+{
+  return compare_result > 0;
+}
+
+RTEMS_INLINE_ROUTINE bool rtems_rbtree_is_lesser(
+  rtems_rbtree_compare_result compare_result
+)
+{
+  return compare_result < 0;
+}
+
+/**
+ * @brief Tries to find a node for the specified key in the tree.
+ *
+ * @param[in] the_rbtree The red-black tree control.
+ * @param[in] the_node A node specifying the key.
+ * @param[in] compare The node compare function.
+ * @param[in] is_unique If true, then return the first node with a key equal to
+ *   the one of the node specified if it exits, else return the last node if it
+ *   exists.
+ *
+ * @retval node A node corresponding to the key.  If the tree is not unique
+ * and contains duplicate keys, the set of duplicate keys acts as FIFO.
+ * @retval NULL No node exists in the tree for the key.
+ */
+rtems_rbtree_node* rtems_rbtree_find(
   const rtems_rbtree_control *the_rbtree,
   const rtems_rbtree_node    *the_node,
-  rtems_rbtree_compare        compare,
+  rtems_rbtree_compare              compare,
   bool                        is_unique
-)
-{
-  return _RBTree_Find( the_rbtree, the_node, compare, is_unique );
-}
+);
 
 /**
@@ -397 +443 @@
   RBTree_Control *the_rbtree,
   RBTree_Node    *the_node,
-  RBTree_Compare  compare,
+  rtems_rbtree_compare  compare,
   bool            is_unique
 );

cpukit/sapi/src/rbtreeinsert.c

@@ -15 +15 @@
 
 RTEMS_STATIC_ASSERT(
-  sizeof( RBTree_Compare_result ) >= sizeof( intptr_t ),
-  RBTree_Compare_result_intptr_t
+  sizeof( rtems_rbtree_compare_result ) >= sizeof( intptr_t ),
+  rtems_rbtree_compare_result_intptr_t
 );
 
 RTEMS_STATIC_ASSERT(
-  sizeof( RBTree_Compare_result ) >= sizeof( int32_t ),
-  RBTree_Compare_result_int32_t
+  sizeof( rtems_rbtree_compare_result ) >= sizeof( int32_t ),
+  rtems_rbtree_compare_result_int32_t
 );
 
@@ -27 +27 @@
   rtems_rbtree_control *the_rbtree,
   rtems_rbtree_node    *the_node,
-  RBTree_Compare        compare,
+  rtems_rbtree_compare  compare,
   bool                  is_unique
 )
@@ -35 +35 @@
 
   while ( *which != NULL ) {
-    RBTree_Compare_result compare_result;
+    rtems_rbtree_compare_result compare_result;
 
     parent = *which;
     compare_result = ( *compare )( the_node, parent );
 
-    if ( is_unique && _RBTree_Is_equal( compare_result ) ) {
+    if ( is_unique && rtems_rbtree_is_equal( compare_result ) ) {
       return parent;
     }
 
-    if ( _RBTree_Is_lesser( compare_result ) ) {
+    if ( rtems_rbtree_is_lesser( compare_result ) ) {
       which = _RBTree_Left_reference( parent );
     } else {

cpukit/score/Makefile.am

@@ -293 +293 @@
 ## RBTREE_C_FILES
 libscore_a_SOURCES += \
-    src/rbtreeextract.c src/rbtreefind.c \
+    src/rbtreeextract.c \
     src/rbtreeinsert.c src/rbtreeiterate.c src/rbtreenext.c
 libscore_a_SOURCES += src/rbtreereplace.c

cpukit/score/include/rtems/score/rbtree.h

@@ -58 +58 @@
 
 /**
- * @brief Integer type for compare results.
- *
- * The type is large enough to represent pointers and 32-bit signed integers.
- *
- * @see RBTree_Compare.
- */
-typedef long RBTree_Compare_result;
-
-/**
- * @brief Compares two red-black tree nodes.
- *
- * @param[in] first The first node.
- * @param[in] second The second node.
- *
- * @retval positive The key value of the first node is greater than the one of
- *   the second node.
- * @retval 0 The key value of the first node is equal to the one of the second
- *   node.
- * @retval negative The key value of the first node is less than the one of the
- *   second node.
- */
-typedef RBTree_Compare_result ( *RBTree_Compare )(
-  const RBTree_Node *first,
-  const RBTree_Node *second
-);
-
-/**
  * @brief Initializer for an empty red-black tree with designator @a name.
  */
@@ -95 +68 @@
 #define RBTREE_DEFINE_EMPTY( name ) \
   RBTree_Control name = RBTREE_INITIALIZER_EMPTY( name )
-
-/**
- * @brief Tries to find a node for the specified key in the tree.
- *
- * @param[in] the_rbtree The red-black tree control.
- * @param[in] the_node A node specifying the key.
- * @param[in] compare The node compare function.
- * @param[in] is_unique If true, then return the first node with a key equal to
- *   the one of the node specified if it exits, else return the last node if it
- *   exists.
- *
- * @retval node A node corresponding to the key.  If the tree is not unique
- * and contains duplicate keys, the set of duplicate keys acts as FIFO.
- * @retval NULL No node exists in the tree for the key.
- */
-RBTree_Node *_RBTree_Find(
-  const RBTree_Control *the_rbtree,
-  const RBTree_Node    *the_node,
-  RBTree_Compare        compare,
-  bool                  is_unique
-);
 
 /**

cpukit/score/include/rtems/score/rbtreeimpl.h

@@ -63 +63 @@
 );
 
-RTEMS_INLINE_ROUTINE bool _RBTree_Is_equal(
-  RBTree_Compare_result compare_result
-)
-{
-  return compare_result == 0;
-}
-
-RTEMS_INLINE_ROUTINE bool _RBTree_Is_greater(
-  RBTree_Compare_result compare_result
-)
-{
-  return compare_result > 0;
-}
-
-RTEMS_INLINE_ROUTINE bool _RBTree_Is_lesser(
-  RBTree_Compare_result compare_result
-)
-{
-  return compare_result < 0;
-}
-
 /** @} */