Remove InspIRCd* parameters and fields

[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 e2b58b42eb9a0bec875ade6a11fb9793e6cc1204..e880d597f71b367f16cf8ed4548923c8bdf5363a 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,101 +14,97 @@
 #include "inspircd.h"
 #include "threadengines/threadengine_win32.h"
 
-CRITICAL_SECTION MyMutex;
-
-Win32ThreadEngine::Win32ThreadEngine(InspIRCd* Instance) : ThreadEngine(Instance)
+ThreadEngine::ThreadEngine()
 {
-       InitializeCriticalSection(&MyMutex);
 }
 
-void Win32ThreadEngine::Create(Thread* thread_to_init)
+void ThreadEngine::Start(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 (NULL == (*MyThread = CreateThread(NULL,0,Win32ThreadEngine::Entry,this,0,&ThreadId)))
+       if (data->handle == NULL)
        {
-               delete MyThread;
-               Mutex(false);
-               throw CoreException(std::string("Unable to create 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);
-
-       while (NewThread)
-               SleepEx(100, false);
 }
 
-Win32ThreadEngine::~Win32ThreadEngine()
+ThreadEngine::~ThreadEngine()
 {
-       DeleteCriticalSection(&MyMutex);
 }
 
-void Win32ThreadEngine::Run()
+DWORD WINAPI ThreadEngine::Entry(void* parameter)
 {
-       Mutex(true);
-       Thread* nt = NewThread;
-       NewThread = NULL;
-       Mutex(false);
-       nt->Run();
-}
-
-bool Win32ThreadEngine::Mutex(bool enable)
-{
-       if (enable)
-               EnterCriticalSection(&MyMutex);
-       else
-               LeaveCriticalSection(&MyMutex);
-
-       return false;
+       Thread* pt = static_cast<Thread*>(parameter);
+       pt->Run();
+       return 0;
 }
 
-DWORD WINAPI Win32ThreadEngine::Entry(void* parameter)
+void ThreadData::FreeThread(Thread* thread)
 {
-       ThreadEngine * pt = (ThreadEngine*)parameter;
-       pt->Run();
-       return 0;
+       thread->SetExitFlag();
+       WaitForSingleObject(handle,INFINITE);
 }
 
-void Win32ThreadEngine::FreeThread(Thread* thread)
+class ThreadSignalSocket : public BufferedSocket
 {
-       HANDLE* winthread = NULL;
-       if (thread->GetExt("winthread", winthread))
+       SocketThread* parent;
+ public:
+       ThreadSignalSocket(SocketThread* t, int newfd)
+               : BufferedSocket(newfd), parent(t)
        {
-               thread->SetExitFlag();
-               WaitForSingleObject(*winthread,INFINITE);
-               delete winthread;
        }
-}
-
 
-MutexEngine::MutexEngine(InspIRCd* Instance) : ServerInstance(Instance)
-{
-}
+       void OnDataReady()
+       {
+               recvq.clear();
+               parent->OnNotify();
+       }
+};
 
-Mutex* MutexEngine::CreateMutex()
+SocketThread::SocketThread()
 {
-       return new Win32Mutex(this->ServerInstance);
+       int listenFD = socket(AF_INET, SOCK_STREAM, 0);
+       if (listenFD == -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");
+
+       if (!SI->BindSocket(listenFD, 0, "127.0.0.1", true))
+               throw CoreException("Could not create ITC pipe");
+       SI->SE->NonBlocking(connFD);
+
+       struct sockaddr_in addr;
+       socklen_t sz = sizeof(addr);
+       getsockname(listenFD, reinterpret_cast<struct sockaddr*>(&addr), &sz);
+       connect(connFD, reinterpret_cast<struct sockaddr*>(&addr), sz);
+       int nfd = accept(listenFD);
+       if (nfd < 0)
+               throw CoreException("Could not create ITC pipe");
+       new ThreadSignalSocket(parent, nfd);
+       closesocket(listenFD);
+
+       SI->SE->Blocking(connFD);
+       this->signal.connFD = connFD;
 }
 
-Win32Mutex::Win32Mutex(InspIRCd* Instance) : Mutex(Instance)
+void SocketThread::NotifyParent()
 {
-       InitializeCriticalSection(&wutex);
+       char dummy = '*';
+       send(signal.connFD, &dummy, 1, 0);
 }
 
-Win32Mutex::~Win32Mutex()
+SocketThread::~SocketThread()
 {
-       DeleteCriticalSection(&wutex);
+       if (signal.connFD >= 0)
+       {
+               shutdown(signal.connFD, 2);
+               closesocket(signal.connFD);
+       }
 }
-
-void Win32Mutex::Enable(bool enable)
-{
-       if (enable)
-               EnterCriticalSection(&wutex);
-       else
-               LeaveCriticalSection(&wutex);
-}
\ No newline at end of file