* +------------------------------------+
*
* InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
* the file COPYING for details.
#include "inspircd.h"
#include "exitcodes.h"
-#include "socketengines/socketengine_poll.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_POLL__
+#define __SOCKETENGINE_POLL__
+
+#include <vector>
+#include <string>
+#include <map>
+#include "inspircd_config.h"
+#include "inspircd.h"
+#include "socketengine.h"
+
+#ifndef WINDOWS
+ #ifndef __USE_XOPEN
+ #define __USE_XOPEN /* fuck every fucking OS ever made. needed by poll.h to work.*/
+ #endif
+ #include <poll.h>
+ #include <sys/poll.h>
+#else
+ /* *grumble* */
+ #define struct pollfd WSAPOLLFD
+ #define poll WSAPoll
+#endif
+
+class InspIRCd;
+
+/** A specialisation of the SocketEngine class, designed to use poll().
+ */
+class PollEngine : public SocketEngine
+{
+private:
+ /** These are used by poll() to hold socket events
+ */
+ struct pollfd *events;
+ /** This map maps fds to an index in the events array.
+ */
+ std::map<int, unsigned int> fd_mappings;
+public:
+ /** Create a new PollEngine
+ */
+ PollEngine();
+ /** Delete a PollEngine
+ */
+ virtual ~PollEngine();
+ virtual bool AddFd(EventHandler* eh, int event_mask);
+ virtual void OnSetEvent(EventHandler* eh, int old_mask, int new_mask);
+ virtual EventHandler* GetRef(int fd);
+ virtual bool DelFd(EventHandler* eh, bool force = false);
+ virtual int DispatchEvents();
+ virtual std::string GetName();
+};
+
+#endif
+
#include <ulimit.h>
#ifdef __FreeBSD__
#include <sys/sysctl.h>
#endif
-PollEngine::PollEngine(InspIRCd* Instance) : SocketEngine(Instance)
+PollEngine::PollEngine()
{
- // Poll requires no special setup (which is nice).
CurrentSetSize = 0;
- MAX_DESCRIPTORS = 0;
+#ifndef __FreeBSD__
+ int max = ulimit(4, 0);
+ if (max > 0)
+ {
+ MAX_DESCRIPTORS = max;
+ }
+ else
+ {
+ ServerInstance->Logs->Log("SOCKET", DEFAULT, "ERROR: Can't determine maximum number of open sockets: %s", strerror(errno));
+ printf("ERROR: Can't determine maximum number of open sockets: %s\n", strerror(errno));
+ ServerInstance->Exit(EXIT_STATUS_SOCKETENGINE);
+ }
+#else
+ int mib[2];
+ size_t len;
+
+ mib[0] = CTL_KERN;
+ mib[1] = KERN_MAXFILES;
+ len = sizeof(MAX_DESCRIPTORS);
+ sysctl(mib, 2, &MAX_DESCRIPTORS, &len, NULL, 0);
+#endif
ref = new EventHandler* [GetMaxFds()];
events = new struct pollfd[GetMaxFds()];
delete[] events;
}
-bool PollEngine::AddFd(EventHandler* eh)
+static int mask_to_poll(int event_mask)
+{
+ int rv = 0;
+ if (event_mask & (FD_WANT_POLL_READ | FD_WANT_FAST_READ))
+ rv |= POLLIN;
+ if (event_mask & (FD_WANT_POLL_WRITE | FD_WANT_FAST_WRITE | FD_WANT_SINGLE_WRITE))
+ rv |= POLLOUT;
+ return rv;
+}
+
+bool PollEngine::AddFd(EventHandler* eh, int event_mask)
{
int fd = eh->GetFd();
if ((fd < 0) || (fd > GetMaxFds() - 1))
return false;
}
- if (GetRemainingFds() <= 1)
- {
- ServerInstance->Logs->Log("SOCKET",DEBUG,"No remaining FDs cannot add fd: %d", fd);
- return false;
- }
-
if (fd_mappings.find(fd) != fd_mappings.end())
{
ServerInstance->Logs->Log("SOCKET",DEBUG,"Attempt to add duplicate fd: %d", fd);
fd_mappings[fd] = index;
ref[index] = eh;
events[index].fd = fd;
- if (eh->Readable())
- {
- events[index].events = POLLIN;
- }
- else
- {
- events[index].events = POLLOUT;
- }
+ events[index].events = mask_to_poll(event_mask);
ServerInstance->Logs->Log("SOCKET", DEBUG,"New file descriptor: %d (%d; index %d)", fd, events[fd].events, index);
+ SocketEngine::SetEventMask(eh, event_mask);
CurrentSetSize++;
return true;
}
return ref[it->second];
}
-void PollEngine::WantWrite(EventHandler* eh)
+void PollEngine::OnSetEvent(EventHandler* eh, int old_mask, int new_mask)
{
std::map<int, unsigned int>::iterator it = fd_mappings.find(eh->GetFd());
if (it == fd_mappings.end())
{
- ServerInstance->Logs->Log("SOCKET",DEBUG,"WantWrite() on unknown fd: %d", eh->GetFd());
+ ServerInstance->Logs->Log("SOCKET",DEBUG,"SetEvents() on unknown fd: %d", eh->GetFd());
return;
}
- events[it->second].events = POLLIN | POLLOUT;
+ events[it->second].events = mask_to_poll(new_mask);
}
bool PollEngine::DelFd(EventHandler* eh, bool force)
return true;
}
-int PollEngine::GetMaxFds()
-{
-#ifndef __FreeBSD__
- if (MAX_DESCRIPTORS)
- return MAX_DESCRIPTORS;
-
- int max = ulimit(4, 0);
- if (max > 0)
- {
- MAX_DESCRIPTORS = max;
- return max;
- }
- else
- {
- MAX_DESCRIPTORS = 0;
- ServerInstance->Logs->Log("SOCKET", DEFAULT, "ERROR: Can't determine maximum number of open sockets: %s", strerror(errno));
- printf("ERROR: Can't determine maximum number of open sockets: %s\n", strerror(errno));
- ServerInstance->Exit(EXIT_STATUS_SOCKETENGINE);
- }
- return 0;
-#else
- if (!MAX_DESCRIPTORS)
- {
- int mib[2], maxfiles;
- size_t len;
-
- mib[0] = CTL_KERN;
- mib[1] = KERN_MAXFILES;
- len = sizeof(maxfiles);
- sysctl(mib, 2, &maxfiles, &len, NULL, 0);
- MAX_DESCRIPTORS = maxfiles;
- return maxfiles;
- }
- return MAX_DESCRIPTORS;
-#endif
-}
-
-int PollEngine::GetRemainingFds()
-{
- return MAX_DESCRIPTORS - CurrentSetSize;
-}
-
int PollEngine::DispatchEvents()
{
int i = poll(events, CurrentSetSize, 1000);
{
if (events[index].revents)
processed++;
+ EventHandler* eh = ref[index];
+ if (!eh)
+ continue;
if (events[index].revents & POLLHUP)
{
- if (ref[index])
- ref[index]->HandleEvent(EVENT_ERROR, 0);
+ eh->HandleEvent(EVENT_ERROR, 0);
continue;
}
// Get error number
if (getsockopt(fd, SOL_SOCKET, SO_ERROR, &errcode, &codesize) < 0)
errcode = errno;
- if (ref[index])
- ref[index]->HandleEvent(EVENT_ERROR, errcode);
+ eh->HandleEvent(EVENT_ERROR, errcode);
continue;
}
- if (events[index].revents & POLLOUT)
+ if (events[index].revents & POLLIN)
{
- // Switch to wanting read again
- // event handlers have to request to write again if they need it
- events[index].events = POLLIN;
-
- if (ref[index])
- ref[index]->HandleEvent(EVENT_WRITE);
+ SetEventMask(eh, eh->GetEventMask() & ~FD_READ_WILL_BLOCK);
+ eh->HandleEvent(EVENT_READ);
}
-
- if (events[index].revents & POLLIN)
+
+ if (events[index].revents & POLLOUT)
{
- if (ref[index])
- ref[index]->HandleEvent(EVENT_READ);
+ int mask = eh->GetEventMask();
+ mask &= ~(FD_WRITE_WILL_BLOCK | FD_WANT_SINGLE_WRITE);
+ SetEventMask(eh, mask);
+ events[index].events = mask_to_poll(mask);
+ eh->HandleEvent(EVENT_WRITE);
}
}
}
return "poll";
}
+SocketEngine* CreateSocketEngine()
+{
+ return new PollEngine;
+}
projects / user / henk / code / inspircd.git / blobdiff