X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fthreadengines%2Fthreadengine_win32.cpp;h=637a3e01093877d75063c049aadd668afb4c34f5;hb=f4cd5fb72ad191a3708d3d39a4fc74cc1ae4377e;hp=1a1755f153308c39e570b4e76355976b0b3a4734;hpb=b6dbd6caab62bc2c0d11ce5a45d511611eb9c2ef;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/threadengines/threadengine_win32.cpp b/src/threadengines/threadengine_win32.cpp index 1a1755f15..637a3e010 100644 --- a/src/threadengines/threadengine_win32.cpp +++ b/src/threadengines/threadengine_win32.cpp @@ -1,114 +1,132 @@ -/* +------------------------------------+ - * | 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 + * Copyright (C) 2008 Craig Edwards * - * 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 . */ + #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; + 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); } - - 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(); + Thread* pt = static_cast(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; -} - -void Win32ThreadEngine::FreeThread(Thread* thread) -{ - 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; } -} + void OnDataReady() + { + recvq.clear(); + parent->OnNotify(); + } -MutexFactory::MutexFactory(InspIRCd* Instance) : ServerInstance(Instance) -{ -} + void OnError(BufferedSocketError) + { + ServerInstance->GlobalCulls.AddItem(this); + } +}; -Mutex* MutexFactory::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 (!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(&addr), &sz); + connect(connFD, reinterpret_cast(&addr), sz); + ServerInstance->SE->Blocking(listenFD); + int nfd = accept(listenFD, reinterpret_cast(&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; } -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