Fix compilation with GCC 4.7.

[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 63a877238cf77ad7b88b11b2a741f4fdf0a30eb8..c1aa0c6ee9f5f5acfc615b3cf40cc33f1a340ef8 100644 (file)
--- a/src/socketengines/socketengine_kqueue.cpp
+++ b/src/socketengines/socketengine_kqueue.cpp
@@ -39,7 +39,7 @@ public:
        virtual ~KQueueEngine();
        bool AddFd(EventHandler* eh, int event_mask);
        void OnSetEvent(EventHandler* eh, int old_mask, int new_mask);
-       virtual bool DelFd(EventHandler* eh, bool force = false);
+       virtual void DelFd(EventHandler* eh);
        virtual int DispatchEvents();
        virtual std::string GetName();
        virtual void RecoverFromFork();
@@ -54,7 +54,7 @@ KQueueEngine::KQueueEngine()
        size_t len;
 
        mib[0] = CTL_KERN;
-       mib[1] = KERN_MAXFILES;
+       mib[1] = KERN_MAXFILESPERPROC;
        len = sizeof(MAX_DESCRIPTORS);
        sysctl(mib, 2, &MAX_DESCRIPTORS, &len, NULL, 0);
        if (MAX_DESCRIPTORS <= 0)
@@ -127,14 +127,14 @@ bool KQueueEngine::AddFd(EventHandler* eh, int event_mask)
        return true;
 }
 
-bool KQueueEngine::DelFd(EventHandler* eh, bool force)
+void KQueueEngine::DelFd(EventHandler* eh)
 {
        int fd = eh->GetFd();
 
        if ((fd < 0) || (fd > GetMaxFds() - 1))
        {
                ServerInstance->Logs->Log("SOCKET",DEFAULT,"DelFd() on invalid fd: %d", fd);
-               return false;
+               return;
        }
 
        struct kevent ke;
@@ -148,18 +148,16 @@ bool KQueueEngine::DelFd(EventHandler* eh, bool force)
        EV_SET(&ke, eh->GetFd(), EVFILT_READ, EV_DELETE, 0, 0, NULL);
        int j = kevent(EngineHandle, &ke, 1, 0, 0, NULL);
 
-       if ((j < 0) && !force)
+       if (j < 0)
        {
                ServerInstance->Logs->Log("SOCKET",DEFAULT,"Failed to remove fd: %d %s",
                                          fd, strerror(errno));
-               return false;
        }
 
        CurrentSetSize--;
        ref[fd] = NULL;
 
        ServerInstance->Logs->Log("SOCKET",DEBUG,"Remove file descriptor: %d", fd);
-       return true;
 }
 
 void KQueueEngine::OnSetEvent(EventHandler* eh, int old_mask, int new_mask)
@@ -230,6 +228,10 @@ int KQueueEngine::DispatchEvents()
                        const int bits_to_clr = FD_WANT_SINGLE_WRITE | FD_WANT_FAST_WRITE | FD_WRITE_WILL_BLOCK;
                        SetEventMask(eh, eh->GetEventMask() & ~bits_to_clr);
                        eh->HandleEvent(EVENT_WRITE);
+
+                       if (eh != ref[ke_list[j].ident])
+                               // whoops, deleted out from under us
+                               continue;
                }
                if (ke_list[j].filter == EVFILT_READ)
                {