Keep count of the number of events in total, and seperate read, write and error event...

[user/henk/code/inspircd.git] / src / socketengines / socketengine_select.cpp

diff --git a/src/socketengines/socketengine_select.cpp b/src/socketengines/socketengine_select.cpp
index b7427612ef6123ed1a952806bf43013ca0c29960..cc7232b9919550bca550b802b2f5f877c5d1d6f7 100644 (file)
--- a/src/socketengines/socketengine_select.cpp
+++ b/src/socketengines/socketengine_select.cpp
@@ -132,27 +132,35 @@ int SelectEngine::DispatchEvents()
                {
                        if (FD_ISSET (ev[i]->GetFd(), &errfdset))
                        {
-                               if (ev[i])
-                               {
-                                       if (getsockopt(ev[i]->GetFd(), SOL_SOCKET, SO_ERROR, (char*)&errcode, &codesize) < 0)
-                                               errcode = errno;
+                               ErrorEvents++;
+
+                               if (getsockopt(ev[i]->GetFd(), SOL_SOCKET, SO_ERROR, (char*)&errcode, &codesize) < 0)
+                                       errcode = errno;
+
+                               ev[i]->HandleEvent(EVENT_ERROR, errcode);
 
-                                       ev[i]->HandleEvent(EVENT_ERROR, errcode);
-                               }
                                continue;
                        }
-                       if (ev[i])
+                       else
                        {
                                if (writeable[ev[i]->GetFd()])
                                {
+                                       WriteEvents++;
                                        writeable[ev[i]->GetFd()] = false;
-                                       if (ev[i])
-                                               ev[i]->HandleEvent(EVENT_WRITE);
+                                       ev[i]->HandleEvent(EVENT_WRITE);
                                }
                                else
                                {
-                                       if (ev[i])
-                                               ev[i]->HandleEvent(ev[i]->Readable() ? EVENT_READ : EVENT_WRITE);
+                                       if (ev[i]->Readable())
+                                       {
+                                               ReadEvents++;
+                                               ev[i]->HandleEvent(EVENT_READ);
+                                       }
+                                       else
+                                       {
+                                               WriteEvents++;
+                                               ev[i]->HandleEvent(EVENT_WRITE);
+                                       }
                                }
                        }
                }