mirror of
git://sourceware.org/git/glibc.git
synced 2024-12-15 04:20:28 +08: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
69 lines
2.0 KiB
C
69 lines
2.0 KiB
C
/* Copyright (C) 2000-2019 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Kaz Kylheku <kaz@ashi.footprints.net>.
|
|
|
|
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; see the file COPYING.LIB. If
|
|
not, see <https://www.gnu.org/licenses/>. */
|
|
|
|
#include <assert.h>
|
|
#include <errno.h>
|
|
#include <pthread.h>
|
|
#include <time.h>
|
|
|
|
#include "posix-timer.h"
|
|
|
|
|
|
/* Delete timer TIMERID. */
|
|
int
|
|
timer_delete (timer_t timerid)
|
|
{
|
|
struct timer_node *timer;
|
|
int retval = -1;
|
|
|
|
pthread_mutex_lock (&__timer_mutex);
|
|
|
|
timer = timer_id2ptr (timerid);
|
|
if (! timer_valid (timer))
|
|
/* Invalid timer ID or the timer is not in use. */
|
|
__set_errno (EINVAL);
|
|
else
|
|
{
|
|
if (timer->armed && timer->thread != NULL)
|
|
{
|
|
struct thread_node *thread = timer->thread;
|
|
assert (thread != NULL);
|
|
|
|
/* If thread is cancelled while waiting for handler to terminate,
|
|
the mutex is unlocked and timer_delete is aborted. */
|
|
pthread_cleanup_push (__timer_mutex_cancel_handler, &__timer_mutex);
|
|
|
|
/* If timer is currently being serviced, wait for it to finish. */
|
|
while (thread->current_timer == timer)
|
|
pthread_cond_wait (&thread->cond, &__timer_mutex);
|
|
|
|
pthread_cleanup_pop (0);
|
|
}
|
|
|
|
/* Remove timer from whatever queue it may be on and deallocate it. */
|
|
timer->inuse = TIMER_DELETED;
|
|
list_unlink_ip (&timer->links);
|
|
timer_delref (timer);
|
|
retval = 0;
|
|
}
|
|
|
|
pthread_mutex_unlock (&__timer_mutex);
|
|
|
|
return retval;
|
|
}
|