ThreadEngine: Allow interthread signaling without needing as many hacks

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11251 e03df62e-2008-0410-955e-edbf42e46eb7

2 files changed, 177 insertions, 1 deletions

diff --git a/src/threadengines/threadengine_pthread.cpp b/src/threadengines/threadengine_pthread.cpp
index f5de69a6a..5aef0f247 100644
--- a/src/threadengines/threadengine_pthread.cpp
+++ b/src/threadengines/threadengine_pthread.cpp
@@ -53,6 +53,96 @@ ThreadEngine::~ThreadEngine()
 
 void ThreadData::FreeThread(Thread* thread)
 {
-	thread->SetExitFlag(true);
+	thread->SetExitFlag();
 	pthread_join(pthread_id, NULL);
 }
+
+#if 0
+/* TODO this is a linux-specific syscall that allows signals to be
+ * sent using a single file descriptor, rather than 2 for a pipe.
+ * Requires glibc 2.8, kernel 2.6.22+
+ */
+#include <sys/eventfd.h>
+
+class ThreadSignalSocket : public BufferedSocket
+{
+	SocketThread* parent;
+ public:
+	ThreadSignalSocket(SocketThread* p, InspIRCd* SI, int newfd) :
+		BufferedSocket(SI, newfd, const_cast<char*>("0.0.0.0")), parent(p) {}
+
+	~ThreadSignalSocket()
+	{
+	}
+
+	void Notify()
+	{
+		eventfd_write(fd, 1);
+	}
+
+	virtual bool OnDataReady()
+	{
+		eventfd_t data;
+		if (eventfd_read(fd, &data))
+			return false;
+		parent->OnNotify();
+		return true;
+	}
+};
+
+SocketThread::SocketThread(InspIRCd* SI)
+{
+	int fd = eventfd(0, 0); // TODO nonblock
+	if (fd < 0)
+		throw new CoreException("Could not create pipe " + std::string(strerror(errno)));
+	signal.sock = new ThreadSignalSocket(this, SI, fd);
+}
+#else
+
+class ThreadSignalSocket : public BufferedSocket
+{
+	SocketThread* parent;
+	int send_fd;
+ public:
+	ThreadSignalSocket(SocketThread* p, InspIRCd* SI, int recvfd, int sendfd) :
+		BufferedSocket(SI, recvfd, const_cast<char*>("0.0.0.0")), parent(p), send_fd(sendfd)  {}
+
+	~ThreadSignalSocket()
+	{
+		close(send_fd);
+	}
+
+	void Notify()
+	{
+		char dummy = '*';
+		send(send_fd, &dummy, 1, 0);
+	}
+
+	virtual bool OnDataReady()
+	{
+		char data;
+		if (ServerInstance->SE->Recv(this, &data, 1, 0) <= 0)
+			return false;
+		parent->OnNotify();
+		return true;
+	}
+};
+
+SocketThread::SocketThread(InspIRCd* SI)
+{
+	int fds[2];
+	if (pipe(fds))
+		throw new CoreException("Could not create pipe " + std::string(strerror(errno)));
+	signal.sock = new ThreadSignalSocket(this, SI, fds[0], fds[1]);
+}
+#endif
+
+void SocketThread::NotifyParent()
+{
+	signal.sock->Notify();
+}
+
+SocketThread::~SocketThread()
+{
+	delete signal.sock;
+}
diff --git a/src/threadengines/threadengine_win32.cpp b/src/threadengines/threadengine_win32.cpp
index 6ebd6a10a..5a0635a09 100644
--- a/src/threadengines/threadengine_win32.cpp
+++ b/src/threadengines/threadengine_win32.cpp
@@ -51,3 +51,89 @@ void ThreadData::FreeThread(Thread* thread)
 	WaitForSingleObject(handle,INFINITE);
 }
 
+class ThreadSignalSocket : public BufferedSocket
+{
+	SignalThread* parent;
+ public:
+	ThreadSignalSocket(SignalThread* t, InspIRCd* SI, int newfd, char* ip)
+		: BufferedSocket(SI, newfd, ip), parent(t)
+	{
+		parent->results = this;
+	}
+	
+	virtual bool OnDataReady()
+	{
+		char data = 0;
+		if (ServerInstance->SE->Recv(this, &data, 1, 0) > 0)
+		{
+			parent->OnNotify();
+			return true;
+		}
+		return false;
+	}
+};
+
+class ThreadSignalListener : public ListenSocketBase
+{
+	SocketThread* parent;
+	irc::sockets::insp_sockaddr sock_us;
+ public:
+	ThreadSignalListener(SocketThread* t, InspIRCd* Instance, int port, const std::string &addr) : ListenSocketBase(Instance, port, addr), parent(t)
+	{
+		socklen_t uslen = sizeof(sock_us);
+		if (getsockname(this->fd,(sockaddr*)&sock_us,&uslen))
+		{
+			throw ModuleException("Could not getsockname() to find out port number for ITC port");
+		}
+	}
+
+	virtual void OnAcceptReady(const std::string &ipconnectedto, int nfd, const std::string &incomingip)
+	{
+		new ThreadSignalSocket(parent, ServerInstance, nfd, const_cast<char*>(ipconnectedto.c_str()));
+		ServerInstance->SE->DelFd(this);
+		// XXX unsafe casts suck
+	}
+/* Using getsockname and ntohs, we can determine which port number we were allocated */
+	int GetPort()
+	{
+#ifdef IPV6
+		return ntohs(sock_us.sin6_port);
+#else
+		return ntohs(sock_us.sin_port);
+#endif
+	}
+};
+
+SocketThread::SocketThread(InspIRCd* SI)
+{
+	ThreadSignalListener* listener = new ThreadSignalListener(this, ServerInstance, 0, "127.0.0.1");
+	if (listener->GetFd() == -1)
+		throw CoreException("Could not create ITC pipe");
+	int connFD = socket(AF_INET, SOCK_STREAM, 0);
+	if (connFD == -1)
+		throw CoreException("Could not create ITC pipe");
+	
+	irc::sockets::sockaddrs addr;
+	irc::sockets::insp_aton("127.0.0.1", &addr.in4.sin_addr);
+	addr.in4.sin_family = AF_INET;
+	addr.in4.sin_port = htons(listener->GetPort());
+
+	if (connect(connFD, &addr.sa, sizeof(addr.in4)) == -1)
+	{
+		ServerInstance->SE->DelFd(listener);
+		close(connFD);
+		throw CoreException("Could not connet to ITC pipe");
+	}
+	this->signal.connFD = connFD;
+}
+
+void SocketThread::NotifyParent()
+{
+	char dummy = '*';
+	send(signal.connFD, &dummy, 1, 0);
+}
+
+SocketThread::~SocketThread()
+{
+	close(signal.connFD);
+}