mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-22 13:00:06 +00:00
ce7eb0e903
This patch wraps all uses of *_{enable,disable}_asynccancel and
and *_CANCEL_{ASYNC,RESET} in either already provided macros
(lll_futex_timed_wait_cancel) or creates new ones if the
functionality is not provided (SYSCALL_CANCEL_NCS, lll_futex_wait_cancel,
and lll_futex_timed_wait_cancel).
Also for some generic implementations, the direct call of the macros
are removed since the underlying symbols are suppose to provide
cancellation support.
This is a priliminary patch intended to simplify the work required
for BZ#12683 fix. It is a refactor change, no semantic changes are
expected.
Checked on x86_64-linux-gnu and i686-linux-gnu.
* nptl/pthread_join_common.c (__pthread_timedjoin_ex): Use
lll_wait_tid with timeout.
* nptl/sem_wait.c (__old_sem_wait): Use lll_futex_wait_cancel.
* sysdeps/nptl/aio_misc.h (AIO_MISC_WAIT): Use
futex_reltimed_wait_cancelable for cancelabla mode.
* sysdeps/nptl/gai_misc.h (GAI_MISC_WAIT): Likewise.
* sysdeps/posix/open64.c (__libc_open64): Do not call cancelation
macros.
* sysdeps/posix/sigwait.c (__sigwait): Likewise.
* sysdeps/posix/waitid.c (__sigwait): Likewise.
* sysdeps/unix/sysdep.h (__SYSCALL_CANCEL_CALL,
SYSCALL_CANCEL_NCS): New macro.
* sysdeps/nptl/lowlevellock.h (lll_wait_tid): Add timeout argument.
(lll_timedwait_tid): Remove macro.
* sysdeps/unix/sysv/linux/i386/lowlevellock.h (lll_wait_tid):
Likewise.
(lll_timedwait_tid): Likewise.
* sysdeps/unix/sysv/linux/sparc/lowlevellock.h (lll_wait_tid):
Likewise.
(lll_timedwait_tid): Likewise.
* sysdeps/unix/sysv/linux/x86_64/lowlevellock.h (lll_wait_tid):
Likewise.
(lll_timedwait_tid): Likewise.
* sysdeps/unix/sysv/linux/clock_nanosleep.c (__clock_nanosleep):
Use INTERNAL_SYSCALL_CANCEL.
* sysdeps/unix/sysv/linux/futex-internal.h
(futex_reltimed_wait_cancelable): Use LIBC_CANCEL_{ASYNC,RESET}
instead of __pthread_{enable,disable}_asynccancel.
* sysdeps/unix/sysv/linux/lowlevellock-futex.h
(lll_futex_wait_cancel): New macro.
72 lines
2.6 KiB
C
72 lines
2.6 KiB
C
/* Copyright (C) 2006-2019 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 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
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
/* We define a special synchronization primitive for AIO. POSIX
|
|
conditional variables would be ideal but the pthread_cond_*wait
|
|
operations do not return on EINTR. This is a requirement for
|
|
correct aio_suspend and lio_listio implementations. */
|
|
|
|
#include <assert.h>
|
|
#include <nptl/pthreadP.h>
|
|
#include <futex-internal.h>
|
|
|
|
#define DONT_NEED_AIO_MISC_COND 1
|
|
|
|
#define AIO_MISC_NOTIFY(waitlist) \
|
|
do { \
|
|
if (*waitlist->counterp > 0 && --*waitlist->counterp == 0) \
|
|
futex_wake ((unsigned int *) waitlist->counterp, 1, FUTEX_PRIVATE); \
|
|
} while (0)
|
|
|
|
#define AIO_MISC_WAIT(result, futex, timeout, cancel) \
|
|
do { \
|
|
volatile unsigned int *futexaddr = &futex; \
|
|
unsigned int oldval = futex; \
|
|
\
|
|
if (oldval != 0) \
|
|
{ \
|
|
pthread_mutex_unlock (&__aio_requests_mutex); \
|
|
\
|
|
int status; \
|
|
do \
|
|
{ \
|
|
if (cancel) \
|
|
status = futex_reltimed_wait_cancelable ( \
|
|
(unsigned int *) futexaddr, oldval, timeout, FUTEX_PRIVATE); \
|
|
else \
|
|
status = futex_reltimed_wait ((unsigned int *) futexaddr, \
|
|
oldval, timeout, FUTEX_PRIVATE); \
|
|
if (status != EAGAIN) \
|
|
break; \
|
|
\
|
|
oldval = *futexaddr; \
|
|
} \
|
|
while (oldval != 0); \
|
|
\
|
|
if (status == EINTR) \
|
|
result = EINTR; \
|
|
else if (status == ETIMEDOUT) \
|
|
result = EAGAIN; \
|
|
else \
|
|
assert (status == 0 || status == EAGAIN); \
|
|
\
|
|
pthread_mutex_lock (&__aio_requests_mutex); \
|
|
} \
|
|
} while (0)
|
|
|
|
#include_next <aio_misc.h>
|