Merge pull request #1148 from guikcd/spelling-error

[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 e426fe37383eb6ece91b263a3fb3157ef7405d00..ea37892f8d9c0d239ca1b1aa485f590a230b4fcf 100644 (file)
--- a/src/threadengines/threadengine_win32.cpp
+++ b/src/threadengines/threadengine_win32.cpp
@@ -1,75 +1,127 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
  *
- * 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_win32.h"
 
-CRITICAL_SECTION MyMutex;
-
-Win32ThreadEngine::Win32ThreadEngine(InspIRCd* Instance) : ThreadEngine(Instance)
+ThreadEngine::ThreadEngine()
 {
 }
 
-void Win32ThreadEngine::Create(Thread* thread_to_init)
+void ThreadEngine::Start(Thread* thread)
 {
-       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;
-               throw CoreException(std::string("Unable to reate new Win32ThreadEngine: ") + dlerror());
+               DWORD lasterr = GetLastError();
+               thread->state = NULL;
+               delete data;
+               std::string err = "Unable to create new thread: " + ConvToStr(lasterr);
+               SetLastError(ERROR_SUCCESS);
+               throw CoreException(err);
        }
+}
 
-       NewThread = thread_to_init;
-       NewThread->Creator = this;
-       NewThread->Extend("winthread", MyThread);
+ThreadEngine::~ThreadEngine()
+{
 }
 
-Win32ThreadEngine::~Win32ThreadEngine()
+DWORD WINAPI ThreadEngine::Entry(void* parameter)
 {
+       Thread* pt = static_cast<Thread*>(parameter);
+       pt->Run();
+       return 0;
 }
 
-void Win32ThreadEngine::Run()
+void ThreadData::FreeThread(Thread* thread)
 {
-       NewThread->Run();
+       thread->SetExitFlag();
+       WaitForSingleObject(handle,INFINITE);
+       CloseHandle(handle);
 }
 
-bool Win32ThreadEngine::Mutex(bool enable)
+class ThreadSignalSocket : public BufferedSocket
 {
-       if (enable)
-               EnterCriticalSection(&MyMutex);
-       else
-               LeaveCriticalSection(&MyMutex);
+       SocketThread* parent;
+ public:
+       ThreadSignalSocket(SocketThread* t, int newfd)
+               : BufferedSocket(newfd), parent(t)
+       {
+       }
 
-       return false;
+       void OnDataReady()
+       {
+               recvq.clear();
+               parent->OnNotify();
+       }
+
+       void OnError(BufferedSocketError)
+       {
+               ServerInstance->GlobalCulls.AddItem(this);
+       }
+};
+
+SocketThread::SocketThread()
+{
+       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 (!ServerInstance->BindSocket(listenFD, 0, "127.0.0.1", true))
+               throw CoreException("Could not create ITC pipe");
+       ServerInstance->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);
+       ServerInstance->SE->Blocking(listenFD);
+       int nfd = accept(listenFD, reinterpret_cast<struct sockaddr*>(&addr), &sz);
+       if (nfd < 0)
+               throw CoreException("Could not create ITC pipe");
+       new ThreadSignalSocket(this, nfd);
+       closesocket(listenFD);
+
+       ServerInstance->SE->Blocking(connFD);
+       this->signal.connFD = connFD;
 }
 
-DWORD WINAPI Win32ThreadEngine::Entry(void* parameter)
+void SocketThread::NotifyParent()
 {
-       ThreadEngine * pt = (ThreadEngine*)parameter;
-       pt->Run();
-       return 0;
+       char dummy = '*';
+       send(signal.connFD, &dummy, 1, 0);
 }
 
-void Win32ThreadEngine::FreeThread(Thread* thread)
+SocketThread::~SocketThread()
 {
-       HANDLE* winthread = NULL;
-       if (thread->GetExt("winthread", winthread))
+       if (signal.connFD >= 0)
        {
-               thread->SetExitFlag();
-               WaitForSingleObject(*winthread,INFINITE);
-               delete winthread;
+               shutdown(signal.connFD, 2);
+               closesocket(signal.connFD);
        }
 }
-