Merge pull request #2237 from xmcclure/container-owner

[mono.git] / mono / metadata / class.c

diff --git a/mono/metadata/class.c b/mono/metadata/class.c
index 55dfcc1a488f6254f0d17fff813568b5ed05dc3c..342faae81789e1996052f8959b26af6bbc3f67d7 100644 (file)
--- a/mono/metadata/class.c
+++ b/mono/metadata/class.c
@@ -104,13 +104,13 @@ typedef gboolean (*gclass_record_func) (MonoClass*, void*);
 static inline void
 classes_lock (void)
 {
-       mono_locks_acquire (&classes_mutex, ClassesLock);
+       mono_locks_os_acquire (&classes_mutex, ClassesLock);
 }
 
 static inline void
 classes_unlock (void)
 {
-       mono_locks_release (&classes_mutex, ClassesLock);
+       mono_locks_os_release (&classes_mutex, ClassesLock);
 }
 
 /* 
@@ -6698,11 +6698,11 @@ mono_bounded_array_class_get (MonoClass *eclass, guint32 rank, gboolean bounded)
                 * from mono_class_from_mono_type (), mono_array_new (), 
                 * Array:CreateInstance (), etc, so use a separate cache + a separate lock.
                 */
-               mono_mutex_lock (&image->szarray_cache_lock);
+               mono_os_mutex_lock (&image->szarray_cache_lock);
                if (!image->szarray_cache)
                        image->szarray_cache = g_hash_table_new (mono_aligned_addr_hash, NULL);
                klass = g_hash_table_lookup (image->szarray_cache, eclass);
-               mono_mutex_unlock (&image->szarray_cache_lock);
+               mono_os_mutex_unlock (&image->szarray_cache_lock);
                if (klass)
                        return klass;
 
@@ -6841,14 +6841,14 @@ mono_bounded_array_class_get (MonoClass *eclass, guint32 rank, gboolean bounded)
        if (rank == 1 && !bounded) {
                MonoClass *prev_class;
 
-               mono_mutex_lock (&image->szarray_cache_lock);
+               mono_os_mutex_lock (&image->szarray_cache_lock);
                prev_class = g_hash_table_lookup (image->szarray_cache, eclass);
                if (prev_class)
                        /* Someone got in before us */
                        klass = prev_class;
                else
                        g_hash_table_insert (image->szarray_cache, eclass, klass);
-               mono_mutex_unlock (&image->szarray_cache_lock);
+               mono_os_mutex_unlock (&image->szarray_cache_lock);
        } else {
                list = g_slist_append (rootlist, klass);
                g_hash_table_insert (image->array_cache, eclass, list);
@@ -9861,7 +9861,7 @@ mono_class_get_exception_data (MonoClass *klass)
 void
 mono_classes_init (void)
 {
-       mono_mutex_init (&classes_mutex);
+       mono_os_mutex_init (&classes_mutex);
 
        mono_counters_register ("Inflated methods size",
                                                        MONO_COUNTER_GENERICS | MONO_COUNTER_INT, &inflated_methods_size);
@@ -9886,7 +9886,7 @@ mono_classes_cleanup (void)
        if (global_interface_bitset)
                mono_bitset_free (global_interface_bitset);
        global_interface_bitset = NULL;
-       mono_mutex_destroy (&classes_mutex);
+       mono_os_mutex_destroy (&classes_mutex);
 }
 
 /**