ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-06 23:58:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make thread_join be more correct

Browse Source
This commit is contained in:
gingerBill
2021-08-26 22:42:56 +01:00
parent f973d271cf
commit 2f34f1283a
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/threading.cpp
+5 -4
View File
@@ -355,8 +355,8 @@ void gb__thread_run(Thread *t) {
#if defined(GB_SYSTEM_WINDOWS) #if defined(GB_SYSTEM_WINDOWS)
DWORD __stdcall internal_thread_proc(void *arg) { DWORD __stdcall internal_thread_proc(void *arg) {
Thread *t = cast(Thread *)arg; Thread *t = cast(Thread *)arg;
t->is_running.store(true);
gb__thread_run(t); gb__thread_run(t);
t->is_running.store(false);
return 0; return 0;
} }
#else #else
@@ -369,8 +369,8 @@ void gb__thread_run(Thread *t) {
#endif #endif
Thread *t = cast(Thread *)arg; Thread *t = cast(Thread *)arg;
t->is_running.store(true);
gb__thread_run(t); gb__thread_run(t);
t->is_running.store(false);
return NULL; return NULL;
} }
#endif #endif
@@ -383,7 +383,6 @@ void thread_start_with_stack(Thread *t, ThreadProc *proc, void *user_data, isize
t->proc = proc; t->proc = proc;
t->user_data = user_data; t->user_data = user_data;
t->stack_size = stack_size; t->stack_size = stack_size;
t->is_running.store(true);
#if defined(GB_SYSTEM_WINDOWS) #if defined(GB_SYSTEM_WINDOWS)
t->win32_handle = CreateThread(NULL, stack_size, internal_thread_proc, t, 0, NULL); t->win32_handle = CreateThread(NULL, stack_size, internal_thread_proc, t, 0, NULL);
@@ -405,7 +404,9 @@ void thread_start_with_stack(Thread *t, ThreadProc *proc, void *user_data, isize
} }
void thread_join(Thread *t) { void thread_join(Thread *t) {
if (!t->is_running.load()) return; if (!t->is_running.load()) {
return;
}
#if defined(GB_SYSTEM_WINDOWS) #if defined(GB_SYSTEM_WINDOWS)
WaitForSingleObject(t->win32_handle, INFINITE); WaitForSingleObject(t->win32_handle, INFINITE);