ViewVC Help

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

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

Comparing:
ircd-hybrid-7.2/src/s_bsd_epoll.c (file contents), Revision 34 by lusky, Sun Oct 2 21:05:51 2005 UTC vs.
ircd-hybrid/trunk/src/s_bsd_epoll.c (file contents), Revision 1592 by michael, Sat Oct 27 21:02:32 2012 UTC

#	Line 24 | Line 24
24		*/
25
26		#include "stdinc.h"
27	+	#if USE_IOPOLL_MECHANISM == __IOPOLL_MECHANISM_EPOLL
28		#include "fdlist.h"
29		#include "ircd.h"
30		#include "memory.h"
31		#include "s_bsd.h"
32	<	#include "s_log.h"
32	>	#include "log.h"
33		#include <sys/epoll.h>
34		#include <sys/syscall.h>
35
#	Line 103 | Line 104 | init_netio(void)
104
105		if ((fd = epoll_create(hard_fdlimit)) < 0)
106		{
107	<	ilog(L_CRIT, "init_netio: Couldn't open epoll fd - %d: %s",
107	>	ilog(LOG_TYPE_IRCD, "init_netio: Couldn't open epoll fd - %d: %s",
108		errno, strerror(errno));
109		exit(115); /* Whee! */
110		}
#	Line 122 | Line 123 | comm_setselect(fde_t *F, unsigned int ty
123		void *client_data, time_t timeout)
124		{
125		int new_events, op;
126	<	struct epoll_event ep_event;
126	>	struct epoll_event ep_event = { 0, { 0 } };
127
128		if ((type & COMM_SELECT_READ))
129		{
#	Line 156 | Line 157 | comm_setselect(fde_t *F, unsigned int ty
157
158		if (epoll_ctl(efd.fd, op, F->fd, &ep_event) != 0)
159		{
160	<	ilog(L_CRIT, "comm_setselect: epoll_ctl() failed: %s", strerror(errno));
160	>	ilog(LOG_TYPE_IRCD, "comm_setselect: epoll_ctl() failed: %s", strerror(errno));
161		abort();
162		}
163		}
#	Line 217 | Line 218 | comm_select(void)
218		comm_setselect(F, 0, NULL, NULL, 0);
219		}
220		}
221	+	#endif

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines