* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * 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 <port.h>
-#include "socketengines/socketengine_ports.h"
+
+#ifndef __SOCKETENGINE_PORTS__
+#define __SOCKETENGINE_PORTS__
+
+#ifndef __sun
+# error You need Solaris 10 or later to make use of this code.
+#endif
+
+#include <vector>
+#include <string>
+#include <map>
+#include "inspircd_config.h"
+#include "inspircd.h"
+#include "socketengine.h"
+#include <port.h>
+
+/** A specialisation of the SocketEngine class, designed to use solaris 10 I/O completion ports
+ */
+class PortsEngine : public SocketEngine
+{
+private:
+ /** These are used by epoll() to hold socket events
+ */
+ port_event_t* events;
+public:
+ /** Create a new PortsEngine
+ * @param Instance The creator of this object
+ */
+ PortsEngine();
+ /** Delete a PortsEngine
+ */
+ virtual ~PortsEngine();
+ virtual bool AddFd(EventHandler* eh, int event_mask);
+ void OnSetEvent(EventHandler* eh, int old_event, int new_event);
+ virtual void DelFd(EventHandler* eh);
+ virtual int DispatchEvents();
+ virtual std::string GetName();
+ virtual void WantWrite(EventHandler* eh);
+};
+
+#endif
+
+
#include <ulimit.h>
-PortsEngine::PortsEngine(InspIRCd* Instance) : SocketEngine(Instance)
+PortsEngine::PortsEngine()
{
- MAX_DESCRIPTORS = 0;
+ int max = ulimit(4, 0);
+ if (max > 0)
+ {
+ MAX_DESCRIPTORS = max;
+ return max;
+ }
+ else
+ {
+ ServerInstance->Logs->Log("SOCKET", DEFAULT, "ERROR: Can't determine maximum number of open sockets!");
+ printf("ERROR: Can't determine maximum number of open sockets!\n");
+ ServerInstance->Exit(EXIT_STATUS_SOCKETENGINE);
+ }
EngineHandle = port_create();
if (EngineHandle == -1)
delete[] events;
}
-bool PortsEngine::AddFd(EventHandler* eh)
+static int mask_to_events(int event_mask)
+{
+ int rv = 0;
+ if (event_mask & (FD_WANT_POLL_READ | FD_WANT_FAST_READ))
+ rv |= POLLRDNORM;
+ if (event_mask & (FD_WANT_POLL_WRITE | FD_WANT_FAST_WRITE | FD_WANT_SINGLE_WRITE))
+ rv |= POLLWRNORM;
+ return rv;
+}
+
+bool PortsEngine::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;
ref[fd] = eh;
- port_associate(EngineHandle, PORT_SOURCE_FD, fd, eh->Readable() ? POLLRDNORM : POLLWRNORM, eh);
+ SocketEngine::SetEventMask(eh, event_mask);
+ port_associate(EngineHandle, PORT_SOURCE_FD, fd, mask_to_events(event_mask), eh);
ServerInstance->Logs->Log("SOCKET",DEBUG,"New file descriptor: %d", fd);
CurrentSetSize++;
return true;
}
-void PortsEngine::WantWrite(EventHandler* eh)
+void PortsEngine::WantWrite(EventHandler* eh, int old_mask, int new_mask)
{
- port_associate(EngineHandle, PORT_SOURCE_FD, eh->GetFd(), POLLRDNORM | POLLWRNORM, eh);
+ if (mask_to_events(new_mask) != mask_to_events(old_mask))
+ port_associate(EngineHandle, PORT_SOURCE_FD, eh->GetFd(), mask_to_events(new_mask), eh);
}
-bool PortsEngine::DelFd(EventHandler* eh, bool force)
+void PortsEngine::DelFd(EventHandler* eh)
{
int fd = eh->GetFd();
if ((fd < 0) || (fd > GetMaxFds() - 1))
- return false;
+ return;
port_dissociate(EngineHandle, PORT_SOURCE_FD, fd);
return true;
}
-int PortsEngine::GetMaxFds()
-{
- if (MAX_DESCRIPTORS)
- return MAX_DESCRIPTORS;
-
- int max = ulimit(4, 0);
- if (max > 0)
- {
- MAX_DESCRIPTORS = max;
- return max;
- }
- else
- {
- ServerInstance->Logs->Log("SOCKET", DEFAULT, "ERROR: Can't determine maximum number of open sockets!");
- printf("ERROR: Can't determine maximum number of open sockets!\n");
- ServerInstance->Exit(EXIT_STATUS_SOCKETENGINE);
- }
-#include <ulimit.h>
-}
-
-int PortsEngine::GetRemainingFds()
-{
- return GetMaxFds() - CurrentSetSize;
-}
-
int PortsEngine::DispatchEvents()
{
struct timespec poll_time;
unsigned int nget = 1; // used to denote a retrieve request.
int i = port_getn(EngineHandle, this->events, GetMaxFds() - 1, &nget, &poll_time);
+ ServerInstance->UpdateTime();
// first handle an error condition
if (i == -1)
case PORT_SOURCE_FD:
{
int fd = this->events[i].portev_object;
- if (ref[fd])
+ EventHandler* eh = ref[fd];
+ if (eh)
{
- // reinsert port for next time around
- port_associate(EngineHandle, PORT_SOURCE_FD, fd, POLLRDNORM, ref[fd]);
- if ((this->events[i].portev_events & POLLRDNORM))
+ int mask = eh->GetEventMask();
+ if (events[i].portev_events & POLLWRNORM)
+ mask &= ~(FD_WRITE_WILL_BLOCK | FD_WANT_FAST_WRITE | FD_WANT_SINGLE_WRITE);
+ if (events[i].portev_events & POLLRDNORM)
+ mask &= ~FD_READ_WILL_BLOCK;
+ // reinsert port for next time around, pretending to be one-shot for writes
+ SetEventMask(ev, mask);
+ port_associate(EngineHandle, PORT_SOURCE_FD, fd, mask_to_events(mask), eh);
+ if (events[i].portev_events & POLLRDNORM)
+ {
ReadEvents++;
- else
+ eh->HandleEvent(EVENT_READ);
+ if (eh != ref[fd])
+ continue;
+ }
+ if (events[i].portev_events & POLLWRNORM)
+ {
WriteEvents++;
- ref[fd]->HandleEvent((this->events[i].portev_events & POLLRDNORM) ? EVENT_READ : EVENT_WRITE);
+ eh->HandleEvent(EVENT_WRITE);
+ }
}
}
default:
return "ports";
}
+SocketEngine* CreateSocketEngine()
+{
+ return new PortsEngine;
+}
projects / user / henk / code / inspircd.git / blobdiff