Changeset 3698e44 in mainline for uspace/app/taskdump/taskdump.c

Timestamp:

2010-01-26T22:46:29Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

196a1439, 2314381

Parents:

e515b21a

Message:

Add ability to determine task name and load symbol table from the binary executable. Resolve symbol names in stack traces when dumping.

File:

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

uspace/app/taskdump/taskdump.c

@@ -46 +46 @@
 #include <bool.h>
 
+#include <symtab.h>
 #include <stacktrace.h>
 
@@ -56 +57 @@
 static task_id_t task_id;
 static bool dump_memory;
+static char *app_name;
+static symtab_t *app_symtab;
 
 static int connect_task(task_id_t task_id);
@@ -67 +70 @@
 static int td_read_uintptr(void *arg, uintptr_t addr, uintptr_t *value);
 
+static void autoload_syms(void);
+static char *get_app_task_name(void);
+static char *fmt_sym_address(uintptr_t addr);
+
 int main(int argc, char *argv[])
 {
@@ -90 +97 @@
         }
 
-        printf("Dumping task %lld.\n\n", task_id);
+        app_name = get_app_task_name();
+        app_symtab = NULL;
+
+        printf("Dumping task '%s' (task ID %lld).\n", app_name, task_id);
+        autoload_syms();
+        putchar('\n');
 
         rc = threads_dump();
@@ -303 +315 @@
         uintptr_t pc, fp, nfp;
         stacktrace_t st;
+        char *sym_pc;
         int rc;
 
@@ -320 +333 @@
 
         while (stacktrace_fp_valid(&st, fp)) {
-                printf("%p: %p()\n", fp, pc);
+                sym_pc = fmt_sym_address(pc);
+                printf("  %p: %s()\n", fp, sym_pc);
+                free(sym_pc);
 
                 rc = stacktrace_ra_get(&st, fp, &pc);
@@ -412 +427 @@
 }
 
+/** Attempt to find the right executable file and load the symbol table. */
+static void autoload_syms(void)
+{
+        char *file_name;
+        int rc;
+
+        assert(app_name != NULL);
+        assert(app_symtab == NULL);
+
+        rc = asprintf(&file_name, "/app/%s", app_name);
+        if (rc < 0) {
+                printf("Memory allocation failure.\n");
+                exit(1);
+        }
+
+        rc = symtab_load(file_name, &app_symtab);
+        if (rc == EOK) {
+                printf("Loaded symbol table from %s\n", file_name);
+                free(file_name);
+                return;
+        }
+
+        free(file_name);
+
+        rc = asprintf(&file_name, "/srv/%s", app_name);
+        if (rc < 0) {
+                printf("Memory allocation failure.\n");
+                exit(1);
+        }
+
+        rc = symtab_load("/srv/xyz", &app_symtab);
+        if (rc == EOK) {
+                printf("Loaded symbol table from %s\n", file_name);
+                free(file_name);
+                return;
+        }
+
+        free(file_name);
+        printf("Failed autoloading symbol table.\n");
+}
+
+static char *get_app_task_name(void)
+{
+        char dummy_buf;
+        size_t copied, needed, name_size;
+        char *name;
+        int rc;
+
+        rc = udebug_name_read(phoneid, &dummy_buf, 0, &copied, &needed);
+        if (rc < 0)
+                return NULL;
+
+        name_size = needed;
+        name = malloc(name_size + 1);
+        rc = udebug_name_read(phoneid, name, name_size, &copied, &needed);
+        if (rc < 0) {
+                free(name);
+                return NULL;
+        }
+
+        assert(copied == name_size);
+        assert(copied == needed);
+        name[copied] = '\0';
+
+        return name;
+}
+
+/** Format address in symbolic form.
+ *
+ * Formats address as <symbol_name>+<offset> (<address>), if possible,
+ * otherwise as <address>.
+ *
+ * @param addr  Address to format.
+ * @return      Newly allocated string, address in symbolic form.
+ */
+static char *fmt_sym_address(uintptr_t addr)
+{
+        char *name;
+        size_t offs;
+        int rc;
+        char *str;
+
+        if (app_symtab != NULL) {
+                rc = symtab_addr_to_name(app_symtab, addr, &name, &offs);
+        } else {
+                rc = ENOTSUP;
+        }
+
+        if (rc == EOK) {
+                rc = asprintf(&str, "(%p) %s+%p", addr, name, offs);
+        } else {
+                rc = asprintf(&str, "%p", addr);
+        }
+
+        if (rc < 0) {
+                printf("Memory allocation error.\n");
+                exit(1);
+        }
+
+        return str;
+}
+
 /** @}
  */