Mgfractal: Add 3D and 4D fractals

[oweals/minetest.git] / src / threads.h

diff --git a/src/threads.h b/src/threads.h
index 1ea7d0a94c4678a5d88d6e0d96372ec73c782c3c..d4306f631a966132f926ed56f7602b25a66ea8dc 100644 (file)
--- a/src/threads.h
+++ b/src/threads.h
@@ -1,18 +1,18 @@
 /*
-Minetest-c55
-Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program 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; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
 (at your option) any later version.
 
 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.
+GNU Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
@@ -20,26 +20,75 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef THREADS_HEADER
 #define THREADS_HEADER
 
-#include <jmutex.h>
-
-#if (defined(WIN32) || defined(_WIN32_WCE))
-typedef DWORD threadid_t;
-#define __NORETURN __declspec(noreturn)
-#define __FUNCTION_NAME __FUNCTION__
+//
+// Determine which threading API we will use
+//
+#if __cplusplus >= 201103L
+       #define USE_CPP11_THREADS 1
+#elif defined(_WIN32)
+       #define USE_WIN_THREADS 1
 #else
-typedef pthread_t threadid_t;
-#define __NORETURN __attribute__ ((__noreturn__))
-#define __FUNCTION_NAME __PRETTY_FUNCTION__
+       #define USE_POSIX_THREADS 1
+#endif
+
+///////////////
+
+
+#if USE_CPP11_THREADS
+       #include <thread>
+#endif
+
+#include "threading/mutex.h"
+
+//
+// threadid_t, threadhandle_t
+//
+#if USE_CPP11_THREADS
+       typedef std::thread::id threadid_t;
+       typedef std::thread::native_handle_type threadhandle_t;
+#elif USE_WIN_THREADS
+       typedef DWORD threadid_t;
+       typedef HANDLE threadhandle_t;
+#elif USE_POSIX_THREADS
+       typedef pthread_t threadid_t;
+       typedef pthread_t threadhandle_t;
+#endif
+
+//
+// ThreadStartFunc
+//
+#if USE_CPP11_THREADS || USE_POSIX_THREADS
+       typedef void *ThreadStartFunc(void *param);
+#elif defined(_WIN32_WCE)
+       typedef DWORD ThreadStartFunc(LPVOID param);
+#elif defined(_WIN32)
+       typedef DWORD WINAPI ThreadStartFunc(LPVOID param);
 #endif
 
-inline threadid_t get_current_thread_id()
+
+inline threadid_t thr_get_current_thread_id()
 {
-#if (defined(WIN32) || defined(_WIN32_WCE))
+#if USE_CPP11_THREADS
+       return std::this_thread::get_id();
+#elif USE_WIN_THREADS
        return GetCurrentThreadId();
-#else
+#elif USE_POSIX_THREADS
        return pthread_self();
 #endif
 }
 
+inline bool thr_compare_thread_id(threadid_t thr1, threadid_t thr2)
+{
+#if USE_POSIX_THREADS
+       return pthread_equal(thr1, thr2);
+#else
+       return thr1 == thr2;
 #endif
+}
 
+inline bool thr_is_current_thread(threadid_t thr)
+{
+       return thr_compare_thread_id(thr_get_current_thread_id(), thr);
+}
+
+#endif