Merge insp20

[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 59ab8f4021b804280d1b0a3e05886ef800d38921..fcb4db444b0b63b8e776721d838b29ed839f099c 100644 (file)
--- a/src/threadengines/threadengine_pthread.cpp
+++ b/src/threadengines/threadengine_pthread.cpp
@@ -1,26 +1,28 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
  *
- * This program is free but copyrighted software; see
- *         the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 #include "threadengines/threadengine_pthread.h"
 #include <pthread.h>
-#include <signal.h>
 #include <fcntl.h>
 
-ThreadEngine::ThreadEngine()
-{
-}
-
 static void* entry_point(void* parameter)
 {
        /* Recommended by nenolod, signal safety on a per-thread basis */
@@ -37,38 +39,32 @@ static void* entry_point(void* parameter)
 
 void ThreadEngine::Start(Thread* thread)
 {
-       ThreadData* data = new ThreadData;
-       thread->state = data;
-
-       if (pthread_create(&data->pthread_id, NULL, entry_point, thread) != 0)
-       {
-               thread->state = NULL;
-               delete data;
+       if (pthread_create(&thread->state.pthread_id, NULL, entry_point, thread) != 0)
                throw CoreException("Unable to create new thread: " + std::string(strerror(errno)));
-       }
-}
-
-ThreadEngine::~ThreadEngine()
-{
 }
 
-void ThreadData::FreeThread(Thread* thread)
+void ThreadEngine::Stop(Thread* thread)
 {
        thread->SetExitFlag();
-       pthread_join(pthread_id, NULL);
+       pthread_join(thread->state.pthread_id, NULL);
 }
 
 #ifdef HAS_EVENTFD
 #include <sys/eventfd.h>
 
-class ThreadSignalSocket : public BufferedSocket
+class ThreadSignalSocket : public EventHandler
 {
        SocketThread* parent;
  public:
-       ThreadSignalSocket(SocketThread* p, int newfd) : BufferedSocket(newfd), parent(p) {}
+       ThreadSignalSocket(SocketThread* p, int newfd) : parent(p)
+       {
+               SetFd(newfd);
+               SocketEngine::AddFd(this, FD_WANT_FAST_READ | FD_WANT_NO_WRITE);
+       }
 
        ~ThreadSignalSocket()
        {
+               SocketEngine::Close(this);
        }
 
        void Notify()
@@ -76,58 +72,74 @@ class ThreadSignalSocket : public BufferedSocket
                eventfd_write(fd, 1);
        }
 
-       void OnDataReady()
-       {
-               recvq.clear();
-               parent->OnNotify();
-       }
-
-       void OnError(BufferedSocketError)
+       void HandleEvent(EventType et, int errornum)
        {
+               if (et == EVENT_READ)
+               {
+                       eventfd_t dummy;
+                       eventfd_read(fd, &dummy);
+                       parent->OnNotify();
+               }
+               else
+               {
+                       ServerInstance->GlobalCulls.AddItem(this);
+               }
        }
 };
 
 SocketThread::SocketThread()
 {
-       int fd = eventfd(0, O_NONBLOCK);
+       signal.sock = NULL;
+       int fd = eventfd(0, EFD_NONBLOCK);
        if (fd < 0)
                throw new CoreException("Could not create pipe " + std::string(strerror(errno)));
        signal.sock = new ThreadSignalSocket(this, fd);
 }
 #else
 
-class ThreadSignalSocket : public BufferedSocket
+class ThreadSignalSocket : public EventHandler
 {
        SocketThread* parent;
        int send_fd;
  public:
        ThreadSignalSocket(SocketThread* p, int recvfd, int sendfd) :
-               BufferedSocket(recvfd), parent(p), send_fd(sendfd)  {}
+               parent(p), send_fd(sendfd)
+       {
+               SetFd(recvfd);
+               SocketEngine::NonBlocking(fd);
+               SocketEngine::AddFd(this, FD_WANT_FAST_READ | FD_WANT_NO_WRITE);
+       }
 
        ~ThreadSignalSocket()
        {
                close(send_fd);
+               SocketEngine::Close(this);
        }
 
        void Notify()
        {
-               char dummy = '*';
+               static const char dummy = '*';
                write(send_fd, &dummy, 1);
        }
 
-       void OnDataReady()
-       {
-               recvq.clear();
-               parent->OnNotify();
-       }
-
-       void OnError(BufferedSocketError)
+       void HandleEvent(EventType et, int errornum)
        {
+               if (et == EVENT_READ)
+               {
+                       char dummy[128];
+                       read(fd, dummy, 128);
+                       parent->OnNotify();
+               }
+               else
+               {
+                       ServerInstance->GlobalCulls.AddItem(this);
+               }
        }
 };
 
 SocketThread::SocketThread()
 {
+       signal.sock = NULL;
        int fds[2];
        if (pipe(fds))
                throw new CoreException("Could not create pipe " + std::string(strerror(errno)));
@@ -142,4 +154,9 @@ void SocketThread::NotifyParent()
 
 SocketThread::~SocketThread()
 {
+       if (signal.sock)
+       {
+               signal.sock->cull();
+               delete signal.sock;
+       }
 }