mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-01 17:30:07 +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.
919 lines
25 KiB
C
919 lines
25 KiB
C
/* Malloc implementation for multiple threads without lock contention.
|
||
Copyright (C) 2001,2002,2003,2004,2005,2006 Free Software Foundation, Inc.
|
||
This file is part of the GNU C Library.
|
||
Contributed by Wolfram Gloger <wg@malloc.de>, 2001.
|
||
|
||
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; see the file COPYING.LIB. If not,
|
||
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||
Boston, MA 02111-1307, USA. */
|
||
|
||
#include <stdbool.h>
|
||
|
||
/* Compile-time constants. */
|
||
|
||
#define HEAP_MIN_SIZE (32*1024)
|
||
#ifndef HEAP_MAX_SIZE
|
||
# ifdef DEFAULT_MMAP_THRESHOLD_MAX
|
||
# define HEAP_MAX_SIZE (2 * DEFAULT_MMAP_THRESHOLD_MAX)
|
||
# else
|
||
# define HEAP_MAX_SIZE (1024*1024) /* must be a power of two */
|
||
# endif
|
||
#endif
|
||
|
||
/* HEAP_MIN_SIZE and HEAP_MAX_SIZE limit the size of mmap()ed heaps
|
||
that are dynamically created for multi-threaded programs. The
|
||
maximum size must be a power of two, for fast determination of
|
||
which heap belongs to a chunk. It should be much larger than the
|
||
mmap threshold, so that requests with a size just below that
|
||
threshold can be fulfilled without creating too many heaps. */
|
||
|
||
|
||
#ifndef THREAD_STATS
|
||
#define THREAD_STATS 0
|
||
#endif
|
||
|
||
/* If THREAD_STATS is non-zero, some statistics on mutex locking are
|
||
computed. */
|
||
|
||
/***************************************************************************/
|
||
|
||
#define top(ar_ptr) ((ar_ptr)->top)
|
||
|
||
/* A heap is a single contiguous memory region holding (coalesceable)
|
||
malloc_chunks. It is allocated with mmap() and always starts at an
|
||
address aligned to HEAP_MAX_SIZE. Not used unless compiling with
|
||
USE_ARENAS. */
|
||
|
||
typedef struct _heap_info {
|
||
mstate ar_ptr; /* Arena for this heap. */
|
||
struct _heap_info *prev; /* Previous heap. */
|
||
size_t size; /* Current size in bytes. */
|
||
/* Make sure the following data is properly aligned, particularly
|
||
that sizeof (heap_info) + 2 * SIZE_SZ is a multiple of
|
||
MALLOG_ALIGNMENT. */
|
||
char pad[-5 * SIZE_SZ & MALLOC_ALIGN_MASK];
|
||
} heap_info;
|
||
|
||
/* Get a compile-time error if the heap_info padding is not correct
|
||
to make alignment work as expected in sYSMALLOc. */
|
||
extern int sanity_check_heap_info_alignment[(sizeof (heap_info)
|
||
+ 2 * SIZE_SZ) % MALLOC_ALIGNMENT
|
||
? -1 : 1];
|
||
|
||
/* Thread specific data */
|
||
|
||
static tsd_key_t arena_key;
|
||
static mutex_t list_lock;
|
||
|
||
#if THREAD_STATS
|
||
static int stat_n_heaps;
|
||
#define THREAD_STAT(x) x
|
||
#else
|
||
#define THREAD_STAT(x) do ; while(0)
|
||
#endif
|
||
|
||
/* Mapped memory in non-main arenas (reliable only for NO_THREADS). */
|
||
static unsigned long arena_mem;
|
||
|
||
/* Already initialized? */
|
||
int __malloc_initialized = -1;
|
||
|
||
/**************************************************************************/
|
||
|
||
#if USE_ARENAS
|
||
|
||
/* arena_get() acquires an arena and locks the corresponding mutex.
|
||
First, try the one last locked successfully by this thread. (This
|
||
is the common case and handled with a macro for speed.) Then, loop
|
||
once over the circularly linked list of arenas. If no arena is
|
||
readily available, create a new one. In this latter case, `size'
|
||
is just a hint as to how much memory will be required immediately
|
||
in the new arena. */
|
||
|
||
#define arena_get(ptr, size) do { \
|
||
Void_t *vptr = NULL; \
|
||
ptr = (mstate)tsd_getspecific(arena_key, vptr); \
|
||
if(ptr && !mutex_trylock(&ptr->mutex)) { \
|
||
THREAD_STAT(++(ptr->stat_lock_direct)); \
|
||
} else \
|
||
ptr = arena_get2(ptr, (size)); \
|
||
} while(0)
|
||
|
||
/* find the heap and corresponding arena for a given ptr */
|
||
|
||
#define heap_for_ptr(ptr) \
|
||
((heap_info *)((unsigned long)(ptr) & ~(HEAP_MAX_SIZE-1)))
|
||
#define arena_for_chunk(ptr) \
|
||
(chunk_non_main_arena(ptr) ? heap_for_ptr(ptr)->ar_ptr : &main_arena)
|
||
|
||
#else /* !USE_ARENAS */
|
||
|
||
/* There is only one arena, main_arena. */
|
||
|
||
#if THREAD_STATS
|
||
#define arena_get(ar_ptr, sz) do { \
|
||
ar_ptr = &main_arena; \
|
||
if(!mutex_trylock(&ar_ptr->mutex)) \
|
||
++(ar_ptr->stat_lock_direct); \
|
||
else { \
|
||
(void)mutex_lock(&ar_ptr->mutex); \
|
||
++(ar_ptr->stat_lock_wait); \
|
||
} \
|
||
} while(0)
|
||
#else
|
||
#define arena_get(ar_ptr, sz) do { \
|
||
ar_ptr = &main_arena; \
|
||
(void)mutex_lock(&ar_ptr->mutex); \
|
||
} while(0)
|
||
#endif
|
||
#define arena_for_chunk(ptr) (&main_arena)
|
||
|
||
#endif /* USE_ARENAS */
|
||
|
||
/**************************************************************************/
|
||
|
||
#ifndef NO_THREADS
|
||
|
||
/* atfork support. */
|
||
|
||
static __malloc_ptr_t (*save_malloc_hook) (size_t __size,
|
||
__const __malloc_ptr_t);
|
||
# if !defined _LIBC || (defined SHARED && !USE___THREAD)
|
||
static __malloc_ptr_t (*save_memalign_hook) (size_t __align, size_t __size,
|
||
__const __malloc_ptr_t);
|
||
# endif
|
||
static void (*save_free_hook) (__malloc_ptr_t __ptr,
|
||
__const __malloc_ptr_t);
|
||
static Void_t* save_arena;
|
||
|
||
/* Magic value for the thread-specific arena pointer when
|
||
malloc_atfork() is in use. */
|
||
|
||
#define ATFORK_ARENA_PTR ((Void_t*)-1)
|
||
|
||
/* The following hooks are used while the `atfork' handling mechanism
|
||
is active. */
|
||
|
||
static Void_t*
|
||
malloc_atfork(size_t sz, const Void_t *caller)
|
||
{
|
||
Void_t *vptr = NULL;
|
||
Void_t *victim;
|
||
|
||
tsd_getspecific(arena_key, vptr);
|
||
if(vptr == ATFORK_ARENA_PTR) {
|
||
/* We are the only thread that may allocate at all. */
|
||
if(save_malloc_hook != malloc_check) {
|
||
return _int_malloc(&main_arena, sz);
|
||
} else {
|
||
if(top_check()<0)
|
||
return 0;
|
||
victim = _int_malloc(&main_arena, sz+1);
|
||
return mem2mem_check(victim, sz);
|
||
}
|
||
} else {
|
||
/* Suspend the thread until the `atfork' handlers have completed.
|
||
By that time, the hooks will have been reset as well, so that
|
||
mALLOc() can be used again. */
|
||
(void)mutex_lock(&list_lock);
|
||
(void)mutex_unlock(&list_lock);
|
||
return public_mALLOc(sz);
|
||
}
|
||
}
|
||
|
||
static void
|
||
free_atfork(Void_t* mem, const Void_t *caller)
|
||
{
|
||
Void_t *vptr = NULL;
|
||
mstate ar_ptr;
|
||
mchunkptr p; /* chunk corresponding to mem */
|
||
|
||
if (mem == 0) /* free(0) has no effect */
|
||
return;
|
||
|
||
p = mem2chunk(mem); /* do not bother to replicate free_check here */
|
||
|
||
#if HAVE_MMAP
|
||
if (chunk_is_mmapped(p)) /* release mmapped memory. */
|
||
{
|
||
munmap_chunk(p);
|
||
return;
|
||
}
|
||
#endif
|
||
|
||
ar_ptr = arena_for_chunk(p);
|
||
tsd_getspecific(arena_key, vptr);
|
||
if(vptr != ATFORK_ARENA_PTR)
|
||
(void)mutex_lock(&ar_ptr->mutex);
|
||
_int_free(ar_ptr, mem);
|
||
if(vptr != ATFORK_ARENA_PTR)
|
||
(void)mutex_unlock(&ar_ptr->mutex);
|
||
}
|
||
|
||
|
||
/* Counter for number of times the list is locked by the same thread. */
|
||
static unsigned int atfork_recursive_cntr;
|
||
|
||
/* The following two functions are registered via thread_atfork() to
|
||
make sure that the mutexes remain in a consistent state in the
|
||
fork()ed version of a thread. Also adapt the malloc and free hooks
|
||
temporarily, because the `atfork' handler mechanism may use
|
||
malloc/free internally (e.g. in LinuxThreads). */
|
||
|
||
static void
|
||
ptmalloc_lock_all (void)
|
||
{
|
||
mstate ar_ptr;
|
||
|
||
if(__malloc_initialized < 1)
|
||
return;
|
||
if (mutex_trylock(&list_lock))
|
||
{
|
||
Void_t *my_arena;
|
||
tsd_getspecific(arena_key, my_arena);
|
||
if (my_arena == ATFORK_ARENA_PTR)
|
||
/* This is the same thread which already locks the global list.
|
||
Just bump the counter. */
|
||
goto out;
|
||
|
||
/* This thread has to wait its turn. */
|
||
(void)mutex_lock(&list_lock);
|
||
}
|
||
for(ar_ptr = &main_arena;;) {
|
||
(void)mutex_lock(&ar_ptr->mutex);
|
||
ar_ptr = ar_ptr->next;
|
||
if(ar_ptr == &main_arena) break;
|
||
}
|
||
save_malloc_hook = __malloc_hook;
|
||
save_free_hook = __free_hook;
|
||
__malloc_hook = malloc_atfork;
|
||
__free_hook = free_atfork;
|
||
/* Only the current thread may perform malloc/free calls now. */
|
||
tsd_getspecific(arena_key, save_arena);
|
||
tsd_setspecific(arena_key, ATFORK_ARENA_PTR);
|
||
out:
|
||
++atfork_recursive_cntr;
|
||
}
|
||
|
||
static void
|
||
ptmalloc_unlock_all (void)
|
||
{
|
||
mstate ar_ptr;
|
||
|
||
if(__malloc_initialized < 1)
|
||
return;
|
||
if (--atfork_recursive_cntr != 0)
|
||
return;
|
||
tsd_setspecific(arena_key, save_arena);
|
||
__malloc_hook = save_malloc_hook;
|
||
__free_hook = save_free_hook;
|
||
for(ar_ptr = &main_arena;;) {
|
||
(void)mutex_unlock(&ar_ptr->mutex);
|
||
ar_ptr = ar_ptr->next;
|
||
if(ar_ptr == &main_arena) break;
|
||
}
|
||
(void)mutex_unlock(&list_lock);
|
||
}
|
||
|
||
#ifdef __linux__
|
||
|
||
/* In NPTL, unlocking a mutex in the child process after a
|
||
fork() is currently unsafe, whereas re-initializing it is safe and
|
||
does not leak resources. Therefore, a special atfork handler is
|
||
installed for the child. */
|
||
|
||
static void
|
||
ptmalloc_unlock_all2 (void)
|
||
{
|
||
mstate ar_ptr;
|
||
|
||
if(__malloc_initialized < 1)
|
||
return;
|
||
#if defined _LIBC || defined MALLOC_HOOKS
|
||
tsd_setspecific(arena_key, save_arena);
|
||
__malloc_hook = save_malloc_hook;
|
||
__free_hook = save_free_hook;
|
||
#endif
|
||
for(ar_ptr = &main_arena;;) {
|
||
mutex_init(&ar_ptr->mutex);
|
||
ar_ptr = ar_ptr->next;
|
||
if(ar_ptr == &main_arena) break;
|
||
}
|
||
mutex_init(&list_lock);
|
||
atfork_recursive_cntr = 0;
|
||
}
|
||
|
||
#else
|
||
|
||
#define ptmalloc_unlock_all2 ptmalloc_unlock_all
|
||
|
||
#endif
|
||
|
||
#endif /* !defined NO_THREADS */
|
||
|
||
/* Initialization routine. */
|
||
#ifdef _LIBC
|
||
#include <string.h>
|
||
extern char **_environ;
|
||
|
||
static char *
|
||
internal_function
|
||
next_env_entry (char ***position)
|
||
{
|
||
char **current = *position;
|
||
char *result = NULL;
|
||
|
||
while (*current != NULL)
|
||
{
|
||
if (__builtin_expect ((*current)[0] == 'M', 0)
|
||
&& (*current)[1] == 'A'
|
||
&& (*current)[2] == 'L'
|
||
&& (*current)[3] == 'L'
|
||
&& (*current)[4] == 'O'
|
||
&& (*current)[5] == 'C'
|
||
&& (*current)[6] == '_')
|
||
{
|
||
result = &(*current)[7];
|
||
|
||
/* Save current position for next visit. */
|
||
*position = ++current;
|
||
|
||
break;
|
||
}
|
||
|
||
++current;
|
||
}
|
||
|
||
return result;
|
||
}
|
||
#endif /* _LIBC */
|
||
|
||
/* Set up basic state so that _int_malloc et al can work. */
|
||
static void
|
||
ptmalloc_init_minimal (void)
|
||
{
|
||
#if DEFAULT_TOP_PAD != 0
|
||
mp_.top_pad = DEFAULT_TOP_PAD;
|
||
#endif
|
||
mp_.n_mmaps_max = DEFAULT_MMAP_MAX;
|
||
mp_.mmap_threshold = DEFAULT_MMAP_THRESHOLD;
|
||
mp_.trim_threshold = DEFAULT_TRIM_THRESHOLD;
|
||
mp_.pagesize = malloc_getpagesize;
|
||
}
|
||
|
||
|
||
#ifdef _LIBC
|
||
# ifdef SHARED
|
||
static void *
|
||
__failing_morecore (ptrdiff_t d)
|
||
{
|
||
return (void *) MORECORE_FAILURE;
|
||
}
|
||
|
||
extern struct dl_open_hook *_dl_open_hook;
|
||
libc_hidden_proto (_dl_open_hook);
|
||
# endif
|
||
|
||
# if defined SHARED && !USE___THREAD
|
||
/* This is called by __pthread_initialize_minimal when it needs to use
|
||
malloc to set up the TLS state. We cannot do the full work of
|
||
ptmalloc_init (below) until __pthread_initialize_minimal has finished,
|
||
so it has to switch to using the special startup-time hooks while doing
|
||
those allocations. */
|
||
void
|
||
__libc_malloc_pthread_startup (bool first_time)
|
||
{
|
||
if (first_time)
|
||
{
|
||
ptmalloc_init_minimal ();
|
||
save_malloc_hook = __malloc_hook;
|
||
save_memalign_hook = __memalign_hook;
|
||
save_free_hook = __free_hook;
|
||
__malloc_hook = malloc_starter;
|
||
__memalign_hook = memalign_starter;
|
||
__free_hook = free_starter;
|
||
}
|
||
else
|
||
{
|
||
__malloc_hook = save_malloc_hook;
|
||
__memalign_hook = save_memalign_hook;
|
||
__free_hook = save_free_hook;
|
||
}
|
||
}
|
||
# endif
|
||
#endif
|
||
|
||
static void
|
||
ptmalloc_init (void)
|
||
{
|
||
#if __STD_C
|
||
const char* s;
|
||
#else
|
||
char* s;
|
||
#endif
|
||
int secure = 0;
|
||
|
||
if(__malloc_initialized >= 0) return;
|
||
__malloc_initialized = 0;
|
||
|
||
#ifdef _LIBC
|
||
# if defined SHARED && !USE___THREAD
|
||
/* ptmalloc_init_minimal may already have been called via
|
||
__libc_malloc_pthread_startup, above. */
|
||
if (mp_.pagesize == 0)
|
||
# endif
|
||
#endif
|
||
ptmalloc_init_minimal();
|
||
|
||
#ifndef NO_THREADS
|
||
# if defined _LIBC
|
||
/* We know __pthread_initialize_minimal has already been called,
|
||
and that is enough. */
|
||
# define NO_STARTER
|
||
# endif
|
||
# ifndef NO_STARTER
|
||
/* With some threads implementations, creating thread-specific data
|
||
or initializing a mutex may call malloc() itself. Provide a
|
||
simple starter version (realloc() won't work). */
|
||
save_malloc_hook = __malloc_hook;
|
||
save_memalign_hook = __memalign_hook;
|
||
save_free_hook = __free_hook;
|
||
__malloc_hook = malloc_starter;
|
||
__memalign_hook = memalign_starter;
|
||
__free_hook = free_starter;
|
||
# ifdef _LIBC
|
||
/* Initialize the pthreads interface. */
|
||
if (__pthread_initialize != NULL)
|
||
__pthread_initialize();
|
||
# endif /* !defined _LIBC */
|
||
# endif /* !defined NO_STARTER */
|
||
#endif /* !defined NO_THREADS */
|
||
mutex_init(&main_arena.mutex);
|
||
main_arena.next = &main_arena;
|
||
|
||
#if defined _LIBC && defined SHARED
|
||
/* In case this libc copy is in a non-default namespace, never use brk.
|
||
Likewise if dlopened from statically linked program. */
|
||
Dl_info di;
|
||
struct link_map *l;
|
||
|
||
if (_dl_open_hook != NULL
|
||
|| (_dl_addr (ptmalloc_init, &di, &l, NULL) != 0
|
||
&& l->l_ns != LM_ID_BASE))
|
||
__morecore = __failing_morecore;
|
||
#endif
|
||
|
||
mutex_init(&list_lock);
|
||
tsd_key_create(&arena_key, NULL);
|
||
tsd_setspecific(arena_key, (Void_t *)&main_arena);
|
||
thread_atfork(ptmalloc_lock_all, ptmalloc_unlock_all, ptmalloc_unlock_all2);
|
||
#ifndef NO_THREADS
|
||
# ifndef NO_STARTER
|
||
__malloc_hook = save_malloc_hook;
|
||
__memalign_hook = save_memalign_hook;
|
||
__free_hook = save_free_hook;
|
||
# else
|
||
# undef NO_STARTER
|
||
# endif
|
||
#endif
|
||
#ifdef _LIBC
|
||
secure = __libc_enable_secure;
|
||
s = NULL;
|
||
if (__builtin_expect (_environ != NULL, 1))
|
||
{
|
||
char **runp = _environ;
|
||
char *envline;
|
||
|
||
while (__builtin_expect ((envline = next_env_entry (&runp)) != NULL,
|
||
0))
|
||
{
|
||
size_t len = strcspn (envline, "=");
|
||
|
||
if (envline[len] != '=')
|
||
/* This is a "MALLOC_" variable at the end of the string
|
||
without a '=' character. Ignore it since otherwise we
|
||
will access invalid memory below. */
|
||
continue;
|
||
|
||
switch (len)
|
||
{
|
||
case 6:
|
||
if (memcmp (envline, "CHECK_", 6) == 0)
|
||
s = &envline[7];
|
||
break;
|
||
case 8:
|
||
if (! secure)
|
||
{
|
||
if (memcmp (envline, "TOP_PAD_", 8) == 0)
|
||
mALLOPt(M_TOP_PAD, atoi(&envline[9]));
|
||
else if (memcmp (envline, "PERTURB_", 8) == 0)
|
||
mALLOPt(M_PERTURB, atoi(&envline[9]));
|
||
}
|
||
break;
|
||
case 9:
|
||
if (! secure && memcmp (envline, "MMAP_MAX_", 9) == 0)
|
||
mALLOPt(M_MMAP_MAX, atoi(&envline[10]));
|
||
break;
|
||
case 15:
|
||
if (! secure)
|
||
{
|
||
if (memcmp (envline, "TRIM_THRESHOLD_", 15) == 0)
|
||
mALLOPt(M_TRIM_THRESHOLD, atoi(&envline[16]));
|
||
else if (memcmp (envline, "MMAP_THRESHOLD_", 15) == 0)
|
||
mALLOPt(M_MMAP_THRESHOLD, atoi(&envline[16]));
|
||
}
|
||
break;
|
||
default:
|
||
break;
|
||
}
|
||
}
|
||
}
|
||
#else
|
||
if (! secure)
|
||
{
|
||
if((s = getenv("MALLOC_TRIM_THRESHOLD_")))
|
||
mALLOPt(M_TRIM_THRESHOLD, atoi(s));
|
||
if((s = getenv("MALLOC_TOP_PAD_")))
|
||
mALLOPt(M_TOP_PAD, atoi(s));
|
||
if((s = getenv("MALLOC_PERTURB_")))
|
||
mALLOPt(M_PERTURB, atoi(s));
|
||
if((s = getenv("MALLOC_MMAP_THRESHOLD_")))
|
||
mALLOPt(M_MMAP_THRESHOLD, atoi(s));
|
||
if((s = getenv("MALLOC_MMAP_MAX_")))
|
||
mALLOPt(M_MMAP_MAX, atoi(s));
|
||
}
|
||
s = getenv("MALLOC_CHECK_");
|
||
#endif
|
||
if(s && s[0]) {
|
||
mALLOPt(M_CHECK_ACTION, (int)(s[0] - '0'));
|
||
if (check_action != 0)
|
||
__malloc_check_init();
|
||
}
|
||
if(__malloc_initialize_hook != NULL)
|
||
(*__malloc_initialize_hook)();
|
||
__malloc_initialized = 1;
|
||
}
|
||
|
||
/* There are platforms (e.g. Hurd) with a link-time hook mechanism. */
|
||
#ifdef thread_atfork_static
|
||
thread_atfork_static(ptmalloc_lock_all, ptmalloc_unlock_all, \
|
||
ptmalloc_unlock_all2)
|
||
#endif
|
||
|
||
|
||
|
||
/* Managing heaps and arenas (for concurrent threads) */
|
||
|
||
#if USE_ARENAS
|
||
|
||
#if MALLOC_DEBUG > 1
|
||
|
||
/* Print the complete contents of a single heap to stderr. */
|
||
|
||
static void
|
||
#if __STD_C
|
||
dump_heap(heap_info *heap)
|
||
#else
|
||
dump_heap(heap) heap_info *heap;
|
||
#endif
|
||
{
|
||
char *ptr;
|
||
mchunkptr p;
|
||
|
||
fprintf(stderr, "Heap %p, size %10lx:\n", heap, (long)heap->size);
|
||
ptr = (heap->ar_ptr != (mstate)(heap+1)) ?
|
||
(char*)(heap + 1) : (char*)(heap + 1) + sizeof(struct malloc_state);
|
||
p = (mchunkptr)(((unsigned long)ptr + MALLOC_ALIGN_MASK) &
|
||
~MALLOC_ALIGN_MASK);
|
||
for(;;) {
|
||
fprintf(stderr, "chunk %p size %10lx", p, (long)p->size);
|
||
if(p == top(heap->ar_ptr)) {
|
||
fprintf(stderr, " (top)\n");
|
||
break;
|
||
} else if(p->size == (0|PREV_INUSE)) {
|
||
fprintf(stderr, " (fence)\n");
|
||
break;
|
||
}
|
||
fprintf(stderr, "\n");
|
||
p = next_chunk(p);
|
||
}
|
||
}
|
||
|
||
#endif /* MALLOC_DEBUG > 1 */
|
||
|
||
/* If consecutive mmap (0, HEAP_MAX_SIZE << 1, ...) calls return decreasing
|
||
addresses as opposed to increasing, new_heap would badly fragment the
|
||
address space. In that case remember the second HEAP_MAX_SIZE part
|
||
aligned to HEAP_MAX_SIZE from last mmap (0, HEAP_MAX_SIZE << 1, ...)
|
||
call (if it is already aligned) and try to reuse it next time. We need
|
||
no locking for it, as kernel ensures the atomicity for us - worst case
|
||
we'll call mmap (addr, HEAP_MAX_SIZE, ...) for some value of addr in
|
||
multiple threads, but only one will succeed. */
|
||
static char *aligned_heap_area;
|
||
|
||
/* Create a new heap. size is automatically rounded up to a multiple
|
||
of the page size. */
|
||
|
||
static heap_info *
|
||
internal_function
|
||
#if __STD_C
|
||
new_heap(size_t size, size_t top_pad)
|
||
#else
|
||
new_heap(size, top_pad) size_t size, top_pad;
|
||
#endif
|
||
{
|
||
size_t page_mask = malloc_getpagesize - 1;
|
||
char *p1, *p2;
|
||
unsigned long ul;
|
||
heap_info *h;
|
||
|
||
if(size+top_pad < HEAP_MIN_SIZE)
|
||
size = HEAP_MIN_SIZE;
|
||
else if(size+top_pad <= HEAP_MAX_SIZE)
|
||
size += top_pad;
|
||
else if(size > HEAP_MAX_SIZE)
|
||
return 0;
|
||
else
|
||
size = HEAP_MAX_SIZE;
|
||
size = (size + page_mask) & ~page_mask;
|
||
|
||
/* A memory region aligned to a multiple of HEAP_MAX_SIZE is needed.
|
||
No swap space needs to be reserved for the following large
|
||
mapping (on Linux, this is the case for all non-writable mappings
|
||
anyway). */
|
||
p2 = MAP_FAILED;
|
||
if(aligned_heap_area) {
|
||
p2 = (char *)MMAP(aligned_heap_area, HEAP_MAX_SIZE, PROT_NONE,
|
||
MAP_PRIVATE|MAP_NORESERVE);
|
||
aligned_heap_area = NULL;
|
||
if (p2 != MAP_FAILED && ((unsigned long)p2 & (HEAP_MAX_SIZE-1))) {
|
||
munmap(p2, HEAP_MAX_SIZE);
|
||
p2 = MAP_FAILED;
|
||
}
|
||
}
|
||
if(p2 == MAP_FAILED) {
|
||
p1 = (char *)MMAP(0, HEAP_MAX_SIZE<<1, PROT_NONE,
|
||
MAP_PRIVATE|MAP_NORESERVE);
|
||
if(p1 != MAP_FAILED) {
|
||
p2 = (char *)(((unsigned long)p1 + (HEAP_MAX_SIZE-1))
|
||
& ~(HEAP_MAX_SIZE-1));
|
||
ul = p2 - p1;
|
||
if (ul)
|
||
munmap(p1, ul);
|
||
else
|
||
aligned_heap_area = p2 + HEAP_MAX_SIZE;
|
||
munmap(p2 + HEAP_MAX_SIZE, HEAP_MAX_SIZE - ul);
|
||
} else {
|
||
/* Try to take the chance that an allocation of only HEAP_MAX_SIZE
|
||
is already aligned. */
|
||
p2 = (char *)MMAP(0, HEAP_MAX_SIZE, PROT_NONE, MAP_PRIVATE|MAP_NORESERVE);
|
||
if(p2 == MAP_FAILED)
|
||
return 0;
|
||
if((unsigned long)p2 & (HEAP_MAX_SIZE-1)) {
|
||
munmap(p2, HEAP_MAX_SIZE);
|
||
return 0;
|
||
}
|
||
}
|
||
}
|
||
if(mprotect(p2, size, PROT_READ|PROT_WRITE) != 0) {
|
||
munmap(p2, HEAP_MAX_SIZE);
|
||
return 0;
|
||
}
|
||
h = (heap_info *)p2;
|
||
h->size = size;
|
||
THREAD_STAT(stat_n_heaps++);
|
||
return h;
|
||
}
|
||
|
||
/* Grow or shrink a heap. size is automatically rounded up to a
|
||
multiple of the page size if it is positive. */
|
||
|
||
static int
|
||
#if __STD_C
|
||
grow_heap(heap_info *h, long diff)
|
||
#else
|
||
grow_heap(h, diff) heap_info *h; long diff;
|
||
#endif
|
||
{
|
||
size_t page_mask = malloc_getpagesize - 1;
|
||
long new_size;
|
||
|
||
if(diff >= 0) {
|
||
diff = (diff + page_mask) & ~page_mask;
|
||
new_size = (long)h->size + diff;
|
||
if((unsigned long) new_size > (unsigned long) HEAP_MAX_SIZE)
|
||
return -1;
|
||
if(mprotect((char *)h + h->size, diff, PROT_READ|PROT_WRITE) != 0)
|
||
return -2;
|
||
} else {
|
||
new_size = (long)h->size + diff;
|
||
if(new_size < (long)sizeof(*h))
|
||
return -1;
|
||
/* Try to re-map the extra heap space freshly to save memory, and
|
||
make it inaccessible. */
|
||
if((char *)MMAP((char *)h + new_size, -diff, PROT_NONE,
|
||
MAP_PRIVATE|MAP_FIXED) == (char *) MAP_FAILED)
|
||
return -2;
|
||
/*fprintf(stderr, "shrink %p %08lx\n", h, new_size);*/
|
||
}
|
||
h->size = new_size;
|
||
return 0;
|
||
}
|
||
|
||
/* Delete a heap. */
|
||
|
||
#define delete_heap(heap) \
|
||
do { \
|
||
if ((char *)(heap) + HEAP_MAX_SIZE == aligned_heap_area) \
|
||
aligned_heap_area = NULL; \
|
||
munmap((char*)(heap), HEAP_MAX_SIZE); \
|
||
} while (0)
|
||
|
||
static int
|
||
internal_function
|
||
#if __STD_C
|
||
heap_trim(heap_info *heap, size_t pad)
|
||
#else
|
||
heap_trim(heap, pad) heap_info *heap; size_t pad;
|
||
#endif
|
||
{
|
||
mstate ar_ptr = heap->ar_ptr;
|
||
unsigned long pagesz = mp_.pagesize;
|
||
mchunkptr top_chunk = top(ar_ptr), p, bck, fwd;
|
||
heap_info *prev_heap;
|
||
long new_size, top_size, extra;
|
||
|
||
/* Can this heap go away completely? */
|
||
while(top_chunk == chunk_at_offset(heap, sizeof(*heap))) {
|
||
prev_heap = heap->prev;
|
||
p = chunk_at_offset(prev_heap, prev_heap->size - (MINSIZE-2*SIZE_SZ));
|
||
assert(p->size == (0|PREV_INUSE)); /* must be fencepost */
|
||
p = prev_chunk(p);
|
||
new_size = chunksize(p) + (MINSIZE-2*SIZE_SZ);
|
||
assert(new_size>0 && new_size<(long)(2*MINSIZE));
|
||
if(!prev_inuse(p))
|
||
new_size += p->prev_size;
|
||
assert(new_size>0 && new_size<HEAP_MAX_SIZE);
|
||
if(new_size + (HEAP_MAX_SIZE - prev_heap->size) < pad + MINSIZE + pagesz)
|
||
break;
|
||
ar_ptr->system_mem -= heap->size;
|
||
arena_mem -= heap->size;
|
||
delete_heap(heap);
|
||
heap = prev_heap;
|
||
if(!prev_inuse(p)) { /* consolidate backward */
|
||
p = prev_chunk(p);
|
||
unlink(p, bck, fwd);
|
||
}
|
||
assert(((unsigned long)((char*)p + new_size) & (pagesz-1)) == 0);
|
||
assert( ((char*)p + new_size) == ((char*)heap + heap->size) );
|
||
top(ar_ptr) = top_chunk = p;
|
||
set_head(top_chunk, new_size | PREV_INUSE);
|
||
/*check_chunk(ar_ptr, top_chunk);*/
|
||
}
|
||
top_size = chunksize(top_chunk);
|
||
extra = ((top_size - pad - MINSIZE + (pagesz-1))/pagesz - 1) * pagesz;
|
||
if(extra < (long)pagesz)
|
||
return 0;
|
||
/* Try to shrink. */
|
||
if(grow_heap(heap, -extra) != 0)
|
||
return 0;
|
||
ar_ptr->system_mem -= extra;
|
||
arena_mem -= extra;
|
||
|
||
/* Success. Adjust top accordingly. */
|
||
set_head(top_chunk, (top_size - extra) | PREV_INUSE);
|
||
/*check_chunk(ar_ptr, top_chunk);*/
|
||
return 1;
|
||
}
|
||
|
||
/* Create a new arena with initial size "size". */
|
||
|
||
static mstate
|
||
_int_new_arena(size_t size)
|
||
{
|
||
mstate a;
|
||
heap_info *h;
|
||
char *ptr;
|
||
unsigned long misalign;
|
||
|
||
h = new_heap(size + (sizeof(*h) + sizeof(*a) + MALLOC_ALIGNMENT),
|
||
mp_.top_pad);
|
||
if(!h) {
|
||
/* Maybe size is too large to fit in a single heap. So, just try
|
||
to create a minimally-sized arena and let _int_malloc() attempt
|
||
to deal with the large request via mmap_chunk(). */
|
||
h = new_heap(sizeof(*h) + sizeof(*a) + MALLOC_ALIGNMENT, mp_.top_pad);
|
||
if(!h)
|
||
return 0;
|
||
}
|
||
a = h->ar_ptr = (mstate)(h+1);
|
||
malloc_init_state(a);
|
||
/*a->next = NULL;*/
|
||
a->system_mem = a->max_system_mem = h->size;
|
||
arena_mem += h->size;
|
||
#ifdef NO_THREADS
|
||
if((unsigned long)(mp_.mmapped_mem + arena_mem + main_arena.system_mem) >
|
||
mp_.max_total_mem)
|
||
mp_.max_total_mem = mp_.mmapped_mem + arena_mem + main_arena.system_mem;
|
||
#endif
|
||
|
||
/* Set up the top chunk, with proper alignment. */
|
||
ptr = (char *)(a + 1);
|
||
misalign = (unsigned long)chunk2mem(ptr) & MALLOC_ALIGN_MASK;
|
||
if (misalign > 0)
|
||
ptr += MALLOC_ALIGNMENT - misalign;
|
||
top(a) = (mchunkptr)ptr;
|
||
set_head(top(a), (((char*)h + h->size) - ptr) | PREV_INUSE);
|
||
|
||
return a;
|
||
}
|
||
|
||
static mstate
|
||
internal_function
|
||
#if __STD_C
|
||
arena_get2(mstate a_tsd, size_t size)
|
||
#else
|
||
arena_get2(a_tsd, size) mstate a_tsd; size_t size;
|
||
#endif
|
||
{
|
||
mstate a;
|
||
|
||
if(!a_tsd)
|
||
a = a_tsd = &main_arena;
|
||
else {
|
||
a = a_tsd->next;
|
||
if(!a) {
|
||
/* This can only happen while initializing the new arena. */
|
||
(void)mutex_lock(&main_arena.mutex);
|
||
THREAD_STAT(++(main_arena.stat_lock_wait));
|
||
return &main_arena;
|
||
}
|
||
}
|
||
|
||
/* Check the global, circularly linked list for available arenas. */
|
||
bool retried = false;
|
||
repeat:
|
||
do {
|
||
if(!mutex_trylock(&a->mutex)) {
|
||
if (retried)
|
||
(void)mutex_unlock(&list_lock);
|
||
THREAD_STAT(++(a->stat_lock_loop));
|
||
tsd_setspecific(arena_key, (Void_t *)a);
|
||
return a;
|
||
}
|
||
a = a->next;
|
||
} while(a != a_tsd);
|
||
|
||
/* If not even the list_lock can be obtained, try again. This can
|
||
happen during `atfork', or for example on systems where thread
|
||
creation makes it temporarily impossible to obtain _any_
|
||
locks. */
|
||
if(!retried && mutex_trylock(&list_lock)) {
|
||
/* We will block to not run in a busy loop. */
|
||
(void)mutex_lock(&list_lock);
|
||
|
||
/* Since we blocked there might be an arena available now. */
|
||
retried = true;
|
||
a = a_tsd;
|
||
goto repeat;
|
||
}
|
||
|
||
/* Nothing immediately available, so generate a new arena. */
|
||
a = _int_new_arena(size);
|
||
if(a)
|
||
{
|
||
tsd_setspecific(arena_key, (Void_t *)a);
|
||
mutex_init(&a->mutex);
|
||
mutex_lock(&a->mutex); /* remember result */
|
||
|
||
/* Add the new arena to the global list. */
|
||
a->next = main_arena.next;
|
||
atomic_write_barrier ();
|
||
main_arena.next = a;
|
||
|
||
THREAD_STAT(++(a->stat_lock_loop));
|
||
}
|
||
(void)mutex_unlock(&list_lock);
|
||
|
||
return a;
|
||
}
|
||
|
||
#endif /* USE_ARENAS */
|
||
|
||
/*
|
||
* Local variables:
|
||
* c-basic-offset: 2
|
||
* End:
|
||
*/
|