X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocketengine.cpp;h=49624481ffe76bb90d853eaf339d6a7dd6beca4a;hb=075bb82c3ebdf4e77f14134ca8343631dd4cfbcd;hp=69838ff59cfee93fc676be5d376ce542d405203b;hpb=dc12fcac8757b36b7da88d0a9ff25acc009d539c;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/socketengine.cpp b/src/socketengine.cpp index 69838ff59..49624481f 100644 --- a/src/socketengine.cpp +++ b/src/socketengine.cpp @@ -2,236 +2,259 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * Inspire is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * - * Written by Craig Edwards, Craig McLure, and others. * This program is free but copyrighted software; see - * the file COPYING for details. + * the file COPYING for details. * * --------------------------------------------------- */ -#include "inspircd_config.h" -#include "globals.h" +/* $Core */ + +/********* DEFAULTS **********/ + +/* $ExtraSources: socketengines/socketengine_select.cpp */ +/* $ExtraObjects: socketengine_select.o */ + +/* $If: USE_POLL */ +/* $ExtraSources: socketengines/socketengine_poll.cpp */ +/* $ExtraObjects: socketengine_poll.o */ +/* $EndIf */ + +/* $If: USE_KQUEUE */ +/* $ExtraSources: socketengines/socketengine_kqueue.cpp */ +/* $ExtraObjects: socketengine_kqueue.o */ +/* $EndIf */ + +/* $If: USE_EPOLL */ +/* $ExtraSources: socketengines/socketengine_epoll.cpp */ +/* $ExtraObjects: socketengine_epoll.o */ +/* $EndIf */ + +/* $If: USE_PORTS */ +/* $ExtraSources: socketengines/socketengine_ports.cpp */ +/* $ExtraObjects: socketengine_ports.o */ +/* $EndIf */ + #include "inspircd.h" -#ifdef USE_EPOLL -#include -#endif -#ifdef USE_KQUEUE -#include -#include -#include -#endif -#include -#include #include "socketengine.h" -char ref[65535]; +EventHandler::EventHandler() +{ + fd = -1; +} + +void EventHandler::SetFd(int FD) +{ + this->fd = FD; +} SocketEngine::SocketEngine() { - log(DEBUG,"SocketEngine::SocketEngine()"); -#ifdef USE_EPOLL - EngineHandle = epoll_create(65535); -#endif -#ifdef USE_KQUEUE - EngineHandle = kqueue(); -#endif - CurrentSetSize = 0; + TotalEvents = WriteEvents = ReadEvents = ErrorEvents = 0; + lastempty = ServerInstance->Time(); + indata = outdata = 0; } SocketEngine::~SocketEngine() { - log(DEBUG,"SocketEngine::~SocketEngine()"); -#ifdef USE_EPOLL - close(EngineHandle); -#endif -#ifdef USE_KQUEUE - close(EngineHandle); -#endif } -char SocketEngine::GetType(int fd) +void SocketEngine::SetEventMask(EventHandler* eh, int mask) { - if ((fd < 0) || (fd > 65535)) - return X_EMPTY_SLOT; - /* Mask off the top bit used for 'read/write' state */ - return (ref[fd] & ~0x80); + eh->event_mask = mask; } -bool SocketEngine::AddFd(int fd, bool readable, char type) +void SocketEngine::ChangeEventMask(EventHandler* eh, int change) { - if ((fd < 0) || (fd > 65535)) - 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; - 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) + int old_m = eh->event_mask; + int new_m = old_m; + + // if we are changing read/write type, remove the previously set bit + if (change & FD_WANT_READ_MASK) + new_m &= ~FD_WANT_READ_MASK; + if (change & FD_WANT_WRITE_MASK) + new_m &= ~FD_WANT_WRITE_MASK; + + // if adding a trial read/write, insert it into the set + if (change & FD_TRIAL_NOTE_MASK && !(old_m & FD_TRIAL_NOTE_MASK)) + trials.insert(eh->GetFd()); + + new_m |= change; + if (new_m == old_m) + return; + + eh->event_mask = new_m; + OnSetEvent(eh, old_m, new_m); +} + +void SocketEngine::DispatchTrialWrites() +{ + std::vector working_list; + working_list.reserve(trials.size()); + working_list.assign(trials.begin(), trials.end()); + trials.clear(); + for(unsigned int i=0; i < working_list.size(); i++) { - log(DEBUG,"kqueue: List insertion failure!"); - return false; + int fd = working_list[i]; + EventHandler* eh = GetRef(fd); + if (!eh) + continue; + int mask = eh->event_mask; + eh->event_mask &= ~(FD_ADD_TRIAL_READ | FD_ADD_TRIAL_WRITE); + if ((mask & (FD_ADD_TRIAL_READ | FD_READ_WILL_BLOCK)) == FD_ADD_TRIAL_READ) + eh->HandleEvent(EVENT_READ, 0); + if ((mask & (FD_ADD_TRIAL_WRITE | FD_WRITE_WILL_BLOCK)) == FD_ADD_TRIAL_WRITE) + eh->HandleEvent(EVENT_WRITE, 0); } -#endif - CurrentSetSize++; - return true; } -bool SocketEngine::DelFd(int fd) +bool SocketEngine::HasFd(int fd) { - log(DEBUG,"SocketEngine::DelFd(%d)",fd); - - if ((fd < 0) || (fd > 65535)) + if ((fd < 0) || (fd > GetMaxFds())) return false; + return ref[fd]; +} -#ifdef USE_SELECT - std::map::iterator t = fds.find(fd); - if (t != fds.end()) - { - 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); - int i = kevent(EngineHandle, &ke, 1, 0, 0, NULL); - if (i == -1) - { - log(DEBUG,"kqueue: Failed to remove socket from queue!"); +EventHandler* SocketEngine::GetRef(int fd) +{ + if ((fd < 0) || (fd > GetMaxFds())) + return 0; + return ref[fd]; +} + +bool SocketEngine::BoundsCheckFd(EventHandler* eh) +{ + if (!eh) 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!"); + if ((eh->GetFd() < 0) || (eh->GetFd() > GetMaxFds())) return false; - } -#endif - CurrentSetSize--; - ref[fd] = 0; return true; } -int SocketEngine::GetMaxFds() + +int SocketEngine::Accept(EventHandler* fd, sockaddr *addr, socklen_t *addrlen) { -#ifdef USE_SELECT - return FD_SETSIZE; -#endif -#ifdef USE_KQUEUE - return MAX_DESCRIPTORS; -#endif -#ifdef USE_EPOLL - return MAX_DESCRIPTORS; + return accept(fd->GetFd(), addr, addrlen); +} + +int SocketEngine::Close(EventHandler* fd) +{ +#ifdef WINDOWS + return closesocket(fd->GetFd()); +#else + return close(fd->GetFd()); #endif } -int SocketEngine::GetRemainingFds() +int SocketEngine::Close(int fd) { -#ifdef USE_SELECT - return FD_SETSIZE - CurrentSetSize; +#ifdef WINDOWS + return closesocket(fd); +#else + return close(fd); #endif -#ifdef USE_KQUEUE - return MAX_DESCRIPTORS - CurrentSetSize; +} + +int SocketEngine::Blocking(int fd) +{ +#ifdef WINDOWS + unsigned long opt = 0; + return ioctlsocket(fd, FIONBIO, &opt); +#else + int flags = fcntl(fd, F_GETFL, 0); + return fcntl(fd, F_SETFL, flags & ~O_NONBLOCK); #endif -#ifdef USE_EPOLL - return MAX_DESCRIPTORS - CurrentSetSize; +} + +int SocketEngine::NonBlocking(int fd) +{ +#ifdef WINDOWS + unsigned long opt = 1; + return ioctlsocket(fd, FIONBIO, &opt); +#else + int flags = fcntl(fd, F_GETFL, 0); + return fcntl(fd, F_SETFL, flags | O_NONBLOCK); #endif } -int SocketEngine::Wait(int* fdlist) +int SocketEngine::GetSockName(EventHandler* fd, sockaddr *name, socklen_t* namelen) { - int result = 0; -#ifdef USE_SELECT - FD_ZERO(&wfdset); - FD_ZERO(&rfdset); - timeval tval; - int sresult; - for (std::map::iterator a = fds.begin(); a != fds.end(); a++) - { - if (ref[a->second] & X_READBIT) - { - FD_SET (a->second, &rfdset); - } - else - { - FD_SET (a->second, &wfdset); - } - - } - tval.tv_sec = 0; - tval.tv_usec = 100L; - sresult = select(FD_SETSIZE, &rfdset, &wfdset, NULL, &tval); - if (sresult > 0) + return getsockname(fd->GetFd(), name, namelen); +} + +int SocketEngine::RecvFrom(EventHandler* fd, void *buf, size_t len, int flags, sockaddr *from, socklen_t *fromlen) +{ + this->UpdateStats(len, 0); + return recvfrom(fd->GetFd(), buf, len, flags, from, fromlen); +} + +int SocketEngine::Send(EventHandler* fd, const void *buf, size_t len, int flags) +{ + this->UpdateStats(0, len); + return send(fd->GetFd(), buf, len, flags); +} + +int SocketEngine::Recv(EventHandler* fd, void *buf, size_t len, int flags) +{ + this->UpdateStats(len, 0); + return recv(fd->GetFd(), buf, len, flags); +} + +int SocketEngine::SendTo(EventHandler* fd, const void *buf, size_t len, int flags, const sockaddr *to, socklen_t tolen) +{ + this->UpdateStats(0, len); + return sendto(fd->GetFd(), buf, len, flags, to, tolen); +} + +int SocketEngine::Connect(EventHandler* fd, const sockaddr *serv_addr, socklen_t addrlen) +{ + return connect(fd->GetFd(), serv_addr, addrlen); +} + +int SocketEngine::Shutdown(EventHandler* fd, int how) +{ + return shutdown(fd->GetFd(), how); +} + +int SocketEngine::Bind(int fd, const sockaddr *my_addr, socklen_t addrlen) +{ + return bind(fd, my_addr, addrlen); +} + +int SocketEngine::Listen(int sockfd, int backlog) +{ + return listen(sockfd, backlog); +} + +int SocketEngine::Shutdown(int fd, int how) +{ + return shutdown(fd, how); +} + +void SocketEngine::RecoverFromFork() +{ +} + +void SocketEngine::UpdateStats(size_t len_in, size_t len_out) +{ + if (lastempty != ServerInstance->Time()) { - for (std::map::iterator a = fds.begin(); a != fds.end(); a++) - { - if ((FD_ISSET (a->second, &rfdset)) || (FD_ISSET (a->second, &wfdset))) - fdlist[result++] = a->second; - } + lastempty = ServerInstance->Time(); + indata = outdata = 0; } -#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[result++] = ke_list[j].ident; -#endif -#ifdef USE_EPOLL - int i = epoll_wait(EngineHandle, events, 65535, 100); - for (int j = 0; j < i; j++) - fdlist[result++] = events[j].data.fd; -#endif - return result; + indata += len_in; + outdata += len_out; } -std::string SocketEngine::GetName() +void SocketEngine::GetStats(float &kbitpersec_in, float &kbitpersec_out, float &kbitpersec_total) { -#ifdef USE_SELECT - return "select"; -#endif -#ifdef USE_KQUEUE - return "kqueue"; -#endif -#ifdef USE_EPOLL - return "epoll"; -#endif - return "misconfigured"; + UpdateStats(0, 0); /* Forces emptying of the values if its been more than a second */ + float in_kbit = indata * 8; + float out_kbit = outdata * 8; + kbitpersec_total = ((in_kbit + out_kbit) / 1024); + kbitpersec_in = in_kbit / 1024; + kbitpersec_out = out_kbit / 1024; }