#include <mono/metadata/threadpool.h>
#include <mono/utils/mono-uri.h>
-#define MONO_CORLIB_VERSION 28
+#define MONO_CORLIB_VERSION 32
CRITICAL_SECTION mono_delegate_section;
mono_domain_fire_assembly_load (MonoAssembly *assembly, gpointer user_data);
static void
-add_assemblies_to_domain (MonoDomain *domain, MonoAssembly *ass);
-
-static MonoMethod *
-look_for_method_by_name (MonoClass *klass, const gchar *name);
+add_assemblies_to_domain (MonoDomain *domain, MonoAssembly *ass, GHashTable *hash);
static void
mono_domain_unload (MonoDomain *domain);
-/*
+/**
* mono_runtime_init:
* @domain: domain returned by mono_init ()
*
static MonoDomainFunc quit_function = NULL;
void
-mono_runtime_install_cleanup (MonoDomainFunc func)
+mono_install_runtime_cleanup (MonoDomainFunc func)
{
quit_function = func;
}
klass = domain->domain->mbr.obj.vtable->klass;
g_assert (klass);
- method = look_for_method_by_name (klass, "DoTypeResolve");
+ method = mono_class_get_method_from_name (klass, "DoTypeResolve", -1);
if (method == NULL) {
g_warning ("Method AppDomain.DoTypeResolve not found.\n");
return NULL;
return (MonoReflectionAssembly *) mono_runtime_invoke (method, domain->domain, params, NULL);
}
-/*
+/**
+ * mono_domain_owns_vtable_slot:
+ *
+ * Returns whenever VTABLE_SLOT is inside a vtable which belongs to DOMAIN.
+ */
+gboolean
+mono_domain_owns_vtable_slot (MonoDomain *domain, gpointer vtable_slot)
+{
+ gboolean res;
+
+ mono_domain_lock (domain);
+ res = mono_mempool_contains_addr (domain->mp, vtable_slot);
+ mono_domain_unlock (domain);
+ return res;
+}
+
+/**
* mono_domain_set:
+ * @domain: domain
+ * @force: force setting.
*
* Set the current appdomain to @domain. If @force is set, set it even
* if it is being unloaded.
+ *
* Returns:
- * - TRUE on success
- * - FALSE if the domain is unloaded
+ * TRUE on success;
+ * FALSE if the domain is unloaded
*/
gboolean
mono_domain_set (MonoDomain *domain, gboolean force)
}
MonoAppDomain *
-ves_icall_System_AppDomain_getDomainByID (gint32 domain_id)
+ves_icall_System_AppDomain_getRootDomain ()
{
- MonoDomain *add = mono_domain_get_by_id (domain_id);
+ MonoDomain *root = mono_get_root_domain ();
MONO_ARCH_SAVE_REGS;
- return ((add == NULL) ? NULL : add->domain);
-}
-
-static void
-add_assembly_to_domain (gpointer key, gpointer value, gpointer user_data)
-{
- add_assemblies_to_domain ((MonoDomain*)user_data, (MonoAssembly*)value);
+ return root->domain;
}
MonoAppDomain *
MonoClass *adclass;
MonoAppDomain *ad;
MonoDomain *data;
+ GSList *tmp;
MONO_ARCH_SAVE_REGS;
/* The new appdomain should have all assemblies loaded */
mono_domain_lock (domain);
- g_hash_table_foreach (domain->assemblies_by_name, add_assembly_to_domain, data);
+ /*g_print ("copy assemblies from domain %p (%s)\n", domain, domain->friendly_name);*/
+ for (tmp = domain->domain_assemblies; tmp; tmp = tmp->next)
+ add_assemblies_to_domain (data, tmp->data, NULL);
mono_domain_unlock (domain);
return ad;
}
-typedef struct {
- MonoArray *res;
- MonoDomain *domain;
- int idx;
-} add_assembly_helper_t;
-
-static void
-add_assembly (gpointer key, gpointer value, gpointer user_data)
-{
- add_assembly_helper_t *ah = (add_assembly_helper_t *) user_data;
-
- mono_array_set (ah->res, gpointer, ah->idx++, mono_assembly_get_object (ah->domain, value));
-}
-
MonoArray *
ves_icall_System_AppDomain_GetAssemblies (MonoAppDomain *ad)
{
MonoDomain *domain = ad->data;
+ MonoAssembly* ass;
static MonoClass *System_Reflection_Assembly;
MonoArray *res;
- add_assembly_helper_t ah;
+ GSList *tmp;
+ int i, count;
MONO_ARCH_SAVE_REGS;
System_Reflection_Assembly = mono_class_from_name (
mono_defaults.corlib, "System.Reflection", "Assembly");
- res = mono_array_new (domain, System_Reflection_Assembly, g_hash_table_size (domain->assemblies_by_name));
-
- ah.domain = domain;
- ah.res = res;
- ah.idx = 0;
+ count = 0;
+ /* Need to skip internal assembly builders created by remoting */
mono_domain_lock (domain);
- g_hash_table_foreach (domain->assemblies_by_name, add_assembly, &ah);
+ for (tmp = domain->domain_assemblies; tmp; tmp = tmp->next) {
+ ass = tmp->data;
+ if (!ass->corlib_internal)
+ count++;
+ }
+ res = mono_array_new (domain, System_Reflection_Assembly, count);
+ i = 0;
+ for (tmp = domain->domain_assemblies; tmp; tmp = tmp->next) {
+ ass = tmp->data;
+ if (ass->corlib_internal)
+ continue;
+ mono_array_set (res, gpointer, i, mono_assembly_get_object (domain, ass));
+ ++i;
+ }
mono_domain_unlock (domain);
return res;
}
-/*
- * Used to find methods in AppDomain class.
- * It only works if there are no multiple signatures for any given method name
- */
-static MonoMethod *
-look_for_method_by_name (MonoClass *klass, const gchar *name)
-{
- gint i;
- MonoMethod *method;
-
- for (i = 0; i < klass->method.count; i++) {
- method = klass->methods [i];
- if (!strcmp (method->name, name))
- return method;
- }
-
- return NULL;
-}
-
static MonoReflectionAssembly *
try_assembly_resolve (MonoDomain *domain, MonoString *fname)
{
klass = domain->domain->mbr.obj.vtable->klass;
g_assert (klass);
- method = look_for_method_by_name (klass, "DoAssemblyResolve");
+ method = mono_class_get_method_from_name (klass, "DoAssemblyResolve", -1);
if (method == NULL) {
g_warning ("Method AppDomain.DoAssemblyResolve not found.\n");
return NULL;
return (MonoReflectionAssembly *) mono_runtime_invoke (method, domain->domain, params, NULL);
}
+/*
+ * LOCKING: assumes domain is already locked.
+ */
static void
-add_assemblies_to_domain (MonoDomain *domain, MonoAssembly *ass)
+add_assemblies_to_domain (MonoDomain *domain, MonoAssembly *ass, GHashTable *ht)
{
gint i;
+ GSList *tmp;
+ gboolean destroy_ht = FALSE;
if (!ass->aname.name)
return;
- mono_domain_lock (domain);
-
- if (g_hash_table_lookup (domain->assemblies_by_name, ass->aname.name)) {
- mono_domain_unlock (domain);
- return; /* This is ok while no lazy loading of assemblies */
+ if (!ht) {
+ ht = g_hash_table_new (mono_aligned_addr_hash, NULL);
+ destroy_ht = TRUE;
}
- g_hash_table_insert (domain->assemblies_by_name, (gpointer) ass->aname.name, ass);
- domain->assemblies = g_list_prepend (domain->assemblies, ass);
- mono_domain_unlock (domain);
+ /* FIXME: handle lazy loaded assemblies */
+ for (tmp = domain->domain_assemblies; tmp; tmp = tmp->next) {
+ g_hash_table_insert (ht, tmp->data, tmp->data);
+ }
+ if (!g_hash_table_lookup (ht, ass)) {
+ mono_assembly_addref (ass);
+ g_hash_table_insert (ht, ass, ass);
+ domain->domain_assemblies = g_slist_prepend (domain->domain_assemblies, ass);
+ }
- if (ass->image->references)
- for (i = 0; ass->image->references [i] != NULL; i++)
- add_assemblies_to_domain (domain, ass->image->references [i]);
+ if (ass->image->references) {
+ for (i = 0; ass->image->references [i] != NULL; i++) {
+ if (!g_hash_table_lookup (ht, ass->image->references [i])) {
+ add_assemblies_to_domain (domain, ass->image->references [i], ht);
+ }
+ }
+ }
+ if (destroy_ht)
+ g_hash_table_destroy (ht);
}
static void
klass = domain->domain->mbr.obj.vtable->klass;
- method = look_for_method_by_name (klass, "DoAssemblyLoad");
+ method = mono_class_get_method_from_name (klass, "DoAssemblyLoad", -1);
if (method == NULL) {
g_warning ("Method AppDomain.DoAssemblyLoad not found.\n");
return;
}
- add_assemblies_to_domain (domain, assembly);
+ mono_domain_lock (domain);
+ add_assemblies_to_domain (domain, assembly, NULL);
+ mono_domain_unlock (domain);
ref_assembly = mono_assembly_get_object (domain, assembly);
g_assert (ref_assembly);
gpointer user_data)
{
MonoDomain *domain = mono_domain_get ();
- GList *tmp;
+ GSList *tmp;
MonoAssembly *ass;
mono_domain_lock (domain);
- for (tmp = domain->assemblies; tmp; tmp = tmp->next) {
+ for (tmp = domain->domain_assemblies; tmp; tmp = tmp->next) {
ass = tmp->data;
/* Dynamic assemblies can't match here in MS.NET */
if (ass->dynamic || !mono_assembly_names_equal (aname, &ass->aname))
/* Clear references to our vtables in class->cached_vtable */
mono_domain_lock (domain);
- mono_g_hash_table_foreach (domain->class_vtable_hash, clear_cached_vtable,
- domain);
+ g_hash_table_foreach (domain->class_vtable_hash, clear_cached_vtable,
+ domain);
mono_domain_unlock (domain);
+ mono_threads_clear_cached_culture (domain);
+
domain->state = MONO_APPDOMAIN_UNLOADED;
/* printf ("UNLOADED %s.\n", domain->friendly_name); */
mono_domain_unload (MonoDomain *domain)
{
HANDLE thread_handle;
- guint32 tid;
+ guint32 tid, res;
MonoAppDomainState prev_state;
MonoMethod *method;
MonoObject *exc;
unload_data thread_data;
MonoDomain *caller_domain = mono_domain_get ();
- /* printf ("UNLOAD STARTING FOR %s.\n", domain->friendly_name); */
+ /* printf ("UNLOAD STARTING FOR %s (%p) IN THREAD 0x%x.\n", domain->friendly_name, domain, GetCurrentThreadId ()); */
/* Atomically change our state to UNLOADING */
prev_state = InterlockedCompareExchange (&domain->state,
mono_domain_set (domain, FALSE);
/* Notify OnDomainUnload listeners */
- method = look_for_method_by_name (domain->domain->mbr.obj.vtable->klass, "DoDomainUnload");
+ method = mono_class_get_method_from_name (domain->domain->mbr.obj.vtable->klass, "DoDomainUnload", -1);
g_assert (method);
exc = NULL;
#endif
ResumeThread (thread_handle);
#endif
-
- while (WaitForSingleObjectEx (thread_handle, INFINITE, FALSE) == WAIT_IO_COMPLETION)
- ; /* wait for the thread */
-
+
+ /* Wait for the thread */
+ while ((res = WaitForSingleObjectEx (thread_handle, INFINITE, TRUE) == WAIT_IO_COMPLETION)) {
+ if (mono_thread_has_appdomain_ref (mono_thread_current (), domain) && (mono_thread_interruption_requested ()))
+ /* The unload thread tries to abort us */
+ /* The icall wrapper will execute the abort */
+ return;
+ }
mono_domain_set (caller_domain, FALSE);
+
if (thread_data.failure_reason) {
MonoException *ex;
- ex = mono_get_exception_cannot_unload_appdomain (thread_data.failure_reason);
/* Roll back the state change */
domain->state = MONO_APPDOMAIN_CREATED;
g_warning (thread_data.failure_reason);
g_free (thread_data.failure_reason);
+ thread_data.failure_reason = NULL;
+
+ ex = mono_get_exception_cannot_unload_appdomain (thread_data.failure_reason);
mono_raise_exception (ex);
}
projects / mono.git / blobdiff