From 38161ac76efe4c50f13e244903a44645023fec83 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 14 Jun 2000 06:13:45 +0000 Subject: Update. 2000-06-13 Kaz Kylheku A few optimizations. Got rid of unnecessary wakeups of timer threads, tightened up some critical regions and micro-optimized some list manipulation code. * sysdeps/pthread/timer_routines.c (__timer_thread_queue_timer): Returns int value now to indicate whether timer was queued at head. * sysdeps/pthread/posix-timer.h: Likewise. * sysdeps/pthread/timer_settime.c (timer_settime): Takes advantage of new return value from __timer_thread_queue_timer to avoid waking up timer thread unnecessarily. * sysdeps/pthread/posix-timer.h (timer_id2ptr): No longer checks inuse flag, because this requires mutex to be held. Callers updated to do the check when they have the mutex. * sysdeps/pthread/timer_getoverr.c: Add check for inuse here. * sysdeps/pthread/timer_settime.c (timer_settime): Tighter critical regions: avoids making system calls while holding timer mutex, and a few computations were moved outside of the mutex as well. * sysdeps/pthread/timer_gettime.c (timer_gettime): Likewise. * sysdeps/pthread/posix-timer.h (list_unlink_ip): Function name changed to list_unlink_ip, meaning idempotent. Pointer manipulation changed to get better better code out of gcc. * sysdeps/pthread/timer_routines.c (list_unlink): Non-idempotent version of list_unlink added here. * sysdeps/pthread/timer_delete.c: Use appropriate list unlink function in all places: idempotent one for timers, non-idempotent one for thread nodes. * sysdeps/pthread/timer_settime: Likewise. * sysdeps/pthread/timer_routines.c: Likewise. --- linuxthreads/sysdeps/pthread/timer_delete.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'linuxthreads/sysdeps/pthread/timer_delete.c') diff --git a/linuxthreads/sysdeps/pthread/timer_delete.c b/linuxthreads/sysdeps/pthread/timer_delete.c index 9e83ae1ab7..4636bf707a 100644 --- a/linuxthreads/sysdeps/pthread/timer_delete.c +++ b/linuxthreads/sysdeps/pthread/timer_delete.c @@ -36,7 +36,7 @@ timer_delete (timerid) pthread_mutex_lock (&__timer_mutex); timer = timer_id2ptr (timerid); - if (timer == NULL) + if (timer == NULL || !timer->inuse) /* Invalid timer ID or the timer is not in use. */ errno = EINVAL; else @@ -58,7 +58,7 @@ timer_delete (timerid) } /* Remove timer from whatever queue it may be on and deallocate it. */ - list_unlink (&timer->links); + list_unlink_ip (&timer->links); __timer_dealloc (timer); retval = 0; } -- cgit 1.4.1