-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/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/>.
*/
-/* $Core: libIRCDthreadengine */
-
-/********* DEFAULTS **********/
-/* $ExtraSources: socketengines/socketengine_pthread.cpp */
-/* $ExtraObjects: socketengine_pthread.o */
-
-/* $If: USE_WIN32 */
-/* $ExtraSources: socketengines/socketengine_win32.cpp */
-/* $ExtraObjects: socketengine_win32.o */
-/* $EndIf */
#include "inspircd.h"
#include "threadengines/threadengine_pthread.h"
#include <pthread.h>
+#include <fcntl.h>
-pthread_mutex_t MyMutex = PTHREAD_MUTEX_INITIALIZER;
-
-PThreadEngine::PThreadEngine(InspIRCd* Instance) : ThreadEngine(Instance)
+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 PThreadEngine::Create(Thread* thread_to_init)
+
+void ThreadEngine::Start(Thread* thread)
{
- pthread_attr_t attribs;
- pthread_attr_init(&attribs);
- if (pthread_create(&this->MyPThread,
- &attribs,
- PThreadEngine::Entry,
- (void*)this) != 0)
- {
- throw CoreException("Unable to create new PThreadEngine: " + std::string(strerror(errno)));
- }
- NewThread = thread_to_init;
+ 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)
{
- //pthread_kill(this->MyPThread, SIGKILL);
+ thread->SetExitFlag();
+ pthread_join(thread->state.pthread_id, NULL);
}
-void PThreadEngine::Run()
+#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() CXX11_OVERRIDE
+ {
+ eventfd_t dummy;
+ eventfd_read(fd, &dummy);
+ parent->OnNotify();
+ }
+
+ void OnEventHandlerWrite() CXX11_OVERRIDE
+ {
+ ServerInstance->GlobalCulls.AddItem(this);
+ }
+
+ void OnEventHandlerError(int errcode) CXX11_OVERRIDE
+ {
+ ThreadSignalSocket::OnEventHandlerWrite();
+ }
+};
+
+SocketThread::SocketThread()
{
- /* This is a factory function that will create a class of type 'Thread'. The class of type Thread just
- * takes an InspIRCd* pointer and a ThreadEngine* pointer in its ctor (so it can easily use the Mutex
- * methods etc) and runs asyncronously of the ircd. */
- NewThread->Run();
+ 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
-bool PThreadEngine::Mutex(bool enable)
+class ThreadSignalSocket : public EventHandler
{
- if (enable)
- pthread_mutex_lock(&MyMutex);
- else
- pthread_mutex_unlock(&MyMutex);
+ 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() 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();
+ }
+};
- return false;
+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* PThreadEngine::Entry(void* parameter)
+void SocketThread::NotifyParent()
{
- ThreadEngine * pt = (ThreadEngine*)parameter;
- pt->Run();
- return NULL;
+ signal.sock->Notify();
}
+SocketThread::~SocketThread()
+{
+ if (signal.sock)
+ {
+ signal.sock->cull();
+ delete signal.sock;
+ }
+}
projects / user / henk / code / inspircd.git / blobdiff