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

Timestamp:

2010-02-06T21:38:11Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

eb73a50

Parents:

25e963a (diff), dafa2d04 (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 saving of ELF core files.

File:

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

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);