mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08: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.
556 lines
17 KiB
C
556 lines
17 KiB
C
/* Profiling of shared libraries.
|
||
Copyright (C) 1997-2002, 2003, 2004, 2006 Free Software Foundation, Inc.
|
||
This file is part of the GNU C Library.
|
||
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
|
||
Based on the BSD mcount implementation.
|
||
|
||
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 <assert.h>
|
||
#include <errno.h>
|
||
#include <fcntl.h>
|
||
#include <inttypes.h>
|
||
#include <limits.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>
|
||
#include <atomic.h>
|
||
|
||
/* The LD_PROFILE feature has to be implemented different to the
|
||
normal profiling using the gmon/ functions. The problem is that an
|
||
arbitrary amount of processes simulataneously can be run using
|
||
profiling and all write the results in the same file. To provide
|
||
this mechanism one could implement a complicated mechanism to merge
|
||
the content of two profiling runs or one could extend the file
|
||
format to allow more than one data set. For the second solution we
|
||
would have the problem that the file can grow in size beyond any
|
||
limit and both solutions have the problem that the concurrency of
|
||
writing the results is a big problem.
|
||
|
||
Another much simpler method is to use mmap to map the same file in
|
||
all using programs and modify the data in the mmap'ed area and so
|
||
also automatically on the disk. Using the MAP_SHARED option of
|
||
mmap(2) this can be done without big problems in more than one
|
||
file.
|
||
|
||
This approach is very different from the normal profiling. We have
|
||
to use the profiling data in exactly the way they are expected to
|
||
be written to disk. But the normal format used by gprof is not usable
|
||
to do this. It is optimized for size. It writes the tags as single
|
||
bytes but this means that the following 32/64 bit values are
|
||
unaligned.
|
||
|
||
Therefore we use a new format. This will look like this
|
||
|
||
0 1 2 3 <- byte is 32 bit word
|
||
0000 g m o n
|
||
0004 *version* <- GMON_SHOBJ_VERSION
|
||
0008 00 00 00 00
|
||
000c 00 00 00 00
|
||
0010 00 00 00 00
|
||
|
||
0014 *tag* <- GMON_TAG_TIME_HIST
|
||
0018 ?? ?? ?? ??
|
||
?? ?? ?? ?? <- 32/64 bit LowPC
|
||
0018+A ?? ?? ?? ??
|
||
?? ?? ?? ?? <- 32/64 bit HighPC
|
||
0018+2*A *histsize*
|
||
001c+2*A *profrate*
|
||
0020+2*A s e c o
|
||
0024+2*A n d s \0
|
||
0028+2*A \0 \0 \0 \0
|
||
002c+2*A \0 \0 \0
|
||
002f+2*A s
|
||
|
||
0030+2*A ?? ?? ?? ?? <- Count data
|
||
... ...
|
||
0030+2*A+K ?? ?? ?? ??
|
||
|
||
0030+2*A+K *tag* <- GMON_TAG_CG_ARC
|
||
0034+2*A+K *lastused*
|
||
0038+2*A+K ?? ?? ?? ??
|
||
?? ?? ?? ?? <- FromPC#1
|
||
0038+3*A+K ?? ?? ?? ??
|
||
?? ?? ?? ?? <- ToPC#1
|
||
0038+4*A+K ?? ?? ?? ?? <- Count#1
|
||
... ... ...
|
||
0038+(2*(CN-1)+2)*A+(CN-1)*4+K ?? ?? ?? ??
|
||
?? ?? ?? ?? <- FromPC#CGN
|
||
0038+(2*(CN-1)+3)*A+(CN-1)*4+K ?? ?? ?? ??
|
||
?? ?? ?? ?? <- ToPC#CGN
|
||
0038+(2*CN+2)*A+(CN-1)*4+K ?? ?? ?? ?? <- Count#CGN
|
||
|
||
We put (for now?) no basic block information in the file since this would
|
||
introduce rase conditions among all the processes who want to write them.
|
||
|
||
`K' is the number of count entries which is computed as
|
||
|
||
textsize / HISTFRACTION
|
||
|
||
`CG' in the above table is the number of call graph arcs. Normally,
|
||
the table is sparse and the profiling code writes out only the those
|
||
entries which are really used in the program run. But since we must
|
||
not extend this table (the profiling file) we'll keep them all here.
|
||
So CN can be executed in advance as
|
||
|
||
MINARCS <= textsize*(ARCDENSITY/100) <= MAXARCS
|
||
|
||
Now the remaining question is: how to build the data structures we can
|
||
work with from this data. We need the from set and must associate the
|
||
froms with all the associated tos. We will do this by constructing this
|
||
data structures at the program start. To do this we'll simply visit all
|
||
entries in the call graph table and add it to the appropriate list. */
|
||
|
||
extern int __profile_frequency (void);
|
||
libc_hidden_proto (__profile_frequency)
|
||
|
||
/* 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));
|
||
|
||
static struct here_cg_arc_record *data;
|
||
|
||
/* Nonzero if profiling is under way. */
|
||
static int running;
|
||
|
||
/* This is the number of entry which have been incorporated in the toset. */
|
||
static uint32_t narcs;
|
||
/* This is a pointer to the object representing the number of entries
|
||
currently in the mmaped file. At no point of time this has to be the
|
||
same as NARCS. If it is equal all entries from the file are in our
|
||
lists. */
|
||
static volatile uint32_t *narcsp;
|
||
|
||
|
||
struct here_fromstruct
|
||
{
|
||
struct here_cg_arc_record volatile *here;
|
||
uint16_t link;
|
||
};
|
||
|
||
static volatile uint16_t *tos;
|
||
|
||
static struct here_fromstruct *froms;
|
||
static uint32_t fromlimit;
|
||
static volatile uint32_t fromidx;
|
||
|
||
static uintptr_t lowpc;
|
||
static size_t textsize;
|
||
static unsigned int log_hashfraction;
|
||
|
||
|
||
|
||
/* Set up profiling data to profile object desribed by MAP. The output
|
||
file is found (or created) in OUTPUT_DIR. */
|
||
void
|
||
internal_function
|
||
_dl_start_profile (void)
|
||
{
|
||
char *filename;
|
||
int fd;
|
||
struct stat64 st;
|
||
const ElfW(Phdr) *ph;
|
||
ElfW(Addr) mapstart = ~((ElfW(Addr)) 0);
|
||
ElfW(Addr) mapend = 0;
|
||
struct gmon_hdr gmon_hdr;
|
||
struct gmon_hist_hdr hist_hdr;
|
||
char *hist, *cp;
|
||
size_t idx;
|
||
size_t tossize;
|
||
size_t fromssize;
|
||
uintptr_t highpc;
|
||
uint16_t *kcount;
|
||
size_t kcountsize;
|
||
struct gmon_hdr *addr = NULL;
|
||
off_t expected_size;
|
||
/* See profil(2) where this is described. */
|
||
int s_scale;
|
||
#define SCALE_1_TO_1 0x10000L
|
||
const char *errstr = NULL;
|
||
|
||
/* Compute the size of the sections which contain program code. */
|
||
for (ph = GL(dl_profile_map)->l_phdr;
|
||
ph < &GL(dl_profile_map)->l_phdr[GL(dl_profile_map)->l_phnum]; ++ph)
|
||
if (ph->p_type == PT_LOAD && (ph->p_flags & PF_X))
|
||
{
|
||
ElfW(Addr) start = (ph->p_vaddr & ~(GLRO(dl_pagesize) - 1));
|
||
ElfW(Addr) end = ((ph->p_vaddr + ph->p_memsz + GLRO(dl_pagesize) - 1)
|
||
& ~(GLRO(dl_pagesize) - 1));
|
||
|
||
if (start < mapstart)
|
||
mapstart = start;
|
||
if (end > mapend)
|
||
mapend = end;
|
||
}
|
||
|
||
/* Now we can compute the size of the profiling data. This is done
|
||
with the same formulars as in `monstartup' (see gmon.c). */
|
||
running = 0;
|
||
lowpc = ROUNDDOWN (mapstart + GL(dl_profile_map)->l_addr,
|
||
HISTFRACTION * sizeof (HISTCOUNTER));
|
||
highpc = ROUNDUP (mapend + GL(dl_profile_map)->l_addr,
|
||
HISTFRACTION * sizeof (HISTCOUNTER));
|
||
textsize = highpc - lowpc;
|
||
kcountsize = textsize / HISTFRACTION;
|
||
if ((HASHFRACTION & (HASHFRACTION - 1)) == 0)
|
||
{
|
||
/* If HASHFRACTION is a power of two, mcount can use shifting
|
||
instead of integer division. Precompute shift amount.
|
||
|
||
This is a constant but the compiler cannot compile the
|
||
expression away since the __ffs implementation is not known
|
||
to the compiler. Help the compiler by precomputing the
|
||
usual cases. */
|
||
assert (HASHFRACTION == 2);
|
||
|
||
if (sizeof (*froms) == 8)
|
||
log_hashfraction = 4;
|
||
else if (sizeof (*froms) == 16)
|
||
log_hashfraction = 5;
|
||
else
|
||
log_hashfraction = __ffs (HASHFRACTION * sizeof (*froms)) - 1;
|
||
}
|
||
else
|
||
log_hashfraction = -1;
|
||
tossize = textsize / HASHFRACTION;
|
||
fromlimit = textsize * ARCDENSITY / 100;
|
||
if (fromlimit < MINARCS)
|
||
fromlimit = MINARCS;
|
||
if (fromlimit > MAXARCS)
|
||
fromlimit = MAXARCS;
|
||
fromssize = fromlimit * sizeof (struct here_fromstruct);
|
||
|
||
expected_size = (sizeof (struct gmon_hdr)
|
||
+ 4 + sizeof (struct gmon_hist_hdr) + kcountsize
|
||
+ 4 + 4 + fromssize * sizeof (struct here_cg_arc_record));
|
||
|
||
/* 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 *) mapstart;
|
||
*(char **) hist_hdr.high_pc = (char *) mapend;
|
||
*(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"));
|
||
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';
|
||
|
||
/* First determine the output name. We write in the directory
|
||
OUTPUT_DIR and the name is composed from the shared objects
|
||
soname (or the file name) and the ending ".profile". */
|
||
filename = (char *) alloca (strlen (GLRO(dl_profile_output)) + 1
|
||
+ strlen (GLRO(dl_profile)) + sizeof ".profile");
|
||
cp = __stpcpy (filename, GLRO(dl_profile_output));
|
||
*cp++ = '/';
|
||
__stpcpy (__stpcpy (cp, GLRO(dl_profile)), ".profile");
|
||
|
||
#ifdef O_NOFOLLOW
|
||
# define EXTRA_FLAGS | O_NOFOLLOW
|
||
#else
|
||
# define EXTRA_FLAGS
|
||
#endif
|
||
fd = __open (filename, O_RDWR | O_CREAT EXTRA_FLAGS, DEFFILEMODE);
|
||
if (fd == -1)
|
||
{
|
||
char buf[400];
|
||
int errnum;
|
||
|
||
/* We cannot write the profiling data so don't do anything. */
|
||
errstr = "%s: cannot open file: %s\n";
|
||
print_error:
|
||
errnum = errno;
|
||
if (fd != -1)
|
||
__close (fd);
|
||
_dl_error_printf (errstr, filename,
|
||
__strerror_r (errnum, buf, sizeof buf));
|
||
return;
|
||
}
|
||
|
||
if (__fxstat64 (_STAT_VER, fd, &st) < 0 || !S_ISREG (st.st_mode))
|
||
{
|
||
/* Not stat'able or not a regular file => don't use it. */
|
||
errstr = "%s: cannot stat file: %s\n";
|
||
goto print_error;
|
||
}
|
||
|
||
/* Test the size. If it does not match what we expect from the size
|
||
values in the map MAP we don't use it and warn the user. */
|
||
if (st.st_size == 0)
|
||
{
|
||
/* We have to create the file. */
|
||
char buf[GLRO(dl_pagesize)];
|
||
|
||
memset (buf, '\0', GLRO(dl_pagesize));
|
||
|
||
if (__lseek (fd, expected_size & ~(GLRO(dl_pagesize) - 1), SEEK_SET) == -1)
|
||
{
|
||
cannot_create:
|
||
errstr = "%s: cannot create file: %s\n";
|
||
goto print_error;
|
||
}
|
||
|
||
if (TEMP_FAILURE_RETRY (__libc_write (fd, buf, (expected_size
|
||
& (GLRO(dl_pagesize)
|
||
- 1))))
|
||
< 0)
|
||
goto cannot_create;
|
||
}
|
||
else if (st.st_size != expected_size)
|
||
{
|
||
__close (fd);
|
||
wrong_format:
|
||
|
||
if (addr != NULL)
|
||
__munmap ((void *) addr, expected_size);
|
||
|
||
_dl_error_printf ("%s: file is no correct profile data file for `%s'\n",
|
||
filename, GLRO(dl_profile));
|
||
return;
|
||
}
|
||
|
||
addr = (struct gmon_hdr *) __mmap (NULL, expected_size, PROT_READ|PROT_WRITE,
|
||
MAP_SHARED|MAP_FILE, fd, 0);
|
||
if (addr == (struct gmon_hdr *) MAP_FAILED)
|
||
{
|
||
errstr = "%s: cannot map file: %s\n";
|
||
goto print_error;
|
||
}
|
||
|
||
/* We don't need the file descriptor anymore. */
|
||
__close (fd);
|
||
|
||
/* Pointer to data after the header. */
|
||
hist = (char *) (addr + 1);
|
||
kcount = (uint16_t *) ((char *) hist + sizeof (uint32_t)
|
||
+ sizeof (struct gmon_hist_hdr));
|
||
|
||
/* Compute pointer to array of the arc information. */
|
||
narcsp = (uint32_t *) ((char *) kcount + kcountsize + sizeof (uint32_t));
|
||
data = (struct here_cg_arc_record *) ((char *) narcsp + sizeof (uint32_t));
|
||
|
||
if (st.st_size == 0)
|
||
{
|
||
/* Create the signature. */
|
||
memcpy (addr, &gmon_hdr, sizeof (struct gmon_hdr));
|
||
|
||
*(uint32_t *) hist = GMON_TAG_TIME_HIST;
|
||
memcpy (hist + sizeof (uint32_t), &hist_hdr,
|
||
sizeof (struct gmon_hist_hdr));
|
||
|
||
narcsp[-1] = GMON_TAG_CG_ARC;
|
||
}
|
||
else
|
||
{
|
||
/* Test the signature in the file. */
|
||
if (memcmp (addr, &gmon_hdr, sizeof (struct gmon_hdr)) != 0
|
||
|| *(uint32_t *) hist != GMON_TAG_TIME_HIST
|
||
|| memcmp (hist + sizeof (uint32_t), &hist_hdr,
|
||
sizeof (struct gmon_hist_hdr)) != 0
|
||
|| narcsp[-1] != GMON_TAG_CG_ARC)
|
||
goto wrong_format;
|
||
}
|
||
|
||
/* Allocate memory for the froms data and the pointer to the tos records. */
|
||
tos = (uint16_t *) calloc (tossize + fromssize, 1);
|
||
if (tos == NULL)
|
||
{
|
||
__munmap ((void *) addr, expected_size);
|
||
_dl_fatal_printf ("Out of memory while initializing profiler\n");
|
||
/* NOTREACHED */
|
||
}
|
||
|
||
froms = (struct here_fromstruct *) ((char *) tos + tossize);
|
||
fromidx = 0;
|
||
|
||
/* Now we have to process all the arc count entries. BTW: it is
|
||
not critical whether the *NARCSP value changes meanwhile. Before
|
||
we enter a new entry in to toset we will check that everything is
|
||
available in TOS. This happens in _dl_mcount.
|
||
|
||
Loading the entries in reverse order should help to get the most
|
||
frequently used entries at the front of the list. */
|
||
for (idx = narcs = MIN (*narcsp, fromlimit); idx > 0; )
|
||
{
|
||
size_t to_index;
|
||
size_t newfromidx;
|
||
--idx;
|
||
to_index = (data[idx].self_pc / (HASHFRACTION * sizeof (*tos)));
|
||
newfromidx = fromidx++;
|
||
froms[newfromidx].here = &data[idx];
|
||
froms[newfromidx].link = tos[to_index];
|
||
tos[to_index] = newfromidx;
|
||
}
|
||
|
||
/* Setup counting data. */
|
||
if (kcountsize < highpc - lowpc)
|
||
{
|
||
#if 0
|
||
s_scale = ((double) kcountsize / (highpc - lowpc)) * SCALE_1_TO_1;
|
||
#else
|
||
size_t range = highpc - lowpc;
|
||
size_t quot = range / kcountsize;
|
||
|
||
if (quot >= SCALE_1_TO_1)
|
||
s_scale = 1;
|
||
else if (quot >= SCALE_1_TO_1 / 256)
|
||
s_scale = SCALE_1_TO_1 / quot;
|
||
else if (range > ULONG_MAX / 256)
|
||
s_scale = (SCALE_1_TO_1 * 256) / (range / (kcountsize / 256));
|
||
else
|
||
s_scale = (SCALE_1_TO_1 * 256) / ((range * 256) / kcountsize);
|
||
#endif
|
||
}
|
||
else
|
||
s_scale = SCALE_1_TO_1;
|
||
|
||
/* Start the profiler. */
|
||
__profil ((void *) kcount, kcountsize, lowpc, s_scale);
|
||
|
||
/* Turn on profiling. */
|
||
running = 1;
|
||
}
|
||
|
||
|
||
void
|
||
_dl_mcount (ElfW(Addr) frompc, ElfW(Addr) selfpc)
|
||
{
|
||
volatile uint16_t *topcindex;
|
||
size_t i, fromindex;
|
||
struct here_fromstruct *fromp;
|
||
|
||
if (! running)
|
||
return;
|
||
|
||
/* Compute relative addresses. The shared object can be loaded at
|
||
any address. The value of frompc could be anything. We cannot
|
||
restrict it in any way, just set to a fixed value (0) in case it
|
||
is outside the allowed range. These calls show up as calls from
|
||
<external> in the gprof output. */
|
||
frompc -= lowpc;
|
||
if (frompc >= textsize)
|
||
frompc = 0;
|
||
selfpc -= lowpc;
|
||
if (selfpc >= textsize)
|
||
goto done;
|
||
|
||
/* Getting here we now have to find out whether the location was
|
||
already used. If yes we are lucky and only have to increment a
|
||
counter (this also has to be atomic). If the entry is new things
|
||
are getting complicated... */
|
||
|
||
/* Avoid integer divide if possible. */
|
||
if ((HASHFRACTION & (HASHFRACTION - 1)) == 0)
|
||
i = selfpc >> log_hashfraction;
|
||
else
|
||
i = selfpc / (HASHFRACTION * sizeof (*tos));
|
||
|
||
topcindex = &tos[i];
|
||
fromindex = *topcindex;
|
||
|
||
if (fromindex == 0)
|
||
goto check_new_or_add;
|
||
|
||
fromp = &froms[fromindex];
|
||
|
||
/* We have to look through the chain of arcs whether there is already
|
||
an entry for our arc. */
|
||
while (fromp->here->from_pc != frompc)
|
||
{
|
||
if (fromp->link != 0)
|
||
do
|
||
fromp = &froms[fromp->link];
|
||
while (fromp->link != 0 && fromp->here->from_pc != frompc);
|
||
|
||
if (fromp->here->from_pc != frompc)
|
||
{
|
||
topcindex = &fromp->link;
|
||
|
||
check_new_or_add:
|
||
/* Our entry is not among the entries we read so far from the
|
||
data file. Now see whether we have to update the list. */
|
||
while (narcs != *narcsp && narcs < fromlimit)
|
||
{
|
||
size_t to_index;
|
||
size_t newfromidx;
|
||
to_index = (data[narcs].self_pc
|
||
/ (HASHFRACTION * sizeof (*tos)));
|
||
newfromidx = catomic_exchange_and_add (&fromidx, 1) + 1;
|
||
froms[newfromidx].here = &data[narcs];
|
||
froms[newfromidx].link = tos[to_index];
|
||
tos[to_index] = newfromidx;
|
||
catomic_increment (&narcs);
|
||
}
|
||
|
||
/* If we still have no entry stop searching and insert. */
|
||
if (*topcindex == 0)
|
||
{
|
||
uint_fast32_t newarc = catomic_exchange_and_add (narcsp, 1);
|
||
|
||
/* In rare cases it could happen that all entries in FROMS are
|
||
occupied. So we cannot count this anymore. */
|
||
if (newarc >= fromlimit)
|
||
goto done;
|
||
|
||
*topcindex = catomic_exchange_and_add (&fromidx, 1) + 1;
|
||
fromp = &froms[*topcindex];
|
||
|
||
fromp->here = &data[newarc];
|
||
data[newarc].from_pc = frompc;
|
||
data[newarc].self_pc = selfpc;
|
||
data[newarc].count = 0;
|
||
fromp->link = 0;
|
||
catomic_increment (&narcs);
|
||
|
||
break;
|
||
}
|
||
|
||
fromp = &froms[*topcindex];
|
||
}
|
||
else
|
||
/* Found in. */
|
||
break;
|
||
}
|
||
|
||
/* Increment the counter. */
|
||
catomic_increment (&fromp->here->count);
|
||
|
||
done:
|
||
;
|
||
}
|
||
INTDEF(_dl_mcount)
|