mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
7752137a6a
* sysdeps/mach/hurd/mmap.c: Fix inverted test of MAP_FIXED. * stdio/vfscanf.c (number): Allow field width to inhibit first digit after base detection. * stdio/vfprintf.c (vfprintf: %s): Never search past the limit specified by the precision. * grp/grpread.c (__grpscan): New function. * grp/grp.h (__grpscan): Declare it. * grp/getgrgid.c: Use __grpscan. * grp/getgrnam.c: Likewise. * pwd/pwdread.c (__pwdscan): New function. * pwd/pwd.h (__pwdscan): Declare it. * pwd/getpwnam.c: Use __pwdscan. * pwd/getpwuid.c: Likewise. Thu Aug 24 16:29:40 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu> * sysdeps/mach/hurd/mmap.c: Treat (FLAGS & MAP_TYPE) == 0 like MAP_FILE. * hurd/thread-cancel.c: Return EINTR when called on self. * sysdeps/i386/elf/start.S (data_start): Define as weak alias for __data_start.
95 lines
2.6 KiB
C
95 lines
2.6 KiB
C
/* Thread cancellation support.
|
|
Copyright (C) 1995 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 <hurd/signal.h>
|
|
#include <hurd/interrupt.h>
|
|
#include <assert.h>
|
|
#include <thread_state.h>
|
|
|
|
|
|
/* See hurdsig.c. */
|
|
extern mach_port_t _hurdsig_abort_rpcs (struct hurd_sigstate *ss,
|
|
int signo, int sigthread,
|
|
struct machine_thread_all_state *,
|
|
int *state_change,
|
|
mach_port_t *reply_port,
|
|
mach_msg_type_name_t reply_port_type,
|
|
int untraced);
|
|
|
|
error_t
|
|
hurd_thread_cancel (thread_t thread)
|
|
{
|
|
struct hurd_sigstate *ss = _hurd_thread_sigstate (thread);
|
|
struct machine_thread_all_state state;
|
|
int state_change;
|
|
error_t err;
|
|
|
|
if (! ss)
|
|
return EINVAL;
|
|
if (ss == _hurd_self_sigstate ())
|
|
return EINTR; /* Bozo. */
|
|
|
|
__spin_lock (&ss->lock);
|
|
assert (! ss->critical_section);
|
|
ss->critical_section = 1;
|
|
err = __thread_suspend (thread);
|
|
__spin_unlock (&ss->lock);
|
|
|
|
if (! err)
|
|
{
|
|
/* Set the flag telling the thread its operation is being cancelled. */
|
|
ss->cancel = 1;
|
|
|
|
/* Interrupt any interruptible RPC now in progress. */
|
|
state.set = 0;
|
|
_hurdsig_abort_rpcs (ss, 0, 0, &state, &state_change, NULL, 0, 0);
|
|
if (state_change)
|
|
err = __thread_set_state (thread, MACHINE_THREAD_STATE_FLAVOR,
|
|
(natural_t *) &state.basic,
|
|
MACHINE_THREAD_STATE_COUNT);
|
|
|
|
if (ss->cancel_hook)
|
|
/* The code being cancelled has a special wakeup function.
|
|
Calling this should make the thread wake up and check the
|
|
cancellation flag. */
|
|
(*ss->cancel_hook) ();
|
|
|
|
__thread_resume (thread);
|
|
}
|
|
|
|
_hurd_critical_section_unlock (ss);
|
|
return err;
|
|
}
|
|
|
|
|
|
int
|
|
hurd_check_cancel (void)
|
|
{
|
|
struct hurd_sigstate *ss = _hurd_self_sigstate ();
|
|
int cancel;
|
|
|
|
__spin_lock (&ss->lock);
|
|
assert (! ss->critical_section);
|
|
cancel = ss->cancel;
|
|
ss->cancel = 0;
|
|
__spin_unlock (&ss->lock);
|
|
|
|
return cancel;
|
|
}
|