X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fthreadengines%2Fthreadengine_pthread.cpp;h=4054766deae87e31eda8e6644d68a95bc511c0aa;hb=4498f1abd163b140efcbbd9e75173665c9b1c29f;hp=2f09cc30556e7b4cfe189bf4ed675ecc6954963c;hpb=81b10b90490e54545d026dfc1cf60453090f1e3a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/threadengines/threadengine_pthread.cpp b/src/threadengines/threadengine_pthread.cpp
index 2f09cc305..4054766de 100644
--- a/src/threadengines/threadengine_pthread.cpp
+++ b/src/threadengines/threadengine_pthread.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *	    the file COPYING for details.
@@ -14,94 +14,134 @@
 #include "inspircd.h"
 #include "threadengines/threadengine_pthread.h"
 #include <pthread.h>
+#include <signal.h>
+#include <fcntl.h>
 
-pthread_mutex_t MyMutex = PTHREAD_MUTEX_INITIALIZER;
-
-PThreadEngine::PThreadEngine(InspIRCd* Instance) : ThreadEngine(Instance)
+ThreadEngine::ThreadEngine()
 {
 }
 
-void PThreadEngine::Create(Thread* thread_to_init)
+static void* entry_point(void* parameter)
 {
-	pthread_attr_t attribs;
-	pthread_attr_init(&attribs);
-	pthread_attr_setdetachstate(&attribs, PTHREAD_CREATE_JOINABLE);
-	pthread_t* MyPThread = new pthread_t;
-
-	/* Create a thread in a mutex. This prevents whacking the member value NewThread,
-	 * and also prevents recursive creation of threads by mistake (instead, the thread
-	 * will just deadlock itself)
-	 */
-	Mutex(true);
-
-	if (pthread_create(MyPThread, &attribs, PThreadEngine::Entry, (void*)this) != 0)
-	{
-		delete MyPThread;
-		Mutex(false);
-		throw CoreException("Unable to create new PThreadEngine: " + std::string(strerror(errno)));
-	}
+	/* Recommended by nenolod, signal safety on a per-thread basis */
+	sigset_t set;
+	sigemptyset(&set);
+	sigaddset(&set, SIGPIPE);
+	pthread_sigmask(SIG_BLOCK, &set, NULL);
 
-	pthread_attr_destroy(&attribs);
+	Thread* pt = static_cast<Thread*>(parameter);
+	pt->Run();
+	return parameter;
+}
 
-	NewThread = thread_to_init;
-	NewThread->Creator = this;
-	NewThread->Extend("pthread", MyPThread);
 
-	/* Always unset a mutex if you set it */
-	Mutex(false);
+void ThreadEngine::Start(Thread* thread)
+{
+	ThreadData* data = new ThreadData;
+	thread->state = data;
 
-	/* Wait for the PThreadEngine::Run method to take a copy of the
-	 * pointer and clear this member value
-	 */
-	while (NewThread)
-		usleep(1000);
+	if (pthread_create(&data->pthread_id, NULL, entry_point, thread) != 0)
+	{
+		thread->state = NULL;
+		delete data;
+		throw CoreException("Unable to create new thread: " + std::string(strerror(errno)));
+	}
 }
 
-PThreadEngine::~PThreadEngine()
+ThreadEngine::~ThreadEngine()
 {
 }
 
-void PThreadEngine::Run()
+void ThreadData::FreeThread(Thread* thread)
 {
-	/* Take a copy of the member value, then clear it. Do this
-	 * in a mutex so that we can be sure nothing else is looking
-	 * at it.
-	 */
-	Mutex(true);
-	Thread* nt = NewThread;
-	NewThread = NULL;
-	Mutex(false);
-	/* Now we have our own safe copy, call the object on it */
-	nt->Run();
+	thread->SetExitFlag();
+	pthread_join(pthread_id, NULL);
 }
 
-bool PThreadEngine::Mutex(bool enable)
+#ifdef HAS_EVENTFD
+#include <sys/eventfd.h>
+
+class ThreadSignalSocket : public BufferedSocket
 {
-	if (enable)
-		pthread_mutex_lock(&MyMutex);
-	else
-		pthread_mutex_unlock(&MyMutex);
+	SocketThread* parent;
+ public:
+	ThreadSignalSocket(SocketThread* p, int newfd) : BufferedSocket(newfd), parent(p) {}
 
-	return false;
-}
+	~ThreadSignalSocket()
+	{
+	}
+
+	void Notify()
+	{
+		eventfd_write(fd, 1);
+	}
 
-void* PThreadEngine::Entry(void* parameter)
+	void OnDataReady()
+	{
+		recvq.clear();
+		parent->OnNotify();
+	}
+
+	void OnError(BufferedSocketError)
+	{
+		ServerInstance->GlobalCulls.AddItem(this);
+	}
+};
+
+SocketThread::SocketThread()
 {
-	ThreadEngine * pt = (ThreadEngine*)parameter;
-	pt->Run();
-	return NULL;
+	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, fd);
 }
+#else
 
-void PThreadEngine::FreeThread(Thread* thread)
+class ThreadSignalSocket : public BufferedSocket
 {
-	pthread_t* pthread = NULL;
-	if (thread->GetExt("pthread", pthread))
+	SocketThread* parent;
+	int send_fd;
+ public:
+	ThreadSignalSocket(SocketThread* p, int recvfd, int sendfd) :
+		BufferedSocket(recvfd), parent(p), send_fd(sendfd)  {}
+
+	~ThreadSignalSocket()
+	{
+		close(send_fd);
+	}
+
+	void Notify()
 	{
-		thread->SetExitFlag();
-		int rc;
-		void* status;
-		rc = pthread_join(*pthread, &status);
-		delete pthread;
+		char dummy = '*';
+		write(send_fd, &dummy, 1);
 	}
+
+	void OnDataReady()
+	{
+		recvq.clear();
+		parent->OnNotify();
+	}
+
+	void OnError(BufferedSocketError)
+	{
+		ServerInstance->GlobalCulls.AddItem(this);
+	}
+};
+
+SocketThread::SocketThread()
+{
+	int fds[2];
+	if (pipe(fds))
+		throw new CoreException("Could not create pipe " + std::string(strerror(errno)));
+	signal.sock = new ThreadSignalSocket(this, fds[0], fds[1]);
 }
+#endif
 
+void SocketThread::NotifyParent()
+{
+	signal.sock->Notify();
+}
+
+SocketThread::~SocketThread()
+{
+}