summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Birrell <jb@FreeBSD.org>1998-04-17 09:37:41 +0000
committerJohn Birrell <jb@FreeBSD.org>1998-04-17 09:37:41 +0000
commit334fa8f215d7d7c06c9069b490128ada85d493e8 (patch)
treeec7b2da4d2e99a8813a3de82f30093dc80e16951
parent4fe6f197e00987cecfed3abbf6fb808ce5b8ae1d (diff)
Notes
-rw-r--r--lib/libc_r/uthread/uthread_kern.c15
-rw-r--r--lib/libkse/thread/thr_kern.c15
-rw-r--r--lib/libpthread/thread/thr_kern.c15
3 files changed, 6 insertions, 39 deletions
diff --git a/lib/libc_r/uthread/uthread_kern.c b/lib/libc_r/uthread/uthread_kern.c
index 9356c4c63e7c..3b624223a7f6 100644
--- a/lib/libc_r/uthread/uthread_kern.c
+++ b/lib/libc_r/uthread/uthread_kern.c
@@ -29,7 +29,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: uthread_kern.c,v 1.7 1998/03/09 04:46:26 jb Exp $
+ * $Id: uthread_kern.c,v 1.8 1998/04/11 07:47:22 jb Exp $
*
*/
#include <errno.h>
@@ -892,6 +892,7 @@ _thread_signal(pthread_t pthread, int sig)
case PS_FDR_WAIT:
case PS_FDW_WAIT:
case PS_SLEEP_WAIT:
+ case PS_SIGWAIT:
/* Return the 'interrupted' error: */
_thread_seterrno(pthread, EINTR);
pthread->interrupted = 1;
@@ -902,18 +903,6 @@ _thread_signal(pthread_t pthread, int sig)
/* Return the signal number: */
pthread->signo = sig;
break;
-
- /* Waiting on a signal: */
- case PS_SIGWAIT:
- /* Change the state of the thread to run: */
- PTHREAD_NEW_STATE(pthread,PS_RUNNING);
-
- /* Return the signal number: */
- pthread->signo = sig;
-
- /* Flag the signal as dealt with: */
- done = 1;
- break;
}
/*
diff --git a/lib/libkse/thread/thr_kern.c b/lib/libkse/thread/thr_kern.c
index 9356c4c63e7c..3b624223a7f6 100644
--- a/lib/libkse/thread/thr_kern.c
+++ b/lib/libkse/thread/thr_kern.c
@@ -29,7 +29,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: uthread_kern.c,v 1.7 1998/03/09 04:46:26 jb Exp $
+ * $Id: uthread_kern.c,v 1.8 1998/04/11 07:47:22 jb Exp $
*
*/
#include <errno.h>
@@ -892,6 +892,7 @@ _thread_signal(pthread_t pthread, int sig)
case PS_FDR_WAIT:
case PS_FDW_WAIT:
case PS_SLEEP_WAIT:
+ case PS_SIGWAIT:
/* Return the 'interrupted' error: */
_thread_seterrno(pthread, EINTR);
pthread->interrupted = 1;
@@ -902,18 +903,6 @@ _thread_signal(pthread_t pthread, int sig)
/* Return the signal number: */
pthread->signo = sig;
break;
-
- /* Waiting on a signal: */
- case PS_SIGWAIT:
- /* Change the state of the thread to run: */
- PTHREAD_NEW_STATE(pthread,PS_RUNNING);
-
- /* Return the signal number: */
- pthread->signo = sig;
-
- /* Flag the signal as dealt with: */
- done = 1;
- break;
}
/*
diff --git a/lib/libpthread/thread/thr_kern.c b/lib/libpthread/thread/thr_kern.c
index 9356c4c63e7c..3b624223a7f6 100644
--- a/lib/libpthread/thread/thr_kern.c
+++ b/lib/libpthread/thread/thr_kern.c
@@ -29,7 +29,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: uthread_kern.c,v 1.7 1998/03/09 04:46:26 jb Exp $
+ * $Id: uthread_kern.c,v 1.8 1998/04/11 07:47:22 jb Exp $
*
*/
#include <errno.h>
@@ -892,6 +892,7 @@ _thread_signal(pthread_t pthread, int sig)
case PS_FDR_WAIT:
case PS_FDW_WAIT:
case PS_SLEEP_WAIT:
+ case PS_SIGWAIT:
/* Return the 'interrupted' error: */
_thread_seterrno(pthread, EINTR);
pthread->interrupted = 1;
@@ -902,18 +903,6 @@ _thread_signal(pthread_t pthread, int sig)
/* Return the signal number: */
pthread->signo = sig;
break;
-
- /* Waiting on a signal: */
- case PS_SIGWAIT:
- /* Change the state of the thread to run: */
- PTHREAD_NEW_STATE(pthread,PS_RUNNING);
-
- /* Return the signal number: */
- pthread->signo = sig;
-
- /* Flag the signal as dealt with: */
- done = 1;
- break;
}
/*