mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-01 17:30:07 +00:00
5a82c74822
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
95 lines
2.8 KiB
C
95 lines
2.8 KiB
C
/* Copyright (C) 2002-2019 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
|
|
|
|
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
|
|
<https://www.gnu.org/licenses/>. */
|
|
|
|
#include "pthreadP.h"
|
|
|
|
|
|
void
|
|
_pthread_cleanup_push_defer (struct _pthread_cleanup_buffer *buffer,
|
|
void (*routine) (void *), void *arg)
|
|
{
|
|
struct pthread *self = THREAD_SELF;
|
|
|
|
buffer->__routine = routine;
|
|
buffer->__arg = arg;
|
|
buffer->__prev = THREAD_GETMEM (self, cleanup);
|
|
|
|
int cancelhandling = THREAD_GETMEM (self, cancelhandling);
|
|
|
|
/* Disable asynchronous cancellation for now. */
|
|
if (__glibc_unlikely (cancelhandling & CANCELTYPE_BITMASK))
|
|
while (1)
|
|
{
|
|
int curval = THREAD_ATOMIC_CMPXCHG_VAL (self, cancelhandling,
|
|
cancelhandling
|
|
& ~CANCELTYPE_BITMASK,
|
|
cancelhandling);
|
|
if (__glibc_likely (curval == cancelhandling))
|
|
/* Successfully replaced the value. */
|
|
break;
|
|
|
|
/* Prepare for the next round. */
|
|
cancelhandling = curval;
|
|
}
|
|
|
|
buffer->__canceltype = (cancelhandling & CANCELTYPE_BITMASK
|
|
? PTHREAD_CANCEL_ASYNCHRONOUS
|
|
: PTHREAD_CANCEL_DEFERRED);
|
|
|
|
THREAD_SETMEM (self, cleanup, buffer);
|
|
}
|
|
strong_alias (_pthread_cleanup_push_defer, __pthread_cleanup_push_defer)
|
|
|
|
|
|
void
|
|
_pthread_cleanup_pop_restore (struct _pthread_cleanup_buffer *buffer,
|
|
int execute)
|
|
{
|
|
struct pthread *self = THREAD_SELF;
|
|
|
|
THREAD_SETMEM (self, cleanup, buffer->__prev);
|
|
|
|
int cancelhandling;
|
|
if (__builtin_expect (buffer->__canceltype != PTHREAD_CANCEL_DEFERRED, 0)
|
|
&& ((cancelhandling = THREAD_GETMEM (self, cancelhandling))
|
|
& CANCELTYPE_BITMASK) == 0)
|
|
{
|
|
while (1)
|
|
{
|
|
int curval = THREAD_ATOMIC_CMPXCHG_VAL (self, cancelhandling,
|
|
cancelhandling
|
|
| CANCELTYPE_BITMASK,
|
|
cancelhandling);
|
|
if (__glibc_likely (curval == cancelhandling))
|
|
/* Successfully replaced the value. */
|
|
break;
|
|
|
|
/* Prepare for the next round. */
|
|
cancelhandling = curval;
|
|
}
|
|
|
|
CANCELLATION_P (self);
|
|
}
|
|
|
|
/* If necessary call the cleanup routine after we removed the
|
|
current cleanup block from the list. */
|
|
if (execute)
|
|
buffer->__routine (buffer->__arg);
|
|
}
|
|
strong_alias (_pthread_cleanup_pop_restore, __pthread_cleanup_pop_restore)
|