From bf7c04cd5f4b3a7d3e3155b0035396e7f1037a13 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 10 Dec 2004 00:41:30 +0000 Subject: Update. 2004-12-01 Jakub Jelinek * posix/tst-regex.c: Use defined _POSIX_CPUTIME && _POSIX_CPUTIME >= 0 conditionals instead of defined _POSIX_CPUTIME. (main): If _POSIX_CPUTIME == 0, call sysconf to see if CPUTIME option is available. * posix/tst-regex.c2: Use defined _POSIX_CPUTIME && _POSIX_CPUTIME >= 0 conditionals instead of defined _POSIX_CPUTIME. (do_test): If _POSIX_CPUTIME == 0, call sysconf to see if CPUTIME option is available. * sysdeps/posix/sysconf.c (__sysconf): If _POSIX_CPUTIME resp. _POSIX_THREAD_CPUTIME is defined to 0, return -1 for the corresponding _SC_ argument. --- linuxthreads/sysdeps/pthread/posix-timer.h | 8 +------- linuxthreads/sysdeps/pthread/timer_create.c | 19 +------------------ linuxthreads/sysdeps/pthread/timer_routines.c | 18 ------------------ 3 files changed, 2 insertions(+), 43 deletions(-) (limited to 'linuxthreads/sysdeps/pthread') diff --git a/linuxthreads/sysdeps/pthread/posix-timer.h b/linuxthreads/sysdeps/pthread/posix-timer.h index 6710291b9b..1b0a2b65e4 100644 --- a/linuxthreads/sysdeps/pthread/posix-timer.h +++ b/linuxthreads/sysdeps/pthread/posix-timer.h @@ -1,5 +1,5 @@ /* Definitions for POSIX timer implementation on top of LinuxThreads. - Copyright (C) 2000, 2002 Free Software Foundation, Inc. + Copyright (C) 2000, 2002, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Kaz Kylheku . @@ -85,12 +85,6 @@ extern int __timer_init_failed; /* A distinct thread is used for each clock type. */ extern struct thread_node __timer_signal_thread_rclk; -#ifdef _POSIX_CPUTIME -extern struct thread_node __timer_signal_thread_pclk; -#endif -#ifdef _POSIX_THREAD_CPUTIME -extern struct thread_node __timer_signal_thread_tclk; -#endif /* Return pointer to timer structure corresponding to ID. */ diff --git a/linuxthreads/sysdeps/pthread/timer_create.c b/linuxthreads/sysdeps/pthread/timer_create.c index 3fde4c74c9..7f7e886c83 100644 --- a/linuxthreads/sysdeps/pthread/timer_create.c +++ b/linuxthreads/sysdeps/pthread/timer_create.c @@ -94,24 +94,7 @@ timer_create (clock_id, evp, timerid) case SIGEV_SIGNAL: /* We have a global thread for delivering timed signals. If it is not running, try to start it up. */ - switch (clock_id) - { - case CLOCK_REALTIME: - default: - thread = &__timer_signal_thread_rclk; - break; -#ifdef _POSIX_CPUTIME - case CLOCK_PROCESS_CPUTIME_ID: - thread = &__timer_signal_thread_pclk; - break; -#endif -#ifdef _POSIX_THREAD_CPUTIME - case CLOCK_THREAD_CPUTIME_ID: - thread = &__timer_signal_thread_tclk; - break; -#endif - } - + thread = &__timer_signal_thread_rclk; if (! thread->exists) { if (__builtin_expect (__timer_thread_start (thread), diff --git a/linuxthreads/sysdeps/pthread/timer_routines.c b/linuxthreads/sysdeps/pthread/timer_routines.c index 6e3797d0b5..3877b86fbb 100644 --- a/linuxthreads/sysdeps/pthread/timer_routines.c +++ b/linuxthreads/sysdeps/pthread/timer_routines.c @@ -52,12 +52,6 @@ int __timer_init_failed; /* Node for the thread used to deliver signals. */ struct thread_node __timer_signal_thread_rclk; -#ifdef _POSIX_CPUTIME -struct thread_node __timer_signal_thread_pclk; -#endif -#ifdef _POSIX_THREAD_CPUTIME -struct thread_node __timer_signal_thread_tclk; -#endif /* Lists to keep free and used timers and threads. */ struct list_links timer_free_list; @@ -190,12 +184,6 @@ init_module (void) list_append (&thread_free_list, &thread_array[i].links); thread_init (&__timer_signal_thread_rclk, 0, CLOCK_REALTIME); -#ifdef _POSIX_CPUTIME - thread_init (&__timer_signal_thread_pclk, 0, CLOCK_PROCESS_CPUTIME_ID); -#endif -#ifdef _POSIX_THREAD_CPUTIME - thread_init (&__timer_signal_thread_tclk, 0, CLOCK_THREAD_CPUTIME_ID); -#endif } @@ -280,12 +268,6 @@ thread_cleanup (void *val) /* How did the signal thread get killed? */ assert (thread != &__timer_signal_thread_rclk); -#ifdef _POSIX_CPUTIME - assert (thread != &__timer_signal_thread_pclk); -#endif -#ifdef _POSIX_THREAD_CPUTIME - assert (thread != &__timer_signal_thread_tclk); -#endif pthread_mutex_lock (&__timer_mutex); -- cgit v1.2.3