projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #2810 from kumpera/fix_hazard_free
[mono.git]
/
mono
/
utils
/
mono-threads.c
diff --git
a/mono/utils/mono-threads.c
b/mono/utils/mono-threads.c
index 5d08308885afd113ee3e52b0abd8b2eb6ed3ead9..0b142ee1c3f0024fedbce186aa41c65df83e484e 100644
(file)
--- a/
mono/utils/mono-threads.c
+++ b/
mono/utils/mono-threads.c
@@
-6,6
+6,7
@@
*
* Copyright 2011 Novell, Inc (http://www.novell.com)
* Copyright 2011 Xamarin, Inc (http://www.xamarin.com)
*
* Copyright 2011 Novell, Inc (http://www.novell.com)
* Copyright 2011 Xamarin, Inc (http://www.xamarin.com)
+ * Licensed under the MIT license. See LICENSE file in the project root for full license information.
*/
#include <config.h>
*/
#include <config.h>
@@
-424,7
+425,10
@@
unregister_thread (void *arg)
g_byte_array_free (info->stackdata, /*free_segment=*/TRUE);
/*now it's safe to free the thread info.*/
g_byte_array_free (info->stackdata, /*free_segment=*/TRUE);
/*now it's safe to free the thread info.*/
- mono_thread_hazardous_free_or_queue (info, free_thread_info, HAZARD_FREE_MAY_LOCK, HAZARD_FREE_SAFE_CTX);
+ mono_thread_hazardous_try_free (info, free_thread_info);
+ /* Pump the HP queue */
+ mono_thread_hazardous_try_free_some ();
+
mono_thread_small_id_free (small_id);
}
mono_thread_small_id_free (small_id);
}