d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add wrapper for kqueue() to keep track of the allocated fd and allow it to

Browse Source 
be closed. This fixes a file descriptor leak when closing a kqueue() fd.

Reviewed by:	deischen
MFC after:	1 week
This commit is contained in:
Mark Peek 2003-07-25 17:02:33 +00:00
parent 44904c4020
commit 6fcd700395
2 changed files with 54 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/libc_r/uthread/Makefile.inc
View File

@ -77,6 +77,7 @@ SRCS+= \
uthread_join.c \
uthread_kern.c \
uthread_kevent.c \
uthread_kqueue.c \
uthread_kill.c \
uthread_listen.c \
uthread_main_np.c \

53
lib/libc_r/uthread/uthread_kqueue.c Normal file
View File

@ -0,0 +1,53 @@
/*
* Copyright (c) 2003 Mark Peek <mp@freebsd.org>
* 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.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 <sys/types.h>
#include <sys/event.h>
#include <fcntl.h>
#include <unistd.h>
#include <pthread.h>
#include "pthread_private.h"
__weak_reference(_kqueue, kqueue);
int
_kqueue(void)
{
int fd;
/* Create a kqueue: */
if ((fd = __sys_kqueue()) < 0) {
/* Error creating socket. */
/* Initialise the entry in the file descriptor table: */
} else if (_thread_fd_table_init(fd) != 0) {
__sys_close(fd);
fd = -1;
}
return (fd);
}