Changeset e515b21a in mainline for uspace/app/taskdump/taskdump.c

Timestamp:

2010-01-26T21:31:56Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

3698e44

Parents:

80487bc5

Message:

Make stacktrace implementation in C library more generic. Use it in taskdump to print a stack trace of the faulting task.

File:

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

uspace/app/taskdump/taskdump.c

@@ -46 +46 @@
 #include <bool.h>
 
+#include <stacktrace.h>
+
 #define LINE_BYTES 16
 
@@ -57 +59 @@
 static int connect_task(task_id_t task_id);
 static int parse_args(int argc, char *argv[]);
-static void print_syntax();
+static void print_syntax(void);
 static int threads_dump(void);
 static int thread_dump(uintptr_t thash);
@@ -63 +65 @@
 static int area_dump(as_area_info_t *area);
 static void hex_dump(uintptr_t addr, void *buffer, size_t size);
+static int td_read_uintptr(void *arg, uintptr_t addr, uintptr_t *value);
 
 int main(int argc, char *argv[])
@@ -184 +187 @@
 }
 
-static void print_syntax()
+static void print_syntax(void)
 {
         printf("Syntax: taskdump [-m] -t <task_id>\n");
@@ -298 +301 @@
 {
         istate_t istate;
-        uintptr_t pc, fp;
+        uintptr_t pc, fp, nfp;
+        stacktrace_t st;
         int rc;
 
@@ -311 +315 @@
 
         printf("Thread 0x%lx crashed at PC 0x%lx. FP 0x%lx\n", thash, pc, fp);
-        printf("Istate hexdump:\n");
-        hex_dump(0, &istate, (sizeof(istate_t) + 15) & ~15);
+
+        st.op_arg = NULL;
+        st.read_uintptr = td_read_uintptr;
+
+        while (stacktrace_fp_valid(&st, fp)) {
+                printf("%p: %p()\n", fp, 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;
@@ -376 +395 @@
 }
 
+static int td_read_uintptr(void *arg, uintptr_t addr, uintptr_t *value)
+{
+        uintptr_t data;
+        int rc;
+
+        (void) arg;
+
+        rc = udebug_mem_read(phoneid, &data, addr, sizeof(data));
+        if (rc < 0) {
+                printf("Warning: udebug_mem_read() failed.\n");
+                return rc;
+        }
+
+        *value = data;
+        return EOK;
+}
+
 /** @}
  */