godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Merge pull request #10552 from RandomShaper/improve-posix

Browse Source 
Improve Mac/UNIX conformance/reliability
This commit is contained in:
Rémi Verschelde
2017-08-29 00:07:07 +02:00
committed by GitHub
parent 0f7376921f d806ad4a3d
commit 9a8a0e20e5
5 changed files with 35 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/unix/thread_posix.cpp
View File

@@ -36,8 +36,18 @@
#include <pthread_np.h>
#endif
#include "core/safe_refcount.h"
#include "os/memory.h"
static pthread_key_t _create_thread_id_key() {
pthread_key_t key;
pthread_key_create(&key, NULL);
return key;
}
pthread_key_t ThreadPosix::thread_id_key = _create_thread_id_key();
Thread::ID ThreadPosix::next_thread_id = 0;
Thread::ID ThreadPosix::get_id() const {
return id;
@@ -51,7 +61,8 @@ Thread *ThreadPosix::create_thread_posix() {
void *ThreadPosix::thread_callback(void *userdata) {
ThreadPosix *t = reinterpret_cast<ThreadPosix *>(userdata);
t->id = (ID)pthread_self();
t->id = atomic_increment(&next_thread_id);
pthread_setspecific(thread_id_key, (void *)t->id);
ScriptServer::thread_enter(); //scripts may need to attach a stack
@@ -77,7 +88,7 @@ Thread *ThreadPosix::create_func_posix(ThreadCreateCallback p_callback, void *p_
}
Thread::ID ThreadPosix::get_thread_id_func_posix() {
return (ID)pthread_self();
return (ID)pthread_getspecific(thread_id_key);
}
void ThreadPosix::wait_to_finish_func_posix(Thread *p_thread) {