X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fthreadengines%2Fthreadengine_pthread.cpp;h=40205da3118533479382f8f7f8dba2b5e182ffe1;hb=748b3a0d89e7ecc9a766471b79fb78f63a5ca2bb;hp=d6b0f3bd749be510f97458e47f64cafdd078acd9;hpb=ed1902f23cd79f45c5795893ac67f383952ac407;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/threadengines/threadengine_pthread.cpp b/src/threadengines/threadengine_pthread.cpp index d6b0f3bd7..40205da31 100644 --- a/src/threadengines/threadengine_pthread.cpp +++ b/src/threadengines/threadengine_pthread.cpp @@ -1,87 +1,180 @@ -/* +------------------------------------+ - * | 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) 2009-2010 Daniel De Graaf + * Copyright (C) 2008 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 +#include -pthread_mutex_t MyMutex = PTHREAD_MUTEX_INITIALIZER; - -PThreadEngine::PThreadEngine(InspIRCd* Instance) : ThreadEngine(Instance) +ThreadEngine::ThreadEngine() { } -void PThreadEngine::Create(Thread* thread_to_init) +static void* entry_point(void* parameter) { - pthread_attr_t attribs; - pthread_attr_init(&attribs); - pthread_attr_setdetachstate(&attribs, PTHREAD_CREATE_JOINABLE); - pthread_t* MyPThread = new pthread_t; + /* 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(parameter); + pt->Run(); + return parameter; +} + - Mutex(true); +void ThreadEngine::Start(Thread* thread) +{ + ThreadData* data = new ThreadData; + thread->state = data; - if (pthread_create(MyPThread, &attribs, PThreadEngine::Entry, (void*)this) != 0) + if (pthread_create(&data->pthread_id, NULL, entry_point, thread) != 0) { - delete MyPThread; - Mutex(false); - throw CoreException("Unable to create new PThreadEngine: " + std::string(strerror(errno))); + thread->state = NULL; + delete data; + throw CoreException("Unable to create new thread: " + std::string(strerror(errno))); } +} - pthread_attr_destroy(&attribs); - - NewThread = thread_to_init; - NewThread->Creator = this; - NewThread->Extend("pthread", MyPThread); - - Mutex(false); +ThreadEngine::~ThreadEngine() +{ } -PThreadEngine::~PThreadEngine() +void ThreadData::FreeThread(Thread* thread) { + thread->SetExitFlag(); + pthread_join(pthread_id, NULL); } -void PThreadEngine::Run() +#ifdef HAS_EVENTFD +#include + +class ThreadSignalSocket : public EventHandler +{ + SocketThread* parent; + public: + ThreadSignalSocket(SocketThread* p, int newfd) : parent(p) + { + SetFd(newfd); + ServerInstance->SE->AddFd(this, FD_WANT_FAST_READ | FD_WANT_NO_WRITE); + } + + ~ThreadSignalSocket() + { + ServerInstance->SE->DelFd(this); + ServerInstance->SE->Close(GetFd()); + } + + void Notify() + { + eventfd_write(fd, 1); + } + + void HandleEvent(EventType et, int errornum) + { + if (et == EVENT_READ) + { + eventfd_t dummy; + eventfd_read(fd, &dummy); + parent->OnNotify(); + } + else + { + ServerInstance->GlobalCulls.AddItem(this); + } + } +}; + +SocketThread::SocketThread() { - 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); + ServerInstance->SE->NonBlocking(fd); + ServerInstance->SE->AddFd(this, FD_WANT_FAST_READ | FD_WANT_NO_WRITE); + } + + ~ThreadSignalSocket() + { + close(send_fd); + ServerInstance->SE->DelFd(this); + ServerInstance->SE->Close(GetFd()); + } + + void Notify() + { + static const char dummy = '*'; + write(send_fd, &dummy, 1); + } + + void HandleEvent(EventType et, int errornum) + { + if (et == EVENT_READ) + { + char dummy[128]; + read(fd, dummy, 128); + parent->OnNotify(); + } + else + { + ServerInstance->GlobalCulls.AddItem(this); + } + } +}; - 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(); } -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; } } -