X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fthreadengines%2Fthreadengine_pthread.h;h=d1810c812320317243f2745c2cff59f7e4734cfe;hb=27f8e788c2a515f63f1f0e5e2b4b0d5e78c3dab4;hp=9304536f1215ff0b895c5a52630a7cb005ad7ac6;hpb=7bb96595ee11acda44bdeda400e356d4044e072e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/threadengines/threadengine_pthread.h b/include/threadengines/threadengine_pthread.h
index 9304536f1..d1810c812 100644
--- a/include/threadengines/threadengine_pthread.h
+++ b/include/threadengines/threadengine_pthread.h
@@ -1,8 +1,11 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2014 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2013 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2008, 2010 Craig Edwards <brain@inspircd.org>
  *
  * 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
@@ -36,6 +39,13 @@
 class CoreExport ThreadEngine
 {
  public:
+	/** Per-thread state, present in each Thread object, managed by the ThreadEngine
+	 */
+	struct ThreadState
+	{
+		pthread_t pthread_id;
+	};
+
 	/** 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.
@@ -57,23 +67,17 @@ class CoreExport ThreadEngine
 	void Stop(Thread* thread);
 };
 
-class CoreExport ThreadData
-{
- public:
-	pthread_t pthread_id;
-};
-
 /** 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
+ * necessary. 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:
+ protected:
 	pthread_mutex_t putex;
  public:
 	/** Constructor.
@@ -102,33 +106,20 @@ class CoreExport Mutex
 	}
 };
 
-class ThreadQueueData
+class ThreadQueueData : public Mutex
 {
-	pthread_mutex_t mutex;
 	pthread_cond_t cond;
  public:
 	ThreadQueueData()
 	{
-		pthread_mutex_init(&mutex, NULL);
 		pthread_cond_init(&cond, NULL);
 	}
 
 	~ThreadQueueData()
 	{
-		pthread_mutex_destroy(&mutex);
 		pthread_cond_destroy(&cond);
 	}
 
-	void Lock()
-	{
-		pthread_mutex_lock(&mutex);
-	}
-
-	void Unlock()
-	{
-		pthread_mutex_unlock(&mutex);
-	}
-
 	void Wakeup()
 	{
 		pthread_cond_signal(&cond);
@@ -136,7 +127,7 @@ class ThreadQueueData
 
 	void Wait()
 	{
-		pthread_cond_wait(&cond, &mutex);
+		pthread_cond_wait(&cond, &putex);
 	}
 };