Changeset 7a0359b in mainline for kernel/generic/src/adt/btree.c

Timestamp:

2010-07-02T15:42:19Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

bbfdf62

Parents:

e3ee9b9

Message:

improve kernel function tracing

• add support for more generic kernel sources
• replace attribute((no_instrument_function)) with NO_TRACE macro (shorter and for future compatibility with different compilers)
• to be on the safe side, do not instrument most of the inline and static functions (plus some specific non-static functions)

collateral code cleanup (no change in functionality)

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