Changeset e16e0d59 in mainline for kernel/generic/src/synch/spinlock.c

Timestamp:

2009-03-17T20:33:18Z (16 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

5eb90cb

Parents:

b1c8dc0

Message:

Make optionality of symbol information less intrusive per Jakub's request. Also, improve symtab function names and update their semantics.

File:

• kernel/generic/src/synch/spinlock.c (modified) (3 diffs)

kernel/generic/src/synch/spinlock.c

@@ -43 +43 @@
 #include <print.h>
 #include <debug.h>
-
-#ifdef CONFIG_SYMTAB
 #include <symtab.h>
-#endif
 
 #ifdef CONFIG_FB
@@ -81 +78 @@
         count_t i = 0;
         bool deadlock_reported = false;
-#ifdef CONFIG_SYMTAB
-        char *symbol;
-#endif
 
         preemption_disable();
@@ -112 +106 @@
 #endif
                 if (i++ > DEADLOCK_THRESHOLD) {
-                        printf("cpu%u: looping on spinlock %" PRIp ":%s, caller=%" PRIp,
-                                CPU->id, sl, sl->name, CALLER);
-#ifdef CONFIG_SYMTAB
-                        symbol = get_symtab_entry(CALLER);
-                        if (symbol)
-                                printf("(%s)", symbol);
-#endif
-                        printf("\n");
+                        printf("cpu%u: looping on spinlock %" PRIp ":%s, "
+                            "caller=%" PRIp "(%s)", CPU->id, sl, sl->name,
+                            CALLER, symtab_fmt_name_lookup(CALLER));
+
                         i = 0;
                         deadlock_reported = true;