Remove the Kiwi links from the readme.

[user/henk/code/inspircd.git] / include / threadengine.h

diff --git a/include/threadengine.h b/include/threadengine.h
index f01abfbbe393f629868d28e0f6d3a1c0448c02df..0c2d26ce6e14f4546cb8b5a952c3ac40372838b4 100644 (file)
--- a/include/threadengine.h
+++ b/include/threadengine.h
@@ -1,8 +1,11 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   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 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
@@ -18,21 +21,10 @@
  */
 
 
-#ifndef THREADENGINE_H
-#define THREADENGINE_H
+#pragma once
 
-#include <vector>
-#include <string>
-#include <map>
-#include "inspircd_config.h"
 #include "base.h"
 
-#ifdef WINDOWS
-#include "threadengines/threadengine_win32.h"
-#endif
-
-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!
@@ -43,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?)
@@ -52,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.
         */
@@ -113,7 +107,7 @@ class CoreExport QueuedThread : public Thread
                queue.Wakeup();
                queue.Unlock();
        }
-       virtual void SetExitFlag()
+       void SetExitFlag() CXX11_OVERRIDE
        {
                queue.Lock();
                Thread::SetExitFlag();
@@ -162,7 +156,7 @@ class CoreExport SocketThread : public Thread
                queue.Wakeup();
                queue.Unlock();
        }
-       virtual void SetExitFlag()
+       void SetExitFlag() CXX11_OVERRIDE
        {
                queue.Lock();
                Thread::SetExitFlag();
@@ -176,6 +170,3 @@ class CoreExport SocketThread : public Thread
         */
        virtual void OnNotify() = 0;
 };
-
-#endif
-