diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2002-02-23 09:20:59 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2002-02-23 09:20:59 +0000 |
| commit | 7fec4f2f70d417b858127d340f7e8f66d8053572 (patch) | |
| tree | c511d342ff5b55a1eaf970a60a1b8ff972dc6ec3 | |
| parent | 557fab43bd3cf75f87ba7efb65c9f4884e261a6c (diff) | |
| download | glibc-7fec4f2f70d417b858127d340f7e8f66d8053572.tar.gz glibc-7fec4f2f70d417b858127d340f7e8f66d8053572.tar.xz glibc-7fec4f2f70d417b858127d340f7e8f66d8053572.zip | |
Update.
* elf/sprof.c (load_profdata): If do_test provide information as to why loading failed. * elf/dl-profile.c (_dl_start_profile): Initialize all of hist_hdr.dimen.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | elf/dl-profile.c | 6 | ||||
| -rw-r--r-- | elf/sprof.c | 14 |
3 files changed, 23 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index dbe013ef48..822a50cc96 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2002-02-23 Ulrich Drepper <drepper@redhat.com> + * elf/sprof.c (load_profdata): If do_test provide information as + to why loading failed. + * elf/dl-profile.c (_dl_start_profile): Initialize all of + hist_hdr.dimen. + * csu/set-init.c: Moved to... * sysdeps/mach/hurd/set-init.c: ...here. New file. * csu/Makefile: Don't compile set-init. diff --git a/elf/dl-profile.c b/elf/dl-profile.c index 19d1865c25..05b5c28fcb 100644 --- a/elf/dl-profile.c +++ b/elf/dl-profile.c @@ -260,7 +260,11 @@ _dl_start_profile (struct link_map *map, const char *output_dir) *(int32_t *) hist_hdr.hist_size = kcountsize / sizeof (HISTCOUNTER); *(int32_t *) hist_hdr.prof_rate = __profile_frequency (); if (sizeof (hist_hdr.dimen) >= sizeof ("seconds")) - memcpy (hist_hdr.dimen, "seconds", sizeof ("seconds")); + { + memcpy (hist_hdr.dimen, "seconds", sizeof ("seconds")); + memset (hist_hdr.dimen + sizeof ("seconds"), '\0', + sizeof (hist_hdr.dimen) - sizeof ("seconds")); + } else strncpy (hist_hdr.dimen, "seconds", sizeof (hist_hdr.dimen)); hist_hdr.dimen_abbrev = 's'; diff --git a/elf/sprof.c b/elf/sprof.c index 7d7fd9f978..3424282044 100644 --- a/elf/sprof.c +++ b/elf/sprof.c @@ -752,9 +752,21 @@ load_profdata (const char *name, struct shobj *shobj) sizeof (struct gmon_hist_hdr)) != 0 || narcsp[-1] != GMON_TAG_CG_ARC) { - free (result); error (0, 0, _("`%s' is no correct profile data file for `%s'"), name, shobj->name); + if (do_test) + { + if (memcmp (addr, &gmon_hdr, sizeof (struct gmon_hdr)) != 0) + puts ("gmon_hdr differs"); + if (*(uint32_t *) result->hist != GMON_TAG_TIME_HIST) + puts ("result->hist differs"); + if (memcmp (result->hist_hdr, &hist_hdr, + sizeof (struct gmon_hist_hdr)) != 0) + puts ("hist_hdr differs"); + if (narcsp[-1] != GMON_TAG_CG_ARC) + puts ("narcsp[-1] differs"); + } + free (result); munmap (addr, st.st_size); return NULL; } |