X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fthreadengines%2Fthreadengine_win32.h;h=59848bd44e3004b2c84f4c6d1aab067e5a8a7d82;hb=e244cb2c63b1ac1d85bdbb4691f7b1bd940ae804;hp=696948d19b3717ab4db4f759d9d1710ee2dfe32b;hpb=a6f16dd4d0ecf27255be2c93f473fae987eeff91;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/threadengines/threadengine_win32.h b/include/threadengines/threadengine_win32.h
index 696948d19..59848bd44 100644
--- a/include/threadengines/threadengine_win32.h
+++ b/include/threadengines/threadengine_win32.h
@@ -1,58 +1,153 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/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/>.
  */
 
-#ifndef __THREADENGINE_PTHREAD__
-#define __THREADENGINE_PTHREAD__
 
-#include <pthread.h>
-#include "inspircd_config.h"
+#pragma once
+
+#include "config.h"
 #include "base.h"
-#include "threadengine.h"
 
-class InspIRCd;
+class Thread;
 
-class CoreExport Win32ThreadEngine : public ThreadEngine
+/** The ThreadEngine class has the responsibility of initialising
+ * Thread derived classes. It does this by creating operating system
+ * level threads which are then associated with the class transparently.
+ * This allows Thread classes to be derived without needing to know how
+ * the OS implements threads. You should ensure that any sections of code
+ * that use threads are threadsafe and do not interact with any other
+ * parts of the code which are NOT known threadsafe! If you really MUST
+ * access non-threadsafe code from a Thread, use the Mutex class to wrap
+ * access to the code carefully.
+ */
+class CoreExport ThreadEngine
 {
  public:
 
-	Win32ThreadEngine(InspIRCd* Instance);
+	ThreadEngine();
 
-	virtual ~Win32ThreadEngine();
-
-	bool Mutex(bool enable);
-
-	void Run();
+	virtual ~ThreadEngine();
 
 	static DWORD WINAPI Entry(void* parameter);
 
-	void Create(Thread* thread_to_init);
-
-	void FreeThread(Thread* thread);
+	/** Create a new thread. This takes an already allocated
+	  * Thread* pointer and initializes it to use this threading
+	  * engine. On failure, this function may throw a CoreException.
+	  * @param thread_to_init Pointer to a newly allocated Thread
+	  * derived object.
+	  */
+	void Start(Thread* thread_to_init);
 
+	/** Returns the thread engine's name for display purposes
+	 * @return The thread engine name
+	 */
 	const std::string GetName()
 	{
 		return "windows-thread";
 	}
 };
 
-class ThreadEngineFactory : public classbase
+class CoreExport ThreadData
+{
+ public:
+	HANDLE handle;
+	void FreeThread(Thread* toFree);
+};
+
+/** The Mutex class represents a mutex, which can be used to keep threads
+ * properly synchronised. Use mutexes sparingly, as they are a good source
+ * of thread deadlocks etc, and should be avoided except where absolutely
+ * neccessary. Note that the internal behaviour of the mutex varies from OS
+ * to OS depending on the thread engine, for example in windows a Mutex
+ * in InspIRCd uses critical sections, as they are faster and simpler to
+ * manage.
+ */
+class CoreExport Mutex
 {
+ private:
+	CRITICAL_SECTION wutex;
  public:
-	ThreadEngine* Create(InspIRCd* ServerInstance)
+	Mutex()
 	{
-		return new Win32ThreadEngine(ServerInstance);
+		InitializeCriticalSection(&wutex);
+	}
+	void Lock()
+	{
+		EnterCriticalSection(&wutex);
+	}
+	void Unlock()
+	{
+		LeaveCriticalSection(&wutex);
+	}
+	~Mutex()
+	{
+		DeleteCriticalSection(&wutex);
 	}
 };
 
-#endif
+class ThreadQueueData
+{
+	CRITICAL_SECTION mutex;
+	HANDLE event;
+ public:
+	ThreadQueueData()
+	{
+		event = CreateEvent(NULL, false, false, NULL);
+		if (event == NULL)
+			throw CoreException("CreateEvent() failed in ThreadQueueData::ThreadQueueData()!");
+		InitializeCriticalSection(&mutex);
+	}
+
+	~ThreadQueueData()
+	{
+		CloseHandle(event);
+		DeleteCriticalSection(&mutex);
+	}
+
+	void Lock()
+	{
+		EnterCriticalSection(&mutex);
+	}
 
+	void Unlock()
+	{
+		LeaveCriticalSection(&mutex);
+	}
+
+	void Wakeup()
+	{
+		PulseEvent(event);
+	}
+
+	void Wait()
+	{
+		LeaveCriticalSection(&mutex);
+		WaitForSingleObject(event, INFINITE);
+		EnterCriticalSection(&mutex);
+	}
+};
+
+class ThreadSignalData
+{
+ public:
+	int connFD;
+	ThreadSignalData()
+	{
+		connFD = -1;
+	}
+};