| thr_detach.c (115260) | thr_detach.c (115693) |
|---|---|
| 1/* 2 * Copyright (c) 1995 John Birrell <jb@cimlogic.com.au>. 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 15 unchanged lines hidden (view full) --- 24 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 25 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 26 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 27 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 28 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 30 * SUCH DAMAGE. 31 * | 1/* 2 * Copyright (c) 1995 John Birrell <jb@cimlogic.com.au>. 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 15 unchanged lines hidden (view full) --- 24 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 25 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 26 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 27 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 28 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 30 * SUCH DAMAGE. 31 * |
| 32 * $FreeBSD: head/lib/libthr/thread/thr_detach.c 115260 2003-05-23 09:48:20Z mtm $ | 32 * $FreeBSD: head/lib/libthr/thread/thr_detach.c 115693 2003-06-02 11:01:00Z mtm $ |
| 33 */ 34#include <errno.h> 35#include <pthread.h> 36#include <stdlib.h> 37#include "thr_private.h" 38 39__weak_reference(_pthread_detach, pthread_detach); 40 41int 42_pthread_detach(pthread_t pthread) 43{ 44 if (pthread == NULL || pthread->magic != PTHREAD_MAGIC) 45 return (EINVAL); 46 | 33 */ 34#include <errno.h> 35#include <pthread.h> 36#include <stdlib.h> 37#include "thr_private.h" 38 39__weak_reference(_pthread_detach, pthread_detach); 40 41int 42_pthread_detach(pthread_t pthread) 43{ 44 if (pthread == NULL || pthread->magic != PTHREAD_MAGIC) 45 return (EINVAL); 46 |
| 47 if (pthread->attr.flags & PTHREAD_DETACHED) | 47 _SPINLOCK(&pthread->lock); 48 49 if (pthread->attr.flags & PTHREAD_DETACHED) { 50 _SPINUNLOCK(&pthread->lock); |
| 48 return (EINVAL); | 51 return (EINVAL); |
| 52 } |
|
| 49 50 pthread->attr.flags |= PTHREAD_DETACHED; 51 | 53 54 pthread->attr.flags |= PTHREAD_DETACHED; 55 |
| 52 /* 53 * Defer signals to protect the scheduling queues from 54 * access by the signal handler: 55 */ 56 GIANT_LOCK(curthread); 57 | |
| 58 /* Check if there is a joiner: */ 59 if (pthread->joiner != NULL) { 60 struct pthread *joiner = pthread->joiner; | 56 /* Check if there is a joiner: */ 57 if (pthread->joiner != NULL) { 58 struct pthread *joiner = pthread->joiner; |
| 59 _thread_critical_enter(joiner); |
|
| 61 62 /* Make the thread runnable: */ 63 PTHREAD_NEW_STATE(joiner, PS_RUNNING); 64 65 /* Set the return value for the woken thread: */ 66 joiner->join_status.error = ESRCH; 67 joiner->join_status.ret = NULL; 68 joiner->join_status.thread = NULL; 69 70 /* 71 * Disconnect the joiner from the thread being detached: 72 */ 73 pthread->joiner = NULL; | 60 61 /* Make the thread runnable: */ 62 PTHREAD_NEW_STATE(joiner, PS_RUNNING); 63 64 /* Set the return value for the woken thread: */ 65 joiner->join_status.error = ESRCH; 66 joiner->join_status.ret = NULL; 67 joiner->join_status.thread = NULL; 68 69 /* 70 * Disconnect the joiner from the thread being detached: 71 */ 72 pthread->joiner = NULL; |
| 73 _thread_critical_exit(joiner); |
|
| 74 } 75 | 74 } 75 |
| 76 GIANT_UNLOCK(curthread); | 76 _SPINUNLOCK(&pthread->lock); |
| 77 78 return (0); 79} | 77 78 return (0); 79} |