diff options
| author | Gedare Bloom <gedare@rtems.org> | 2012-05-02 11:13:22 -0400 |
|---|---|---|
| committer | Gedare Bloom <gedare@rtems.org> | 2012-05-08 18:40:44 -0400 |
| commit | 871262295955cf888cb5d42c2f66a8237055777d (patch) | |
| tree | 0a9a97624fb6507e8c5e9e64ade5da5552c33780 | |
| parent | score/scheduling: Use RBTree_First instead of Peek in EDF scheduler. (diff) | |
| download | rtems-871262295955cf888cb5d42c2f66a8237055777d.tar.bz2 | |
score/rbtree: replace _RBTree_Peek_unprotected with _RBTree_First.
| -rw-r--r-- | cpukit/score/inline/rtems/score/rbtree.inl | 20 | ||||
| -rw-r--r-- | cpukit/score/src/rbtreepeek.c | 6 |
2 files changed, 3 insertions, 23 deletions
diff --git a/cpukit/score/inline/rtems/score/rbtree.inl b/cpukit/score/inline/rtems/score/rbtree.inl index d646b067b8..a079745290 100644 --- a/cpukit/score/inline/rtems/score/rbtree.inl +++ b/cpukit/score/inline/rtems/score/rbtree.inl @@ -10,13 +10,11 @@ */ /* - * Copyright (c) 2010 Gedare Bloom. + * Copyright (c) 2010-2012 Gedare Bloom. * * The license and distribution terms for this file may be * found in the file LICENSE in this distribution or at * http://www.rtems.com/license/LICENSE. - * - * $Id$ */ #ifndef _RTEMS_SCORE_RBTREE_H @@ -459,22 +457,6 @@ RTEMS_INLINE_ROUTINE RBTree_Node *_RBTree_Get_unprotected( return the_node; } -/** @brief Peek at the First Node (unprotected) - * - * This function returns a pointer to the first node, minimum if @a dir is 0 - * or maximum if @a dir is 1, from @a the_rbtree without extracting it. - * It does NOT disable interrupts to ensure the atomicity of the peek. - * - * @retval NULL if @a the_rbtree is empty. - */ -RTEMS_INLINE_ROUTINE RBTree_Node *_RBTree_Peek_unprotected( - const RBTree_Control *the_rbtree, - RBTree_Direction dir -) -{ - return(the_rbtree->first[dir]); -} - /** @brief Rotate the_node in the direction passed as second argument * * This routine rotates @a the_node to the direction @a dir, swapping diff --git a/cpukit/score/src/rbtreepeek.c b/cpukit/score/src/rbtreepeek.c index 13ea33370f..81ff0fd137 100644 --- a/cpukit/score/src/rbtreepeek.c +++ b/cpukit/score/src/rbtreepeek.c @@ -1,11 +1,9 @@ /* - * Copyright (c) 2010 Gedare Bloom. + * Copyright (c) 2010-2012 Gedare Bloom. * * The license and distribution terms for this file may be * found in the file LICENSE in this distribution or at * http://www.rtems.com/license/LICENSE. - * - * $Id$ */ #if HAVE_CONFIG_H @@ -45,7 +43,7 @@ RBTree_Node *_RBTree_Peek( return_node = NULL; _ISR_Disable( level ); - return_node = _RBTree_Peek_unprotected( the_rbtree, dir ); + return_node = _RBTree_First( the_rbtree, dir ); _ISR_Enable( level ); return return_node; } |