2019-01-01 00:11:28 +00:00
|
|
|
/* Copyright (C) 1998-2019 Free Software Foundation, Inc.
|
2004-09-08 15:46:42 +00:00
|
|
|
This file is part of the GNU C Library.
|
|
|
|
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
|
|
|
|
|
|
|
|
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
|
2012-02-09 23:18:22 +00:00
|
|
|
License along with the GNU C Library; if not, see
|
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
|
|
|
<https://www.gnu.org/licenses/>. */
|
2004-09-08 15:46:42 +00:00
|
|
|
|
|
|
|
#include <assert.h>
|
|
|
|
#include <errno.h>
|
|
|
|
#include <fcntl.h>
|
|
|
|
#include <stdbool.h>
|
2009-05-16 04:17:08 +00:00
|
|
|
#include <stddef.h>
|
2014-10-22 20:17:20 +00:00
|
|
|
#include <stdlib.h>
|
2007-01-31 09:14:21 +00:00
|
|
|
#include <string.h>
|
2006-03-01 05:39:10 +00:00
|
|
|
#include <time.h>
|
2004-09-08 15:46:42 +00:00
|
|
|
#include <unistd.h>
|
2013-05-01 15:46:34 +00:00
|
|
|
#include <stdint.h>
|
2004-09-08 15:46:42 +00:00
|
|
|
#include <sys/mman.h>
|
2017-10-10 12:09:02 +00:00
|
|
|
#include <sys/param.h>
|
2004-09-08 15:46:42 +00:00
|
|
|
#include <sys/poll.h>
|
|
|
|
#include <sys/socket.h>
|
|
|
|
#include <sys/stat.h>
|
2005-07-13 22:47:24 +00:00
|
|
|
#include <sys/time.h>
|
2004-09-08 15:46:42 +00:00
|
|
|
#include <sys/uio.h>
|
|
|
|
#include <sys/un.h>
|
|
|
|
#include <not-cancel.h>
|
2008-07-25 18:31:07 +00:00
|
|
|
#include <kernel-features.h>
|
2017-11-23 13:08:11 +00:00
|
|
|
#include <nss.h>
|
2004-09-08 15:46:42 +00:00
|
|
|
|
|
|
|
#include "nscd-client.h"
|
|
|
|
|
2007-10-13 18:02:24 +00:00
|
|
|
/* Extra time we wait if the socket is still receiving data. This
|
2007-10-13 23:04:40 +00:00
|
|
|
value is in milliseconds. Note that the other side is nscd on the
|
2007-10-13 18:02:24 +00:00
|
|
|
local machine and it is already transmitting data. So the wait
|
|
|
|
time need not be long. */
|
|
|
|
#define EXTRA_RECEIVE_TIME 200
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
wait_on_socket (int sock, long int usectmo)
|
|
|
|
{
|
|
|
|
struct pollfd fds[1];
|
|
|
|
fds[0].fd = sock;
|
|
|
|
fds[0].events = POLLIN | POLLERR | POLLHUP;
|
|
|
|
int n = __poll (fds, 1, usectmo);
|
|
|
|
if (n == -1 && __builtin_expect (errno == EINTR, 0))
|
|
|
|
{
|
|
|
|
/* Handle the case where the poll() call is interrupted by a
|
|
|
|
signal. We cannot just use TEMP_FAILURE_RETRY since it might
|
|
|
|
lead to infinite loops. */
|
Change most internal uses of __gettimeofday to __clock_gettime.
Since gettimeofday will shortly be implemented in terms of
clock_gettime on all platforms, internal code should use clock_gettime
directly; in addition to removing a layer of indirection, this will
allow us to remove the PLT-bypass gunk for gettimeofday. (We can't
quite do that yet, but it'll be coming later in this patch series.)
In many cases, the changed code does fewer conversions.
The changed code always assumes __clock_gettime (CLOCK_REALTIME)
cannot fail. Most of the call sites were assuming gettimeofday could
not fail, but a few places were checking for errors. POSIX says
clock_gettime can only fail if the clock constant is invalid or
unsupported, and CLOCK_REALTIME is the one and only clock constant
that's required to be supported. For consistency I grepped the entire
source tree for any other places that checked for errors from
__clock_gettime (CLOCK_REALTIME), found one, and changed it too.
(For the record, POSIX also says gettimeofday can never fail.)
(It would be nice if we could declare that GNU systems will always
support CLOCK_MONOTONIC as well as CLOCK_REALTIME; there are several
places where we are using CLOCK_REALTIME where _MONOTONIC would be
more appropriate, and/or trying to use _MONOTONIC and then falling
back to _REALTIME. But the Hurd doesn't support CLOCK_MONOTONIC yet,
and it looks like adding it would involve substantial changes to
gnumach's internals and API. Oh well.)
A few Hurd-specific files were changed to use __host_get_time instead
of __clock_gettime, as this seemed tidier. We also assume this cannot
fail. Skimming the code in gnumach leads me to believe the only way
it could fail is if __mach_host_self also failed, and our
Hurd-specific code consistently assumes that can't happen, so I'm
going with that.
With the exception of support/support_test_main.c, test cases are not
modified, mainly because I didn't want to have to figure out which
test cases were testing gettimeofday specifically.
The definition of GETTIME in sysdeps/generic/memusage.h had a typo and
was not reading tv_sec at all. I fixed this. It appears nobody has been
generating malloc traces on a machine that doesn't have a superseding
definition.
There are a whole bunch of places where the code could be simplified
by factoring out timespec subtraction and/or comparison logic, but I
want to keep this patch as mechanical as possible.
Checked on x86_64-linux-gnu, i686-linux-gnu, powerpc64le-linux-gnu,
powerpc64-linux-gnu, powerpc-linux-gnu, and aarch64-linux-gnu.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Reviewed-by: Lukasz Majewski <lukma@denx.de>
2019-08-17 00:38:22 +00:00
|
|
|
struct timespec now;
|
|
|
|
__clock_gettime (CLOCK_REALTIME, &now);
|
|
|
|
long int end = (now.tv_sec * 1000 + usectmo
|
|
|
|
+ (now.tv_nsec + 500000) / 1000000);
|
2007-10-13 18:02:24 +00:00
|
|
|
long int timeout = usectmo;
|
|
|
|
while (1)
|
|
|
|
{
|
|
|
|
n = __poll (fds, 1, timeout);
|
|
|
|
if (n != -1 || errno != EINTR)
|
|
|
|
break;
|
|
|
|
|
|
|
|
/* Recompute the timeout time. */
|
Change most internal uses of __gettimeofday to __clock_gettime.
Since gettimeofday will shortly be implemented in terms of
clock_gettime on all platforms, internal code should use clock_gettime
directly; in addition to removing a layer of indirection, this will
allow us to remove the PLT-bypass gunk for gettimeofday. (We can't
quite do that yet, but it'll be coming later in this patch series.)
In many cases, the changed code does fewer conversions.
The changed code always assumes __clock_gettime (CLOCK_REALTIME)
cannot fail. Most of the call sites were assuming gettimeofday could
not fail, but a few places were checking for errors. POSIX says
clock_gettime can only fail if the clock constant is invalid or
unsupported, and CLOCK_REALTIME is the one and only clock constant
that's required to be supported. For consistency I grepped the entire
source tree for any other places that checked for errors from
__clock_gettime (CLOCK_REALTIME), found one, and changed it too.
(For the record, POSIX also says gettimeofday can never fail.)
(It would be nice if we could declare that GNU systems will always
support CLOCK_MONOTONIC as well as CLOCK_REALTIME; there are several
places where we are using CLOCK_REALTIME where _MONOTONIC would be
more appropriate, and/or trying to use _MONOTONIC and then falling
back to _REALTIME. But the Hurd doesn't support CLOCK_MONOTONIC yet,
and it looks like adding it would involve substantial changes to
gnumach's internals and API. Oh well.)
A few Hurd-specific files were changed to use __host_get_time instead
of __clock_gettime, as this seemed tidier. We also assume this cannot
fail. Skimming the code in gnumach leads me to believe the only way
it could fail is if __mach_host_self also failed, and our
Hurd-specific code consistently assumes that can't happen, so I'm
going with that.
With the exception of support/support_test_main.c, test cases are not
modified, mainly because I didn't want to have to figure out which
test cases were testing gettimeofday specifically.
The definition of GETTIME in sysdeps/generic/memusage.h had a typo and
was not reading tv_sec at all. I fixed this. It appears nobody has been
generating malloc traces on a machine that doesn't have a superseding
definition.
There are a whole bunch of places where the code could be simplified
by factoring out timespec subtraction and/or comparison logic, but I
want to keep this patch as mechanical as possible.
Checked on x86_64-linux-gnu, i686-linux-gnu, powerpc64le-linux-gnu,
powerpc64-linux-gnu, powerpc-linux-gnu, and aarch64-linux-gnu.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Reviewed-by: Lukasz Majewski <lukma@denx.de>
2019-08-17 00:38:22 +00:00
|
|
|
__clock_gettime (CLOCK_REALTIME, &now);
|
|
|
|
timeout = end - ((now.tv_sec * 1000
|
|
|
|
+ (now.tv_nsec + 500000) / 1000000));
|
2007-10-13 18:02:24 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return n;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-02-22 22:58:32 +00:00
|
|
|
ssize_t
|
|
|
|
__readall (int fd, void *buf, size_t len)
|
|
|
|
{
|
|
|
|
size_t n = len;
|
|
|
|
ssize_t ret;
|
|
|
|
do
|
|
|
|
{
|
2007-10-13 18:02:24 +00:00
|
|
|
again:
|
2005-02-22 22:58:32 +00:00
|
|
|
ret = TEMP_FAILURE_RETRY (__read (fd, buf, n));
|
|
|
|
if (ret <= 0)
|
2007-10-13 18:02:24 +00:00
|
|
|
{
|
|
|
|
if (__builtin_expect (ret < 0 && errno == EAGAIN, 0)
|
|
|
|
/* The socket is still receiving data. Wait a bit more. */
|
|
|
|
&& wait_on_socket (fd, EXTRA_RECEIVE_TIME) > 0)
|
|
|
|
goto again;
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
2005-02-22 22:58:32 +00:00
|
|
|
buf = (char *) buf + ret;
|
|
|
|
n -= ret;
|
|
|
|
}
|
|
|
|
while (n > 0);
|
|
|
|
return ret < 0 ? ret : len - n;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
ssize_t
|
|
|
|
__readvall (int fd, const struct iovec *iov, int iovcnt)
|
|
|
|
{
|
|
|
|
ssize_t ret = TEMP_FAILURE_RETRY (__readv (fd, iov, iovcnt));
|
|
|
|
if (ret <= 0)
|
2007-10-13 18:02:24 +00:00
|
|
|
{
|
2014-02-10 13:45:42 +00:00
|
|
|
if (__glibc_likely (ret == 0 || errno != EAGAIN))
|
2007-10-13 18:02:24 +00:00
|
|
|
/* A genuine error or no data to read. */
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
/* The data has not all yet been received. Do as if we have not
|
|
|
|
read anything yet. */
|
|
|
|
ret = 0;
|
|
|
|
}
|
2005-02-22 22:58:32 +00:00
|
|
|
|
|
|
|
size_t total = 0;
|
|
|
|
for (int i = 0; i < iovcnt; ++i)
|
|
|
|
total += iov[i].iov_len;
|
|
|
|
|
|
|
|
if (ret < total)
|
|
|
|
{
|
|
|
|
struct iovec iov_buf[iovcnt];
|
|
|
|
ssize_t r = ret;
|
|
|
|
|
|
|
|
struct iovec *iovp = memcpy (iov_buf, iov, iovcnt * sizeof (*iov));
|
|
|
|
do
|
|
|
|
{
|
|
|
|
while (iovp->iov_len <= r)
|
|
|
|
{
|
|
|
|
r -= iovp->iov_len;
|
|
|
|
--iovcnt;
|
|
|
|
++iovp;
|
|
|
|
}
|
|
|
|
iovp->iov_base = (char *) iovp->iov_base + r;
|
|
|
|
iovp->iov_len -= r;
|
2007-10-13 18:02:24 +00:00
|
|
|
again:
|
2005-02-22 22:58:32 +00:00
|
|
|
r = TEMP_FAILURE_RETRY (__readv (fd, iovp, iovcnt));
|
|
|
|
if (r <= 0)
|
2007-10-13 18:02:24 +00:00
|
|
|
{
|
|
|
|
if (__builtin_expect (r < 0 && errno == EAGAIN, 0)
|
|
|
|
/* The socket is still receiving data. Wait a bit more. */
|
|
|
|
&& wait_on_socket (fd, EXTRA_RECEIVE_TIME) > 0)
|
|
|
|
goto again;
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
2005-02-22 22:58:32 +00:00
|
|
|
ret += r;
|
|
|
|
}
|
|
|
|
while (ret < total);
|
|
|
|
if (r < 0)
|
|
|
|
ret = r;
|
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-09-08 15:46:42 +00:00
|
|
|
static int
|
2007-01-31 23:24:54 +00:00
|
|
|
open_socket (request_type type, const char *key, size_t keylen)
|
2004-09-08 15:46:42 +00:00
|
|
|
{
|
2008-07-25 18:31:07 +00:00
|
|
|
int sock;
|
|
|
|
|
2015-10-17 10:02:37 +00:00
|
|
|
sock = __socket (PF_UNIX, SOCK_STREAM | SOCK_CLOEXEC | SOCK_NONBLOCK, 0);
|
2004-09-08 15:46:42 +00:00
|
|
|
if (sock < 0)
|
|
|
|
return -1;
|
|
|
|
|
2014-10-22 20:17:20 +00:00
|
|
|
size_t real_sizeof_reqdata = sizeof (request_header) + keylen;
|
2007-01-31 23:24:54 +00:00
|
|
|
struct
|
|
|
|
{
|
|
|
|
request_header req;
|
2014-10-22 20:17:20 +00:00
|
|
|
char key[];
|
|
|
|
} *reqdata = alloca (real_sizeof_reqdata);
|
2007-01-31 23:24:54 +00:00
|
|
|
|
2004-09-08 15:46:42 +00:00
|
|
|
struct sockaddr_un sun;
|
|
|
|
sun.sun_family = AF_UNIX;
|
|
|
|
strcpy (sun.sun_path, _PATH_NSCDSOCKET);
|
|
|
|
if (__connect (sock, (struct sockaddr *) &sun, sizeof (sun)) < 0
|
|
|
|
&& errno != EINPROGRESS)
|
|
|
|
goto out;
|
|
|
|
|
2014-10-22 20:17:20 +00:00
|
|
|
reqdata->req.version = NSCD_VERSION;
|
|
|
|
reqdata->req.type = type;
|
|
|
|
reqdata->req.key_len = keylen;
|
2007-01-31 23:24:54 +00:00
|
|
|
|
2014-10-22 20:17:20 +00:00
|
|
|
memcpy (reqdata->key, key, keylen);
|
2007-01-31 23:24:54 +00:00
|
|
|
|
|
|
|
bool first_try = true;
|
Change most internal uses of __gettimeofday to __clock_gettime.
Since gettimeofday will shortly be implemented in terms of
clock_gettime on all platforms, internal code should use clock_gettime
directly; in addition to removing a layer of indirection, this will
allow us to remove the PLT-bypass gunk for gettimeofday. (We can't
quite do that yet, but it'll be coming later in this patch series.)
In many cases, the changed code does fewer conversions.
The changed code always assumes __clock_gettime (CLOCK_REALTIME)
cannot fail. Most of the call sites were assuming gettimeofday could
not fail, but a few places were checking for errors. POSIX says
clock_gettime can only fail if the clock constant is invalid or
unsupported, and CLOCK_REALTIME is the one and only clock constant
that's required to be supported. For consistency I grepped the entire
source tree for any other places that checked for errors from
__clock_gettime (CLOCK_REALTIME), found one, and changed it too.
(For the record, POSIX also says gettimeofday can never fail.)
(It would be nice if we could declare that GNU systems will always
support CLOCK_MONOTONIC as well as CLOCK_REALTIME; there are several
places where we are using CLOCK_REALTIME where _MONOTONIC would be
more appropriate, and/or trying to use _MONOTONIC and then falling
back to _REALTIME. But the Hurd doesn't support CLOCK_MONOTONIC yet,
and it looks like adding it would involve substantial changes to
gnumach's internals and API. Oh well.)
A few Hurd-specific files were changed to use __host_get_time instead
of __clock_gettime, as this seemed tidier. We also assume this cannot
fail. Skimming the code in gnumach leads me to believe the only way
it could fail is if __mach_host_self also failed, and our
Hurd-specific code consistently assumes that can't happen, so I'm
going with that.
With the exception of support/support_test_main.c, test cases are not
modified, mainly because I didn't want to have to figure out which
test cases were testing gettimeofday specifically.
The definition of GETTIME in sysdeps/generic/memusage.h had a typo and
was not reading tv_sec at all. I fixed this. It appears nobody has been
generating malloc traces on a machine that doesn't have a superseding
definition.
There are a whole bunch of places where the code could be simplified
by factoring out timespec subtraction and/or comparison logic, but I
want to keep this patch as mechanical as possible.
Checked on x86_64-linux-gnu, i686-linux-gnu, powerpc64le-linux-gnu,
powerpc64-linux-gnu, powerpc-linux-gnu, and aarch64-linux-gnu.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Reviewed-by: Lukasz Majewski <lukma@denx.de>
2019-08-17 00:38:22 +00:00
|
|
|
struct timespec tvend = { 0, 0 };
|
2007-01-31 23:24:54 +00:00
|
|
|
while (1)
|
|
|
|
{
|
|
|
|
#ifndef MSG_NOSIGNAL
|
|
|
|
# define MSG_NOSIGNAL 0
|
|
|
|
#endif
|
2014-10-22 20:17:20 +00:00
|
|
|
ssize_t wres = TEMP_FAILURE_RETRY (__send (sock, reqdata,
|
2007-02-16 06:34:26 +00:00
|
|
|
real_sizeof_reqdata,
|
2007-01-31 23:24:54 +00:00
|
|
|
MSG_NOSIGNAL));
|
2014-02-10 13:45:42 +00:00
|
|
|
if (__glibc_likely (wres == (ssize_t) real_sizeof_reqdata))
|
2007-01-31 23:24:54 +00:00
|
|
|
/* We managed to send the request. */
|
|
|
|
return sock;
|
|
|
|
|
|
|
|
if (wres != -1 || errno != EAGAIN)
|
|
|
|
/* Something is really wrong, no chance to continue. */
|
|
|
|
break;
|
|
|
|
|
|
|
|
/* The daemon is busy wait for it. */
|
|
|
|
int to;
|
Change most internal uses of __gettimeofday to __clock_gettime.
Since gettimeofday will shortly be implemented in terms of
clock_gettime on all platforms, internal code should use clock_gettime
directly; in addition to removing a layer of indirection, this will
allow us to remove the PLT-bypass gunk for gettimeofday. (We can't
quite do that yet, but it'll be coming later in this patch series.)
In many cases, the changed code does fewer conversions.
The changed code always assumes __clock_gettime (CLOCK_REALTIME)
cannot fail. Most of the call sites were assuming gettimeofday could
not fail, but a few places were checking for errors. POSIX says
clock_gettime can only fail if the clock constant is invalid or
unsupported, and CLOCK_REALTIME is the one and only clock constant
that's required to be supported. For consistency I grepped the entire
source tree for any other places that checked for errors from
__clock_gettime (CLOCK_REALTIME), found one, and changed it too.
(For the record, POSIX also says gettimeofday can never fail.)
(It would be nice if we could declare that GNU systems will always
support CLOCK_MONOTONIC as well as CLOCK_REALTIME; there are several
places where we are using CLOCK_REALTIME where _MONOTONIC would be
more appropriate, and/or trying to use _MONOTONIC and then falling
back to _REALTIME. But the Hurd doesn't support CLOCK_MONOTONIC yet,
and it looks like adding it would involve substantial changes to
gnumach's internals and API. Oh well.)
A few Hurd-specific files were changed to use __host_get_time instead
of __clock_gettime, as this seemed tidier. We also assume this cannot
fail. Skimming the code in gnumach leads me to believe the only way
it could fail is if __mach_host_self also failed, and our
Hurd-specific code consistently assumes that can't happen, so I'm
going with that.
With the exception of support/support_test_main.c, test cases are not
modified, mainly because I didn't want to have to figure out which
test cases were testing gettimeofday specifically.
The definition of GETTIME in sysdeps/generic/memusage.h had a typo and
was not reading tv_sec at all. I fixed this. It appears nobody has been
generating malloc traces on a machine that doesn't have a superseding
definition.
There are a whole bunch of places where the code could be simplified
by factoring out timespec subtraction and/or comparison logic, but I
want to keep this patch as mechanical as possible.
Checked on x86_64-linux-gnu, i686-linux-gnu, powerpc64le-linux-gnu,
powerpc64-linux-gnu, powerpc-linux-gnu, and aarch64-linux-gnu.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Reviewed-by: Lukasz Majewski <lukma@denx.de>
2019-08-17 00:38:22 +00:00
|
|
|
struct timespec now;
|
|
|
|
__clock_gettime (CLOCK_REALTIME, &now);
|
2007-01-31 23:24:54 +00:00
|
|
|
if (first_try)
|
|
|
|
{
|
Change most internal uses of __gettimeofday to __clock_gettime.
Since gettimeofday will shortly be implemented in terms of
clock_gettime on all platforms, internal code should use clock_gettime
directly; in addition to removing a layer of indirection, this will
allow us to remove the PLT-bypass gunk for gettimeofday. (We can't
quite do that yet, but it'll be coming later in this patch series.)
In many cases, the changed code does fewer conversions.
The changed code always assumes __clock_gettime (CLOCK_REALTIME)
cannot fail. Most of the call sites were assuming gettimeofday could
not fail, but a few places were checking for errors. POSIX says
clock_gettime can only fail if the clock constant is invalid or
unsupported, and CLOCK_REALTIME is the one and only clock constant
that's required to be supported. For consistency I grepped the entire
source tree for any other places that checked for errors from
__clock_gettime (CLOCK_REALTIME), found one, and changed it too.
(For the record, POSIX also says gettimeofday can never fail.)
(It would be nice if we could declare that GNU systems will always
support CLOCK_MONOTONIC as well as CLOCK_REALTIME; there are several
places where we are using CLOCK_REALTIME where _MONOTONIC would be
more appropriate, and/or trying to use _MONOTONIC and then falling
back to _REALTIME. But the Hurd doesn't support CLOCK_MONOTONIC yet,
and it looks like adding it would involve substantial changes to
gnumach's internals and API. Oh well.)
A few Hurd-specific files were changed to use __host_get_time instead
of __clock_gettime, as this seemed tidier. We also assume this cannot
fail. Skimming the code in gnumach leads me to believe the only way
it could fail is if __mach_host_self also failed, and our
Hurd-specific code consistently assumes that can't happen, so I'm
going with that.
With the exception of support/support_test_main.c, test cases are not
modified, mainly because I didn't want to have to figure out which
test cases were testing gettimeofday specifically.
The definition of GETTIME in sysdeps/generic/memusage.h had a typo and
was not reading tv_sec at all. I fixed this. It appears nobody has been
generating malloc traces on a machine that doesn't have a superseding
definition.
There are a whole bunch of places where the code could be simplified
by factoring out timespec subtraction and/or comparison logic, but I
want to keep this patch as mechanical as possible.
Checked on x86_64-linux-gnu, i686-linux-gnu, powerpc64le-linux-gnu,
powerpc64-linux-gnu, powerpc-linux-gnu, and aarch64-linux-gnu.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Reviewed-by: Lukasz Majewski <lukma@denx.de>
2019-08-17 00:38:22 +00:00
|
|
|
tvend.tv_nsec = now.tv_nsec;
|
2007-02-02 15:53:48 +00:00
|
|
|
tvend.tv_sec = now.tv_sec + 5;
|
2007-01-31 23:24:54 +00:00
|
|
|
to = 5 * 1000;
|
|
|
|
first_try = false;
|
|
|
|
}
|
|
|
|
else
|
2007-02-02 15:53:48 +00:00
|
|
|
to = ((tvend.tv_sec - now.tv_sec) * 1000
|
Change most internal uses of __gettimeofday to __clock_gettime.
Since gettimeofday will shortly be implemented in terms of
clock_gettime on all platforms, internal code should use clock_gettime
directly; in addition to removing a layer of indirection, this will
allow us to remove the PLT-bypass gunk for gettimeofday. (We can't
quite do that yet, but it'll be coming later in this patch series.)
In many cases, the changed code does fewer conversions.
The changed code always assumes __clock_gettime (CLOCK_REALTIME)
cannot fail. Most of the call sites were assuming gettimeofday could
not fail, but a few places were checking for errors. POSIX says
clock_gettime can only fail if the clock constant is invalid or
unsupported, and CLOCK_REALTIME is the one and only clock constant
that's required to be supported. For consistency I grepped the entire
source tree for any other places that checked for errors from
__clock_gettime (CLOCK_REALTIME), found one, and changed it too.
(For the record, POSIX also says gettimeofday can never fail.)
(It would be nice if we could declare that GNU systems will always
support CLOCK_MONOTONIC as well as CLOCK_REALTIME; there are several
places where we are using CLOCK_REALTIME where _MONOTONIC would be
more appropriate, and/or trying to use _MONOTONIC and then falling
back to _REALTIME. But the Hurd doesn't support CLOCK_MONOTONIC yet,
and it looks like adding it would involve substantial changes to
gnumach's internals and API. Oh well.)
A few Hurd-specific files were changed to use __host_get_time instead
of __clock_gettime, as this seemed tidier. We also assume this cannot
fail. Skimming the code in gnumach leads me to believe the only way
it could fail is if __mach_host_self also failed, and our
Hurd-specific code consistently assumes that can't happen, so I'm
going with that.
With the exception of support/support_test_main.c, test cases are not
modified, mainly because I didn't want to have to figure out which
test cases were testing gettimeofday specifically.
The definition of GETTIME in sysdeps/generic/memusage.h had a typo and
was not reading tv_sec at all. I fixed this. It appears nobody has been
generating malloc traces on a machine that doesn't have a superseding
definition.
There are a whole bunch of places where the code could be simplified
by factoring out timespec subtraction and/or comparison logic, but I
want to keep this patch as mechanical as possible.
Checked on x86_64-linux-gnu, i686-linux-gnu, powerpc64le-linux-gnu,
powerpc64-linux-gnu, powerpc-linux-gnu, and aarch64-linux-gnu.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Reviewed-by: Lukasz Majewski <lukma@denx.de>
2019-08-17 00:38:22 +00:00
|
|
|
+ (tvend.tv_nsec - now.tv_nsec) / 1000000);
|
2007-01-31 23:24:54 +00:00
|
|
|
|
|
|
|
struct pollfd fds[1];
|
|
|
|
fds[0].fd = sock;
|
|
|
|
fds[0].events = POLLOUT | POLLERR | POLLHUP;
|
|
|
|
if (__poll (fds, 1, to) <= 0)
|
|
|
|
/* The connection timed out or broke down. */
|
|
|
|
break;
|
|
|
|
|
|
|
|
/* We try to write again. */
|
|
|
|
}
|
2004-09-08 15:46:42 +00:00
|
|
|
|
|
|
|
out:
|
2017-07-03 18:22:58 +00:00
|
|
|
__close_nocancel_nostatus (sock);
|
2004-09-08 15:46:42 +00:00
|
|
|
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
__nscd_unmap (struct mapped_database *mapped)
|
|
|
|
{
|
|
|
|
assert (mapped->counter == 0);
|
2004-09-16 22:54:54 +00:00
|
|
|
__munmap ((void *) mapped->head, mapped->mapsize);
|
2004-09-08 15:46:42 +00:00
|
|
|
free (mapped);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Try to get a file descriptor for the shared meory segment
|
|
|
|
containing the database. */
|
2011-10-31 05:51:16 +00:00
|
|
|
struct mapped_database *
|
|
|
|
__nscd_get_mapping (request_type type, const char *key,
|
|
|
|
struct mapped_database **mappedp)
|
2004-09-08 15:46:42 +00:00
|
|
|
{
|
|
|
|
struct mapped_database *result = NO_MAPPING;
|
|
|
|
#ifdef SCM_RIGHTS
|
|
|
|
const size_t keylen = strlen (key) + 1;
|
|
|
|
int saved_errno = errno;
|
|
|
|
|
|
|
|
int mapfd = -1;
|
2007-01-31 23:24:54 +00:00
|
|
|
char resdata[keylen];
|
2004-09-08 15:46:42 +00:00
|
|
|
|
2007-01-31 23:24:54 +00:00
|
|
|
/* Open a socket and send the request. */
|
|
|
|
int sock = open_socket (type, key, keylen);
|
2004-09-08 15:46:42 +00:00
|
|
|
if (sock < 0)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
/* Room for the data sent along with the file descriptor. We expect
|
|
|
|
the key name back. */
|
2007-08-29 06:10:07 +00:00
|
|
|
uint64_t mapsize;
|
|
|
|
struct iovec iov[2];
|
2004-09-08 15:46:42 +00:00
|
|
|
iov[0].iov_base = resdata;
|
|
|
|
iov[0].iov_len = keylen;
|
2007-08-29 06:10:07 +00:00
|
|
|
iov[1].iov_base = &mapsize;
|
|
|
|
iov[1].iov_len = sizeof (mapsize);
|
2004-09-08 15:46:42 +00:00
|
|
|
|
2005-07-13 22:47:24 +00:00
|
|
|
union
|
|
|
|
{
|
|
|
|
struct cmsghdr hdr;
|
|
|
|
char bytes[CMSG_SPACE (sizeof (int))];
|
|
|
|
} buf;
|
2007-08-29 06:10:07 +00:00
|
|
|
struct msghdr msg = { .msg_iov = iov, .msg_iovlen = 2,
|
2005-07-13 22:47:24 +00:00
|
|
|
.msg_control = buf.bytes,
|
|
|
|
.msg_controllen = sizeof (buf) };
|
2004-09-08 15:46:42 +00:00
|
|
|
struct cmsghdr *cmsg = CMSG_FIRSTHDR (&msg);
|
|
|
|
|
|
|
|
cmsg->cmsg_level = SOL_SOCKET;
|
|
|
|
cmsg->cmsg_type = SCM_RIGHTS;
|
|
|
|
cmsg->cmsg_len = CMSG_LEN (sizeof (int));
|
|
|
|
|
2005-07-13 22:47:24 +00:00
|
|
|
/* This access is well-aligned since BUF is correctly aligned for an
|
|
|
|
int and CMSG_DATA preserves this alignment. */
|
2009-04-26 20:12:37 +00:00
|
|
|
memset (CMSG_DATA (cmsg), '\xff', sizeof (int));
|
2004-09-08 15:46:42 +00:00
|
|
|
|
|
|
|
msg.msg_controllen = cmsg->cmsg_len;
|
|
|
|
|
2007-10-13 18:02:24 +00:00
|
|
|
if (wait_on_socket (sock, 5 * 1000) <= 0)
|
2004-09-08 15:46:42 +00:00
|
|
|
goto out_close2;
|
|
|
|
|
2007-07-21 17:24:43 +00:00
|
|
|
# ifndef MSG_CMSG_CLOEXEC
|
|
|
|
# define MSG_CMSG_CLOEXEC 0
|
|
|
|
# endif
|
2007-08-29 06:10:07 +00:00
|
|
|
ssize_t n = TEMP_FAILURE_RETRY (__recvmsg (sock, &msg, MSG_CMSG_CLOEXEC));
|
2004-09-13 17:24:41 +00:00
|
|
|
|
2007-05-29 14:45:49 +00:00
|
|
|
if (__builtin_expect (CMSG_FIRSTHDR (&msg) == NULL
|
|
|
|
|| (CMSG_FIRSTHDR (&msg)->cmsg_len
|
|
|
|
!= CMSG_LEN (sizeof (int))), 0))
|
|
|
|
goto out_close2;
|
[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
|
|
|
|
2009-04-26 20:12:37 +00:00
|
|
|
int *ip = (void *) CMSG_DATA (cmsg);
|
|
|
|
mapfd = *ip;
|
2007-05-29 16:15:48 +00:00
|
|
|
|
2014-02-10 13:45:42 +00:00
|
|
|
if (__glibc_unlikely (n != keylen && n != keylen + sizeof (mapsize)))
|
2007-08-29 06:10:07 +00:00
|
|
|
goto out_close;
|
|
|
|
|
2014-02-10 13:45:42 +00:00
|
|
|
if (__glibc_unlikely (strcmp (resdata, key) != 0))
|
2004-09-08 15:46:42 +00:00
|
|
|
goto out_close;
|
|
|
|
|
2014-02-10 13:45:42 +00:00
|
|
|
if (__glibc_unlikely (n == keylen))
|
2007-08-29 06:10:07 +00:00
|
|
|
{
|
|
|
|
struct stat64 st;
|
|
|
|
if (__builtin_expect (fstat64 (mapfd, &st) != 0, 0)
|
|
|
|
|| __builtin_expect (st.st_size < sizeof (struct database_pers_head),
|
|
|
|
0))
|
|
|
|
goto out_close;
|
|
|
|
|
|
|
|
mapsize = st.st_size;
|
|
|
|
}
|
|
|
|
|
2004-09-08 15:46:42 +00:00
|
|
|
/* The file is large enough, map it now. */
|
2007-08-29 06:10:07 +00:00
|
|
|
void *mapping = __mmap (NULL, mapsize, PROT_READ, MAP_SHARED, mapfd, 0);
|
2014-02-10 13:45:42 +00:00
|
|
|
if (__glibc_likely (mapping != MAP_FAILED))
|
2004-09-08 15:46:42 +00:00
|
|
|
{
|
2007-08-29 05:16:12 +00:00
|
|
|
/* Check whether the database is correct and up-to-date. */
|
|
|
|
struct database_pers_head *head = mapping;
|
|
|
|
|
|
|
|
if (__builtin_expect (head->version != DB_VERSION, 0)
|
|
|
|
|| __builtin_expect (head->header_size != sizeof (*head), 0)
|
2008-03-04 01:54:09 +00:00
|
|
|
/* Catch some misconfiguration. The server should catch
|
|
|
|
them now but some older versions did not. */
|
|
|
|
|| __builtin_expect (head->module == 0, 0)
|
2007-08-29 05:16:12 +00:00
|
|
|
/* This really should not happen but who knows, maybe the update
|
|
|
|
thread got stuck. */
|
|
|
|
|| __builtin_expect (! head->nscd_certainly_running
|
|
|
|
&& (head->timestamp + MAPPING_TIMEOUT
|
2019-10-24 21:01:40 +00:00
|
|
|
< time_now ()), 0))
|
2004-09-08 15:46:42 +00:00
|
|
|
{
|
2007-08-29 05:16:12 +00:00
|
|
|
out_unmap:
|
2007-08-29 06:10:07 +00:00
|
|
|
__munmap (mapping, mapsize);
|
2004-09-08 15:46:42 +00:00
|
|
|
goto out_close;
|
|
|
|
}
|
|
|
|
|
2007-08-29 05:16:12 +00:00
|
|
|
size_t size = (sizeof (*head) + roundup (head->module * sizeof (ref_t),
|
|
|
|
ALIGN)
|
|
|
|
+ head->data_size);
|
|
|
|
|
2014-02-10 13:45:42 +00:00
|
|
|
if (__glibc_unlikely (mapsize < size))
|
2007-08-29 05:16:12 +00:00
|
|
|
goto out_unmap;
|
|
|
|
|
|
|
|
/* Allocate a record for the mapping. */
|
|
|
|
struct mapped_database *newp = malloc (sizeof (*newp));
|
|
|
|
if (newp == NULL)
|
|
|
|
/* Ugh, after all we went through the memory allocation failed. */
|
|
|
|
goto out_unmap;
|
|
|
|
|
2004-09-08 15:46:42 +00:00
|
|
|
newp->head = mapping;
|
2007-08-29 05:16:12 +00:00
|
|
|
newp->data = ((char *) mapping + head->header_size
|
|
|
|
+ roundup (head->module * sizeof (ref_t), ALIGN));
|
2004-09-08 15:46:42 +00:00
|
|
|
newp->mapsize = size;
|
2007-08-29 05:16:12 +00:00
|
|
|
newp->datasize = head->data_size;
|
2004-09-08 15:46:42 +00:00
|
|
|
/* Set counter to 1 to show it is usable. */
|
|
|
|
newp->counter = 1;
|
|
|
|
|
|
|
|
result = newp;
|
|
|
|
}
|
|
|
|
|
|
|
|
out_close:
|
|
|
|
__close (mapfd);
|
|
|
|
out_close2:
|
|
|
|
__close (sock);
|
|
|
|
out:
|
|
|
|
__set_errno (saved_errno);
|
|
|
|
#endif /* SCM_RIGHTS */
|
|
|
|
|
|
|
|
struct mapped_database *oldval = *mappedp;
|
|
|
|
*mappedp = result;
|
|
|
|
|
|
|
|
if (oldval != NULL && atomic_decrement_val (&oldval->counter) == 0)
|
|
|
|
__nscd_unmap (oldval);
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct mapped_database *
|
|
|
|
__nscd_get_map_ref (request_type type, const char *name,
|
2006-04-25 23:50:31 +00:00
|
|
|
volatile struct locked_map_ptr *mapptr, int *gc_cyclep)
|
2004-09-08 15:46:42 +00:00
|
|
|
{
|
|
|
|
struct mapped_database *cur = mapptr->mapped;
|
|
|
|
if (cur == NO_MAPPING)
|
|
|
|
return cur;
|
|
|
|
|
2012-05-15 18:35:53 +00:00
|
|
|
if (!__nscd_acquire_maplock (mapptr))
|
|
|
|
return NO_MAPPING;
|
2004-09-08 15:46:42 +00:00
|
|
|
|
|
|
|
cur = mapptr->mapped;
|
|
|
|
|
2014-02-10 13:45:42 +00:00
|
|
|
if (__glibc_likely (cur != NO_MAPPING))
|
2004-09-08 15:46:42 +00:00
|
|
|
{
|
|
|
|
/* If not mapped or timestamp not updated, request new map. */
|
|
|
|
if (cur == NULL
|
2004-09-08 17:56:46 +00:00
|
|
|
|| (cur->head->nscd_certainly_running == 0
|
2019-10-24 21:01:40 +00:00
|
|
|
&& cur->head->timestamp + MAPPING_TIMEOUT < time_now ())
|
2006-10-02 16:34:25 +00:00
|
|
|
|| cur->head->data_size > cur->datasize)
|
2011-10-31 05:51:16 +00:00
|
|
|
cur = __nscd_get_mapping (type, name,
|
|
|
|
(struct mapped_database **) &mapptr->mapped);
|
2004-09-08 15:46:42 +00:00
|
|
|
|
2014-02-10 13:45:42 +00:00
|
|
|
if (__glibc_likely (cur != NO_MAPPING))
|
2004-09-08 15:46:42 +00:00
|
|
|
{
|
|
|
|
if (__builtin_expect (((*gc_cyclep = cur->head->gc_cycle) & 1) != 0,
|
|
|
|
0))
|
|
|
|
cur = NO_MAPPING;
|
|
|
|
else
|
|
|
|
atomic_increment (&cur->counter);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
mapptr->lock = 0;
|
|
|
|
|
|
|
|
return cur;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-05-18 17:19:50 +00:00
|
|
|
/* Using sizeof (hashentry) is not always correct to determine the size of
|
|
|
|
the data structure as found in the nscd cache. The program could be
|
|
|
|
a 64-bit process and nscd could be a 32-bit process. In this case
|
|
|
|
sizeof (hashentry) would overestimate the size. The following is
|
|
|
|
the minimum size of such an entry, good enough for our tests here. */
|
|
|
|
#define MINIMUM_HASHENTRY_SIZE \
|
|
|
|
(offsetof (struct hashentry, dellist) + sizeof (int32_t))
|
|
|
|
|
2007-01-31 09:14:21 +00:00
|
|
|
/* Don't return const struct datahead *, as eventhough the record
|
|
|
|
is normally constant, it can change arbitrarily during nscd
|
|
|
|
garbage collection. */
|
|
|
|
struct datahead *
|
2004-09-08 15:46:42 +00:00
|
|
|
__nscd_cache_search (request_type type, const char *key, size_t keylen,
|
2009-05-16 04:17:08 +00:00
|
|
|
const struct mapped_database *mapped, size_t datalen)
|
2004-09-08 15:46:42 +00:00
|
|
|
{
|
2017-11-23 13:08:11 +00:00
|
|
|
unsigned long int hash = __nss_hash (key, keylen) % mapped->head->module;
|
2006-10-02 16:34:25 +00:00
|
|
|
size_t datasize = mapped->datasize;
|
2004-09-08 15:46:42 +00:00
|
|
|
|
2007-10-07 05:31:00 +00:00
|
|
|
ref_t trail = mapped->head->array[hash];
|
2009-05-16 04:17:08 +00:00
|
|
|
trail = atomic_forced_read (trail);
|
2007-10-07 05:31:00 +00:00
|
|
|
ref_t work = trail;
|
2009-05-18 17:19:50 +00:00
|
|
|
size_t loop_cnt = datasize / (MINIMUM_HASHENTRY_SIZE
|
|
|
|
+ offsetof (struct datahead, data) / 2);
|
2007-10-07 05:31:00 +00:00
|
|
|
int tick = 0;
|
|
|
|
|
2009-05-18 17:19:50 +00:00
|
|
|
while (work != ENDREF && work + MINIMUM_HASHENTRY_SIZE <= datasize)
|
2004-09-08 15:46:42 +00:00
|
|
|
{
|
|
|
|
struct hashentry *here = (struct hashentry *) (mapped->data + work);
|
2009-05-16 04:17:08 +00:00
|
|
|
ref_t here_key, here_packet;
|
2004-09-08 15:46:42 +00:00
|
|
|
|
2014-03-26 20:37:35 +00:00
|
|
|
#if !_STRING_ARCH_unaligned
|
2007-01-31 09:14:21 +00:00
|
|
|
/* Although during garbage collection when moving struct hashentry
|
|
|
|
records around we first copy from old to new location and then
|
|
|
|
adjust pointer from previous hashentry to it, there is no barrier
|
|
|
|
between those memory writes. It is very unlikely to hit it,
|
|
|
|
so check alignment only if a misaligned load can crash the
|
|
|
|
application. */
|
|
|
|
if ((uintptr_t) here & (__alignof__ (*here) - 1))
|
|
|
|
return NULL;
|
|
|
|
#endif
|
|
|
|
|
2006-10-02 16:34:25 +00:00
|
|
|
if (type == here->type
|
|
|
|
&& keylen == here->len
|
2009-05-16 04:17:08 +00:00
|
|
|
&& (here_key = atomic_forced_read (here->key)) + keylen <= datasize
|
|
|
|
&& memcmp (key, mapped->data + here_key, keylen) == 0
|
|
|
|
&& ((here_packet = atomic_forced_read (here->packet))
|
|
|
|
+ sizeof (struct datahead) <= datasize))
|
2004-09-08 15:46:42 +00:00
|
|
|
{
|
|
|
|
/* We found the entry. Increment the appropriate counter. */
|
2007-01-31 09:14:21 +00:00
|
|
|
struct datahead *dh
|
2009-05-16 04:17:08 +00:00
|
|
|
= (struct datahead *) (mapped->data + here_packet);
|
2004-09-08 15:46:42 +00:00
|
|
|
|
2014-03-26 20:37:35 +00:00
|
|
|
#if !_STRING_ARCH_unaligned
|
2007-01-31 09:14:21 +00:00
|
|
|
if ((uintptr_t) dh & (__alignof__ (*dh) - 1))
|
|
|
|
return NULL;
|
|
|
|
#endif
|
|
|
|
|
2004-09-08 15:46:42 +00:00
|
|
|
/* See whether we must ignore the entry or whether something
|
|
|
|
is wrong because garbage collection is in progress. */
|
2009-05-16 04:17:08 +00:00
|
|
|
if (dh->usable
|
|
|
|
&& here_packet + dh->allocsize <= datasize
|
|
|
|
&& (here_packet + offsetof (struct datahead, data) + datalen
|
|
|
|
<= datasize))
|
2004-09-08 15:46:42 +00:00
|
|
|
return dh;
|
|
|
|
}
|
|
|
|
|
2009-05-16 04:17:08 +00:00
|
|
|
work = atomic_forced_read (here->next);
|
2007-10-06 18:47:56 +00:00
|
|
|
/* Prevent endless loops. This should never happen but perhaps
|
|
|
|
the database got corrupted, accidentally or deliberately. */
|
2009-05-16 17:10:32 +00:00
|
|
|
if (work == trail || loop_cnt-- == 0)
|
2007-10-06 18:47:56 +00:00
|
|
|
break;
|
2007-10-07 05:31:00 +00:00
|
|
|
if (tick)
|
|
|
|
{
|
|
|
|
struct hashentry *trailelem;
|
|
|
|
trailelem = (struct hashentry *) (mapped->data + trail);
|
|
|
|
|
2014-03-26 20:37:35 +00:00
|
|
|
#if !_STRING_ARCH_unaligned
|
2007-10-07 05:31:00 +00:00
|
|
|
/* We have to redo the checks. Maybe the data changed. */
|
|
|
|
if ((uintptr_t) trailelem & (__alignof__ (*trailelem) - 1))
|
|
|
|
return NULL;
|
|
|
|
#endif
|
2009-05-16 04:17:08 +00:00
|
|
|
|
2009-05-18 17:19:50 +00:00
|
|
|
if (trail + MINIMUM_HASHENTRY_SIZE > datasize)
|
2009-05-16 04:17:08 +00:00
|
|
|
return NULL;
|
|
|
|
|
|
|
|
trail = atomic_forced_read (trailelem->next);
|
2007-10-07 05:31:00 +00:00
|
|
|
}
|
|
|
|
tick = 1 - tick;
|
2004-09-08 15:46:42 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Create a socket connected to a name. */
|
|
|
|
int
|
|
|
|
__nscd_open_socket (const char *key, size_t keylen, request_type type,
|
|
|
|
void *response, size_t responselen)
|
|
|
|
{
|
2007-01-31 23:24:54 +00:00
|
|
|
/* This should never happen and it is something the nscd daemon
|
|
|
|
enforces, too. He it helps to limit the amount of stack
|
|
|
|
used. */
|
|
|
|
if (keylen > MAXKEYLEN)
|
|
|
|
return -1;
|
|
|
|
|
2004-09-08 15:46:42 +00:00
|
|
|
int saved_errno = errno;
|
|
|
|
|
2007-01-31 23:24:54 +00:00
|
|
|
int sock = open_socket (type, key, keylen);
|
2004-09-08 15:46:42 +00:00
|
|
|
if (sock >= 0)
|
|
|
|
{
|
2007-01-31 23:24:54 +00:00
|
|
|
/* Wait for data. */
|
2007-10-13 18:02:24 +00:00
|
|
|
if (wait_on_socket (sock, 5 * 1000) > 0)
|
2005-07-13 22:47:24 +00:00
|
|
|
{
|
2007-01-31 23:24:54 +00:00
|
|
|
ssize_t nbytes = TEMP_FAILURE_RETRY (__read (sock, response,
|
|
|
|
responselen));
|
2005-07-13 22:47:24 +00:00
|
|
|
if (nbytes == (ssize_t) responselen)
|
|
|
|
return sock;
|
2004-09-08 15:46:42 +00:00
|
|
|
}
|
|
|
|
|
2017-07-03 18:22:58 +00:00
|
|
|
__close_nocancel_nostatus (sock);
|
2004-09-08 15:46:42 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
__set_errno (saved_errno);
|
|
|
|
|
|
|
|
return -1;
|
|
|
|
}
|