* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
* the file COPYING for details.
#include "inspircd.h"
#include "exitcodes.h"
-#include <sys/epoll.h>
#include "socketengines/socketengine_epoll.h"
#include <ulimit.h>
EPollEngine::EPollEngine(InspIRCd* Instance) : SocketEngine(Instance)
{
MAX_DESCRIPTORS = 0;
- EngineHandle = epoll_create(GetMaxFds());
+ // This is not a maximum, just a hint at the eventual number of sockets that may be polled.
+ EngineHandle = epoll_create(GetMaxFds() / 4);
if (EngineHandle == -1)
{
int fd = eh->GetFd();
if ((fd < 0) || (fd > GetMaxFds() - 1))
{
- ServerInstance->Logs->Log("SOCKET",DEBUG,"Out of range FD: (fd: %d, max: %d)", fd, GetMaxFds());
+ ServerInstance->Logs->Log("SOCKET",DEBUG,"AddFd out of range: (fd: %d, max: %d)", fd, GetMaxFds());
return false;
}
if (GetRemainingFds() <= 1)
+ {
+ ServerInstance->Logs->Log("SOCKET",DEBUG,"No remaining FDs cannot add fd: %d", fd);
return false;
+ }
if (ref[fd])
+ {
+ ServerInstance->Logs->Log("SOCKET",DEBUG,"Attempt to add duplicate fd: %d", fd);
return false;
+ }
struct epoll_event ev;
- memset(&ev,0,sizeof(struct epoll_event));
+ memset(&ev,0,sizeof(ev));
eh->Readable() ? ev.events = EPOLLIN : ev.events = EPOLLOUT;
ev.data.fd = fd;
int i = epoll_ctl(EngineHandle, EPOLL_CTL_ADD, fd, &ev);
if (i < 0)
{
+ ServerInstance->Logs->Log("SOCKET",DEBUG,"Error adding fd: %d to socketengine: %s", fd, strerror(errno));
return false;
}
* status for us and saves us a call.
*/
struct epoll_event ev;
- memset(&ev,0,sizeof(struct epoll_event));
- ev.events = EPOLLOUT;
+ memset(&ev,0,sizeof(ev));
+ ev.events = EPOLLIN | EPOLLOUT;
ev.data.fd = eh->GetFd();
epoll_ctl(EngineHandle, EPOLL_CTL_MOD, eh->GetFd(), &ev);
}
{
int fd = eh->GetFd();
if ((fd < 0) || (fd > GetMaxFds() - 1))
+ {
+ ServerInstance->Logs->Log("SOCKET",DEBUG,"DelFd out of range: (fd: %d, max: %d)", fd, GetMaxFds());
return false;
+ }
struct epoll_event ev;
- memset(&ev,0,sizeof(struct epoll_event));
+ memset(&ev,0,sizeof(ev));
eh->Readable() ? ev.events = EPOLLIN : ev.events = EPOLLOUT;
ev.data.fd = fd;
int i = epoll_ctl(EngineHandle, EPOLL_CTL_DEL, fd, &ev);
int EPollEngine::DispatchEvents()
{
- socklen_t codesize;
+ socklen_t codesize = sizeof(int);
int errcode;
int i = epoll_wait(EngineHandle, events, GetMaxFds() - 1, 1000);
{
WriteEvents++;
struct epoll_event ev;
- memset(&ev,0,sizeof(struct epoll_event));
+ memset(&ev,0,sizeof(ev));
ev.events = EPOLLIN;
ev.data.fd = events[j].data.fd;
epoll_ctl(EngineHandle, EPOLL_CTL_MOD, events[j].data.fd, &ev);