X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fthreadengines%2Fthreadengine_pthread.cpp;h=7e822faa9b1cf862fbeab19cfce6dd7bb15823c4;hb=f3f2388a81b6463e1229fa5bf2b8c427440bf406;hp=3921622ff9b0d275f81c7ad61a1a3fd12b8a6cd2;hpb=5f8f96e0b6ed20f01dcda78e19e6fb1168d27f5f;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/threadengines/threadengine_pthread.cpp b/src/threadengines/threadengine_pthread.cpp index 3921622ff..7e822faa9 100644 --- a/src/threadengines/threadengine_pthread.cpp +++ b/src/threadengines/threadengine_pthread.cpp @@ -1,109 +1,170 @@ -/* +------------------------------------+ - * | 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 + * Copyright (C) 2012 Robby + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2008, 2010 Craig Edwards * - * 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 . */ + #include "inspircd.h" #include "threadengines/threadengine_pthread.h" #include +#include + +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); -pthread_mutex_t MyMutex = PTHREAD_MUTEX_INITIALIZER; + Thread* pt = static_cast(parameter); + pt->Run(); + return parameter; +} -PThreadEngine::PThreadEngine(InspIRCd* Instance) : ThreadEngine(Instance) + +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 PThreadEngine::Create(Thread* thread_to_init) +void ThreadEngine::Stop(Thread* thread) +{ + thread->SetExitFlag(); + pthread_join(thread->state.pthread_id, NULL); +} + +#ifdef HAS_EVENTFD +#include + +class ThreadSignalSocket : public EventHandler { - 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) + SocketThread* parent; + public: + ThreadSignalSocket(SocketThread* p, int newfd) : parent(p) { - delete MyPThread; - Mutex(false); - throw CoreException("Unable to create new PThreadEngine: " + std::string(strerror(errno))); + SetFd(newfd); + SocketEngine::AddFd(this, FD_WANT_FAST_READ | FD_WANT_NO_WRITE); } - pthread_attr_destroy(&attribs); + ~ThreadSignalSocket() + { + SocketEngine::Close(this); + } - NewThread = thread_to_init; - NewThread->Creator = this; - NewThread->Extend("pthread", MyPThread); + void Notify() + { + eventfd_write(fd, 1); + } - /* Always unset a mutex if you set it */ - Mutex(false); + void OnEventHandlerRead() CXX11_OVERRIDE + { + eventfd_t dummy; + eventfd_read(fd, &dummy); + parent->OnNotify(); + } - /* Wait for the PThreadEngine::Run method to take a copy of the - * pointer and clear this member value - */ - while (NewThread) - usleep(1000); -} + void OnEventHandlerWrite() CXX11_OVERRIDE + { + ServerInstance->GlobalCulls.AddItem(this); + } -PThreadEngine::~PThreadEngine() -{ -} + void OnEventHandlerError(int errcode) CXX11_OVERRIDE + { + ThreadSignalSocket::OnEventHandlerWrite(); + } +}; -void PThreadEngine::Run() +SocketThread::SocketThread() { - /* 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(); + 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); + } - printf("OK! Mutex %s\n", enable ? "on" : "off"); + ~ThreadSignalSocket() + { + close(send_fd); + SocketEngine::Close(this); + } - return false; + 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(); + } +}; + +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(); } -void PThreadEngine::FreeThread(Thread* thread) +SocketThread::~SocketThread() { - pthread_t* pthread = NULL; - if (thread->GetExt("pthread", pthread)) + if (signal.sock) { - thread->SetExitFlag(); - int rc; - void* status; - rc = pthread_join(*pthread, &status); - delete pthread; + signal.sock->cull(); + delete signal.sock; } } -