Changeset 6e93c836 in rtems

Timestamp:

07/22/14 17:42:54 (9 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

4.11, 5, master

Children:

b767683a

Parents:

4cd55724

git-author:

Sebastian Huber <sebastian.huber@…> (07/22/14 17:42:54)

git-committer:

Sebastian Huber <sebastian.huber@…> (07/29/14 12:05:08)

Message:

rbtree: Simplify off-tree handling

Only use the parent pointer, since this pointer is never NULL for nodes
which are part of a tree.

Rename functions from *_off_rbtree() to *_off_tree().

Files:

• cpukit/sapi/include/rtems/rbtree.h (modified) (2 diffs)
• cpukit/score/include/rtems/score/rbtree.h (modified) (2 diffs)
• testsuites/sptests/sprbtree01/init.c (modified) (3 diffs)

cpukit/sapi/include/rtems/rbtree.h

@@ -122 +122 @@
  * indicating the @a node is not part of any rbtree.
  */
-RTEMS_INLINE_ROUTINE void rtems_rbtree_set_off_rbtree(
+RTEMS_INLINE_ROUTINE void rtems_rbtree_set_off_tree(
   rtems_rbtree_node *node
 )
 {
-  _RBTree_Set_off_rbtree( node );
+  _RBTree_Set_off_tree( node );
 }
 
@@ -135 +135 @@
  * off rbtree if the next and previous fields are set to NULL.
  */
-RTEMS_INLINE_ROUTINE bool rtems_rbtree_is_node_off_rbtree(
+RTEMS_INLINE_ROUTINE bool rtems_rbtree_is_node_off_tree(
   const rtems_rbtree_node *node
 )
 {
-  return _RBTree_Is_node_off_rbtree( node );
+  return _RBTree_Is_node_off_tree( node );
 }
 

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

@@ -246 +246 @@
  *
  * This function does not set the node off-tree.  In case this is desired, then
- * call _RBTree_Set_off_rbtree() after the extraction.
+ * call _RBTree_Set_off_tree() after the extraction.
  *
  * In case the node to extract is not a node of the tree, then this function
@@ -274 +274 @@
 
 /**
- * @brief Set off RBtree.
- *
- * This function sets the parent and child fields of the @a node to NULL
- * indicating the @a node is not part of a rbtree.
- *
- */
-RTEMS_INLINE_ROUTINE void _RBTree_Set_off_rbtree(
-    RBTree_Node *node
-    )
-{
-  node->parent = node->child[RBT_LEFT] = node->child[RBT_RIGHT] = NULL;
-}
-
-/**
- * @brief Is the node off RBTree.
- *
- * This function returns true if the @a node is not on a rbtree. A @a node is
- * off rbtree if the parent and child fields are set to NULL.
- */
-RTEMS_INLINE_ROUTINE bool _RBTree_Is_node_off_rbtree(
-    const RBTree_Node *node
-    )
-{
-  return (node->parent == NULL) &&
-         (node->child[RBT_LEFT] == NULL) &&
-         (node->child[RBT_RIGHT] == NULL);
+ * @brief Sets a red-black tree node as off-tree.
+ *
+ * Do not use this function on nodes which are a part of a tree.
+ *
+ * @param[in] the_node The node to set off-tree.
+ *
+ * @see _RBTree_Is_node_off_tree().
+ */
+RTEMS_INLINE_ROUTINE void _RBTree_Set_off_tree( RBTree_Node *the_node )
+{
+  the_node->parent = NULL;
+}
+
+/**
+ * @brief Returns true, if this red-black tree node is off-tree, and false
+ * otherwise.
+ *
+ * @param[in] the_node The node to test.
+ *
+ * @retval true The node is not a part of a tree (off-tree).
+ * @retval false Otherwise.
+ *
+ * @see _RBTree_Set_off_tree().
+ */
+RTEMS_INLINE_ROUTINE bool _RBTree_Is_node_off_tree(
+  const RBTree_Node *the_node
+)
+{
+  return the_node->parent == NULL;
 }
 

testsuites/sptests/sprbtree01/init.c

@@ -236 +236 @@
   rtems_rbtree_initialize_empty( &rbtree1 );
 
-  rtems_rbtree_set_off_rbtree( &node1.Node );
-  rtems_test_assert( rtems_rbtree_is_node_off_rbtree( &node1.Node ) );
+  rtems_rbtree_set_off_tree( &node1.Node );
+  rtems_test_assert( rtems_rbtree_is_node_off_tree( &node1.Node ) );
 
   /* verify that the rbtree insert work */
@@ -248 +248 @@
   rb_insert_unique( &rbtree1, &node2.Node );
 
-  rtems_test_assert( !rtems_rbtree_is_node_off_rbtree( &node1.Node ) );
+  rtems_test_assert( !rtems_rbtree_is_node_off_tree( &node1.Node ) );
 
   _RBTree_Rotate(NULL, RBT_LEFT);
@@ -361 +361 @@
     rtems_test_exit(0);
   }
-  rtems_test_assert( !rtems_rbtree_is_node_off_rbtree( p ) );
+  rtems_test_assert( !rtems_rbtree_is_node_off_tree( p ) );
   rb_insert_unique(&rbtree1, p);