From 833dd903356eae776975fc8e43a96687430f2e64 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Tue, 19 Nov 2013 16:09:39 +0100 Subject: score/rbtree: Delete protected operations The user of the red-black tree container must now ensure that at most one thread at once can access an instance. --- cpukit/score/src/rbtreeextract.c | 27 -------------------------- cpukit/score/src/rbtreefind.c | 15 --------------- cpukit/score/src/rbtreefindheader.c | 38 ------------------------------------- cpukit/score/src/rbtreeget.c | 37 ------------------------------------ cpukit/score/src/rbtreeinsert.c | 31 ------------------------------ cpukit/score/src/rbtreenext.c | 15 --------------- 6 files changed, 163 deletions(-) delete mode 100644 cpukit/score/src/rbtreefindheader.c delete mode 100644 cpukit/score/src/rbtreeget.c (limited to 'cpukit/score/src') diff --git a/cpukit/score/src/rbtreeextract.c b/cpukit/score/src/rbtreeextract.c index 0f38fbc325..8dafe3b72c 100644 --- a/cpukit/score/src/rbtreeextract.c +++ b/cpukit/score/src/rbtreeextract.c @@ -202,30 +202,3 @@ void _RBTree_Extract_unprotected( /* set root to black, if it exists */ if (the_rbtree->root) the_rbtree->root->color = RBT_BLACK; } - - -/* - * _RBTree_Extract - * - * This kernel routine deletes the given node from a rbtree. - * - * Input parameters: - * node - pointer to node in rbtree to be deleted - * - * Output parameters: NONE - * - * INTERRUPT LATENCY: - * only case - */ - -void _RBTree_Extract( - RBTree_Control *the_rbtree, - RBTree_Node *the_node -) -{ - ISR_Level level; - - _ISR_Disable( level ); - _RBTree_Extract_unprotected( the_rbtree, the_node ); - _ISR_Enable( level ); -} diff --git a/cpukit/score/src/rbtreefind.c b/cpukit/score/src/rbtreefind.c index b485845dbd..9b2663d493 100644 --- a/cpukit/score/src/rbtreefind.c +++ b/cpukit/score/src/rbtreefind.c @@ -20,21 +20,6 @@ #include #include -RBTree_Node *_RBTree_Find( - const RBTree_Control *the_rbtree, - const RBTree_Node *search_node -) -{ - ISR_Level level; - RBTree_Node *return_node; - - return_node = NULL; - _ISR_Disable( level ); - return_node = _RBTree_Find_unprotected( the_rbtree, search_node ); - _ISR_Enable( level ); - return return_node; -} - RBTree_Node *_RBTree_Find_unprotected( const RBTree_Control *the_rbtree, const RBTree_Node *the_node diff --git a/cpukit/score/src/rbtreefindheader.c b/cpukit/score/src/rbtreefindheader.c deleted file mode 100644 index 2368a11428..0000000000 --- a/cpukit/score/src/rbtreefindheader.c +++ /dev/null @@ -1,38 +0,0 @@ -/** - * @file - * - * @brief Finds the Header of a Tree if it Exists - * - * @ingroup ScoreRBTree - */ - -/* - * Copyright (c) 2010 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. - */ - -#if HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include -#include - -RBTree_Control *_RBTree_Find_header( - RBTree_Node *the_node -) -{ - ISR_Level level; - RBTree_Control *return_header; - - return_header = NULL; - _ISR_Disable( level ); - return_header = _RBTree_Find_header_unprotected( the_node ); - _ISR_Enable( level ); - return return_header; -} diff --git a/cpukit/score/src/rbtreeget.c b/cpukit/score/src/rbtreeget.c deleted file mode 100644 index a805a4090f..0000000000 --- a/cpukit/score/src/rbtreeget.c +++ /dev/null @@ -1,37 +0,0 @@ -/** - * @file - * - * @brief Obtain the min or max node of a rbtree - * @ingroup ScoreRBTree - */ - -/* - * Copyright (c) 2010 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. - */ - -#if HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -RBTree_Node *_RBTree_Get( - RBTree_Control *the_rbtree, - RBTree_Direction dir -) -{ - ISR_Level level; - RBTree_Node *return_node; - - return_node = NULL; - _ISR_Disable( level ); - return_node = _RBTree_Get_unprotected( the_rbtree, dir ); - _ISR_Enable( level ); - return return_node; -} - diff --git a/cpukit/score/src/rbtreeinsert.c b/cpukit/score/src/rbtreeinsert.c index 0d8e4a6dc4..a2f6f09ab3 100644 --- a/cpukit/score/src/rbtreeinsert.c +++ b/cpukit/score/src/rbtreeinsert.c @@ -122,34 +122,3 @@ RBTree_Node *_RBTree_Insert_unprotected( } return (RBTree_Node*)0; } - - -/* - * _RBTree_Insert - * - * This kernel routine inserts a given node after a specified node - * a requested rbtree. - * - * Input parameters: - * tree - pointer to RBTree Control for tree to insert to - * node - pointer to node to be inserted - * - * Output parameters: NONE - * - * INTERRUPT LATENCY: - * only case - */ - -RBTree_Node *_RBTree_Insert( - RBTree_Control *tree, - RBTree_Node *node -) -{ - ISR_Level level; - RBTree_Node *return_node; - - _ISR_Disable( level ); - return_node = _RBTree_Insert_unprotected( tree, node ); - _ISR_Enable( level ); - return return_node; -} diff --git a/cpukit/score/src/rbtreenext.c b/cpukit/score/src/rbtreenext.c index 7dd305a3dc..f3268d246b 100644 --- a/cpukit/score/src/rbtreenext.c +++ b/cpukit/score/src/rbtreenext.c @@ -60,18 +60,3 @@ RBTree_Node *_RBTree_Next_unprotected( return next; } - -RBTree_Node *_RBTree_Next( - const RBTree_Node *node, - RBTree_Direction dir -) -{ - RBTree_Node *next; - ISR_Level level; - - _ISR_Disable( level ); - next = _RBTree_Next_unprotected( node, dir ); - _ISR_Enable( level ); - - return next; -} -- cgit v1.2.3