mirror of
https://git.FreeBSD.org/src.git
synced 2024-10-19 02:29:40 +00:00
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
This commit is contained in:
parent
1637aa4b1c
commit
c578efe575
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=46680
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user