Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Wait for the native thread to die in Thread.Join() on Windows #5504

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ntherning merged 1 commit into from
Sep 11, 2017
Merged

Wait for the native thread to die in Thread.Join() on Windows #5504

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 21 additions & 9 deletions mono/metadata/threads.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1802,7 +1802,7 @@ mono_join_uninterrupted (MonoThreadHandle* thread_to_join, gint32 ms, MonoError
}

gboolean
ves_icall_System_Threading_Thread_Join_internal(MonoThread *this_obj, int ms)
ves_icall_System_Threading_Thread_Join_internal (MonoThread *this_obj, int ms)
{
MonoInternalThread *thread = this_obj->internal_thread;
MonoThreadHandle *handle = thread->handle;
Expand All @@ -1822,30 +1822,42 @@ ves_icall_System_Threading_Thread_Join_internal(MonoThread *this_obj, int ms)
return FALSE;
}

MonoNativeThreadId tid = thread_get_tid (thread);

UNLOCK_THREAD (thread);

if(ms== -1) {
ms=MONO_INFINITE_WAIT;
}
if (ms == -1)
ms = MONO_INFINITE_WAIT;
THREAD_DEBUG (g_message ("%s: joining thread handle %p, %d ms", __func__, handle, ms));

mono_thread_set_state (cur_thread, ThreadState_WaitSleepJoin);

ret=mono_join_uninterrupted (handle, ms, &error);
ret = mono_join_uninterrupted (handle, ms, &error);

mono_thread_clr_state (cur_thread, ThreadState_WaitSleepJoin);

mono_error_set_pending_exception (&error);

if(ret==MONO_THREAD_INFO_WAIT_RET_SUCCESS_0) {
if (ret == MONO_THREAD_INFO_WAIT_RET_SUCCESS_0) {
THREAD_DEBUG (g_message ("%s: join successful", __func__));

return(TRUE);
#ifdef HOST_WIN32
/* TODO: Do this on Unix platforms as well. See PR #5454 for context. */
/* Wait for the thread to really exit */
MONO_ENTER_GC_SAFE;
/* This shouldn't block */
mono_threads_join_lock ();
mono_native_thread_join (tid);
mono_threads_join_unlock ();
MONO_EXIT_GC_SAFE;
#endif

return TRUE;
}

THREAD_DEBUG (g_message ("%s: join failed", __func__));

return(FALSE);
return FALSE;
}

#define MANAGED_WAIT_FAILED 0x7fffffff
Expand Down