mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-21 18:30:05 +00:00
8f0c527e13
* hurd/hurd-raise.c (_hurd_raise_signal): Pass sigcode in msg_sig_post rpc. * hurd/hurdmsg.c (_S_msg_set_environment): Use argz.h functions instead of _hurd_split_args. (_S_msg_*_exec_flags): Functions removed. (_S_msg_startup_dosync): Stub removed. Sat May 4 02:11:55 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu> * sysdeps/mach/hurd/ptrace.c: Set _hurdsig_traced instead of EXEC_TRACED bit in _hurd_exec_flags. Pass sigcode arg in msg_sig_post_untraced rpc. * sysdeps/mach/hurd/access.c: Don't pass io port in auth_user_authenticate rpc. * posix/sched.h: Fix typos. * sysdeps/mach/hurd/fork.c: Use new critical section lock. Clear _hurdsig_traced instead of EXEC_TRACED. * sysdeps/stub/nanosleep.c (nanosleep): Fix typo. * wcsmbs/wcstol.c: Find strtol.c in ../stdlib. * wcsmbs/wcstof.c: Find strtod.c in ../stdlib. * wcsmbs/wcstod.c: Likewise. * wcsmbs/wcstold.c: Likewise. * wcsmbs/wcwidth.h: Find cname-lookup.h in ../wctype. * string/envz.c (envz_entry): Use const. (envz_get, envz_remove): Likewise. (envz_entry): Return char *, not const char *. * string/envz.h: Fix decl. * string/argz-create.c: Use const in prototype. * string/argz-next.c: Likewise. * sysdeps/mach/hurd/sigprocmask.c: Pass sigcode arg to msg_sig_post. * sysdeps/mach/hurd/i386/sigreturn.c: Likewise. * sysdeps/mach/hurd/sigsuspend.c: Likewise. * sysdeps/mach/hurd/kill.c: Likewise. * hurd/hurdexec.c (_hurd_exec): Use new critical section lock. * hurd/catch-exc.c (_S_catch_exception_raise): Likewise. * hurd/sigunwind.c (_hurdsig_longjmp_from_handler): Likewise. * hurd/thread-cancel.c (hurd_thread_cancel, hurd_check_cancel): Likewise. * sysdeps/mach/hurd/jmp-unwind.c (_longjmp_unwind): Likewise. * sysdeps/mach/hurd/sigaction.c: Likewise. * sysdeps/mach/hurd/errnos.awk: Don't use ARGV in comment; it can change meaninglessly. * hurd/hurd/signal.h (struct hurd_sigstate): Replace critical section flag with a spin lock. (_hurd_critical_section_lock): Use spin_try_lock on that to see if we get it. No need to take SS->lock at all. (_hurd_critical_section_unlock): Unlock SS->critical_section_lock instead of clearing the old flag member. * hurd/hurdsig.c (_hurd_internal_post_signal): Use spin_lock_locked to test the critical section state. * hurd/hurdinit.c (_hurd_init): Set _hurdsig_traced from the intarray. * hurd/hurdkill.c (_hurd_sig_post): Pass 0 sigcode in msg_sig_post. * hurd/hurdsig.c (_hurd_internal_post_signal): Test _hurdsig_traced instead of testing (_hurd_exec_flags & EXEC_TRACED). (_S_msg_sig_post): Take sigcode arg and pass it through. (_S_msg_sig_post_untraced): Likewise. (reauth_proc): Don't pass proc port in auth_user_authenticate. * hurd/setauth.c (_hurd_setauth): Don't pass object ports in auth_user_authenticate RPCs, just the one-off rendezvous port. * hurd/dtable.c (reauth_dtable): Likewise. * hurd/hurdlookup.c (__hurd_file_name_lookup_retry): Likewise. * hurd/hurdexec.c (_hurd_exec): Pass 0 flags to file_exec. Pass sigcode arg to msg_sig_post. * string/argz.h (argz_create): Use const in prototype. * hurd/hurdinit.c (_hurd_proc_init): Test _hurdsig_traced instead of testing (_hurd_exec_flags & EXEC_TRACED). Pass sigcode arg to msg_sig_post. * hurd/hurd.h: Declare _hurdsig_traced. * string/argz.h (__argz_next): Cast ENTRY before returning it. * hurd/hurd/signal.h (_hurd_critical_section_unlock): Pass sigcode arg to msg_sig_post. * hurd/path-lookup.c: New file. * hurd/Makefile (routines): Add path-lookup. * hurd/hurd/lookup.h: Declare file_name_path_scan, hurd_file_name_path_lookup. * hurd/hurd.h: Declare file_name_path_lookup. * sysdeps/mach/hurd/select.c: The io_select rpc no longer has a TAG_ID argument. Instead, use a separate reply port for each RPC and put them all in a port set to wait for slow replies.
316 lines
8.7 KiB
C
316 lines
8.7 KiB
C
/* Copyright (C) 1991, 92, 93, 94, 95, 96 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., 675 Mass Ave,
|
|
Cambridge, MA 02139, USA. */
|
|
|
|
#include <ansidecl.h>
|
|
#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
|
|
DEFUN(__select, (nfds, readfds, writefds, exceptfds, timeout),
|
|
int nfds AND fd_set *readfds AND fd_set *writefds AND
|
|
fd_set *exceptfds AND 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. */
|
|
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 for each but the last. */
|
|
(i == lastfd && got == 0) ? to : 0,
|
|
&type);
|
|
switch (err)
|
|
{
|
|
case MACH_RCV_TIMED_OUT:
|
|
/* No immediate response. This is normal. */
|
|
err = 0;
|
|
if (got == 0)
|
|
{
|
|
/* 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_32, 32, 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);
|
|
msg.success.result = SELECT_ALL;
|
|
}
|
|
|
|
/* Look up the respondant's reply port and record its
|
|
readiness. */
|
|
{
|
|
int had = got;
|
|
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;
|
|
}
|
|
|
|
for (i = firstfd; i <= lastfd; ++i)
|
|
if (d[i].type)
|
|
__mach_port_destroy (__mach_task_self (), d[i].reply_port);
|
|
if (portset != MACH_PORT_NULL)
|
|
__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. */
|
|
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)
|