From e4bff8be94c0db4f94e63ad448d0eeb869ccdbbd Mon Sep 17 00:00:00 2001
From: ShadowNinja <shadowninja@minetest.net>
Date: Tue, 7 Apr 2015 06:13:12 -0400
Subject: Clean up threading

  * Rename everything.
    * Strip J prefix.
    * Change UpperCamelCase functions to lowerCamelCase.
  * Remove global (!) semaphore count mutex on OSX.
  * Remove semaphore count getter (unused, unsafe, depended on internal
    API functions on Windows, and used a hack on OSX).
  * Add `Atomic<type>`.
  * Make `Thread` handle thread names.
  * Add support for C++11 multi-threading.
  * Combine pthread and win32 sources.
  * Remove `ThreadStarted` (unused, unneeded).
  * Move some includes from the headers to the sources.
  * Move all of `Event` into its header (allows inlining with no new includes).
  * Make `Event` use `Semaphore` (except on Windows).
  * Move some porting functions into `Thread`.
  * Integrate logging with `Thread`.
  * Add threading test.
---
 src/threading/thread.h | 119 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 119 insertions(+)
 create mode 100644 src/threading/thread.h

(limited to 'src/threading/thread.h')

diff --git a/src/threading/thread.h b/src/threading/thread.h
new file mode 100644
index 000000000..275bc9b6d
--- /dev/null
+++ b/src/threading/thread.h
@@ -0,0 +1,119 @@
+/*
+This file is a part of the JThread package, which contains some object-
+oriented thread wrappers for different thread implementations.
+
+Copyright (c) 2000-2006  Jori Liesenborgs (jori.liesenborgs@gmail.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef THREADING_THREAD_H
+#define THREADING_THREAD_H
+
+#include "threading/atomic.h"
+#include "threading/mutex.h"
+
+#include <string>
+#if __cplusplus >= 201103L
+	#include <thread>
+#endif
+
+#ifndef _WIN32
+enum {
+	THREAD_PRIORITY_LOWEST,
+	THREAD_PRIORITY_BELOW_NORMAL,
+	THREAD_PRIORITY_NORMAL,
+	THREAD_PRIORITY_ABOVE_NORMAL,
+	THREAD_PRIORITY_HIGHEST,
+};
+#endif
+
+
+class Thread
+{
+public:
+	Thread(const std::string &name="Unnamed");
+	virtual ~Thread() { kill(); }
+
+	bool start();
+	inline void stop() { request_stop = true; }
+	bool kill();
+
+	inline bool isRunning() { return running; }
+	inline bool stopRequested() { return request_stop; }
+	void *getReturnValue() { return running ? NULL : retval; }
+	bool isSameThread();
+
+	static unsigned int getNumberOfProcessors();
+	bool bindToProcessor(unsigned int);
+	bool setPriority(int);
+
+	/*
+	 * Wait for thread to finish.
+	 * Note: this does not stop a thread, you have to do this on your own.
+	 * Returns immediately if the thread is not started.
+	 */
+	void wait();
+
+	static void setName(const std::string &name);
+
+protected:
+	std::string name;
+
+	virtual void *run() = 0;
+
+private:
+	void setName() { setName(name); }
+
+	void *retval;
+	Atomic<bool> request_stop;
+	Atomic<bool> running;
+	Mutex continue_mutex;
+
+#if __cplusplus >= 201103L
+	static void theThread(Thread *th);
+
+	std::thread *thread;
+	std::thread::native_handle_type getThreadHandle() const
+		{ return thread->native_handle(); }
+#else
+# if defined(WIN32) || defined(_WIN32_WCE)
+#  ifdef _WIN32_WCE
+	DWORD thread_id;
+	static DWORD WINAPI theThread(void *param);
+#  else
+	UINT thread_id;
+	static UINT __stdcall theThread(void *param);
+#  endif
+
+	HANDLE thread;
+	HANDLE getThreadHandle() const { return thread; }
+# else // pthread
+	static void *theThread(void *param);
+
+	pthread_t thread;
+	pthread_t getThreadHandle() const { return thread; }
+
+	Atomic<bool> started;
+# endif
+#endif
+};
+
+#endif
+
-- 
cgit v1.2.3