diff options
| -rw-r--r-- | lib/libc_r/uthread/pthread_private.h | 4 | ||||
| -rw-r--r-- | lib/libc_r/uthread/uthread_accept.c | 5 | ||||
| -rw-r--r-- | lib/libc_r/uthread/uthread_fd.c | 3 | ||||
| -rw-r--r-- | lib/libpthread/uthread/pthread_private.h | 4 | ||||
| -rw-r--r-- | lib/libpthread/uthread/uthread_accept.c | 5 | ||||
| -rw-r--r-- | lib/libpthread/uthread/uthread_fd.c | 3 |
6 files changed, 12 insertions, 12 deletions
diff --git a/lib/libc_r/uthread/pthread_private.h b/lib/libc_r/uthread/pthread_private.h index 9f64f0328e7..749c4e05791 100644 --- a/lib/libc_r/uthread/pthread_private.h +++ b/lib/libc_r/uthread/pthread_private.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pthread_private.h,v 1.37 2002/10/30 20:05:11 marc Exp $ */ +/* $OpenBSD: pthread_private.h,v 1.38 2002/11/12 20:12:45 marc Exp $ */ /* * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>. * All rights reserved. @@ -1087,9 +1087,9 @@ void _pq_remove(struct pq_queue *pq, struct pthread *); void _pq_insert_head(struct pq_queue *pq, struct pthread *); void _pq_insert_tail(struct pq_queue *pq, struct pthread *); struct pthread *_pq_first(struct pq_queue *pq); -#if defined(_PTHREADS_INVARIANTS) void _waitq_insert(pthread_t pthread); void _waitq_remove(pthread_t pthread); +#if defined(_PTHREADS_INVARIANTS) void _waitq_setactive(void); void _waitq_clearactive(void); #endif diff --git a/lib/libc_r/uthread/uthread_accept.c b/lib/libc_r/uthread/uthread_accept.c index 9c4b1d81eca..a3f424084fc 100644 --- a/lib/libc_r/uthread/uthread_accept.c +++ b/lib/libc_r/uthread/uthread_accept.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uthread_accept.c,v 1.6 2002/10/30 19:11:56 marc Exp $ */ +/* $OpenBSD: uthread_accept.c,v 1.7 2002/11/12 20:12:45 marc Exp $ */ /* * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au> * All rights reserved. @@ -89,13 +89,14 @@ accept(int fd, struct sockaddr * name, socklen_t *namelen) * child if it is on in the parent. This is done * as _thread_fd_table_init *may* have turned the flag on. */ - if (ret != -1) + if (ret != -1) { if (_thread_fd_table_init(ret) != 0) { /* Quietly close the socket: */ _thread_sys_close(ret); ret = -1; } else if ((_thread_fd_table[fd]->flags & O_NONBLOCK) == 0) _thread_fd_table[ret]->flags &= ~O_NONBLOCK; + } /* Unlock the file descriptor: */ _FD_UNLOCK(fd, FD_RDWR); diff --git a/lib/libc_r/uthread/uthread_fd.c b/lib/libc_r/uthread/uthread_fd.c index 19bc48f2cc9..12b325c93d9 100644 --- a/lib/libc_r/uthread/uthread_fd.c +++ b/lib/libc_r/uthread/uthread_fd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uthread_fd.c,v 1.14 2002/11/05 22:19:56 marc Exp $ */ +/* $OpenBSD: uthread_fd.c,v 1.15 2002/11/12 20:12:45 marc Exp $ */ /* * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au> * All rights reserved. @@ -279,7 +279,6 @@ _thread_fd_unlock(int fd, int lock_type, const char *fname, int lineno) void _thread_fd_unlock_owned(pthread_t pthread) { - struct pthread *saved_thread = _get_curthread(); struct fd_table_entry *entry; int do_unlock; int fd; diff --git a/lib/libpthread/uthread/pthread_private.h b/lib/libpthread/uthread/pthread_private.h index 9f64f0328e7..749c4e05791 100644 --- a/lib/libpthread/uthread/pthread_private.h +++ b/lib/libpthread/uthread/pthread_private.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pthread_private.h,v 1.37 2002/10/30 20:05:11 marc Exp $ */ +/* $OpenBSD: pthread_private.h,v 1.38 2002/11/12 20:12:45 marc Exp $ */ /* * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>. * All rights reserved. @@ -1087,9 +1087,9 @@ void _pq_remove(struct pq_queue *pq, struct pthread *); void _pq_insert_head(struct pq_queue *pq, struct pthread *); void _pq_insert_tail(struct pq_queue *pq, struct pthread *); struct pthread *_pq_first(struct pq_queue *pq); -#if defined(_PTHREADS_INVARIANTS) void _waitq_insert(pthread_t pthread); void _waitq_remove(pthread_t pthread); +#if defined(_PTHREADS_INVARIANTS) void _waitq_setactive(void); void _waitq_clearactive(void); #endif diff --git a/lib/libpthread/uthread/uthread_accept.c b/lib/libpthread/uthread/uthread_accept.c index 9c4b1d81eca..a3f424084fc 100644 --- a/lib/libpthread/uthread/uthread_accept.c +++ b/lib/libpthread/uthread/uthread_accept.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uthread_accept.c,v 1.6 2002/10/30 19:11:56 marc Exp $ */ +/* $OpenBSD: uthread_accept.c,v 1.7 2002/11/12 20:12:45 marc Exp $ */ /* * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au> * All rights reserved. @@ -89,13 +89,14 @@ accept(int fd, struct sockaddr * name, socklen_t *namelen) * child if it is on in the parent. This is done * as _thread_fd_table_init *may* have turned the flag on. */ - if (ret != -1) + if (ret != -1) { if (_thread_fd_table_init(ret) != 0) { /* Quietly close the socket: */ _thread_sys_close(ret); ret = -1; } else if ((_thread_fd_table[fd]->flags & O_NONBLOCK) == 0) _thread_fd_table[ret]->flags &= ~O_NONBLOCK; + } /* Unlock the file descriptor: */ _FD_UNLOCK(fd, FD_RDWR); diff --git a/lib/libpthread/uthread/uthread_fd.c b/lib/libpthread/uthread/uthread_fd.c index 19bc48f2cc9..12b325c93d9 100644 --- a/lib/libpthread/uthread/uthread_fd.c +++ b/lib/libpthread/uthread/uthread_fd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uthread_fd.c,v 1.14 2002/11/05 22:19:56 marc Exp $ */ +/* $OpenBSD: uthread_fd.c,v 1.15 2002/11/12 20:12:45 marc Exp $ */ /* * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au> * All rights reserved. @@ -279,7 +279,6 @@ _thread_fd_unlock(int fd, int lock_type, const char *fname, int lineno) void _thread_fd_unlock_owned(pthread_t pthread) { - struct pthread *saved_thread = _get_curthread(); struct fd_table_entry *entry; int do_unlock; int fd; |