Remove useless vector copy

[user/henk/code/inspircd.git] / src / threadengines / threadengine_pthread.cpp

diff --git a/src/threadengines/threadengine_pthread.cpp b/src/threadengines/threadengine_pthread.cpp
index f5de69a6a71301c20ff7850ec48f42b2688b7886..6e32634c5c4c0050bc2037a25c3123941446d777 100644 (file)
--- a/src/threadengines/threadengine_pthread.cpp
+++ b/src/threadengines/threadengine_pthread.cpp
@@ -15,6 +15,7 @@
 #include "threadengines/threadengine_pthread.h"
 #include <pthread.h>
 #include <signal.h>
+#include <fcntl.h>
 
 ThreadEngine::ThreadEngine(InspIRCd* Instance)
 {
@@ -28,7 +29,7 @@ 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;
 }
@@ -53,6 +54,91 @@ ThreadEngine::~ThreadEngine()
 
 void ThreadData::FreeThread(Thread* thread)
 {
-       thread->SetExitFlag(true);
+       thread->SetExitFlag();
        pthread_join(pthread_id, NULL);
 }
+
+#ifdef HAS_EVENTFD
+#include <sys/eventfd.h>
+
+class ThreadSignalSocket : public BufferedSocket
+{
+       SocketThread* parent;
+ public:
+       ThreadSignalSocket(SocketThread* p, InspIRCd* SI, int newfd) :
+               BufferedSocket(SI, newfd, const_cast<char*>("0.0.0.0")), parent(p) {}
+
+       ~ThreadSignalSocket()
+       {
+       }
+
+       void Notify()
+       {
+               eventfd_write(fd, 1);
+       }
+
+       virtual bool OnDataReady()
+       {
+               eventfd_t data;
+               if (eventfd_read(fd, &data))
+                       return false;
+               parent->OnNotify();
+               return true;
+       }
+};
+
+SocketThread::SocketThread(InspIRCd* SI)
+{
+       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, SI, fd);
+}
+#else
+
+class ThreadSignalSocket : public BufferedSocket
+{
+       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()
+       {
+               close(send_fd);
+       }
+
+       void Notify()
+       {
+               char dummy = '*';
+               write(send_fd, &dummy, 1);
+       }
+
+       virtual bool OnDataReady()
+       {
+               char data;
+               if (read(this->fd, &data, 1) <= 0)
+                       return false;
+               parent->OnNotify();
+               return true;
+       }
+};
+
+SocketThread::SocketThread(InspIRCd* SI)
+{
+       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]);
+}
+#endif
+
+void SocketThread::NotifyParent()
+{
+       signal.sock->Notify();
+}
+
+SocketThread::~SocketThread()
+{
+}