Measure bandwidth statistics from the socket engine (kiloBITS per second in, out...

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@9918 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/include/socketengine.h b/include/socketengine.h
index f647f4df3add6d6c6b440ed64848ff7070054833..f16ec3fea045272c8ef99e64c6b261f77f0ba867 100644 (file)
--- a/include/socketengine.h
+++ b/include/socketengine.h
@@ -170,6 +170,12 @@ protected:
        EventHandler** ref;
 
        int MAX_DESCRIPTORS;
+
+       size_t indata;
+       size_t outdata;
+       time_t lastempty;
+
+       void UpdateStats(size_t len_in, size_t len_out);
 public:
 
        double TotalEvents;
@@ -396,6 +402,10 @@ public:
         * the shell or operating system on fatal error.
         */
        virtual void RecoverFromFork();
+
+       /** Get data transfer statistics, kilobits per second in and out and total.
+        */
+       void GetStats(float &kbitpersec_in, float &kbitpersec_out, float &kbitpersec_total);
 };
 
 #endif

diff --git a/src/commands/cmd_stats.cpp b/src/commands/cmd_stats.cpp
index 1296bf08a5ff337c800b645be1263a72ad53aff4..0857adb446ba5d61f09165d8e59a88e4aa3c8fdc 100644 (file)
--- a/src/commands/cmd_stats.cpp
+++ b/src/commands/cmd_stats.cpp
@@ -201,6 +201,17 @@ DllExport void DoStats(InspIRCd* ServerInstance, char statschar, User* user, str
 
                        results.push_back(sn+" 249 "+user->nick+" :MOTD(VECTOR) "+ConvToStr(ServerInstance->Config->MOTD.size())+", RULES(VECTOR) "+ConvToStr(ServerInstance->Config->RULES.size()));
 
+                       float kbitpersec_in, kbitpersec_out, kbitpersec_total;
+                       ServerInstance->SE->GetStats(kbitpersec_in, kbitpersec_out, kbitpersec_total);
+
+                       snprintf(kbitspersec_total_s, 30, "%03.5f%%", kbitspersec_total);
+                       snprintf(kbitspersec_out_s, 30, "%03.5f%%", kbitspersec_out);
+                       snprintf(kbitspersec_in_s, 30, "%03.5f%%", kbitspersec_in);
+
+                       results.push_back(sn+" 249 "+user->nick+" :Bandwidth total:  "+ConvToStr(kbitspersec_total_s)+" kilobits/sec");
+                       results.push_back(sn+" 249 "+user->nick+" :Bandwidth out:    "+ConvToStr(kbitspersec_out_s)+" kilobits/sec");
+                       results.push_back(sn+" 249 "+user->nick+" :Bandwidth in:     "+ConvToStr(kbitspersec_in_s)+" kilobits/sec");
+
 #ifndef WIN32
                        /* Moved this down here so all the not-windows stuff (look w00tie, I didn't say win32!) is in one ifndef.
                         * Also cuts out some identical code in both branches of the ifndef. -- Om

diff --git a/src/socketengine.cpp b/src/socketengine.cpp
index dd80b7f94019a605eb274a8d356400ed63dbdba3..90d25e0604eaea1d5e392c364487d620e583a423 100644 (file)
--- a/src/socketengine.cpp
+++ b/src/socketengine.cpp
@@ -62,6 +62,8 @@ void SocketEngine::WantWrite(EventHandler* eh)
 SocketEngine::SocketEngine(InspIRCd* Instance) : ServerInstance(Instance)
 {
        TotalEvents = WriteEvents = ReadEvents = ErrorEvents = 0;
+       lastempty = time(NULL);
+       indata = outdata = 0;
 }
 
 SocketEngine::~SocketEngine()
@@ -174,21 +176,25 @@ int SocketEngine::GetSockName(EventHandler* fd, sockaddr *name, socklen_t* namel
 
 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(), (char*)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(), (const char*)buf, len, flags);
 }
 
 int SocketEngine::Recv(EventHandler* fd, void *buf, size_t len, int flags)
 {
+       this->UpdateStats(len, 0);
        return recv(fd->GetFd(), (char*)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(), (const char*)buf, len, flags, to, tolen);
 }
 
@@ -221,3 +227,22 @@ void SocketEngine::RecoverFromFork()
 {
 }
 
+void SocketEngine::UpdateStats(size_t len_in, size_t len_out)
+{
+       if (lastempty + 1 > time(NULL))
+       {
+               lastempty = time(NULL);
+               indata = outdata = 0;
+       }
+       indata += len_in;
+       outdata += len_out;
+}
+
+void SocketEngine::GetStats(float &kbitpersec_in, float &kbitpersec_out, float &kbitpersec_total)
+{
+       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;
+}

diff --git a/src/socketengines/socketengine_iocp.cpp b/src/socketengines/socketengine_iocp.cpp
index c1e97ce74186f325117177b122b17b054ba09e65..2a0c4d416f8930ef75741f8e031d2a4acf1803c3 100644 (file)
--- a/src/socketengines/socketengine_iocp.cpp
+++ b/src/socketengines/socketengine_iocp.cpp
@@ -494,6 +494,7 @@ int IOCPEngine::GetSockName(EventHandler* fd, sockaddr *name, socklen_t* namelen
 
 int IOCPEngine::RecvFrom(EventHandler* fd, void *buf, size_t len, int flags, struct sockaddr *from, socklen_t *fromlen)
 {
+       this->UpdateStats(len, 0);
        udp_overlap * ov = NULL;
        if (!fd->GetExt("windows_readevent", ov))
                return -1;

diff --git a/win/inspircd_namedpipe.cpp b/win/inspircd_namedpipe.cpp
index 30aab9cd49874d1d8db060ed14bf08570d82667f..3f0f47fdf5ebfe7c08f6dd78c70528d526b96bba 100644 (file)
--- a/win/inspircd_namedpipe.cpp
+++ b/win/inspircd_namedpipe.cpp
@@ -62,9 +62,12 @@ void IPCThread::Run()
 \r
                        std::stringstream stat;\r
                        DWORD Written = 0;\r
+                       float kbitpersec_in, kbitpersec_out, kbitpersec_total;\r
 \r
                        PROCESS_MEMORY_COUNTERS MemCounters;\r
 \r
+                       ServerInstance->SE->GetStats(kbitpersec_in, kbitpersec_out, kbitpersec_total);\r
+\r
                        bool HaveMemoryStats = GetProcessMemoryInfo(GetCurrentProcess(), &MemCounters, sizeof(MemCounters));\r
 \r
                        stat << "name " << ServerInstance->Config->ServerName << std::endl;\r
@@ -77,6 +80,9 @@ void IPCThread::Run()
                        stat << "pid " << GetProcessId(GetCurrentProcess()) << std::endl;\r
                        stat << "request " << oldrequest << std::endl;\r
                        stat << "result " << this->GetResult() << std::endl;\r
+                       stat << "kbitspersectotal " << kbitpersec_total << std::endl;\r
+                       stat << "kbitspersecout " << kbitpersec_out << std::endl;\r
+                       stat << "kbitspersecin " << kbitpersec_in << std::endl;\r
                        if (HaveMemoryStats)\r
                        {\r
                                stat << "workingset " << MemCounters.WorkingSetSize << std::endl;\r