* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- * E-mail:
- * <brain@chatspike.net>
- * <Craig@chatspike.net>
+ * InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
*
- * 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"
+#include "exitcodes.h"
#include <sys/types.h>
#include <sys/event.h>
#include <sys/time.h>
-#include <vector>
-#include <string>
#include "socketengine_kqueue.h"
-#include "helperfuncs.h"
+
KQueueEngine::KQueueEngine(InspIRCd* Instance) : SocketEngine(Instance)
{
+ this->RecoverFromFork();
+}
+
+void KQueueEngine::RecoverFromFork()
+{
+ /*
+ * The only bad thing about kqueue is that its fd cant survive a fork and is not inherited.
+ * BUM HATS.
+ *
+ */
EngineHandle = kqueue();
if (EngineHandle == -1)
{
- log(SPARSE,"ERROR: Could not initialize socket engine. Your kernel probably does not have the proper features.");
- log(SPARSE,"ERROR: this is a fatal error, exiting now.");
+ ServerInstance->Log(SPARSE,"ERROR: Could not initialize socket engine. Your kernel probably does not have the proper features.");
+ ServerInstance->Log(SPARSE,"ERROR: this is a fatal error, exiting now.");
printf("ERROR: Could not initialize socket engine. Your kernel probably does not have the proper features.");
printf("ERROR: this is a fatal error, exiting now.");
- InspIRCd::Exit(ERROR);
+ ServerInstance->Exit(EXIT_STATUS_SOCKETENGINE);
}
CurrentSetSize = 0;
}
KQueueEngine::~KQueueEngine()
{
- log(DEBUG,"KQueueEngine::~KQueueEngine()");
- close(EngineHandle);
+ this->Close(EngineHandle);
}
-bool KQueueEngine::AddFd(int fd, bool readable, char type)
+bool KQueueEngine::AddFd(EventHandler* eh)
{
+ int fd = eh->GetFd();
+
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;
- }
if (ref[fd])
return false;
- ref[fd] = type;
- if (readable)
- {
- log(DEBUG,"Set readbit");
- ref[fd] |= X_READBIT;
- }
- log(DEBUG,"Add socket %d",fd);
-
struct kevent ke;
- log(DEBUG,"kqueue: Add socket to events, kq=%d socket=%d",EngineHandle,fd);
- EV_SET(&ke, fd, readable ? EVFILT_READ : EVFILT_WRITE, EV_ADD, 0, 0, NULL);
+ EV_SET(&ke, fd, eh->Readable() ? EVFILT_READ : EVFILT_WRITE, EV_ADD, 0, 0, NULL);
+
int i = kevent(EngineHandle, &ke, 1, 0, 0, NULL);
if (i == -1)
{
- log(DEBUG,"kqueue: List insertion failure!");
return false;
}
+ ref[fd] = eh;
CurrentSetSize++;
+
+ ServerInstance->Log(DEBUG,"New file descriptor: %d", fd);
return true;
}
-bool KQueueEngine::DelFd(int fd)
+bool KQueueEngine::DelFd(EventHandler* eh, bool force)
{
- log(DEBUG,"KQueueEngine::DelFd(%d)",fd);
+ int fd = eh->GetFd();
if ((fd < 0) || (fd > MAX_DESCRIPTORS))
return false;
struct kevent ke;
- EV_SET(&ke, fd, ref[fd] & X_READBIT ? EVFILT_READ : EVFILT_WRITE, EV_DELETE, 0, 0, NULL);
+ EV_SET(&ke, eh->GetFd(), EVFILT_READ, EV_DELETE, 0, 0, NULL);
+
int i = kevent(EngineHandle, &ke, 1, 0, 0, NULL);
- if (i == -1)
- {
- log(DEBUG,"kqueue: Failed to remove socket from queue!");
+
+ EV_SET(&ke, eh->GetFd(), EVFILT_WRITE, EV_DELETE, 0, 0, NULL);
+
+ int j = kevent(EngineHandle, &ke, 1, 0, 0, NULL);
+
+ if ((j < 0) && (i < 0) && !force)
return false;
- }
CurrentSetSize--;
- ref[fd] = 0;
+ ref[fd] = NULL;
+
+ ServerInstance->Log(DEBUG,"Remove file descriptor: %d", fd);
return true;
}
+void KQueueEngine::WantWrite(EventHandler* eh)
+{
+ /** When changing an item in a kqueue, there is no 'modify' call
+ * as in epoll. Instead, we add the item again, and this overwrites
+ * the original setting rather than adding it twice. See man kqueue.
+ */
+ struct kevent ke;
+ EV_SET(&ke, eh->GetFd(), EVFILT_WRITE, EV_ADD | EV_ONESHOT, 0, 0, NULL);
+ kevent(EngineHandle, &ke, 1, 0, 0, NULL);
+}
+
int KQueueEngine::GetMaxFds()
{
return MAX_DESCRIPTORS;
return MAX_DESCRIPTORS - CurrentSetSize;
}
-int KQueueEngine::Wait(int* fdlist)
+int KQueueEngine::DispatchEvents()
{
- int result = 0;
-
- ts.tv_nsec = 5000L;
- ts.tv_sec = 0;
+ ts.tv_nsec = 0;
+ ts.tv_sec = 1;
int i = kevent(EngineHandle, NULL, 0, &ke_list[0], MAX_DESCRIPTORS, &ts);
for (int j = 0; j < i; j++)
- fdlist[result++] = ke_list[j].ident;
+ {
+ if (ke_list[j].flags & EV_EOF)
+ {
+ /* We love you kqueue, oh yes we do *sings*!
+ * kqueue gives us the error number directly in the EOF state!
+ * Unlike smelly epoll and select, where we have to getsockopt
+ * to get the error, this saves us time and cpu cycles. Go BSD!
+ */
+ if (ref[ke_list[j].ident])
+ ref[ke_list[j].ident]->HandleEvent(EVENT_ERROR, ke_list[j].fflags);
+ continue;
+ }
+ if (ke_list[j].flags & EVFILT_WRITE)
+ {
+ /* This looks wrong but its right. As above, theres no modify
+ * call in kqueue. See the manpage.
+ */
+ struct kevent ke;
+ EV_SET(&ke, ke_list[j].ident, EVFILT_READ, EV_ADD, 0, 0, NULL);
+ kevent(EngineHandle, &ke, 1, 0, 0, NULL);
+ if (ref[ke_list[j].ident])
+ ref[ke_list[j].ident]->HandleEvent(EVENT_WRITE);
+ }
+ else
+ {
+ if (ref[ke_list[j].ident])
+ ref[ke_list[j].ident]->HandleEvent(EVENT_READ);
+ }
+ }
- return result;
+ return i;
}
std::string KQueueEngine::GetName()
projects / user / henk / code / inspircd.git / blobdiff