[runtime] Change MonoImage::field_cache lock from the loader lock to …

…the image lock.
mono · Jan 9, 2014 · b8bb36e · b8bb36e
1 parent b3f05d8
commit b8bb36e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/mono/metadata/loader.c b/mono/metadata/loader.c
@@ -532,13 +532,13 @@ mono_field_from_token (MonoImage *image, guint32 token, MonoClass **retklass,
 		return result;
 	}
 
-	mono_loader_lock ();
+	mono_image_lock (image);
 	if ((field = g_hash_table_lookup (image->field_cache, GUINT_TO_POINTER (token)))) {
 		*retklass = field->parent;
-		mono_loader_unlock ();
+		mono_image_unlock (image);
 		return field;
 	}
-	mono_loader_unlock ();
+	mono_image_unlock (image);
 
 	if (mono_metadata_token_table (token) == MONO_TABLE_MEMBERREF)
 		field = field_from_memberref (image, token, retklass, context);
@@ -555,10 +555,10 @@ mono_field_from_token (MonoImage *image, guint32 token, MonoClass **retklass,
 		field = mono_class_get_field (k, token);
 	}
 
-	mono_loader_lock ();
+	mono_image_lock (image);
 	if (field && field->parent && !field->parent->generic_class && !field->parent->generic_container)
 		g_hash_table_insert (image->field_cache, GUINT_TO_POINTER (token), field);
-	mono_loader_unlock ();
+	mono_image_unlock (image);
 	return field;
 }
 

diff --git a/mono/metadata/metadata-internals.h b/mono/metadata/metadata-internals.h
@@ -224,7 +224,7 @@ struct _MonoImage {
 	/*
 	 * Indexed by fielddef and memberref tokens
 	 */
-	GHashTable *field_cache;
+	GHashTable *field_cache; /*protected by the image lock*/
 
 	/* indexed by typespec tokens. */
 	GHashTable *typespec_cache;