In .:

	* class.c:
	* loader.c:
	* reflection.c: Remove all explicit uses of MonoImage::property_hash.

2009-02-14 Rodrigo Kumpera  <rkumpera@novell.com>

svn path=/trunk/mono/; revision=126928

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index 0bb0b34b6dfcb43b0c31d3ad74739f3a3271dd49..a42bab666bee834f4d2af1a6e6caeee38084c716 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,9 @@
+2009-02-14 Rodrigo Kumpera  <rkumpera@novell.com>
+
+       * class.c:
+       * loader.c:
+       * reflection.c: Remove all explicit uses of MonoImage::property_hash.
+
 2009-02-14 Rodrigo Kumpera  <rkumpera@novell.com>
 
        * image.c: Add mono_image_property_(lookup,insert,remove) functions that

diff --git a/mono/metadata/class.c b/mono/metadata/class.c
index 612f1be5f7de88340ce28b800b33b265385f9086..95a4e53a8937aab79821ad94aa2c17e3b31f34ed 100644 (file)
--- a/mono/metadata/class.c
+++ b/mono/metadata/class.c
@@ -957,9 +957,7 @@ mono_method_get_generic_container (MonoMethod *method)
        if (!method->is_generic)
                return NULL;
 
-       mono_loader_lock ();
-       container = mono_property_hash_lookup (method->klass->image->property_hash, method, MONO_METHOD_PROP_GENERIC_CONTAINER);
-       mono_loader_unlock ();
+       container = mono_image_property_lookup (method->klass->image, method, MONO_METHOD_PROP_GENERIC_CONTAINER);
        g_assert (container);
 
        return container;
@@ -976,9 +974,7 @@ mono_method_set_generic_container (MonoMethod *method, MonoGenericContainer* con
 {
        g_assert (method->is_generic);
 
-       mono_loader_lock ();
-       mono_property_hash_insert (method->klass->image->property_hash, method, MONO_METHOD_PROP_GENERIC_CONTAINER, container);
-       mono_loader_unlock ();
+       mono_image_property_insert (method->klass->image, method, MONO_METHOD_PROP_GENERIC_CONTAINER, container);
 }
 
 /** 
@@ -7197,7 +7193,7 @@ mono_class_set_failure (MonoClass *klass, guint32 ex_type, void *ex_data)
        mono_loader_lock ();
        klass->exception_type = ex_type;
        if (ex_data)
-               mono_property_hash_insert (klass->image->property_hash, klass, MONO_CLASS_PROP_EXCEPTION_DATA, ex_data);
+               mono_image_property_insert (klass->image, klass, MONO_CLASS_PROP_EXCEPTION_DATA, ex_data);
        mono_loader_unlock ();
 
        return TRUE;
@@ -7213,12 +7209,7 @@ mono_class_set_failure (MonoClass *klass, guint32 ex_type, void *ex_data)
 gpointer
 mono_class_get_exception_data (MonoClass *klass)
 {
-       gpointer res;
-
-       mono_loader_lock ();
-       res = mono_property_hash_lookup (klass->image->property_hash, klass, MONO_CLASS_PROP_EXCEPTION_DATA);
-       mono_loader_unlock ();
-       return res;
+       return mono_image_property_lookup (klass->image, klass, MONO_CLASS_PROP_EXCEPTION_DATA);
 }
 
 /**

diff --git a/mono/metadata/loader.c b/mono/metadata/loader.c
index 19327c2b0a92793b0f8123d122bff27d9d96a35f..c3535ad25b28f4587a03645797978c1bf3f572b2 100644 (file)
--- a/mono/metadata/loader.c
+++ b/mono/metadata/loader.c
@@ -1684,9 +1684,7 @@ mono_free_method  (MonoMethod *method)
 
                mono_marshal_free_dynamic_wrappers (method);
 
-               mono_loader_lock ();
-               mono_property_hash_remove_object (method->klass->image->property_hash, method);
-               mono_loader_unlock ();
+               mono_image_property_remove (method->klass->image, method);
 
                g_free ((char*)method->name);
                if (mw->method.header) {

diff --git a/mono/metadata/reflection.c b/mono/metadata/reflection.c
index 9611495dde9c340ed85af4e0d58f9b6fe29f4e57..32a53543e72ca78ff687fd499f707dbe45972b99 100644 (file)
--- a/mono/metadata/reflection.c
+++ b/mono/metadata/reflection.c
@@ -1116,9 +1116,7 @@ lookup_custom_attr (MonoImage *image, gpointer member)
 {
        MonoCustomAttrInfo* res;
 
-       mono_loader_lock ();
-       res = mono_property_hash_lookup (image->property_hash, member, MONO_PROP_DYNAMIC_CATTR);
-       mono_loader_unlock ();
+       res = mono_image_property_lookup (image, member, MONO_PROP_DYNAMIC_CATTR);
 
        if (!res)
                return NULL;
@@ -1196,12 +1194,14 @@ mono_save_custom_attrs (MonoImage *image, void *obj, MonoArray *cattrs)
                return;
 
        ainfo = mono_custom_attrs_from_builders (image, image, cattrs);
+
        mono_loader_lock ();
-       tmp = mono_property_hash_lookup (image->property_hash, obj, MONO_PROP_DYNAMIC_CATTR);
+       tmp = mono_image_property_lookup (image, obj, MONO_PROP_DYNAMIC_CATTR);
        if (tmp)
                mono_custom_attrs_free (tmp);
-       mono_property_hash_insert (image->property_hash, obj, MONO_PROP_DYNAMIC_CATTR, ainfo);
+       mono_image_property_insert (image, obj, MONO_PROP_DYNAMIC_CATTR, ainfo);
        mono_loader_unlock ();
+
 }
 
 void