Remove support for the Solaris IOCP socket engine.

After discussing this with Adam we have decided that there is very
little point in keeping this now that Solaris has been killed. Any
legacy Solaris users will have to make do with poll.

This change does not affect users of Solaris forks like Illumos as
they have support for epoll which will have already been selected
over Solaris IOCP by configure.

diff --git a/configure b/configure
index 1e66df00017cee3c139bbf9fb0f46ba0c626163a..04981f6fdcc186f3fef0397fd36526da3d0d252d 100755 (executable)
--- a/configure
+++ b/configure
@@ -165,7 +165,6 @@ $config{HAS_EVENTFD} = run_test 'eventfd()', test_file($config{CXX}, 'eventfd.cp
 my @socketengines;
 push @socketengines, 'epoll'  if run_test 'epoll', test_header $config{CXX}, 'sys/epoll.h';
 push @socketengines, 'kqueue' if run_test 'kqueue', test_file $config{CXX}, 'kqueue.cpp';
-push @socketengines, 'ports'  if run_test 'Solaris IOCP', test_header $config{CXX}, 'port.h';
 push @socketengines, 'poll'   if run_test 'poll', test_header $config{CXX}, 'poll.h';
 push @socketengines, 'select';
 

diff --git a/src/socketengines/socketengine_ports.cpp b/src/socketengines/socketengine_ports.cpp
deleted file mode 100644 (file)
index 68fa70e..0000000
--- a/src/socketengines/socketengine_ports.cpp
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * InspIRCd -- Internet Relay Chat Daemon
- *
- *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2007-2008 Craig Edwards <craigedwards@brainbox.cc>
- *
- * 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"
-
-#ifndef __sun
-# error You need Solaris 10 or later to make use of this code.
-#endif
-
-#include "inspircd.h"
-#include <port.h>
-#include <iostream>
-#include <ulimit.h>
-
-/** A specialisation of the SocketEngine class, designed to use solaris 10 I/O completion ports
- */
-namespace
-{
-       /** These are used by ports to hold socket events
-        */
-       std::vector<port_event_t> events(16);
-       int EngineHandle;
-}
-
-/** Initialize ports engine
- */
-void SocketEngine::Init()
-{
-       // MAX_DESCRIPTORS is mainly used for display purposes, no problem if ulimit() fails and returns a negative number
-       MAX_DESCRIPTORS = ulimit(4, 0);
-
-       EngineHandle = port_create();
-
-       if (EngineHandle == -1)
-       {
-               ServerInstance->Logs->Log("SOCKET", LOG_SPARSE, "ERROR: Could not initialize socket engine: %s", strerror(errno));
-               ServerInstance->Logs->Log("SOCKET", LOG_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);
-       }
-}
-
-/** Shutdown the ports engine
- */
-void SocketEngine::Deinit()
-{
-       SocketEngine::Close(EngineHandle);
-}
-
-void SocketEngine::RecoverFromFork()
-{
-}
-
-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 SocketEngine::AddFd(EventHandler* eh, int event_mask)
-{
-       int fd = eh->GetFd();
-       if (fd < 0)
-               return false;
-
-       if (!SocketEngine::AddFdRef(eh))
-               return false;
-
-       eh->SetEventMask(event_mask);
-       port_associate(EngineHandle, PORT_SOURCE_FD, fd, mask_to_events(event_mask), eh);
-
-       ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "New file descriptor: %d", fd);
-       ResizeDouble(events);
-
-       return true;
-}
-
-void SocketEngine::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);
-}
-
-void SocketEngine::DelFd(EventHandler* eh)
-{
-       int fd = eh->GetFd();
-       if (fd < 0)
-               return;
-
-       port_dissociate(EngineHandle, PORT_SOURCE_FD, fd);
-
-       SocketEngine::DelFdRef(eh);
-
-       ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Remove file descriptor: %d", fd);
-}
-
-int SocketEngine::DispatchEvents()
-{
-       struct timespec poll_time;
-
-       poll_time.tv_sec = 1;
-       poll_time.tv_nsec = 0;
-
-       unsigned int nget = 1; // used to denote a retrieve request.
-       int ret = port_getn(EngineHandle, &events[0], events.size(), &nget, &poll_time);
-       ServerInstance->UpdateTime();
-
-       // first handle an error condition
-       if (ret == -1)
-               return -1;
-
-       stats.TotalEvents += nget;
-
-       unsigned int i;
-       for (i = 0; i < nget; i++)
-       {
-               port_event_t& ev = events[i];
-
-               if (ev.portev_source != PORT_SOURCE_FD)
-                       continue;
-
-               // Copy these in case the vector gets resized and ev invalidated
-               const int fd = ev.portev_object;
-               const int portev_events = ev.portev_events;
-               EventHandler* eh = static_cast<EventHandler*>(ev.portev_user);
-               if (eh->GetFd() < 0)
-                       continue;
-
-               int mask = eh->GetEventMask();
-               if (portev_events & POLLWRNORM)
-                       mask &= ~(FD_WRITE_WILL_BLOCK | FD_WANT_FAST_WRITE | FD_WANT_SINGLE_WRITE);
-               if (portev_events & POLLRDNORM)
-                       mask &= ~FD_READ_WILL_BLOCK;
-               // reinsert port for next time around, pretending to be one-shot for writes
-               eh->SetEventMask(mask);
-               port_associate(EngineHandle, PORT_SOURCE_FD, fd, mask_to_events(mask), eh);
-               if (portev_events & POLLRDNORM)
-               {
-                       eh->OnEventHandlerRead();
-                       if (eh != GetRef(fd))
-                               continue;
-               }
-               if (portev_events & POLLWRNORM)
-               {
-                       eh->OnEventHandlerWrite();
-               }
-       }
-
-       return (int)i;
-}

diff --git a/tools/test-build b/tools/test-build
index eb77a2bcf2c993750663229e2c7672124d2599db..c74dbb4e0d066d7e6a783cb47f982654481ea9bd 100755 (executable)
--- a/tools/test-build
+++ b/tools/test-build
@@ -51,7 +51,6 @@ foreach my $compiler (@compilers) {
        push @socketengines, 'epoll' if test_header $compiler, 'sys/epoll.h';
        push @socketengines, 'kqueue' if test_file $compiler, 'kqueue.cpp';
        push @socketengines, 'poll' if test_header $compiler, 'poll.h';
-       push @socketengines, 'ports' if test_header $compiler, 'ports.h';
        foreach my $socketengine (@socketengines) {
                say "Attempting to build using the $compiler compiler and the $socketengine socket engine...";
                system './configure', '--enable-extras', $ENV{TEST_BUILD_MODULES} if defined $ENV{TEST_BUILD_MODULES};