ThreadEngine: Allow interthread signaling without needing as many hacks

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

diff --git a/src/threadengines/threadengine_win32.cpp b/src/threadengines/threadengine_win32.cpp
index 1b8d113ec25654096de18936ff591e2d9f997301..5a0635a097b93e039a296261a6b633cb151c8797 100644 (file)
--- a/src/threadengines/threadengine_win32.cpp
+++ b/src/threadengines/threadengine_win32.cpp
@@ -2,8 +2,8 @@
  *       | 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.
@@ -14,66 +14,126 @@
 #include "inspircd.h"
 #include "threadengines/threadengine_win32.h"
 
-CRITICAL_SECTION MyMutex;
-
-Win32ThreadEngine::Win32ThreadEngine(InspIRCd* Instance) : ThreadEngine(Instance)
+ThreadEngine::ThreadEngine(InspIRCd* Instance)
 {
-       InitializeCriticalSection(&MyMutex);
 }
 
-void Win32ThreadEngine::Create(Thread* thread_to_init)
+void ThreadEngine::Create(Thread* thread)
 {
-       Mutex(true);
-       HANDLE* MyThread = new HANDLE;
+       ThreadData* data = new ThreadData;
+       thread->state = data;
+
        DWORD ThreadId = 0;
+       data->handle = CreateThread(NULL,0,ThreadEngine::Entry,thread,0,&ThreadId);
 
-       if (!(*MyThread = CreateThread(NULL,0,Win32ThreadEngine::Entry,this,0,&ThreadId)))
+       if (data->handle == NULL)
        {
-               delete MyThread;
-               Mutex(false);
-               throw CoreException(std::string("Unable to reate new Win32ThreadEngine: ") + dlerror());
+               thread->state = NULL;
+               delete data;
+               throw CoreException(std::string("Unable to create new thread: ") + dlerror());
        }
-       NewThread = thread_to_init;
-       NewThread->Creator = this;
-       NewThread->Extend("winthread", MyThread);
-       Mutex(false);
 }
 
-Win32ThreadEngine::~Win32ThreadEngine()
+ThreadEngine::~ThreadEngine()
 {
-       DeleteCriticalSection(&MyMutex);
 }
 
-void Win32ThreadEngine::Run()
+DWORD WINAPI ThreadEngine::Entry(void* parameter)
 {
-       NewThread->Run();
+       Thread* pt = reinterpret_cast<Thread*>(parameter);
+       pt->Run();
+       return 0;
 }
 
-bool Win32ThreadEngine::Mutex(bool enable)
+void ThreadData::FreeThread(Thread* thread)
 {
-       if (enable)
-               EnterCriticalSection(&MyMutex);
-       else
-               LeaveCriticalSection(&MyMutex);
-
-       return false;
+       thread->SetExitFlag();
+       WaitForSingleObject(handle,INFINITE);
 }
 
-DWORD WINAPI Win32ThreadEngine::Entry(void* parameter)
+class ThreadSignalSocket : public BufferedSocket
 {
-       ThreadEngine * pt = (ThreadEngine*)parameter;
-       pt->Run();
-       return 0;
-}
+       SignalThread* parent;
+ public:
+       ThreadSignalSocket(SignalThread* t, InspIRCd* SI, int newfd, char* ip)
+               : BufferedSocket(SI, newfd, ip), parent(t)
+       {
+               parent->results = this;
+       }
+       
+       virtual bool OnDataReady()
+       {
+               char data = 0;
+               if (ServerInstance->SE->Recv(this, &data, 1, 0) > 0)
+               {
+                       parent->OnNotify();
+                       return true;
+               }
+               return false;
+       }
+};
 
-void Win32ThreadEngine::FreeThread(Thread* thread)
+class ThreadSignalListener : public ListenSocketBase
 {
-       HANDLE* winthread = NULL;
-       if (thread->GetExt("winthread", winthread))
+       SocketThread* parent;
+       irc::sockets::insp_sockaddr sock_us;
+ public:
+       ThreadSignalListener(SocketThread* t, InspIRCd* Instance, int port, const std::string &addr) : ListenSocketBase(Instance, port, addr), parent(t)
        {
-               thread->SetExitFlag();
-               WaitForSingleObject(*winthread,INFINITE);
-               delete winthread;
+               socklen_t uslen = sizeof(sock_us);
+               if (getsockname(this->fd,(sockaddr*)&sock_us,&uslen))
+               {
+                       throw ModuleException("Could not getsockname() to find out port number for ITC port");
+               }
        }
+
+       virtual void OnAcceptReady(const std::string &ipconnectedto, int nfd, const std::string &incomingip)
+       {
+               new ThreadSignalSocket(parent, ServerInstance, nfd, const_cast<char*>(ipconnectedto.c_str()));
+               ServerInstance->SE->DelFd(this);
+               // XXX unsafe casts suck
+       }
+/* Using getsockname and ntohs, we can determine which port number we were allocated */
+       int GetPort()
+       {
+#ifdef IPV6
+               return ntohs(sock_us.sin6_port);
+#else
+               return ntohs(sock_us.sin_port);
+#endif
+       }
+};
+
+SocketThread::SocketThread(InspIRCd* SI)
+{
+       ThreadSignalListener* listener = new ThreadSignalListener(this, ServerInstance, 0, "127.0.0.1");
+       if (listener->GetFd() == -1)
+               throw CoreException("Could not create ITC pipe");
+       int connFD = socket(AF_INET, SOCK_STREAM, 0);
+       if (connFD == -1)
+               throw CoreException("Could not create ITC pipe");
+       
+       irc::sockets::sockaddrs addr;
+       irc::sockets::insp_aton("127.0.0.1", &addr.in4.sin_addr);
+       addr.in4.sin_family = AF_INET;
+       addr.in4.sin_port = htons(listener->GetPort());
+
+       if (connect(connFD, &addr.sa, sizeof(addr.in4)) == -1)
+       {
+               ServerInstance->SE->DelFd(listener);
+               close(connFD);
+               throw CoreException("Could not connet to ITC pipe");
+       }
+       this->signal.connFD = connFD;
+}
+
+void SocketThread::NotifyParent()
+{
+       char dummy = '*';
+       send(signal.connFD, &dummy, 1, 0);
 }
 
+SocketThread::~SocketThread()
+{
+       close(signal.connFD);
+}