Changes in uspace/app/taskdump/taskdump.c [c1b979a:3e6a98c5] in mainline

File:

• uspace/app/taskdump/taskdump.c (modified) (6 diffs)

uspace/app/taskdump/taskdump.c

@@ -35 +35 @@
 #include <async.h>
 #include <elf/elf_linux.h>
-#include <fibrildump.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -53 +52 @@
 #include <elf_core.h>
 #include <stacktrace.h>
-#include <taskdump.h>
 
 #define LINE_BYTES 16
@@ -78 +76 @@
 static istate_t reg_state;
 
-static stacktrace_ops_t td_stacktrace_ops = {
-        .read_uintptr = td_read_uintptr
-}; 
-
 int main(int argc, char *argv[])
 {
@@ -112 +106 @@
         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);
@@ -321 +311 @@
 }
 
-int td_stacktrace(uintptr_t fp, uintptr_t pc)
-{
-        uintptr_t nfp;
+static int thread_dump(uintptr_t thash)
+{
+        istate_t istate;
+        uintptr_t pc, fp, nfp;
         stacktrace_t st;
         char *sym_pc;
         int rc;
 
+        rc = udebug_regs_read(sess, thash, &istate);
+        if (rc < 0) {
+                printf("Failed reading registers (%d).\n", rc);
+                return EIO;
+        }
+
+        pc = istate_get_pc(&istate);
+        fp = istate_get_fp(&istate);
+
+        /* Save register state for dumping to core file later. */
+        reg_state = istate;
+
+        sym_pc = fmt_sym_address(pc);
+        printf("Thread %p: PC = %s. FP = %p\n", (void *) thash,
+            sym_pc, (void *) fp);
+        free(sym_pc);
+
         st.op_arg = NULL;
-        st.ops = &td_stacktrace_ops;
+        st.read_uintptr = td_read_uintptr;
 
         while (stacktrace_fp_valid(&st, fp)) {
@@ -346 +354 @@
                 fp = nfp;
         }
-
-        return EOK;
-}
-
-static int thread_dump(uintptr_t thash)
-{
-        istate_t istate;
-        uintptr_t pc, fp;
-        char *sym_pc;
-        int rc;
-
-        rc = udebug_regs_read(sess, thash, &istate);
-        if (rc < 0) {
-                printf("Failed reading registers (%d).\n", rc);
-                return EIO;
-        }
-
-        pc = istate_get_pc(&istate);
-        fp = istate_get_fp(&istate);
-
-        /* Save register state for dumping to core file later. */
-        reg_state = istate;
-
-        sym_pc = fmt_sym_address(pc);
-        printf("Thread %p: PC = %s. FP = %p\n", (void *) thash,
-            sym_pc, (void *) fp);
-        free(sym_pc);
-
-        (void) td_stacktrace(fp, pc);
 
         return EOK;