aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/unix/sysv/linux/timer_delete.c
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2021-06-25 10:51:31 +0200
committerFlorian Weimer <fweimer@redhat.com>2021-06-25 12:21:12 +0200
commit2c16cb88a6e5ace0fb7cedca86860ea7bde522a7 (patch)
tree8e7aa16a33590ccd27050ef3d3b00607b7f15751 /sysdeps/unix/sysv/linux/timer_delete.c
parent1a5a653be2f95d4d9485d08672dc5083c74c39d8 (diff)
downloadglibc-2c16cb88a6e5ace0fb7cedca86860ea7bde522a7.tar
glibc-2c16cb88a6e5ace0fb7cedca86860ea7bde522a7.tar.gz
glibc-2c16cb88a6e5ace0fb7cedca86860ea7bde522a7.tar.bz2
glibc-2c16cb88a6e5ace0fb7cedca86860ea7bde522a7.zip
Linux: Move timer helper routines from librt to libc
This adds several temporary GLIBC_PRIVATE exports. The symbol names are changed so that they all start with __timer_. It is now possible to invoke the fork handler directly, so pthread_atfork is no longer necessary. The associated error cannot happen anymore, and cancellation handling can be removed from the helper thread routine. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'sysdeps/unix/sysv/linux/timer_delete.c')
-rw-r--r--sysdeps/unix/sysv/linux/timer_delete.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sysdeps/unix/sysv/linux/timer_delete.c b/sysdeps/unix/sysv/linux/timer_delete.c
index 50aac8fc27..a7a183591e 100644
--- a/sysdeps/unix/sysv/linux/timer_delete.c
+++ b/sysdeps/unix/sysv/linux/timer_delete.c
@@ -42,12 +42,12 @@ timer_delete (timer_t timerid)
struct timer *kt = timerid_to_timer (timerid);
/* Remove the timer from the list. */
- pthread_mutex_lock (&__active_timer_sigev_thread_lock);
- if (__active_timer_sigev_thread == kt)
- __active_timer_sigev_thread = kt->next;
+ pthread_mutex_lock (&__timer_active_sigev_thread_lock);
+ if (__timer_active_sigev_thread == kt)
+ __timer_active_sigev_thread = kt->next;
else
{
- struct timer *prevp = __active_timer_sigev_thread;
+ struct timer *prevp = __timer_active_sigev_thread;
while (prevp->next != NULL)
if (prevp->next == kt)
{
@@ -57,7 +57,7 @@ timer_delete (timer_t timerid)
else
prevp = prevp->next;
}
- pthread_mutex_unlock (&__active_timer_sigev_thread_lock);
+ pthread_mutex_unlock (&__timer_active_sigev_thread_lock);
free (kt);
}