X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocketengine.cpp;h=48f7e11bf611d7e2f05df7af0d2e2dd7260c59b7;hb=bfdf503e5204ba17479084e688a3605dbc9007a2;hp=82e79ece34e61a5595508f7472d594503cf33a03;hpb=cc905e149d29a5471bf3dd0b2eb353b3d17e77d4;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/socketengine.cpp b/src/socketengine.cpp index 82e79ece3..48f7e11bf 100644 --- a/src/socketengine.cpp +++ b/src/socketengine.cpp @@ -2,204 +2,92 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * Inspire is copyright (C) 2002-2005 ChatSpike-Dev. - * E-mail: - * - * + * 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" -#ifdef USE_EPOLL -#include -#define EP_DELAY 5 -#endif -#ifdef USE_KQUEUE -#include -#include -#include -#endif -#include -#include #include "socketengine.h" -char ref[65535]; +int EventHandler::GetFd() +{ + return this->fd; +} -SocketEngine::SocketEngine() +void EventHandler::SetFd(int FD) { - log(DEBUG,"SocketEngine::SocketEngine()"); -#ifdef USE_EPOLL - EngineHandle = epoll_create(65535); -#endif -#ifdef USE_KQUEUE - EngineHandle = kqueue(); -#endif + this->fd = FD; } -SocketEngine::~SocketEngine() +bool EventHandler::Readable() { - log(DEBUG,"SocketEngine::~SocketEngine()"); -#ifdef USE_EPOLL - close(EngineHandle); -#endif -#ifdef USE_KQUEUE - close(EngineHandle); -#endif + return true; } -char SocketEngine::GetType(int fd) +bool EventHandler::Writeable() { - if ((fd < 0) || (fd > 65535)) - return X_EMPTY_SLOT; - /* Mask off the top bit used for 'read/write' state */ - return (ref[fd] & ~0x80); + return false; } -bool SocketEngine::AddFd(int fd, bool readable, char type) +void SocketEngine::WantWrite(EventHandler* eh) { - if ((fd < 0) || (fd > 65535)) - return false; - this->fds.push_back(fd); - 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; - ev.data.fd = fd; - int i = epoll_ctl(EngineHandle, EPOLL_CTL_ADD, fd, &ev); - if (i < 0) - { - log(DEBUG,"epoll: List insertion failure!"); - return false; - } -#endif -#ifdef USE_KQUEUE - 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); - int i = kevent(EngineHandle, &ke, 1, 0, 0, NULL); - if (i == -1) - { - log(DEBUG,"kqueue: List insertion failure!"); - return false; - } -#endif -return true; } -bool SocketEngine::DelFd(int fd) +SocketEngine::SocketEngine(InspIRCd* Instance) : ServerInstance(Instance) { - log(DEBUG,"SocketEngine::DelFd(%d)",fd); + memset(ref, 0, sizeof(ref)); +} - if ((fd < 0) || (fd > 65535)) - return false; +SocketEngine::~SocketEngine() +{ +} - bool found = false; - for (std::vector::iterator i = fds.begin(); i != fds.end(); i++) - { - if (*i == fd) - { - fds.erase(i); - log(DEBUG,"Deleted fd %d",fd); - found = true; - break; - } - } -#ifdef USE_KQUEUE - struct kevent ke; - 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) - { - log(DEBUG,"kqueue: Failed to remove socket from queue!"); - return false; - } -#endif -#ifdef USE_EPOLL - struct epoll_event ev; - ref[fd] && X_READBIT ? ev.events = EPOLLIN | EPOLLET : ev.events = EPOLLOUT | EPOLLET; - ev.data.fd = fd; - int i = epoll_ctl(EngineHandle, EPOLL_CTL_DEL, fd, &ev); - if (i < 0) - { - log(DEBUG,"epoll: List deletion failure!"); +bool SocketEngine::AddFd(EventHandler* eh) +{ + return true; +} + +bool SocketEngine::HasFd(int fd) +{ + if ((fd < 0) || (fd > MAX_DESCRIPTORS)) return false; - } -#endif - ref[fd] = 0; - return found; + return ref[fd]; +} + +EventHandler* SocketEngine::GetRef(int fd) +{ + if ((fd < 0) || (fd > MAX_DESCRIPTORS)) + return 0; + return ref[fd]; } -bool SocketEngine::Wait(std::vector &fdlist) +bool SocketEngine::DelFd(EventHandler* eh, bool force) { - fdlist.clear(); -#ifdef USE_SELECT - FD_ZERO(&wfdset); - FD_ZERO(&rfdset); - timeval tval; - int sresult; - for (unsigned int a = 0; a < fds.size(); a++) - { - if (ref[fds[a]] & X_READBIT) - { - FD_SET (fds[a], &rfdset); - } - else - { - FD_SET (fds[a], &wfdset); - } - - } - tval.tv_sec = 0; - tval.tv_usec = 100L; - sresult = select(FD_SETSIZE, &rfdset, &wfdset, NULL, &tval); - if (sresult > 0) - { - for (unsigned int a = 0; a < fds.size(); a++) - { - if ((FD_ISSET (fds[a], &rfdset)) || (FD_ISSET (fds[a], &wfdset))) - fdlist.push_back(fds[a]); - } - } -#endif -#ifdef USE_KQUEUE - ts.tv_nsec = 10000L; - ts.tv_sec = 0; - int i = kevent(EngineHandle, NULL, 0, &ke_list[0], 65535, &ts); - for (int j = 0; j < i; j++) - fdlist.push_back(ke_list[j].ident); -#endif -#ifdef USE_EPOLL - int i = epoll_wait(EngineHandle, events, 65535, 100); - for (int j = 0; j < i; j++) - fdlist.push_back(events[j].data.fd); -#endif return true; } +int SocketEngine::GetMaxFds() +{ + return 0; +} + +int SocketEngine::GetRemainingFds() +{ + return 0; +} + +int SocketEngine::DispatchEvents() +{ + return 0; +} + std::string SocketEngine::GetName() { -#ifdef USE_SELECT - return "select"; -#endif -#ifdef USE_KQUEUE - return "kqueue"; -#endif -#ifdef USE_EPOLL - return "epoll"; -#endif return "misconfigured"; } +