X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fthreadengines%2Fthreadengine_pthread.cpp;h=4054766deae87e31eda8e6644d68a95bc511c0aa;hb=4498f1abd163b140efcbbd9e75173665c9b1c29f;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..4054766de 100644
--- 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
@@ -15,8 +15,9 @@
 #include "threadengines/threadengine_pthread.h"
 #include <pthread.h>
 #include <signal.h>
+#include <fcntl.h>
 
-PThreadEngine::PThreadEngine(InspIRCd* Instance) : ThreadEngine(Instance)
+ThreadEngine::ThreadEngine()
 {
 }
 
@@ -28,58 +29,119 @@ 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;
+	ThreadData* data = new ThreadData;
 	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)));
+		throw CoreException("Unable to create new thread: " + std::string(strerror(errno)));
 	}
 }
 
-PThreadEngine::~PThreadEngine()
+ThreadEngine::~ThreadEngine()
 {
 }
 
-void PThreadData::FreeThread(Thread* thread)
+void ThreadData::FreeThread(Thread* thread)
 {
-	thread->SetExitFlag(true);
+	thread->SetExitFlag();
 	pthread_join(pthread_id, NULL);
 }
 
-MutexFactory::MutexFactory(InspIRCd* Instance) : ServerInstance(Instance)
+#ifdef HAS_EVENTFD
+#include <sys/eventfd.h>
+
+class ThreadSignalSocket : public BufferedSocket
 {
-}
+	SocketThread* parent;
+ public:
+	ThreadSignalSocket(SocketThread* p, int newfd) : BufferedSocket(newfd), parent(p) {}
+
+	~ThreadSignalSocket()
+	{
+	}
+
+	void Notify()
+	{
+		eventfd_write(fd, 1);
+	}
+
+	void OnDataReady()
+	{
+		recvq.clear();
+		parent->OnNotify();
+	}
+
+	void OnError(BufferedSocketError)
+	{
+		ServerInstance->GlobalCulls.AddItem(this);
+	}
+};
 
-Mutex* MutexFactory::CreateMutex()
+SocketThread::SocketThread()
 {
-	return new PosixMutex();
+	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
+
+class ThreadSignalSocket : public BufferedSocket
+{
+	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()
+	{
+		char dummy = '*';
+		write(send_fd, &dummy, 1);
+	}
+
+	void OnDataReady()
+	{
+		recvq.clear();
+		parent->OnNotify();
+	}
+
+	void OnError(BufferedSocketError)
+	{
+		ServerInstance->GlobalCulls.AddItem(this);
+	}
+};
 
-PosixMutex::PosixMutex() : Mutex()
+SocketThread::SocketThread()
 {
-	pthread_mutex_init(&putex, NULL);
+	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
 
-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);
 }