m_spanningtree Remove SpanningTreeUtilities* fields and parameters

[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 6ebd6a10ab36a104ed199e4ad9f0bf6afcf3eaf1..529e24a294c30fe5cb00956f9f17529f7a5d3834 100644 (file)
--- a/src/threadengines/threadengine_win32.cpp
+++ b/src/threadengines/threadengine_win32.cpp
@@ -1,24 +1,31 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/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"
 
-ThreadEngine::ThreadEngine(InspIRCd* Instance)
+ThreadEngine::ThreadEngine()
 {
 }
 
-void ThreadEngine::Create(Thread* thread)
+void ThreadEngine::Start(Thread* thread)
 {
        ThreadData* data = new ThreadData;
        thread->state = data;
@@ -30,7 +37,16 @@ void ThreadEngine::Create(Thread* thread)
        {
                thread->state = NULL;
                delete data;
-               throw CoreException(std::string("Unable to create new thread: ") + dlerror());
+               std::string err = "Unable to create new thread: ";
+#ifdef _WIN32
+               CHAR errdetail[100];
+               FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM, 0, GetLastError(), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), errdetail, 100, 0);
+               SetLastError(ERROR_SUCCESS);
+               err += errdetail;
+#else
+               err += dlerror();
+#endif
+               throw CoreException(err);
        }
 }
 
@@ -40,7 +56,7 @@ ThreadEngine::~ThreadEngine()
 
 DWORD WINAPI ThreadEngine::Entry(void* parameter)
 {
-       Thread* pt = reinterpret_cast<Thread*>(parameter);
+       Thread* pt = static_cast<Thread*>(parameter);
        pt->Run();
        return 0;
 }
@@ -49,5 +65,69 @@ void ThreadData::FreeThread(Thread* thread)
 {
        thread->SetExitFlag();
        WaitForSingleObject(handle,INFINITE);
+       CloseHandle(handle);
 }
 
+class ThreadSignalSocket : public BufferedSocket
+{
+       SocketThread* parent;
+ public:
+       ThreadSignalSocket(SocketThread* t, int newfd)
+               : BufferedSocket(newfd), parent(t)
+       {
+       }
+
+       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;
+}
+
+void SocketThread::NotifyParent()
+{
+       char dummy = '*';
+       send(signal.connFD, &dummy, 1, 0);
+}
+
+SocketThread::~SocketThread()
+{
+       if (signal.connFD >= 0)
+       {
+               shutdown(signal.connFD, 2);
+               closesocket(signal.connFD);
+       }
+}