* ---------------------------------------------------
*/
-#include "inspircd_config.h"
#include "inspircd.h"
#include <sys/epoll.h>
-#include <vector>
-#include <string>
#include "socketengine_epoll.h"
EPollEngine::EPollEngine(InspIRCd* Instance) : SocketEngine(Instance)
return false;
}
if (ref[fd])
+ {
+ ServerInstance->Log(DEFAULT,"Slot %d already occupied",fd);
return false;
+ }
ref[fd] = eh;
struct epoll_event ev;
memset(&ev,0,sizeof(struct epoll_event));
- ref[fd]->Readable() ? ev.events = EPOLLIN : ev.events = EPOLLOUT;
+ eh->Readable() ? ev.events = EPOLLIN : ev.events = EPOLLOUT;
ev.data.fd = fd;
int i = epoll_ctl(EngineHandle, EPOLL_CTL_DEL, fd, &ev);
if (i < 0)
return MAX_DESCRIPTORS - CurrentSetSize;
}
-int EPollEngine::Wait(EventHandler** fdlist)
+int EPollEngine::DispatchEvents()
{
- int result = 0;
-
int i = epoll_wait(EngineHandle, events, MAX_DESCRIPTORS, 50);
for (int j = 0; j < i; j++)
- fdlist[result++] = ref[events[j].data.fd];
+ {
+ ServerInstance->Log(DEBUG,"Handle %s event on fd %d",ref[events[j].data.fd]->Readable() ? "read" : "write", ref[events[j].data.fd]->GetFd());
+ ref[events[j].data.fd]->HandleEvent(ref[events[j].data.fd]->Readable() ? EVENT_READ : EVENT_WRITE);
+ }
- return result;
+ return i;
}
std::string EPollEngine::GetName()