Changeset 2810636 in mainline

Timestamp:

2006-04-09T16:29:26Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

33472fa

Parents:

7f7859b9

Message:

Switch B+tree node allocation from malloc() to a dedicated slab - btree_node_slab.

Location:

generic

Files:

• include/adt/btree.h (modified) (1 diff)
• src/adt/btree.c (modified) (8 diffs)
• src/main/main.c (modified) (2 diffs)

generic/include/adt/btree.h

@@ -77 +77 @@
 };
 
+extern void btree_init(void);
+
 extern void btree_create(btree_t *t);
 extern void btree_destroy(btree_t *t);

generic/src/adt/btree.c

@@ -29 +29 @@
 /*
  * This B-tree has the following properties:
- * - it is a ballanced 2-3-4-5 tree (i.e. BTREE_M = 5)
+ * - it is a ballanced 3-4-5 tree (i.e. BTREE_M = 5)
  * - values (i.e. pointers to values) are stored only in leaves
  * - leaves are linked in a list
@@ -75 +75 @@
 #define MEDIAN_HIGH(n)          ((n)->key[MEDIAN_HIGH_INDEX((n))]);
 
+static slab_cache_t *btree_node_slab;
+
+/** Initialize B-trees. */
+void btree_init(void)
+{
+        btree_node_slab = slab_cache_create("btree_node_slab", sizeof(btree_node_t), 0, NULL, NULL, SLAB_CACHE_MAGDEFERRED);
+}
+
 /** Create empty B-tree.
  *
@@ -82 +90 @@
 {
         list_initialize(&t->leaf_head);
-        t->root = (btree_node_t *) malloc(sizeof(btree_node_t), 0);
+        t->root = (btree_node_t *) slab_alloc(btree_node_slab, 0);
         node_initialize(t->root);
         list_append(&t->root->leaf_link, &t->leaf_head);
@@ -91 +99 @@
 {
         ASSERT(!t->root->keys);
-        free(t->root);
+        slab_free(btree_node_slab, t->root);
 }
 
@@ -162 +170 @@
                          * We split the root node. Create new root.
                          */
-                        t->root = (btree_node_t *) malloc(sizeof(btree_node_t), 0);
+                        t->root = (btree_node_t *) slab_alloc(btree_node_slab, 0);
                         node->parent = t->root;
                         rnode->parent = t->root;
@@ -215 +223 @@
                         t->root = node->subtree[0];
                         t->root->parent = NULL;
-                        free(node);
+                        slab_free(btree_node_slab, node);
                 } else {
                         /*
@@ -270 +278 @@
                 idx = find_key_by_subtree(parent, rnode, true);
                 ASSERT((int) idx != -1);
-                free(rnode);
+                slab_free(btree_node_slab, rnode);
                 _btree_remove(t, parent->key[idx], parent);
         }
@@ -563 +571 @@
          * Allocate and initialize new right sibling.
          */
-        rnode = (btree_node_t *) malloc(sizeof(btree_node_t), 0);
+        rnode = (btree_node_t *) slab_alloc(btree_node_slab, 0);
         node_initialize(rnode);
         rnode->parent = node->parent;

generic/src/main/main.c

@@ -58 +58 @@
 #include <ipc/ipc.h>
 #include <macros.h>
+#include <adt/btree.h>
 
 #ifdef CONFIG_SMP
@@ -169 +170 @@
         frame_init();           /* Initialize at least 1 memory segment big enough for slab to work */
         slab_cache_init();
+        btree_init();
         as_init();
         page_init();