2024-01-01 18:12:26 +00:00
|
|
|
/* Copyright (c) 1998-2024 Free Software Foundation, Inc.
|
1998-10-18 15:16:22 +00:00
|
|
|
This file is part of the GNU C Library.
|
|
|
|
|
2005-12-07 05:49:17 +00:00
|
|
|
This program is free software; you can redistribute it and/or modify
|
2007-07-16 00:56:07 +00:00
|
|
|
it under the terms of the GNU General Public License as published
|
|
|
|
by the Free Software Foundation; version 2 of the License, or
|
|
|
|
(at your option) any later version.
|
1998-10-18 15:16:22 +00:00
|
|
|
|
2005-12-07 05:49:17 +00:00
|
|
|
This program is distributed in the hope that it will be useful,
|
1998-10-18 15:16:22 +00:00
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
2005-12-07 05:49:17 +00:00
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
GNU General Public License for more details.
|
1998-10-18 15:16:22 +00:00
|
|
|
|
2005-12-07 05:49:17 +00:00
|
|
|
You should have received a copy of the GNU General Public License
|
Prefer https to http for gnu.org and fsf.org URLs
Also, change sources.redhat.com to sourceware.org.
This patch was automatically generated by running the following shell
script, which uses GNU sed, and which avoids modifying files imported
from upstream:
sed -ri '
s,(http|ftp)(://(.*\.)?(gnu|fsf|sourceware)\.org($|[^.]|\.[^a-z])),https\2,g
s,(http|ftp)(://(.*\.)?)sources\.redhat\.com($|[^.]|\.[^a-z]),https\2sourceware.org\4,g
' \
$(find $(git ls-files) -prune -type f \
! -name '*.po' \
! -name 'ChangeLog*' \
! -path COPYING ! -path COPYING.LIB \
! -path manual/fdl-1.3.texi ! -path manual/lgpl-2.1.texi \
! -path manual/texinfo.tex ! -path scripts/config.guess \
! -path scripts/config.sub ! -path scripts/install-sh \
! -path scripts/mkinstalldirs ! -path scripts/move-if-change \
! -path INSTALL ! -path locale/programs/charmap-kw.h \
! -path po/libc.pot ! -path sysdeps/gnu/errlist.c \
! '(' -name configure \
-execdir test -f configure.ac -o -f configure.in ';' ')' \
! '(' -name preconfigure \
-execdir test -f preconfigure.ac ';' ')' \
-print)
and then by running 'make dist-prepare' to regenerate files built
from the altered files, and then executing the following to cleanup:
chmod a+x sysdeps/unix/sysv/linux/riscv/configure
# Omit irrelevant whitespace and comment-only changes,
# perhaps from a slightly-different Autoconf version.
git checkout -f \
sysdeps/csky/configure \
sysdeps/hppa/configure \
sysdeps/riscv/configure \
sysdeps/unix/sysv/linux/csky/configure
# Omit changes that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/powerpc/powerpc64/ppc-mcount.S: trailing lines
git checkout -f \
sysdeps/powerpc/powerpc64/ppc-mcount.S \
sysdeps/unix/sysv/linux/s390/s390-64/syscall.S
# Omit change that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S: last line does not end in newline
git checkout -f sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S
2019-09-07 05:40:42 +00:00
|
|
|
along with this program; if not, see <https://www.gnu.org/licenses/>. */
|
1998-10-18 15:16:22 +00:00
|
|
|
|
2004-08-26 18:35:05 +00:00
|
|
|
#include <assert.h>
|
2003-03-20 07:19:17 +00:00
|
|
|
#include <atomic.h>
|
1998-10-18 15:16:22 +00:00
|
|
|
#include <errno.h>
|
|
|
|
#include <error.h>
|
2005-08-16 22:47:26 +00:00
|
|
|
#include <inttypes.h>
|
1998-10-18 15:16:22 +00:00
|
|
|
#include <limits.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
1999-06-19 09:58:37 +00:00
|
|
|
#include <libintl.h>
|
1999-02-07 12:50:11 +00:00
|
|
|
#include <arpa/inet.h>
|
2004-08-26 18:35:05 +00:00
|
|
|
#include <sys/mman.h>
|
1998-10-18 15:16:22 +00:00
|
|
|
#include <sys/param.h>
|
|
|
|
#include <sys/stat.h>
|
|
|
|
#include <sys/uio.h>
|
2017-11-23 13:08:11 +00:00
|
|
|
#include <nss.h>
|
1998-10-18 15:16:22 +00:00
|
|
|
|
|
|
|
#include "nscd.h"
|
|
|
|
#include "dbg_log.h"
|
|
|
|
|
2004-08-26 18:35:05 +00:00
|
|
|
|
2007-11-25 21:08:01 +00:00
|
|
|
/* Wrapper functions with error checking for standard functions. */
|
|
|
|
extern void *xcalloc (size_t n, size_t s);
|
|
|
|
|
|
|
|
|
2004-08-26 18:35:05 +00:00
|
|
|
/* Number of times a value is reloaded without being used. UINT_MAX
|
|
|
|
means unlimited. */
|
|
|
|
unsigned int reload_count = DEFAULT_RELOAD_LIMIT;
|
|
|
|
|
|
|
|
|
2011-02-06 01:07:27 +00:00
|
|
|
static time_t (*const readdfcts[LASTREQ]) (struct database_dyn *,
|
|
|
|
struct hashentry *,
|
|
|
|
struct datahead *) =
|
2007-01-14 05:26:04 +00:00
|
|
|
{
|
|
|
|
[GETPWBYNAME] = readdpwbyname,
|
|
|
|
[GETPWBYUID] = readdpwbyuid,
|
|
|
|
[GETGRBYNAME] = readdgrbyname,
|
|
|
|
[GETGRBYGID] = readdgrbygid,
|
|
|
|
[GETHOSTBYNAME] = readdhstbyname,
|
|
|
|
[GETHOSTBYNAMEv6] = readdhstbynamev6,
|
|
|
|
[GETHOSTBYADDR] = readdhstbyaddr,
|
|
|
|
[GETHOSTBYADDRv6] = readdhstbyaddrv6,
|
|
|
|
[GETAI] = readdhstai,
|
|
|
|
[INITGROUPS] = readdinitgroups,
|
|
|
|
[GETSERVBYNAME] = readdservbyname,
|
2011-10-07 14:06:31 +00:00
|
|
|
[GETSERVBYPORT] = readdservbyport,
|
|
|
|
[GETNETGRENT] = readdgetnetgrent,
|
|
|
|
[INNETGR] = readdinnetgr
|
2007-01-14 05:26:04 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
1998-10-18 15:16:22 +00:00
|
|
|
/* Search the cache for a matching entry and return it when found. If
|
|
|
|
this fails search the negative cache and return (void *) -1 if this
|
|
|
|
search was successful. Otherwise return NULL.
|
|
|
|
|
|
|
|
This function must be called with the read-lock held. */
|
2004-08-26 18:35:05 +00:00
|
|
|
struct datahead *
|
2011-10-07 14:06:31 +00:00
|
|
|
cache_search (request_type type, const void *key, size_t len,
|
2004-08-26 18:35:05 +00:00
|
|
|
struct database_dyn *table, uid_t owner)
|
1998-10-18 15:16:22 +00:00
|
|
|
{
|
2017-11-23 13:08:11 +00:00
|
|
|
unsigned long int hash = __nss_hash (key, len) % table->head->module;
|
1998-10-18 15:16:22 +00:00
|
|
|
|
2004-08-26 18:35:05 +00:00
|
|
|
unsigned long int nsearched = 0;
|
|
|
|
struct datahead *result = NULL;
|
1998-10-18 15:16:22 +00:00
|
|
|
|
2004-08-26 18:35:05 +00:00
|
|
|
ref_t work = table->head->array[hash];
|
|
|
|
while (work != ENDREF)
|
1998-10-18 15:16:22 +00:00
|
|
|
{
|
2003-04-26 04:15:50 +00:00
|
|
|
++nsearched;
|
|
|
|
|
2004-08-26 18:35:05 +00:00
|
|
|
struct hashentry *here = (struct hashentry *) (table->data + work);
|
|
|
|
|
|
|
|
if (type == here->type && len == here->len
|
|
|
|
&& memcmp (key, table->data + here->key, len) == 0
|
|
|
|
&& here->owner == owner)
|
1998-10-18 15:16:22 +00:00
|
|
|
{
|
|
|
|
/* We found the entry. Increment the appropriate counter. */
|
2004-08-26 18:35:05 +00:00
|
|
|
struct datahead *dh
|
|
|
|
= (struct datahead *) (table->data + here->packet);
|
|
|
|
|
|
|
|
/* See whether we must ignore the entry. */
|
|
|
|
if (dh->usable)
|
|
|
|
{
|
|
|
|
/* We do not synchronize the memory here. The statistics
|
|
|
|
data is not crucial, we synchronize only once in a while
|
|
|
|
in the cleanup threads. */
|
|
|
|
if (dh->notfound)
|
|
|
|
++table->head->neghit;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
++table->head->poshit;
|
|
|
|
|
|
|
|
if (dh->nreloads != 0)
|
|
|
|
dh->nreloads = 0;
|
|
|
|
}
|
1998-10-18 15:16:22 +00:00
|
|
|
|
2004-08-26 18:35:05 +00:00
|
|
|
result = dh;
|
|
|
|
break;
|
|
|
|
}
|
1998-10-18 15:16:22 +00:00
|
|
|
}
|
|
|
|
|
2004-08-26 18:35:05 +00:00
|
|
|
work = here->next;
|
1998-10-18 15:16:22 +00:00
|
|
|
}
|
|
|
|
|
2004-08-26 18:35:05 +00:00
|
|
|
if (nsearched > table->head->maxnsearched)
|
|
|
|
table->head->maxnsearched = nsearched;
|
2003-04-26 04:15:50 +00:00
|
|
|
|
2004-08-26 18:35:05 +00:00
|
|
|
return result;
|
1998-10-18 15:16:22 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Add a new entry to the cache. The return value is zero if the function
|
|
|
|
call was successful.
|
|
|
|
|
|
|
|
This function must be called with the read-lock held.
|
|
|
|
|
|
|
|
We modify the table but we nevertheless only acquire a read-lock.
|
|
|
|
This is ok since we use operations which would be safe even without
|
|
|
|
locking, given that the `prune_cache' function never runs. Using
|
|
|
|
the readlock reduces the chance of conflicts. */
|
2004-08-26 18:35:05 +00:00
|
|
|
int
|
|
|
|
cache_add (int type, const void *key, size_t len, struct datahead *packet,
|
|
|
|
bool first, struct database_dyn *table,
|
2008-05-18 21:54:43 +00:00
|
|
|
uid_t owner, bool prune_wakeup)
|
1998-10-18 15:16:22 +00:00
|
|
|
{
|
2014-02-10 13:45:42 +00:00
|
|
|
if (__glibc_unlikely (debug_level >= 2))
|
2004-09-05 07:19:46 +00:00
|
|
|
{
|
|
|
|
const char *str;
|
|
|
|
char buf[INET6_ADDRSTRLEN + 1];
|
|
|
|
if (type == GETHOSTBYADDR || type == GETHOSTBYADDRv6)
|
|
|
|
str = inet_ntop (type == GETHOSTBYADDR ? AF_INET : AF_INET6,
|
|
|
|
key, buf, sizeof (buf));
|
|
|
|
else
|
|
|
|
str = key;
|
|
|
|
|
|
|
|
dbg_log (_("add new entry \"%s\" of type %s for %s to cache%s"),
|
|
|
|
str, serv2str[type], dbnames[table - dbs],
|
[BZ #2510, BZ #2830, BZ #3137, BZ #3313, BZ #3426, BZ #3465, BZ #3480, BZ #3483, BZ #3493, BZ #3514, BZ #3515, BZ #3664, BZ #3673, BZ #3674]
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.
2007-01-11 21:51:07 +00:00
|
|
|
first ? _(" (first)") : "");
|
2004-09-05 07:19:46 +00:00
|
|
|
}
|
2004-08-26 18:35:05 +00:00
|
|
|
|
2017-11-23 13:08:11 +00:00
|
|
|
unsigned long int hash = __nss_hash (key, len) % table->head->module;
|
1998-10-18 15:16:22 +00:00
|
|
|
struct hashentry *newp;
|
|
|
|
|
2009-02-13 20:36:37 +00:00
|
|
|
newp = mempool_alloc (table, sizeof (struct hashentry), 0);
|
2004-08-26 18:35:05 +00:00
|
|
|
/* If we cannot allocate memory, just do not do anything. */
|
1998-10-18 15:16:22 +00:00
|
|
|
if (newp == NULL)
|
2007-01-16 00:23:46 +00:00
|
|
|
{
|
2008-05-11 03:02:25 +00:00
|
|
|
/* If necessary mark the entry as unusable so that lookups will
|
|
|
|
not use it. */
|
|
|
|
if (first)
|
|
|
|
packet->usable = false;
|
|
|
|
|
2007-01-16 00:23:46 +00:00
|
|
|
return -1;
|
|
|
|
}
|
1998-10-18 15:16:22 +00:00
|
|
|
|
|
|
|
newp->type = type;
|
2004-08-26 18:35:05 +00:00
|
|
|
newp->first = first;
|
1998-10-18 15:16:22 +00:00
|
|
|
newp->len = len;
|
2004-08-26 18:35:05 +00:00
|
|
|
newp->key = (char *) key - table->data;
|
|
|
|
assert (newp->key + newp->len <= table->head->first_free);
|
1999-06-11 20:58:21 +00:00
|
|
|
newp->owner = owner;
|
2004-08-26 18:35:05 +00:00
|
|
|
newp->packet = (char *) packet - table->data;
|
2008-05-18 21:54:43 +00:00
|
|
|
assert ((newp->packet & BLOCK_ALIGN_M1) == 0);
|
1998-10-18 15:16:22 +00:00
|
|
|
|
|
|
|
/* Put the new entry in the first position. */
|
2016-06-14 13:12:00 +00:00
|
|
|
/* TODO Review concurrency. Use atomic_exchange_release. */
|
|
|
|
newp->next = atomic_load_relaxed (&table->head->array[hash]);
|
|
|
|
while (!atomic_compare_exchange_weak_release (&table->head->array[hash],
|
|
|
|
(ref_t *) &newp->next,
|
|
|
|
(ref_t) ((char *) newp
|
|
|
|
- table->data)));
|
1998-10-18 15:16:22 +00:00
|
|
|
|
|
|
|
/* Update the statistics. */
|
2004-08-26 18:35:05 +00:00
|
|
|
if (packet->notfound)
|
|
|
|
++table->head->negmiss;
|
|
|
|
else if (first)
|
|
|
|
++table->head->posmiss;
|
|
|
|
|
|
|
|
/* We depend on this value being correct and at least as high as the
|
|
|
|
real number of entries. */
|
2022-09-22 14:32:40 +00:00
|
|
|
atomic_fetch_add_relaxed (&table->head->nentries, 1);
|
2004-08-26 18:35:05 +00:00
|
|
|
|
|
|
|
/* It does not matter that we are not loading the just increment
|
|
|
|
value, this is just for statistics. */
|
|
|
|
unsigned long int nentries = table->head->nentries;
|
|
|
|
if (nentries > table->head->maxnentries)
|
|
|
|
table->head->maxnentries = nentries;
|
|
|
|
|
2005-08-08 20:58:35 +00:00
|
|
|
if (table->persistent)
|
|
|
|
// XXX async OK?
|
|
|
|
msync ((void *) table->head,
|
|
|
|
(char *) &table->head->array[hash] - (char *) table->head
|
|
|
|
+ sizeof (ref_t), MS_ASYNC);
|
|
|
|
|
2008-05-18 21:54:43 +00:00
|
|
|
/* We do not have to worry about the pruning thread if we are
|
|
|
|
re-adding the data since this is done by the pruning thread. We
|
|
|
|
also do not have to do anything in case this is not the first
|
|
|
|
time the data is entered since different data heads all have the
|
|
|
|
same timeout. */
|
|
|
|
if (first && prune_wakeup)
|
|
|
|
{
|
|
|
|
/* Perhaps the prune thread for the table is not running in a long
|
|
|
|
time. Wake it if necessary. */
|
|
|
|
pthread_mutex_lock (&table->prune_lock);
|
|
|
|
time_t next_wakeup = table->wakeup_time;
|
|
|
|
bool do_wakeup = false;
|
|
|
|
if (next_wakeup > packet->timeout + CACHE_PRUNE_INTERVAL)
|
|
|
|
{
|
|
|
|
table->wakeup_time = packet->timeout;
|
|
|
|
do_wakeup = true;
|
|
|
|
}
|
|
|
|
pthread_mutex_unlock (&table->prune_lock);
|
|
|
|
if (do_wakeup)
|
2007-11-06 00:45:40 +00:00
|
|
|
pthread_cond_signal (&table->prune_cond);
|
2008-05-18 21:54:43 +00:00
|
|
|
}
|
2007-11-06 00:45:40 +00:00
|
|
|
|
2004-08-26 18:35:05 +00:00
|
|
|
return 0;
|
1998-10-18 15:16:22 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Walk through the table and remove all entries which lifetime ended.
|
|
|
|
|
|
|
|
We have a problem here. To actually remove the entries we must get
|
|
|
|
the write-lock. But since we want to keep the time we have the
|
|
|
|
lock as short as possible we cannot simply acquire the lock when we
|
|
|
|
start looking for timedout entries.
|
|
|
|
|
|
|
|
Therefore we do it in two stages: first we look for entries which
|
|
|
|
must be invalidated and remember them. Then we get the lock and
|
|
|
|
actually remove them. This is complicated by the way we have to
|
|
|
|
free the data structures since some hash table entries share the same
|
1998-10-19 15:22:14 +00:00
|
|
|
data. */
|
2007-11-06 00:45:40 +00:00
|
|
|
time_t
|
2006-05-30 17:32:08 +00:00
|
|
|
prune_cache (struct database_dyn *table, time_t now, int fd)
|
1998-10-18 15:16:22 +00:00
|
|
|
{
|
2004-08-26 18:35:05 +00:00
|
|
|
size_t cnt = table->head->module;
|
1998-10-18 15:16:22 +00:00
|
|
|
|
1999-04-15 08:43:35 +00:00
|
|
|
/* If this table is not actually used don't do anything. */
|
|
|
|
if (cnt == 0)
|
2006-05-30 17:32:08 +00:00
|
|
|
{
|
|
|
|
if (fd != -1)
|
|
|
|
{
|
|
|
|
/* Reply to the INVALIDATE initiator. */
|
|
|
|
int32_t resp = 0;
|
|
|
|
writeall (fd, &resp, sizeof (resp));
|
|
|
|
}
|
2007-11-06 00:45:40 +00:00
|
|
|
|
|
|
|
/* No need to do this again anytime soon. */
|
|
|
|
return 24 * 60 * 60;
|
2006-05-30 17:32:08 +00:00
|
|
|
}
|
1999-04-15 08:43:35 +00:00
|
|
|
|
1998-10-18 15:16:22 +00:00
|
|
|
/* If we check for the modification of the underlying file we invalidate
|
|
|
|
the entries also in this case. */
|
2011-07-11 18:50:24 +00:00
|
|
|
if (table->check_file && now != LONG_MAX)
|
1998-10-18 15:16:22 +00:00
|
|
|
{
|
2011-07-11 18:50:24 +00:00
|
|
|
struct traced_file *runp = table->traced_files;
|
1998-10-18 15:16:22 +00:00
|
|
|
|
2011-07-11 18:50:24 +00:00
|
|
|
while (runp != NULL)
|
1998-10-18 15:16:22 +00:00
|
|
|
{
|
2011-07-11 18:50:24 +00:00
|
|
|
#ifdef HAVE_INOTIFY
|
2015-03-13 13:49:24 +00:00
|
|
|
if (runp->inotify_descr[TRACED_FILE] == -1)
|
2011-07-11 18:50:24 +00:00
|
|
|
#endif
|
1999-04-16 09:09:54 +00:00
|
|
|
{
|
2011-07-11 18:50:24 +00:00
|
|
|
struct stat64 st;
|
|
|
|
|
|
|
|
if (stat64 (runp->fname, &st) < 0)
|
|
|
|
{
|
2015-03-13 13:49:24 +00:00
|
|
|
/* Print a diagnostic that the traced file was missing.
|
|
|
|
We must not disable tracing since the file might return
|
|
|
|
shortly and we want to reload it at the next pruning.
|
|
|
|
Disabling tracing here would go against the configuration
|
|
|
|
as specified by the user via check-files. */
|
2011-07-11 18:50:24 +00:00
|
|
|
char buf[128];
|
2015-03-13 13:49:24 +00:00
|
|
|
dbg_log (_("checking for monitored file `%s': %s"),
|
2011-07-11 18:50:24 +00:00
|
|
|
runp->fname, strerror_r (errno, buf, sizeof (buf)));
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2015-03-13 13:49:24 +00:00
|
|
|
/* This must be `!=` to catch cases where users turn the
|
|
|
|
clocks back and we still want to detect any time difference
|
|
|
|
in mtime. */
|
|
|
|
if (st.st_mtime != runp->mtime)
|
2011-07-11 18:50:24 +00:00
|
|
|
{
|
2015-03-13 13:49:24 +00:00
|
|
|
dbg_log (_("monitored file `%s` changed (mtime)"),
|
|
|
|
runp->fname);
|
|
|
|
/* The file changed. Invalidate all entries. */
|
2011-07-11 18:50:24 +00:00
|
|
|
now = LONG_MAX;
|
2015-03-13 13:49:24 +00:00
|
|
|
runp->mtime = st.st_mtime;
|
|
|
|
#ifdef HAVE_INOTIFY
|
|
|
|
/* Attempt to install a watch on the file. */
|
|
|
|
install_watches (runp);
|
|
|
|
#endif
|
2011-07-11 18:50:24 +00:00
|
|
|
}
|
|
|
|
}
|
1999-04-16 09:09:54 +00:00
|
|
|
}
|
2011-07-11 18:50:24 +00:00
|
|
|
|
|
|
|
runp = runp->next;
|
1998-10-18 15:16:22 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* We run through the table and find values which are not valid anymore.
|
|
|
|
|
2003-04-26 04:15:50 +00:00
|
|
|
Note that for the initial step, finding the entries to be removed,
|
|
|
|
we don't need to get any lock. It is at all timed assured that the
|
|
|
|
linked lists are set up correctly and that no second thread prunes
|
|
|
|
the cache. */
|
2007-11-25 21:08:01 +00:00
|
|
|
bool *mark;
|
|
|
|
size_t memory_needed = cnt * sizeof (bool);
|
|
|
|
bool mark_use_alloca;
|
2014-02-10 13:45:42 +00:00
|
|
|
if (__glibc_likely (memory_needed <= MAX_STACK_USE))
|
2007-11-25 21:08:01 +00:00
|
|
|
{
|
|
|
|
mark = alloca (cnt * sizeof (bool));
|
|
|
|
memset (mark, '\0', memory_needed);
|
|
|
|
mark_use_alloca = true;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
mark = xcalloc (1, memory_needed);
|
|
|
|
mark_use_alloca = false;
|
|
|
|
}
|
2004-08-26 18:35:05 +00:00
|
|
|
size_t first = cnt + 1;
|
|
|
|
size_t last = 0;
|
|
|
|
char *const data = table->data;
|
|
|
|
bool any = false;
|
|
|
|
|
2014-02-10 13:45:42 +00:00
|
|
|
if (__glibc_unlikely (debug_level > 2))
|
2005-08-16 22:47:26 +00:00
|
|
|
dbg_log (_("pruning %s cache; time %ld"),
|
|
|
|
dbnames[table - dbs], (long int) now);
|
|
|
|
|
2007-11-14 15:26:10 +00:00
|
|
|
#define NO_TIMEOUT LONG_MAX
|
|
|
|
time_t next_timeout = NO_TIMEOUT;
|
1998-10-18 15:16:22 +00:00
|
|
|
do
|
|
|
|
{
|
2004-08-26 18:35:05 +00:00
|
|
|
ref_t run = table->head->array[--cnt];
|
1998-10-18 15:16:22 +00:00
|
|
|
|
2004-08-26 18:35:05 +00:00
|
|
|
while (run != ENDREF)
|
1998-10-18 15:16:22 +00:00
|
|
|
{
|
2004-08-26 18:35:05 +00:00
|
|
|
struct hashentry *runp = (struct hashentry *) (data + run);
|
|
|
|
struct datahead *dh = (struct datahead *) (data + runp->packet);
|
|
|
|
|
2005-08-16 22:47:26 +00:00
|
|
|
/* Some debug support. */
|
2014-02-10 13:45:42 +00:00
|
|
|
if (__glibc_unlikely (debug_level > 2))
|
2005-08-16 22:47:26 +00:00
|
|
|
{
|
|
|
|
char buf[INET6_ADDRSTRLEN];
|
|
|
|
const char *str;
|
|
|
|
|
|
|
|
if (runp->type == GETHOSTBYADDR || runp->type == GETHOSTBYADDRv6)
|
|
|
|
{
|
|
|
|
inet_ntop (runp->type == GETHOSTBYADDR ? AF_INET : AF_INET6,
|
|
|
|
data + runp->key, buf, sizeof (buf));
|
|
|
|
str = buf;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
str = data + runp->key;
|
|
|
|
|
|
|
|
dbg_log (_("considering %s entry \"%s\", timeout %" PRIu64),
|
|
|
|
serv2str[runp->type], str, dh->timeout);
|
|
|
|
}
|
|
|
|
|
2023-08-29 06:28:31 +00:00
|
|
|
/* Check whether the entry timed out. Timed out entries
|
|
|
|
will be revalidated. For unusable records, it is still
|
|
|
|
necessary to record that the bucket needs to be scanned
|
|
|
|
again below. */
|
|
|
|
if (dh->timeout < now || !dh->usable)
|
1998-10-18 15:16:22 +00:00
|
|
|
{
|
2004-08-26 18:35:05 +00:00
|
|
|
/* This hash bucket could contain entries which need to
|
|
|
|
be looked at. */
|
|
|
|
mark[cnt] = true;
|
|
|
|
|
1998-10-18 15:16:22 +00:00
|
|
|
first = MIN (first, cnt);
|
|
|
|
last = MAX (last, cnt);
|
2004-08-26 18:35:05 +00:00
|
|
|
|
|
|
|
/* We only have to look at the data of the first entries
|
|
|
|
since the count information is kept in the data part
|
|
|
|
which is shared. */
|
2023-08-29 06:28:31 +00:00
|
|
|
if (runp->first && dh->usable)
|
2004-08-26 18:35:05 +00:00
|
|
|
{
|
|
|
|
|
|
|
|
/* At this point there are two choices: we reload the
|
|
|
|
value or we discard it. Do not change NRELOADS if
|
|
|
|
we never not reload the record. */
|
|
|
|
if ((reload_count != UINT_MAX
|
|
|
|
&& __builtin_expect (dh->nreloads >= reload_count, 0))
|
|
|
|
/* We always remove negative entries. */
|
|
|
|
|| dh->notfound
|
|
|
|
/* Discard everything if the user explicitly
|
|
|
|
requests it. */
|
|
|
|
|| now == LONG_MAX)
|
|
|
|
{
|
|
|
|
/* Remove the value. */
|
|
|
|
dh->usable = false;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* Reload the value. We do this only for the
|
|
|
|
initially used key, not the additionally
|
|
|
|
added derived value. */
|
2007-01-14 05:26:04 +00:00
|
|
|
assert (runp->type < LASTREQ
|
|
|
|
&& readdfcts[runp->type] != NULL);
|
|
|
|
|
2011-02-06 01:07:27 +00:00
|
|
|
time_t timeout = readdfcts[runp->type] (table, runp, dh);
|
|
|
|
next_timeout = MIN (next_timeout, timeout);
|
2004-08-26 18:35:05 +00:00
|
|
|
}
|
|
|
|
}
|
2023-08-29 06:28:31 +00:00
|
|
|
|
|
|
|
/* If the entry has been replaced, we might need cleanup. */
|
|
|
|
any |= !dh->usable;
|
1998-10-18 15:16:22 +00:00
|
|
|
}
|
2004-08-26 18:35:05 +00:00
|
|
|
else
|
2023-08-29 06:28:31 +00:00
|
|
|
/* Entry has not timed out and is usable. */
|
|
|
|
next_timeout = MIN (next_timeout, dh->timeout);
|
2004-08-26 18:35:05 +00:00
|
|
|
|
|
|
|
run = runp->next;
|
1998-10-18 15:16:22 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
while (cnt > 0);
|
|
|
|
|
2014-02-10 13:45:42 +00:00
|
|
|
if (__glibc_unlikely (fd != -1))
|
2006-05-30 17:32:08 +00:00
|
|
|
{
|
|
|
|
/* Reply to the INVALIDATE initiator that the cache has been
|
|
|
|
invalidated. */
|
|
|
|
int32_t resp = 0;
|
|
|
|
writeall (fd, &resp, sizeof (resp));
|
|
|
|
}
|
|
|
|
|
2004-08-26 18:35:05 +00:00
|
|
|
if (first <= last)
|
1998-10-18 15:16:22 +00:00
|
|
|
{
|
|
|
|
struct hashentry *head = NULL;
|
|
|
|
|
|
|
|
/* Now we have to get the write lock since we are about to modify
|
|
|
|
the table. */
|
2014-02-10 13:45:42 +00:00
|
|
|
if (__glibc_unlikely (pthread_rwlock_trywrlock (&table->lock) != 0))
|
2003-04-26 04:15:50 +00:00
|
|
|
{
|
2004-08-26 18:35:05 +00:00
|
|
|
++table->head->wrlockdelayed;
|
2003-04-26 04:15:50 +00:00
|
|
|
pthread_rwlock_wrlock (&table->lock);
|
|
|
|
}
|
1998-10-18 15:16:22 +00:00
|
|
|
|
2020-06-17 14:05:13 +00:00
|
|
|
/* Now we start modifying the data. Make sure all readers of the
|
|
|
|
data are aware of this and temporarily don't use the data. */
|
|
|
|
atomic_fetch_add_relaxed (&table->head->gc_cycle, 1);
|
|
|
|
assert ((table->head->gc_cycle & 1) == 1);
|
|
|
|
|
1998-10-18 15:16:22 +00:00
|
|
|
while (first <= last)
|
|
|
|
{
|
2004-08-26 18:35:05 +00:00
|
|
|
if (mark[first])
|
1998-10-18 15:16:22 +00:00
|
|
|
{
|
2004-08-26 18:35:05 +00:00
|
|
|
ref_t *old = &table->head->array[first];
|
|
|
|
ref_t run = table->head->array[first];
|
1998-10-18 15:16:22 +00:00
|
|
|
|
2008-05-18 21:54:43 +00:00
|
|
|
assert (run != ENDREF);
|
|
|
|
do
|
1998-10-18 15:16:22 +00:00
|
|
|
{
|
2004-08-26 18:35:05 +00:00
|
|
|
struct hashentry *runp = (struct hashentry *) (data + run);
|
|
|
|
struct datahead *dh
|
|
|
|
= (struct datahead *) (data + runp->packet);
|
1998-10-18 15:16:22 +00:00
|
|
|
|
2004-08-26 18:35:05 +00:00
|
|
|
if (! dh->usable)
|
1998-10-18 15:16:22 +00:00
|
|
|
{
|
2004-08-26 18:35:05 +00:00
|
|
|
/* We need the list only for debugging but it is
|
|
|
|
more costly to avoid creating the list than
|
|
|
|
doing it. */
|
|
|
|
runp->dellist = head;
|
|
|
|
head = runp;
|
|
|
|
|
|
|
|
/* No need for an atomic operation, we have the
|
|
|
|
write lock. */
|
|
|
|
--table->head->nentries;
|
|
|
|
|
|
|
|
run = *old = runp->next;
|
1998-10-18 15:16:22 +00:00
|
|
|
}
|
|
|
|
else
|
2004-08-26 18:35:05 +00:00
|
|
|
{
|
|
|
|
old = &runp->next;
|
|
|
|
run = runp->next;
|
|
|
|
}
|
1998-10-18 15:16:22 +00:00
|
|
|
}
|
2008-05-18 21:54:43 +00:00
|
|
|
while (run != ENDREF);
|
1998-10-18 15:16:22 +00:00
|
|
|
}
|
2004-08-26 18:35:05 +00:00
|
|
|
|
1998-10-18 15:16:22 +00:00
|
|
|
++first;
|
|
|
|
}
|
|
|
|
|
2020-06-17 14:05:13 +00:00
|
|
|
/* Now we are done modifying the data. */
|
|
|
|
atomic_fetch_add_relaxed (&table->head->gc_cycle, 1);
|
|
|
|
assert ((table->head->gc_cycle & 1) == 0);
|
|
|
|
|
1998-10-18 15:16:22 +00:00
|
|
|
/* It's all done. */
|
|
|
|
pthread_rwlock_unlock (&table->lock);
|
|
|
|
|
2004-08-26 18:35:05 +00:00
|
|
|
/* Make sure the data is saved to disk. */
|
|
|
|
if (table->persistent)
|
|
|
|
msync (table->head,
|
2005-08-16 22:47:26 +00:00
|
|
|
data + table->head->first_free - (char *) table->head,
|
2004-08-26 18:35:05 +00:00
|
|
|
MS_ASYNC);
|
|
|
|
|
2003-04-26 04:15:50 +00:00
|
|
|
/* One extra pass if we do debugging. */
|
2014-02-10 13:45:42 +00:00
|
|
|
if (__glibc_unlikely (debug_level > 0))
|
1998-10-18 15:16:22 +00:00
|
|
|
{
|
2003-04-26 04:15:50 +00:00
|
|
|
struct hashentry *runp = head;
|
1998-10-18 15:16:22 +00:00
|
|
|
|
2003-04-26 04:15:50 +00:00
|
|
|
while (runp != NULL)
|
1999-02-07 00:06:12 +00:00
|
|
|
{
|
|
|
|
char buf[INET6_ADDRSTRLEN];
|
|
|
|
const char *str;
|
|
|
|
|
2003-04-26 04:15:50 +00:00
|
|
|
if (runp->type == GETHOSTBYADDR || runp->type == GETHOSTBYADDRv6)
|
1999-02-07 00:06:12 +00:00
|
|
|
{
|
2003-04-26 04:15:50 +00:00
|
|
|
inet_ntop (runp->type == GETHOSTBYADDR ? AF_INET : AF_INET6,
|
2005-08-16 22:47:26 +00:00
|
|
|
data + runp->key, buf, sizeof (buf));
|
1999-02-07 00:06:12 +00:00
|
|
|
str = buf;
|
|
|
|
}
|
|
|
|
else
|
2005-08-16 22:47:26 +00:00
|
|
|
str = data + runp->key;
|
1999-02-07 00:06:12 +00:00
|
|
|
|
2003-04-26 04:15:50 +00:00
|
|
|
dbg_log ("remove %s entry \"%s\"", serv2str[runp->type], str);
|
|
|
|
|
2004-07-22 01:47:28 +00:00
|
|
|
runp = runp->dellist;
|
1999-02-07 00:06:12 +00:00
|
|
|
}
|
2003-04-26 04:15:50 +00:00
|
|
|
}
|
1998-10-18 15:16:22 +00:00
|
|
|
}
|
2004-08-26 18:35:05 +00:00
|
|
|
|
2014-02-10 13:45:42 +00:00
|
|
|
if (__glibc_unlikely (! mark_use_alloca))
|
2007-11-25 21:08:01 +00:00
|
|
|
free (mark);
|
|
|
|
|
2004-08-26 18:35:05 +00:00
|
|
|
/* Run garbage collection if any entry has been removed or replaced. */
|
|
|
|
if (any)
|
|
|
|
gc (table);
|
2006-05-29 07:00:16 +00:00
|
|
|
|
2007-11-14 15:26:10 +00:00
|
|
|
/* If there is no entry in the database and we therefore have no new
|
|
|
|
timeout value, tell the caller to wake up in 24 hours. */
|
|
|
|
return next_timeout == NO_TIMEOUT ? 24 * 60 * 60 : next_timeout - now;
|
1998-10-18 15:16:22 +00:00
|
|
|
}
|