Merge branch 'master+tlsversion'

[user/henk/code/inspircd.git] / src / socketengine.cpp

diff --git a/src/socketengine.cpp b/src/socketengine.cpp
index c5f8031b5e6d71ca34add078c4390bb128d8b4ce..1c91ccdea0c37f52d6cb5d1ac2c8469bd79004aa 100644 (file)
--- a/src/socketengine.cpp
+++ b/src/socketengine.cpp
@@ -23,6 +23,25 @@
 
 #include "inspircd.h"
 
+
+/** Reference table, contains all current handlers
+ **/
+std::vector<EventHandler*> SocketEngine::ref;
+
+/** Current number of descriptors in the engine
+ */
+size_t SocketEngine::CurrentSetSize = 0;
+
+/** List of handlers that want a trial read/write
+ */
+std::set<int> SocketEngine::trials;
+
+int SocketEngine::MAX_DESCRIPTORS;
+
+/** Socket engine statistics: count of various events, bandwidth usage
+ */
+SocketEngine::Statistics SocketEngine::stats;
+
 EventHandler::EventHandler()
 {
        fd = -1;
@@ -34,22 +53,6 @@ void EventHandler::SetFd(int FD)
        this->fd = FD;
 }
 
-SocketEngine::SocketEngine()
-{
-       TotalEvents = WriteEvents = ReadEvents = ErrorEvents = 0;
-       lastempty = ServerInstance->Time();
-       indata = outdata = 0;
-}
-
-SocketEngine::~SocketEngine()
-{
-}
-
-void SocketEngine::SetEventMask(EventHandler* eh, int mask)
-{
-       eh->event_mask = mask;
-}
-
 void SocketEngine::ChangeEventMask(EventHandler* eh, int change)
 {
        int old_m = eh->event_mask;
@@ -103,6 +106,7 @@ bool SocketEngine::AddFdRef(EventHandler* eh)
        while (static_cast<unsigned int>(fd) >= ref.size())
                ref.resize(ref.empty() ? 1 : (ref.size() * 2));
        ref[fd] = eh;
+       CurrentSetSize++;
        return true;
 }
 
@@ -110,7 +114,10 @@ void SocketEngine::DelFdRef(EventHandler *eh)
 {
        int fd = eh->GetFd();
        if (GetRef(fd) == eh)
+       {
                ref[fd] = NULL;
+               CurrentSetSize--;
+       }
 }
 
 bool SocketEngine::HasFd(int fd)
@@ -129,7 +136,7 @@ bool SocketEngine::BoundsCheckFd(EventHandler* eh)
 {
        if (!eh)
                return false;
-       if ((eh->GetFd() < 0) || (eh->GetFd() > GetMaxFds()))
+       if (eh->GetFd() < 0)
                return false;
        return true;
 }
@@ -140,13 +147,12 @@ int SocketEngine::Accept(EventHandler* fd, sockaddr *addr, socklen_t *addrlen)
        return accept(fd->GetFd(), addr, addrlen);
 }
 
-int SocketEngine::Close(EventHandler* fd)
+int SocketEngine::Close(EventHandler* eh)
 {
-#ifdef _WIN32
-       return closesocket(fd->GetFd());
-#else
-       return close(fd->GetFd());
-#endif
+       DelFd(eh);
+       int ret = Close(eh->GetFd());
+       eh->SetFd(-1);
+       return ret;
 }
 
 int SocketEngine::Close(int fd)
@@ -190,7 +196,7 @@ int SocketEngine::RecvFrom(EventHandler* fd, void *buf, size_t len, int flags, s
 {
        int nbRecvd = recvfrom(fd->GetFd(), (char*)buf, len, flags, from, fromlen);
        if (nbRecvd > 0)
-               this->UpdateStats(nbRecvd, 0);
+               stats.Update(nbRecvd, 0);
        return nbRecvd;
 }
 
@@ -198,7 +204,7 @@ int SocketEngine::Send(EventHandler* fd, const void *buf, size_t len, int flags)
 {
        int nbSent = send(fd->GetFd(), (const char*)buf, len, flags);
        if (nbSent > 0)
-               this->UpdateStats(0, nbSent);
+               stats.Update(0, nbSent);
        return nbSent;
 }
 
@@ -206,7 +212,7 @@ int SocketEngine::Recv(EventHandler* fd, void *buf, size_t len, int flags)
 {
        int nbRecvd = recv(fd->GetFd(), (char*)buf, len, flags);
        if (nbRecvd > 0)
-               this->UpdateStats(nbRecvd, 0);
+               stats.Update(nbRecvd, 0);
        return nbRecvd;
 }
 
@@ -214,7 +220,7 @@ int SocketEngine::SendTo(EventHandler* fd, const void *buf, size_t len, int flag
 {
        int nbSent = sendto(fd->GetFd(), (const char*)buf, len, flags, to, tolen);
        if (nbSent > 0)
-               this->UpdateStats(0, nbSent);
+               stats.Update(0, nbSent);
        return nbSent;
 }
 
@@ -248,24 +254,27 @@ int SocketEngine::Shutdown(int fd, int how)
        return shutdown(fd, how);
 }
 
-void SocketEngine::RecoverFromFork()
+void SocketEngine::Statistics::Update(size_t len_in, size_t len_out)
 {
+       CheckFlush();
+       indata += len_in;
+       outdata += len_out;
 }
 
-void SocketEngine::UpdateStats(size_t len_in, size_t len_out)
+void SocketEngine::Statistics::CheckFlush() const
 {
-       if (lastempty != ServerInstance->Time())
+       // Reset the in/out byte counters if it has been more than a second
+       time_t now = ServerInstance->Time();
+       if (lastempty != now)
        {
-               lastempty = ServerInstance->Time();
+               lastempty = now;
                indata = outdata = 0;
        }
-       indata += len_in;
-       outdata += len_out;
 }
 
-void SocketEngine::GetStats(float &kbitpersec_in, float &kbitpersec_out, float &kbitpersec_total)
+void SocketEngine::Statistics::GetBandwidth(float& kbitpersec_in, float& kbitpersec_out, float& kbitpersec_total) const
 {
-       UpdateStats(0, 0); /* Forces emptying of the values if its been more than a second */
+       CheckFlush();
        float in_kbit = indata * 8;
        float out_kbit = outdata * 8;
        kbitpersec_total = ((in_kbit + out_kbit) / 1024);
@@ -282,7 +291,13 @@ std::string SocketEngine::LastError()
        DWORD dwErrorCode = WSAGetLastError();
        if (FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, dwErrorCode, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPSTR)szErrorString, _countof(szErrorString), NULL) == 0)
                sprintf_s(szErrorString, _countof(szErrorString), "Error code: %u", dwErrorCode);
-       return szErrorString;
+
+       std::string::size_type p;
+       std::string ret = szErrorString;
+       while ((p = ret.find_last_of("\r\n")) != std::string::npos)
+               ret.erase(p, 1);
+
+       return ret;
 #endif
 }