Attachment #13302 for bug #25393

View | Details | Raw Unified | Return to bug 25393
Collapse All | Expand All




static MALLOC_DEFINE(M_SELECT, "select", "select() buffer");
MALLOC_DEFINE(M_IOV, "iov", "large iov's");

static int	pollscan __P((struct proc *, struct pollfd *, u_int));
static int	selscan __P((struct proc *, fd_mask **, fd_mask **, int));
static int	dofileread __P((struct proc *, struct file *, int, void *,
		    size_t, off_t, int));

	caddr_t bits;
	char smallbits[32 * sizeof(struct pollfd)];
	struct timeval atv, rtv, ttv;
	int s, ncoll, error = 0, timo;
	u_int nfds;
	size_t ni;

	nfds = SCARG(uap, nfds);

pollscan(p, fds, nfd)
	struct proc *p;
	struct pollfd *fds;
	u_int nfd;
{
	register struct filedesc *fdp = p->p_fd;
	u_int i;
	struct file *fp;
	int n = 0;

Return to bug 25393

Lines 73-79 Link Here

(-)sys_generic.c (-4 / +5 lines)
73	static MALLOC_DEFINE(M_SELECT, "select", "select() buffer");	73	static MALLOC_DEFINE(M_SELECT, "select", "select() buffer");
74	MALLOC_DEFINE(M_IOV, "iov", "large iov's");	74	MALLOC_DEFINE(M_IOV, "iov", "large iov's");
75		75
76	static int pollscan __P((struct proc , struct pollfd , int));	76	static int pollscan __P((struct proc , struct pollfd , u_int));
77	static int selscan __P((struct proc , fd_mask , fd_mask *, int));	77	static int selscan __P((struct proc , fd_mask , fd_mask *, int));
78	static int dofileread __P((struct proc , struct file , int, void *,	78	static int dofileread __P((struct proc , struct file , int, void *,
79	size_t, off_t, int));	79	size_t, off_t, int));
Lines 858-864 Link Here
858	caddr_t bits;	858	caddr_t bits;
859	char smallbits[32 * sizeof(struct pollfd)];	859	char smallbits[32 * sizeof(struct pollfd)];
860	struct timeval atv, rtv, ttv;	860	struct timeval atv, rtv, ttv;
861	int s, ncoll, error = 0, timo, nfds;	861	int s, ncoll, error = 0, timo;
		862	u_int nfds;
862	size_t ni;	863	size_t ni;
863		864
864	nfds = SCARG(uap, nfds);	865	nfds = SCARG(uap, nfds);
Lines 945-954 Link Here
945	pollscan(p, fds, nfd)	946	pollscan(p, fds, nfd)
946	struct proc *p;	947	struct proc *p;
947	struct pollfd *fds;	948	struct pollfd *fds;
948	int nfd;	949	u_int nfd;
949	{	950	{
950	register struct filedesc *fdp = p->p_fd;	951	register struct filedesc *fdp = p->p_fd;
951	int i;	952	u_int i;
952	struct file *fp;	953	struct file *fp;
953	int n = 0;	954	int n = 0;