projects
/
mono.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
15aca90
)
[threads] Do not switch to GC safe twice, it's already done inside mono_join_uninterr...
author
Ludovic Henry
<ludovic@xamarin.com>
Mon, 5 Dec 2016 16:23:48 +0000
(11:23 -0500)
committer
Aleksey Kliger (λgeek)
<akliger@gmail.com>
Mon, 5 Dec 2016 18:51:02 +0000
(13:51 -0500)
mono/metadata/threads.c
patch
|
blob
|
history
diff --git
a/mono/metadata/threads.c
b/mono/metadata/threads.c
index 47b4b691690317bae645137e9b1fcaa1b6ac544e..6721ba5c23fe263f8e45850aa4e82e79b906b826 100644
(file)
--- a/
mono/metadata/threads.c
+++ b/
mono/metadata/threads.c
@@
-1686,9
+1686,7
@@
ves_icall_System_Threading_Thread_Join_internal(MonoThread *this_obj, int ms)
mono_thread_set_state (cur_thread, ThreadState_WaitSleepJoin);
- MONO_ENTER_GC_SAFE;
ret=mono_join_uninterrupted (handle, ms, &error);
- MONO_EXIT_GC_SAFE;
mono_thread_clr_state (cur_thread, ThreadState_WaitSleepJoin);