X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fthreadengines%2Fthreadengine_win32.cpp;h=b2a4dcacac0b50eab18e43e94815a31037f36609;hb=9133c3302428eb81f6d970502f811e8168079d5a;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..b2a4dcaca 100644
--- a/src/threadengines/threadengine_win32.cpp
+++ b/src/threadengines/threadengine_win32.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -14,101 +14,102 @@
 #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;
+		throw CoreException(std::string("Unable to create new thread: ") + dlerror());
 	}
-
-	NewThread = thread_to_init;
-	NewThread->Creator = this;
-	NewThread->Extend("winthread", MyThread);
-	Mutex(false);
-
-	while (NewThread)
-		SleepEx(100, false);
-}
-
-Win32ThreadEngine::~Win32ThreadEngine()
-{
-	DeleteCriticalSection(&MyMutex);
 }
 
-void Win32ThreadEngine::Run()
+ThreadEngine::~ThreadEngine()
 {
-	Mutex(true);
-	Thread* nt = NewThread;
-	NewThread = NULL;
-	Mutex(false);
-	nt->Run();
 }
 
-bool Win32ThreadEngine::Mutex(bool enable)
+DWORD WINAPI ThreadEngine::Entry(void* parameter)
 {
-	if (enable)
-		EnterCriticalSection(&MyMutex);
-	else
-		LeaveCriticalSection(&MyMutex);
-
-	return false;
+	Thread* pt = static_cast<Thread*>(parameter);
+	pt->Run();
+	return 0;
 }
 
-DWORD WINAPI Win32ThreadEngine::Entry(void* parameter)
+void ThreadData::FreeThread(Thread* thread)
 {
-	ThreadEngine * pt = (ThreadEngine*)parameter;
-	pt->Run();
-	return 0;
+	thread->SetExitFlag();
+	WaitForSingleObject(handle,INFINITE);
 }
 
-void Win32ThreadEngine::FreeThread(Thread* thread)
+class ThreadSignalSocket : public BufferedSocket
 {
-	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<struct sockaddr*>(&addr), &sz);
+	connect(connFD, reinterpret_cast<struct sockaddr*>(&addr), sz);
+	int nfd = accept(listenFD, reinterpret_cast<struct sockaddr*>(&addr), (int*)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