RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

rbheap: Avoid internal API

Browse Source
This commit is contained in:
Sebastian Huber
2015-08-18 06:05:05 +02:00
parent 1f242285df
commit c72f1322d2
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
cpukit/sapi/src/rbheap.c
View File

@@ -210,13 +210,17 @@ static rtems_rbheap_chunk *find(rtems_rbtree_control *chunk_tree, uintptr_t key)
); );
} }
static rtems_rbheap_chunk *get_next( static rtems_rbheap_chunk *pred(const rtems_rbheap_chunk *chunk)
const rtems_rbheap_chunk *chunk,
RBTree_Direction dir
)
{ {
return rtems_rbheap_chunk_of_node( return rtems_rbheap_chunk_of_node(
_RBTree_Next(&chunk->tree_node, dir) rtems_rbtree_predecessor(&chunk->tree_node)
);
}
static rtems_rbheap_chunk *succ(const rtems_rbheap_chunk *chunk)
{
return rtems_rbheap_chunk_of_node(
rtems_rbtree_successor(&chunk->tree_node)
); );
} }
@@ -253,12 +257,9 @@ rtems_status_code rtems_rbheap_free(rtems_rbheap_control *control, void *ptr)
if (chunk != NULL_PAGE) { if (chunk != NULL_PAGE) {
if (!rtems_rbheap_is_chunk_free(chunk)) { if (!rtems_rbheap_is_chunk_free(chunk)) {
rtems_rbheap_chunk *pred = get_next(chunk, RBT_LEFT); check_and_merge(free_chain, chunk_tree, chunk, succ(chunk));
rtems_rbheap_chunk *succ = get_next(chunk, RBT_RIGHT);
check_and_merge(free_chain, chunk_tree, chunk, succ);
add_to_chain(free_chain, chunk); add_to_chain(free_chain, chunk);
check_and_merge(free_chain, chunk_tree, chunk, pred); check_and_merge(free_chain, chunk_tree, chunk, pred(chunk));
} else { } else {
sc = RTEMS_INCORRECT_STATE; sc = RTEMS_INCORRECT_STATE;
} }