2003-04-01 03:46:29 +00:00
|
|
|
/*
|
2005-12-17 09:42:45 +00:00
|
|
|
* Copyright (c) 2005, David Xu <davidxu@freebsd.org>
|
2003-04-01 03:46:29 +00:00
|
|
|
* All rights reserved.
|
|
|
|
|
*
|
|
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
|
* modification, are permitted provided that the following conditions
|
|
|
|
|
* are met:
|
|
|
|
|
* 1. Redistributions of source code must retain the above copyright
|
2005-12-17 09:42:45 +00:00
|
|
|
* notice unmodified, this list of conditions, and the following
|
|
|
|
|
* disclaimer.
|
2003-04-01 03:46:29 +00:00
|
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
|
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
|
|
|
* documentation and/or other materials provided with the distribution.
|
|
|
|
|
*
|
2005-12-17 09:42:45 +00:00
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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) HOWEVER CAUSED AND ON ANY
|
|
|
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
|
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
|
|
|
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
2003-04-01 03:46:29 +00:00
|
|
|
*
|
|
|
|
|
* $FreeBSD$
|
2005-12-17 09:42:45 +00:00
|
|
|
*
|
2003-04-01 03:46:29 +00:00
|
|
|
*/
|
2005-04-02 01:20:00 +00:00
|
|
|
|
2006-04-04 02:57:49 +00:00
|
|
|
#include "namespace.h"
|
2003-04-01 03:46:29 +00:00
|
|
|
#include <errno.h>
|
|
|
|
|
#include <pthread.h>
|
2006-04-04 02:57:49 +00:00
|
|
|
#include "un-namespace.h"
|
2005-04-02 01:20:00 +00:00
|
|
|
|
2003-04-01 03:46:29 +00:00
|
|
|
#include "thr_private.h"
|
|
|
|
|
|
2006-04-04 02:57:49 +00:00
|
|
|
int _pthread_timedjoin_np(pthread_t pthread, void **thread_return,
|
|
|
|
|
const struct timespec *abstime);
|
2005-10-04 06:15:25 +00:00
|
|
|
static int join_common(pthread_t, void **, const struct timespec *);
|
|
|
|
|
|
2003-04-01 03:46:29 +00:00
|
|
|
__weak_reference(_pthread_join, pthread_join);
|
2005-10-04 06:15:25 +00:00
|
|
|
__weak_reference(_pthread_timedjoin_np, pthread_timedjoin_np);
|
2003-04-01 03:46:29 +00:00
|
|
|
|
2005-04-02 01:20:00 +00:00
|
|
|
static void backout_join(void *arg)
|
|
|
|
|
{
|
|
|
|
|
struct pthread *curthread = _get_curthread();
|
|
|
|
|
struct pthread *pthread = (struct pthread *)arg;
|
|
|
|
|
|
|
|
|
|
THREAD_LIST_LOCK(curthread);
|
|
|
|
|
pthread->joiner = NULL;
|
|
|
|
|
THREAD_LIST_UNLOCK(curthread);
|
|
|
|
|
}
|
|
|
|
|
|
2003-04-01 03:46:29 +00:00
|
|
|
int
|
|
|
|
|
_pthread_join(pthread_t pthread, void **thread_return)
|
2005-10-04 06:15:25 +00:00
|
|
|
{
|
|
|
|
|
return (join_common(pthread, thread_return, NULL));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
_pthread_timedjoin_np(pthread_t pthread, void **thread_return,
|
|
|
|
|
const struct timespec *abstime)
|
|
|
|
|
{
|
|
|
|
|
if (abstime == NULL || abstime->tv_sec < 0 || abstime->tv_nsec < 0 ||
|
|
|
|
|
abstime->tv_nsec >= 1000000000)
|
|
|
|
|
return (EINVAL);
|
|
|
|
|
|
|
|
|
|
return (join_common(pthread, thread_return, abstime));
|
|
|
|
|
}
|
|
|
|
|
|
In current implementation, thread cancellation is done in signal handler,
which does not know what is the state of interrupted system call, for
example, open() system call opened a file and the thread is still cancelled,
result is descriptor leak, there are other problems which can cause resource
leak or undeterminable side effect when a thread is cancelled. However, this
is no longer true in new implementation.
In defering mode, a thread is canceled if cancellation request is pending and
later the thread enters a cancellation point, otherwise, a later
pthread_cancel() just causes SIGCANCEL to be sent to the target thread, and
causes target thread to abort system call, userland code in libthr then checks
cancellation state, and cancels the thread if needed. For example, the
cancellation point open(), the thread may be canceled at start,
but later, if it opened a file descriptor, it is not canceled, this avoids
file handle leak. Another example is read(), a thread may be canceled at start
of the function, but later, if it read some bytes from a socket, the thread
is not canceled, the caller then can decide if it should still enable cancelling
or disable it and continue reading data until it thinks it has read all
bytes of a packet, and keeps a protocol stream in health state, if user ignores
partly reading of a packet without disabling cancellation, then second iteration
of read loop cause the thread to be cancelled.
An exception is that the close() cancellation point always closes a file handle
despite whether the thread is cancelled or not.
The old mechanism is still kept, for a functions which is not so easily to
fix a cancellation problem, the rough mechanism is used.
Reviewed by: kib@
2010-08-20 05:15:39 +00:00
|
|
|
/*
|
|
|
|
|
* Cancellation behavior:
|
|
|
|
|
* if the thread is canceled, joinee is not recycled.
|
|
|
|
|
*/
|
2005-10-04 06:15:25 +00:00
|
|
|
static int
|
|
|
|
|
join_common(pthread_t pthread, void **thread_return,
|
|
|
|
|
const struct timespec *abstime)
|
2003-04-01 03:46:29 +00:00
|
|
|
{
|
2005-04-02 01:20:00 +00:00
|
|
|
struct pthread *curthread = _get_curthread();
|
2005-10-04 06:15:25 +00:00
|
|
|
struct timespec ts, ts2, *tsp;
|
2005-04-02 01:20:00 +00:00
|
|
|
void *tmp;
|
2005-10-26 07:11:43 +00:00
|
|
|
long tid;
|
2005-04-02 01:20:00 +00:00
|
|
|
int ret = 0;
|
2005-10-26 07:11:43 +00:00
|
|
|
|
2005-04-02 01:20:00 +00:00
|
|
|
if (pthread == NULL)
|
|
|
|
|
return (EINVAL);
|
2003-04-01 03:46:29 +00:00
|
|
|
|
Make libthr async-signal-safe without costly signal masking. The guidlines I
followed are: Only 3 functions (pthread_cancel, pthread_setcancelstate,
pthread_setcanceltype) are required to be async-signal-safe by POSIX. None of
the rest of the pthread api is required to be async-signal-safe. This means
that only the three mentioned functions are safe to use from inside
signal handlers.
However, there are certain system/libc calls that are
cancellation points that a caller may call from within a signal handler,
and since they are cancellation points calls have to be made into libthr
to test for cancellation and exit the thread if necessary. So, the
cancellation test and thread exit code paths must be async-signal-safe
as well. A summary of the changes follows:
o Almost all of the code paths that masked signals, as well as locking the
pthread structure now lock only the pthread structure.
o Signals are masked (and left that way) as soon as a thread enters
pthread_exit().
o The active and dead threads locks now explicitly require that signals
are masked.
o Access to the isdead field of the pthread structure is protected by both
the active and dead list locks for writing. Either one is sufficient for
reading.
o The thread state and type fields have been combined into one three-state
switch to make it easier to read without requiring a lock. It doesn't need
a lock for writing (and therefore for reading either) because only the
current thread can write to it and it is an integer value.
o The thread state field of the pthread structure has been eliminated. It
was an unnecessary field that mostly duplicated the flags field, but
required additional locking that would make a lot more code paths require
signal masking. Any truly unique values (such as PS_DEAD) have been
reborn as separate members of the pthread structure.
o Since the mutex and condvar pthread functions are not async-signal-safe
there is no need to muck about with the wait queues when handling
a signal ...
o ... which also removes the need for wrapping signal handlers and sigaction(2).
o The condvar and mutex async-cancellation code had to be revised as a result
of some of these changes, which resulted in semi-unrelated changes which
would have been difficult to work on as a separate commit, so they are
included as well.
The only part of the changes I am worried about is related to locking for
the pthread joining fields. But, I will take a closer look at them once this
mega-patch is committed.
2004-05-20 12:06:16 +00:00
|
|
|
if (pthread == curthread)
|
2005-04-02 01:20:00 +00:00
|
|
|
return (EDEADLK);
|
2003-04-01 03:46:29 +00:00
|
|
|
|
2005-04-02 01:20:00 +00:00
|
|
|
THREAD_LIST_LOCK(curthread);
|
|
|
|
|
if ((ret = _thr_find_thread(curthread, pthread, 1)) != 0) {
|
2003-04-01 03:46:29 +00:00
|
|
|
ret = ESRCH;
|
2005-04-02 01:20:00 +00:00
|
|
|
} else if ((pthread->tlflags & TLFLAGS_DETACHED) != 0) {
|
2006-11-28 11:05:31 +00:00
|
|
|
ret = EINVAL;
|
2005-04-02 01:20:00 +00:00
|
|
|
} else if (pthread->joiner != NULL) {
|
2003-04-01 03:46:29 +00:00
|
|
|
/* Multiple joiners are not supported. */
|
|
|
|
|
ret = ENOTSUP;
|
|
|
|
|
}
|
2005-04-02 01:20:00 +00:00
|
|
|
if (ret) {
|
|
|
|
|
THREAD_LIST_UNLOCK(curthread);
|
|
|
|
|
return (ret);
|
|
|
|
|
}
|
|
|
|
|
/* Set the running thread to be the joiner: */
|
|
|
|
|
pthread->joiner = curthread;
|
2003-04-01 03:46:29 +00:00
|
|
|
|
2005-04-02 01:20:00 +00:00
|
|
|
THREAD_LIST_UNLOCK(curthread);
|
2003-05-26 00:28:49 +00:00
|
|
|
|
2005-04-02 01:20:00 +00:00
|
|
|
THR_CLEANUP_PUSH(curthread, backout_join, pthread);
|
In current implementation, thread cancellation is done in signal handler,
which does not know what is the state of interrupted system call, for
example, open() system call opened a file and the thread is still cancelled,
result is descriptor leak, there are other problems which can cause resource
leak or undeterminable side effect when a thread is cancelled. However, this
is no longer true in new implementation.
In defering mode, a thread is canceled if cancellation request is pending and
later the thread enters a cancellation point, otherwise, a later
pthread_cancel() just causes SIGCANCEL to be sent to the target thread, and
causes target thread to abort system call, userland code in libthr then checks
cancellation state, and cancels the thread if needed. For example, the
cancellation point open(), the thread may be canceled at start,
but later, if it opened a file descriptor, it is not canceled, this avoids
file handle leak. Another example is read(), a thread may be canceled at start
of the function, but later, if it read some bytes from a socket, the thread
is not canceled, the caller then can decide if it should still enable cancelling
or disable it and continue reading data until it thinks it has read all
bytes of a packet, and keeps a protocol stream in health state, if user ignores
partly reading of a packet without disabling cancellation, then second iteration
of read loop cause the thread to be cancelled.
An exception is that the close() cancellation point always closes a file handle
despite whether the thread is cancelled or not.
The old mechanism is still kept, for a functions which is not so easily to
fix a cancellation problem, the rough mechanism is used.
Reviewed by: kib@
2010-08-20 05:15:39 +00:00
|
|
|
_thr_cancel_enter_defer(curthread, 1);
|
2003-04-01 03:46:29 +00:00
|
|
|
|
2005-10-26 07:11:43 +00:00
|
|
|
tid = pthread->tid;
|
|
|
|
|
while (pthread->tid != TID_TERMINATED) {
|
In current implementation, thread cancellation is done in signal handler,
which does not know what is the state of interrupted system call, for
example, open() system call opened a file and the thread is still cancelled,
result is descriptor leak, there are other problems which can cause resource
leak or undeterminable side effect when a thread is cancelled. However, this
is no longer true in new implementation.
In defering mode, a thread is canceled if cancellation request is pending and
later the thread enters a cancellation point, otherwise, a later
pthread_cancel() just causes SIGCANCEL to be sent to the target thread, and
causes target thread to abort system call, userland code in libthr then checks
cancellation state, and cancels the thread if needed. For example, the
cancellation point open(), the thread may be canceled at start,
but later, if it opened a file descriptor, it is not canceled, this avoids
file handle leak. Another example is read(), a thread may be canceled at start
of the function, but later, if it read some bytes from a socket, the thread
is not canceled, the caller then can decide if it should still enable cancelling
or disable it and continue reading data until it thinks it has read all
bytes of a packet, and keeps a protocol stream in health state, if user ignores
partly reading of a packet without disabling cancellation, then second iteration
of read loop cause the thread to be cancelled.
An exception is that the close() cancellation point always closes a file handle
despite whether the thread is cancelled or not.
The old mechanism is still kept, for a functions which is not so easily to
fix a cancellation problem, the rough mechanism is used.
Reviewed by: kib@
2010-08-20 05:15:39 +00:00
|
|
|
_thr_testcancel(curthread);
|
2005-10-04 06:15:25 +00:00
|
|
|
if (abstime != NULL) {
|
|
|
|
|
clock_gettime(CLOCK_REALTIME, &ts);
|
|
|
|
|
TIMESPEC_SUB(&ts2, abstime, &ts);
|
|
|
|
|
if (ts2.tv_sec < 0) {
|
|
|
|
|
ret = ETIMEDOUT;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
tsp = &ts2;
|
|
|
|
|
} else
|
|
|
|
|
tsp = NULL;
|
2005-10-26 07:11:43 +00:00
|
|
|
ret = _thr_umtx_wait(&pthread->tid, tid, tsp);
|
2005-10-04 06:15:25 +00:00
|
|
|
if (ret == ETIMEDOUT)
|
|
|
|
|
break;
|
2005-04-02 01:20:00 +00:00
|
|
|
}
|
2003-04-01 03:46:29 +00:00
|
|
|
|
In current implementation, thread cancellation is done in signal handler,
which does not know what is the state of interrupted system call, for
example, open() system call opened a file and the thread is still cancelled,
result is descriptor leak, there are other problems which can cause resource
leak or undeterminable side effect when a thread is cancelled. However, this
is no longer true in new implementation.
In defering mode, a thread is canceled if cancellation request is pending and
later the thread enters a cancellation point, otherwise, a later
pthread_cancel() just causes SIGCANCEL to be sent to the target thread, and
causes target thread to abort system call, userland code in libthr then checks
cancellation state, and cancels the thread if needed. For example, the
cancellation point open(), the thread may be canceled at start,
but later, if it opened a file descriptor, it is not canceled, this avoids
file handle leak. Another example is read(), a thread may be canceled at start
of the function, but later, if it read some bytes from a socket, the thread
is not canceled, the caller then can decide if it should still enable cancelling
or disable it and continue reading data until it thinks it has read all
bytes of a packet, and keeps a protocol stream in health state, if user ignores
partly reading of a packet without disabling cancellation, then second iteration
of read loop cause the thread to be cancelled.
An exception is that the close() cancellation point always closes a file handle
despite whether the thread is cancelled or not.
The old mechanism is still kept, for a functions which is not so easily to
fix a cancellation problem, the rough mechanism is used.
Reviewed by: kib@
2010-08-20 05:15:39 +00:00
|
|
|
_thr_cancel_leave_defer(curthread, 0);
|
2005-04-02 01:20:00 +00:00
|
|
|
THR_CLEANUP_POP(curthread, 0);
|
2003-04-01 03:46:29 +00:00
|
|
|
|
2005-10-04 06:15:25 +00:00
|
|
|
if (ret == ETIMEDOUT) {
|
|
|
|
|
THREAD_LIST_LOCK(curthread);
|
|
|
|
|
pthread->joiner = NULL;
|
|
|
|
|
THREAD_LIST_UNLOCK(curthread);
|
|
|
|
|
} else {
|
2005-12-19 03:20:55 +00:00
|
|
|
ret = 0;
|
2005-10-04 06:15:25 +00:00
|
|
|
tmp = pthread->ret;
|
|
|
|
|
THREAD_LIST_LOCK(curthread);
|
|
|
|
|
pthread->tlflags |= TLFLAGS_DETACHED;
|
|
|
|
|
pthread->joiner = NULL;
|
|
|
|
|
THR_GCLIST_ADD(pthread);
|
|
|
|
|
THREAD_LIST_UNLOCK(curthread);
|
2003-04-01 03:46:29 +00:00
|
|
|
|
2005-10-04 06:15:25 +00:00
|
|
|
if (thread_return != NULL)
|
|
|
|
|
*thread_return = tmp;
|
|
|
|
|
}
|
2003-04-01 03:46:29 +00:00
|
|
|
return (ret);
|
|
|
|
|
}
|
