Deleted Added
full compact
thr_syscalls.c (281712) thr_syscalls.c (281714)
1/*
2 * Copyright (c) 2014 The FreeBSD Foundation.
3 * Copyright (C) 2005 David Xu <davidxu@freebsd.org>.
4 * Copyright (c) 2003 Daniel Eischen <deischen@freebsd.org>.
5 * Copyright (C) 2000 Jason Evans <jasone@freebsd.org>.
6 * All rights reserved.
7 *
8 * Portions of this software were developed by Konstantin Belousov

--- 50 unchanged lines hidden (view full) ---

59 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
60 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
61 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
62 * SUCH DAMAGE.
63 *
64 */
65
66#include <sys/cdefs.h>
1/*
2 * Copyright (c) 2014 The FreeBSD Foundation.
3 * Copyright (C) 2005 David Xu <davidxu@freebsd.org>.
4 * Copyright (c) 2003 Daniel Eischen <deischen@freebsd.org>.
5 * Copyright (C) 2000 Jason Evans <jasone@freebsd.org>.
6 * All rights reserved.
7 *
8 * Portions of this software were developed by Konstantin Belousov

--- 50 unchanged lines hidden (view full) ---

59 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
60 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
61 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
62 * SUCH DAMAGE.
63 *
64 */
65
66#include <sys/cdefs.h>
67__FBSDID("$FreeBSD: head/lib/libthr/thread/thr_syscalls.c 281712 2015-04-18 21:35:41Z kib $");
67__FBSDID("$FreeBSD: head/lib/libthr/thread/thr_syscalls.c 281714 2015-04-18 21:50:13Z kib $");
68
69#include "namespace.h"
70#include <sys/types.h>
71#include <sys/mman.h>
72#include <sys/param.h>
73#include <sys/select.h>
74#include <sys/signalvar.h>
75#include <sys/socket.h>

--- 14 unchanged lines hidden (view full) ---

90#include <termios.h>
91#include <unistd.h>
92#include <pthread.h>
93#include "un-namespace.h"
94
95#include "libc_private.h"
96#include "thr_private.h"
97
68
69#include "namespace.h"
70#include <sys/types.h>
71#include <sys/mman.h>
72#include <sys/param.h>
73#include <sys/select.h>
74#include <sys/signalvar.h>
75#include <sys/socket.h>

--- 14 unchanged lines hidden (view full) ---

90#include <termios.h>
91#include <unistd.h>
92#include <pthread.h>
93#include "un-namespace.h"
94
95#include "libc_private.h"
96#include "thr_private.h"
97
98#ifdef SYSCALL_COMPAT
99extern int __fcntl_compat(int, int, ...);
100#endif
101
102static int
103__thr_accept(int s, struct sockaddr *addr, socklen_t *addrlen)
104{
105 struct pthread *curthread;
106 int ret;
107
108 curthread = _get_curthread();
109 _thr_cancel_enter(curthread);

--- 88 unchanged lines hidden (view full) ---

198 struct pthread *curthread;
199 int ret;
200 va_list ap;
201
202 curthread = _get_curthread();
203 va_start(ap, cmd);
204 if (cmd == F_OSETLKW || cmd == F_SETLKW) {
205 _thr_cancel_enter(curthread);
98static int
99__thr_accept(int s, struct sockaddr *addr, socklen_t *addrlen)
100{
101 struct pthread *curthread;
102 int ret;
103
104 curthread = _get_curthread();
105 _thr_cancel_enter(curthread);

--- 88 unchanged lines hidden (view full) ---

194 struct pthread *curthread;
195 int ret;
196 va_list ap;
197
198 curthread = _get_curthread();
199 va_start(ap, cmd);
200 if (cmd == F_OSETLKW || cmd == F_SETLKW) {
201 _thr_cancel_enter(curthread);
206#ifdef SYSCALL_COMPAT
207 ret = __fcntl_compat(fd, cmd, va_arg(ap, void *));
208#else
209 ret = __sys_fcntl(fd, cmd, va_arg(ap, void *));
202 ret = __sys_fcntl(fd, cmd, va_arg(ap, void *));
210#endif
211 _thr_cancel_leave(curthread, ret == -1);
212 } else {
203 _thr_cancel_leave(curthread, ret == -1);
204 } else {
213#ifdef SYSCALL_COMPAT
214 ret = __fcntl_compat(fd, cmd, va_arg(ap, void *));
215#else
216 ret = __sys_fcntl(fd, cmd, va_arg(ap, void *));
205 ret = __sys_fcntl(fd, cmd, va_arg(ap, void *));
217#endif
218 }
219 va_end(ap);
220
221 return (ret);
222}
223
224/*
225 * Cancellation behavior:

--- 446 unchanged lines hidden ---
206 }
207 va_end(ap);
208
209 return (ret);
210}
211
212/*
213 * Cancellation behavior:

--- 446 unchanged lines hidden ---