mirror of
https://github.com/freebsd/freebsd-src.git
synced 2024-12-04 21:09:28 +00:00
f5295b34ac
specifically:
uthread_accept.c: Fix for inherited socket not getting correct entry in
pthread flags.
uthread_create.c: Fix to allow pthread_t pointer return to be null if
caller doesn't care about return.
uthread_fd.c: Fix for return codes to be placed into correct errno.
uthread_init.c: Changes to make gcc-2.8 thread aware for exception stack
frames (WARNING: This is #ifdef'ed out by default and is
different from the Cygnus egcs fix).
uthread_ioctl.c: Fix for blocking/non-blocking ioctl.
uthread_kern.c: Signal handling fixes (only one case left to fix,
that of an externally sent SIGSEGV and friends -
a fairly unusual case).
uthread_write.c: Fix for lock of fd - ask for write lock, not read/write.
uthread_writev.c: Fix for lock of fd - ask for write lock, not read/write.
Pthreads now works well enough to run the LDAP and ACAPD(with the gcc 2.8 fix)
sample implementations.
107 lines
3.7 KiB
C
107 lines
3.7 KiB
C
/*
|
|
* Copyright (c) 1995 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 <unistd.h>
|
|
#include <sys/types.h>
|
|
#include <sys/socket.h>
|
|
#include <fcntl.h>
|
|
#ifdef _THREAD_SAFE
|
|
#include <pthread.h>
|
|
#include "pthread_private.h"
|
|
|
|
int
|
|
accept(int fd, struct sockaddr * name, int *namelen)
|
|
{
|
|
int ret;
|
|
|
|
/* Lock the file descriptor: */
|
|
if ((ret = _thread_fd_lock(fd, FD_RDWR, NULL, __FILE__, __LINE__)) == 0) {
|
|
/* Enter a loop to wait for a connection request: */
|
|
while ((ret = _thread_sys_accept(fd, name, namelen)) < 0) {
|
|
/* Check if the socket is to block: */
|
|
if ((_thread_fd_table[fd]->flags & O_NONBLOCK) == 0 && (errno == EWOULDBLOCK || errno == EAGAIN)) {
|
|
/* Save the socket file descriptor: */
|
|
_thread_run->data.fd.fd = fd;
|
|
_thread_run->data.fd.fname = __FILE__;
|
|
_thread_run->data.fd.branch = __LINE__;
|
|
|
|
/* Set the timeout: */
|
|
_thread_kern_set_timeout(NULL);
|
|
|
|
/* Schedule the next thread: */
|
|
_thread_kern_sched_state(PS_FDR_WAIT, __FILE__, __LINE__);
|
|
|
|
/* Check if the wait was interrupted: */
|
|
if (errno == EINTR) {
|
|
/* Return an error status: */
|
|
ret = -1;
|
|
break;
|
|
}
|
|
} else {
|
|
/*
|
|
* Another error has occurred, so exit the
|
|
* loop here:
|
|
*/
|
|
break;
|
|
}
|
|
}
|
|
|
|
/* Check for errors: */
|
|
if (ret < 0) {
|
|
}
|
|
/* Initialise the file descriptor table for the new socket: */
|
|
else if (_thread_fd_table_init(ret) != 0) {
|
|
/* Quietly close the socket: */
|
|
_thread_sys_close(ret);
|
|
|
|
/* Return an error: */
|
|
ret = -1;
|
|
}
|
|
/*
|
|
* If the parent socket was blocking, make sure that
|
|
* the new socket is also set blocking here (as the
|
|
* call to _thread_fd_table_init() above will always
|
|
* set the new socket flags to non-blocking, as that
|
|
* will be the inherited state of the new socket.
|
|
*/
|
|
if((ret > 0) && (_thread_fd_table[fd]->flags & O_NONBLOCK) == 0)
|
|
_thread_fd_table[ret]->flags &= ~O_NONBLOCK;
|
|
|
|
/* Unlock the file descriptor: */
|
|
_thread_fd_unlock(fd, FD_RDWR);
|
|
}
|
|
/* Return the socket file descriptor or -1 on error: */
|
|
return (ret);
|
|
}
|
|
#endif
|