-/* +------------------------------------+
- * | 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__
+
+#pragma once
#include <vector>
#include <string>
#include <map>
-#include "inspircd_config.h"
+#include "config.h"
#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
* 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:
+
+ /** 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?)
*/
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 this thread has a Creator set, call it to
- * free the thread
- */
- virtual ~Thread()
- {
- if (state)
- {
- state->FreeThread(this);
- delete state;
- }
- }
-
/** Override this method to put your actual
* threaded code here.
*/
/** 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();
};
queue.Wakeup();
queue.Unlock();
}
- virtual void SetExitFlag()
+ void SetExitFlag() CXX11_OVERRIDE
{
queue.Lock();
Thread::SetExitFlag();
{
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.
*/
queue.Wakeup();
queue.Unlock();
}
- virtual void SetExitFlag()
+ void SetExitFlag() CXX11_OVERRIDE
{
queue.Lock();
Thread::SetExitFlag();
*/
virtual void OnNotify() = 0;
};
-
-#endif
-