Changes in uspace/app/taskdump/taskdump.c [dafa2d04:1ccafee] in mainline

File:

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

uspace/app/taskdump/taskdump.c

@@ -40 +40 @@
 #include <udebug.h>
 #include <task.h>
-#include <as.h>
+#include <kernel/mm/as.h>
 #include <sys/types.h>
 #include <sys/typefmt.h>
@@ -49 +49 @@
 
 #include <symtab.h>
-#include <elf_core.h>
 #include <stacktrace.h>
 
@@ -59 +58 @@
 static int phoneid;
 static task_id_t task_id;
-static bool write_core_file;
-static char *core_file_name;
+static bool dump_memory;
 static char *app_name;
 static symtab_t *app_symtab;
@@ -82 +80 @@
         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");
-        write_core_file = false;
+        dump_memory = false;
 
         if (parse_args(argc, argv) < 0)
@@ -167 +172 @@
                                         return -1;
                                 }
-                        } else if (arg[1] == 'c' && arg[2] == '\0') {
-                                write_core_file = true;
-
-                                --argc; ++argv;
-                                core_file_name = *argv;
+                        } else if (arg[1] == 'm' && arg[2] == '\0') {
+                                dump_memory = true;
                         } else {
                                 printf("Uknown option '%s'\n", arg[0]);
@@ -201 +203 @@
 static void print_syntax(void)
 {
-        printf("Syntax: taskdump [-c <core_file>] -t <task_id>\n");
-        printf("\t-c <core_file_id>\tName of core file to write.\n");
+        printf("Syntax: taskdump [-m] -t <task_id>\n");
+        printf("\t-m\tDump memory area contents.\n");
         printf("\t-t <task_id>\tWhich task to dump.\n");
 }
@@ -295 +297 @@
                     (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;
-                }
-        }
 
         free(ainfo_buf);