* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
* the file COPYING for details.
#include "threadengines/threadengine_pthread.h"
#include <pthread.h>
#include <signal.h>
+#include <fcntl.h>
-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;
-
- /* 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)
- {
- delete MyPThread;
- Mutex(false);
- throw CoreException("Unable to create new PThreadEngine: " + std::string(strerror(errno)));
- }
+ /* 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_attr_destroy(&attribs);
+ Thread* pt = static_cast<Thread*>(parameter);
+ pt->Run();
+ return parameter;
+}
- NewThread = thread_to_init;
- NewThread->Creator = this;
- NewThread->Extend("pthread", MyPThread);
- /* Always unset a mutex if you set it */
- Mutex(false);
+void ThreadEngine::Start(Thread* thread)
+{
+ ThreadData* data = new ThreadData;
+ thread->state = data;
- /* Wait for the PThreadEngine::Run method to take a copy of the
- * pointer and clear this member value
- */
- while (NewThread)
- usleep(1000);
+ if (pthread_create(&data->pthread_id, NULL, entry_point, thread) != 0)
+ {
+ thread->state = NULL;
+ delete data;
+ throw CoreException("Unable to create new thread: " + std::string(strerror(errno)));
+ }
}
-PThreadEngine::~PThreadEngine()
+ThreadEngine::~ThreadEngine()
{
}
-void PThreadEngine::Run()
+void ThreadData::FreeThread(Thread* thread)
{
- /* 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();
+ thread->SetExitFlag();
+ pthread_join(pthread_id, NULL);
}
-bool PThreadEngine::Mutex(bool enable)
+#ifdef HAS_EVENTFD
+#include <sys/eventfd.h>
+
+class ThreadSignalSocket : public BufferedSocket
{
- if (enable)
- pthread_mutex_lock(&MyMutex);
- else
- pthread_mutex_unlock(&MyMutex);
+ SocketThread* parent;
+ public:
+ ThreadSignalSocket(SocketThread* p, int newfd) : BufferedSocket(newfd), parent(p) {}
- return false;
-}
+ ~ThreadSignalSocket()
+ {
+ }
-void* PThreadEngine::Entry(void* parameter)
-{
- /* Recommended by nenolod, signal safety on a per-thread basis */
- sigset_t set;
- sigemptyset(&set);
- sigaddset(&set, SIGPIPE);
- if(pthread_sigmask(SIG_BLOCK, &set, NULL))
- signal(SIGPIPE, SIG_IGN);
+ void Notify()
+ {
+ eventfd_write(fd, 1);
+ }
- ThreadEngine * pt = (ThreadEngine*)parameter;
- pt->Run();
- return NULL;
-}
+ void OnDataReady()
+ {
+ recvq.clear();
+ parent->OnNotify();
+ }
-void PThreadEngine::FreeThread(Thread* thread)
-{
- pthread_t* pthread = NULL;
- if (thread->GetExt("pthread", pthread))
+ void OnError(BufferedSocketError)
{
- thread->SetExitFlag();
- int rc;
- void* status;
- rc = pthread_join(*pthread, &status);
- delete pthread;
}
-}
+};
-MutexFactory::MutexFactory(InspIRCd* Instance) : ServerInstance(Instance)
+SocketThread::SocketThread()
{
+ int fd = eventfd(0, O_NONBLOCK);
+ if (fd < 0)
+ throw new CoreException("Could not create pipe " + std::string(strerror(errno)));
+ signal.sock = new ThreadSignalSocket(this, fd);
}
+#else
-Mutex* MutexFactory::CreateMutex()
+class ThreadSignalSocket : public BufferedSocket
{
- return new PosixMutex(this->ServerInstance);
-}
+ SocketThread* parent;
+ int send_fd;
+ public:
+ ThreadSignalSocket(SocketThread* p, int recvfd, int sendfd) :
+ BufferedSocket(recvfd), parent(p), send_fd(sendfd) {}
+
+ ~ThreadSignalSocket()
+ {
+ close(send_fd);
+ }
+
+ void Notify()
+ {
+ char dummy = '*';
+ write(send_fd, &dummy, 1);
+ }
+
+ void OnDataReady()
+ {
+ recvq.clear();
+ parent->OnNotify();
+ }
+
+ void OnError(BufferedSocketError)
+ {
+ }
+};
-PosixMutex::PosixMutex(InspIRCd* Instance) : Mutex(Instance)
+SocketThread::SocketThread()
{
- pthread_mutex_init(&putex, NULL);
+ int fds[2];
+ if (pipe(fds))
+ throw new CoreException("Could not create pipe " + std::string(strerror(errno)));
+ signal.sock = new ThreadSignalSocket(this, fds[0], fds[1]);
}
+#endif
-PosixMutex::~PosixMutex()
+void SocketThread::NotifyParent()
{
- pthread_mutex_destroy(&putex);
+ signal.sock->Notify();
}
-void PosixMutex::Enable(bool enable)
+SocketThread::~SocketThread()
{
- if (enable)
- pthread_mutex_lock(&putex);
- else
- pthread_mutex_unlock(&putex);
}
projects / user / henk / code / inspircd.git / blobdiff