From 97127aa119176be3533d1165d66966b74d226f82 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Thu, 31 Mar 2016 13:30:38 +0200 Subject: score: Add and use _RBTree_Find_inline() --- cpukit/posix/include/rtems/posix/keyimpl.h | 54 ++++++++++++++++++------------ 1 file changed, 32 insertions(+), 22 deletions(-) (limited to 'cpukit/posix') diff --git a/cpukit/posix/include/rtems/posix/keyimpl.h b/cpukit/posix/include/rtems/posix/keyimpl.h index 28666aa925..7715fdfcdc 100644 --- a/cpukit/posix/include/rtems/posix/keyimpl.h +++ b/cpukit/posix/include/rtems/posix/keyimpl.h @@ -111,35 +111,45 @@ RTEMS_INLINE_ROUTINE void _POSIX_Keys_Key_value_free( _Freechain_Put( &_POSIX_Keys_Keypool, key_value_pair ); } -RTEMS_INLINE_ROUTINE RBTree_Node *_POSIX_Keys_Key_value_find( - pthread_key_t key, - Thread_Control *the_thread +RTEMS_INLINE_ROUTINE bool _POSIX_Keys_Key_value_equal( + const void *left, + const RBTree_Node *right ) { - RBTree_Node **link; - RBTree_Node *parent; + const pthread_key_t *the_left; + const POSIX_Keys_Key_value_pair *the_right; - link = _RBTree_Root_reference( &the_thread->Keys.Key_value_pairs ); - parent = NULL; + the_left = left; + the_right = POSIX_KEYS_RBTREE_NODE_TO_KEY_VALUE_PAIR( right ); - while ( *link != NULL ) { - POSIX_Keys_Key_value_pair *parent_key_value_pair; - pthread_key_t parent_key; + return *the_left == the_right->key; +} - parent = *link; - parent_key_value_pair = POSIX_KEYS_RBTREE_NODE_TO_KEY_VALUE_PAIR( parent ); - parent_key = parent_key_value_pair->key; +RTEMS_INLINE_ROUTINE bool _POSIX_Keys_Key_value_less( + const void *left, + const RBTree_Node *right +) +{ + const pthread_key_t *the_left; + const POSIX_Keys_Key_value_pair *the_right; - if ( key == parent_key ) { - return parent; - } else if ( key < parent_key ) { - link = _RBTree_Left_reference( parent ); - } else { - link = _RBTree_Right_reference( parent ); - } - } + the_left = left; + the_right = POSIX_KEYS_RBTREE_NODE_TO_KEY_VALUE_PAIR( right ); + + return *the_left < the_right->key; +} - return NULL; +RTEMS_INLINE_ROUTINE RBTree_Node *_POSIX_Keys_Key_value_find( + pthread_key_t key, + Thread_Control *the_thread +) +{ + return _RBTree_Find_inline( + &the_thread->Keys.Key_value_pairs, + &key, + _POSIX_Keys_Key_value_equal, + _POSIX_Keys_Key_value_less + ); } RTEMS_INLINE_ROUTINE void _POSIX_Keys_Key_value_insert( -- cgit v1.2.3