* | 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 "socketengines/socketengine_select.h"
-SelectEngine::SelectEngine(InspIRCd* Instance) : SocketEngine(Instance)
+SelectEngine::SelectEngine()
{
+ MAX_DESCRIPTORS = FD_SETSIZE;
EngineHandle = 0;
CurrentSetSize = 0;
- writeable = new bool [GetMaxFds()];
- memset(writeable, 0, sizeof(writeable));
+ writeable.assign(GetMaxFds(), false);
ref = new EventHandler* [GetMaxFds()];
memset(ref, 0, GetMaxFds() * sizeof(EventHandler*));
- ev = new EventHandler* [GetMaxFds()];
}
SelectEngine::~SelectEngine()
{
delete[] ref;
- delete[] ev;
}
-bool SelectEngine::AddFd(EventHandler* eh)
+bool SelectEngine::AddFd(EventHandler* eh, bool writeFirst)
{
int fd = eh->GetFd();
if ((fd < 0) || (fd > GetMaxFds() - 1))
if (ref[fd])
return false;
- fds[fd] = fd;
+ fds.insert(fd);
ref[fd] = eh;
CurrentSetSize++;
+ writeable[eh->GetFd()] = writeFirst;
+
ServerInstance->Logs->Log("SOCKET",DEBUG,"New file descriptor: %d", fd);
return true;
}
if ((fd < 0) || (fd > GetMaxFds() - 1))
return false;
- std::map<int,int>::iterator t = fds.find(fd);
+ std::set<int>::iterator t = fds.find(fd);
if (t != fds.end())
fds.erase(t);
int SelectEngine::DispatchEvents()
{
- int result = 0;
timeval tval;
int sresult = 0;
- socklen_t codesize;
- int errcode;
+ socklen_t codesize = sizeof(int);
+ int errcode = 0;
FD_ZERO(&wfdset);
FD_ZERO(&rfdset);
FD_ZERO(&errfdset);
- for (std::map<int,int>::iterator a = fds.begin(); a != fds.end(); a++)
+ /* Populate the select FD set (this is why select sucks compared to epoll, kqueue, IOCP) */
+ for (std::set<int>::iterator a = fds.begin(); a != fds.end(); a++)
{
- if (ref[a->second]->Readable())
- FD_SET (a->second, &rfdset);
+ /* Explicitly one-time writeable */
+ if (writeable[*a])
+ FD_SET (*a, &wfdset);
else
- FD_SET (a->second, &wfdset);
- if (writeable[a->second])
- FD_SET (a->second, &wfdset);
+ FD_SET (*a, &rfdset);
- FD_SET (a->second, &errfdset);
+ /* All sockets must receive error notifications regardless */
+ FD_SET (*a, &errfdset);
}
+ /* One second waits */
tval.tv_sec = 1;
tval.tv_usec = 0;
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)) || FD_ISSET (a->second, &errfdset))
- {
- ev[result++] = ref[a->second];
- }
- }
- }
+ /* Nothing to process this time around */
+ if (sresult < 1)
+ return 0;
- /** An event handler may remove its own descriptor from the list, therefore it is not
- * safe to directly iterate over the list and dispatch events there with STL iterators.
- * Thats a shame because it makes this code slower and more resource intensive, but maybe
- * the user should stop using select(), as select() smells anyway.
- */
- for (int i = 0; i < result; i++)
+ std::vector<int> copy(fds.begin(), fds.end());
+ for (std::vector<int>::iterator a = copy.begin(); a != copy.end(); a++)
{
- if (ev[i])
+ EventHandler* ev = ref[*a];
+ if (ev)
{
- if (FD_ISSET (ev[i]->GetFd(), &errfdset))
+ if (FD_ISSET (ev->GetFd(), &errfdset))
{
ErrorEvents++;
-
- if (getsockopt(ev[i]->GetFd(), SOL_SOCKET, SO_ERROR, (char*)&errcode, &codesize) < 0)
+ if (getsockopt(ev->GetFd(), SOL_SOCKET, SO_ERROR, (char*)&errcode, &codesize) < 0)
errcode = errno;
- ev[i]->HandleEvent(EVENT_ERROR, errcode);
-
+ ev->HandleEvent(EVENT_ERROR, errcode);
continue;
}
else
{
- if (writeable[ev[i]->GetFd()])
+ /* NOTE: This is a pair of seperate if statements as the socket
+ * may be in both read and writeable state at the same time.
+ * If an error event occurs above it is not worth processing the
+ * read and write states even if set.
+ */
+ if (FD_ISSET (ev->GetFd(), &wfdset))
{
WriteEvents++;
- writeable[ev[i]->GetFd()] = false;
- ev[i]->HandleEvent(EVENT_WRITE);
+ writeable[ev->GetFd()] = false;
+ ev->HandleEvent(EVENT_WRITE);
}
- else
+ if (FD_ISSET (ev->GetFd(), &rfdset))
{
- if (ev[i]->Readable())
- {
ReadEvents++;
- ev[i]->HandleEvent(EVENT_READ);
- }
- else
- {
- WriteEvents++;
- ev[i]->HandleEvent(EVENT_WRITE);
- }
+ ev->HandleEvent(EVENT_READ);
}
}
}
}
- return result;
+ return sresult;
}
std::string SelectEngine::GetName()
projects / user / henk / code / inspircd.git / blobdiff