m_dnsbl updates

[user/henk/code/inspircd.git] / src / threadengines / threadengine_pthread.cpp

diff --git a/src/threadengines/threadengine_pthread.cpp b/src/threadengines/threadengine_pthread.cpp
index a4f42eba9532b6df9c707f3488860742f9ee9b47..4054766deae87e31eda8e6644d68a95bc511c0aa 100644 (file)
--- a/src/threadengines/threadengine_pthread.cpp
+++ b/src/threadengines/threadengine_pthread.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -17,7 +17,7 @@
 #include <signal.h>
 #include <fcntl.h>
 
-ThreadEngine::ThreadEngine(InspIRCd* Instance)
+ThreadEngine::ThreadEngine()
 {
 }
 
@@ -29,7 +29,7 @@ static void* entry_point(void* parameter)
        sigaddset(&set, SIGPIPE);
        pthread_sigmask(SIG_BLOCK, &set, NULL);
 
-       Thread* pt = reinterpret_cast<Thread*>(parameter);
+       Thread* pt = static_cast<Thread*>(parameter);
        pt->Run();
        return parameter;
 }
@@ -65,8 +65,7 @@ class ThreadSignalSocket : public BufferedSocket
 {
        SocketThread* parent;
  public:
-       ThreadSignalSocket(SocketThread* p, InspIRCd* SI, int newfd) :
-               BufferedSocket(SI, newfd, const_cast<char*>("0.0.0.0")), parent(p) {}
+       ThreadSignalSocket(SocketThread* p, int newfd) : BufferedSocket(newfd), parent(p) {}
 
        ~ThreadSignalSocket()
        {
@@ -77,22 +76,24 @@ class ThreadSignalSocket : public BufferedSocket
                eventfd_write(fd, 1);
        }
 
-       virtual bool OnDataReady()
+       void OnDataReady()
        {
-               eventfd_t data;
-               if (eventfd_read(fd, &data))
-                       return false;
+               recvq.clear();
                parent->OnNotify();
-               return true;
+       }
+
+       void OnError(BufferedSocketError)
+       {
+               ServerInstance->GlobalCulls.AddItem(this);
        }
 };
 
-SocketThread::SocketThread(InspIRCd* SI)
+SocketThread::SocketThread()
 {
        int fd = eventfd(0, O_NONBLOCK);
        if (fd < 0)
                throw new CoreException("Could not create pipe " + std::string(strerror(errno)));
-       signal.sock = new ThreadSignalSocket(this, SI, fd);
+       signal.sock = new ThreadSignalSocket(this, fd);
 }
 #else
 
@@ -101,8 +102,8 @@ class ThreadSignalSocket : public BufferedSocket
        SocketThread* parent;
        int send_fd;
  public:
-       ThreadSignalSocket(SocketThread* p, InspIRCd* SI, int recvfd, int sendfd) :
-               BufferedSocket(SI, recvfd, const_cast<char*>("0.0.0.0")), parent(p), send_fd(sendfd)  {}
+       ThreadSignalSocket(SocketThread* p, int recvfd, int sendfd) :
+               BufferedSocket(recvfd), parent(p), send_fd(sendfd)  {}
 
        ~ThreadSignalSocket()
        {
@@ -112,25 +113,27 @@ class ThreadSignalSocket : public BufferedSocket
        void Notify()
        {
                char dummy = '*';
-               send(send_fd, &dummy, 1, 0);
+               write(send_fd, &dummy, 1);
        }
 
-       virtual bool OnDataReady()
+       void OnDataReady()
        {
-               char data;
-               if (ServerInstance->SE->Recv(this, &data, 1, 0) <= 0)
-                       return false;
+               recvq.clear();
                parent->OnNotify();
-               return true;
+       }
+
+       void OnError(BufferedSocketError)
+       {
+               ServerInstance->GlobalCulls.AddItem(this);
        }
 };
 
-SocketThread::SocketThread(InspIRCd* SI)
+SocketThread::SocketThread()
 {
        int fds[2];
        if (pipe(fds))
                throw new CoreException("Could not create pipe " + std::string(strerror(errno)));
-       signal.sock = new ThreadSignalSocket(this, SI, fds[0], fds[1]);
+       signal.sock = new ThreadSignalSocket(this, fds[0], fds[1]);
 }
 #endif
 
@@ -141,5 +144,4 @@ void SocketThread::NotifyParent()
 
 SocketThread::~SocketThread()
 {
-       delete signal.sock;
 }