ServerInstance->Log(DEBUG,"SelectEngine::SelectEngine()");
EngineHandle = 0;
CurrentSetSize = 0;
+ memset(writeable, 0, sizeof(writeable));
}
SelectEngine::~SelectEngine()
int fd = eh->GetFd();
if ((fd < 0) || (fd > MAX_DESCRIPTORS))
{
- ServerInstance->Log(DEFAULT,"ERROR: FD of %d added above max of %d",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(DEFAULT,"ERROR: System out of file descriptors!");
+ ServerInstance->Log(DEBUG,"ERROR: System out of file descriptors!");
return false;
}
return true;
}
+void SelectEngine::WantWrite(EventHandler* eh)
+{
+ writeable[eh->GetFd()] = true;
+}
+
bool SelectEngine::DelFd(EventHandler* eh)
{
int fd = eh->GetFd();
timeval tval;
int sresult = 0;
EventHandler* ev[MAX_DESCRIPTORS];
+ socklen_t codesize;
+ int errcode;
FD_ZERO(&wfdset);
FD_ZERO(&rfdset);
+ FD_ZERO(&errfdset);
for (std::map<int,int>::iterator a = fds.begin(); a != fds.end(); a++)
{
if (ref[a->second]->Readable())
- {
FD_SET (a->second, &rfdset);
- }
else
- {
FD_SET (a->second, &wfdset);
- }
-
+ if (writeable[a->second])
+ FD_SET (a->second, &wfdset);
+
+ FD_SET (a->second, &errfdset);
}
tval.tv_sec = 0;
tval.tv_usec = 50L;
- sresult = select(FD_SETSIZE, &rfdset, &wfdset, NULL, &tval);
+ sresult = select(FD_SETSIZE, &rfdset, &wfdset, &errfdset, &tval);
if (sresult > 0)
{
for (std::map<int,int>::iterator a = fds.begin(); a != fds.end(); a++)
{
- if ((FD_ISSET (a->second, &rfdset)) || (FD_ISSET (a->second, &wfdset)))
+ if ((FD_ISSET (a->second, &rfdset)) || (FD_ISSET (a->second, &wfdset)) || FD_ISSET (a->second, &errfdset))
{
ev[result++] = ref[a->second];
}
*/
for (int i = 0; i < result; i++)
{
- ServerInstance->Log(DEBUG,"Handle %s event on fd %d",ev[i]->Readable() ? "read" : "write", ev[i]->GetFd());
- ev[i]->HandleEvent(ev[i]->Readable() ? EVENT_READ : EVENT_WRITE);
+ if (ev[i])
+ {
+ if (FD_ISSET (ev[i]->GetFd(), &errfdset))
+ {
+ if (ev[i])
+ {
+ if (getsockopt(ev[i]->GetFd(), SOL_SOCKET, SO_ERROR, &errcode, &codesize) < 0)
+ errcode = errno;
+ ev[i]->HandleEvent(EVENT_ERROR, errcode);
+ }
+ continue;
+ }
+ 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()])
+ {
+ if (ev[i])
+ ev[i]->HandleEvent(EVENT_WRITE);
+ writeable[ev[i]->GetFd()] = false;
+
+ }
+ else
+ {
+ if (ev[i])
+ ev[i]->HandleEvent(ev[i]->Readable() ? EVENT_READ : EVENT_WRITE);
+ }
+ }
}
return result;