glibc/linuxthreads/sysdeps/pthread/timer_delete.c

71 lines
2.1 KiB
C
Raw Normal View History

/* Copyright (C) 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Kaz Kylheku <kaz@ashi.footprints.net>.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public License as
published by the Free Software Foundation; either version 2 of the
License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
You should have received a copy of the GNU Library General Public
License along with the GNU C Library; see the file COPYING.LIB. If not,
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
#include <assert.h>
#include <errno.h>
#include <pthread.h>
#include <time.h>
#include "posix-timer.h"
/* Delete timer TIMERID. */
int
timer_delete (timerid)
timer_t timerid;
{
struct timer_node *timer;
int retval = -1;
pthread_mutex_lock (&__timer_mutex);
timer = timer_id2ptr (timerid);
if (! timer_valid (timer))
/* Invalid timer ID or the timer is not in use. */
__set_errno (EINVAL);
else
{
if (timer->armed)
{
struct thread_node *thread = timer->thread;
assert (thread != NULL);
/* If thread is cancelled while waiting for handler to terminate,
the mutex is unlocked and timer_delete is aborted. */
pthread_cleanup_push (__timer_mutex_cancel_handler, &__timer_mutex);
/* If timer is currently being serviced, wait for it to finish. */
while (thread->current_timer == timer)
pthread_cond_wait (&thread->cond, &__timer_mutex);
pthread_cleanup_pop (0);
}
/* Remove timer from whatever queue it may be on and deallocate it. */
timer->inuse = TIMER_DELETED;
Update. 2000-06-13 Kaz Kylheku <kaz@ashi.footprints.net> 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.
2000-06-14 06:13:45 +00:00
list_unlink_ip (&timer->links);
timer_delref (timer);
retval = 0;
}
pthread_mutex_unlock (&__timer_mutex);
return retval;
}