diff options
author | Ulrich Drepper <drepper@redhat.com> | 2003-03-28 06:27:21 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 2003-03-28 06:27:21 +0000 |
commit | 5f5004df21cecd0f842ba6ac5610a8f3f9fd9413 (patch) | |
tree | da43b7f57a0f7086cb42cd0f81b9341c02966e93 /nptl/sysdeps/unix/sysv/linux/timer_routines.c | |
parent | f07d234541c487e2e14ba83b03571179b4e32b1a (diff) | |
download | glibc-5f5004df21cecd0f842ba6ac5610a8f3f9fd9413.tar.gz glibc-5f5004df21cecd0f842ba6ac5610a8f3f9fd9413.tar.xz glibc-5f5004df21cecd0f842ba6ac5610a8f3f9fd9413.zip |
Update.
* sysdeps/unix/sysv/linux/kernel-posix-timers.h: Don't declare __timer_helper_thread. Declare __start_helper_thread, __helper_once, and __helper_tid. (struct timer): Remove th and bar field. * sysdeps/unix/sysv/linux/timer_create.c (timer_create): Remove debugging code. Create only one helper thread. * sysdeps/unix/sysv/linux/timer_delete.c (timer_delete): Don't kill helper thread. * sysdeps/unix/sysv/linux/timer_routines.c (timer_helper_thread): Renamed. Define statically. Use thread info from siginfo. (__helper_once): New variable. (__helper_tid): New variable. (__reset_helper_control): New function. (__start_helper_thread): New function.
Diffstat (limited to 'nptl/sysdeps/unix/sysv/linux/timer_routines.c')
-rw-r--r-- | nptl/sysdeps/unix/sysv/linux/timer_routines.c | 70 |
1 files changed, 53 insertions, 17 deletions
diff --git a/nptl/sysdeps/unix/sysv/linux/timer_routines.c b/nptl/sysdeps/unix/sysv/linux/timer_routines.c index 3f69aa64fd..e9ece9f488 100644 --- a/nptl/sysdeps/unix/sysv/linux/timer_routines.c +++ b/nptl/sysdeps/unix/sysv/linux/timer_routines.c @@ -22,6 +22,7 @@ #include <stdbool.h> #include <sysdep.h> #include <kernel-features.h> +#include <nptl/pthreadP.h> #include "kernel-posix-timers.h" @@ -40,24 +41,14 @@ timer_sigev_thread (void *arg) /* Helper function to support starting threads for SIGEV_THREAD. */ -void * -attribute_hidden -__timer_helper_thread (void *arg) +static void * +timer_helper_thread (void *arg) { - /* Block all signals. */ + /* Block all signals. We will only wait for the signal the kernel + will send. */ sigset_t ss; - - sigfillset (&ss); - (void) pthread_sigmask (SIG_BLOCK, &ss, NULL); - - struct timer *tk = (struct timer *) arg; - - /* Synchronize with the parent. */ - (void) pthread_barrier_wait (&tk->bar); - - /* We will only wait for the signal the kernel will send. */ sigemptyset (&ss); - sigaddset (&ss, TIMER_SIG); + sigaddset (&ss, SIGTIMER); /* Endless loop of waiting for signals. The loop is only ended when the thread is canceled. */ @@ -65,15 +56,60 @@ __timer_helper_thread (void *arg) { siginfo_t si; - if (sigwaitinfo (&ss, &si) > 0 && si.si_timerid == tk->ktimerid) + if (sigwaitinfo (&ss, &si) > 0 && si.si_code == SI_TIMER) { + + struct timer *tk = (struct timer *) si.si_ptr; + /* That the signal we are waiting for. */ pthread_t th; - (void) pthread_create (&th, &tk->attr, timer_sigev_thread, arg); + (void) pthread_create (&th, &tk->attr, timer_sigev_thread, tk); } } } + +/* Control variable for helper thread creation. */ +pthread_once_t __helper_once attribute_hidden; + + +/* TID of the helper thread. */ +pid_t __helper_tid attribute_hidden; + + +/* Reset variables so that after a fork a new helper thread gets started. */ +static void +reset_helper_control (void) +{ + __helper_once = PTHREAD_ONCE_INIT; + __helper_tid = 0; +} + + +void +attribute_hidden +__start_helper_thread (void) +{ + /* The helper thread needs only very little resources + and should go away automatically when canceled. */ + pthread_attr_t attr; + (void) pthread_attr_init (&attr); + (void) pthread_attr_setstacksize (&attr, PTHREAD_STACK_MIN); + + /* Create the helper thread for this timer. */ + pthread_t th; + int res = pthread_create (&th, &attr, timer_helper_thread, NULL); + if (res == 0) + /* We managed to start the helper thread. */ + __helper_tid = ((struct pthread *) th)->tid; + + /* No need for the attribute anymore. */ + (void) pthread_attr_destroy (&attr); + + /* We have to make sure that after fork()ing a new helper thread can + be created. */ + pthread_atfork (NULL, NULL, reset_helper_control); +} #endif #ifndef __ASSUME_POSIX_TIMERS |