X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocketengine.cpp;h=187a06541f53f30a6b7a8be8763216d695408914;hb=a64a4665e0a2898ec08cf5996bdbf63c2567310e;hp=d8291073e8735a33cf14b04d870b0993e5a20a72;hpb=d0d36795e807cf72295c6e73813e0c2daa0a71e7;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/socketengine.cpp b/src/socketengine.cpp index d8291073e..187a06541 100644 --- a/src/socketengine.cpp +++ b/src/socketengine.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -11,9 +11,64 @@ * --------------------------------------------------- */ +/* $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" #include "socketengine.h" +EventHandler::EventHandler() +{ + this->IOHook = NULL; +} + +bool EventHandler::AddIOHook(Module *IOHooker) +{ + if (this->IOHook) + return false; + + this->IOHook = IOHooker; + return true; +} + +bool EventHandler::DelIOHook() +{ + if (!this->IOHook) + return false; + + this->IOHook = NULL; + return true; +} + +Module *EventHandler::GetIOHook() +{ + return this->IOHook; +} + int EventHandler::GetFd() { return this->fd; @@ -40,7 +95,9 @@ void SocketEngine::WantWrite(EventHandler* eh) SocketEngine::SocketEngine(InspIRCd* Instance) : ServerInstance(Instance) { - memset(ref, 0, sizeof(ref)); + TotalEvents = WriteEvents = ReadEvents = ErrorEvents = 0; + lastempty = ServerInstance->Time(); + indata = outdata = 0; } SocketEngine::~SocketEngine() @@ -92,7 +149,7 @@ std::string SocketEngine::GetName() } bool SocketEngine::BoundsCheckFd(EventHandler* eh) -{ +{ if (!eh) return false; if ((eh->GetFd() < 0) || (eh->GetFd() > MAX_DESCRIPTORS)) @@ -108,44 +165,76 @@ int SocketEngine::Accept(EventHandler* fd, sockaddr *addr, socklen_t *addrlen) int SocketEngine::Close(EventHandler* fd) { +#ifdef WINDOWS + return closesocket(fd->GetFd()); +#else return close(fd->GetFd()); +#endif } -int SocketEngine::Send(EventHandler* fd, const void *buf, size_t len, int flags) +int SocketEngine::Close(int fd) { - return send(fd->GetFd(), buf, len, flags); +#ifdef WINDOWS + return closesocket(fd); +#else + return close(fd); +#endif } -int SocketEngine::Recv(EventHandler* fd, void *buf, size_t len, int flags) +int SocketEngine::Blocking(int fd) { - return recv(fd->GetFd(), buf, len, flags); +#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 +} + +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::GetSockName(EventHandler* fd, sockaddr *name, socklen_t* namelen) +{ + return getsockname(fd->GetFd(), name, namelen); } int SocketEngine::RecvFrom(EventHandler* fd, void *buf, size_t len, int flags, sockaddr *from, socklen_t *fromlen) { - return recvfrom(fd->GetFd(), buf, len, flags, from, fromlen); + this->UpdateStats(len, 0); + return recvfrom(fd->GetFd(), (char*)buf, len, flags, from, fromlen); } -int SocketEngine::SendTo(EventHandler* fd, const void *buf, size_t len, int flags, const sockaddr *to, socklen_t tolen) +int SocketEngine::Send(EventHandler* fd, const void *buf, size_t len, int flags) { - return sendto(fd->GetFd(), buf, len, flags, to, tolen); + this->UpdateStats(0, len); + return send(fd->GetFd(), (const char*)buf, len, flags); } -int SocketEngine::Connect(EventHandler* fd, const sockaddr *serv_addr, socklen_t addrlen) +int SocketEngine::Recv(EventHandler* fd, void *buf, size_t len, int flags) { - return connect(fd->GetFd(), serv_addr, addrlen); + this->UpdateStats(len, 0); + return recv(fd->GetFd(), (char*)buf, len, flags); } -int SocketEngine::Blocking(int fd) +int SocketEngine::SendTo(EventHandler* fd, const void *buf, size_t len, int flags, const sockaddr *to, socklen_t tolen) { - int flags = fcntl(fd, F_GETFL, 0); - return fcntl(fd, F_SETFL, flags ^ O_NONBLOCK); + this->UpdateStats(0, len); + return sendto(fd->GetFd(), (const char*)buf, len, flags, to, tolen); } -int SocketEngine::NonBlocking(int fd) +int SocketEngine::Connect(EventHandler* fd, const sockaddr *serv_addr, socklen_t addrlen) { - int flags = fcntl(fd, F_GETFL, 0); - return fcntl(fd, F_SETFL, flags | O_NONBLOCK); + return connect(fd->GetFd(), serv_addr, addrlen); } int SocketEngine::Shutdown(EventHandler* fd, int how) @@ -153,34 +242,42 @@ 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::GetSockName(EventHandler* fd, sockaddr *name, socklen_t* namelen) -{ - return getsockname(fd->GetFd(), name, namelen); -} - int SocketEngine::Listen(int sockfd, int backlog) { return listen(sockfd, backlog); } - int SocketEngine::Shutdown(int fd, int how) { return shutdown(fd, how); } -int SocketEngine::Close(int fd) +void SocketEngine::RecoverFromFork() { - return close(fd); } -void SocketEngine::RecoverFromFork() +void SocketEngine::UpdateStats(size_t len_in, size_t len_out) { + if (lastempty != ServerInstance->Time()) + { + lastempty = ServerInstance->Time(); + indata = outdata = 0; + } + indata += len_in; + outdata += len_out; } +void SocketEngine::GetStats(float &kbitpersec_in, float &kbitpersec_out, float &kbitpersec_total) +{ + 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; +}