* Miguel de Icaza (miguel@ximian.com)
* Patrik Torstensson (patrik.torstensson@labs2.com)
*
- * (C) 2001 Ximian, Inc.
- * Copyright (C) 2002-2006 Novell, Inc.
+ * Copyright 2001-2003 Ximian, Inc (http://www.ximian.com)
+ * Copyright 2004-2009 Novell, Inc (http://www.novell.com)
*
* This file is used by the interpreter and the JIT engine to locate
* assemblies. Used to load AssemblyRef and later to resolve various
#include <mono/metadata/profiler.h>
#include <mono/metadata/profiler-private.h>
#include <mono/metadata/exception.h>
+#include <mono/metadata/marshal.h>
#include <mono/utils/mono-logger.h>
#include <mono/utils/mono-dl.h>
#include <mono/utils/mono-membar.h>
/*
* This lock protects the hash tables inside MonoImage used by the metadata
* loading functions in class.c and loader.c.
+ *
+ * See domain-internals.h for locking policy in combination with the
+ * domain lock.
*/
static CRITICAL_SECTION loader_mutex;
void
mono_loader_init ()
{
- InitializeCriticalSection (&loader_mutex);
+ static gboolean inited;
+
+ if (!inited) {
+ InitializeCriticalSection (&loader_mutex);
+
+ loader_error_thread_id = TlsAlloc ();
- loader_error_thread_id = TlsAlloc ();
+ inited = TRUE;
+ }
}
void
return ex;
}
-/*
- * If @field belongs to an inflated generic class, return the corresponding field of the
- * generic type definition class.
- */
-static MonoClassField*
-mono_metadata_get_corresponding_field_from_generic_type_definition (MonoClassField *field)
-{
- MonoClass *gtd;
- int offset;
-
- if (!field->parent->generic_class)
- return field;
-
- gtd = field->parent->generic_class->container_class;
- offset = field - field->parent->fields;
- return gtd->fields + offset;
-}
-
static MonoClassField*
field_from_memberref (MonoImage *image, guint32 token, MonoClass **retklass,
MonoGenericContext *context)
if (retklass)
*retklass = klass;
field = mono_class_get_field_from_name (klass, fname);
- sig_field = mono_metadata_get_corresponding_field_from_generic_type_definition (field);
+ if (field)
+ sig_field = mono_metadata_get_corresponding_field_from_generic_type_definition (field);
break;
}
default:
}
static MonoMethod *
-find_method_in_class (MonoClass *in_class, const char *name, const char *qname, const char *fqname,
+find_method_in_class (MonoClass *klass, const char *name, const char *qname, const char *fqname,
MonoMethodSignature *sig, MonoClass *from_class)
{
- int i;
+ int i;
+
+ /* Search directly in the metadata to avoid calling setup_methods () */
+
+ /* FIXME: !from_class->generic_class condition causes test failures. */
+ if (klass->type_token && !klass->image->dynamic && !klass->methods && !klass->rank && klass == from_class && !from_class->generic_class) {
+ for (i = 0; i < klass->method.count; ++i) {
+ guint32 cols [MONO_METHOD_SIZE];
+ MonoMethod *method;
+ const char *m_name;
+
+ mono_metadata_decode_table_row (klass->image, MONO_TABLE_METHOD, klass->method.first + i, cols, MONO_METHOD_SIZE);
- mono_class_setup_methods (in_class);
- for (i = 0; i < in_class->method.count; ++i) {
- MonoMethod *m = in_class->methods [i];
+ m_name = mono_metadata_string_heap (klass->image, cols [MONO_METHOD_NAME]);
+
+ if (!((fqname && !strcmp (m_name, fqname)) ||
+ (qname && !strcmp (m_name, qname)) ||
+ (name && !strcmp (m_name, name))))
+ continue;
+
+ method = mono_get_method (klass->image, MONO_TOKEN_METHOD_DEF | (klass->method.first + i + 1), klass);
+ if (method && (sig->call_convention != MONO_CALL_VARARG) && mono_metadata_signature_equal (sig, mono_method_signature (method)))
+ return method;
+ }
+ }
+
+ mono_class_setup_methods (klass);
+ for (i = 0; i < klass->method.count; ++i) {
+ MonoMethod *m = klass->methods [i];
if (!((fqname && !strcmp (m->name, fqname)) ||
(qname && !strcmp (m->name, qname)) ||
}
}
- if (i < in_class->method.count)
+ if (i < klass->method.count)
return mono_class_get_method_by_index (from_class, i);
return NULL;
}
if (name [0] == '.' && (!strcmp (name, ".ctor") || !strcmp (name, ".cctor")))
break;
- g_assert (from_class->interface_count == in_class->interface_count);
- for (i = 0; i < in_class->interface_count; i++) {
- MonoClass *in_ic = in_class->interfaces [i];
- MonoClass *from_ic = from_class->interfaces [i];
+ g_assert (from_class->interface_offsets_count == in_class->interface_offsets_count);
+ for (i = 0; i < in_class->interface_offsets_count; i++) {
+ MonoClass *in_ic = in_class->interfaces_packed [i];
+ MonoClass *from_ic = from_class->interfaces_packed [i];
char *ic_qname, *ic_fqname, *ic_class_name;
ic_class_name = mono_type_get_name_full (&in_ic->byval_arg, MONO_TYPE_NAME_FORMAT_IL);
}
/* this is only for the typespec array methods */
-static MonoMethod*
-search_in_array_class (MonoClass *klass, const char *name, MonoMethodSignature *sig)
+MonoMethod*
+mono_method_search_in_array_class (MonoClass *klass, const char *name, MonoMethodSignature *sig)
{
int i;
+
+ mono_class_setup_methods (klass);
+
for (i = 0; i < klass->method.count; ++i) {
MonoMethod *method = klass->methods [i];
if (strcmp (method->name, name) == 0 && sig->param_count == method->signature->param_count)
}
/* we're an array and we created these methods already in klass in mono_class_init () */
- result = search_in_array_class (klass, mname, sig);
+ result = mono_method_search_in_array_class (klass, mname, sig);
if (result)
return result;
else
method = method_from_memberref (image, nindex, context, NULL);
+ if (!method)
+ return NULL;
+
klass = method->klass;
if (klass->generic_class) {
return mono_dllmap_lookup_list (global_dll_map, dll, func, rdll, rfunc);
}
+/*
+ * mono_dllmap_insert:
+ *
+ * LOCKING: Acquires the loader lock.
+ *
+ * NOTE: This can be called before the runtime is initialized, for example from
+ * mono_config_parse ().
+ */
void
-mono_dllmap_insert (MonoImage *assembly, const char *dll, const char *func, const char *tdll, const char *tfunc) {
+mono_dllmap_insert (MonoImage *assembly, const char *dll, const char *func, const char *tdll, const char *tfunc)
+{
MonoDllMap *entry;
+ mono_loader_init ();
+
mono_loader_lock ();
if (!assembly) {
entry->next = global_dll_map;
global_dll_map = entry;
} else {
- MonoMemPool *mpool = assembly->mempool;
- entry = mono_mempool_alloc0 (mpool, sizeof (MonoDllMap));
- entry->dll = dll? mono_mempool_strdup (mpool, dll): NULL;
- entry->target = tdll? mono_mempool_strdup (mpool, tdll): NULL;
- entry->func = func? mono_mempool_strdup (mpool, func): NULL;
- entry->target_func = tfunc? mono_mempool_strdup (mpool, tfunc): NULL;
+ entry = mono_image_alloc0 (assembly, sizeof (MonoDllMap));
+ entry->dll = dll? mono_image_strdup (assembly, dll): NULL;
+ entry->target = tdll? mono_image_strdup (assembly, tdll): NULL;
+ entry->func = func? mono_image_strdup (assembly, func): NULL;
+ entry->target_func = tfunc? mono_image_strdup (assembly, tfunc): NULL;
entry->next = assembly->dll_map;
assembly->dll_map = entry;
}
if ((cols [2] & METHOD_ATTRIBUTE_PINVOKE_IMPL) ||
(cols [1] & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL))
- result = (MonoMethod *)mono_mempool_alloc0 (image->mempool, sizeof (MonoMethodPInvoke));
+ result = (MonoMethod *)mono_image_alloc0 (image, sizeof (MonoMethodPInvoke));
else
- result = (MonoMethod *)mono_mempool_alloc0 (image->mempool, sizeof (MonoMethodNormal));
+ result = (MonoMethod *)mono_image_alloc0 (image, sizeof (MonoMethodNormal));
mono_stats.method_count ++;
{
MonoMethod *method, *result;
MonoClass *ic = NULL;
- MonoGenericContext *class_context = NULL, *method_context = NULL;
+ MonoGenericContext *method_context = NULL;
MonoMethodSignature *sig, *original_sig;
mono_loader_lock ();
}
}
- if ((constrained_class != method->klass) && (method->klass->interface_id != 0))
+ if ((constrained_class != method->klass) && (MONO_CLASS_IS_INTERFACE (method->klass)))
ic = method->klass;
- if (constrained_class->generic_class)
- class_context = mono_class_get_context (constrained_class);
-
result = find_method (constrained_class, ic, method->name, sig, constrained_class);
if (sig != original_sig)
mono_metadata_free_inflated_signature (sig);
return NULL;
}
- if (class_context)
- result = mono_class_inflate_generic_method (result, class_context);
if (method_context)
result = mono_class_inflate_generic_method (result, method_context);
MonoMethodWrapper *mw = (MonoMethodWrapper*)method;
int i;
+ mono_marshal_free_dynamic_wrappers (method);
+
mono_loader_lock ();
mono_property_hash_remove_object (method->klass->image->property_hash, method);
mono_loader_unlock ();
MonoImage* img;
gpointer loc;
MonoMethodNormal* mn = (MonoMethodNormal*) method;
+ MonoMethodHeader *header;
if ((method->flags & METHOD_ATTRIBUTE_ABSTRACT) || (method->iflags & METHOD_IMPL_ATTRIBUTE_RUNTIME) || (method->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL) || (method->flags & METHOD_ATTRIBUTE_PINVOKE_IMPL))
return NULL;
#endif
return mn->header;
- mono_loader_lock ();
-
- if (mn->header) {
- mono_loader_unlock ();
- return mn->header;
- }
-
if (method->is_inflated) {
MonoMethodInflated *imethod = (MonoMethodInflated *) method;
MonoMethodHeader *header;
- /* the lock is recursive */
+
header = mono_method_get_header (imethod->declaring);
+
+ mono_loader_lock ();
+
+ if (mn->header) {
+ mono_loader_unlock ();
+ return mn->header;
+ }
+
mn->header = inflate_generic_header (header, mono_method_get_context (method));
mono_loader_unlock ();
return mn->header;
}
+ /*
+ * Do most of the work outside the loader lock, to avoid assembly loader hook
+ * deadlocks.
+ */
g_assert (mono_metadata_token_table (method->token) == MONO_TABLE_METHOD);
idx = mono_metadata_token_index (method->token);
img = method->klass->image;
g_assert (loc);
- mn->header = mono_metadata_parse_mh_full (img, mono_method_get_generic_container (method), loc);
+ header = mono_metadata_parse_mh_full (img, mono_method_get_generic_container (method), loc);
+
+ mono_loader_lock ();
+
+ if (mn->header) {
+ /* header is allocated from the image mempool, no need to free it */
+ mono_loader_unlock ();
+ return mn->header;
+ }
+
+ mono_memory_barrier ();
+
+ mn->header = header;
mono_loader_unlock ();
return mn->header;