Add parameter to InspIRCd::TimeString for UTC time formats.

[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..90fe60b91e8ebd58c0ae0395bc7fc9d78ead3be7 100644 (file)
--- a/src/threadengines/threadengine_win32.cpp
+++ b/src/threadengines/threadengine_win32.cpp
@@ -1,53 +1,114 @@
-/*       +------------------------------------+
- *       | 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)
-{
-}
-
-void ThreadEngine::Create(Thread* thread)
+void ThreadEngine::Start(Thread* thread)
 {
-       ThreadData* data = new ThreadData;
-       thread->state = data;
-
-       DWORD ThreadId = 0;
-       data->handle = CreateThread(NULL,0,ThreadEngine::Entry,thread,0,&ThreadId);
+       thread->state.handle = CreateThread(NULL, 0, ThreadEngine::Entry, thread, 0, NULL);
 
-       if (data->handle == NULL)
+       if (thread->state.handle == NULL)
        {
-               thread->state = NULL;
-               delete data;
-               throw CoreException(std::string("Unable to create new thread: ") + dlerror());
+               DWORD lasterr = GetLastError();
+               std::string err = "Unable to create new thread: " + ConvToStr(lasterr);
+               SetLastError(ERROR_SUCCESS);
+               throw CoreException(err);
        }
 }
 
-ThreadEngine::~ThreadEngine()
-{
-}
-
 DWORD WINAPI ThreadEngine::Entry(void* parameter)
 {
-       Thread* pt = reinterpret_cast<Thread*>(parameter);
+       Thread* pt = static_cast<Thread*>(parameter);
        pt->Run();
        return 0;
 }
 
-void ThreadData::FreeThread(Thread* thread)
+void ThreadEngine::Stop(Thread* thread)
 {
        thread->SetExitFlag();
+       HANDLE handle = thread->state.handle;
        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");
+       SocketEngine::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);
+       SocketEngine::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);
+
+       SocketEngine::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);
+       }
+}