Mirrors_Framework/rtems
1
0
Fork 0
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2026-08-31 09:37:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

rbtree: Do not set node off-tree in extract

Browse Source
This commit is contained in:
Sebastian Huber
2014-07-22 12:31:41 +02:00
parent d7a9469378
commit 8abbbdde38
3 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cpukit/score/include/rtems/score/rbtree.h
+9 -2
View File
@@ -241,9 +241,16 @@ RBTree_Node *_RBTree_Insert(
);
/**
* @brief Extracts (removes) @a the_node from @a the_rbtree.
* @brief Extracts (removes) the node from the red-black tree.
*
* This routine extracts (removes) @a the_node from @a the_rbtree.
* This function does not set the node off-tree. In case this is desired, then
* call _RBTree_Set_off_rbtree() after the extraction.
*
* In case the node to extract is not a node of the tree, then this function
* yields unpredictable results.
*
* @param[in] the_rbtree The red-black tree control.
* @param[in] the_node The node to extract.
*/
void _RBTree_Extract(
RBTree_Control *the_rbtree,
cpukit/score/src/rbtreeextract.c
-3
View File
@@ -202,9 +202,6 @@ void _RBTree_Extract(
}
}
/* Wipe the_node */
_RBTree_Set_off_rbtree( the_node );
/* set root to black, if it exists */
if ( the_rbtree->root )
the_rbtree->root->color = RBT_BLACK;
testsuites/sptests/sprbtree01/init.c
+5 -4
View File
@@ -140,6 +140,9 @@ rtems_task Init(
puts( "Init - Initialize rbtree empty" );
rtems_rbtree_initialize_empty( &rbtree1 );
rtems_rbtree_set_off_rbtree( &node1.Node );
rtems_test_assert( rtems_rbtree_is_node_off_rbtree( &node1.Node ) );
/* verify that the rbtree insert work */
puts( "INIT - Verify rtems_rbtree_insert with two nodes" );
node1.id = 1;
@@ -149,6 +152,7 @@ rtems_task Init(
rb_insert_unique( &rbtree1, &node1.Node );
rb_insert_unique( &rbtree1, &node2.Node );
rtems_test_assert( !rtems_rbtree_is_node_off_rbtree( &node1.Node ) );
_RBTree_Rotate(NULL, RBT_LEFT);
i = (node1.Node.parent == &node2.Node);
@@ -261,6 +265,7 @@ rtems_task Init(
puts( "INIT - rtems_rbtree_extract failed");
rtems_test_exit(0);
}
rtems_test_assert( !rtems_rbtree_is_node_off_rbtree( p ) );
rb_insert_unique(&rbtree1, p);
for ( p = rtems_rbtree_get_min(&rbtree1), id = 1 ; p ;
@@ -520,10 +525,6 @@ rtems_task Init(
rtems_test_exit(0);
}
if (rtems_rbtree_find_header(&node_array[0].Node) != NULL) {
puts ("INIT - ERROR ON RBTREE HEADER MISMATCH");
rtems_test_exit(0);
}
if (rtems_rbtree_find_header(NULL) != NULL) {
puts ("INIT - ERROR ON RBTREE HEADER MISMATCH");
rtems_test_exit(0);