X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocketengine.cpp;h=1c91ccdea0c37f52d6cb5d1ac2c8469bd79004aa;hb=9b99c5ad31eb8de222d2b3aa1daa9412f0b25857;hp=8af598b069ed6184565810688b416f2823f88810;hpb=6e0b904d342461cd2ac2a3cd0cf2a43d864d2b00;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/socketengine.cpp b/src/socketengine.cpp index 8af598b06..1c91ccdea 100644 --- a/src/socketengine.cpp +++ b/src/socketengine.cpp @@ -23,6 +23,25 @@ #include "inspircd.h" + +/** Reference table, contains all current handlers + **/ +std::vector 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 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; @@ -60,7 +63,7 @@ void SocketEngine::ChangeEventMask(EventHandler* eh, int change) 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()); @@ -94,17 +97,38 @@ void SocketEngine::DispatchTrialWrites() } } -bool SocketEngine::HasFd(int fd) +bool SocketEngine::AddFdRef(EventHandler* eh) { - if ((fd < 0) || (fd > GetMaxFds())) + int fd = eh->GetFd(); + if (HasFd(fd)) return false; - return (ref[fd] != NULL); + + while (static_cast(fd) >= ref.size()) + ref.resize(ref.empty() ? 1 : (ref.size() * 2)); + ref[fd] = eh; + CurrentSetSize++; + return true; +} + +void SocketEngine::DelFdRef(EventHandler *eh) +{ + int fd = eh->GetFd(); + if (GetRef(fd) == eh) + { + ref[fd] = NULL; + CurrentSetSize--; + } +} + +bool SocketEngine::HasFd(int fd) +{ + return GetRef(fd) != NULL; } EventHandler* SocketEngine::GetRef(int fd) { - if ((fd < 0) || (fd > GetMaxFds())) - return 0; + if (fd < 0 || static_cast(fd) >= ref.size()) + return NULL; return ref[fd]; } @@ -112,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; } @@ -123,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) @@ -173,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; } @@ -181,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; } @@ -189,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; } @@ -197,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; } @@ -231,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); @@ -265,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 }