diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-10-02 20:22:32 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-10-02 20:22:32 +0200 |
| commit | d6a8ab3c9097ce211e9aa7780ddd31b4f62d380f (patch) | |
| tree | 4c6d2502fa5a75718ff0a2ad0e044637e8d59195 | |
| parent | 8e582543cbd9600e98875b0e9a1125ee7b94e8ad (diff) | |
| parent | 4817e7343b56fe83379a022bd46e5502490aca97 (diff) | |
Merge branch 't/timer_routines' into refs/top-bases/tschwinge/Roger_Whittaker
| -rw-r--r-- | sysdeps/pthread/timer_routines.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sysdeps/pthread/timer_routines.c b/sysdeps/pthread/timer_routines.c index e0f31156bf..7efe8f584f 100644 --- a/sysdeps/pthread/timer_routines.c +++ b/sysdeps/pthread/timer_routines.c @@ -29,7 +29,7 @@ #include <sys/syscall.h> #include "posix-timer.h" -#include <nptl/pthreadP.h> +//#include <nptl/pthreadP.h> /* Number of threads used. */ @@ -395,6 +395,9 @@ thread_func (void *arg) { timespec_add (&timer->expirytime, &timer->expirytime, &timer->value.it_interval); +#ifndef DELAYTIMER_MAX +#define DELAYTIMER_MAX INT_MAX +#endif if (timer->overrun_count < DELAYTIMER_MAX) ++timer->overrun_count; } @@ -481,7 +484,7 @@ __timer_thread_wakeup (struct thread_node *thread) pthread_cond_broadcast (&thread->cond); } - +#if 0 /* Compare two pthread_attr_t thread attributes for exact equality. Returns 1 if they are equal, otherwise zero if they are not equal or contain illegal values. This version is NPTL-specific for @@ -506,6 +509,7 @@ thread_attr_compare (const pthread_attr_t *left, const pthread_attr_t *right) && memcmp (ileft->cpuset, iright->cpuset, ileft->cpusetsize) == 0))); } +#endif /* Search the list of active threads and find one which has matching @@ -514,6 +518,7 @@ struct thread_node * __timer_thread_find_matching (const pthread_attr_t *desired_attr, clockid_t desired_clock_id) { +#if 0 struct list_head *iter = list_first (&thread_active_list); while (iter != list_null (&thread_active_list)) @@ -526,6 +531,7 @@ __timer_thread_find_matching (const pthread_attr_t *desired_attr, iter = list_next (iter); } +#endif return NULL; } |