Moved some other stuff into ServerConfig

[user/henk/code/inspircd.git] / src / socketengine.cpp

diff --git a/src/socketengine.cpp b/src/socketengine.cpp
index e425b7b0f712654e3e5862b5947d9c87cd8721f5..82e79ece34e61a5595508f7472d594503cf33a03 100644 (file)
--- a/src/socketengine.cpp
+++ b/src/socketengine.cpp
@@ -120,7 +120,7 @@ bool SocketEngine::DelFd(int fd)
        }
 #ifdef USE_KQUEUE
        struct kevent ke;
-       EV_SET(&ke, fd, ref[fd] && X_READBIT ? EVFILT_READ : EVFILT_WRITE, EV_DELETE, 0, 0, NULL);
+       EV_SET(&ke, fd, ref[fd] & X_READBIT ? EVFILT_READ : EVFILT_WRITE, EV_DELETE, 0, 0, NULL);
        int i = kevent(EngineHandle, &ke, 1, 0, 0, NULL);
        if (i == -1)
        {
@@ -164,29 +164,26 @@ bool SocketEngine::Wait(std::vector<int> &fdlist)
                
        }
        tval.tv_sec = 0;
-       tval.tv_usec = 1000L;
+       tval.tv_usec = 100L;
        sresult = select(FD_SETSIZE, &rfdset, &wfdset, NULL, &tval);
        if (sresult > 0)
        {
                for (unsigned int a = 0; a < fds.size(); a++)
                {
                        if ((FD_ISSET (fds[a], &rfdset)) || (FD_ISSET (fds[a], &wfdset)))
-                       {
-                               log(DEBUG,"...Adding active %d",fds[a]);
                                fdlist.push_back(fds[a]);
-                       }
                }
        }
 #endif
 #ifdef USE_KQUEUE
-       ts.tv_nsec = 1000L;
+       ts.tv_nsec = 10000L;
        ts.tv_sec = 0;
        int i = kevent(EngineHandle, NULL, 0, &ke_list[0], 65535, &ts);
        for (int j = 0; j < i; j++)
                fdlist.push_back(ke_list[j].ident);
 #endif
 #ifdef USE_EPOLL
-       int i = epoll_wait(EngineHandle, events, 65535, 1);
+       int i = epoll_wait(EngineHandle, events, 65535, 100);
        for (int j = 0; j < i; j++)
                fdlist.push_back(events[j].data.fd);
 #endif