Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 95e6c4f in mainline


Ignore:
Timestamp:
2010-01-27T20:21:49Z (10 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
master
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:
2 edited

Legend:

Unmodified
Added
Removed
  • uspace/app/taskdump/taskdump.c

    rbca408b r95e6c4f  
    327327        fp = istate_get_fp(&istate);
    328328
    329         printf("Thread 0x%lx crashed at PC 0x%lx. FP 0x%lx\n", thash, pc, fp);
     329        sym_pc = fmt_sym_address(pc);
     330        printf("Thread 0x%lx crashed at %s. FP = 0x%lx\n", thash, sym_pc, fp);
     331        free(sym_pc);
    330332
    331333        st.op_arg = NULL;
     
    334336        while (stacktrace_fp_valid(&st, fp)) {
    335337                sym_pc = fmt_sym_address(pc);
    336                 printf("  %p: %s()\n", fp, sym_pc);
     338                printf("  %p: %s\n", fp, sym_pc);
    337339                free(sym_pc);
    338340
     
    390392
    391393        while (pos < size) {
    392                 printf("%08x:", addr + pos);
     394                printf("%08lx:", addr + pos);
    393395                for (i = 0; i < LINE_BYTES; ++i) {
    394396                        if (i % 4 == 0) putchar(' ');
     
    457459        }
    458460
    459         rc = symtab_load("/srv/xyz", &app_symtab);
     461        rc = symtab_load(file_name, &app_symtab);
    460462        if (rc == EOK) {
    461463                printf("Loaded symbol table from %s\n", file_name);
     
    516518
    517519        if (rc == EOK) {
    518                 rc = asprintf(&str, "(%p) %s+%p", addr, name, offs);
     520                rc = asprintf(&str, "%p (%s+%p)", addr, name, offs);
    519521        } else {
    520522                rc = asprintf(&str, "%p", addr);
  • uspace/srv/taskmon/taskmon.c

    rbca408b r95e6c4f  
    7272        printf(NAME ": Task %lld fault in thread 0x%lx.\n", taskid, thread);
    7373
    74         argv[0] = fname = "/app/redir";
     74#ifdef CONFIG_VERBOSE_DUMPS
     75        argv[0] = "/app/redir";
    7576        argv[1] = "-i";
    7677        argv[2] = "/readme";
     
    7879        argv[4] = dump_fname;
    7980        argv[5] = "--";
    80 
    81 #ifdef CONFIG_VERBOSE_DUMPS
    8281        argv[6] = "/app/taskdump";
    8382        argv[7] = "-m";
     
    8685        argv[10] = NULL;
    8786#else
    88         argv[6] = "/app/taskdump";
    89         argv[7] = "-t";
    90         argv[8] = s_taskid;
    91         argv[9] = NULL;
     87        argv[0] = "/app/taskdump";
     88        argv[1] = "-t";
     89        argv[2] = s_taskid;
     90        argv[3] = NULL;
    9291#endif
     92        fname = argv[0];
     93
    9394        printf(NAME ": Executing");
    9495        s = argv;
Note: See TracChangeset for help on using the changeset viewer.