-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/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>
-/* +------------------------------------+
- * | 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_PORTS__
-#define __SOCKETENGINE_PORTS__
+#ifndef SOCKETENGINE_PORTS
+#define SOCKETENGINE_PORTS
#ifndef __sun
# error You need Solaris 10 or later to make use of this code.
#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
*/
/** These are used by epoll() to hold socket events
*/
port_event_t* events;
+ int EngineHandle;
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 bool DelFd(EventHandler* eh, bool force = false);
+ virtual void OnSetEvent(EventHandler* eh, int old_mask, int new_mask);
+ virtual void DelFd(EventHandler* eh);
virtual int DispatchEvents();
virtual std::string GetName();
- virtual void WantWrite(EventHandler* eh);
};
#endif
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);
+ std::cout << "ERROR: Can't determine maximum number of open sockets!" << std::endl;
+ ServerInstance->QuickExit(EXIT_STATUS_SOCKETENGINE);
}
EngineHandle = port_create();
{
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.");
- 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);
+ 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;
return true;
}
-void PortsEngine::WantWrite(EventHandler* eh, int old_mask, int new_mask)
+void PortsEngine::OnSetEvent(EventHandler* eh, int old_mask, int new_mask)
{
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);
ref[fd] = NULL;
ServerInstance->Logs->Log("SOCKET",DEBUG,"Remove file descriptor: %d", fd);
- return true;
}
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, GetMaxFds() - 1, &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)
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);
+ 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)
{
}
}
- return i;
+ return (int)i;
}
std::string PortsEngine::GetName()
projects / user / henk / code / inspircd.git / blobdiff