* | 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.
#ifndef WINDOWS
#include <sys/select.h>
#endif // WINDOWS
-#include "socketengines/socketengine_select.h"
+/* +------------------------------------+
+ * | Inspire Internet Relay Chat Daemon |
+ * +------------------------------------+
+ *
+ * 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.
+ *
+ * ---------------------------------------------------
+ */
+
+#ifndef __SOCKETENGINE_SELECT__
+#define __SOCKETENGINE_SELECT__
+
+#include <vector>
+#include <string>
+#include <map>
+#ifndef WINDOWS
+#include <sys/select.h>
+#endif // WINDOWS
+#include "inspircd_config.h"
+#include "inspircd.h"
+#include "socketengine.h"
+
+/** A specialisation of the SocketEngine class, designed to use traditional select().
+ */
+class SelectEngine : public SocketEngine
+{
+public:
+ /** Create a new SelectEngine
+ */
+ SelectEngine();
+ /** Delete a SelectEngine
+ */
+ virtual ~SelectEngine();
+ virtual bool AddFd(EventHandler* eh, int event_mask);
+ virtual bool DelFd(EventHandler* eh, bool force = false);
+ void OnSetEvent(EventHandler* eh, int, int);
+ virtual int DispatchEvents();
+ virtual std::string GetName();
+};
+#endif
-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));
ref = new EventHandler* [GetMaxFds()];
memset(ref, 0, GetMaxFds() * sizeof(EventHandler*));
}
delete[] ref;
}
-bool SelectEngine::AddFd(EventHandler* eh)
+bool SelectEngine::AddFd(EventHandler* eh, int event_mask)
{
int fd = eh->GetFd();
if ((fd < 0) || (fd > GetMaxFds() - 1))
return false;
- if (GetRemainingFds() <= 1)
- return false;
-
if (ref[fd])
return false;
- fds[fd] = fd;
ref[fd] = eh;
+ SocketEngine::SetEventMask(eh, event_mask);
CurrentSetSize++;
ServerInstance->Logs->Log("SOCKET",DEBUG,"New file descriptor: %d", fd);
return true;
}
-void SelectEngine::WantWrite(EventHandler* eh)
-{
- writeable[eh->GetFd()] = true;
-}
-
bool SelectEngine::DelFd(EventHandler* eh, bool force)
{
int fd = eh->GetFd();
if ((fd < 0) || (fd > GetMaxFds() - 1))
return false;
- std::map<int,int>::iterator t = fds.find(fd);
- if (t != fds.end())
- fds.erase(t);
-
CurrentSetSize--;
ref[fd] = NULL;
return true;
}
-int SelectEngine::GetMaxFds()
-{
- return FD_SETSIZE;
-}
-
-int SelectEngine::GetRemainingFds()
+void SelectEngine::OnSetEvent(EventHandler* eh, int old_mask, int new_mask)
{
- return GetMaxFds() - CurrentSetSize;
+ // deal with it later
}
int SelectEngine::DispatchEvents()
socklen_t codesize = sizeof(int);
int errcode = 0;
+ fd_set wfdset, rfdset, errfdset;
FD_ZERO(&wfdset);
FD_ZERO(&rfdset);
FD_ZERO(&errfdset);
- /* Populate the select FD set (this is why select sucks compared to epoll, kqueue, IOCP) */
- for (std::map<int,int>::iterator a = fds.begin(); a != fds.end(); a++)
+ /* Populate the select FD sets (this is why select sucks compared to epoll, kqueue, IOCP) */
+ for (int i = 0; i < FD_SETSIZE; i++)
{
- if (ref[a->second]->Readable())
- /* Read notifications */
- FD_SET (a->second, &rfdset);
- else
- /* Write notifications */
- FD_SET (a->second, &wfdset);
-
- /* Explicitly one-time writeable */
- if (writeable[a->second])
- FD_SET (a->second, &wfdset);
-
- /* All sockets must receive error notifications regardless */
- FD_SET (a->second, &errfdset);
+ EventHandler* eh = ref[i];
+ if (!eh)
+ continue;
+ int state = eh->GetEventMask();
+ if (state & (FD_WANT_POLL_READ | FD_WANT_FAST_READ))
+ FD_SET (i, &rfdset);
+ if (state & (FD_WANT_POLL_WRITE | FD_WANT_FAST_WRITE | FD_WANT_SINGLE_WRITE))
+ FD_SET (i, &wfdset);
+ FD_SET (i, &errfdset);
}
- /* One second waits */
+ /* One second wait */
tval.tv_sec = 1;
tval.tv_usec = 0;
if (sresult < 1)
return 0;
- /* Safe assumption (as of 1.1 anyway) that a socket can't remove itself from the list in the middle of the loop */
- for (std::map<int,int>::iterator a = fds.begin(); a != fds.end(); a++)
+ for (int i = 0; i < FD_SETSIZE; i++)
{
- EventHandler* ev = ref[a->second];
+ EventHandler* ev = ref[i];
if (ev)
{
- if (FD_ISSET (ev->GetFd(), &errfdset))
+ if (FD_ISSET (i, &errfdset))
{
ErrorEvents++;
- if (getsockopt(ev->GetFd(), SOL_SOCKET, SO_ERROR, (char*)&errcode, &codesize) < 0)
+ if (getsockopt(i, SOL_SOCKET, SO_ERROR, (char*)&errcode, &codesize) < 0)
errcode = errno;
ev->HandleEvent(EVENT_ERROR, errcode);
* 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))
+ if (FD_ISSET (i, &rfdset))
{
- WriteEvents++;
- writeable[ev->GetFd()] = false;
- ev->HandleEvent(EVENT_WRITE);
+ ReadEvents++;
+ SetEventMask(ev, ev->GetEventMask() & ~FD_READ_WILL_BLOCK);
+ ev->HandleEvent(EVENT_READ);
}
- if (FD_ISSET (ev->GetFd(), &rfdset))
+ if (FD_ISSET (i, &wfdset))
{
- ReadEvents++;
- ev->HandleEvent(EVENT_READ);
+ WriteEvents++;
+ SetEventMask(ev, ev->GetEventMask() & ~(FD_WRITE_WILL_BLOCK | FD_WANT_SINGLE_WRITE));
+ ev->HandleEvent(EVENT_WRITE);
}
}
}
{
return "select";
}
+
+SocketEngine* CreateSocketEngine()
+{
+ return new SelectEngine;
+}
projects / user / henk / code / inspircd.git / blobdiff