X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fthreadengines%2Fthreadengine_pthread.cpp;h=7e822faa9b1cf862fbeab19cfce6dd7bb15823c4;hb=6cfabb0064cab52bbbab59974e53dc0fa1954da7;hp=59ab8f4021b804280d1b0a3e05886ef800d38921;hpb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/threadengines/threadengine_pthread.cpp b/src/threadengines/threadengine_pthread.cpp
index 59ab8f402..7e822faa9 100644
--- a/src/threadengines/threadengine_pthread.cpp
+++ b/src/threadengines/threadengine_pthread.cpp
@@ -1,26 +1,30 @@
-/*       +------------------------------------+
- *       | 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) 2013-2015 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008, 2010 Craig Edwards <brain@inspircd.org>
  *
- * 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 +41,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,61 +74,83 @@ class ThreadSignalSocket : public BufferedSocket
 		eventfd_write(fd, 1);
 	}
 
-	void OnDataReady()
+	void OnEventHandlerRead() CXX11_OVERRIDE
 	{
-		recvq.clear();
+		eventfd_t dummy;
+		eventfd_read(fd, &dummy);
 		parent->OnNotify();
 	}
 
-	void OnError(BufferedSocketError)
+	void OnEventHandlerWrite() CXX11_OVERRIDE
+	{
+		ServerInstance->GlobalCulls.AddItem(this);
+	}
+
+	void OnEventHandlerError(int errcode) CXX11_OVERRIDE
 	{
+		ThreadSignalSocket::OnEventHandlerWrite();
 	}
 };
 
 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)));
+		throw 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()
+	void OnEventHandlerRead() CXX11_OVERRIDE
 	{
-		recvq.clear();
+		char dummy[128];
+		read(fd, dummy, 128);
 		parent->OnNotify();
 	}
 
-	void OnError(BufferedSocketError)
+	void OnEventHandlerWrite() CXX11_OVERRIDE
 	{
+		ServerInstance->GlobalCulls.AddItem(this);
+	}
+
+	void OnEventHandlerError(int errcode) CXX11_OVERRIDE
+	{
+		ThreadSignalSocket::OnEventHandlerWrite();
 	}
 };
 
 SocketThread::SocketThread()
 {
+	signal.sock = NULL;
 	int fds[2];
 	if (pipe(fds))
-		throw new CoreException("Could not create pipe " + std::string(strerror(errno)));
+		throw CoreException("Could not create pipe " + std::string(strerror(errno)));
 	signal.sock = new ThreadSignalSocket(this, fds[0], fds[1]);
 }
 #endif
@@ -142,4 +162,9 @@ void SocketThread::NotifyParent()
 
 SocketThread::~SocketThread()
 {
+	if (signal.sock)
+	{
+		signal.sock->cull();
+		delete signal.sock;
+	}
 }