581c785bf3
I used these shell commands: ../glibc/scripts/update-copyrights $PWD/../gnulib/build-aux/update-copyright (cd ../glibc && git commit -am"[this commit message]") and then ignored the output, which consisted lines saying "FOO: warning: copyright statement not found" for each of 7061 files FOO. I then removed trailing white space from math/tgmath.h, support/tst-support-open-dev-null-range.c, and sysdeps/x86_64/multiarch/strlen-vec.S, to work around the following obscure pre-commit check failure diagnostics from Savannah. I don't know why I run into these diagnostics whereas others evidently do not. remote: *** 912-#endif remote: *** 913: remote: *** 914- remote: *** error: lines with trailing whitespace found ... remote: *** error: sysdeps/unix/sysv/linux/statx_cp.c: trailing lines
97 lines
2.9 KiB
C
97 lines
2.9 KiB
C
/* Copyright (C) 2003-2022 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; see the file COPYING.LIB. If
|
|
not, see <https://www.gnu.org/licenses/>. */
|
|
|
|
#include <errno.h>
|
|
#include <stdlib.h>
|
|
#include <time.h>
|
|
#include <sysdep.h>
|
|
#include "kernel-posix-timers.h"
|
|
#include <pthreadP.h>
|
|
#include <shlib-compat.h>
|
|
|
|
int
|
|
___timer_delete (timer_t timerid)
|
|
{
|
|
kernel_timer_t ktimerid = timerid_to_kernel_timer (timerid);
|
|
int res = INLINE_SYSCALL_CALL (timer_delete, ktimerid);
|
|
|
|
if (res == 0)
|
|
{
|
|
if (timer_is_sigev_thread (timerid))
|
|
{
|
|
struct timer *kt = timerid_to_timer (timerid);
|
|
|
|
/* Remove the timer from the list. */
|
|
__pthread_mutex_lock (&__timer_active_sigev_thread_lock);
|
|
if (__timer_active_sigev_thread == kt)
|
|
__timer_active_sigev_thread = kt->next;
|
|
else
|
|
{
|
|
struct timer *prevp = __timer_active_sigev_thread;
|
|
while (prevp->next != NULL)
|
|
if (prevp->next == kt)
|
|
{
|
|
prevp->next = kt->next;
|
|
break;
|
|
}
|
|
else
|
|
prevp = prevp->next;
|
|
}
|
|
__pthread_mutex_unlock (&__timer_active_sigev_thread_lock);
|
|
|
|
free (kt);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
/* The kernel timer is not known or something else bad happened.
|
|
Return the error. */
|
|
return -1;
|
|
}
|
|
versioned_symbol (libc, ___timer_delete, timer_delete, GLIBC_2_34);
|
|
libc_hidden_ver (___timer_delete, __timer_delete)
|
|
|
|
#if TIMER_T_WAS_INT_COMPAT
|
|
# if OTHER_SHLIB_COMPAT (librt, GLIBC_2_3_3, GLIBC_2_34)
|
|
compat_symbol (librt, ___timer_delete, timer_delete, GLIBC_2_3_3);
|
|
#endif
|
|
|
|
# if OTHER_SHLIB_COMPAT (librt, GLIBC_2_2, GLIBC_2_3_3)
|
|
int
|
|
__timer_delete_old (int timerid)
|
|
{
|
|
int res = __timer_delete (__timer_compat_list[timerid]);
|
|
|
|
if (res == 0)
|
|
/* Successful timer deletion, now free the index. We only need to
|
|
store a word and that better be atomic. */
|
|
__timer_compat_list[timerid] = NULL;
|
|
|
|
return res;
|
|
}
|
|
compat_symbol (librt, __timer_delete_old, timer_delete, GLIBC_2_2);
|
|
# endif /* OTHER_SHLIB_COMPAT */
|
|
|
|
#else /* !TIMER_T_WAS_INT_COMPAT */
|
|
/* The transition from int to timer_t did not change ABI because the
|
|
type sizes are the same. */
|
|
# if OTHER_SHLIB_COMPAT (librt, GLIBC_2_2, GLIBC_2_34)
|
|
compat_symbol (librt, ___timer_delete, timer_delete, GLIBC_2_2);
|
|
# endif
|
|
#endif /* !TIMER_T_WAS_INT_COMPAT */
|