From f2acdbc3820f0f4f5ef76a0a64e73d2a320df91f Mon Sep 17 00:00:00 2001 From: peavey Date: Mon, 16 Jul 2007 17:30:04 +0000 Subject: OOPS! We try again, since I'm smoking craq. LF is 0x0a NOT CR. git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@7456 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/socketengine_kqueue.cpp | 159 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 158 insertions(+), 1 deletion(-) (limited to 'src/socketengine_kqueue.cpp') diff --git a/src/socketengine_kqueue.cpp b/src/socketengine_kqueue.cpp index de9a78f4e..7fcdae2b6 100644 --- a/src/socketengine_kqueue.cpp +++ b/src/socketengine_kqueue.cpp @@ -1 +1,158 @@ -/* +------------------------------------+ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * * InspIRCd: (C) 2002-2007 InspIRCd Development Team * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see * the file COPYING for details. * * --------------------------------------------------- */ #include "inspircd.h" #include "exitcodes.h" #include #include #include #include "socketengine_kqueue.h" KQueueEngine::KQueueEngine(InspIRCd* Instance) : SocketEngine(Instance) { EngineHandle = kqueue(); if (EngineHandle == -1) { 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(EXIT_STATUS_SOCKETENGINE); } CurrentSetSize = 0; } KQueueEngine::~KQueueEngine() { close(EngineHandle); } bool KQueueEngine::AddFd(EventHandler* eh) { int fd = eh->GetFd(); if ((fd < 0) || (fd > MAX_DESCRIPTORS)) return false; if (GetRemainingFds() <= 1) return false; if (ref[fd]) return false; ref[fd] = eh; struct kevent ke; 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) return false; CurrentSetSize++; ServerInstance->Log(DEBUG,"New file descriptor: %d", fd); return true; } bool KQueueEngine::DelFd(EventHandler* eh, bool force) { int fd = eh->GetFd(); if ((fd < 0) || (fd > MAX_DESCRIPTORS)) return false; struct kevent ke; EV_SET(&ke, eh->GetFd(), EVFILT_READ, EV_DELETE, 0, 0, NULL); int i = kevent(EngineHandle, &ke, 1, 0, 0, NULL); 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] = 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; } int KQueueEngine::GetRemainingFds() { return MAX_DESCRIPTORS - CurrentSetSize; } int KQueueEngine::DispatchEvents() { 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++) { 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 i; } std::string KQueueEngine::GetName() { return "kqueue"; } \ No newline at end of file +/* +------------------------------------+ + * | Inspire Internet Relay Chat Daemon | + * +------------------------------------+ + * + * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits + * + * This program is free but copyrighted software; see + * the file COPYING for details. + * + * --------------------------------------------------- + */ + +#include "inspircd.h" +#include "exitcodes.h" +#include +#include +#include +#include "socketengine_kqueue.h" + + +KQueueEngine::KQueueEngine(InspIRCd* Instance) : SocketEngine(Instance) +{ + EngineHandle = kqueue(); + if (EngineHandle == -1) + { + 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(EXIT_STATUS_SOCKETENGINE); + } + CurrentSetSize = 0; +} + +KQueueEngine::~KQueueEngine() +{ + close(EngineHandle); +} + +bool KQueueEngine::AddFd(EventHandler* eh) +{ + int fd = eh->GetFd(); + + if ((fd < 0) || (fd > MAX_DESCRIPTORS)) + return false; + + if (GetRemainingFds() <= 1) + return false; + + if (ref[fd]) + return false; + + ref[fd] = eh; + + struct kevent ke; + 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) + return false; + + CurrentSetSize++; + + ServerInstance->Log(DEBUG,"New file descriptor: %d", fd); + return true; +} + +bool KQueueEngine::DelFd(EventHandler* eh, bool force) +{ + int fd = eh->GetFd(); + + if ((fd < 0) || (fd > MAX_DESCRIPTORS)) + return false; + + struct kevent ke; + EV_SET(&ke, eh->GetFd(), EVFILT_READ, EV_DELETE, 0, 0, NULL); + + int i = kevent(EngineHandle, &ke, 1, 0, 0, NULL); + + 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] = 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; +} + +int KQueueEngine::GetRemainingFds() +{ + return MAX_DESCRIPTORS - CurrentSetSize; +} + +int KQueueEngine::DispatchEvents() +{ + 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++) + { + 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 i; +} + +std::string KQueueEngine::GetName() +{ + return "kqueue"; +} -- cgit v1.3.1-10-gc9f91