diff options
| author | Jason Evans <jasone@FreeBSD.org> | 1999-05-08 07:50:05 +0000 |
|---|---|---|
| committer | Jason Evans <jasone@FreeBSD.org> | 1999-05-08 07:50:05 +0000 |
| commit | c578efe575dc0b2020cf21aaae2c34b12a12a430 (patch) | |
| tree | 9b63340c6c0440d1e17bdf6f3b8fc09ed1bfb80f | |
| parent | 1637aa4b1cc600e66276de2f474a9a6d5cdb0ef7 (diff) | |
| download | src-c578efe575dc0b2020cf21aaae2c34b12a12a430.tar.gz src-c578efe575dc0b2020cf21aaae2c34b12a12a430.zip | |
Back out patch for cond_timedwait() bug from -current, since other changes
have made the patch obsolete, as pointed out by Daniel Eischen
<eischen@vigrid.com>.
PR: bin/8872
Notes
Notes:
svn path=/head/; revision=46680
| -rw-r--r-- | lib/libc_r/uthread/uthread_kern.c | 11 | ||||
| -rw-r--r-- | lib/libkse/thread/thr_kern.c | 11 | ||||
| -rw-r--r-- | lib/libpthread/thread/thr_kern.c | 11 |
3 files changed, 3 insertions, 30 deletions
diff --git a/lib/libc_r/uthread/uthread_kern.c b/lib/libc_r/uthread/uthread_kern.c index 7c4dffaeeafa..f1e97f914c57 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.16 1999/03/23 05:07:56 jb Exp $ + * $Id: uthread_kern.c,v 1.17 1999/05/07 07:59:44 jasone Exp $ * */ #include <errno.h> @@ -212,15 +212,6 @@ __asm__("fnsave %0": :"m"(*fdata)); FD_ZERO(&pthread->data.select_data->writefds); FD_ZERO(&pthread->data.select_data->exceptfds); pthread->data.select_data->nfds = 0; - } else if (pthread->state == PS_COND_WAIT) { - /* - * The pthread_cond_timedwait() - * has timed out, so remove the - * thread from the condition's - * queue. - */ - _thread_queue_remove(pthread->queue, - pthread); } /* * Return an error as an interrupted diff --git a/lib/libkse/thread/thr_kern.c b/lib/libkse/thread/thr_kern.c index 7c4dffaeeafa..f1e97f914c57 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.16 1999/03/23 05:07:56 jb Exp $ + * $Id: uthread_kern.c,v 1.17 1999/05/07 07:59:44 jasone Exp $ * */ #include <errno.h> @@ -212,15 +212,6 @@ __asm__("fnsave %0": :"m"(*fdata)); FD_ZERO(&pthread->data.select_data->writefds); FD_ZERO(&pthread->data.select_data->exceptfds); pthread->data.select_data->nfds = 0; - } else if (pthread->state == PS_COND_WAIT) { - /* - * The pthread_cond_timedwait() - * has timed out, so remove the - * thread from the condition's - * queue. - */ - _thread_queue_remove(pthread->queue, - pthread); } /* * Return an error as an interrupted diff --git a/lib/libpthread/thread/thr_kern.c b/lib/libpthread/thread/thr_kern.c index 7c4dffaeeafa..f1e97f914c57 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.16 1999/03/23 05:07:56 jb Exp $ + * $Id: uthread_kern.c,v 1.17 1999/05/07 07:59:44 jasone Exp $ * */ #include <errno.h> @@ -212,15 +212,6 @@ __asm__("fnsave %0": :"m"(*fdata)); FD_ZERO(&pthread->data.select_data->writefds); FD_ZERO(&pthread->data.select_data->exceptfds); pthread->data.select_data->nfds = 0; - } else if (pthread->state == PS_COND_WAIT) { - /* - * The pthread_cond_timedwait() - * has timed out, so remove the - * thread from the condition's - * queue. - */ - _thread_queue_remove(pthread->queue, - pthread); } /* * Return an error as an interrupted |