diff options
Diffstat (limited to 'lib/libpthread/uthread/uthread_detach.c')
| -rw-r--r-- | lib/libpthread/uthread/uthread_detach.c | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/lib/libpthread/uthread/uthread_detach.c b/lib/libpthread/uthread/uthread_detach.c index cb51ff0e43d..181f73b942f 100644 --- a/lib/libpthread/uthread/uthread_detach.c +++ b/lib/libpthread/uthread/uthread_detach.c @@ -1,3 +1,4 @@ +/* $OpenBSD: uthread_detach.c,v 1.5 1999/11/25 07:01:33 d Exp $ */ /* * Copyright (c) 1995 John Birrell <jb@cimlogic.com.au>. * All rights reserved. @@ -20,7 +21,7 @@ * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) @@ -29,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $OpenBSD: uthread_detach.c,v 1.4 1999/05/26 00:18:23 d Exp $ + * $FreeBSD: uthread_detach.c,v 1.10 1999/08/28 00:03:28 peter Exp $ */ #include <errno.h> #ifdef _THREAD_SAFE @@ -40,6 +41,7 @@ int pthread_detach(pthread_t pthread) { int rval = 0; + int status; pthread_t next_thread; /* Check for invalid calling parameters: */ @@ -53,23 +55,25 @@ pthread_detach(pthread_t pthread) pthread->attr.flags |= PTHREAD_DETACHED; /* - * Guard against preemption by a scheduling signal. - * A change of thread state modifies the waiting - * and priority queues. + * Defer signals to protect the scheduling queues from + * access by the signal handler: */ - _thread_kern_sched_defer(); + _thread_kern_sig_defer(); /* Enter a loop to bring all threads off the join queue: */ - while ((next_thread = _thread_queue_deq(&pthread->join_queue)) != NULL) { + while ((next_thread = TAILQ_FIRST(&pthread->join_queue)) != NULL) { + /* Remove the thread from the queue: */ + TAILQ_REMOVE(&pthread->join_queue, next_thread, qe); + /* Make the thread run: */ PTHREAD_NEW_STATE(next_thread,PS_RUNNING); } /* - * Reenable preemption and yield if a scheduling signal - * occurred while in the critical region. + * Undefer and handle pending signals, yielding if a + * scheduling signal occurred while in the critical region. */ - _thread_kern_sched_undefer(); + _thread_kern_sig_undefer(); } else /* Return an error: */ rval = EINVAL; |