Changeset 64939bc in rtems for cpukit/sapi/src/rbheap.c


Ignore:
Timestamp:
Jul 12, 2014, 7:22:22 PM (5 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
4.11, master
Children:
ed7a028
Parents:
7e119990
git-author:
Sebastian Huber <sebastian.huber@…> (07/12/14 19:22:22)
git-committer:
Joel Sherrill <joel.sherrill@…> (07/15/14 15:03:48)
Message:

rbtree: Reduce RBTree_Control size

Remove compare function and is unique indicator from the control
structure. Rename RBTree_Compare_function to RBTree_Compare. Rename
rtems_rbtree_compare_function to rtems_rbtree_compare. Provide C++
compatible initializers. Add compare function and is unique indicator
to _RBTree_Find(), _RBTree_Insert(), rtems_rbtree_find() and
rtems_rbtree_insert(). Remove _RBTree_Is_unique() and
rtems_rbtree_is_unique(). Remove compare function and is unique
indicator from _RBTree_Initialize_empty() and
rtems_rbtree_initialize_empty().

File:
1 edited

Legend:

Unmodified
Added
Removed
  • cpukit/sapi/src/rbheap.c

    r7e119990 r64939bc  
    8181)
    8282{
    83   _RBTree_Insert(tree, &chunk->tree_node);
     83  rtems_rbtree_insert(tree, &chunk->tree_node, chunk_compare, true);
    8484}
    8585
     
    108108      rtems_chain_initialize_empty(free_chain);
    109109      rtems_chain_initialize_empty(&control->spare_descriptor_chain);
    110       rtems_rbtree_initialize_empty(chunk_tree, chunk_compare, true);
     110      rtems_rbtree_initialize_empty(chunk_tree);
    111111      control->alignment = alignment;
    112112      control->handler_arg = handler_arg;
     
    199199
    200200  return rtems_rbheap_chunk_of_node(
    201     _RBTree_Find(chunk_tree, &chunk.tree_node)
     201    rtems_rbtree_find(chunk_tree, &chunk.tree_node, chunk_compare, true)
    202202  );
    203203}
     
    231231    rtems_chain_extract_unprotected(&b->chain_node);
    232232    add_to_chain(free_chain, b);
    233     _RBTree_Extract(chunk_tree, &b->tree_node);
     233    rtems_rbtree_extract(chunk_tree, &b->tree_node);
    234234  }
    235235}
Note: See TracChangeset for help on using the changeset viewer.