Changeset 5bda2f96 in mainline

Timestamp:

2010-02-09T21:03:02Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

83b4cf53

Parents:

696979ce (diff), a60b2d7 (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 from mainline.

Files:

• HelenOS.config (modified) (1 diff)
• uspace/app/taskdump/Makefile (modified) (1 diff)
• uspace/app/taskdump/elf_core.c (added)
• uspace/app/taskdump/include/elf.h (modified) (1 diff)
• uspace/app/taskdump/include/elf_core.h (added)
• uspace/app/taskdump/symtab.c (modified) (3 diffs)
• uspace/app/taskdump/taskdump.c (modified) (7 diffs)
• uspace/srv/bd/file_bd/file_bd.c (modified) (3 diffs)
• uspace/srv/taskmon/taskmon.c (modified) (3 diffs)

HelenOS.config

@@ -505 +505 @@
 ! [CONFIG_START_BD=y] CONFIG_MOUNT_DATA (n/y)
 
-% Verbose task dumps
-! CONFIG_VERBOSE_DUMPS (n/y)
+% Write core files
+! CONFIG_WRITE_CORE_FILES (n/y)

uspace/app/taskdump/Makefile

@@ -34 +34 @@
 
 SOURCES = \
+        elf_core.c \
         taskdump.c \
         symtab.c

uspace/app/taskdump/include/elf.h

@@ -148 +148 @@
 #define SHF_MASKPROC            0xf0000000
 
+/** Macros for decomposing elf_symbol.st_info into binging and type */
+#define ELF_ST_BIND(i)          ((i) >> 4)
+#define ELF_ST_TYPE(i)          ((i) & 0x0f)
+#define ELF_ST_INFO(b, t)       (((b) << 4) + ((t) & 0x0f))
+
 /**
  * Symbol binding

uspace/app/taskdump/symtab.c

@@ -206 +206 @@
         size_t i;
         char *sname;
+        unsigned stype;
 
         for (i = 0; i < st->sym_size / sizeof(elf_symbol_t); ++i) {
                 if (st->sym[i].st_name == 0)
+                        continue;
+
+                stype = ELF_ST_TYPE(st->sym[i].st_info);
+                if (stype != STT_OBJECT && stype != STT_FUNC)
                         continue;
 
@@ -240 +245 @@
         uintptr_t saddr, best_addr;
         char *sname, *best_name;
+        unsigned stype;
 
         best_name = NULL;
@@ -248 +254 @@
                         continue;
 
+                stype = ELF_ST_TYPE(st->sym[i].st_info);
+                if (stype != STT_OBJECT && stype != STT_FUNC &&
+                    stype != STT_NOTYPE) {
+                        continue;
+                }
+
                 saddr = st->sym[i].st_value;
                 sname = st->strtab + st->sym[i].st_name;
+
+                /* An ugly hack to filter out some special ARM symbols. */
+                if (sname[0] == '$')
+                        continue;
 
                 if (best_name == NULL || (saddr <= addr && saddr > best_addr)) {

uspace/app/taskdump/taskdump.c

@@ -40 +40 @@
 #include <udebug.h>
 #include <task.h>
-#include <kernel/mm/as.h>
+#include <as.h>
 #include <sys/types.h>
 #include <sys/typefmt.h>
@@ -49 +49 @@
 
 #include <symtab.h>
+#include <elf_core.h>
 #include <stacktrace.h>
 
@@ -58 +59 @@
 static int phoneid;
 static task_id_t task_id;
-static bool dump_memory;
+static bool write_core_file;
+static char *core_file_name;
 static char *app_name;
 static symtab_t *app_symtab;
@@ -80 +82 @@
         int rc;
 
-        /*
-         * FIXME: The stdio module cannot currently detect whether we are
-         * writing to a console or file. This workaround make file output
-         * faster.
-         */
-        setvbuf(stdout, NULL, _IOFBF, 32768);
-
         printf("Task Dump Utility\n");
-        dump_memory = false;
+        write_core_file = false;
 
         if (parse_args(argc, argv) < 0)
@@ -172 +167 @@
                                         return -1;
                                 }
-                        } else if (arg[1] == 'm' && arg[2] == '\0') {
-                                dump_memory = true;
+                        } else if (arg[1] == 'c' && arg[2] == '\0') {
+                                write_core_file = true;
+
+                                --argc; ++argv;
+                                core_file_name = *argv;
                         } else {
                                 printf("Uknown option '%s'\n", arg[0]);
@@ -203 +201 @@
 static void print_syntax(void)
 {
-        printf("Syntax: taskdump [-m] -t <task_id>\n");
-        printf("\t-m\tDump memory area contents.\n");
+        printf("Syntax: taskdump [-c <core_file>] -t <task_id>\n");
+        printf("\t-c <core_file_id>\tName of core file to write.\n");
         printf("\t-t <task_id>\tWhich task to dump.\n");
 }
@@ -297 +295 @@
                     (ainfo_buf[i].flags & AS_AREA_CACHEABLE) ? 'C' : '-',
                     ainfo_buf[i].start_addr, ainfo_buf[i].size);
-
-                if (dump_memory) {
-                        putchar('\n');
-                        area_dump(&ainfo_buf[i]);
-                        putchar('\n');
+        }
+
+        putchar('\n');
+
+        if (write_core_file) {
+                printf("Writing core file '%s'\n", core_file_name);
+                rc = elf_core_save(core_file_name, ainfo_buf, n_areas, phoneid);
+                if (rc != EOK) {
+                        printf("Failed writing core file.\n");
+                        return EIO;
                 }
         }
-
-        putchar('\n');
 
         free(ainfo_buf);

uspace/srv/bd/file_bd/file_bd.c

@@ -48 +48 @@
 #include <devmap.h>
 #include <sys/types.h>
+#include <sys/typefmt.h>
 #include <errno.h>
 #include <bool.h>
@@ -207 +208 @@
         int rc;
 
+        /* Check whether access is within device address bounds. */
+        if (ba + cnt > num_blocks) {
+                printf(NAME ": Accessed blocks %" PRIuBN "-%" PRIuBN ", while "
+                    "max block number is %" PRIuBN ".\n", ba, ba + cnt - 1,
+                    num_blocks - 1);
+                return ELIMIT;
+        }
+
         fibril_mutex_lock(&dev_lock);
 
@@ -237 +246 @@
         int rc;
 
+        /* Check whether access is within device address bounds. */
+        if (ba + cnt > num_blocks) {
+                printf(NAME ": Accessed blocks %" PRIuBN "-%" PRIuBN ", while "
+                    "max block numeber is %" PRIuBN ".\n", ba, ba + cnt - 1,
+                    num_blocks - 1);
+                return ELIMIT;
+        }
+
         fibril_mutex_lock(&dev_lock);
 

uspace/srv/taskmon/taskmon.c

@@ -49 +49 @@
 static void fault_event(ipc_callid_t callid, ipc_call_t *call)
 {
-        char *argv[11];
+        char *argv[6];
         char *fname;
         char *dump_fname;
@@ -66 +66 @@
         }
 
-        if (asprintf(&dump_fname, "/scratch/d" PRIuTASKID ".txt", taskid) < 0) {
+        if (asprintf(&dump_fname, "/data/core%" PRIuTASKID, taskid) < 0) {
                 printf("Memory allocation failed.\n");
                 return;
@@ -73 +73 @@
         printf(NAME ": Task %" PRIuTASKID " fault in thread %p.\n", taskid, thread);
 
-#ifdef CONFIG_VERBOSE_DUMPS
-        argv[0] = "/app/redir";
-        argv[1] = "-i";
-        argv[2] = "/readme";
-        argv[3] = "-o";
-        argv[4] = dump_fname;
-        argv[5] = "--";
-        argv[6] = "/app/taskdump";
-        argv[7] = "-m";
-        argv[8] = "-t";
-        argv[9] = s_taskid;
-        argv[10] = NULL;
+#ifdef CONFIG_WRITE_CORE_FILES
+        argv[0] = "/app/taskdump";
+        argv[1] = "-c";
+        argv[2] = dump_fname;
+        argv[3] = "-t";
+        argv[4] = s_taskid;
+        argv[5] = NULL;
 #else
         argv[0] = "/app/taskdump";