mirror of
https://github.com/moparisthebest/minetest
synced 2024-11-15 05:45:13 -05:00
0a16e53b40
The initial problem was that mutex_auto_lock.h tries to use std::unique_lock<std::mutex> despite mutex.h not using C++11's std::mutex on Windows. The problem here is the mismatch between C++11 usage conditions of the two headers. This commit moves the decision logic to threads.h and makes sure mutex.h, mutex_auto_lock.h and event.h all use the same features.
111 lines
2.5 KiB
C++
111 lines
2.5 KiB
C++
/*
|
|
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 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 Lesser General Public License for more details.
|
|
|
|
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.
|
|
*/
|
|
|
|
#ifndef THREADS_HEADER
|
|
#define THREADS_HEADER
|
|
|
|
//
|
|
// Determine which threading APIs we will use
|
|
//
|
|
#if __cplusplus >= 201103L
|
|
#define USE_CPP11_THREADS 1
|
|
#elif defined(_WIN32)
|
|
#define USE_WIN_THREADS 1
|
|
#else
|
|
#define USE_POSIX_THREADS 1
|
|
#endif
|
|
|
|
#if defined(_WIN32)
|
|
// Prefer critical section API because std::mutex is much slower on Windows
|
|
#define USE_WIN_MUTEX 1
|
|
#elif __cplusplus >= 201103L
|
|
#define USE_CPP11_MUTEX 1
|
|
#else
|
|
#define USE_POSIX_MUTEX 1
|
|
#endif
|
|
|
|
///////////////
|
|
|
|
|
|
#if USE_CPP11_THREADS
|
|
#include <thread>
|
|
#elif USE_POSIX_THREADS
|
|
#include <pthread.h>
|
|
#else
|
|
#ifndef WIN32_LEAN_AND_MEAN
|
|
#define WIN32_LEAN_AND_MEAN
|
|
#endif
|
|
#include <windows.h>
|
|
#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 thr_get_current_thread_id()
|
|
{
|
|
#if USE_CPP11_THREADS
|
|
return std::this_thread::get_id();
|
|
#elif USE_WIN_THREADS
|
|
return GetCurrentThreadId();
|
|
#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
|