From 9710f75d4a4d57fa86f20e011c6dc6e66c590080 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sun, 3 Feb 2002 19:39:52 +0000 Subject: Update. 2002-02-03 Andreas Schwab * sysdeps/posix/readv.c: Use ssize_t for bytes_read. * sysdeps/posix/writev.c: Use ssize_t for bytes_written. Fix comment. 2002-02-03 Thorsten Kukuk * sysdeps/posix/writev.c: Check for ssize_t overflow, don't use alloca if the memory reqirements are too high. 2002-02-03 Ulrich Drepper * elf/dl-load.c (decompose_rpath): Avoid using strstr. * elf/dl-minimal.c (_strerror_r): Use _itoa instead of _itoa_word since the former is available anyway and speed isn't important here. * elf/dl-misc.c (_dl_debug_vdprintf): Likewise. * elf/dl-version.c (match_symbol): Likewise. (_dl_check_map_versions): Likewise. * elf/rtld.c (process_envvars): Likewise. (print_statistics): Likewise. * sysdeps/generic/dl-sysdep.c (_dl_show_auxv): Likewise. * elf/dl-minimal.c (_itoa): Always define it. Make it work for all bases. Add assert to catch uses of unimplemented features. (__strsep): Add assert to catch uses of unimplemented features. * elf/dl-object.c (_dl_new_object): Don't use rawmemchr. Use strchr and avoid inline optimization. * elf/rtld.c (process_envvars): Likewise. * elf/dl-open.c: Don't include . * elf/dl-profile.c (_dl_start_profile): Help compiler to avoid ffs. * elf/rtld.c (dl_main): Avoid strsep inline optimization. * stdio-common/_itoa.h: Minor simplifications of the code. * stdio-common/_itoa.c: Likewise. * elf/dl-reloc.c (_dl_relocate_object): Use _dl_debug_printf instead of _dl_printf for debugging info output. * sysdeps/mips/atomicity.h (exchange_and_add): Use branch likely. --- elf/rtld.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'elf/rtld.c') diff --git a/elf/rtld.c b/elf/rtld.c index 4dd288b072..b49d110267 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -697,7 +697,8 @@ of this helper program; chances are you did not intend to run this program.\n\ HP_TIMING_NOW (start); - while ((p = strsep (&list, " :")) != NULL) + /* Prevent optimizing strsep. Speed is not important here. */ + while ((p = (strsep) (&list, " :")) != NULL) if (p[0] != '\0' && (__builtin_expect (! __libc_enable_secure, 1) || strchr (p, '/') == NULL)) @@ -1063,8 +1064,8 @@ of this helper program; chances are you did not intend to run this program.\n\ { ElfW(Lib) *liblist, *liblistend; struct link_map **r_list, **r_listend, *l; - const char *strtab = (const void *) - D_PTR (GL(dl_loaded), l_info[DT_STRTAB]); + const char *strtab = (const void *) D_PTR (GL(dl_loaded), + l_info[DT_STRTAB]); assert (GL(dl_loaded)->l_info [VALIDX (DT_GNU_LIBLISTSZ)] != NULL); liblist = (ElfW(Lib) *) @@ -1550,7 +1551,8 @@ process_envvars (enum mode *modep) do { unsetenv (nextp); - nextp = (char *) rawmemchr (nextp, '\0') + 1; + /* We could use rawmemchr but this need not be fast. */ + nextp = (char *) (strchr) (nextp, '\0') + 1; } while (*nextp != '\0'); @@ -1572,7 +1574,7 @@ process_envvars (enum mode *modep) char *startp; buf[name_len + 11] = '\0'; - startp = _itoa_word (__getpid (), &buf[name_len + 11], 10, 0); + startp = _itoa (__getpid (), &buf[name_len + 11], 10, 0); *--startp = '.'; startp = memcpy (startp - name_len, debug_output, name_len); @@ -1607,8 +1609,8 @@ print_statistics (void) { char pbuf[30]; HP_TIMING_PRINT (buf, sizeof (buf), relocate_time); - cp = _itoa_word ((1000ULL * relocate_time) / rtld_total_time, - pbuf + sizeof (pbuf), 10, 0); + cp = _itoa ((1000ULL * relocate_time) / rtld_total_time, + pbuf + sizeof (pbuf), 10, 0); wp = pbuf; switch (pbuf + sizeof (pbuf) - cp) { @@ -1637,8 +1639,8 @@ print_statistics (void) { char pbuf[30]; HP_TIMING_PRINT (buf, sizeof (buf), load_time); - cp = _itoa_word ((1000ULL * load_time) / rtld_total_time, - pbuf + sizeof (pbuf), 10, 0); + cp = _itoa ((1000ULL * load_time) / rtld_total_time, + pbuf + sizeof (pbuf), 10, 0); wp = pbuf; switch (pbuf + sizeof (pbuf) - cp) { -- cgit v1.2.3