mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-25 04:01:10 +00:00
2d7da676f3
1997-07-11 03:00 Ulrich Drepper <drepper@cygnus.com> * inet/inet_ntoa.c: Prevent looking for thread data key if we found one. * signal/sigandset.c: Include stddef.h to get NULL defined. * signal/sigisempty.c: Likewise. * signal/sigorset.c: Likewise. * sysdeps/stub/if_index.h: Likewise. * wcsmbs/wcstod_l.c: Include locale.h to get __locale_t defined. * wcsmbs/wcstof_l.c: Likewise. * wcsmbs/wcstol_l.c: Likewise. * wcsmbs/wcstold_l.c: Likewise. * wcsmbs/wcstoll_l.c: Likewise. * wcsmbs/wcstoul_l.c: Likewise. * wcsmbs/wcstoull_l.c: Likewise. Reported by Marcus G. Daniels <marcus@cathcart.sysc.pdx.edu>. * stdio-common/snprintf.c: Use ISO C function definition form. * sysdeps/stub/libc-lock.h: Don't define __libc_key_create and __libc_setspecific as empty macros since they are used as function with return value. Reported by Andreas Jaeger. 1997-07-10 Marcus G. Daniels <marcus@cathcart.sysc.pdx.edu> * sysdeps/mach/hurd/select.c (__select): Need bit count for MACH_MSG_TYPE_INTEGER_T. 1997-07-08 10:12 Fila Kolodny <fila@ibi.com> * sysdeps/i370/Implies: New file for i370-ibm-mvs port. * sysdeps/mvs/Implies: Likewise. 1997-07-09 23:06 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> * nis/Makefile: Add new source files. * nis/nis_intern.h: Add new internal functions. * nis/rpcsvc/nislib.h: Likewise. * nis/lckcache.c: New. * nis/nis_cache.c: New, dummy functions in the moment. * nis/nis_util.c: New. * nis/nisplus-parser.h: New. * nis/nss_nisplus/nisplus-parser.c: New. * nis/rpcsvc/nis_cache.h: New. * nis/rpcsvc/nis_cache.x: New. * nis/nss_compat/compat-grp.c: Matches Solaris behaviour now. * nis/nss_compat/compat-pwd.c: Likewise. * nis/nss_compat/compat-spwd.c: Likewise. * nis/nss_nisplus/nisplus-alias.c: Likewise. * nis/nss_nisplus/nisplus-ethers.c: Likewise. * nis/nss_nisplus/nisplus-grp.c: Likewise. * nis/nss_nisplus/nisplus-hosts.c: Likewise. * nis/nss_nisplus/nisplus-netgrp.c: Likewise. * nis/nss_nisplus/nisplus-network.c: Likewise. * nis/nss_nisplus/nisplus-proto.c: Likewise. * nis/nss_nisplus/nisplus-publickey.c: Likewise. * nis/nss_nisplus/nisplus-pwd.c: Likewise. * nis/nss_nisplus/nisplus-rpc.c: Likewise. * nis/nss_nisplus/nisplus-service.c: Likewise. * nis/nss_nisplus/nisplus-spwd.c: Likewise. * nis/nss_nis/nis-publickey.c: Remove libc-lock.h include. * nis/nis_intern.c: Removed. * nis/nis_call.c: Complete rewrite. * nis/nis_lookup.c: Likewise. * nis/nis_table.c: Likewise. * nis/libnsl.map: Add missing symbols. * nis/nis_print.c: Fix nis_print_link. * nis/nis_subr.c: Fix nis_getnames. 1997-07-09 07:19 H.J. Lu <hjl@gnu.ai.mit.edu> * posix/execvp.c (execvp): Handle ESTALE. 1997-07-10 13:54 Ulrich Drepper <drepper@cygnus.com> * posix/regex.c: Make CHAR_SET_SIZE definition always available, even if SYNTAX_TABLE is defined. Patch by Akim Demaille <demaille@inf.enst.fr>. 1997-07-09 08:16 H.J. Lu <hjl@gnu.ai.mit.edu> * libio/fileops.c (_IO_file_underflow): Adjust pointers before calling _IO_SYSREAD (). 1997-07-07 22:54 Zack Weinberg <zack@rabi.phys.columbia.edu> * sysdeps/sparc/divrem.m4: Eliminate use of "DEFS.h" (sysdep.h does the same job). * sysdeps/sparc/alloca.S: Likewise. * sysdeps/sparc/dotmul.S: Likewise. * sysdeps/sparc/udiv_qrnnd.S: Likewise. * sysdeps/sparc/rem.S: Regenerated. * sysdeps/sparc/sdiv.S: Regenerated. * sysdeps/sparc/udiv.S: Regenerated. * sysdeps/sparc/urem.S: Regenerated. * sysdeps/sparc/DEFS.h: Removed. * sysdeps/sparc/elf/DEFS.h: Removed. * sysdeps/sparc/Dist: Don't distribute DEFS.h. * sysdeps/unix/sparc/sysdep.h: Use 4 byte alignment. Add .type directive #ifdef HAVE_ELF. Minor format changes. * sysdeps/alpha/DEFS.h: Removed. * sysdeps/alpha/Dist: Don't distribute DEFS.h. 1997-07-07 19:03 H.J. Lu <hjl@gnu.ai.mit.edu> * math/test-fenv.c (feenv_nomask_test): Move fesetenv (FE_NOMASK_ENV) after fork () to work with SMP. * sysdeps/i386/fpu_control.h (_FPU_IEEE): Fix comment. 1997-07-08 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * libc.map: Add _IO_peekc_locked. 1997-07-07 15:45 Fila Kolodny <fila@ibi.com> * Makeconfig: Add dbobjdir to rpath-link analogous to nssobjdir. 1997-07-08 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/m68k/fpu/feholdexcpt.c: Shift the exception mask in the right position. * sysdeps/m68k/fpu/fesetenv.c (fesetenv): Likewise. 1997-07-08 13:59 Ulrich Drepper <drepper@cygnus.com> * time/strftime.c (spaces, zeroes): Handle broken SGI compiler. Patch by Richard Stallman <rms@gnu.ai.mit.edu>.
342 lines
9.5 KiB
C
342 lines
9.5 KiB
C
/* Copyright (C) 1991, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Library General Public License as
|
|
published by the Free Software Foundation; either version 2 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
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with the GNU C Library; see the file COPYING.LIB. If not,
|
|
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
#include <sys/types.h>
|
|
#include <hurd.h>
|
|
#include <hurd/fd.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <assert.h>
|
|
|
|
/* All user select types. */
|
|
#define SELECT_ALL (SELECT_READ | SELECT_WRITE | SELECT_URG)
|
|
|
|
/* Used to record that a particular select rpc returned. Must be distinct
|
|
from SELECT_ALL (which better not have the high bit set). */
|
|
#define SELECT_RETURNED ((SELECT_ALL << 1) & ~SELECT_ALL)
|
|
|
|
/* Check the first NFDS descriptors each in READFDS (if not NULL) for read
|
|
readiness, in WRITEFDS (if not NULL) for write readiness, and in EXCEPTFDS
|
|
(if not NULL) for exceptional conditions. If TIMEOUT is not NULL, time out
|
|
after waiting the interval specified therein. Returns the number of ready
|
|
descriptors, or -1 for errors. */
|
|
int
|
|
__select (nfds, readfds, writefds, exceptfds, timeout)
|
|
int nfds;
|
|
fd_set *readfds;
|
|
fd_set *writefds;
|
|
fd_set *exceptfds;
|
|
struct timeval *timeout;
|
|
{
|
|
int i;
|
|
mach_port_t portset;
|
|
int got;
|
|
error_t err;
|
|
fd_set rfds, wfds, xfds;
|
|
int firstfd, lastfd;
|
|
mach_msg_timeout_t to = (timeout != NULL ?
|
|
(timeout->tv_sec * 1000 +
|
|
timeout->tv_usec / 1000) :
|
|
0);
|
|
struct
|
|
{
|
|
struct hurd_userlink ulink;
|
|
struct hurd_fd *cell;
|
|
mach_port_t io_port;
|
|
int type;
|
|
mach_port_t reply_port;
|
|
} d[nfds];
|
|
|
|
/* Use local copies so we can't crash from user bogosity. */
|
|
if (readfds == NULL)
|
|
FD_ZERO (&rfds);
|
|
else
|
|
rfds = *readfds;
|
|
if (writefds == NULL)
|
|
FD_ZERO (&wfds);
|
|
else
|
|
wfds = *writefds;
|
|
if (exceptfds == NULL)
|
|
FD_ZERO (&xfds);
|
|
else
|
|
xfds = *exceptfds;
|
|
|
|
HURD_CRITICAL_BEGIN;
|
|
__mutex_lock (&_hurd_dtable_lock);
|
|
|
|
if (nfds > _hurd_dtablesize)
|
|
nfds = _hurd_dtablesize;
|
|
|
|
/* Collect the ports for interesting FDs. */
|
|
firstfd = lastfd = -1;
|
|
for (i = 0; i < nfds; ++i)
|
|
{
|
|
int type = 0;
|
|
if (readfds != NULL && FD_ISSET (i, &rfds))
|
|
type |= SELECT_READ;
|
|
if (writefds != NULL && FD_ISSET (i, &wfds))
|
|
type |= SELECT_WRITE;
|
|
if (exceptfds != NULL && FD_ISSET (i, &xfds))
|
|
type |= SELECT_URG;
|
|
d[i].type = type;
|
|
if (type)
|
|
{
|
|
d[i].cell = _hurd_dtable[i];
|
|
d[i].io_port = _hurd_port_get (&d[i].cell->port, &d[i].ulink);
|
|
if (d[i].io_port == MACH_PORT_NULL)
|
|
{
|
|
/* If one descriptor is bogus, we fail completely. */
|
|
while (i-- > 0)
|
|
_hurd_port_free (&d[i].cell->port, &d[i].ulink, d[i].io_port);
|
|
errno = EBADF;
|
|
break;
|
|
}
|
|
lastfd = i;
|
|
if (firstfd == -1)
|
|
firstfd = i;
|
|
}
|
|
}
|
|
|
|
__mutex_unlock (&_hurd_dtable_lock);
|
|
HURD_CRITICAL_END;
|
|
|
|
if (i < nfds)
|
|
return -1;
|
|
|
|
/* Send them all io_select request messages. */
|
|
|
|
if (firstfd == -1)
|
|
/* But not if there were no ports to deal with at all. */
|
|
portset = __mach_reply_port ();
|
|
else
|
|
{
|
|
err = 0;
|
|
got = 0;
|
|
portset = MACH_PORT_NULL;
|
|
|
|
for (i = firstfd; i <= lastfd; ++i)
|
|
if (d[i].type)
|
|
{
|
|
int type = d[i].type;
|
|
d[i].reply_port = __mach_reply_port ();
|
|
err = __io_select (d[i].io_port, d[i].reply_port,
|
|
/* Poll only if there's a single descriptor. */
|
|
(firstfd == lastfd) ? to : 0,
|
|
&type);
|
|
switch (err)
|
|
{
|
|
case MACH_RCV_TIMED_OUT:
|
|
/* No immediate response. This is normal. */
|
|
err = 0;
|
|
if (firstfd == lastfd)
|
|
/* When there's a single descriptor, we don't need a
|
|
portset, so just pretend we have one, but really
|
|
use the single reply port. */
|
|
portset = d[i].reply_port;
|
|
else if (got == 0)
|
|
/* We've got multiple reply ports, so we need a port set to
|
|
multiplex them. */
|
|
{
|
|
/* We will wait again for a reply later. */
|
|
if (portset == MACH_PORT_NULL)
|
|
/* Create the portset to receive all the replies on. */
|
|
err = __mach_port_allocate (__mach_task_self (),
|
|
MACH_PORT_RIGHT_PORT_SET,
|
|
&portset);
|
|
if (! err)
|
|
/* Put this reply port in the port set. */
|
|
__mach_port_move_member (__mach_task_self (),
|
|
d[i].reply_port, portset);
|
|
}
|
|
break;
|
|
|
|
default:
|
|
/* No other error should happen. Callers of select
|
|
don't expect to see errors, so we simulate
|
|
readiness of the erring object and the next call
|
|
hopefully will get the error again. */
|
|
type = SELECT_ALL;
|
|
/* FALLTHROUGH */
|
|
|
|
case 0:
|
|
/* We got an answer. */
|
|
if ((type & SELECT_ALL) == 0)
|
|
/* Bogus answer; treat like an error, as a fake positive. */
|
|
type = SELECT_ALL;
|
|
|
|
/* This port is already ready already. */
|
|
d[i].type &= type;
|
|
d[i].type |= SELECT_RETURNED;
|
|
++got;
|
|
break;
|
|
}
|
|
_hurd_port_free (&d[i].cell->port, &d[i].ulink, d[i].io_port);
|
|
}
|
|
}
|
|
|
|
/* Now wait for reply messages. */
|
|
if (!err && got == 0)
|
|
{
|
|
/* Now wait for io_select_reply messages on PORT,
|
|
timing out as appropriate. */
|
|
|
|
union
|
|
{
|
|
mach_msg_header_t head;
|
|
struct
|
|
{
|
|
mach_msg_header_t head;
|
|
mach_msg_type_t err_type;
|
|
error_t err;
|
|
} error;
|
|
struct
|
|
{
|
|
mach_msg_header_t head;
|
|
mach_msg_type_t err_type;
|
|
error_t err;
|
|
mach_msg_type_t result_type;
|
|
int result;
|
|
} success;
|
|
} msg;
|
|
mach_msg_option_t options = (timeout == NULL ? 0 : MACH_RCV_TIMEOUT);
|
|
error_t msgerr;
|
|
while ((msgerr = __mach_msg (&msg.head,
|
|
MACH_RCV_MSG | options,
|
|
0, sizeof msg, portset, to,
|
|
MACH_PORT_NULL)) == MACH_MSG_SUCCESS)
|
|
{
|
|
/* We got a message. Decode it. */
|
|
#define IO_SELECT_REPLY_MSGID (21012 + 100) /* XXX */
|
|
const mach_msg_type_t inttype =
|
|
{ MACH_MSG_TYPE_INTEGER_T, sizeof (MACH_MSG_TYPE_INTEGER_T) * 8,
|
|
1, 1, 0, 0 };
|
|
if (msg.head.msgh_id == IO_SELECT_REPLY_MSGID &&
|
|
msg.head.msgh_size >= sizeof msg.error &&
|
|
!(msg.head.msgh_bits & MACH_MSGH_BITS_COMPLEX) &&
|
|
*(int *) &msg.error.err_type == *(int *) &inttype)
|
|
{
|
|
/* This is a properly formatted message so far.
|
|
See if it is a success or a failure. */
|
|
if (msg.error.err == EINTR &&
|
|
msg.head.msgh_size == sizeof msg.error)
|
|
{
|
|
/* EINTR response; poll for further responses
|
|
and then return quickly. */
|
|
err = EINTR;
|
|
goto poll;
|
|
}
|
|
if (msg.error.err ||
|
|
msg.head.msgh_size != sizeof msg.success ||
|
|
*(int *) &msg.success.result_type != *(int *) &inttype ||
|
|
(msg.success.result & SELECT_ALL) == 0)
|
|
{
|
|
/* Error or bogus reply. Simulate readiness. */
|
|
__mach_msg_destroy (&msg.head);
|
|
msg.success.result = SELECT_ALL;
|
|
}
|
|
|
|
/* Look up the respondent's reply port and record its
|
|
readiness. */
|
|
{
|
|
int had = got;
|
|
if (firstfd != -1)
|
|
for (i = firstfd; i <= lastfd; ++i)
|
|
if (d[i].type
|
|
&& d[i].reply_port == msg.head.msgh_local_port)
|
|
{
|
|
d[i].type &= msg.success.result;
|
|
d[i].type |= SELECT_RETURNED;
|
|
++got;
|
|
}
|
|
assert (got > had);
|
|
}
|
|
}
|
|
|
|
if (msg.head.msgh_remote_port != MACH_PORT_NULL)
|
|
__mach_port_deallocate (__mach_task_self (),
|
|
msg.head.msgh_remote_port);
|
|
|
|
if (got)
|
|
poll:
|
|
{
|
|
/* Poll for another message. */
|
|
to = 0;
|
|
options |= MACH_RCV_TIMEOUT;
|
|
}
|
|
}
|
|
|
|
if (err == MACH_RCV_TIMED_OUT)
|
|
/* This is the normal value for ERR. We might have timed out and
|
|
read no messages. Otherwise, after receiving the first message,
|
|
we poll for more messages. We receive with a timeout of 0 to
|
|
effect a poll, so ERR is MACH_RCV_TIMED_OUT when the poll finds no
|
|
message waiting. */
|
|
err = 0;
|
|
|
|
if (got)
|
|
/* At least one descriptor is known to be ready now, so we will
|
|
return success. */
|
|
err = 0;
|
|
}
|
|
|
|
if (firstfd != -1)
|
|
for (i = firstfd; i <= lastfd; ++i)
|
|
if (d[i].type)
|
|
__mach_port_destroy (__mach_task_self (), d[i].reply_port);
|
|
if (firstfd == -1 || (firstfd != lastfd && portset != MACH_PORT_NULL))
|
|
/* Destroy PORTSET, but only if it's not actually the reply port for a
|
|
single descriptor (in which case it's destroyed in the previous loop;
|
|
not doing it here is just a bit more efficient). */
|
|
__mach_port_destroy (__mach_task_self (), portset);
|
|
|
|
if (err)
|
|
return __hurd_fail (err);
|
|
|
|
/* Below we recalculate GOT to include an increment for each operation
|
|
allowed on each fd. */
|
|
got = 0;
|
|
|
|
/* Set the user bitarrays. We only ever have to clear bits, as all desired
|
|
ones are initially set. */
|
|
if (firstfd != -1)
|
|
for (i = firstfd; i <= lastfd; ++i)
|
|
{
|
|
int type = d[i].type;
|
|
|
|
if ((type & SELECT_RETURNED) == 0)
|
|
type = 0;
|
|
|
|
if (type & SELECT_READ)
|
|
got++;
|
|
else if (readfds)
|
|
FD_CLR (i, readfds);
|
|
if (type & SELECT_WRITE)
|
|
got++;
|
|
else if (writefds)
|
|
FD_CLR (i, writefds);
|
|
if (type & SELECT_URG)
|
|
got++;
|
|
else if (exceptfds)
|
|
FD_CLR (i, exceptfds);
|
|
}
|
|
|
|
return got;
|
|
}
|
|
|
|
weak_alias (__select, select)
|