Changes in kernel/generic/src/adt/btree.c [7a0359b:e3ee9b9] in mainline

File:

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

kernel/generic/src/adt/btree.c

@@ -53 +53 @@
 #include <panic.h>
 #include <print.h>
-#include <trace.h>
 
 static slab_cache_t *btree_node_slab;
@@ -80 +79 @@
  *
  */
-NO_TRACE static void node_initialize(btree_node_t *node)
+static void node_initialize(btree_node_t *node)
 {
         unsigned int i;
@@ -119 +118 @@
  *
  */
-NO_TRACE static void btree_destroy_subtree(btree_node_t *root)
+static void btree_destroy_subtree(btree_node_t *root)
 {
         size_t i;
@@ -152 +151 @@
  *
  */
-NO_TRACE static void node_insert_key_and_rsubtree(btree_node_t *node,
-    btree_key_t key, void *value, btree_node_t *rsubtree)
+static void node_insert_key_and_rsubtree(btree_node_t *node, btree_key_t key,
+    void *value, btree_node_t *rsubtree)
 {
         size_t i;
@@ -187 +186 @@
  *
  */
-NO_TRACE static size_t find_key_by_subtree(btree_node_t *node,
-    btree_node_t *subtree, bool right)
+static size_t find_key_by_subtree(btree_node_t *node, btree_node_t *subtree,
+    bool right)
 {
         size_t i;
@@ -210 +209 @@
  *
  */
-NO_TRACE static void node_remove_key_and_lsubtree(btree_node_t *node,
-    btree_key_t key)
+static void node_remove_key_and_lsubtree(btree_node_t *node, btree_key_t key)
 {
         size_t i;
@@ -244 +242 @@
  *
  */
-NO_TRACE static void node_remove_key_and_rsubtree(btree_node_t *node,
-    btree_key_t key)
+static void node_remove_key_and_rsubtree(btree_node_t *node, btree_key_t key)
 {
         size_t i, j;
@@ -276 +273 @@
  *
  */
-NO_TRACE static void node_insert_key_and_lsubtree(btree_node_t *node,
-    btree_key_t key, void *value, btree_node_t *lsubtree)
+static void node_insert_key_and_lsubtree(btree_node_t *node, btree_key_t key,
+    void *value, btree_node_t *lsubtree)
 {
         size_t i;
@@ -316 +313 @@
  *
  */
-NO_TRACE static void rotate_from_left(btree_node_t *lnode, btree_node_t *rnode,
-    size_t idx)
+static void rotate_from_left(btree_node_t *lnode, btree_node_t *rnode, size_t idx)
 {
         btree_key_t key = lnode->key[lnode->keys - 1];
@@ -352 +348 @@
  *
  */
-NO_TRACE static void rotate_from_right(btree_node_t *lnode, btree_node_t *rnode,
-    size_t idx)
+static void rotate_from_right(btree_node_t *lnode, btree_node_t *rnode, size_t idx)
 {
         btree_key_t key = rnode->key[0];
@@ -390 +385 @@
  *
  */
-NO_TRACE static bool try_insert_by_rotation_to_left(btree_node_t *node,
+static bool try_insert_by_rotation_to_left(btree_node_t *node,
     btree_key_t inskey, void *insvalue, btree_node_t *rsubtree)
 {
@@ -439 +434 @@
  *
  */
-NO_TRACE static bool try_insert_by_rotation_to_right(btree_node_t *node,
+static bool try_insert_by_rotation_to_right(btree_node_t *node,
     btree_key_t inskey, void *insvalue, btree_node_t *rsubtree)
 {
@@ -493 +488 @@
  *
  */
-NO_TRACE static btree_node_t *node_split(btree_node_t *node, btree_key_t key,
+static btree_node_t *node_split(btree_node_t *node, btree_key_t key,
     void *value, btree_node_t *rsubtree, btree_key_t *median)
 {
@@ -557 +552 @@
  *
  */
-NO_TRACE static void _btree_insert(btree_t *t, btree_key_t key, void *value,
+static void _btree_insert(btree_t *t, btree_key_t key, void *value,
     btree_node_t *rsubtree, btree_node_t *node)
 {
@@ -644 +639 @@
  *
  */
-NO_TRACE static bool try_rotation_from_left(btree_node_t *rnode)
+static bool try_rotation_from_left(btree_node_t *rnode)
 {
         size_t idx;
@@ -681 +676 @@
  *
  */
-NO_TRACE static bool try_rotation_from_right(btree_node_t *lnode)
+static bool try_rotation_from_right(btree_node_t *lnode)
 {
         size_t idx;
@@ -719 +714 @@
  *
  */
-NO_TRACE static btree_node_t *node_combine(btree_node_t *node)
+static btree_node_t *node_combine(btree_node_t *node)
 {
         size_t idx;
@@ -769 +764 @@
  *
  */
-NO_TRACE static void _btree_remove(btree_t *t, btree_key_t key,
-    btree_node_t *node)
+static void _btree_remove(btree_t *t, btree_key_t key, btree_node_t *node)
 {
         if (ROOT_NODE(node)) {