Changeset 82d515e9 in mainline for kernel/generic/src/adt/btree.c
- Timestamp:
- 2017-12-05T11:30:02Z (6 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 9af1c61
- Parents:
- 9a09212
- git-author:
- Jakub Jermar <jakub@…> (2017-12-05 11:25:41)
- git-committer:
- Jakub Jermar <jakub@…> (2017-12-05 11:30:02)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
kernel/generic/src/adt/btree.c
r9a09212 r82d515e9 55 55 #include <trace.h> 56 56 57 static slab_cache_t *btree_node_ slab;57 static slab_cache_t *btree_node_cache; 58 58 59 59 #define ROOT_NODE(n) (!(n)->parent) … … 71 71 void btree_init(void) 72 72 { 73 btree_node_ slab= slab_cache_create("btree_node_t",73 btree_node_cache = slab_cache_create("btree_node_t", 74 74 sizeof(btree_node_t), 0, NULL, NULL, SLAB_CACHE_MAGDEFERRED); 75 75 } … … 109 109 { 110 110 list_initialize(&t->leaf_list); 111 t->root = (btree_node_t *) slab_alloc(btree_node_ slab, 0);111 t->root = (btree_node_t *) slab_alloc(btree_node_cache, 0); 112 112 node_initialize(t->root); 113 113 list_append(&t->root->leaf_link, &t->leaf_list); … … 130 130 } 131 131 132 slab_free(btree_node_ slab, root);132 slab_free(btree_node_cache, root); 133 133 } 134 134 … … 516 516 * Allocate and initialize new right sibling. 517 517 */ 518 rnode = (btree_node_t *) slab_alloc(btree_node_ slab, 0);518 rnode = (btree_node_t *) slab_alloc(btree_node_cache, 0); 519 519 node_initialize(rnode); 520 520 rnode->parent = node->parent; … … 595 595 * We split the root node. Create new root. 596 596 */ 597 t->root = (btree_node_t *) slab_alloc(btree_node_ slab, 0);597 t->root = (btree_node_t *) slab_alloc(btree_node_cache, 0); 598 598 node->parent = t->root; 599 599 rnode->parent = t->root; … … 779 779 t->root = node->subtree[0]; 780 780 t->root->parent = NULL; 781 slab_free(btree_node_ slab, node);781 slab_free(btree_node_cache, node); 782 782 } else { 783 783 /* … … 838 838 idx = find_key_by_subtree(parent, rnode, true); 839 839 assert((int) idx != -1); 840 slab_free(btree_node_ slab, rnode);840 slab_free(btree_node_cache, rnode); 841 841 _btree_remove(t, parent->key[idx], parent); 842 842 }
Note:
See TracChangeset
for help on using the changeset viewer.