-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ * Copyright (C) 2014 Adam <Adam@anope.org>
+ * 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_config.h"
#include "inspircd.h"
#include "socketengine.h"
-#ifndef WINDOWS
+#ifndef _WIN32
#include <sys/select.h>
-#endif // WINDOWS
+#endif // _WIN32
/** A specialisation of the SocketEngine class, designed to use traditional select().
*/
-class SelectEngine : public SocketEngine
+namespace
{
-public:
- /** Create a new SelectEngine
- */
- SelectEngine();
- /** Delete a SelectEngine
- */
- virtual ~SelectEngine();
- virtual bool AddFd(EventHandler* eh, int event_mask);
- virtual void DelFd(EventHandler* eh);
- void OnSetEvent(EventHandler* eh, int, int);
- virtual int DispatchEvents();
- virtual std::string GetName();
-};
-
-SelectEngine::SelectEngine()
+ fd_set ReadSet, WriteSet, ErrSet;
+ int MaxFD = 0;
+}
+
+void SocketEngine::Init()
{
MAX_DESCRIPTORS = FD_SETSIZE;
- CurrentSetSize = 0;
- ref = new EventHandler* [GetMaxFds()];
- memset(ref, 0, GetMaxFds() * sizeof(EventHandler*));
+ FD_ZERO(&ReadSet);
+ FD_ZERO(&WriteSet);
+ FD_ZERO(&ErrSet);
+}
+
+void SocketEngine::Deinit()
+{
}
-SelectEngine::~SelectEngine()
+void SocketEngine::RecoverFromFork()
{
- delete[] ref;
}
-bool SelectEngine::AddFd(EventHandler* eh, int event_mask)
+bool SocketEngine::AddFd(EventHandler* eh, int event_mask)
{
int fd = eh->GetFd();
if ((fd < 0) || (fd > GetMaxFds() - 1))
return false;
- if (ref[fd])
+ if (!SocketEngine::AddFdRef(eh))
return false;
- ref[fd] = eh;
- SocketEngine::SetEventMask(eh, event_mask);
- CurrentSetSize++;
+ eh->SetEventMask(event_mask);
+ OnSetEvent(eh, 0, event_mask);
+ FD_SET(fd, &ErrSet);
+ if (fd > MaxFD)
+ MaxFD = fd;
- ServerInstance->Logs->Log("SOCKET",DEBUG,"New file descriptor: %d", fd);
+ ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "New file descriptor: %d", fd);
return true;
}
-void SelectEngine::DelFd(EventHandler* eh)
+void SocketEngine::DelFd(EventHandler* eh)
{
int fd = eh->GetFd();
if ((fd < 0) || (fd > GetMaxFds() - 1))
return;
- CurrentSetSize--;
- ref[fd] = NULL;
+ SocketEngine::DelFdRef(eh);
- ServerInstance->Logs->Log("SOCKET",DEBUG,"Remove file descriptor: %d", fd);
-}
+ FD_CLR(fd, &ReadSet);
+ FD_CLR(fd, &WriteSet);
+ FD_CLR(fd, &ErrSet);
+ if (fd == MaxFD)
+ --MaxFD;
-void SelectEngine::OnSetEvent(EventHandler* eh, int old_mask, int new_mask)
-{
- // deal with it later
+ ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Remove file descriptor: %d", fd);
}
-int SelectEngine::DispatchEvents()
+void SocketEngine::OnSetEvent(EventHandler* eh, int old_mask, int new_mask)
{
- timeval tval;
- int sresult = 0;
- socklen_t codesize = sizeof(int);
- int errcode = 0;
-
- fd_set wfdset, rfdset, errfdset;
- FD_ZERO(&wfdset);
- FD_ZERO(&rfdset);
- FD_ZERO(&errfdset);
-
- /* Populate the select FD sets (this is why select sucks compared to epoll, kqueue) */
- for (unsigned int i = 0; i < FD_SETSIZE; i++)
+ int fd = eh->GetFd();
+ int diff = old_mask ^ new_mask;
+
+ if (diff & (FD_WANT_POLL_READ | FD_WANT_FAST_READ))
{
- EventHandler* eh = ref[i];
- if (!eh)
- continue;
- int state = eh->GetEventMask();
- if (state & (FD_WANT_POLL_READ | FD_WANT_FAST_READ))
- FD_SET (i, &rfdset);
- if (state & (FD_WANT_POLL_WRITE | FD_WANT_FAST_WRITE | FD_WANT_SINGLE_WRITE))
- FD_SET (i, &wfdset);
- FD_SET (i, &errfdset);
+ if (new_mask & (FD_WANT_POLL_READ | FD_WANT_FAST_READ))
+ FD_SET(fd, &ReadSet);
+ else
+ FD_CLR(fd, &ReadSet);
+ }
+ if (diff & (FD_WANT_POLL_WRITE | FD_WANT_FAST_WRITE | FD_WANT_SINGLE_WRITE))
+ {
+ if (new_mask & (FD_WANT_POLL_WRITE | FD_WANT_FAST_WRITE | FD_WANT_SINGLE_WRITE))
+ FD_SET(fd, &WriteSet);
+ else
+ FD_CLR(fd, &WriteSet);
}
+}
- /* One second wait */
- tval.tv_sec = 1;
- tval.tv_usec = 0;
+int SocketEngine::DispatchEvents()
+{
+ static timeval tval = { 1, 0 };
- sresult = select(FD_SETSIZE, &rfdset, &wfdset, &errfdset, &tval);
- ServerInstance->UpdateTime();
+ fd_set rfdset = ReadSet, wfdset = WriteSet, errfdset = ErrSet;
- /* Nothing to process this time around */
- if (sresult < 1)
- return 0;
+ int sresult = select(MaxFD + 1, &rfdset, &wfdset, &errfdset, &tval);
+ ServerInstance->UpdateTime();
- for (int i = 0; i < FD_SETSIZE; i++)
+ for (int i = 0, j = sresult; i <= MaxFD && j > 0; i++)
{
- EventHandler* ev = ref[i];
- if (ev)
+ int has_read = FD_ISSET(i, &rfdset), has_write = FD_ISSET(i, &wfdset), has_error = FD_ISSET(i, &errfdset);
+
+ if (!(has_read || has_write || has_error))
+ continue;
+
+ --j;
+
+ EventHandler* ev = GetRef(i);
+ if (!ev)
+ continue;
+
+ if (has_error)
{
- if (FD_ISSET (i, &errfdset))
- {
- ErrorEvents++;
- if (getsockopt(i, SOL_SOCKET, SO_ERROR, (char*)&errcode, &codesize) < 0)
- errcode = errno;
+ stats.ErrorEvents++;
+
+ socklen_t codesize = sizeof(int);
+ int errcode = 0;
+ if (getsockopt(i, SOL_SOCKET, SO_ERROR, (char*)&errcode, &codesize) < 0)
+ errcode = errno;
- ev->HandleEvent(EVENT_ERROR, errcode);
+ ev->HandleEvent(EVENT_ERROR, errcode);
+ continue;
+ }
+
+ if (has_read)
+ {
+ stats.ReadEvents++;
+ ev->SetEventMask(ev->GetEventMask() & ~FD_READ_WILL_BLOCK);
+ ev->HandleEvent(EVENT_READ);
+ if (ev != GetRef(i))
continue;
- }
- else
- {
- /* NOTE: This is a pair of seperate if statements as the socket
- * may be in both read and writeable state at the same time.
- * If an error event occurs above it is not worth processing the
- * read and write states even if set.
- */
- if (FD_ISSET (i, &rfdset))
- {
- ReadEvents++;
- SetEventMask(ev, ev->GetEventMask() & ~FD_READ_WILL_BLOCK);
- ev->HandleEvent(EVENT_READ);
- if (ev != ref[i])
- continue;
- }
- if (FD_ISSET (i, &wfdset))
- {
- WriteEvents++;
- SetEventMask(ev, ev->GetEventMask() & ~(FD_WRITE_WILL_BLOCK | FD_WANT_SINGLE_WRITE));
- ev->HandleEvent(EVENT_WRITE);
- }
- }
+ }
+
+ if (has_write)
+ {
+ stats.WriteEvents++;
+ int newmask = (ev->GetEventMask() & ~(FD_WRITE_WILL_BLOCK | FD_WANT_SINGLE_WRITE));
+ SocketEngine::OnSetEvent(ev, ev->GetEventMask(), newmask);
+ ev->SetEventMask(newmask);
+ ev->HandleEvent(EVENT_WRITE);
}
}
return sresult;
}
-
-std::string SelectEngine::GetName()
-{
- return "select";
-}
-
-SocketEngine* CreateSocketEngine()
-{
- return new SelectEngine;
-}
projects / user / henk / code / inspircd.git / blobdiff