X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fthreadengines%2Fthreadengine_win32.cpp;h=b14f46e8e7d004413be9c4403e51ea91490da5ff;hb=a30a0074edac353cb60e134b43fa8ff0ffb67f8b;hp=562c65dd49cb5a6e0ed4361ca1240eb236a58a9c;hpb=43847ec9c7e1a195163eb4c529f1c92fd1ace0a4;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/threadengines/threadengine_win32.cpp b/src/threadengines/threadengine_win32.cpp index 562c65dd4..b14f46e8e 100644 --- a/src/threadengines/threadengine_win32.cpp +++ b/src/threadengines/threadengine_win32.cpp @@ -1,114 +1,137 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * Copyright (C) 2013-2014 Attila Molnar + * Copyright (C) 2012 Robby + * Copyright (C) 2012 ChrisTX + * Copyright (C) 2009, 2011 Daniel De Graaf + * Copyright (C) 2009 Uli Schlachter + * Copyright (C) 2009 Dennis Friis + * Copyright (C) 2008-2009 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) -{ - InitializeCriticalSection(&MyMutex); -} - -void Win32ThreadEngine::Create(Thread* thread_to_init) +void ThreadEngine::Start(Thread* thread) { - Mutex(true); - HANDLE* MyThread = new HANDLE; - DWORD ThreadId = 0; + thread->state.handle = CreateThread(NULL, 0, ThreadEngine::Entry, thread, 0, NULL); - if (NULL == (*MyThread = CreateThread(NULL,0,Win32ThreadEngine::Entry,this,0,&ThreadId))) + if (thread->state.handle == NULL) { - delete MyThread; - Mutex(false); - throw CoreException(std::string("Unable to create new Win32ThreadEngine: ") + dlerror()); + DWORD lasterr = GetLastError(); + 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); - Mutex(false); - - while (NewThread) - SleepEx(100, false); } -Win32ThreadEngine::~Win32ThreadEngine() +DWORD WINAPI ThreadEngine::Entry(void* parameter) { - DeleteCriticalSection(&MyMutex); + Thread* pt = static_cast(parameter); + pt->Run(); + return 0; } -void Win32ThreadEngine::Run() +void ThreadEngine::Stop(Thread* thread) { - Mutex(true); - Thread* nt = NewThread; - NewThread = NULL; - Mutex(false); - nt->Run(); + thread->SetExitFlag(); + HANDLE handle = thread->state.handle; + 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(); + } -DWORD WINAPI Win32ThreadEngine::Entry(void* parameter) -{ - ThreadEngine * pt = (ThreadEngine*)parameter; - pt->Run(); - return 0; -} + void OnError(BufferedSocketError) + { + ServerInstance->GlobalCulls.AddItem(this); + } +}; -void Win32ThreadEngine::FreeThread(Thread* thread) +static bool BindAndListen(int sockfd, int port, const char* addr) { - HANDLE* winthread = NULL; - if (thread->GetExt("winthread", winthread)) + irc::sockets::sockaddrs servaddr; + if (!irc::sockets::aptosa(addr, port, servaddr)) + return false; + + if (SocketEngine::Bind(sockfd, servaddr) != 0) + return false; + + if (SocketEngine::Listen(sockfd, ServerInstance->Config->MaxConn) != 0) { - thread->SetExitFlag(); - WaitForSingleObject(*winthread,INFINITE); - delete winthread; + ServerInstance->Logs->Log("SOCKET", LOG_DEFAULT, "ERROR in listen(): %s", strerror(errno)); + return false; } -} - -MutexFactory::MutexFactory(InspIRCd* Instance) : ServerInstance(Instance) -{ + return true; } -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 (!BindAndListen(listenFD, 0, "127.0.0.1")) + throw CoreException("Could not create ITC pipe"); + SocketEngine::NonBlocking(connFD); + + struct sockaddr_in addr; + socklen_t sz = sizeof(addr); + getsockname(listenFD, reinterpret_cast(&addr), &sz); + connect(connFD, reinterpret_cast(&addr), sz); + SocketEngine::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); + + SocketEngine::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