ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/svn/ircd-hybrid/trunk/src/s_bsd_kqueue.c

Comparing:
ircd-hybrid-8/src/s_bsd_kqueue.c (file contents), Revision 1247 by michael, Sat Oct 1 07:54:24 2011 UTC vs.
ircd-hybrid/trunk/src/s_bsd_kqueue.c (file contents), Revision 5347 by michael, Sun Jan 11 12:42:20 2015 UTC

#	Line 1 | Line 1
1		/*
2	<	*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3	<	*  s_bsd_kqueue.c: FreeBSD kqueue compatible network routines.
2	>	*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Originally by Adrian Chadd <adrian@creative.net.au>
6	<	*  Copyright (C) 2005 Hybrid Development Team
4	>	*  Copyright (c) 2000-2015 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 17 | Line 15
15		*
16		*  You should have received a copy of the GNU General Public License
17		*  along with this program; if not, write to the Free Software
18	<	*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
18	>	*  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
19		*  USA
20	<	*
21	<	*  $Id$
20	>	*/
21	>
22	>	/*! \file s_bsd_kqueue.c
23	>	* \brief kqueue() compatible network routines.
24	>	* \version $Id$
25		*/
26
27		#include "stdinc.h"
#	Line 28 | Line 29
29		#include <sys/event.h>
30		#include "fdlist.h"
31		#include "ircd.h"
31	–	#include "memory.h"
32		#include "s_bsd.h"
33	<	#include "s_log.h"
33	>	#include "log.h"
34
35		#define KE_LENGTH 128
36
37	–	/* jlemon goofed up and didn't add EV_SET until fbsd 4.3 */
38	–
39	–	#ifndef EV_SET
40	–	#define EV_SET(kevp, a, b, c, d, e, f) do {     \
41	–	(kevp)->ident = (a);                    \
42	–	(kevp)->filter = (b);                   \
43	–	(kevp)->flags = (c);                    \
44	–	(kevp)->fflags = (d);                   \
45	–	(kevp)->data = (e);                     \
46	–	(kevp)->udata = (f);                    \
47	–	} while(0)
48	–	#endif
49	–
37		static fde_t kqfd;
38		static struct kevent kq_fdlist[KE_LENGTH];  /* kevent buffer */
39		static int kqoff;      /* offset into the buffer */
40	<	void init_netio(void);
40	>
41
42		/*
43		* init_netio
#	Line 85 | Line 72 | kq_update_events(int fd, int filter, int
72
73		if (++kqoff == KE_LENGTH)
74		{
75	<	kevent(kqfd.fd, kq_fdlist, kqoff, NULL, 0, &zero_timespec);
75	>	int i;
76	>
77	>	for (i = 0; i < kqoff; ++i)
78	>	kevent(kqfd.fd, &kq_fdlist[i], 1, NULL, 0, &zero_timespec);
79		kqoff = 0;
80		}
81		}
#	Line 97 | Line 87 | kq_update_events(int fd, int filter, int
87		* and deregister interest in a pending IO state for a given FD.
88		*/
89		void
90	<	comm_setselect(fde_t *F, unsigned int type, PF *handler,
90	>	comm_setselect(fde_t *F, unsigned int type, void (*handler)(fde_t *, void *),
91		void *client_data, time_t timeout)
92		{
93		int new_events, diff;
#	Line 115 | Line 105 | comm_setselect(fde_t *F, unsigned int ty
105		}
106
107		new_events = (F->read_handler ? COMM_SELECT_READ : 0) |
108	<	(F->write_handler ? COMM_SELECT_WRITE : 0);
108	>	(F->write_handler ? COMM_SELECT_WRITE : 0);
109
110		if (timeout != 0)
111	+	{
112		F->timeout = CurrentTime + (timeout / 1000);
113	+	F->timeout_handler = handler;
114	+	F->timeout_data = client_data;
115	+	}
116
117		diff = new_events ^ F->evcache;
118
#	Line 146 | Line 140 | comm_select(void)
140		int num, i;
141		static struct kevent ke[KE_LENGTH];
142		struct timespec poll_time;
143	<	PF *hdl;
143	>	void (*hdl)(fde_t *, void *);
144		fde_t *F;
145
146		/*
#	Line 176 | Line 170 | comm_select(void)
170		continue;
171
172		if (ke[i].filter == EVFILT_READ)
173	+	{
174		if ((hdl = F->read_handler) != NULL)
175		{
176		F->read_handler = NULL;
177		hdl(F, F->read_data);
178	<	if (!F->flags.open)
179	<	continue;
178	>	if (!F->flags.open)
179	>	continue;
180		}
181	+	}
182
183		if (ke[i].filter == EVFILT_WRITE)
184	+	{
185		if ((hdl = F->write_handler) != NULL)
186		{
187		F->write_handler = NULL;
188		hdl(F, F->write_data);
189	<	if (!F->flags.open)
190	<	continue;
189	>	if (!F->flags.open)
190	>	continue;
191		}
192	+	}
193
194		comm_setselect(F, 0, NULL, NULL, 0);
195		}

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)