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
/
metadata
/
jit-info.c
diff --git
a/mono/metadata/jit-info.c
b/mono/metadata/jit-info.c
index c8d5f588322040c152b1d18ec78c60ad5aa10cef..e94b73d590cfe85fd055d00b341fc8d84198c924 100644
(file)
--- a/
mono/metadata/jit-info.c
+++ b/
mono/metadata/jit-info.c
@@
-614,7
+614,7
@@
jit_info_table_add (MonoDomain *domain, MonoJitInfoTable *volatile *table_ptr, M
*table_ptr = new_table;
mono_memory_barrier ();
domain->num_jit_info_tables++;
*table_ptr = new_table;
mono_memory_barrier ();
domain->num_jit_info_tables++;
- mono_thread_hazardous_
free_or_queue (table, (MonoHazardousFreeFunc)mono_jit_info_table_free, HAZARD_FREE_MAY_LOCK, HAZARD_FREE_SAFE_CTX
);
+ mono_thread_hazardous_
try_free (table, (MonoHazardousFreeFunc)mono_jit_info_table_free
);
table = new_table;
goto restart;
table = new_table;
goto restart;
@@
-692,7
+692,7
@@
mono_jit_info_free_or_queue (MonoDomain *domain, MonoJitInfo *ji)
if (domain->num_jit_info_tables <= 1) {
/* Can it actually happen that we only have one table
but ji is still hazardous? */
if (domain->num_jit_info_tables <= 1) {
/* Can it actually happen that we only have one table
but ji is still hazardous? */
- mono_thread_hazardous_
free_or_queue (ji, g_free, HAZARD_FREE_MAY_LOCK, HAZARD_FREE_SAFE_CTX
);
+ mono_thread_hazardous_
try_free (ji, g_free
);
} else {
domain->jit_info_free_queue = g_slist_prepend (domain->jit_info_free_queue, ji);
}
} else {
domain->jit_info_free_queue = g_slist_prepend (domain->jit_info_free_queue, ji);
}