diff options
Diffstat (limited to 'cpukit/score')
-rw-r--r-- | cpukit/score/include/rtems/score/rbtree.h | 28 | ||||
-rw-r--r-- | cpukit/score/include/rtems/score/rbtreeimpl.h | 4 | ||||
-rw-r--r-- | cpukit/score/src/rbtree.c | 2 | ||||
-rw-r--r-- | cpukit/score/src/rbtreeextract.c | 12 | ||||
-rw-r--r-- | cpukit/score/src/rbtreefind.c | 2 | ||||
-rw-r--r-- | cpukit/score/src/rbtreeinsert.c | 6 | ||||
-rw-r--r-- | cpukit/score/src/rbtreeiterate.c | 6 | ||||
-rw-r--r-- | cpukit/score/src/rbtreenext.c | 4 | ||||
-rw-r--r-- | cpukit/score/src/scheduleredfenqueue.c | 2 | ||||
-rw-r--r-- | cpukit/score/src/scheduleredfextract.c | 2 | ||||
-rw-r--r-- | cpukit/score/src/scheduleredfyield.c | 4 |
11 files changed, 36 insertions, 36 deletions
diff --git a/cpukit/score/include/rtems/score/rbtree.h b/cpukit/score/include/rtems/score/rbtree.h index a3744e57e3..b9a172ca82 100644 --- a/cpukit/score/include/rtems/score/rbtree.h +++ b/cpukit/score/include/rtems/score/rbtree.h @@ -216,13 +216,13 @@ void _RBTree_Initialize( * 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_unprotected( +RBTree_Node *_RBTree_Find( const RBTree_Control *the_rbtree, const RBTree_Node *the_node ); /** - * @brief Insert @a the_node on the Red-Black Tree @a the_rbtree (unprotected). + * @brief Insert @a the_node on the Red-Black Tree @a the_rbtree. * * This routine inserts @a the_node on the Red-Black Tree @a the_rbtree. * @@ -231,17 +231,17 @@ RBTree_Node *_RBTree_Find_unprotected( * @retval RBTree_Node* if one with equal value to @a the_node 's key exists * in an unique @a the_rbtree. */ -RBTree_Node *_RBTree_Insert_unprotected( +RBTree_Node *_RBTree_Insert( RBTree_Control *the_rbtree, RBTree_Node *the_node ); /** - * @brief Extracts (removes) @a the_node from @a the_rbtree (unprotected). + * @brief Extracts (removes) @a the_node from @a the_rbtree. * * This routine extracts (removes) @a the_node from @a the_rbtree. */ -void _RBTree_Extract_unprotected( +void _RBTree_Extract( RBTree_Control *the_rbtree, RBTree_Node *the_node ); @@ -255,7 +255,7 @@ void _RBTree_Extract_unprotected( * @retval NULL The in-order next node does not exist. * @retval otherwise The next node. */ -RBTree_Node *_RBTree_Next_unprotected( +RBTree_Node *_RBTree_Next( const RBTree_Node *node, RBTree_Direction dir ); @@ -471,7 +471,7 @@ RTEMS_INLINE_ROUTINE bool _RBTree_Is_root( * This function returns a pointer to the header of the Red Black * Tree containing @a the_node if it exists, and NULL if not. */ -RTEMS_INLINE_ROUTINE RBTree_Control *_RBTree_Find_header_unprotected( +RTEMS_INLINE_ROUTINE RBTree_Control *_RBTree_Find_header( RBTree_Node *the_node ) { @@ -508,11 +508,11 @@ RTEMS_INLINE_ROUTINE void _RBTree_Initialize_empty( * @retval NULL The predecessor does not exist. Otherwise it returns * the predecessor node. */ -RTEMS_INLINE_ROUTINE RBTree_Node *_RBTree_Predecessor_unprotected( +RTEMS_INLINE_ROUTINE RBTree_Node *_RBTree_Predecessor( const RBTree_Node *node ) { - return _RBTree_Next_unprotected( node, RBT_LEFT ); + return _RBTree_Next( node, RBT_LEFT ); } /** @@ -522,15 +522,15 @@ RTEMS_INLINE_ROUTINE RBTree_Node *_RBTree_Predecessor_unprotected( * * @retval NULL The successor does not exist. Otherwise the successor node. */ -RTEMS_INLINE_ROUTINE RBTree_Node *_RBTree_Successor_unprotected( +RTEMS_INLINE_ROUTINE RBTree_Node *_RBTree_Successor( const RBTree_Node *node ) { - return _RBTree_Next_unprotected( node, RBT_RIGHT ); + return _RBTree_Next( node, RBT_RIGHT ); } /** - * @brief Get the first node (unprotected). + * @brief Get the first node. * * This function removes the minimum or maximum node from the_rbtree and * returns a pointer to that node. @@ -542,13 +542,13 @@ RTEMS_INLINE_ROUTINE RBTree_Node *_RBTree_Successor_unprotected( * * @note This routine may return NULL if the RBTree is empty. */ -RTEMS_INLINE_ROUTINE RBTree_Node *_RBTree_Get_unprotected( +RTEMS_INLINE_ROUTINE RBTree_Node *_RBTree_Get( RBTree_Control *the_rbtree, RBTree_Direction dir ) { RBTree_Node *the_node = the_rbtree->first[dir]; - _RBTree_Extract_unprotected(the_rbtree, the_node); + _RBTree_Extract(the_rbtree, the_node); return the_node; } diff --git a/cpukit/score/include/rtems/score/rbtreeimpl.h b/cpukit/score/include/rtems/score/rbtreeimpl.h index 30d55d2fb9..0a3a8836ce 100644 --- a/cpukit/score/include/rtems/score/rbtreeimpl.h +++ b/cpukit/score/include/rtems/score/rbtreeimpl.h @@ -43,7 +43,7 @@ extern "C" { * @retval true Stop the iteration. * @retval false Continue the iteration. * - * @see _RBTree_Iterate_unprotected(). + * @see _RBTree_Iterate(). */ typedef bool (*RBTree_Visitor)( const RBTree_Node *node, @@ -59,7 +59,7 @@ typedef bool (*RBTree_Visitor)( * @param[in] visitor The visitor. * @param[in] visitor_arg The visitor argument. */ -void _RBTree_Iterate_unprotected( +void _RBTree_Iterate( const RBTree_Control *rbtree, RBTree_Direction dir, RBTree_Visitor visitor, diff --git a/cpukit/score/src/rbtree.c b/cpukit/score/src/rbtree.c index 59dfd760c2..4ec0ad627e 100644 --- a/cpukit/score/src/rbtree.c +++ b/cpukit/score/src/rbtree.c @@ -43,7 +43,7 @@ void _RBTree_Initialize( count = number_nodes; next = starting_address; while ( count-- ) { - _RBTree_Insert_unprotected(the_rbtree, next); + _RBTree_Insert(the_rbtree, next); next = (RBTree_Node *) _Addresses_Add_offset( (void *) next, node_size ); } diff --git a/cpukit/score/src/rbtreeextract.c b/cpukit/score/src/rbtreeextract.c index 8dafe3b72c..730d3f8be6 100644 --- a/cpukit/score/src/rbtreeextract.c +++ b/cpukit/score/src/rbtreeextract.c @@ -21,7 +21,7 @@ * @note It does NOT disable interrupts to ensure the atomicity * of the extract operation. */ -static void _RBTree_Extract_validate_unprotected( +static void _RBTree_Extract_validate( RBTree_Node *the_node ) { @@ -91,7 +91,7 @@ static void _RBTree_Extract_validate_unprotected( * @note It does NOT disable interrupts to ensure the atomicity * of the extract operation. */ -void _RBTree_Extract_unprotected( +void _RBTree_Extract( RBTree_Control *the_rbtree, RBTree_Node *the_node ) @@ -105,7 +105,7 @@ void _RBTree_Extract_unprotected( /* check if min needs to be updated */ if (the_node == the_rbtree->first[RBT_LEFT]) { RBTree_Node *next; - next = _RBTree_Successor_unprotected(the_node); + next = _RBTree_Successor(the_node); the_rbtree->first[RBT_LEFT] = next; } @@ -113,7 +113,7 @@ void _RBTree_Extract_unprotected( * do not use else if here. */ if (the_node == the_rbtree->first[RBT_RIGHT]) { RBTree_Node *previous; - previous = _RBTree_Predecessor_unprotected(the_node); + previous = _RBTree_Predecessor(the_node); the_rbtree->first[RBT_RIGHT] = previous; } @@ -139,7 +139,7 @@ void _RBTree_Extract_unprotected( leaf->parent = target->parent; } else { /* fix the tree here if the child is a null leaf. */ - _RBTree_Extract_validate_unprotected(target); + _RBTree_Extract_validate(target); } victim_color = target->color; dir = target != target->parent->child[0]; @@ -176,7 +176,7 @@ void _RBTree_Extract_unprotected( leaf->parent = the_node->parent; } else { /* fix the tree here if the child is a null leaf. */ - _RBTree_Extract_validate_unprotected(the_node); + _RBTree_Extract_validate(the_node); } victim_color = the_node->color; diff --git a/cpukit/score/src/rbtreefind.c b/cpukit/score/src/rbtreefind.c index 9b2663d493..7aa0b35818 100644 --- a/cpukit/score/src/rbtreefind.c +++ b/cpukit/score/src/rbtreefind.c @@ -20,7 +20,7 @@ #include <rtems/score/rbtreeimpl.h> #include <rtems/score/isr.h> -RBTree_Node *_RBTree_Find_unprotected( +RBTree_Node *_RBTree_Find( const RBTree_Control *the_rbtree, const RBTree_Node *the_node ) diff --git a/cpukit/score/src/rbtreeinsert.c b/cpukit/score/src/rbtreeinsert.c index a2f6f09ab3..c39249f9ec 100644 --- a/cpukit/score/src/rbtreeinsert.c +++ b/cpukit/score/src/rbtreeinsert.c @@ -21,7 +21,7 @@ * @note It does NOT disable interrupts to ensure the atomicity of the * append operation. */ -static void _RBTree_Validate_insert_unprotected( +static void _RBTree_Validate_insert( RBTree_Node *the_node ) { @@ -73,7 +73,7 @@ static void _RBTree_Validate_insert_unprotected( * @note It does NOT disable interrupts to ensure the atomicity * of the extract operation. */ -RBTree_Node *_RBTree_Insert_unprotected( +RBTree_Node *_RBTree_Insert( RBTree_Control *the_rbtree, RBTree_Node *the_node ) @@ -118,7 +118,7 @@ RBTree_Node *_RBTree_Insert_unprotected( } /* while(iter_node) */ /* verify red-black properties */ - _RBTree_Validate_insert_unprotected(the_node); + _RBTree_Validate_insert(the_node); } return (RBTree_Node*)0; } diff --git a/cpukit/score/src/rbtreeiterate.c b/cpukit/score/src/rbtreeiterate.c index 880fa2b143..629b69fef6 100644 --- a/cpukit/score/src/rbtreeiterate.c +++ b/cpukit/score/src/rbtreeiterate.c @@ -3,7 +3,7 @@ * * @ingroup ScoreRBTree * - * @brief _RBTree_Iterate_unprotected() implementation. + * @brief _RBTree_Iterate() implementation. */ /* @@ -26,7 +26,7 @@ #include <rtems/score/rbtreeimpl.h> -void _RBTree_Iterate_unprotected( +void _RBTree_Iterate( const RBTree_Control *rbtree, RBTree_Direction dir, RBTree_Visitor visitor, @@ -40,6 +40,6 @@ void _RBTree_Iterate_unprotected( while ( !stop && current != NULL ) { stop = (*visitor)( current, dir, visitor_arg ); - current = _RBTree_Next_unprotected( current, dir ); + current = _RBTree_Next( current, dir ); } } diff --git a/cpukit/score/src/rbtreenext.c b/cpukit/score/src/rbtreenext.c index f3268d246b..5b3d7cb29e 100644 --- a/cpukit/score/src/rbtreenext.c +++ b/cpukit/score/src/rbtreenext.c @@ -3,7 +3,7 @@ * * @ingroup ScoreRBTree * - * @brief _RBTree_Next_unprotected() and _RBTree_Next() implementation. + * @brief _RBTree_Next() and _RBTree_Next() implementation. */ /* @@ -27,7 +27,7 @@ #include <rtems/score/rbtreeimpl.h> #include <rtems/score/isr.h> -RBTree_Node *_RBTree_Next_unprotected( +RBTree_Node *_RBTree_Next( const RBTree_Node *node, RBTree_Direction dir ) diff --git a/cpukit/score/src/scheduleredfenqueue.c b/cpukit/score/src/scheduleredfenqueue.c index 9a9b906bb9..921721fb67 100644 --- a/cpukit/score/src/scheduleredfenqueue.c +++ b/cpukit/score/src/scheduleredfenqueue.c @@ -31,6 +31,6 @@ void _Scheduler_EDF_Enqueue( (Scheduler_EDF_Per_thread*) the_thread->scheduler_info; RBTree_Node *node = &(sched_info->Node); - _RBTree_Insert_unprotected( &_Scheduler_EDF_Ready_queue, node ); + _RBTree_Insert( &_Scheduler_EDF_Ready_queue, node ); sched_info->queue_state = SCHEDULER_EDF_QUEUE_STATE_YES; } diff --git a/cpukit/score/src/scheduleredfextract.c b/cpukit/score/src/scheduleredfextract.c index b2f91cc1c8..7547cafcb9 100644 --- a/cpukit/score/src/scheduleredfextract.c +++ b/cpukit/score/src/scheduleredfextract.c @@ -31,6 +31,6 @@ void _Scheduler_EDF_Extract( (Scheduler_EDF_Per_thread*) the_thread->scheduler_info; RBTree_Node *node = &(sched_info->Node); - _RBTree_Extract_unprotected( &_Scheduler_EDF_Ready_queue, node ); + _RBTree_Extract( &_Scheduler_EDF_Ready_queue, node ); sched_info->queue_state = SCHEDULER_EDF_QUEUE_STATE_NOT_PRESENTLY; } diff --git a/cpukit/score/src/scheduleredfyield.c b/cpukit/score/src/scheduleredfyield.c index 4a80168ab4..fc5b13a7a0 100644 --- a/cpukit/score/src/scheduleredfyield.c +++ b/cpukit/score/src/scheduleredfyield.c @@ -35,8 +35,8 @@ void _Scheduler_EDF_Yield( Thread_Control *thread ) * The RBTree has more than one node, enqueue behind the tasks * with the same priority in case there are such ones. */ - _RBTree_Extract_unprotected( &_Scheduler_EDF_Ready_queue, thread_node ); - _RBTree_Insert_unprotected( &_Scheduler_EDF_Ready_queue, thread_node ); + _RBTree_Extract( &_Scheduler_EDF_Ready_queue, thread_node ); + _RBTree_Insert( &_Scheduler_EDF_Ready_queue, thread_node ); _ISR_Flash( level ); |