X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fthreadengine.h;h=0c2d26ce6e14f4546cb8b5a952c3ac40372838b4;hb=c05f81cac83e80c7727594e3929e0709eccca689;hp=3768f113cade7e544205d1b3d4326e2173ac2b1a;hpb=76619990ad82501afc95d0c76f057a2841862de9;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/threadengine.h b/include/threadengine.h
index 3768f113c..0c2d26ce6 100644
--- a/include/threadengine.h
+++ b/include/threadengine.h
@@ -1,30 +1,29 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2014 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2013, 2017 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Craig Edwards <brain@inspircd.org>
  *
- * 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_H
-#define THREADENGINE_H
-
-#include <vector>
-#include <string>
-#include <map>
-#include "inspircd_config.h"
-#include "base.h"
 
-#ifdef WINDOWS
-#include "threadengines/threadengine_win32.h"
-#endif
+#pragma once
 
-class ThreadData;
+#include "base.h"
 
 /** Derive from this class to implement your own threaded sections of
  * code. Be sure to keep your code thread-safe and not prone to deadlocks
@@ -36,6 +35,15 @@ class CoreExport Thread
 	/** Set to true when the thread is to exit
 	 */
 	bool ExitFlag;
+
+	/** Opaque thread state managed by the ThreadEngine
+	 */
+	ThreadEngine::ThreadState state;
+
+	/** ThreadEngine manages Thread::state
+	 */
+	friend class ThreadEngine;
+
  protected:
 	/** Get thread's current exit status.
 	 * (are we being asked to exit?)
@@ -45,19 +53,12 @@ class CoreExport Thread
 		return ExitFlag;
 	}
  public:
-	/** Opaque thread state managed by threading engine
-	 */
-	ThreadData* state;
-
 	/** Set Creator to NULL at this point
 	 */
-	Thread() : ExitFlag(false), state(NULL)
+	Thread() : ExitFlag(false)
 	{
 	}
 
-	/* If the thread is running, you MUST join BEFORE deletion */
-	virtual ~Thread();
-
 	/** Override this method to put your actual
 	 * threaded code here.
 	 */
@@ -106,7 +107,7 @@ class CoreExport QueuedThread : public Thread
 		queue.Wakeup();
 		queue.Unlock();
 	}
-	virtual void SetExitFlag()
+	void SetExitFlag() CXX11_OVERRIDE
 	{
 		queue.Lock();
 		Thread::SetExitFlag();
@@ -155,7 +156,7 @@ class CoreExport SocketThread : public Thread
 		queue.Wakeup();
 		queue.Unlock();
 	}
-	virtual void SetExitFlag()
+	void SetExitFlag() CXX11_OVERRIDE
 	{
 		queue.Lock();
 		Thread::SetExitFlag();
@@ -169,6 +170,3 @@ class CoreExport SocketThread : public Thread
 	 */
 	virtual void OnNotify() = 0;
 };
-
-#endif
-