+/* +------------------------------------+
+ * | Inspire Internet Relay Chat Daemon |
+ * +------------------------------------+
+ *
+ * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
+ * E-mail:
+ * <brain@chatspike.net>
+ * <Craig@chatspike.net>
+ *
+ * Written by Craig Edwards, Craig McLure, and others.
+ * This program is free but copyrighted software; see
+ * the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
#include "inspircd_config.h"
#include "globals.h"
#include "inspircd.h"
#ifdef USE_EPOLL
#include <sys/epoll.h>
-#define EP_DELAY 5
#endif
#ifdef USE_KQUEUE
#include <sys/types.h>
#include <string>
#include "socketengine.h"
-char ref[65535];
+char ref[MAX_DESCRIPTORS];
SocketEngine::SocketEngine()
{
log(DEBUG,"SocketEngine::SocketEngine()");
#ifdef USE_EPOLL
- EngineHandle = epoll_create(65535);
+ EngineHandle = epoll_create(MAX_DESCRIPTORS);
#endif
#ifdef USE_KQUEUE
EngineHandle = kqueue();
#endif
+ CurrentSetSize = 0;
}
SocketEngine::~SocketEngine()
char SocketEngine::GetType(int fd)
{
+ if ((fd < 0) || (fd > MAX_DESCRIPTORS))
+ return X_EMPTY_SLOT;
/* Mask off the top bit used for 'read/write' state */
- return (ref[fd] & 0x7F);
+ return (ref[fd] & ~0x80);
}
bool SocketEngine::AddFd(int fd, bool readable, char type)
{
- this->fds.push_back(fd);
+ if ((fd < 0) || (fd > MAX_DESCRIPTORS))
+ {
+ log(DEFAULT,"ERROR: FD of %d added above max of %d",fd,MAX_DESCRIPTORS);
+ return false;
+ }
+ if (GetRemainingFds() <= 1)
+ {
+ log(DEFAULT,"ERROR: System out of file descriptors!");
+ return false;
+ }
+#ifdef USE_SELECT
+ fds[fd] = fd;
+#endif
+ ref[fd] = type;
if (readable)
+ {
+ log(DEBUG,"Set readbit");
ref[fd] |= X_READBIT;
+ }
+ log(DEBUG,"Add socket %d",fd);
#ifdef USE_EPOLL
struct epoll_event ev;
log(DEBUG,"epoll: Add socket to events, ep=%d socket=%d",EngineHandle,fd);
- readable ? ev.events = EPOLLIN | EPOLLET : ev.events = EPOLLOUT | EPOLLET;
+ readable ? ev.events = EPOLLIN : ev.events = EPOLLOUT;
ev.data.fd = fd;
int i = epoll_ctl(EngineHandle, EPOLL_CTL_ADD, fd, &ev);
if (i < 0)
return false;
}
#endif
-return true;
+ CurrentSetSize++;
+ return true;
}
bool SocketEngine::DelFd(int fd)
{
log(DEBUG,"SocketEngine::DelFd(%d)",fd);
- bool found = false;
- for (std::vector<int>::iterator i = fds.begin(); i != fds.end(); i++)
+
+ if ((fd < 0) || (fd > MAX_DESCRIPTORS))
+ return false;
+
+#ifdef USE_SELECT
+ std::map<int,int>::iterator t = fds.find(fd);
+ if (t != fds.end())
{
- if (*i == fd)
- {
- fds.erase(i);
- found = true;
- break;
- }
+ fds.erase(t);
+ log(DEBUG,"Deleted fd %d",fd);
}
+#endif
#ifdef USE_KQUEUE
struct kevent ke;
- EV_SET(&ke, fd, ref[fd] && X_READBIT ? EVFILT_READ : EVFILT_WRITE, EV_DELETE, 0, 0, NULL);
+ EV_SET(&ke, fd, ref[fd] & X_READBIT ? EVFILT_READ : EVFILT_WRITE, EV_DELETE, 0, 0, NULL);
int i = kevent(EngineHandle, &ke, 1, 0, 0, NULL);
if (i == -1)
{
#endif
#ifdef USE_EPOLL
struct epoll_event ev;
- ref[fd] && X_READBIT ? ev.events = EPOLLIN | EPOLLET : ev.events = EPOLLOUT | EPOLLET;
+ ref[fd] && X_READBIT ? ev.events = EPOLLIN : ev.events = EPOLLOUT;
ev.data.fd = fd;
int i = epoll_ctl(EngineHandle, EPOLL_CTL_DEL, fd, &ev);
if (i < 0)
return false;
}
#endif
+ CurrentSetSize--;
ref[fd] = 0;
- return found;
+ return true;
}
-bool SocketEngine::Wait(std::vector<int> &fdlist)
+int SocketEngine::GetMaxFds()
{
- fdlist.clear();
+#ifdef USE_SELECT
+ return FD_SETSIZE;
+#endif
+#ifdef USE_KQUEUE
+ return MAX_DESCRIPTORS;
+#endif
+#ifdef USE_EPOLL
+ return MAX_DESCRIPTORS;
+#endif
+}
+
+int SocketEngine::GetRemainingFds()
+{
+#ifdef USE_SELECT
+ return FD_SETSIZE - CurrentSetSize;
+#endif
+#ifdef USE_KQUEUE
+ return MAX_DESCRIPTORS - CurrentSetSize;
+#endif
+#ifdef USE_EPOLL
+ return MAX_DESCRIPTORS - CurrentSetSize;
+#endif
+}
+
+int SocketEngine::Wait(int* fdlist)
+{
+ int result = 0;
#ifdef USE_SELECT
FD_ZERO(&wfdset);
FD_ZERO(&rfdset);
timeval tval;
int sresult;
- for (unsigned int a = 0; a < fds.size(); a++)
+ for (std::map<int,int>::iterator a = fds.begin(); a != fds.end(); a++)
{
- if (ref[fds[a]] && X_READBIT)
+ if (ref[a->second] & X_READBIT)
{
- FD_SET (fds[a], &rfdset);
+ FD_SET (a->second, &rfdset);
}
else
{
- FD_SET (fds[a], &wfdset);
+ FD_SET (a->second, &wfdset);
}
}
tval.tv_sec = 0;
- tval.tv_usec = 1000L;
+ tval.tv_usec = 100L;
sresult = select(FD_SETSIZE, &rfdset, &wfdset, NULL, &tval);
if (sresult > 0)
{
- for (unsigned int a = 0; a < fds.size(); a++)
+ for (std::map<int,int>::iterator a = fds.begin(); a != fds.end(); a++)
{
- if ((FD_ISSET (fds[a], &rfdset)) || (FD_ISSET (fds[a], &wfdset)))
- fdlist.push_back(fds[a]);
+ if ((FD_ISSET (a->second, &rfdset)) || (FD_ISSET (a->second, &wfdset)))
+ fdlist[result++] = a->second;
}
}
#endif
#ifdef USE_KQUEUE
- ts.tv_nsec = 1000L;
+ ts.tv_nsec = 10000L;
ts.tv_sec = 0;
- int i = kevent(EngineHandle, NULL, 0, &ke_list[0], 65535, &ts);
+ int i = kevent(EngineHandle, NULL, 0, &ke_list[0], MAX_DESCRIPTORS, &ts);
for (int j = 0; j < i; j++)
- fdlist.push_back(ke_list[j].ident);
+ fdlist[result++] = ke_list[j].ident;
#endif
#ifdef USE_EPOLL
- int i = epoll_wait(EngineHandle, events, 65535, 1);
+ int i = epoll_wait(EngineHandle, events, MAX_DESCRIPTORS, 100);
for (int j = 0; j < i; j++)
- fdlist.push_back(events[j].data.fd);
+ fdlist[result++] = events[j].data.fd;
#endif
- return true;
+ return result;
}
std::string SocketEngine::GetName()
projects / user / henk / code / inspircd.git / blobdiff