SelectEngine::SelectEngine(InspIRCd* Instance) : SocketEngine(Instance)
{
- ServerInstance->Log(DEBUG,"SelectEngine::SelectEngine()");
EngineHandle = 0;
CurrentSetSize = 0;
memset(writeable, 0, sizeof(writeable));
SelectEngine::~SelectEngine()
{
- ServerInstance->Log(DEBUG,"SelectEngine::~SelectEngine()");
}
bool SelectEngine::AddFd(EventHandler* eh)
{
int fd = eh->GetFd();
if ((fd < 0) || (fd > MAX_DESCRIPTORS))
- {
- ServerInstance->Log(DEBUG,"ERROR: FD of %d added above max of %d",fd,MAX_DESCRIPTORS);
return false;
- }
+
if (GetRemainingFds() <= 1)
- {
- ServerInstance->Log(DEBUG,"ERROR: System out of file descriptors!");
return false;
- }
fds[fd] = fd;
return false;
ref[fd] = eh;
- ServerInstance->Log(DEBUG,"Add socket %d",fd);
-
CurrentSetSize++;
+
+ ServerInstance->Log(DEBUG,"New file descriptor: %d", fd);
return true;
}
writeable[eh->GetFd()] = true;
}
-bool SelectEngine::DelFd(EventHandler* eh)
+bool SelectEngine::DelFd(EventHandler* eh, bool force)
{
int fd = eh->GetFd();
- ServerInstance->Log(DEBUG,"SelectEngine::DelFd(%d)",fd);
-
if ((fd < 0) || (fd > MAX_DESCRIPTORS))
return false;
std::map<int,int>::iterator t = fds.find(fd);
if (t != fds.end())
- {
fds.erase(t);
- ServerInstance->Log(DEBUG,"Deleted fd %d",fd);
- }
CurrentSetSize--;
ref[fd] = NULL;
+
+ ServerInstance->Log(DEBUG,"Remove file descriptor: %d", fd);
return true;
}
FD_SET (a->second, &errfdset);
}
- tval.tv_sec = 0;
- tval.tv_usec = 50L;
+ tval.tv_sec = 1;
+ tval.tv_usec = 0;
sresult = select(FD_SETSIZE, &rfdset, &wfdset, &errfdset, &tval);
if (sresult > 0)
{
}
if (ev[i])
{
- ServerInstance->Log(DEBUG,"Handle %s event on fd %d",writeable[ev[i]->GetFd()] || !ev[i]->Readable() ? "write" : "read", ev[i]->GetFd());
if (writeable[ev[i]->GetFd()])
{
+ writeable[ev[i]->GetFd()] = false;
if (ev[i])
ev[i]->HandleEvent(EVENT_WRITE);
- writeable[ev[i]->GetFd()] = false;
-
}
else
{