X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fthreadengine.h;h=4bf5a48f38399a94d367989f405f9bff213f5936;hb=4c751dbbe8945e5efc230a59b0ed51c2ba10cf92;hp=d7eaaef6938277e4b559d5007ebd02ee51425fb5;hpb=59dbcc1245468218ec7e2372b2678351382a34f0;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/threadengine.h b/include/threadengine.h
index d7eaaef69..4bf5a48f3 100644
--- a/include/threadengine.h
+++ b/include/threadengine.h
@@ -1,18 +1,25 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/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__
-#define __THREADENGINE__
+
+#ifndef THREADENGINE_H
+#define THREADENGINE_H
 
 #include <vector>
 #include <string>
@@ -20,18 +27,19 @@
 #include "inspircd_config.h"
 #include "base.h"
 
+class ThreadData;
+
 /** 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
  * and race conditions if you MUST use threading!
  */
-class CoreExport Thread : public Extensible
+class CoreExport Thread
 {
  private:
 	/** Set to true when the thread is to exit
 	 */
 	bool ExitFlag;
-// TODO protected:
- public:
+ protected:
 	/** Get thread's current exit status.
 	 * (are we being asked to exit?)
 	 */
@@ -50,17 +58,8 @@ class CoreExport Thread : public Extensible
 	{
 	}
 
-	/** If this thread has a Creator set, call it to
-	 * free the thread
-	 */
-	virtual ~Thread()
-	{
-		if (state)
-		{
-			state->FreeThread(this);
-			delete state;
-		}
-	}
+	/* If the thread is running, you MUST join BEFORE deletion */
+	virtual ~Thread();
 
 	/** Override this method to put your actual
 	 * threaded code here.
@@ -69,10 +68,11 @@ class CoreExport Thread : public Extensible
 
 	/** Signal the thread to exit gracefully.
 	 */
-	virtual void SetExitFlag()
-	{
-		ExitFlag = true;
-	}
+	virtual void SetExitFlag();
+
+	/** Join the thread (calls SetExitFlag and waits for exit)
+	 */
+	void join();
 };
 
 
@@ -132,12 +132,12 @@ class CoreExport SocketThread : public Thread
 	{
 		queue.Wait();
 	}
+ public:
 	/** Notifies parent by making the SignalFD ready to read
 	 * No requirements on locking
 	 */
 	void NotifyParent();
- public:
-	SocketThread(InspIRCd* SI);
+	SocketThread();
 	virtual ~SocketThread();
 	/** Lock queue.
 	 */