Replace socketengine_{pthread,win32} with C++11 threads.

2 files changed, 0 insertions, 300 deletions

diff --git a/src/threadengines/threadengine_pthread.cpp b/src/threadengines/threadengine_pthread.cpp
deleted file mode 100644
index c2190c879..000000000
--- a/src/threadengines/threadengine_pthread.cpp
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * InspIRCd -- Internet Relay Chat Daemon
- *
- *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
- *
- * 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 <fcntl.h>
-
-static void* entry_point(void* parameter)
-{
-	/* Recommended by nenolod, signal safety on a per-thread basis */
-	sigset_t set;
-	sigemptyset(&set);
-	sigaddset(&set, SIGPIPE);
-	pthread_sigmask(SIG_BLOCK, &set, NULL);
-
-	Thread* pt = static_cast<Thread*>(parameter);
-	pt->Run();
-	return parameter;
-}
-
-
-void ThreadEngine::Start(Thread* thread)
-{
-	if (pthread_create(&thread->state.pthread_id, NULL, entry_point, thread) != 0)
-		throw CoreException("Unable to create new thread: " + std::string(strerror(errno)));
-}
-
-void ThreadEngine::Stop(Thread* thread)
-{
-	thread->SetExitFlag();
-	pthread_join(thread->state.pthread_id, NULL);
-}
-
-#ifdef HAS_EVENTFD
-#include <sys/eventfd.h>
-
-class ThreadSignalSocket : public EventHandler
-{
-	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() override
-	{
-		eventfd_t dummy;
-		eventfd_read(fd, &dummy);
-		parent->OnNotify();
-	}
-
-	void OnEventHandlerWrite() override
-	{
-		ServerInstance->GlobalCulls.AddItem(this);
-	}
-
-	void OnEventHandlerError(int errcode) 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
-
-class ThreadSignalSocket : public EventHandler
-{
-	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);
-	}
-
-	void OnEventHandlerRead() override
-	{
-		char dummy[128];
-		read(fd, dummy, 128);
-		parent->OnNotify();
-	}
-
-	void OnEventHandlerWrite() override
-	{
-		ServerInstance->GlobalCulls.AddItem(this);
-	}
-
-	void OnEventHandlerError(int errcode) override
-	{
-		ThreadSignalSocket::OnEventHandlerWrite();
-	}
-};
-
-SocketThread::SocketThread()
-{
-	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
-
-void SocketThread::NotifyParent()
-{
-	signal.sock->Notify();
-}
-
-SocketThread::~SocketThread()
-{
-	if (signal.sock)
-	{
-		signal.sock->cull();
-		delete signal.sock;
-	}
-}
diff --git a/src/threadengines/threadengine_win32.cpp b/src/threadengines/threadengine_win32.cpp
deleted file mode 100644
index f2a4fdc85..000000000
--- a/src/threadengines/threadengine_win32.cpp
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * InspIRCd -- Internet Relay Chat Daemon
- *
- *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
- *
- * 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_win32.h"
-
-void ThreadEngine::Start(Thread* thread)
-{
-	thread->state.handle = CreateThread(NULL, 0, ThreadEngine::Entry, thread, 0, NULL);
-
-	if (thread->state.handle == NULL)
-	{
-		DWORD lasterr = GetLastError();
-		std::string err = "Unable to create new thread: " + ConvToStr(lasterr);
-		SetLastError(ERROR_SUCCESS);
-		throw CoreException(err);
-	}
-}
-
-DWORD WINAPI ThreadEngine::Entry(void* parameter)
-{
-	Thread* pt = static_cast<Thread*>(parameter);
-	pt->Run();
-	return 0;
-}
-
-void ThreadEngine::Stop(Thread* thread)
-{
-	thread->SetExitFlag();
-	HANDLE handle = thread->state.handle;
-	WaitForSingleObject(handle,INFINITE);
-	CloseHandle(handle);
-}
-
-class ThreadSignalSocket : public BufferedSocket
-{
-	SocketThread* parent;
- public:
-	ThreadSignalSocket(SocketThread* t, int newfd)
-		: BufferedSocket(newfd), parent(t)
-	{
-	}
-
-	void OnDataReady()
-	{
-		recvq.clear();
-		parent->OnNotify();
-	}
-
-	void OnError(BufferedSocketError)
-	{
-		ServerInstance->GlobalCulls.AddItem(this);
-	}
-};
-
-static bool BindAndListen(int sockfd, int port, const char* addr)
-{
-	irc::sockets::sockaddrs servaddr;
-	if (!irc::sockets::aptosa(addr, port, servaddr))
-		return false;
-
-	if (SocketEngine::Bind(sockfd, servaddr) != 0)
-		return false;
-
-	if (SocketEngine::Listen(sockfd, ServerInstance->Config->MaxConn) != 0)
-	{
-		ServerInstance->Logs.Log("SOCKET", LOG_DEFAULT, "ERROR in listen(): %s", strerror(errno));
-		return false;
-	}
-
-	return true;
-}
-
-SocketThread::SocketThread()
-{
-	int listenFD = socket(AF_INET, SOCK_STREAM, 0);
-	if (listenFD == -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");
-
-	if (!BindAndListen(listenFD, 0, "127.0.0.1"))
-		throw CoreException("Could not create ITC pipe");
-	SocketEngine::NonBlocking(connFD);
-
-	struct sockaddr_in addr;
-	socklen_t sz = sizeof(addr);
-	getsockname(listenFD, reinterpret_cast<struct sockaddr*>(&addr), &sz);
-	connect(connFD, reinterpret_cast<struct sockaddr*>(&addr), sz);
-	SocketEngine::Blocking(listenFD);
-	int nfd = accept(listenFD, reinterpret_cast<struct sockaddr*>(&addr), &sz);
-	if (nfd < 0)
-		throw CoreException("Could not create ITC pipe");
-	new ThreadSignalSocket(this, nfd);
-	closesocket(listenFD);
-
-	SocketEngine::Blocking(connFD);
-	this->signal.connFD = connFD;
-}
-
-void SocketThread::NotifyParent()
-{
-	char dummy = '*';
-	send(signal.connFD, &dummy, 1, 0);
-}
-
-SocketThread::~SocketThread()
-{
-	if (signal.connFD >= 0)
-	{
-		shutdown(signal.connFD, 2);
-		closesocket(signal.connFD);
-	}
-}