-/* +------------------------------------+
- * | 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 <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/>.
*/
+
#include "inspircd.h"
#include "threadengines/threadengine_pthread.h"
#include <pthread.h>
-#include <signal.h>
-
-ThreadEngine::ThreadEngine(InspIRCd* Instance)
-{
-}
+#include <fcntl.h>
static void* entry_point(void* parameter)
{
sigaddset(&set, SIGPIPE);
pthread_sigmask(SIG_BLOCK, &set, NULL);
- Thread* pt = reinterpret_cast<Thread*>(parameter);
+ Thread* pt = static_cast<Thread*>(parameter);
pt->Run();
return 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);
}
-#if 0
-/* TODO this is a linux-specific syscall that allows signals to be
- * sent using a single file descriptor, rather than 2 for a pipe.
- * Requires glibc 2.8, kernel 2.6.22+
- */
+#ifdef HAS_EVENTFD
#include <sys/eventfd.h>
-class ThreadSignalSocket : public BufferedSocket
+class ThreadSignalSocket : public EventHandler
{
SocketThread* parent;
public:
- ThreadSignalSocket(SocketThread* p, InspIRCd* SI, int newfd) :
- BufferedSocket(SI, newfd, const_cast<char*>("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()
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, 0); // TODO 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<char*>("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 = '*';
- send(send_fd, &dummy, 1, 0);
+ static const char dummy = '*';
+ write(send_fd, &dummy, 1);
}
- virtual bool OnDataReady()
+ void OnEventHandlerRead() CXX11_OVERRIDE
{
- char data;
- if (ServerInstance->SE->Recv(this, &data, 1, 0) <= 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
SocketThread::~SocketThread()
{
- delete signal.sock;
+ if (signal.sock)
+ {
+ signal.sock->cull();
+ delete signal.sock;
+ }
}
projects / user / henk / code / inspircd.git / blobdiff