Changeset 95e6c4f in mainline

Timestamp:

2010-01-27T20:21:49Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

a9bbe48d, b79d450

Parents:

bca408b (diff), f0bdfb7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge small taskdump improvements.

Location:

uspace

Files:

• app/taskdump/taskdump.c (modified) (5 diffs)
• srv/taskmon/taskmon.c (modified) (3 diffs)

uspace/app/taskdump/taskdump.c

@@ -327 +327 @@
         fp = istate_get_fp(&istate);
 
-        printf("Thread 0x%lx crashed at PC 0x%lx. FP 0x%lx\n", thash, pc, fp);
+        sym_pc = fmt_sym_address(pc);
+        printf("Thread 0x%lx crashed at %s. FP = 0x%lx\n", thash, sym_pc, fp);
+        free(sym_pc);
 
         st.op_arg = NULL;
@@ -334 +336 @@
         while (stacktrace_fp_valid(&st, fp)) {
                 sym_pc = fmt_sym_address(pc);
-                printf("  %p: %s()\n", fp, sym_pc);
+                printf("  %p: %s\n", fp, sym_pc);
                 free(sym_pc);
 
@@ -390 +392 @@
 
         while (pos < size) {
-                printf("%08x:", addr + pos);
+                printf("%08lx:", addr + pos);
                 for (i = 0; i < LINE_BYTES; ++i) {
                         if (i % 4 == 0) putchar(' ');
@@ -457 +459 @@
         }
 
-        rc = symtab_load("/srv/xyz", &app_symtab);
+        rc = symtab_load(file_name, &app_symtab);
         if (rc == EOK) {
                 printf("Loaded symbol table from %s\n", file_name);
@@ -516 +518 @@
 
         if (rc == EOK) {
-                rc = asprintf(&str, "(%p) %s+%p", addr, name, offs);
+                rc = asprintf(&str, "%p (%s+%p)", addr, name, offs);
         } else {
                 rc = asprintf(&str, "%p", addr);

uspace/srv/taskmon/taskmon.c

@@ -72 +72 @@
         printf(NAME ": Task %lld fault in thread 0x%lx.\n", taskid, thread);
 
-        argv[0] = fname = "/app/redir";
+#ifdef CONFIG_VERBOSE_DUMPS
+        argv[0] = "/app/redir";
         argv[1] = "-i";
         argv[2] = "/readme";
@@ -78 +79 @@
         argv[4] = dump_fname;
         argv[5] = "--";
-
-#ifdef CONFIG_VERBOSE_DUMPS
         argv[6] = "/app/taskdump";
         argv[7] = "-m";
@@ -86 +85 @@
         argv[10] = NULL;
 #else
-        argv[6] = "/app/taskdump";
-        argv[7] = "-t";
-        argv[8] = s_taskid;
-        argv[9] = NULL;
+        argv[0] = "/app/taskdump";
+        argv[1] = "-t";
+        argv[2] = s_taskid;
+        argv[3] = NULL;
 #endif
+        fname = argv[0];
+
         printf(NAME ": Executing");
         s = argv;