X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fthreadengines%2Fthreadengine_pthread.cpp;h=7e822faa9b1cf862fbeab19cfce6dd7bb15823c4;hb=6cfabb0064cab52bbbab59974e53dc0fa1954da7;hp=904efa0c9ce085e3c90ed66866f7d2273cd1a9d1;hpb=22a32e8fd8b31f3d94c5b9ede6fb258b0d66950f;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/threadengines/threadengine_pthread.cpp b/src/threadengines/threadengine_pthread.cpp index 904efa0c9..7e822faa9 100644 --- a/src/threadengines/threadengine_pthread.cpp +++ b/src/threadengines/threadengine_pthread.cpp @@ -1,26 +1,30 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team - * See: http://wiki.inspircd.org/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 #include -ThreadEngine::ThreadEngine(InspIRCd* Instance) -{ -} - static void* entry_point(void* parameter) { /* Recommended by nenolod, signal safety on a per-thread basis */ @@ -29,7 +33,7 @@ static void* entry_point(void* parameter) sigaddset(&set, SIGPIPE); pthread_sigmask(SIG_BLOCK, &set, NULL); - Thread* pt = reinterpret_cast(parameter); + Thread* pt = static_cast(parameter); pt->Run(); return parameter; } @@ -37,39 +41,32 @@ static void* entry_point(void* parameter) void ThreadEngine::Start(Thread* thread) { - ThreadData* data = new ThreadData; - thread->state = data; - - if (pthread_create(&data->pthread_id, NULL, entry_point, thread) != 0) - { - thread->state = NULL; - delete data; + if (pthread_create(&thread->state.pthread_id, NULL, entry_point, thread) != 0) throw CoreException("Unable to create new thread: " + std::string(strerror(errno))); - } } -ThreadEngine::~ThreadEngine() -{ -} - -void ThreadData::FreeThread(Thread* thread) +void ThreadEngine::Stop(Thread* thread) { thread->SetExitFlag(); - pthread_join(pthread_id, NULL); + pthread_join(thread->state.pthread_id, NULL); } #ifdef HAS_EVENTFD #include -class ThreadSignalSocket : public BufferedSocket +class ThreadSignalSocket : public EventHandler { SocketThread* parent; public: - ThreadSignalSocket(SocketThread* p, InspIRCd* SI, int newfd) : - BufferedSocket(SI, newfd, const_cast("0.0.0.0")), parent(p) {} + 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() @@ -77,60 +74,84 @@ class ThreadSignalSocket : public BufferedSocket eventfd_write(fd, 1); } - virtual bool OnDataReady() + void OnEventHandlerRead() CXX11_OVERRIDE { - eventfd_t data; - if (eventfd_read(fd, &data)) - return false; + eventfd_t dummy; + eventfd_read(fd, &dummy); parent->OnNotify(); - return true; + } + + void OnEventHandlerWrite() CXX11_OVERRIDE + { + ServerInstance->GlobalCulls.AddItem(this); + } + + void OnEventHandlerError(int errcode) CXX11_OVERRIDE + { + ThreadSignalSocket::OnEventHandlerWrite(); } }; -SocketThread::SocketThread(InspIRCd* SI) +SocketThread::SocketThread() { - int fd = eventfd(0, O_NONBLOCK); + signal.sock = NULL; + int fd = eventfd(0, EFD_NONBLOCK); if (fd < 0) - throw new CoreException("Could not create pipe " + std::string(strerror(errno))); - signal.sock = new ThreadSignalSocket(this, SI, fd); + throw CoreException("Could not create pipe " + std::string(strerror(errno))); + signal.sock = new ThreadSignalSocket(this, fd); } #else -class ThreadSignalSocket : public BufferedSocket +class ThreadSignalSocket : public EventHandler { SocketThread* parent; int send_fd; public: - ThreadSignalSocket(SocketThread* p, InspIRCd* SI, int recvfd, int sendfd) : - BufferedSocket(SI, recvfd, const_cast("0.0.0.0")), parent(p), send_fd(sendfd) {} + 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() { - char dummy = '*'; + static const char dummy = '*'; write(send_fd, &dummy, 1); } - virtual bool OnDataReady() + void OnEventHandlerRead() CXX11_OVERRIDE { - char data; - if (read(this->fd, &data, 1) <= 0) - return false; + char dummy[128]; + read(fd, dummy, 128); parent->OnNotify(); - return true; + } + + void OnEventHandlerWrite() CXX11_OVERRIDE + { + ServerInstance->GlobalCulls.AddItem(this); + } + + void OnEventHandlerError(int errcode) CXX11_OVERRIDE + { + ThreadSignalSocket::OnEventHandlerWrite(); } }; -SocketThread::SocketThread(InspIRCd* SI) +SocketThread::SocketThread() { + signal.sock = NULL; 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]); + throw CoreException("Could not create pipe " + std::string(strerror(errno))); + signal.sock = new ThreadSignalSocket(this, fds[0], fds[1]); } #endif @@ -141,4 +162,9 @@ void SocketThread::NotifyParent() SocketThread::~SocketThread() { + if (signal.sock) + { + signal.sock->cull(); + delete signal.sock; + } }