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

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

diff --git a/src/socketengines/socketengine_kqueue.cpp b/src/socketengines/socketengine_kqueue.cpp
index ccb1d1dc3c40a7f57956425cbccf884171a38640..a2bbd5afe442e18445056abec795019f648a454a 100644 (file)
--- a/src/socketengines/socketengine_kqueue.cpp
+++ b/src/socketengines/socketengine_kqueue.cpp
@@ -34,10 +34,10 @@ void KQueueEngine::RecoverFromFork()
        EngineHandle = kqueue();
        if (EngineHandle == -1)
        {
-               ServerInstance->Log(SPARSE,"ERROR: Could not initialize socket engine. Your kernel probably does not have the proper features.");
-               ServerInstance->Log(SPARSE,"ERROR: this is a fatal error, exiting now.");
-               printf("ERROR: Could not initialize socket engine. Your kernel probably does not have the proper features.");
-               printf("ERROR: this is a fatal error, exiting now.");
+               ServerInstance->Log(DEFAULT, "ERROR: Could not initialize socket engine. Your kernel probably does not have the proper features.");
+               ServerInstance->Log(DEFAULT, "ERROR: this is a fatal error, exiting now.");
+               printf("ERROR: Could not initialize socket engine. Your kernel probably does not have the proper features.\n");
+               printf("ERROR: this is a fatal error, exiting now.\n");
                ServerInstance->Exit(EXIT_STATUS_SOCKETENGINE);
        }
        CurrentSetSize = 0;
@@ -128,7 +128,11 @@ int KQueueEngine::DispatchEvents()
 {
        ts.tv_nsec = 0;
        ts.tv_sec = 1;
+
        int i = kevent(EngineHandle, NULL, 0, &ke_list[0], MAX_DESCRIPTORS, &ts);
+
+       TotalEvents += i;
+
        for (int j = 0; j < i; j++)
        {
                if (ke_list[j].flags & EV_EOF)
@@ -138,6 +142,7 @@ int KQueueEngine::DispatchEvents()
                         * Unlike smelly epoll and select, where we have to getsockopt
                         * to get the error, this saves us time and cpu cycles. Go BSD!
                         */
+                       ErrorEvents++;
                        if (ref[ke_list[j].ident])
                                ref[ke_list[j].ident]->HandleEvent(EVENT_ERROR, ke_list[j].fflags);
                        continue;
@@ -150,11 +155,13 @@ int KQueueEngine::DispatchEvents()
                        struct kevent ke;
                        EV_SET(&ke, ke_list[j].ident, EVFILT_READ, EV_ADD, 0, 0, NULL);
                        kevent(EngineHandle, &ke, 1, 0, 0, NULL);
+                       WriteEvents++;
                        if (ref[ke_list[j].ident])
                                ref[ke_list[j].ident]->HandleEvent(EVENT_WRITE);
                }
                else
                {
+                       ReadEvents++;
                        if (ref[ke_list[j].ident])
                                ref[ke_list[j].ident]->HandleEvent(EVENT_READ);
                }