From 4fcda809ef8f7655467d393396cd1fa468102771 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Mon, 8 May 2023 13:45:10 +0100 Subject: Rename threadsocket to thread. --- src/thread.cpp | 198 +++++++++++++++++++++++++++++++++++++++++++++++++++ src/threadsocket.cpp | 198 --------------------------------------------------- 2 files changed, 198 insertions(+), 198 deletions(-) create mode 100644 src/thread.cpp delete mode 100644 src/threadsocket.cpp (limited to 'src') diff --git a/src/thread.cpp b/src/thread.cpp new file mode 100644 index 000000000..1fa40fbf5 --- /dev/null +++ b/src/thread.cpp @@ -0,0 +1,198 @@ +/* + * InspIRCd -- Internet Relay Chat Daemon + * + * Copyright (C) 2013-2015 Attila Molnar + * Copyright (C) 2012 Robby + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2008 Craig Edwards + * + * 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 "threadsocket.h" + +bool Thread::Start() +{ + try + { + if (thread) + return false; + + thread = new std::thread(Thread::StartInternal, this); + return true; + } + catch (const std::system_error& err) + { + throw CoreException("Unable to start new thread: " + std::string(err.what())); + } +} + +void Thread::StartInternal(Thread* thread) +{ +#ifndef _WIN32 + // C++ does not have an API for this so we still need to use pthreads. + sigset_t set; + sigemptyset(&set); + sigaddset(&set, SIGPIPE); + pthread_sigmask(SIG_BLOCK, &set, nullptr); +#endif + + thread->OnStart(); +} + +bool Thread::Stop() +{ + if (!thread) + return false; + + OnStop(); + stopping = true; + thread->join(); + + stdalgo::delete_zero(thread); + return true; +} + +#if __has_include() +#include + +class ThreadSignalSocket final + : public EventHandler +{ +private: + SocketThread* parent = nullptr; + +public: + ThreadSignalSocket(SocketThread* p, int newfd) + : parent(p) + { + SetFd(newfd); + SocketEngine::AddFd(this, FD_WANT_FAST_READ | FD_WANT_NO_WRITE); + } + + ~ThreadSignalSocket() override + { + SocketEngine::Close(this); + } + + void Notify() + { + eventfd_write(GetFd(), 1); + } + + void OnEventHandlerRead() override + { + eventfd_t dummy; + eventfd_read(GetFd(), &dummy); + parent->OnNotify(); + } + + void OnEventHandlerWrite() override + { + ServerInstance->GlobalCulls.AddItem(this); + } + + void OnEventHandlerError(int errcode) override + { + ThreadSignalSocket::OnEventHandlerWrite(); + } +}; + +SocketThread::SocketThread() +{ + int fd = eventfd(0, EFD_NONBLOCK); + if (fd < 0) + throw CoreException("Could not create pipe " + std::string(strerror(errno))); + + socket = new ThreadSignalSocket(this, fd); +} +#else + +# ifdef _WIN32 +# define pipe(fd) _pipe(fd, 1, 0) +# else +# include +# endif + +class ThreadSignalSocket final + : public EventHandler +{ +private: + SocketThread* parent; + int send_fd; + +public: + ThreadSignalSocket(SocketThread* p, int recvfd, int sendfd) + : parent(p) + , send_fd(sendfd) + { + SetFd(recvfd); + SocketEngine::NonBlocking(GetFd()); + SocketEngine::AddFd(this, FD_WANT_FAST_READ | FD_WANT_NO_WRITE); + } + + ~ThreadSignalSocket() + { + SocketEngine::Close(send_fd); + SocketEngine::Close(this); + } + + void Notify() + { + static constexpr char dummy = '*'; + write(send_fd, &dummy, 1); + } + + void OnEventHandlerRead() override + { + char dummy[128]; + read(GetFd(), dummy, 128); + parent->OnNotify(); + } + + void OnEventHandlerWrite() override + { + ServerInstance->GlobalCulls.AddItem(this); + } + + void OnEventHandlerError(int errcode) override + { + ThreadSignalSocket::OnEventHandlerWrite(); + } +}; + +SocketThread::SocketThread() +{ + socket = nullptr; + int fds[2]; + if (pipe(fds)) + throw CoreException("Could not create pipe " + std::string(strerror(errno))); + socket = new ThreadSignalSocket(this, fds[0], fds[1]); +} +#endif + +void SocketThread::NotifyParent() +{ + socket->Notify(); +} + +SocketThread::~SocketThread() +{ + if (socket) + { + socket->Cull(); + delete socket; + } +} diff --git a/src/threadsocket.cpp b/src/threadsocket.cpp deleted file mode 100644 index 1fa40fbf5..000000000 --- a/src/threadsocket.cpp +++ /dev/null @@ -1,198 +0,0 @@ -/* - * InspIRCd -- Internet Relay Chat Daemon - * - * Copyright (C) 2013-2015 Attila Molnar - * Copyright (C) 2012 Robby - * Copyright (C) 2009-2010 Daniel De Graaf - * Copyright (C) 2008 Craig Edwards - * - * 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 "threadsocket.h" - -bool Thread::Start() -{ - try - { - if (thread) - return false; - - thread = new std::thread(Thread::StartInternal, this); - return true; - } - catch (const std::system_error& err) - { - throw CoreException("Unable to start new thread: " + std::string(err.what())); - } -} - -void Thread::StartInternal(Thread* thread) -{ -#ifndef _WIN32 - // C++ does not have an API for this so we still need to use pthreads. - sigset_t set; - sigemptyset(&set); - sigaddset(&set, SIGPIPE); - pthread_sigmask(SIG_BLOCK, &set, nullptr); -#endif - - thread->OnStart(); -} - -bool Thread::Stop() -{ - if (!thread) - return false; - - OnStop(); - stopping = true; - thread->join(); - - stdalgo::delete_zero(thread); - return true; -} - -#if __has_include() -#include - -class ThreadSignalSocket final - : public EventHandler -{ -private: - SocketThread* parent = nullptr; - -public: - ThreadSignalSocket(SocketThread* p, int newfd) - : parent(p) - { - SetFd(newfd); - SocketEngine::AddFd(this, FD_WANT_FAST_READ | FD_WANT_NO_WRITE); - } - - ~ThreadSignalSocket() override - { - SocketEngine::Close(this); - } - - void Notify() - { - eventfd_write(GetFd(), 1); - } - - void OnEventHandlerRead() override - { - eventfd_t dummy; - eventfd_read(GetFd(), &dummy); - parent->OnNotify(); - } - - void OnEventHandlerWrite() override - { - ServerInstance->GlobalCulls.AddItem(this); - } - - void OnEventHandlerError(int errcode) override - { - ThreadSignalSocket::OnEventHandlerWrite(); - } -}; - -SocketThread::SocketThread() -{ - int fd = eventfd(0, EFD_NONBLOCK); - if (fd < 0) - throw CoreException("Could not create pipe " + std::string(strerror(errno))); - - socket = new ThreadSignalSocket(this, fd); -} -#else - -# ifdef _WIN32 -# define pipe(fd) _pipe(fd, 1, 0) -# else -# include -# endif - -class ThreadSignalSocket final - : public EventHandler -{ -private: - SocketThread* parent; - int send_fd; - -public: - ThreadSignalSocket(SocketThread* p, int recvfd, int sendfd) - : parent(p) - , send_fd(sendfd) - { - SetFd(recvfd); - SocketEngine::NonBlocking(GetFd()); - SocketEngine::AddFd(this, FD_WANT_FAST_READ | FD_WANT_NO_WRITE); - } - - ~ThreadSignalSocket() - { - SocketEngine::Close(send_fd); - SocketEngine::Close(this); - } - - void Notify() - { - static constexpr char dummy = '*'; - write(send_fd, &dummy, 1); - } - - void OnEventHandlerRead() override - { - char dummy[128]; - read(GetFd(), dummy, 128); - parent->OnNotify(); - } - - void OnEventHandlerWrite() override - { - ServerInstance->GlobalCulls.AddItem(this); - } - - void OnEventHandlerError(int errcode) override - { - ThreadSignalSocket::OnEventHandlerWrite(); - } -}; - -SocketThread::SocketThread() -{ - socket = nullptr; - int fds[2]; - if (pipe(fds)) - throw CoreException("Could not create pipe " + std::string(strerror(errno))); - socket = new ThreadSignalSocket(this, fds[0], fds[1]); -} -#endif - -void SocketThread::NotifyParent() -{ - socket->Notify(); -} - -SocketThread::~SocketThread() -{ - if (socket) - { - socket->Cull(); - delete socket; - } -} -- cgit v1.3.1-10-gc9f91