oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Remove threads.h and replace its definitions with their C++11 equivalents (#5957)

Browse source 
This also changes threadProc's signature, since C++11 supports arbitrary
thread function signatures.
This commit is contained in:
ShadowNinja 2017-06-11 03:43:05 -04:00 • committed by Loïc Blot
parent 5cc8ad946e
commit 6c5e5e2023
16 changed files with 82 additions and 160 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/script/cpp_api/s_base.h
View file

@ -22,6 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include <iostream>
#include <string>
#include <thread>
#include "util/basic_macros.h"
extern "C" {
@ -29,7 +30,6 @@ extern "C" {
}
#include "irrlichttypes.h"
#include "threads.h"
#include "threading/mutex_auto_lock.h"
#include "common/c_types.h"
#include "common/c_internal.h"
@ -122,7 +122,7 @@ protected:
bool m_secure;
#ifdef SCRIPTAPI_LOCK_DEBUG
int m_lock_recursion_count;
threadid_t m_owning_thread;
std::thread::id m_owning_thread;
#endif
private:

16
src/script/cpp_api/s_internal.h
View file

@ -27,6 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#ifndef S_INTERNAL_H_
#define S_INTERNAL_H_
#include <thread>
#include "common/c_internal.h"
#include "cpp_api/s_base.h"
@ -35,23 +36,24 @@ with this program; if not, write to the Free Software Foundation, Inc.,
class LockChecker {
public:
LockChecker(int *recursion_counter, threadid_t *owning_thread)
LockChecker(int *recursion_counter, std::thread::id *owning_thread)
{
m_lock_recursion_counter = recursion_counter;
m_owning_thread = owning_thread;
m_original_level = *recursion_counter;
if (*m_lock_recursion_counter > 0)
assert(thr_is_current_thread(*m_owning_thread));
else
*m_owning_thread = thr_get_current_thread_id();
if (*m_lock_recursion_counter > 0) {
assert(*m_owning_thread == std::this_thread::get_id());
} else {
*m_owning_thread = std::this_thread::get_id();
}
(*m_lock_recursion_counter)++;
}
~LockChecker()
{
assert(thr_is_current_thread(*m_owning_thread));
assert(*m_owning_thread == std::this_thread::get_id());
assert(*m_lock_recursion_counter > 0);
(*m_lock_recursion_counter)--;
@ -62,7 +64,7 @@ public:
private:
int *m_lock_recursion_counter;
int m_original_level;
threadid_t *m_owning_thread;
std::thread::id *m_owning_thread;
};
#define SCRIPTAPI_LOCK_CHECK \