Changeset eb73a50 in mainline

Timestamp:

2010-02-07T10:56:37Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

a60b2d7, e27cf669

Parents:

f27ada7 (diff), e067dcd (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 taskdump fixes.

Location:

uspace

Files:

• app/taskdump/symtab.c (modified) (1 diff)
• srv/taskmon/taskmon.c (modified) (1 diff)

uspace/app/taskdump/symtab.c

@@ -255 +255 @@
 
                 stype = ELF_ST_TYPE(st->sym[i].st_info);
-                if (stype != STT_OBJECT && stype != STT_FUNC)
-                        continue;
+                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/srv/taskmon/taskmon.c

@@ -66 +66 @@
         }
 
-        if (asprintf(&dump_fname, "/data/core" PRIuTASKID, taskid) < 0) {
+        if (asprintf(&dump_fname, "/data/core%" PRIuTASKID, taskid) < 0) {
                 printf("Memory allocation failed.\n");
                 return;