mirror of
https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git
synced 2025-01-11 17:04:19 +01:00
I shouldn't do things early in the morning.
I shouldn't do things early in the morning. [...] I shouldn't do things early in the morning.
This commit is contained in:
John Birrell
parent
23c82db7a3
commit
fca35cd32f
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=36553
@ -1,4 +1,4 @@
|
||||
# $Id: Makefile.inc,v 1.11 1998/04/29 09:58:27 jb Exp $
|
||||
# $Id: Makefile.inc,v 1.12 1998/05/31 23:48:26 jb Exp $
|
||||
|
||||
# uthread sources
|
||||
.PATH: ${.CURDIR}/uthread
|
||||
@ -64,13 +64,11 @@ SRCS+= \
|
||||
uthread_queue.c \
|
||||
uthread_read.c \
|
||||
uthread_readv.c \
|
||||
uthread_recv.c \
|
||||
uthread_recvfrom.c \
|
||||
uthread_recvmsg.c \
|
||||
uthread_resume_np.c \
|
||||
uthread_select.c \
|
||||
uthread_self.c \
|
||||
uthread_send.c \
|
||||
uthread_sendmsg.c \
|
||||
uthread_sendto.c \
|
||||
uthread_seterrno.c \
|
||||
|
||||
@ -1,72 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) 1998 John Birrell <jb@cimlogic.com.au>
|
||||
* 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
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 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.
|
||||
* 3. All advertising materials mentioning features or use of this software
|
||||
* must display the following acknowledgement:
|
||||
* This product includes software developed by John Birrell.
|
||||
* 4. Neither the name of the author nor the names of any co-contributors
|
||||
* may be used to endorse or promote products derived from this software
|
||||
* without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL AND CONTRIBUTORS ``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 REGENTS OR CONTRIBUTORS 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.
|
||||
*
|
||||
*/
|
||||
#include <errno.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
#include <fcntl.h>
|
||||
#ifdef _THREAD_SAFE
|
||||
#include <pthread.h>
|
||||
#include "pthread_private.h"
|
||||
|
||||
ssize_t
|
||||
recv(int fd, void *buf, size_t len, int flags)
|
||||
{
|
||||
int ret;
|
||||
|
||||
if ((ret = _thread_fd_lock(fd, FD_READ, NULL, __FILE__, __LINE__)) == 0) {
|
||||
while ((ret = _thread_sys_recv(fd, buf, len, flags)) < 0) {
|
||||
if (!(_thread_fd_table[fd]->flags & O_NONBLOCK) && ((errno == EWOULDBLOCK) || (errno == EAGAIN))) {
|
||||
_thread_run->data.fd.fd = fd;
|
||||
|
||||
/* Set the timeout: */
|
||||
_thread_kern_set_timeout(NULL);
|
||||
_thread_run->interrupted = 0;
|
||||
_thread_kern_sched_state(PS_FDR_WAIT, __FILE__, __LINE__);
|
||||
|
||||
/* Check if the wait was interrupted: */
|
||||
if (_thread_run->interrupted) {
|
||||
/* Return an error status: */
|
||||
errno = EINTR;
|
||||
ret = -1;
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
ret = -1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
_thread_fd_unlock(fd, FD_READ);
|
||||
}
|
||||
return (ret);
|
||||
}
|
||||
#endif
|
||||
@ -1,71 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) 1998 John Birrell <jb@cimlogic.com.au>
|
||||
* 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
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 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.
|
||||
* 3. All advertising materials mentioning features or use of this software
|
||||
* must display the following acknowledgement:
|
||||
* This product includes software developed by John Birrell.
|
||||
* 4. Neither the name of the author nor the names of any co-contributors
|
||||
* may be used to endorse or promote products derived from this software
|
||||
* without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL AND CONTRIBUTORS ``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 REGENTS OR CONTRIBUTORS 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.
|
||||
*
|
||||
*/
|
||||
#include <errno.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
#include <fcntl.h>
|
||||
#ifdef _THREAD_SAFE
|
||||
#include <pthread.h>
|
||||
#include "pthread_private.h"
|
||||
|
||||
ssize_t
|
||||
send(int fd, const void *msg, size_t len, int flags)
|
||||
{
|
||||
int ret;
|
||||
|
||||
if ((ret = _thread_fd_lock(fd, FD_WRITE, NULL, __FILE__, __LINE__)) == 0) {
|
||||
while ((ret = _thread_sys_send(fd, msg, len, flags)) < 0) {
|
||||
if (!(_thread_fd_table[fd]->flags & O_NONBLOCK) && ((errno == EWOULDBLOCK) || (errno == EAGAIN))) {
|
||||
_thread_run->data.fd.fd = fd;
|
||||
|
||||
/* Set the timeout: */
|
||||
_thread_kern_set_timeout(NULL);
|
||||
_thread_run->interrupted = 0;
|
||||
_thread_kern_sched_state(PS_FDW_WAIT, __FILE__, __LINE__);
|
||||
|
||||
/* Check if the operation was interrupted: */
|
||||
if (_thread_run->interrupted) {
|
||||
errno = EINTR;
|
||||
ret = -1;
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
ret = -1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
_thread_fd_unlock(fd, FD_WRITE);
|
||||
}
|
||||
return (ret);
|
||||
}
|
||||
#endif
|
||||
@ -1,4 +1,4 @@
|
||||
# $Id: Makefile.inc,v 1.11 1998/04/29 09:58:27 jb Exp $
|
||||
# $Id: Makefile.inc,v 1.12 1998/05/31 23:48:26 jb Exp $
|
||||
|
||||
# uthread sources
|
||||
.PATH: ${.CURDIR}/uthread
|
||||
@ -64,13 +64,11 @@ SRCS+= \
|
||||
uthread_queue.c \
|
||||
uthread_read.c \
|
||||
uthread_readv.c \
|
||||
uthread_recv.c \
|
||||
uthread_recvfrom.c \
|
||||
uthread_recvmsg.c \
|
||||
uthread_resume_np.c \
|
||||
uthread_select.c \
|
||||
uthread_self.c \
|
||||
uthread_send.c \
|
||||
uthread_sendmsg.c \
|
||||
uthread_sendto.c \
|
||||
uthread_seterrno.c \
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $Id: Makefile.inc,v 1.11 1998/04/29 09:58:27 jb Exp $
|
||||
# $Id: Makefile.inc,v 1.12 1998/05/31 23:48:26 jb Exp $
|
||||
|
||||
# uthread sources
|
||||
.PATH: ${.CURDIR}/uthread
|
||||
@ -64,13 +64,11 @@ SRCS+= \
|
||||
uthread_queue.c \
|
||||
uthread_read.c \
|
||||
uthread_readv.c \
|
||||
uthread_recv.c \
|
||||
uthread_recvfrom.c \
|
||||
uthread_recvmsg.c \
|
||||
uthread_resume_np.c \
|
||||
uthread_select.c \
|
||||
uthread_self.c \
|
||||
uthread_send.c \
|
||||
uthread_sendmsg.c \
|
||||
uthread_sendto.c \
|
||||
uthread_seterrno.c \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user