X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fthreadengines%2Fthreadengine_pthread.cpp;h=7e822faa9b1cf862fbeab19cfce6dd7bb15823c4;hb=05fe4bdd1dbe3162abb6efe830bc21bb94c73fa8;hp=9fc9cc4b4f0a5b3d39ec17fbadd8a4c4e85f16da;hpb=7b6eae36661bc798f69b22393b85a4f06d533cf6;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/threadengines/threadengine_pthread.cpp b/src/threadengines/threadengine_pthread.cpp
index 9fc9cc4b4..7e822faa9 100644
--- a/src/threadengines/threadengine_pthread.cpp
+++ b/src/threadengines/threadengine_pthread.cpp
@@ -1,24 +1,29 @@
-/*       +------------------------------------+
- *       | 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>
-
-PThreadEngine::PThreadEngine(InspIRCd* Instance) : ThreadEngine(Instance)
-{
-}
+#include <fcntl.h>
 
 static void* entry_point(void* parameter)
 {
@@ -28,58 +33,138 @@ 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;
 }
 
 
-void PThreadEngine::Start(Thread* thread)
+void ThreadEngine::Start(Thread* thread)
 {
-	PThreadData* data = new PThreadData;
-	thread->state = data;
-
-	if (pthread_create(&data->pthread_id, NULL, entry_point, thread) != 0)
-	{
-		thread->state = NULL;
-		delete data;
-		throw CoreException("Unable to create new PThreadEngine: " + std::string(strerror(errno)));
-	}
+	if (pthread_create(&thread->state.pthread_id, NULL, entry_point, thread) != 0)
+		throw CoreException("Unable to create new thread: " + std::string(strerror(errno)));
 }
 
-PThreadEngine::~PThreadEngine()
+void ThreadEngine::Stop(Thread* thread)
 {
+	thread->SetExitFlag();
+	pthread_join(thread->state.pthread_id, NULL);
 }
 
-void PThreadData::FreeThread(Thread* thread)
+#ifdef HAS_EVENTFD
+#include <sys/eventfd.h>
+
+class ThreadSignalSocket : public EventHandler
 {
-	thread->SetExitFlag(true);
-	pthread_join(pthread_id, NULL);
-}
+	SocketThread* parent;
+ public:
+	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()
+	{
+		eventfd_write(fd, 1);
+	}
+
+	void OnEventHandlerRead() CXX11_OVERRIDE
+	{
+		eventfd_t dummy;
+		eventfd_read(fd, &dummy);
+		parent->OnNotify();
+	}
+
+	void OnEventHandlerWrite() CXX11_OVERRIDE
+	{
+		ServerInstance->GlobalCulls.AddItem(this);
+	}
 
-MutexFactory::MutexFactory(InspIRCd* Instance) : ServerInstance(Instance)
+	void OnEventHandlerError(int errcode) CXX11_OVERRIDE
+	{
+		ThreadSignalSocket::OnEventHandlerWrite();
+	}
+};
+
+SocketThread::SocketThread()
 {
+	signal.sock = NULL;
+	int fd = eventfd(0, EFD_NONBLOCK);
+	if (fd < 0)
+		throw CoreException("Could not create pipe " + std::string(strerror(errno)));
+	signal.sock = new ThreadSignalSocket(this, fd);
 }
+#else
 
-Mutex* MutexFactory::CreateMutex()
+class ThreadSignalSocket : public EventHandler
 {
-	return new PosixMutex();
-}
+	SocketThread* parent;
+	int send_fd;
+ public:
+	ThreadSignalSocket(SocketThread* p, int recvfd, int 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()
+	{
+		static const char dummy = '*';
+		write(send_fd, &dummy, 1);
+	}
 
-PosixMutex::PosixMutex() : Mutex()
+	void OnEventHandlerRead() CXX11_OVERRIDE
+	{
+		char dummy[128];
+		read(fd, dummy, 128);
+		parent->OnNotify();
+	}
+
+	void OnEventHandlerWrite() CXX11_OVERRIDE
+	{
+		ServerInstance->GlobalCulls.AddItem(this);
+	}
+
+	void OnEventHandlerError(int errcode) CXX11_OVERRIDE
+	{
+		ThreadSignalSocket::OnEventHandlerWrite();
+	}
+};
+
+SocketThread::SocketThread()
 {
-	pthread_mutex_init(&putex, NULL);
+	signal.sock = NULL;
+	int fds[2];
+	if (pipe(fds))
+		throw CoreException("Could not create pipe " + std::string(strerror(errno)));
+	signal.sock = new ThreadSignalSocket(this, fds[0], fds[1]);
 }
+#endif
 
-PosixMutex::~PosixMutex()
+void SocketThread::NotifyParent()
 {
-	pthread_mutex_destroy(&putex);
+	signal.sock->Notify();
 }
 
-void PosixMutex::Enable(bool enable)
+SocketThread::~SocketThread()
 {
-	if (enable)
-		pthread_mutex_lock(&putex);
-	else
-		pthread_mutex_unlock(&putex);
+	if (signal.sock)
+	{
+		signal.sock->cull();
+		delete signal.sock;
+	}
 }