-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ * Copyright (C) 2007-2008 Craig Edwards <craigedwards@brainbox.cc>
*
- * This program is free but copyrighted software; see
- * the file COPYING for details.
+ * This file is part of InspIRCd. InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
*
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+
#include "inspircd.h"
#include "exitcodes.h"
#include <port.h>
-#include "socketengines/socketengine_ports.h"
-PortsEngine::PortsEngine(InspIRCd* Instance) : SocketEngine(Instance)
+#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>
+#include <iostream>
+
+/** 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;
+ int EngineHandle;
+public:
+ /** Create a new PortsEngine
+ */
+ PortsEngine();
+ /** Delete a PortsEngine
+ */
+ virtual ~PortsEngine();
+ virtual bool AddFd(EventHandler* eh, int event_mask);
+ virtual void OnSetEvent(EventHandler* eh, int old_mask, int new_mask);
+ virtual void DelFd(EventHandler* eh);
+ virtual int DispatchEvents();
+ virtual std::string GetName();
+};
+
+#endif
+
+
+#include <ulimit.h>
+
+PortsEngine::PortsEngine()
+{
+ 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!");
+ std::cout << "ERROR: Can't determine maximum number of open sockets!" << std::endl;
+ ServerInstance->QuickExit(EXIT_STATUS_SOCKETENGINE);
+ }
EngineHandle = port_create();
if (EngineHandle == -1)
{
- ServerInstance->Log(SPARSE,"ERROR: Could not initialize socket engine: %s", strerror(errno));
- ServerInstance->Log(SPARSE,"ERROR: This is a fatal error, exiting now.");
- printf("ERROR: Could not initialize socket engine: %s\n", strerror(errno));
- printf("ERROR: This is a fatal error, exiting now.\n");
- ServerInstance->Exit(EXIT_STATUS_SOCKETENGINE);
+ ServerInstance->Logs->Log("SOCKET",SPARSE,"ERROR: Could not initialize socket engine: %s", strerror(errno));
+ ServerInstance->Logs->Log("SOCKET",SPARSE,"ERROR: This is a fatal error, exiting now.");
+ std::cout << "ERROR: Could not initialize socket engine: " << strerror(errno) << std::endl;
+ std::cout << "ERROR: This is a fatal error, exiting now." << std::endl;
+ ServerInstance->QuickExit(EXIT_STATUS_SOCKETENGINE);
}
CurrentSetSize = 0;
+
+ ref = new EventHandler* [GetMaxFds()];
+ events = new port_event_t[GetMaxFds()];
+ memset(ref, 0, GetMaxFds() * sizeof(EventHandler*));
}
PortsEngine::~PortsEngine()
{
this->Close(EngineHandle);
+ delete[] ref;
+ delete[] events;
}
-bool PortsEngine::AddFd(EventHandler* eh)
+static int mask_to_events(int event_mask)
{
- int fd = eh->GetFd();
- if ((fd < 0) || (fd > MAX_DESCRIPTORS))
- return false;
+ 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;
+}
- if (GetRemainingFds() <= 1)
+bool PortsEngine::AddFd(EventHandler* eh, int event_mask)
+{
+ int fd = eh->GetFd();
+ if ((fd < 0) || (fd > GetMaxFds() - 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->Log(DEBUG,"New file descriptor: %d", fd);
+ ServerInstance->Logs->Log("SOCKET",DEBUG,"New file descriptor: %d", fd);
CurrentSetSize++;
return true;
}
-void PortsEngine::WantWrite(EventHandler* eh)
+void PortsEngine::OnSetEvent(EventHandler* eh, int old_mask, int new_mask)
{
- port_associate(EngineHandle, PORT_SOURCE_FD, eh->GetFd(), 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 > MAX_DESCRIPTORS))
- return false;
+ if ((fd < 0) || (fd > GetMaxFds() - 1))
+ return;
port_dissociate(EngineHandle, PORT_SOURCE_FD, fd);
CurrentSetSize--;
ref[fd] = NULL;
- ServerInstance->Log(DEBUG,"Remove file descriptor: %d", fd);
- return true;
-}
-
-int PortsEngine::GetMaxFds()
-{
- return MAX_DESCRIPTORS;
-}
-
-int PortsEngine::GetRemainingFds()
-{
- return MAX_DESCRIPTORS - CurrentSetSize;
+ ServerInstance->Logs->Log("SOCKET",DEBUG,"Remove file descriptor: %d", fd);
}
int PortsEngine::DispatchEvents()
poll_time.tv_nsec = 0;
unsigned int nget = 1; // used to denote a retrieve request.
- int i = port_getn(EngineHandle, this->events, MAX_DESCRIPTORS, &nget, &poll_time);
+ int ret = port_getn(EngineHandle, this->events, GetMaxFds() - 1, &nget, &poll_time);
+ ServerInstance->UpdateTime();
// first handle an error condition
- if (i == -1)
- return i;
+ if (ret == -1)
+ return -1;
+ TotalEvents += nget;
+
+ unsigned int i;
for (i = 0; i < nget; i++)
{
switch (this->events[i].portev_source)
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]);
- ref[fd]->HandleEvent((this->events[i].portev_events & POLLRDNORM) ? EVENT_READ : EVENT_WRITE);
+ 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(eh, mask);
+ port_associate(EngineHandle, PORT_SOURCE_FD, fd, mask_to_events(mask), eh);
+ if (events[i].portev_events & POLLRDNORM)
+ {
+ ReadEvents++;
+ eh->HandleEvent(EVENT_READ);
+ if (eh != ref[fd])
+ continue;
+ }
+ if (events[i].portev_events & POLLWRNORM)
+ {
+ WriteEvents++;
+ eh->HandleEvent(EVENT_WRITE);
+ }
}
}
default:
}
}
- return i;
+ return (int)i;
}
std::string PortsEngine::GetName()
return "ports";
}
+SocketEngine* CreateSocketEngine()
+{
+ return new PortsEngine;
+}
projects / user / henk / code / inspircd.git / blobdiff