2009-03-02 Zoltan Varga <vargaz@gmail.com>

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

diff --git a/mono/metadata/image.c b/mono/metadata/image.c
index 5f393eb072c59ad36acf67173d30fc6a0e009e9c..39766cb0237a0e16c3c5ccca349f1dd6f33911a4 100644 (file)
--- a/mono/metadata/image.c
+++ b/mono/metadata/image.c
@@ -614,6 +614,8 @@ mono_image_init (MonoImage *image)
        image->method_signatures = g_hash_table_new (NULL, NULL);
 
        image->property_hash = mono_property_hash_new ();
+       InitializeCriticalSection (&image->lock);
+       InitializeCriticalSection (&image->szarray_cache_lock);
 }
 
 #if G_BYTE_ORDER != G_LITTLE_ENDIAN
@@ -1431,6 +1433,8 @@ mono_image_close (MonoImage *image)
                g_hash_table_foreach (image->array_cache, free_array_cache_entry, NULL);
                g_hash_table_destroy (image->array_cache);
        }
+       if (image->szarray_cache)
+               g_hash_table_destroy (image->szarray_cache);
        if (image->ptr_cache)
                g_hash_table_destroy (image->ptr_cache);
        if (image->name_cache) {
@@ -1504,6 +1508,10 @@ mono_image_close (MonoImage *image)
        if (image->references)
                g_free (image->references);
        mono_perfcounters->loader_bytes -= mono_mempool_get_allocated (image->mempool);
+
+       DeleteCriticalSection (&image->szarray_cache_lock);
+       DeleteCriticalSection (&image->lock);
+
        /*g_print ("destroy image %p (dynamic: %d)\n", image, image->dynamic);*/
        if (!image->dynamic) {
                if (debug_assembly_unload)
@@ -1570,11 +1578,11 @@ mono_image_walk_resource_tree (MonoCLIImageInfo *info, guint32 res_id,
        dir_offset = MONO_PE_RES_DIR_ENTRY_DIR_OFFSET (*entry);
 
        if(level==0) {
-               if((is_string==FALSE && name_offset!=res_id) ||
-                  (is_string==TRUE)) {
-                       return(NULL);
-               }
+               if (is_string)
+                       return NULL;
        } else if (level==1) {
+               if (res_id != name_offset)
+                       return NULL;
 #if 0
                if(name!=NULL &&
                   is_string==TRUE && name!=lookup (name_offset)) {
@@ -1582,12 +1590,8 @@ mono_image_walk_resource_tree (MonoCLIImageInfo *info, guint32 res_id,
                }
 #endif
        } else if (level==2) {
-               if ((is_string == FALSE &&
-                   name_offset != lang_id &&
-                   lang_id != 0) ||
-                  (is_string == TRUE)) {
-                       return(NULL);
-               }
+               if (is_string == TRUE || (is_string == FALSE && lang_id != 0 && name_offset != lang_id))
+                       return NULL;
        } else {
                g_assert_not_reached ();
        }
@@ -1654,6 +1658,8 @@ mono_image_lookup_resource (MonoImage *image, guint32 res_id, guint32 lang_id, g
                return(NULL);
        }
 
+       mono_image_ensure_section_idx (image, MONO_SECTION_RSRC);
+
        info=image->image_info;
        if(info==NULL) {
                return(NULL);
@@ -1987,21 +1993,130 @@ mono_image_has_authenticode_entry (MonoImage *image)
 gpointer
 mono_image_alloc (MonoImage *image, guint size)
 {
+       gpointer res;
+
        mono_perfcounters->loader_bytes += size;
-       return mono_mempool_alloc (image->mempool, size);
+       mono_image_lock (image);
+       res = mono_mempool_alloc (image->mempool, size);
+       mono_image_unlock (image);
+
+       return res;
 }
 
 gpointer
 mono_image_alloc0 (MonoImage *image, guint size)
 {
+       gpointer res;
+
        mono_perfcounters->loader_bytes += size;
-       return mono_mempool_alloc0 (image->mempool, size);
+       mono_image_lock (image);
+       res = mono_mempool_alloc0 (image->mempool, size);
+       mono_image_unlock (image);
+
+       return res;
 }
 
 char*
 mono_image_strdup (MonoImage *image, const char *s)
 {
+       char *res;
+
        mono_perfcounters->loader_bytes += strlen (s);
-       return mono_mempool_strdup (image->mempool, s);
+       mono_image_lock (image);
+       res = mono_mempool_strdup (image->mempool, s);
+       mono_image_unlock (image);
+
+       return res;
+}
+
+GList*
+g_list_prepend_image (MonoImage *image, GList *list, gpointer data)
+{
+       GList *new_list;
+       
+       new_list = mono_image_alloc (image, sizeof (GList));
+       new_list->data = data;
+       new_list->prev = list ? list->prev : NULL;
+    new_list->next = list;
+
+    if (new_list->prev)
+            new_list->prev->next = new_list;
+    if (list)
+            list->prev = new_list;
+
+       return new_list;
+}
+
+GSList*
+g_slist_append_image (MonoImage *image, GSList *list, gpointer data)
+{
+       GSList *new_list;
+
+       new_list = mono_image_alloc (image, sizeof (GSList));
+       new_list->data = data;
+       new_list->next = NULL;
+
+       return g_slist_concat (list, new_list);
+}
+
+void
+mono_image_lock (MonoImage *image)
+{
+       mono_locks_acquire (&image->lock, ImageDataLock);
+}
+
+void
+mono_image_unlock (MonoImage *image)
+{
+       mono_locks_release (&image->lock, ImageDataLock);
+}
+
+
+/**
+ * mono_image_property_lookup:
+ *
+ * Lookup a property on @image. Used to store very rare fields of MonoClass and MonoMethod.
+ *
+ * LOCKING: Takes the image lock
+ */
+gpointer 
+mono_image_property_lookup (MonoImage *image, gpointer subject, guint32 property)
+{
+       gpointer res;
+
+       mono_image_lock (image);
+       res = mono_property_hash_lookup (image->property_hash, subject, property);
+       mono_image_unlock (image);
+
+       return res;
+}
+
+/**
+ * mono_image_property_insert:
+ *
+ * Insert a new property @property with value @value on @subject in @image. Used to store very rare fields of MonoClass and MonoMethod.
+ *
+ * LOCKING: Takes the image lock
+ */
+void
+mono_image_property_insert (MonoImage *image, gpointer subject, guint32 property, gpointer value)
+{
+       mono_image_lock (image);
+       mono_property_hash_insert (image->property_hash, subject, property, value);
+       mono_image_unlock (image);
 }
 
+/**
+ * mono_image_property_remove:
+ *
+ * Remove all properties associated with @subject in @image. Used to store very rare fields of MonoClass and MonoMethod.
+ *
+ * LOCKING: Takes the image lock
+ */
+void
+mono_image_property_remove (MonoImage *image, gpointer subject)
+{
+       mono_image_lock (image);
+       mono_property_hash_remove_object (image->property_hash, subject);
+       mono_image_unlock (image);
+}