image->property_hash = mono_property_hash_new ();
InitializeCriticalSection (&image->lock);
+ InitializeCriticalSection (&image->szarray_cache_lock);
}
#if G_BYTE_ORDER != G_LITTLE_ENDIAN
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) {
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)
mono_mempool_destroy (image->mempool);
}
- DeleteCriticalSection (&image->lock);
-
mono_profiler_module_event (image, MONO_PROFILE_END_UNLOAD);
}
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)) {
}
#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 ();
}
return(NULL);
}
+ mono_image_ensure_section_idx (image, MONO_SECTION_RSRC);
+
info=image->image_info;
if(info==NULL) {
return(NULL);
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*
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)
{
- EnterCriticalSection (&image->lock);
+ mono_locks_acquire (&image->lock, ImageDataLock);
}
void
mono_image_unlock (MonoImage *image)
{
- LeaveCriticalSection (&image->lock);
+ 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);
}