22c52834eb
_thr_leave_cancellation_point to _thr_cancel_leave, add a parameter to _thr_cancel_leave to indicate whether cancellation point should be checked, this gives us an option to not check cancallation point if a syscall successfully returns to avoid any leaks, current I have creat(), open() and fcntl(F_DUPFD) to not check cancellation point after they sucessfully returned. Replace some members in structure kse with bit flags to same some memory. Conditionally compile THR_ASSERT to nothing if _PTHREAD_INVARIANTS is not defined. Inline some small functions in thr_cancel.c. Use __predict_false in thr_kern.c for some executed only once code. Reviewd by: deischen
79 lines
2.6 KiB
C
79 lines
2.6 KiB
C
/*
|
|
* Copyright (c) 1995-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 AUTHOR 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.
|
|
*
|
|
* $FreeBSD$
|
|
*/
|
|
#include <stdarg.h>
|
|
#include "namespace.h"
|
|
#include <fcntl.h>
|
|
#include "un-namespace.h"
|
|
#include <pthread.h>
|
|
#include "thr_private.h"
|
|
|
|
__weak_reference(__fcntl, fcntl);
|
|
|
|
int
|
|
__fcntl(int fd, int cmd,...)
|
|
{
|
|
struct pthread *curthread = _get_curthread();
|
|
int ret, check = 1;
|
|
va_list ap;
|
|
|
|
_thr_cancel_enter(curthread);
|
|
|
|
va_start(ap, cmd);
|
|
switch (cmd) {
|
|
case F_DUPFD:
|
|
ret = __sys_fcntl(fd, cmd, va_arg(ap, int));
|
|
/*
|
|
* To avoid possible file handle leak,
|
|
* only check cancellation point if it is failure
|
|
*/
|
|
check = (ret == -1);
|
|
break;
|
|
case F_SETFD:
|
|
case F_SETFL:
|
|
ret = __sys_fcntl(fd, cmd, va_arg(ap, int));
|
|
break;
|
|
case F_GETFD:
|
|
case F_GETFL:
|
|
ret = __sys_fcntl(fd, cmd);
|
|
break;
|
|
default:
|
|
ret = __sys_fcntl(fd, cmd, va_arg(ap, void *));
|
|
}
|
|
va_end(ap);
|
|
|
|
_thr_cancel_leave(curthread, check);
|
|
|
|
return (ret);
|
|
}
|