mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-10 07:10:06 +00:00
11bf311edc
2007-01-11 Jakub Jelinek <jakub@redhat.com> * sysdeps/i386/soft-fp/sfp-machine.h: Remove. * sysdeps/x86_64/soft-fp/sfp-machine.h: Likewise. 2007-01-10 Ulrich Drepper <drepper@redhat.com> * io/fts.c: Make sure fts_cur is always valid after return from fts_read. Patch by Miloslav Trmac <mitr@redhat.com>. 2006-10-27 Richard Sandiford <richard@codesourcery.com> * elf/elf.h (R_MIPS_GLOB_DAT): Define. (R_MIPS_NUM): Bump by 1. 2007-01-03 Jakub Jelinek <jakub@redhat.com> * posix/execvp.c: Include alloca.h. (allocate_scripts_argv): Renamed to... (scripts_argv): ... this. Don't allocate buffer here nor count arguments. (execvp): Use alloca if possible. * posix/Makefile: Add rules to build and run tst-vfork3 test. * posix/tst-vfork3.c: New test. * stdlib/Makefile (tst-strtod3-ENV): Define. 2007-01-02 Ulrich Drepper <drepper@redhat.com> * posix/getconf.c: Update copyright year. * nss/getent.c: Likewise. * iconv/iconvconfig.c: Likewise. * iconv/iconv_prog.c: Likewise. * elf/ldconfig.c: Likewise. * catgets/gencat.c: Likewise. * csu/version.c: Likewise. * elf/ldd.bash.in: Likewise. * elf/sprof.c (print_version): Likewise. * locale/programs/locale.c: Likewise. * locale/programs/localedef.c: Likewise. * nscd/nscd.c (print_version): Likewise. * debug/xtrace.sh: Likewise. * malloc/memusage.sh: Likewise. * malloc/mtrace.pl: Likewise. * debug/catchsegv.sh: Likewise. 2006-12-24 Ulrich Drepper <drepper@redhat.com> * malloc/malloc.c (sYSMALLOc): Remove some unnecessary alignment attempts. 2006-12-23 Ulrich Drepper <drepper@redhat.com> * posix/wordexp.c: Remove some unnecessary tests. 2006-12-20 SUGIOKA Toshinobu <sugioka@itonet.co.jp> * sysdeps/unix/sysv/linux/sh/bits/shm.h: New file. * nss/getXXbyYY_r.c: Include atomic.h. (INTERNAL (REENTRANT_NAME)): Write startp after start_fct, add atomic_write_barrier () in between. 2006-11-28 Jakub Jelinek <jakub@redhat.com> * elf/dl-support.c: Include dl-procinfo.h. * sysdeps/powerpc/dl-procinfo.h (PPC_PLATFORM_POWER4, PPC_PLATFORM_PPC970, PPC_PLATFORM_POWER5, PPC_PLATFORM_POWER5_PLUS, PPC_PLATFORM_POWER6, PPC_PLATFORM_CELL_BE, PPC_PLATFORM_POWER6X): Define. (_dl_string_platform): Use PPC_PLATFORM_* macros instead of hardcoded constants. * sysdeps/powerpc/dl-procinfo.c (_dl_powerpc_platform): Use PPC_PLATFORM_* macros for array designators. 2006-11-11 Steven Munroe <sjmunroe@us.ibm.com> * sysdeps/powerpc/dl-procinfo.c (_dl_powerpc_cap_flags): Add 3 new cap names to the beginning. (_dl_powerpc_platforms): Add "power6x". * sysdeps/powerpc/dl-procinfo.h (_DL_HWCAP_FIRST): Decrease. (HWCAP_IMPORTANT): Add PPC_FEATURE_HAS_DFP. (_DL_PLATFORMS_COUNT): Increase. (_dl_string_platform): Handle power6x case. * sysdeps/powerpc/sysdep.h (PPC_FEATURE_PA6T, PPC_FEATURE_HAS_DFP, PPC_FEATURE_POWER6_EXT): Define. (PPC_FEATURE_POWER5, PPC_FEATURE_POWER5_PLUS): Correct Comment. [-2^31 .. 2^31) range. * sysdeps/unix/sysv/linux/bits/statvfs.h: Define ST_RELATIME. * sysdeps/unix/sysv/linux/internal_statvfs.c (__statvfs_getflags): Handle relatime mount option. 2006-12-13 Jakub Jelinek <jakub@redhat.com> * sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext.S: Include kernel-features.h. 2006-12-11 Ulrich Drepper <drepper@redhat.com> * stdlib/strtod_l.c (____STRTOF_INTERNAL): Parse thousand separators also if no non-zero digits found. * stdlib/Makefile (tests): Add tst-strtod3. [BZ #3664] * stdlib/strtod_l.c (____STRTOF_INTERNAL): Fix test to recognize empty parsed strings. * stdlib/Makefile (tests): Add tst-strtod2. * stdlib/tst-strtod2.c: New file. [BZ #3673] * stdlib/strtod_l.c (____STRTOF_INTERNAL): Fix exp_limit computation. * stdlib/Makefile (tests): Add tst-atof2. * stdlib/tst-atof2.c: New file. [BZ #3674] * stdlib/strtod_l.c (____STRTOF_INTERNAL): Adjust exponent value correctly if removing trailing zero of hex-float. * stdlib/Makefile (tests): Add tst-atof1. * stdlib/tst-atof1.c: New file. * misc/mntent_r.c (__hasmntopt): Check p[optlen] even when p == rest. Start searching for next comma at p rather than rest. * misc/Makefile (tests): Add tst-mntent2. * misc/tst-mntent2.c: New test. 2006-12-08 Ulrich Drepper <drepper@redhat.com> * malloc/memusage.c: Handle realloc with new size of zero and non-NULL pointer correctly. (me): Really write first record twice. (struct entry): Make format bi-arch safe. (dest): Write out more realloc statistics. * malloc/memusagestat.c (struct entry): Make format bi-arch safe. 2006-12-05 Jakub Jelinek <jakub@redhat.com> * nis/nis_subr.c (nis_getnames): Revert last change. 2006-12-03 Kaz Kojima <kkojima@rr.iij4u.or.jp> * sysdeps/unix/sysv/linux/sh/sys/io.h: Removed. 2006-11-30 H.J. Lu <hongjiu.lu@intel.com> * sysdeps/i386/i686/memcmp.S: Use jump table as the base of jump table entries. 2006-11-30 Jan Kratochvil <jan.kratochvil@redhat.com> * sysdeps/unix/sysv/linux/i386/clone.S: Provide CFI for the outermost `clone' function to ensure proper unwinding stop of gdb. * sysdeps/unix/sysv/linux/x86_64/clone.S: Likewise. 2006-12-01 Ulrich Drepper <drepper@redhat.com> * nscd/nscd.init: Remove obsolete and commented-out -S option handling. 2006-11-23 Jakub Jelinek <jakub@redhat.com> [BZ #3514] * manual/string.texi (strncmp): Fix pastos from wcscmp description. [BZ #3515] * manual/string.texi (strtok): Remove duplicate paragraph. 2006-12-01 Jan Kratochvil <jan.kratochvil@redhat.com> * sysdeps/unix/sysv/linux/x86_64/sigaction.c: Fix compatibility with libgcc not supporting `rflags' unwinding (register # >= 17). 2006-11-30 Jakub Jelinek <jakub@redhat.com> * sunrpc/svc_run.c (svc_run): Set my_pollfd to new_pollfd if realloc succeeded. 2006-11-29 Daniel Jacobowitz <dan@codesourcery.com> Jakub Jelinek <jakub@redhat.com> Jan Kratochvil <jan.kratochvil@redhat.com> * sysdeps/unix/sysv/linux/x86_64/sigaction.c (restore_rt): Add correct unwind information. * sysdeps/unix/sysv/linux/x86_64/Makefile: Provide symbols for 'restore_rt' even in the 'signal' directory. * sysdeps/unix/sysv/linux/x86_64/ucontext_i.sym: Extend the regs list. malloc crashed. Don't allocate memory unnecessarily in each loop. 2006-10-21 Jakub Jelinek <jakub@redhat.com> * resolv/mapv4v6addr.h (map_v4v6_address): Fix last change. 2006-11-20 Ulrich Drepper <drepper@redhat.com> * resolv/mapv4v6addr.h (map_v4v6_address): Optimize a bit. 2006-11-18 Bruno Haible <bruno@clisp.org> * sysdeps/unix/sysv/linux/i386/getgroups.c (__getgroups): Invoke __sysconf only after having tried to call getgroups32. 2006-11-19 Ulrich Drepper <drepper@redhat.com> * nss/nss_files/files-hosts.c (LINE_PARSER): Support IPv6-style addresses for IPv4 queries if they can be mapped. 2006-11-16 Jakub Jelinek <jakub@redhat.com> * sysdeps/x86_64/fpu/s_copysignf.S (__copysignf): Switch to .text. * sysdeps/x86_64/fpu/s_copysign.S (__copysign): Likewise. (signmask): Add .size directive. (othermask): Add .type directive. 2006-11-14 Ulrich Drepper <drepper@redhat.com> * po/nl.po: Update from translation team. * timezone/zdump.c: Redo fix for BZ #3137. 2006-11-14 Jakub Jelinek <jakub@redhat.com> * nss/nss_files/files-alias.c (get_next_alias): Set line back to first_unused after parsing :include: file. * timezone/africa: Update from tzdata2006o. * timezone/antarctica: Likewise. * timezone/asia: Likewise. * timezone/australasia: Likewise. * timezone/backward: Likewise. * timezone/europe: Likewise. * timezone/iso3166.tab: Likewise. * timezone/northamerica: Likewise. * timezone/southamerica: Likewise. * timezone/zone.tab: Likewise. * time/tzfile.c (__tzfile_read): Extend to handle new file format on machines with 64-bit time_t. * timezone/checktab.awk: Update from tzcode2006o. * timezone/ialloc.c: Likewise. * timezone/private.h: Likewise. * timezone/scheck.c: Likewise. * timezone/tzfile.h: Likewise. * timezone/tzselect.ksh: Likewise. * timezone/zdump.c: Likewise. * timezone/zic.c: Likewise. [BZ #3483] * elf/ldconfig.c (main): Call setlocale and textdomain. Patch mostly by Benno Schulenberg <bensberg@justemail.net>. [BZ #3480] * manual/argp.texi: Fix typos. * manual/charset.texi: Likewise. * manual/errno.texi: Likewise. * manual/filesys.texi: Likewise. * manual/lang.texi: Likewise. * manual/maint.texi: Likewise. * manual/memory.texi: Likewise. * manual/message.texi: Likewise. * manual/resource.texi: Likewise. * manual/search.texi: Likewise. * manual/signal.texi: Likewise. * manual/startup.texi: Likewise. * manual/stdio.texi: Likewise. * manual/sysinfo.texi: Likewise. * manual/syslog.texi: Likewise. * manual/time.texi: Likewise. Patch by Ralf Wildenhues <Ralf.Wildenhues@gmx.de>. [BZ #3465] * sunrpc/clnt_raw.c: Minimal message improvements. * sunrpc/pm_getmaps.c: Likewise. * nis/nss_nisplus/nisplus-publickey.c: Likewise. * nis/nis_print_group_entry.c: Likewise. * locale/programs/repertoire.c: Likewise. * locale/programs/charmap.c: Likewise. * malloc/memusage.sh: Likewise. * elf/dl-deps.c: Likewise. * locale/programs/ld-collate.c: Likewise. * libio/vswprintf.c: Likewise. * malloc/memusagestat.c: Likewise. * sunrpc/auth_unix.c: Likewise. * sunrpc/rpc_main.c: Likewise. * nscd/cache.c: Likewise. * locale/programs/repertoire.c: Unify output messages. * locale/programs/charmap.c: Likewise. * locale/programs/ld-ctype.c: Likewise. * locale/programs/ld-monetary.c: Likewise. * locale/programs/ld-numeric.c: Likewise. * locale/programs/ld-time.c: Likewise. * elf/ldconfig.c: Likewise. * nscd/selinux.c: Likewise. * elf/cache.c: Likewise. Patch mostly by Benno Schulenberg <bensberg@justemail.net>. 2006-11-10 Jakub Jelinek <jakub@redhat.com> * string/strxfrm_l.c (STRXFRM): Fix trailing \1 optimization if N is one bigger than return value. * string/tst-strxfrm2.c (do_test): Also test strxfrm with l1 + 1 and l1 last arguments, if buf is defined, verify the return value equals to strlen (buf) and verify no byte beyond passed length is modified. 2006-11-10 Ulrich Drepper <drepper@redhat.com> * po/sv.po: Update from translation team. * sysdeps/gnu/siglist.c (__old_sys_siglist, __old_sys_sigabbrev): Use __new_sys_siglist instead of _sys_siglist_internal as second macro argument. (_old_sys_siglist): Use declare_symbol_alias macro instead of strong_alias. 2006-11-09 Ulrich Drepper <drepper@redhat.com> [BZ #3493] * posix/unistd.h (sysconf): Remove const attribute. * sysdeps/posix/getaddrinfo.c (getaddrinfo): Fix test for temporary or deprecated addresses. Patch by Sridhar Samudrala <sri@us.ibm.com>. * string/Makefile (tests): Add tst-strxfrm2. * string/tst-strxfrm2.c: New file. 2006-10-09 Jakub Jelinek <jakub@redhat.com> * elf/dl-debug.c (_dl_debug_initialize): Check r->r_map for 0 rather than r->r_brk. * string/strxfrm_l.c (STRXFRM): Do the trailing \1 removal optimization even if needed > n. 2006-11-07 Jakub Jelinek <jakub@redhat.com> * include/libc-symbols.h (declare_symbol): Rename to... (declare_symbol_alias): ... this. Add ORIGINAL argument, imply strong_alias (ORIGINAL, SYMBOL) in asm to make sure it preceedes .size directive. * sysdeps/gnu/errlist-compat.awk: Adjust for declare_symbol_alias changes. * sysdeps/gnu/siglist.c: Likewise. 2006-11-03 Steven Munroe <sjmunroe@us.ibm.com> * sysdeps/powerpc/fpu/bits/mathinline.h [__LIBC_INTERNAL_MATH_INLINES]: Moved to ... * sysdeps/powerpc/fpu/math_private.h: ...here. New file. 2006-11-05 Ulrich Drepper <drepper@redhat.com> * sysdeps/unix/sysv/linux/i386/sysconf.c (intel_check_word): Update handling of cache descriptor 0x49 for new models. * sysdeps/unix/sysv/linux/x86_64/sysconf.c (intel_check_word): Likewise. 2006-11-02 Ulrich Drepper <drepper@redhat.com> * configure.in: Work around ld --help change and avoid -z relro test completely if the architecture doesn't care about security. 2006-11-01 Ulrich Drepper <drepper@redhat.com> * po/sv.po: Update from translation team. 2006-10-31 Ulrich Drepper <drepper@redhat.com> * stdlib/atexit.c (atexit): Don't mark as hidden when used to generate compatibility version. 2006-10-29 Ulrich Drepper <drepper@redhat.com> * configure.in: Relax -z relro requirement a bit. * po/sv.po: Update from translation team. 2006-10-29 Jakub Jelinek <jakub@redhat.com> * elf/dl-sym.c (do_sym): Use RTLD_SINGLE_THREAD_P. * elf/dl-runtime.c (_dl_fixup, _dl_profile_fixup): Likewise. * elf/dl-close.c (_dl_close_worker): Likewise. * elf/dl-open.c (_dl_open_worker): Likewise. * sysdeps/generic/sysdep-cancel.h (RTLD_SINGLE_THREAD_P): Define. * configure.in: Require assembler support for visibility, compiler support for visibility and aliases, linker support for various -z options. * Makeconfig: Remove conditional code which now is unnecessary. * config.h.in: Likewise. * config.make.in: Likewise. * dlfcn/Makefile: Likewise. * elf/Makefile: Likewise. * elf/dl-load.c: Likewise. * elf/rtld.c: Likewise. * include/libc-symbols.h: Likewise. * include/stdio.h: Likewise. * io/Makefile: Likewise. * io/fstat.c: Likewise. * io/fstat64.c: Likewise. * io/fstatat.c: Likewise. * io/fstatat64.c: Likewise. * io/lstat.c: Likewise. * io/lstat64.c: Likewise. * io/mknod.c: Likewise. * io/mknodat.c: Likewise. * io/stat.c: Likewise. * io/stat64.c: Likewise. * libio/stdio.c: Likewise. * nscd/Makefile: Likewise. * stdlib/Makefile: Likewise. * stdlib/atexit.c: Likewise. * sysdeps/generic/ldsodefs.h: Likewise. * sysdeps/i386/dl-machine.h: Likewise. * sysdeps/i386/sysdep.h: Likewise. * sysdeps/i386/i686/memcmp.S: Likewise. * sysdeps/powerpc/powerpc32/sysdep.h: Likewise. * sysdeps/unix/sysv/linux/i386/sigaction.c: Likewise. * sysdeps/unix/sysv/linux/x86_64/sigaction.c: Likewise. * Makerules: USE_TLS support is now default. * tls.make.c: Likewise. * csu/Versions: Likewise. * csu/libc-start.c: Likewise. * csu/libc-tls.c: Likewise. * csu/version.c: Likewise. * dlfcn/dlinfo.c: Likewise. * elf/dl-addr.c: Likewise. * elf/dl-cache.c: Likewise. * elf/dl-close.c: Likewise. * elf/dl-iteratephdr.c: Likewise. * elf/dl-load.c: Likewise. * elf/dl-lookup.c: Likewise. * elf/dl-object.c: Likewise. * elf/dl-open.c: Likewise. * elf/dl-reloc.c: Likewise. * elf/dl-support.c: Likewise. * elf/dl-sym.c: Likewise. * elf/dl-sysdep.c: Likewise. * elf/dl-tls.c: Likewise. * elf/ldconfig.c: Likewise. * elf/rtld.c: Likewise. * elf/tst-tls-dlinfo.c: Likewise. * elf/tst-tls1.c: Likewise. * elf/tst-tls10.h: Likewise. * elf/tst-tls14.c: Likewise. * elf/tst-tls2.c: Likewise. * elf/tst-tls3.c: Likewise. * elf/tst-tls4.c: Likewise. * elf/tst-tls5.c: Likewise. * elf/tst-tls6.c: Likewise. * elf/tst-tls7.c: Likewise. * elf/tst-tls8.c: Likewise. * elf/tst-tls9.c: Likewise. * elf/tst-tlsmod1.c: Likewise. * elf/tst-tlsmod13.c: Likewise. * elf/tst-tlsmod13a.c: Likewise. * elf/tst-tlsmod14a.c: Likewise. * elf/tst-tlsmod2.c: Likewise. * elf/tst-tlsmod3.c: Likewise. * elf/tst-tlsmod4.c: Likewise. * elf/tst-tlsmod5.c: Likewise. * elf/tst-tlsmod6.c: Likewise. * include/errno.h: Likewise. * include/link.h: Likewise. * include/tls.h: Likewise. * locale/global-locale.c: Likewise. * locale/localeinfo.h: Likewise. * malloc/arena.c: Likewise. * malloc/hooks.c: Likewise. * malloc/malloc.c: Likewise. * resolv/Versions: Likewise. * sysdeps/alpha/dl-machine.h: Likewise. * sysdeps/alpha/libc-tls.c: Likewise. * sysdeps/generic/ldsodefs.h: Likewise. * sysdeps/generic/tls.h: Likewise. * sysdeps/i386/dl-machine.h: Likewise. * sysdeps/ia64/dl-machine.h: Likewise. * sysdeps/ia64/libc-tls.c: Likewise. * sysdeps/mach/hurd/fork.c: Likewise. * sysdeps/mach/hurd/i386/tls.h: Likewise. * sysdeps/powerpc/powerpc32/dl-machine.c: Likwise. * sysdeps/powerpc/powerpc32/dl-machine.h: Likewise. * sysdeps/powerpc/powerpc64/dl-machine.h: Likewise. * sysdeps/s390/libc-tls.c: Likewise. * sysdeps/s390/s390-32/dl-machine.h: Likewise. * sysdeps/s390/s390-64/dl-machine.h: Likewise. * sysdeps/sh/dl-machine.h: Likewise. * sysdeps/sparc/sparc32/dl-machine.h: Likewise. * sysdeps/sparc/sparc64/dl-machine.h: Likewise. * sysdeps/x86_64/dl-machine.h: Likewise. [BZ #3426] * stdlib/stdlib.h: Adjust comment for canonicalize_file_name to reality. 2006-10-27 Jakub Jelinek <jakub@redhat.com> * elf/dl-lookup.c (_dl_debug_bindings): Remove unused symbol_scope argument. (_dl_lookup_symbol_x): Adjust caller. * sysdeps/generic/ldsodefs.h (struct link_namespaces): Remove _ns_global_scope. * elf/rtld.c (dl_main): Don't initialize _ns_global_scope. * elf/dl-libc.c: Revert l_scope name changes. * elf/dl-load.c: Likewise. * elf/dl-object.c: Likewise. * elf/rtld.c: Likewise. * elf/dl-close.c (_dl_close): Likewise. * elf/dl-open.c (dl_open_worker): Likewise. If not SINGLE_THREAD_P, always use __rtld_mrlock_{change,done}. Always free old scope list here if not l_scope_mem. * elf/dl-runtime.c (_dl_fixup, _dl_profile_fixup): Revert l_scope name change. Never free scope list here. Just __rtld_mrlock_lock before the lookup and __rtld_mrlock_unlock it after the lookup. * elf/dl-sym.c: Likewise. * include/link.h (struct r_scoperec): Remove. (struct link_map): Replace l_scoperec with l_scope, l_scoperec_mem with l_scope_mem and l_scoperec_lock with l_scope_lock. 2006-10-25 Ulrich Drepper <drepper@redhat.com> * sysdeps/gnu/netinet/tcp.h: Define TCP_CONGESTION. 2006-10-18 Ulrich Drepper <drepper@redhat.com> * configure.in: Disable building profile libraries by default. 2006-10-18 Ulrich Drepper <drepper@redhat.com> * elf/dl-lookup.c (_dl_lookup_symbol_x): Add warning to _dl_lookup_symbol_x code. 2006-10-17 Jakub Jelinek <jakub@redhat.com> * elf/dl-runtime.c: Include sysdep-cancel.h. (_dl_fixup, _dl_profile_fixup): Use __rtld_mrlock_* and scoperec->nusers only if !SINGLE_THREAD_P. Use atomic_* instead of catomic_* macros. * elf/dl-sym.c: Include sysdep-cancel.h. (do_sym): Use __rtld_mrlock_* and scoperec->nusers only if !SINGLE_THREAD_P. Use atomic_* instead of catomic_* macros. * elf/dl-close.c: Include sysdep-cancel.h. (_dl_close): Use __rtld_mrlock_* and scoperec->nusers only if !SINGLE_THREAD_P. Use atomic_* instead of catomic_* macros. * elf/dl-open.c: Include sysdep-cancel.h. (dl_open_worker): Use __rtld_mrlock_* and scoperec->nusers only if !SINGLE_THREAD_P. Use atomic_* instead of catomic_* macros. 2006-10-17 Jakub Jelinek <jakub@redhat.com> [BZ #3313] * malloc/malloc.c (malloc_consolidate): Set maxfb to address of last fastbin rather than end of fastbin array. 2006-10-18 Ulrich Drepper <drepper@redhat.com> * sysdeps/i386/i486/bits/atomic.h (catomic_decrement): Use correct body macro. * sysdeps/x86_64/bits/atomic.h (__arch_c_compare_and_exchange_val_64_acq): Add missing casts. (catomic_decrement): Use correct body macro. 2006-10-17 Jakub Jelinek <jakub@redhat.com> * include/atomic.h: Add a unique prefix to all local variables in macros. * csu/tst-atomic.c (do_test): Test also catomic_* macros. 2006-10-14 Ulrich Drepper <drepper@redhat.com> * resolv/arpa/nameser.h: Document that ns_t_a6 is deprecated. [BZ #3313] * malloc/malloc.c (malloc_consolidate): Don't use get_fast_max to determine highest fast bin to consolidate, always look into all of them. (do_check_malloc_state): Only require for empty bins for large sizes in main arena. * libio/stdio.h: Add more __wur attributes. 2006-11-12 Andreas Jaeger <aj@suse.de> [BZ #2510] * manual/search.texi (Hash Search Function): Clarify. (Array Search Function): Clarify. 2006-11-12 Joseph Myers <joseph@codesourcery.com> [BZ #2830] * math/atest-exp.c (main): Cast hex value to mp_limb_t before shifting. * math/atest-exp2.c (read_mpn_hex): Likewise. * math/atest-sincos.c (main): Likewise. * sysdeps/unix/sysv/linux/syscalls.list: Add epoll_pwait. * sysdeps/unix/sysv/linux/sys/epoll.h: Declare epoll_pwait. * sysdeps/unix/sysv/linux/Versions (libc): Add epoll_pwait for version GLIBC_2.6. * Versions.def: Add GLIBC_2.6 for libc. * sysdeps/i386/i486/bits/atomic.h: Add catomic_* support. 2006-10-11 Jakub Jelinek <jakub@redhat.com> * malloc/malloc.c (_int_malloc): Remove unused any_larger variable. * nis/nis_defaults.c (__nis_default_access): Don't call getenv twice. * nis/nis_subr.c (nis_getnames): Use __secure_getenv instead of getenv. * sysdeps/generic/unsecvars.h: Add NIS_PATH. 2006-10-11 Ulrich Drepper <drepper@redhat.com> * include/atomic.c: Define catomic_* operations. * sysdeps/x86_64/bits/atomic.h: Likewise. Fix a few minor problems. * stdlib/cxa_finalize.c: Use catomic_* operations instead of atomic_*. * malloc/memusage.c: Likewise. * gmon/mcount.c: Likewise. * elf/dl-close.c: Likewise. * elf/dl-open.c: Likewise. * elf/dl-profile.c: Likewise. * elf/dl-sym.c: Likewise. * elf/dl-runtime.c: Likewise. * elf/dl-fptr.c: Likewise. * resolv/res_libc.c: Likewise. 2006-10-10 Roland McGrath <roland@frob.com> * sysdeps/mach/hurd/utimes.c: Use a union to avoid an improper cast. * sysdeps/mach/hurd/futimes.c: Likewise. * sysdeps/mach/hurd/lutimes.c: Likewise. 2006-10-09 Ulrich Drepper <drepper@redhat.com> Jakub Jelinek <jakub@redhat.com> Implement reference counting of scope records. * elf/dl-close.c (_dl_close): Remove all scopes from removed objects from the list in objects which remain. Always allocate new scope record. * elf/dl-open.c (dl_open_worker): When growing array for scopes, don't resize, allocate a new one. * elf/dl-runtime.c: Update reference counters before using a scope array. * elf/dl-sym.c: Likewise. * elf/dl-libc.c: Adjust for l_scope name change. * elf/dl-load.c: Likewise. * elf/dl-object.c: Likewise. * elf/rtld.c: Likewise. * include/link.h: Include <rtld-lowlevel.h>. Define struct r_scoperec. Replace r_scope with pointer to r_scoperec structure. Add l_scoperec_lock. * sysdeps/generic/ldsodefs.h: Include <rtld-lowlevel.h>. * sysdeps/generic/rtld-lowlevel.h: New file. * include/atomic.h: Rename atomic_and to atomic_and_val and atomic_or to atomic_or_val. Define new macros atomic_and and atomic_or which do not return values. * sysdeps/x86_64/bits/atomic.h: Define atomic_and and atomic_or. Various cleanups. * sysdeps/i386/i486/bits/atomic.h: Likewise. * po/sv.po: Update from translation team. 2006-10-07 Ulrich Drepper <drepper@redhat.com> * Versions.def: Add GLIBC_2.6 to libpthread. * include/shlib-compat.h (SHLIB_COMPAT): Expand parameters before use. (versioned_symbol): Likewise. (compat_symbol): Likewise. * po/tr.po: Update from translation team. * nis/Banner: Removed. It's been integral part forever and the author info is incomplete anyway. * libio/Banner: Likewise. 2006-10-06 Ulrich Drepper <drepper@redhat.com> * version.h (VERSION): Bump to 2.5.90 for new development tree.
1384 lines
38 KiB
C
1384 lines
38 KiB
C
/* Read and display shared object profiling data.
|
|
Copyright (C) 1997-2004, 2005, 2006, 2007 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA. */
|
|
|
|
#include <argp.h>
|
|
#include <dlfcn.h>
|
|
#include <elf.h>
|
|
#include <error.h>
|
|
#include <fcntl.h>
|
|
#include <inttypes.h>
|
|
#include <libintl.h>
|
|
#include <locale.h>
|
|
#include <obstack.h>
|
|
#include <search.h>
|
|
#include <stdbool.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#include <ldsodefs.h>
|
|
#include <sys/gmon.h>
|
|
#include <sys/gmon_out.h>
|
|
#include <sys/mman.h>
|
|
#include <sys/param.h>
|
|
#include <sys/stat.h>
|
|
|
|
/* Get libc version number. */
|
|
#include "../version.h"
|
|
|
|
#define PACKAGE _libc_intl_domainname
|
|
|
|
|
|
#include <endian.h>
|
|
#if BYTE_ORDER == BIG_ENDIAN
|
|
# define byteorder ELFDATA2MSB
|
|
# define byteorder_name "big-endian"
|
|
#elif BYTE_ORDER == LITTLE_ENDIAN
|
|
# define byteorder ELFDATA2LSB
|
|
# define byteorder_name "little-endian"
|
|
#else
|
|
# error "Unknown BYTE_ORDER " BYTE_ORDER
|
|
# define byteorder ELFDATANONE
|
|
#endif
|
|
|
|
#ifndef PATH_MAX
|
|
# define PATH_MAX 1024
|
|
#endif
|
|
|
|
|
|
extern int __profile_frequency (void);
|
|
|
|
/* Name and version of program. */
|
|
static void print_version (FILE *stream, struct argp_state *state);
|
|
void (*argp_program_version_hook) (FILE *, struct argp_state *) = print_version;
|
|
|
|
#define OPT_TEST 1
|
|
|
|
/* Definitions of arguments for argp functions. */
|
|
static const struct argp_option options[] =
|
|
{
|
|
{ NULL, 0, NULL, 0, N_("Output selection:") },
|
|
{ "call-pairs", 'c', NULL, 0,
|
|
N_("print list of count paths and their number of use") },
|
|
{ "flat-profile", 'p', NULL, 0,
|
|
N_("generate flat profile with counts and ticks") },
|
|
{ "graph", 'q', NULL, 0, N_("generate call graph") },
|
|
|
|
{ "test", OPT_TEST, NULL, OPTION_HIDDEN, NULL },
|
|
{ NULL, 0, NULL, 0, NULL }
|
|
};
|
|
|
|
/* Short description of program. */
|
|
static const char doc[] = N_("Read and display shared object profiling data.\v\
|
|
For bug reporting instructions, please see:\n\
|
|
<http://www.gnu.org/software/libc/bugs.html>.\n");
|
|
|
|
/* Strings for arguments in help texts. */
|
|
static const char args_doc[] = N_("SHOBJ [PROFDATA]");
|
|
|
|
/* Prototype for option handler. */
|
|
static error_t parse_opt (int key, char *arg, struct argp_state *state);
|
|
|
|
/* Data structure to communicate with argp functions. */
|
|
static struct argp argp =
|
|
{
|
|
options, parse_opt, args_doc, doc
|
|
};
|
|
|
|
|
|
/* Operation modes. */
|
|
static enum
|
|
{
|
|
NONE = 0,
|
|
FLAT_MODE = 1 << 0,
|
|
CALL_GRAPH_MODE = 1 << 1,
|
|
CALL_PAIRS = 1 << 2,
|
|
|
|
DEFAULT_MODE = FLAT_MODE | CALL_GRAPH_MODE
|
|
} mode;
|
|
|
|
/* Nozero for testing. */
|
|
static int do_test;
|
|
|
|
/* Strcuture describing calls. */
|
|
struct here_fromstruct
|
|
{
|
|
struct here_cg_arc_record volatile *here;
|
|
uint16_t link;
|
|
};
|
|
|
|
/* We define a special type to address the elements of the arc table.
|
|
This is basically the `gmon_cg_arc_record' format but it includes
|
|
the room for the tag and it uses real types. */
|
|
struct here_cg_arc_record
|
|
{
|
|
uintptr_t from_pc;
|
|
uintptr_t self_pc;
|
|
uint32_t count;
|
|
} __attribute__ ((packed));
|
|
|
|
|
|
struct known_symbol;
|
|
struct arc_list
|
|
{
|
|
size_t idx;
|
|
uintmax_t count;
|
|
|
|
struct arc_list *next;
|
|
};
|
|
|
|
static struct obstack ob_list;
|
|
|
|
|
|
struct known_symbol
|
|
{
|
|
const char *name;
|
|
uintptr_t addr;
|
|
size_t size;
|
|
bool weak;
|
|
bool hidden;
|
|
|
|
uintmax_t ticks;
|
|
uintmax_t calls;
|
|
|
|
struct arc_list *froms;
|
|
struct arc_list *tos;
|
|
};
|
|
|
|
|
|
struct shobj
|
|
{
|
|
const char *name; /* User-provided name. */
|
|
|
|
struct link_map *map;
|
|
const char *dynstrtab; /* Dynamic string table of shared object. */
|
|
const char *soname; /* Soname of shared object. */
|
|
|
|
uintptr_t lowpc;
|
|
uintptr_t highpc;
|
|
unsigned long int kcountsize;
|
|
size_t expected_size; /* Expected size of profiling file. */
|
|
size_t tossize;
|
|
size_t fromssize;
|
|
size_t fromlimit;
|
|
unsigned int hashfraction;
|
|
int s_scale;
|
|
|
|
void *symbol_map;
|
|
size_t symbol_mapsize;
|
|
const ElfW(Sym) *symtab;
|
|
size_t symtab_size;
|
|
const char *strtab;
|
|
|
|
struct obstack ob_str;
|
|
struct obstack ob_sym;
|
|
};
|
|
|
|
|
|
struct profdata
|
|
{
|
|
void *addr;
|
|
off_t size;
|
|
|
|
char *hist;
|
|
struct gmon_hist_hdr *hist_hdr;
|
|
uint16_t *kcount;
|
|
uint32_t narcs; /* Number of arcs in toset. */
|
|
struct here_cg_arc_record *data;
|
|
uint16_t *tos;
|
|
struct here_fromstruct *froms;
|
|
};
|
|
|
|
/* Search tree for symbols. */
|
|
static void *symroot;
|
|
static struct known_symbol **sortsym;
|
|
static size_t symidx;
|
|
static uintmax_t total_ticks;
|
|
|
|
/* Prototypes for local functions. */
|
|
static struct shobj *load_shobj (const char *name);
|
|
static void unload_shobj (struct shobj *shobj);
|
|
static struct profdata *load_profdata (const char *name, struct shobj *shobj);
|
|
static void unload_profdata (struct profdata *profdata);
|
|
static void count_total_ticks (struct shobj *shobj, struct profdata *profdata);
|
|
static void count_calls (struct shobj *shobj, struct profdata *profdata);
|
|
static void read_symbols (struct shobj *shobj);
|
|
static void add_arcs (struct profdata *profdata);
|
|
static void generate_flat_profile (struct profdata *profdata);
|
|
static void generate_call_graph (struct profdata *profdata);
|
|
static void generate_call_pair_list (struct profdata *profdata);
|
|
|
|
|
|
int
|
|
main (int argc, char *argv[])
|
|
{
|
|
const char *shobj;
|
|
const char *profdata;
|
|
struct shobj *shobj_handle;
|
|
struct profdata *profdata_handle;
|
|
int remaining;
|
|
|
|
setlocale (LC_ALL, "");
|
|
|
|
/* Initialize the message catalog. */
|
|
textdomain (_libc_intl_domainname);
|
|
|
|
/* Parse and process arguments. */
|
|
argp_parse (&argp, argc, argv, 0, &remaining, NULL);
|
|
|
|
if (argc - remaining == 0 || argc - remaining > 2)
|
|
{
|
|
/* We need exactly two non-option parameter. */
|
|
argp_help (&argp, stdout, ARGP_HELP_SEE | ARGP_HELP_EXIT_ERR,
|
|
program_invocation_short_name);
|
|
exit (1);
|
|
}
|
|
|
|
/* Get parameters. */
|
|
shobj = argv[remaining];
|
|
if (argc - remaining == 2)
|
|
profdata = argv[remaining + 1];
|
|
else
|
|
/* No filename for the profiling data given. We will determine it
|
|
from the soname of the shobj, later. */
|
|
profdata = NULL;
|
|
|
|
/* First see whether we can load the shared object. */
|
|
shobj_handle = load_shobj (shobj);
|
|
if (shobj_handle == NULL)
|
|
exit (1);
|
|
|
|
/* We can now determine the filename for the profiling data, if
|
|
nececessary. */
|
|
if (profdata == NULL)
|
|
{
|
|
char *newp;
|
|
const char *soname;
|
|
size_t soname_len;
|
|
|
|
soname = shobj_handle->soname ?: basename (shobj);
|
|
soname_len = strlen (soname);
|
|
newp = (char *) alloca (soname_len + sizeof ".profile");
|
|
stpcpy (mempcpy (newp, soname, soname_len), ".profile");
|
|
profdata = newp;
|
|
}
|
|
|
|
/* Now see whether the profiling data file matches the given object. */
|
|
profdata_handle = load_profdata (profdata, shobj_handle);
|
|
if (profdata_handle == NULL)
|
|
{
|
|
unload_shobj (shobj_handle);
|
|
|
|
exit (1);
|
|
}
|
|
|
|
read_symbols (shobj_handle);
|
|
|
|
/* Count the ticks. */
|
|
count_total_ticks (shobj_handle, profdata_handle);
|
|
|
|
/* Count the calls. */
|
|
count_calls (shobj_handle, profdata_handle);
|
|
|
|
/* Add the arc information. */
|
|
add_arcs (profdata_handle);
|
|
|
|
/* If no mode is specified fall back to the default mode. */
|
|
if (mode == NONE)
|
|
mode = DEFAULT_MODE;
|
|
|
|
/* Do some work. */
|
|
if (mode & FLAT_MODE)
|
|
generate_flat_profile (profdata_handle);
|
|
|
|
if (mode & CALL_GRAPH_MODE)
|
|
generate_call_graph (profdata_handle);
|
|
|
|
if (mode & CALL_PAIRS)
|
|
generate_call_pair_list (profdata_handle);
|
|
|
|
/* Free the resources. */
|
|
unload_shobj (shobj_handle);
|
|
unload_profdata (profdata_handle);
|
|
|
|
return 0;
|
|
}
|
|
|
|
|
|
/* Handle program arguments. */
|
|
static error_t
|
|
parse_opt (int key, char *arg, struct argp_state *state)
|
|
{
|
|
switch (key)
|
|
{
|
|
case 'c':
|
|
mode |= CALL_PAIRS;
|
|
break;
|
|
case 'p':
|
|
mode |= FLAT_MODE;
|
|
break;
|
|
case 'q':
|
|
mode |= CALL_GRAPH_MODE;
|
|
break;
|
|
case OPT_TEST:
|
|
do_test = 1;
|
|
break;
|
|
default:
|
|
return ARGP_ERR_UNKNOWN;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
|
|
/* Print the version information. */
|
|
static void
|
|
print_version (FILE *stream, struct argp_state *state)
|
|
{
|
|
fprintf (stream, "sprof (GNU %s) %s\n", PACKAGE, VERSION);
|
|
fprintf (stream, gettext ("\
|
|
Copyright (C) %s Free Software Foundation, Inc.\n\
|
|
This is free software; see the source for copying conditions. There is NO\n\
|
|
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
|
|
"),
|
|
"2007");
|
|
fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper");
|
|
}
|
|
|
|
|
|
/* Note that we must not use `dlopen' etc. The shobj object must not
|
|
be loaded for use. */
|
|
static struct shobj *
|
|
load_shobj (const char *name)
|
|
{
|
|
struct link_map *map = NULL;
|
|
struct shobj *result;
|
|
ElfW(Addr) mapstart = ~((ElfW(Addr)) 0);
|
|
ElfW(Addr) mapend = 0;
|
|
const ElfW(Phdr) *ph;
|
|
size_t textsize;
|
|
unsigned int log_hashfraction;
|
|
ElfW(Ehdr) *ehdr;
|
|
int fd;
|
|
ElfW(Shdr) *shdr;
|
|
size_t pagesize = getpagesize ();
|
|
|
|
/* Since we use dlopen() we must be prepared to work around the sometimes
|
|
strange lookup rules for the shared objects. If we have a file foo.so
|
|
in the current directory and the user specfies foo.so on the command
|
|
line (without specifying a directory) we should load the file in the
|
|
current directory even if a normal dlopen() call would read the other
|
|
file. We do this by adding a directory portion to the name. */
|
|
if (strchr (name, '/') == NULL)
|
|
{
|
|
char *load_name = (char *) alloca (strlen (name) + 3);
|
|
stpcpy (stpcpy (load_name, "./"), name);
|
|
|
|
map = (struct link_map *) dlopen (load_name, RTLD_LAZY | __RTLD_SPROF);
|
|
}
|
|
if (map == NULL)
|
|
{
|
|
map = (struct link_map *) dlopen (name, RTLD_LAZY | __RTLD_SPROF);
|
|
if (map == NULL)
|
|
{
|
|
error (0, errno, _("failed to load shared object `%s'"), name);
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
/* Prepare the result. */
|
|
result = (struct shobj *) calloc (1, sizeof (struct shobj));
|
|
if (result == NULL)
|
|
{
|
|
error (0, errno, _("cannot create internal descriptors"));
|
|
dlclose (map);
|
|
return NULL;
|
|
}
|
|
result->name = name;
|
|
result->map = map;
|
|
|
|
/* Compute the size of the sections which contain program code.
|
|
This must match the code in dl-profile.c (_dl_start_profile). */
|
|
for (ph = map->l_phdr; ph < &map->l_phdr[map->l_phnum]; ++ph)
|
|
if (ph->p_type == PT_LOAD && (ph->p_flags & PF_X))
|
|
{
|
|
ElfW(Addr) start = (ph->p_vaddr & ~(pagesize - 1));
|
|
ElfW(Addr) end = ((ph->p_vaddr + ph->p_memsz + pagesize - 1)
|
|
& ~(pagesize - 1));
|
|
|
|
if (start < mapstart)
|
|
mapstart = start;
|
|
if (end > mapend)
|
|
mapend = end;
|
|
}
|
|
|
|
result->lowpc = ROUNDDOWN ((uintptr_t) (mapstart + map->l_addr),
|
|
HISTFRACTION * sizeof (HISTCOUNTER));
|
|
result->highpc = ROUNDUP ((uintptr_t) (mapend + map->l_addr),
|
|
HISTFRACTION * sizeof (HISTCOUNTER));
|
|
if (do_test)
|
|
printf ("load addr: %0#*" PRIxPTR "\n"
|
|
"lower bound PC: %0#*" PRIxPTR "\n"
|
|
"upper bound PC: %0#*" PRIxPTR "\n",
|
|
__ELF_NATIVE_CLASS == 32 ? 10 : 18, map->l_addr,
|
|
__ELF_NATIVE_CLASS == 32 ? 10 : 18, result->lowpc,
|
|
__ELF_NATIVE_CLASS == 32 ? 10 : 18, result->highpc);
|
|
|
|
textsize = result->highpc - result->lowpc;
|
|
result->kcountsize = textsize / HISTFRACTION;
|
|
result->hashfraction = HASHFRACTION;
|
|
if ((HASHFRACTION & (HASHFRACTION - 1)) == 0)
|
|
/* If HASHFRACTION is a power of two, mcount can use shifting
|
|
instead of integer division. Precompute shift amount. */
|
|
log_hashfraction = __builtin_ffs (result->hashfraction
|
|
* sizeof (struct here_fromstruct)) - 1;
|
|
else
|
|
log_hashfraction = -1;
|
|
if (do_test)
|
|
printf ("hashfraction = %d\ndivider = %Zu\n",
|
|
result->hashfraction,
|
|
result->hashfraction * sizeof (struct here_fromstruct));
|
|
result->tossize = textsize / HASHFRACTION;
|
|
result->fromlimit = textsize * ARCDENSITY / 100;
|
|
if (result->fromlimit < MINARCS)
|
|
result->fromlimit = MINARCS;
|
|
if (result->fromlimit > MAXARCS)
|
|
result->fromlimit = MAXARCS;
|
|
result->fromssize = result->fromlimit * sizeof (struct here_fromstruct);
|
|
|
|
result->expected_size = (sizeof (struct gmon_hdr)
|
|
+ 4 + sizeof (struct gmon_hist_hdr)
|
|
+ result->kcountsize
|
|
+ 4 + 4
|
|
+ (result->fromssize
|
|
* sizeof (struct here_cg_arc_record)));
|
|
|
|
if (do_test)
|
|
printf ("expected size: %Zd\n", result->expected_size);
|
|
|
|
#define SCALE_1_TO_1 0x10000L
|
|
|
|
if (result->kcountsize < result->highpc - result->lowpc)
|
|
{
|
|
size_t range = result->highpc - result->lowpc;
|
|
size_t quot = range / result->kcountsize;
|
|
|
|
if (quot >= SCALE_1_TO_1)
|
|
result->s_scale = 1;
|
|
else if (quot >= SCALE_1_TO_1 / 256)
|
|
result->s_scale = SCALE_1_TO_1 / quot;
|
|
else if (range > ULONG_MAX / 256)
|
|
result->s_scale = ((SCALE_1_TO_1 * 256)
|
|
/ (range / (result->kcountsize / 256)));
|
|
else
|
|
result->s_scale = ((SCALE_1_TO_1 * 256)
|
|
/ ((range * 256) / result->kcountsize));
|
|
}
|
|
else
|
|
result->s_scale = SCALE_1_TO_1;
|
|
|
|
if (do_test)
|
|
printf ("s_scale: %d\n", result->s_scale);
|
|
|
|
/* Determine the dynamic string table. */
|
|
if (map->l_info[DT_STRTAB] == NULL)
|
|
result->dynstrtab = NULL;
|
|
else
|
|
result->dynstrtab = (const char *) D_PTR (map, l_info[DT_STRTAB]);
|
|
if (do_test)
|
|
printf ("string table: %p\n", result->dynstrtab);
|
|
|
|
/* Determine the soname. */
|
|
if (map->l_info[DT_SONAME] == NULL)
|
|
result->soname = NULL;
|
|
else
|
|
result->soname = result->dynstrtab + map->l_info[DT_SONAME]->d_un.d_val;
|
|
if (do_test && result->soname != NULL)
|
|
printf ("soname: %s\n", result->soname);
|
|
|
|
/* Now we have to load the symbol table.
|
|
|
|
First load the section header table. */
|
|
ehdr = (ElfW(Ehdr) *) map->l_map_start;
|
|
|
|
/* Make sure we are on the right party. */
|
|
if (ehdr->e_shentsize != sizeof (ElfW(Shdr)))
|
|
abort ();
|
|
|
|
/* And we need the shared object file descriptor again. */
|
|
fd = open (map->l_name, O_RDONLY);
|
|
if (fd == -1)
|
|
/* Dooh, this really shouldn't happen. We know the file is available. */
|
|
error (EXIT_FAILURE, errno, _("Reopening shared object `%s' failed"),
|
|
map->l_name);
|
|
|
|
/* Map the section header. */
|
|
size_t size = ehdr->e_shnum * sizeof (ElfW(Shdr));
|
|
shdr = (ElfW(Shdr) *) alloca (size);
|
|
if (pread (fd, shdr, size, ehdr->e_shoff) != size)
|
|
error (EXIT_FAILURE, errno, _("reading of section headers failed"));
|
|
|
|
/* Get the section header string table. */
|
|
char *shstrtab = (char *) alloca (shdr[ehdr->e_shstrndx].sh_size);
|
|
if (pread (fd, shstrtab, shdr[ehdr->e_shstrndx].sh_size,
|
|
shdr[ehdr->e_shstrndx].sh_offset)
|
|
!= shdr[ehdr->e_shstrndx].sh_size)
|
|
error (EXIT_FAILURE, errno,
|
|
_("reading of section header string table failed"));
|
|
|
|
/* Search for the ".symtab" section. */
|
|
ElfW(Shdr) *symtab_entry = NULL;
|
|
ElfW(Shdr) *debuglink_entry = NULL;
|
|
for (int idx = 0; idx < ehdr->e_shnum; ++idx)
|
|
if (shdr[idx].sh_type == SHT_SYMTAB
|
|
&& strcmp (shstrtab + shdr[idx].sh_name, ".symtab") == 0)
|
|
{
|
|
symtab_entry = &shdr[idx];
|
|
break;
|
|
}
|
|
else if (shdr[idx].sh_type == SHT_PROGBITS
|
|
&& strcmp (shstrtab + shdr[idx].sh_name, ".gnu_debuglink") == 0)
|
|
debuglink_entry = &shdr[idx];
|
|
|
|
/* Get the file name of the debuginfo file if necessary. */
|
|
int symfd = fd;
|
|
if (symtab_entry == NULL && debuglink_entry != NULL)
|
|
{
|
|
size_t size = debuglink_entry->sh_size;
|
|
char *debuginfo_fname = (char *) alloca (size + 1);
|
|
debuginfo_fname[size] = '\0';
|
|
if (pread (fd, debuginfo_fname, size, debuglink_entry->sh_offset)
|
|
!= size)
|
|
{
|
|
fprintf (stderr, _("*** Cannot read debuginfo file name: %m\n"));
|
|
goto no_debuginfo;
|
|
}
|
|
|
|
static const char procpath[] = "/proc/self/fd/%d";
|
|
char origprocname[sizeof (procpath) + sizeof (int) * 3];
|
|
snprintf (origprocname, sizeof (origprocname), procpath, fd);
|
|
char *origlink = (char *) alloca (PATH_MAX + 1);
|
|
origlink[PATH_MAX] = '\0';
|
|
if (readlink (origprocname, origlink, PATH_MAX) == -1)
|
|
goto no_debuginfo;
|
|
|
|
/* Try to find the actual file. There are three places:
|
|
1. the same directory the DSO is in
|
|
2. in a subdir named .debug of the directory the DSO is in
|
|
3. in /usr/lib/debug/PATH-OF-DSO
|
|
*/
|
|
char *realname = canonicalize_file_name (origlink);
|
|
char *cp = NULL;
|
|
if (realname == NULL || (cp = strrchr (realname, '/')) == NULL)
|
|
error (EXIT_FAILURE, errno, _("cannot determine file name"));
|
|
|
|
/* Leave the last slash in place. */
|
|
*++cp = '\0';
|
|
|
|
/* First add the debuginfo file name only. */
|
|
static const char usrlibdebug[]= "/usr/lib/debug/";
|
|
char *workbuf = (char *) alloca (sizeof (usrlibdebug)
|
|
+ (cp - realname)
|
|
+ strlen (debuginfo_fname));
|
|
strcpy (stpcpy (workbuf, realname), debuginfo_fname);
|
|
|
|
int fd2 = open (workbuf, O_RDONLY);
|
|
if (fd2 == -1)
|
|
{
|
|
strcpy (stpcpy (stpcpy (workbuf, realname), ".debug/"),
|
|
debuginfo_fname);
|
|
fd2 = open (workbuf, O_RDONLY);
|
|
if (fd2 == -1)
|
|
{
|
|
strcpy (stpcpy (stpcpy (workbuf, usrlibdebug), realname),
|
|
debuginfo_fname);
|
|
fd2 = open (workbuf, O_RDONLY);
|
|
}
|
|
}
|
|
|
|
if (fd2 != -1)
|
|
{
|
|
ElfW(Ehdr) ehdr2;
|
|
|
|
/* Read the ELF header. */
|
|
if (pread (fd2, &ehdr2, sizeof (ehdr2), 0) != sizeof (ehdr2))
|
|
error (EXIT_FAILURE, errno,
|
|
_("reading of ELF header failed"));
|
|
|
|
/* Map the section header. */
|
|
size_t size = ehdr2.e_shnum * sizeof (ElfW(Shdr));
|
|
ElfW(Shdr) *shdr2 = (ElfW(Shdr) *) alloca (size);
|
|
if (pread (fd2, shdr2, size, ehdr2.e_shoff) != size)
|
|
error (EXIT_FAILURE, errno,
|
|
_("reading of section headers failed"));
|
|
|
|
/* Get the section header string table. */
|
|
shstrtab = (char *) alloca (shdr2[ehdr2.e_shstrndx].sh_size);
|
|
if (pread (fd2, shstrtab, shdr2[ehdr2.e_shstrndx].sh_size,
|
|
shdr2[ehdr2.e_shstrndx].sh_offset)
|
|
!= shdr2[ehdr2.e_shstrndx].sh_size)
|
|
error (EXIT_FAILURE, errno,
|
|
_("reading of section header string table failed"));
|
|
|
|
/* Search for the ".symtab" section. */
|
|
for (int idx = 0; idx < ehdr2.e_shnum; ++idx)
|
|
if (shdr2[idx].sh_type == SHT_SYMTAB
|
|
&& strcmp (shstrtab + shdr2[idx].sh_name, ".symtab") == 0)
|
|
{
|
|
symtab_entry = &shdr2[idx];
|
|
shdr = shdr2;
|
|
symfd = fd2;
|
|
break;
|
|
}
|
|
|
|
if (fd2 != symfd)
|
|
close (fd2);
|
|
}
|
|
}
|
|
|
|
no_debuginfo:
|
|
if (symtab_entry == NULL)
|
|
{
|
|
fprintf (stderr, _("\
|
|
*** The file `%s' is stripped: no detailed analysis possible\n"),
|
|
name);
|
|
result->symtab = NULL;
|
|
result->strtab = NULL;
|
|
}
|
|
else
|
|
{
|
|
ElfW(Off) min_offset, max_offset;
|
|
ElfW(Shdr) *strtab_entry;
|
|
|
|
strtab_entry = &shdr[symtab_entry->sh_link];
|
|
|
|
/* Find the minimum and maximum offsets that include both the symbol
|
|
table and the string table. */
|
|
if (symtab_entry->sh_offset < strtab_entry->sh_offset)
|
|
{
|
|
min_offset = symtab_entry->sh_offset & ~(pagesize - 1);
|
|
max_offset = strtab_entry->sh_offset + strtab_entry->sh_size;
|
|
}
|
|
else
|
|
{
|
|
min_offset = strtab_entry->sh_offset & ~(pagesize - 1);
|
|
max_offset = symtab_entry->sh_offset + symtab_entry->sh_size;
|
|
}
|
|
|
|
result->symbol_map = mmap (NULL, max_offset - min_offset,
|
|
PROT_READ, MAP_SHARED|MAP_FILE, symfd,
|
|
min_offset);
|
|
if (result->symbol_map == MAP_FAILED)
|
|
error (EXIT_FAILURE, errno, _("failed to load symbol data"));
|
|
|
|
result->symtab
|
|
= (const ElfW(Sym) *) ((const char *) result->symbol_map
|
|
+ (symtab_entry->sh_offset - min_offset));
|
|
result->symtab_size = symtab_entry->sh_size;
|
|
result->strtab = ((const char *) result->symbol_map
|
|
+ (strtab_entry->sh_offset - min_offset));
|
|
result->symbol_mapsize = max_offset - min_offset;
|
|
}
|
|
|
|
/* Free the descriptor for the shared object. */
|
|
close (fd);
|
|
if (symfd != fd)
|
|
close (symfd);
|
|
|
|
return result;
|
|
}
|
|
|
|
|
|
static void
|
|
unload_shobj (struct shobj *shobj)
|
|
{
|
|
munmap (shobj->symbol_map, shobj->symbol_mapsize);
|
|
dlclose (shobj->map);
|
|
}
|
|
|
|
|
|
static struct profdata *
|
|
load_profdata (const char *name, struct shobj *shobj)
|
|
{
|
|
struct profdata *result;
|
|
int fd;
|
|
struct stat st;
|
|
void *addr;
|
|
struct gmon_hdr gmon_hdr;
|
|
struct gmon_hist_hdr hist_hdr;
|
|
uint32_t *narcsp;
|
|
size_t fromlimit;
|
|
struct here_cg_arc_record *data;
|
|
struct here_fromstruct *froms;
|
|
uint16_t *tos;
|
|
size_t fromidx;
|
|
size_t idx;
|
|
|
|
fd = open (name, O_RDONLY);
|
|
if (fd == -1)
|
|
{
|
|
char *ext_name;
|
|
|
|
if (errno != ENOENT || strchr (name, '/') != NULL)
|
|
/* The file exists but we are not allowed to read it or the
|
|
file does not exist and the name includes a path
|
|
specification.. */
|
|
return NULL;
|
|
|
|
/* A file with the given name does not exist in the current
|
|
directory, try it in the default location where the profiling
|
|
files are created. */
|
|
ext_name = (char *) alloca (strlen (name) + sizeof "/var/tmp/");
|
|
stpcpy (stpcpy (ext_name, "/var/tmp/"), name);
|
|
name = ext_name;
|
|
|
|
fd = open (ext_name, O_RDONLY);
|
|
if (fd == -1)
|
|
{
|
|
/* Even this file does not exist. */
|
|
error (0, errno, _("cannot load profiling data"));
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
/* We have found the file, now make sure it is the right one for the
|
|
data file. */
|
|
if (fstat (fd, &st) < 0)
|
|
{
|
|
error (0, errno, _("while stat'ing profiling data file"));
|
|
close (fd);
|
|
return NULL;
|
|
}
|
|
|
|
if ((size_t) st.st_size != shobj->expected_size)
|
|
{
|
|
error (0, 0,
|
|
_("profiling data file `%s' does not match shared object `%s'"),
|
|
name, shobj->name);
|
|
close (fd);
|
|
return NULL;
|
|
}
|
|
|
|
/* The data file is most probably the right one for our shared
|
|
object. Map it now. */
|
|
addr = mmap (NULL, st.st_size, PROT_READ, MAP_SHARED|MAP_FILE, fd, 0);
|
|
if (addr == MAP_FAILED)
|
|
{
|
|
error (0, errno, _("failed to mmap the profiling data file"));
|
|
close (fd);
|
|
return NULL;
|
|
}
|
|
|
|
/* We don't need the file desriptor anymore. */
|
|
if (close (fd) < 0)
|
|
{
|
|
error (0, errno, _("error while closing the profiling data file"));
|
|
munmap (addr, st.st_size);
|
|
return NULL;
|
|
}
|
|
|
|
/* Prepare the result. */
|
|
result = (struct profdata *) calloc (1, sizeof (struct profdata));
|
|
if (result == NULL)
|
|
{
|
|
error (0, errno, _("cannot create internal descriptor"));
|
|
munmap (addr, st.st_size);
|
|
return NULL;
|
|
}
|
|
|
|
/* Store the address and size so that we can later free the resources. */
|
|
result->addr = addr;
|
|
result->size = st.st_size;
|
|
|
|
/* Pointer to data after the header. */
|
|
result->hist = (char *) ((struct gmon_hdr *) addr + 1);
|
|
result->hist_hdr = (struct gmon_hist_hdr *) ((char *) result->hist
|
|
+ sizeof (uint32_t));
|
|
result->kcount = (uint16_t *) ((char *) result->hist + sizeof (uint32_t)
|
|
+ sizeof (struct gmon_hist_hdr));
|
|
|
|
/* Compute pointer to array of the arc information. */
|
|
narcsp = (uint32_t *) ((char *) result->kcount + shobj->kcountsize
|
|
+ sizeof (uint32_t));
|
|
result->narcs = *narcsp;
|
|
result->data = (struct here_cg_arc_record *) ((char *) narcsp
|
|
+ sizeof (uint32_t));
|
|
|
|
/* Create the gmon_hdr we expect or write. */
|
|
memset (&gmon_hdr, '\0', sizeof (struct gmon_hdr));
|
|
memcpy (&gmon_hdr.cookie[0], GMON_MAGIC, sizeof (gmon_hdr.cookie));
|
|
*(int32_t *) gmon_hdr.version = GMON_SHOBJ_VERSION;
|
|
|
|
/* Create the hist_hdr we expect or write. */
|
|
*(char **) hist_hdr.low_pc = (char *) shobj->lowpc - shobj->map->l_addr;
|
|
*(char **) hist_hdr.high_pc = (char *) shobj->highpc - shobj->map->l_addr;
|
|
if (do_test)
|
|
printf ("low_pc = %p\nhigh_pc = %p\n",
|
|
*(char **) hist_hdr.low_pc, *(char **) hist_hdr.high_pc);
|
|
*(int32_t *) hist_hdr.hist_size = shobj->kcountsize / sizeof (HISTCOUNTER);
|
|
*(int32_t *) hist_hdr.prof_rate = __profile_frequency ();
|
|
strncpy (hist_hdr.dimen, "seconds", sizeof (hist_hdr.dimen));
|
|
hist_hdr.dimen_abbrev = 's';
|
|
|
|
/* Test whether the header of the profiling data is ok. */
|
|
if (memcmp (addr, &gmon_hdr, sizeof (struct gmon_hdr)) != 0
|
|
|| *(uint32_t *) result->hist != GMON_TAG_TIME_HIST
|
|
|| memcmp (result->hist_hdr, &hist_hdr,
|
|
sizeof (struct gmon_hist_hdr)) != 0
|
|
|| narcsp[-1] != GMON_TAG_CG_ARC)
|
|
{
|
|
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;
|
|
}
|
|
|
|
/* We are pretty sure now that this is a correct input file. Set up
|
|
the remaining information in the result structure and return. */
|
|
result->tos = (uint16_t *) calloc (shobj->tossize + shobj->fromssize, 1);
|
|
if (result->tos == NULL)
|
|
{
|
|
error (0, errno, _("cannot create internal descriptor"));
|
|
munmap (addr, st.st_size);
|
|
free (result);
|
|
return NULL;
|
|
}
|
|
|
|
result->froms = (struct here_fromstruct *) ((char *) result->tos
|
|
+ shobj->tossize);
|
|
fromidx = 0;
|
|
|
|
/* Now we have to process all the arc count entries. */
|
|
fromlimit = shobj->fromlimit;
|
|
data = result->data;
|
|
froms = result->froms;
|
|
tos = result->tos;
|
|
for (idx = 0; idx < MIN (*narcsp, fromlimit); ++idx)
|
|
{
|
|
size_t to_index;
|
|
size_t newfromidx;
|
|
to_index = (data[idx].self_pc / (shobj->hashfraction * sizeof (*tos)));
|
|
newfromidx = fromidx++;
|
|
froms[newfromidx].here = &data[idx];
|
|
froms[newfromidx].link = tos[to_index];
|
|
tos[to_index] = newfromidx;
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
|
|
static void
|
|
unload_profdata (struct profdata *profdata)
|
|
{
|
|
free (profdata->tos);
|
|
munmap (profdata->addr, profdata->size);
|
|
free (profdata);
|
|
}
|
|
|
|
|
|
static void
|
|
count_total_ticks (struct shobj *shobj, struct profdata *profdata)
|
|
{
|
|
volatile uint16_t *kcount = profdata->kcount;
|
|
size_t maxkidx = shobj->kcountsize;
|
|
size_t factor = 2 * (65536 / shobj->s_scale);
|
|
size_t kidx = 0;
|
|
size_t sidx = 0;
|
|
|
|
while (sidx < symidx)
|
|
{
|
|
uintptr_t start = sortsym[sidx]->addr;
|
|
uintptr_t end = start + sortsym[sidx]->size;
|
|
|
|
while (kidx < maxkidx && factor * kidx < start)
|
|
++kidx;
|
|
if (kidx == maxkidx)
|
|
break;
|
|
|
|
while (kidx < maxkidx && factor * kidx < end)
|
|
sortsym[sidx]->ticks += kcount[kidx++];
|
|
if (kidx == maxkidx)
|
|
break;
|
|
|
|
total_ticks += sortsym[sidx++]->ticks;
|
|
}
|
|
}
|
|
|
|
|
|
static size_t
|
|
find_symbol (uintptr_t addr)
|
|
{
|
|
size_t sidx = 0;
|
|
|
|
while (sidx < symidx)
|
|
{
|
|
uintptr_t start = sortsym[sidx]->addr;
|
|
uintptr_t end = start + sortsym[sidx]->size;
|
|
|
|
if (addr >= start && addr < end)
|
|
return sidx;
|
|
|
|
if (addr < start)
|
|
break;
|
|
|
|
++sidx;
|
|
}
|
|
|
|
return (size_t) -1l;
|
|
}
|
|
|
|
|
|
static void
|
|
count_calls (struct shobj *shobj, struct profdata *profdata)
|
|
{
|
|
struct here_cg_arc_record *data = profdata->data;
|
|
uint32_t narcs = profdata->narcs;
|
|
uint32_t cnt;
|
|
|
|
for (cnt = 0; cnt < narcs; ++cnt)
|
|
{
|
|
uintptr_t here = data[cnt].self_pc;
|
|
size_t symbol_idx;
|
|
|
|
/* Find the symbol for this address. */
|
|
symbol_idx = find_symbol (here);
|
|
if (symbol_idx != (size_t) -1l)
|
|
sortsym[symbol_idx]->calls += data[cnt].count;
|
|
}
|
|
}
|
|
|
|
|
|
static int
|
|
symorder (const void *o1, const void *o2)
|
|
{
|
|
const struct known_symbol *p1 = (const struct known_symbol *) o1;
|
|
const struct known_symbol *p2 = (const struct known_symbol *) o2;
|
|
|
|
return p1->addr - p2->addr;
|
|
}
|
|
|
|
|
|
static void
|
|
printsym (const void *node, VISIT value, int level)
|
|
{
|
|
if (value == leaf || value == postorder)
|
|
sortsym[symidx++] = *(struct known_symbol **) node;
|
|
}
|
|
|
|
|
|
static void
|
|
read_symbols (struct shobj *shobj)
|
|
{
|
|
int n = 0;
|
|
|
|
/* Initialize the obstacks. */
|
|
#define obstack_chunk_alloc malloc
|
|
#define obstack_chunk_free free
|
|
obstack_init (&shobj->ob_str);
|
|
obstack_init (&shobj->ob_sym);
|
|
obstack_init (&ob_list);
|
|
|
|
/* Process the symbols. */
|
|
if (shobj->symtab != NULL)
|
|
{
|
|
const ElfW(Sym) *sym = shobj->symtab;
|
|
const ElfW(Sym) *sym_end
|
|
= (const ElfW(Sym) *) ((const char *) sym + shobj->symtab_size);
|
|
for (; sym < sym_end; sym++)
|
|
if ((ELFW(ST_TYPE) (sym->st_info) == STT_FUNC
|
|
|| ELFW(ST_TYPE) (sym->st_info) == STT_NOTYPE)
|
|
&& sym->st_size != 0)
|
|
{
|
|
struct known_symbol **existp;
|
|
struct known_symbol *newsym
|
|
= (struct known_symbol *) obstack_alloc (&shobj->ob_sym,
|
|
sizeof (*newsym));
|
|
if (newsym == NULL)
|
|
error (EXIT_FAILURE, errno, _("cannot allocate symbol data"));
|
|
|
|
newsym->name = &shobj->strtab[sym->st_name];
|
|
newsym->addr = sym->st_value;
|
|
newsym->size = sym->st_size;
|
|
newsym->weak = ELFW(ST_BIND) (sym->st_info) == STB_WEAK;
|
|
newsym->hidden = (ELFW(ST_VISIBILITY) (sym->st_other)
|
|
!= STV_DEFAULT);
|
|
newsym->ticks = 0;
|
|
newsym->calls = 0;
|
|
|
|
existp = tfind (newsym, &symroot, symorder);
|
|
if (existp == NULL)
|
|
{
|
|
/* New function. */
|
|
tsearch (newsym, &symroot, symorder);
|
|
++n;
|
|
}
|
|
else
|
|
{
|
|
/* The function is already defined. See whether we have
|
|
a better name here. */
|
|
if (((*existp)->hidden && !newsym->hidden)
|
|
|| ((*existp)->name[0] == '_' && newsym->name[0] != '_')
|
|
|| ((*existp)->name[0] != '_' && newsym->name[0] != '_'
|
|
&& ((*existp)->weak && !newsym->weak)))
|
|
*existp = newsym;
|
|
else
|
|
/* We don't need the allocated memory. */
|
|
obstack_free (&shobj->ob_sym, newsym);
|
|
}
|
|
}
|
|
}
|
|
else
|
|
{
|
|
/* Blarg, the binary is stripped. We have to rely on the
|
|
information contained in the dynamic section of the object. */
|
|
const ElfW(Sym) *symtab = (ElfW(Sym) *) D_PTR (shobj->map,
|
|
l_info[DT_SYMTAB]);
|
|
const char *strtab = (const char *) D_PTR (shobj->map,
|
|
l_info[DT_STRTAB]);
|
|
|
|
/* We assume that the string table follows the symbol table,
|
|
because there is no way in ELF to know the size of the
|
|
dynamic symbol table without looking at the section headers. */
|
|
while ((void *) symtab < (void *) strtab)
|
|
{
|
|
if ((ELFW(ST_TYPE)(symtab->st_info) == STT_FUNC
|
|
|| ELFW(ST_TYPE)(symtab->st_info) == STT_NOTYPE)
|
|
&& symtab->st_size != 0)
|
|
{
|
|
struct known_symbol *newsym;
|
|
struct known_symbol **existp;
|
|
|
|
newsym =
|
|
(struct known_symbol *) obstack_alloc (&shobj->ob_sym,
|
|
sizeof (*newsym));
|
|
if (newsym == NULL)
|
|
error (EXIT_FAILURE, errno, _("cannot allocate symbol data"));
|
|
|
|
newsym->name = &strtab[symtab->st_name];
|
|
newsym->addr = symtab->st_value;
|
|
newsym->size = symtab->st_size;
|
|
newsym->weak = ELFW(ST_BIND) (symtab->st_info) == STB_WEAK;
|
|
newsym->hidden = (ELFW(ST_VISIBILITY) (symtab->st_other)
|
|
!= STV_DEFAULT);
|
|
newsym->ticks = 0;
|
|
newsym->froms = NULL;
|
|
newsym->tos = NULL;
|
|
|
|
existp = tfind (newsym, &symroot, symorder);
|
|
if (existp == NULL)
|
|
{
|
|
/* New function. */
|
|
tsearch (newsym, &symroot, symorder);
|
|
++n;
|
|
}
|
|
else
|
|
{
|
|
/* The function is already defined. See whether we have
|
|
a better name here. */
|
|
if (((*existp)->hidden && !newsym->hidden)
|
|
|| ((*existp)->name[0] == '_' && newsym->name[0] != '_')
|
|
|| ((*existp)->name[0] != '_' && newsym->name[0] != '_'
|
|
&& ((*existp)->weak && !newsym->weak)))
|
|
*existp = newsym;
|
|
else
|
|
/* We don't need the allocated memory. */
|
|
obstack_free (&shobj->ob_sym, newsym);
|
|
}
|
|
}
|
|
|
|
++symtab;
|
|
}
|
|
}
|
|
|
|
sortsym = malloc (n * sizeof (struct known_symbol *));
|
|
if (sortsym == NULL)
|
|
abort ();
|
|
|
|
twalk (symroot, printsym);
|
|
}
|
|
|
|
|
|
static void
|
|
add_arcs (struct profdata *profdata)
|
|
{
|
|
uint32_t narcs = profdata->narcs;
|
|
struct here_cg_arc_record *data = profdata->data;
|
|
uint32_t cnt;
|
|
|
|
for (cnt = 0; cnt < narcs; ++cnt)
|
|
{
|
|
/* First add the incoming arc. */
|
|
size_t sym_idx = find_symbol (data[cnt].self_pc);
|
|
|
|
if (sym_idx != (size_t) -1l)
|
|
{
|
|
struct known_symbol *sym = sortsym[sym_idx];
|
|
struct arc_list *runp = sym->froms;
|
|
|
|
while (runp != NULL
|
|
&& ((data[cnt].from_pc == 0 && runp->idx != (size_t) -1l)
|
|
|| (data[cnt].from_pc != 0
|
|
&& (runp->idx == (size_t) -1l
|
|
|| data[cnt].from_pc < sortsym[runp->idx]->addr
|
|
|| (data[cnt].from_pc
|
|
>= (sortsym[runp->idx]->addr
|
|
+ sortsym[runp->idx]->size))))))
|
|
runp = runp->next;
|
|
|
|
if (runp == NULL)
|
|
{
|
|
/* We need a new entry. */
|
|
struct arc_list *newp = (struct arc_list *)
|
|
obstack_alloc (&ob_list, sizeof (struct arc_list));
|
|
|
|
if (data[cnt].from_pc == 0)
|
|
newp->idx = (size_t) -1l;
|
|
else
|
|
newp->idx = find_symbol (data[cnt].from_pc);
|
|
newp->count = data[cnt].count;
|
|
newp->next = sym->froms;
|
|
sym->froms = newp;
|
|
}
|
|
else
|
|
/* Increment the counter for the found entry. */
|
|
runp->count += data[cnt].count;
|
|
}
|
|
|
|
/* Now add it to the appropriate outgoing list. */
|
|
sym_idx = find_symbol (data[cnt].from_pc);
|
|
if (sym_idx != (size_t) -1l)
|
|
{
|
|
struct known_symbol *sym = sortsym[sym_idx];
|
|
struct arc_list *runp = sym->tos;
|
|
|
|
while (runp != NULL
|
|
&& (runp->idx == (size_t) -1l
|
|
|| data[cnt].self_pc < sortsym[runp->idx]->addr
|
|
|| data[cnt].self_pc >= (sortsym[runp->idx]->addr
|
|
+ sortsym[runp->idx]->size)))
|
|
runp = runp->next;
|
|
|
|
if (runp == NULL)
|
|
{
|
|
/* We need a new entry. */
|
|
struct arc_list *newp = (struct arc_list *)
|
|
obstack_alloc (&ob_list, sizeof (struct arc_list));
|
|
|
|
newp->idx = find_symbol (data[cnt].self_pc);
|
|
newp->count = data[cnt].count;
|
|
newp->next = sym->tos;
|
|
sym->tos = newp;
|
|
}
|
|
else
|
|
/* Increment the counter for the found entry. */
|
|
runp->count += data[cnt].count;
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
static int
|
|
countorder (const void *p1, const void *p2)
|
|
{
|
|
struct known_symbol *s1 = (struct known_symbol *) p1;
|
|
struct known_symbol *s2 = (struct known_symbol *) p2;
|
|
|
|
if (s1->ticks != s2->ticks)
|
|
return (int) (s2->ticks - s1->ticks);
|
|
|
|
if (s1->calls != s2->calls)
|
|
return (int) (s2->calls - s1->calls);
|
|
|
|
return strcmp (s1->name, s2->name);
|
|
}
|
|
|
|
|
|
static double tick_unit;
|
|
static uintmax_t cumu_ticks;
|
|
|
|
static void
|
|
printflat (const void *node, VISIT value, int level)
|
|
{
|
|
if (value == leaf || value == postorder)
|
|
{
|
|
struct known_symbol *s = *(struct known_symbol **) node;
|
|
|
|
cumu_ticks += s->ticks;
|
|
|
|
printf ("%6.2f%10.2f%9.2f%9" PRIdMAX "%9.2f %s\n",
|
|
total_ticks ? (100.0 * s->ticks) / total_ticks : 0.0,
|
|
tick_unit * cumu_ticks,
|
|
tick_unit * s->ticks,
|
|
s->calls,
|
|
s->calls ? (s->ticks * 1000000) * tick_unit / s->calls : 0,
|
|
/* FIXME: don't know about called functions. */
|
|
s->name);
|
|
}
|
|
}
|
|
|
|
|
|
/* ARGUSED */
|
|
static void
|
|
freenoop (void *p)
|
|
{
|
|
}
|
|
|
|
|
|
static void
|
|
generate_flat_profile (struct profdata *profdata)
|
|
{
|
|
size_t n;
|
|
void *data = NULL;
|
|
|
|
tick_unit = 1.0 / *(uint32_t *) profdata->hist_hdr->prof_rate;
|
|
|
|
printf ("Flat profile:\n\n"
|
|
"Each sample counts as %g %s.\n",
|
|
tick_unit, profdata->hist_hdr->dimen);
|
|
fputs (" % cumulative self self total\n"
|
|
" time seconds seconds calls us/call us/call name\n",
|
|
stdout);
|
|
|
|
for (n = 0; n < symidx; ++n)
|
|
if (sortsym[n]->calls != 0 || sortsym[n]->ticks != 0)
|
|
tsearch (sortsym[n], &data, countorder);
|
|
|
|
twalk (data, printflat);
|
|
|
|
tdestroy (data, freenoop);
|
|
}
|
|
|
|
|
|
static void
|
|
generate_call_graph (struct profdata *profdata)
|
|
{
|
|
size_t cnt;
|
|
|
|
puts ("\nindex % time self children called name\n");
|
|
|
|
for (cnt = 0; cnt < symidx; ++cnt)
|
|
if (sortsym[cnt]->froms != NULL || sortsym[cnt]->tos != NULL)
|
|
{
|
|
struct arc_list *runp;
|
|
size_t n;
|
|
|
|
/* First print the from-information. */
|
|
runp = sortsym[cnt]->froms;
|
|
while (runp != NULL)
|
|
{
|
|
printf (" %8.2f%8.2f%9" PRIdMAX "/%-9" PRIdMAX " %s",
|
|
(runp->idx != (size_t) -1l
|
|
? sortsym[runp->idx]->ticks * tick_unit : 0.0),
|
|
0.0, /* FIXME: what's time for the children, recursive */
|
|
runp->count, sortsym[cnt]->calls,
|
|
(runp->idx != (size_t) -1l ?
|
|
sortsym[runp->idx]->name : "<UNKNOWN>"));
|
|
|
|
if (runp->idx != (size_t) -1l)
|
|
printf (" [%Zd]", runp->idx);
|
|
putchar_unlocked ('\n');
|
|
|
|
runp = runp->next;
|
|
}
|
|
|
|
/* Info abount the function itself. */
|
|
n = printf ("[%Zu]", cnt);
|
|
printf ("%*s%5.1f%8.2f%8.2f%9" PRIdMAX " %s [%Zd]\n",
|
|
(int) (7 - n), " ",
|
|
total_ticks ? (100.0 * sortsym[cnt]->ticks) / total_ticks : 0,
|
|
sortsym[cnt]->ticks * tick_unit,
|
|
0.0, /* FIXME: what's time for the children, recursive */
|
|
sortsym[cnt]->calls,
|
|
sortsym[cnt]->name, cnt);
|
|
|
|
/* Info about the functions this function calls. */
|
|
runp = sortsym[cnt]->tos;
|
|
while (runp != NULL)
|
|
{
|
|
printf (" %8.2f%8.2f%9" PRIdMAX "/",
|
|
(runp->idx != (size_t) -1l
|
|
? sortsym[runp->idx]->ticks * tick_unit : 0.0),
|
|
0.0, /* FIXME: what's time for the children, recursive */
|
|
runp->count);
|
|
|
|
if (runp->idx != (size_t) -1l)
|
|
printf ("%-9" PRIdMAX " %s [%Zd]\n",
|
|
sortsym[runp->idx]->calls,
|
|
sortsym[runp->idx]->name,
|
|
runp->idx);
|
|
else
|
|
fputs ("??? <UNKNOWN>\n\n", stdout);
|
|
|
|
runp = runp->next;
|
|
}
|
|
|
|
fputs ("-----------------------------------------------\n", stdout);
|
|
}
|
|
}
|
|
|
|
|
|
static void
|
|
generate_call_pair_list (struct profdata *profdata)
|
|
{
|
|
size_t cnt;
|
|
|
|
for (cnt = 0; cnt < symidx; ++cnt)
|
|
if (sortsym[cnt]->froms != NULL || sortsym[cnt]->tos != NULL)
|
|
{
|
|
struct arc_list *runp;
|
|
|
|
/* First print the incoming arcs. */
|
|
runp = sortsym[cnt]->froms;
|
|
while (runp != NULL)
|
|
{
|
|
if (runp->idx == (size_t) -1l)
|
|
printf ("\
|
|
<UNKNOWN> %-34s %9" PRIdMAX "\n",
|
|
sortsym[cnt]->name, runp->count);
|
|
runp = runp->next;
|
|
}
|
|
|
|
/* Next the outgoing arcs. */
|
|
runp = sortsym[cnt]->tos;
|
|
while (runp != NULL)
|
|
{
|
|
printf ("%-34s %-34s %9" PRIdMAX "\n",
|
|
sortsym[cnt]->name,
|
|
(runp->idx != (size_t) -1l
|
|
? sortsym[runp->idx]->name : "<UNKNOWN>"),
|
|
runp->count);
|
|
runp = runp->next;
|
|
}
|
|
}
|
|
}
|