Changeset 132ab5d1 in mainline for kernel/generic/src/adt/btree.c

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

• kernel/generic/src/adt/btree.c (modified) (8 diffs)

kernel/generic/src/adt/btree.c

@@ -55 +55 @@
 #include <trace.h>
 
-static slab_cache_t *btree_node_slab;
+static slab_cache_t *btree_node_cache;
 
 #define ROOT_NODE(n)   (!(n)->parent)
@@ -71 +71 @@
 void btree_init(void)
 {
-        btree_node_slab = slab_cache_create("btree_node_t",
+        btree_node_cache = slab_cache_create("btree_node_t",
             sizeof(btree_node_t), 0, NULL, NULL, SLAB_CACHE_MAGDEFERRED);
 }
@@ -109 +109 @@
 {
         list_initialize(&t->leaf_list);
-        t->root = (btree_node_t *) slab_alloc(btree_node_slab, 0);
+        t->root = (btree_node_t *) slab_alloc(btree_node_cache, 0);
         node_initialize(t->root);
         list_append(&t->root->leaf_link, &t->leaf_list);
@@ -130 +130 @@
         }
         
-        slab_free(btree_node_slab, root);
+        slab_free(btree_node_cache, root);
 }
 
@@ -516 +516 @@
          * Allocate and initialize new right sibling.
          */
-        rnode = (btree_node_t *) slab_alloc(btree_node_slab, 0);
+        rnode = (btree_node_t *) slab_alloc(btree_node_cache, 0);
         node_initialize(rnode);
         rnode->parent = node->parent;
@@ -595 +595 @@
                          * We split the root node. Create new root.
                          */
-                        t->root = (btree_node_t *) slab_alloc(btree_node_slab, 0);
+                        t->root = (btree_node_t *) slab_alloc(btree_node_cache, 0);
                         node->parent = t->root;
                         rnode->parent = t->root;
@@ -779 +779 @@
                         t->root = node->subtree[0];
                         t->root->parent = NULL;
-                        slab_free(btree_node_slab, node);
+                        slab_free(btree_node_cache, node);
                 } else {
                         /*
@@ -838 +838 @@
                 idx = find_key_by_subtree(parent, rnode, true);
                 assert((int) idx != -1);
-                slab_free(btree_node_slab, rnode);
+                slab_free(btree_node_cache, rnode);
                 _btree_remove(t, parent->key[idx], parent);
         }