Changeset c1b979a in mainline for uspace/app

Timestamp:

2014-07-11T23:06:30Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

78192cc7

Parents:

8e4a408

Message:

Taskdump printing of fibril stacktraces.

Location:

uspace/app/taskdump

Files:

• Makefile (modified) (1 diff)
• fibrildump.c (added)
• include/fibrildump.h (added)
• include/symtab.h (modified) (1 diff)
• include/taskdump.h (added)
• symtab.c (modified) (1 diff)
• taskdump.c (modified) (6 diffs)

uspace/app/taskdump/Makefile

@@ -33 +33 @@
 SOURCES = \
         elf_core.c \
+        fibrildump.c \
         taskdump.c \
         symtab.c

uspace/app/taskdump/include/symtab.h

@@ -50 +50 @@
 extern int symtab_load(const char *file_name, symtab_t **symtab);
 extern void symtab_delete(symtab_t *st);
-extern int symtab_name_to_addr(symtab_t *st, char *name, uintptr_t *addr);
+extern int symtab_name_to_addr(symtab_t *st, const char *name, uintptr_t *addr);
 extern int symtab_addr_to_name(symtab_t *symtab, uintptr_t addr, char **name,
     size_t *offs);

uspace/app/taskdump/symtab.c

@@ -202 +202 @@
  * @return      EOK on success, ENOENT if no such symbol was found.
  */
-int symtab_name_to_addr(symtab_t *st, char *name, uintptr_t *addr)
+int symtab_name_to_addr(symtab_t *st, const char *name, uintptr_t *addr)
 {
         size_t i;

uspace/app/taskdump/taskdump.c

@@ -35 +35 @@
 #include <async.h>
 #include <elf/elf_linux.h>
+#include <fibrildump.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -52 +53 @@
 #include <elf_core.h>
 #include <stacktrace.h>
+#include <taskdump.h>
 
 #define LINE_BYTES 16
@@ -76 +78 @@
 static istate_t reg_state;
 
+static stacktrace_ops_t td_stacktrace_ops = {
+        .read_uintptr = td_read_uintptr
+}; 
+
 int main(int argc, char *argv[])
 {
@@ -106 +112 @@
         if (rc < 0)
                 printf("Failed dumping address space areas.\n");
+
+        rc = fibrils_dump(app_symtab, sess);
+        if (rc < 0)
+                printf("Failed dumping fibrils.\n");
 
         udebug_end(sess);
@@ -311 +321 @@
 }
 
+int td_stacktrace(uintptr_t fp, uintptr_t pc)
+{
+        uintptr_t nfp;
+        stacktrace_t st;
+        char *sym_pc;
+        int rc;
+
+        st.op_arg = NULL;
+        st.ops = &td_stacktrace_ops;
+
+        while (stacktrace_fp_valid(&st, fp)) {
+                sym_pc = fmt_sym_address(pc);
+                printf("  %p: %s\n", (void *) fp, sym_pc);
+                free(sym_pc);
+
+                rc = stacktrace_ra_get(&st, fp, &pc);
+                if (rc != EOK)
+                        return rc;
+
+                rc = stacktrace_fp_prev(&st, fp, &nfp);
+                if (rc != EOK)
+                        return rc;
+
+                fp = nfp;
+        }
+
+        return EOK;
+}
+
 static int thread_dump(uintptr_t thash)
 {
         istate_t istate;
-        uintptr_t pc, fp, nfp;
-        stacktrace_t st;
+        uintptr_t pc, fp;
         char *sym_pc;
         int rc;
@@ -336 +374 @@
         free(sym_pc);
 
-        st.op_arg = NULL;
-        st.read_uintptr = td_read_uintptr;
-
-        while (stacktrace_fp_valid(&st, fp)) {
-                sym_pc = fmt_sym_address(pc);
-                printf("  %p: %s\n", (void *) fp, sym_pc);
-                free(sym_pc);
-
-                rc = stacktrace_ra_get(&st, fp, &pc);
-                if (rc != EOK)
-                        return rc;
-
-                rc = stacktrace_fp_prev(&st, fp, &nfp);
-                if (rc != EOK)
-                        return rc;
-
-                fp = nfp;
-        }
+        (void) td_stacktrace(fp, pc);
 
         return EOK;