void
mono_loader_init ()
{
- InitializeCriticalSection (&loader_mutex);
+ static gboolean inited;
- loader_error_thread_id = TlsAlloc ();
+ if (!inited) {
+ InitializeCriticalSection (&loader_mutex);
+
+ loader_error_thread_id = TlsAlloc ();
+
+ inited = TRUE;
+ }
}
void
MonoGenericContext *context)
{
MonoClass *klass;
- MonoClassField *field;
+ MonoClassField *field, *sig_field = NULL;
MonoTableInfo *tables = image->tables;
+ MonoType *sig_type;
guint32 cols[6];
guint32 nindex, class;
const char *fname;
mono_metadata_decode_blob_size (ptr, &ptr);
/* we may want to check the signature here... */
+ if (*ptr++ != 0x6) {
+ mono_loader_set_error_bad_image (g_strdup_printf ("Bad field signature class token %08x field name %s token %08x", class, fname, token));
+ return NULL;
+ }
+ sig_type = mono_metadata_parse_type (image, MONO_PARSE_TYPE, 0, ptr, &ptr);
+
switch (class) {
case MONO_MEMBERREF_PARENT_TYPEDEF:
klass = mono_class_get (image, MONO_TOKEN_TYPE_DEF | nindex);
mono_class_init (klass);
if (retklass)
*retklass = klass;
- field = mono_class_get_field_from_name (klass, fname);
+ sig_field = field = mono_class_get_field_from_name (klass, fname);
break;
case MONO_MEMBERREF_PARENT_TYPEREF:
klass = mono_class_from_typeref (image, MONO_TOKEN_TYPE_REF | nindex);
mono_class_init (klass);
if (retklass)
*retklass = klass;
- field = mono_class_get_field_from_name (klass, fname);
+ sig_field = field = mono_class_get_field_from_name (klass, fname);
break;
case MONO_MEMBERREF_PARENT_TYPESPEC: {
- /*guint32 bcols [MONO_TYPESPEC_SIZE];
- guint32 len;
- MonoType *type;
-
- mono_metadata_decode_row (&tables [MONO_TABLE_TYPESPEC], nindex - 1,
- bcols, MONO_TYPESPEC_SIZE);
- ptr = mono_metadata_blob_heap (image, bcols [MONO_TYPESPEC_SIGNATURE]);
- len = mono_metadata_decode_value (ptr, &ptr);
- type = mono_metadata_parse_type (image, MONO_PARSE_TYPE, 0, ptr, &ptr);
-
- klass = mono_class_from_mono_type (type);
- mono_class_init (klass);
- g_print ("type in sig: %s\n", klass->name);*/
klass = mono_class_get_full (image, MONO_TOKEN_TYPE_SPEC | nindex, context);
//FIXME can't klass be null?
mono_class_init (klass);
if (retklass)
*retklass = klass;
field = mono_class_get_field_from_name (klass, fname);
+ if (field)
+ sig_field = mono_metadata_get_corresponding_field_from_generic_type_definition (field);
break;
}
default:
if (!field)
mono_loader_set_error_field_load (klass, fname);
+ else if (sig_field && !mono_metadata_type_equal_full (sig_type, sig_field->type, TRUE)) {
+ mono_loader_set_error_field_load (klass, fname);
+ return NULL;
+ }
return field;
}
}
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_class_setup_methods (in_class);
- for (i = 0; i < in_class->method.count; ++i) {
- MonoMethod *m = in_class->methods [i];
+ mono_metadata_decode_table_row (klass->image, MONO_TABLE_METHOD, klass->method.first + i, cols, MONO_METHOD_SIZE);
+
+ 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);
if (table == MONO_TABLE_METHODSPEC) {
g_assert (!(method->flags & METHOD_ATTRIBUTE_PINVOKE_IMPL) &&
- !(method->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL) &&
mono_method_signature (method));
g_assert (method->is_inflated);
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 ++;
return mono_get_method_full (image, token, klass, NULL);
}
+static gpointer
+get_method_token (gpointer value)
+{
+ MonoMethod *m = (MonoMethod*)value;
+
+ return GUINT_TO_POINTER (m->token);
+}
+
MonoMethod *
mono_get_method_full (MonoImage *image, guint32 token, MonoClass *klass,
MonoGenericContext *context)
mono_loader_lock ();
- if ((result = g_hash_table_lookup (image->method_cache, GINT_TO_POINTER (token)))) {
+ if (mono_metadata_token_table (token) == MONO_TABLE_METHOD) {
+ if (!image->method_cache)
+ image->method_cache = mono_value_hash_table_new (NULL, NULL, get_method_token);
+ result = mono_value_hash_table_lookup (image->method_cache, GINT_TO_POINTER (token));
+ } else {
+ if (!image->methodref_cache)
+ image->methodref_cache = g_hash_table_new (NULL, NULL);
+ result = g_hash_table_lookup (image->methodref_cache, GINT_TO_POINTER (token));
+ }
+ if (result) {
mono_loader_unlock ();
return result;
}
* used the `context' to get the method. See bug #80969.
*/
- if (!used_context && !(result && result->is_inflated))
- g_hash_table_insert (image->method_cache, GINT_TO_POINTER (token), result);
+ if (!used_context && !(result && result->is_inflated) && result) {
+ if (mono_metadata_token_table (token) == MONO_TABLE_METHOD) {
+ mono_value_hash_table_insert (image->method_cache, GINT_TO_POINTER (token), result);
+ } else {
+ g_hash_table_insert (image->methodref_cache, GINT_TO_POINTER (token), result);
+ }
+ }
mono_loader_unlock ();
{
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);
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;
projects / mono.git / blobdiff