#include <mono/os/gc_wrapper.h>
#include <mono/metadata/object.h>
-#include <mono/metadata/appdomain.h>
+#include <mono/metadata/domain-internals.h>
+#include "mono/metadata/metadata-internals.h"
#include <mono/metadata/assembly.h>
#include <mono/metadata/exception.h>
#include <mono/metadata/threads.h>
#include <mono/metadata/marshal.h>
#include <mono/utils/mono-uri.h>
-#define MONO_CORLIB_VERSION 17
+#define MONO_CORLIB_VERSION 24
CRITICAL_SECTION mono_delegate_section;
MonoClass *class;
MonoString *arg;
+ MONO_GC_PRE_INIT ();
mono_marshal_init ();
mono_install_assembly_preload_hook (mono_domain_assembly_preload, NULL);
mono_runtime_quit ()
{
if (quit_function != NULL)
- quit_function (mono_root_domain, NULL);
+ quit_function (mono_get_root_domain (), NULL);
}
gboolean
return TRUE;
}
-void
-ves_icall_System_AppDomainSetup_InitAppDomainSetup (MonoAppDomainSetup *setup)
-{
- MonoDomain* domain = mono_domain_get ();
- MonoAssembly *assembly;
- gchar *str;
- gchar *config_suffix;
-
- MONO_ARCH_SAVE_REGS;
-
- if (!domain->entry_assembly)
- assembly = mono_root_domain->entry_assembly;
- else
- assembly = domain->entry_assembly;
-
- g_assert (assembly);
-
- setup->application_base = mono_string_new (domain, assembly->basedir);
-
- config_suffix = g_strconcat (assembly->aname.name, ".exe.config", NULL);
- str = g_build_filename (assembly->basedir, config_suffix, NULL);
- g_free (config_suffix);
- setup->configuration_file = mono_string_new (domain, str);
- g_free (str);
-}
-
MonoObject *
ves_icall_System_AppDomain_GetData (MonoAppDomain *ad, MonoString *name)
{
return add->domain;
}
+MonoAppDomain *
+ves_icall_System_AppDomain_getDomainByID (gint32 domain_id)
+{
+ MonoDomain *add = mono_domain_get_by_id (domain_id);
+
+ MONO_ARCH_SAVE_REGS;
+
+ return ((add == NULL) ? NULL : add->domain);
+}
+
MonoAppDomain *
ves_icall_System_AppDomain_createDomain (MonoString *friendly_name, MonoAppDomainSetup *setup)
{
mono_runtime_invoke (method, domain->domain, params, NULL);
}
+static gchar *
+reduce_path (const gchar *dirname)
+{
+ gchar **parts;
+ gchar *part;
+ GList *list, *tmp;
+ GString *result;
+ gchar *res;
+ gint i;
+
+ parts = g_strsplit (dirname, G_DIR_SEPARATOR_S, 0);
+ list = NULL;
+ for (i = 0; (part = parts [i]) != NULL; i++) {
+ if (!strcmp (part, "."))
+ continue;
+
+ if (!strcmp (part, "..")) {
+ if (list && list->next) /* Don't remove root */
+ list = g_list_delete_link (list, list);
+ } else {
+ list = g_list_prepend (list, part);
+ }
+ }
+
+ result = g_string_new ("");
+ list = g_list_reverse (list);
+
+ for (tmp = list; tmp; tmp = tmp->next) {
+ gchar *data = (gchar *) tmp->data;
+
+ if (data && *data) {
+#ifdef PLATFORM_WIN32
+ if (result->len == 0)
+ g_string_append_printf (result, "%s\\", data);
+ else if (result->str [result->len - 1] == '\\')
+ g_string_append_printf (result, "%s", data);
+ else
+#endif
+ g_string_append_printf (result, "%c%s",
+ G_DIR_SEPARATOR, data);
+ }
+ }
+
+ res = result->str;
+ g_string_free (result, FALSE);
+ g_list_free (list);
+ g_strfreev (parts);
+ return res;
+}
+
static void
set_domain_search_path (MonoDomain *domain)
{
gint npaths = 0;
gchar **pvt_split = NULL;
GError *error = NULL;
+ gint appbaselen = -1;
if ((domain->search_path != NULL) && !domain->setup->path_changed)
return;
setup = domain->setup;
- if (setup->application_base)
- npaths++;
+ if (!setup->application_base)
+ return; /* Must set application base to get private path working */
+ npaths++;
if (setup->private_bin_path) {
utf8 = mono_string_to_utf8 (setup->private_bin_path);
pvt_split = g_strsplit (utf8, G_SEARCHPATH_SEPARATOR_S, 1000);
domain->search_path = tmp = g_malloc ((npaths + 1) * sizeof (gchar *));
tmp [npaths] = NULL;
- if (setup->application_base) {
- *tmp = mono_string_to_utf8 (setup->application_base);
-
- /* FIXME: is this needed? */
- if (strncmp (*tmp, "file://", 7) == 0) {
- gchar *file = *tmp;
- gchar *uri = *tmp;
- gchar *tmpuri;
-
- if (uri [7] != '/')
- uri = g_strdup_printf ("file:///%s", uri + 7);
-
- tmpuri = uri;
- uri = mono_escape_uri_string (tmpuri);
- *tmp = g_filename_from_uri (uri, NULL, &error);
- g_free (uri);
-
- if (tmpuri != file)
- g_free (tmpuri);
-
- if (error != NULL) {
- g_warning ("%s\n", error->message);
- g_error_free (error);
- *tmp = file;
- } else {
- g_free (file);
- }
+
+ *tmp = mono_string_to_utf8 (setup->application_base);
+
+ /* FIXME: is this needed? */
+ if (strncmp (*tmp, "file://", 7) == 0) {
+ gchar *file = *tmp;
+ gchar *uri = *tmp;
+ gchar *tmpuri;
+
+ if (uri [7] != '/')
+ uri = g_strdup_printf ("file:///%s", uri + 7);
+
+ tmpuri = uri;
+ uri = mono_escape_uri_string (tmpuri);
+ *tmp = g_filename_from_uri (uri, NULL, &error);
+ g_free (uri);
+
+ if (tmpuri != file)
+ g_free (tmpuri);
+
+ if (error != NULL) {
+ g_warning ("%s\n", error->message);
+ g_error_free (error);
+ *tmp = file;
+ } else {
+ g_free (file);
}
-
- } else {
- *tmp = g_strdup ("");
}
for (i = 1; pvt_split && i < npaths; i++) {
- if (*tmp [0] == '\0' || g_path_is_absolute (pvt_split [i - 1])) {
+ if (g_path_is_absolute (pvt_split [i - 1])) {
tmp [i] = g_strdup (pvt_split [i - 1]);
- continue;
+ } else {
+ tmp [i] = g_build_filename (tmp [0], pvt_split [i - 1], NULL);
}
- tmp [i] = g_build_filename (tmp [0], pvt_split [i - 1], NULL);
+ if (strchr (tmp [i], '.')) {
+ gchar *reduced;
+ gchar *freeme;
+
+ reduced = reduce_path (tmp [i]);
+ if (appbaselen == -1)
+ appbaselen = strlen (tmp [0]);
+
+ if (strncmp (tmp [0], reduced, appbaselen)) {
+ g_free (reduced);
+ g_free (tmp [i]);
+ tmp [i] = g_strdup ("");
+ continue;
+ }
+
+ freeme = tmp [i];
+ tmp [i] = reduced;
+ g_free (freeme);
+ }
}
- if (setup->private_bin_path_probe != NULL && setup->application_base) {
+ if (setup->private_bin_path_probe != NULL) {
g_free (tmp [0]);
tmp [0] = g_strdup ("");
}
g_strfreev (pvt_split);
}
+static gboolean
+try_load_from (MonoAssembly **assembly, const gchar *path1, const gchar *path2,
+ const gchar *path3, const gchar *path4)
+{
+ gchar *fullpath;
+
+ *assembly = NULL;
+ fullpath = g_build_filename (path1, path2, path3, path4, NULL);
+ if (g_file_test (fullpath, G_FILE_TEST_IS_REGULAR))
+ *assembly = mono_assembly_open (fullpath, NULL);
+
+ g_free (fullpath);
+ return (*assembly != NULL);
+}
+
static MonoAssembly *
-real_load (gchar **search_path, const gchar *culture, gchar *filename)
+real_load (gchar **search_path, const gchar *culture, const gchar *name)
{
- MonoAssembly *result;
+ MonoAssembly *result = NULL;
gchar **path;
- gchar *fullpath;
+ gchar *filename;
+ const gchar *local_culture;
+ gint len;
+
+ if (!culture || *culture == '\0') {
+ local_culture = "";
+ } else {
+ local_culture = culture;
+ }
+
+ filename = g_strconcat (name, ".dll", NULL);
+ len = strlen (filename);
for (path = search_path; *path; path++) {
if (**path == '\0')
continue; /* Ignore empty ApplicationBase */
- if (culture && *culture != '\0') /* !neutral */
- fullpath = g_build_filename (*path, culture, filename, NULL);
- else
- fullpath = g_build_filename (*path, filename, NULL);
-
- result = mono_assembly_open (fullpath, NULL);
- g_free (fullpath);
- if (result)
- return result;
+ /* See test cases in bug #58992 and bug #57710 */
+ /* 1st try: [culture]/[name].dll (culture may be empty) */
+ strcpy (filename + len - 4, ".dll");
+ if (try_load_from (&result, *path, local_culture, "", filename))
+ break;
+
+ /* 2nd try: [culture]/[name].exe (culture may be empty) */
+ strcpy (filename + len - 4, ".exe");
+ if (try_load_from (&result, *path, local_culture, "", filename))
+ break;
+
+ /* 3rd try: [culture]/[name]/[name].dll (culture may be empty) */
+ strcpy (filename + len - 4, ".dll");
+ if (try_load_from (&result, *path, local_culture, name, filename))
+ break;
+
+ /* 4th try: [culture]/[name]/[name].exe (culture may be empty) */
+ strcpy (filename + len - 4, ".exe");
+ if (try_load_from (&result, *path, local_culture, name, filename))
+ break;
}
- return NULL;
+ g_free (filename);
+ return result;
}
/*
gpointer user_data)
{
MonoDomain *domain = mono_domain_get ();
- MonoAssembly *result;
- gchar *dll, *exe;
+ MonoAssembly *result = NULL;
set_domain_search_path (domain);
- dll = g_strconcat (aname->name, ".dll", NULL);
- exe = g_strdup (dll);
- strcpy (exe + strlen (exe) - 4, ".exe");
-
if (domain->search_path && domain->search_path [0] != NULL) {
- /* TODO: should also search in name/name.dll and name/name.exe from appbase */
- result = real_load (domain->search_path, aname->culture, dll);
- if (result) {
- g_free (dll);
- g_free (exe);
- return result;
- }
-
- result = real_load (domain->search_path, aname->culture, exe);
- if (result) {
- g_free (dll);
- g_free (exe);
- return result;
- }
+ result = real_load (domain->search_path, aname->culture, aname->name);
}
- if (assemblies_path && assemblies_path [0] != NULL) {
- result = real_load (assemblies_path, aname->culture, dll);
- if (result) {
- g_free (dll);
- g_free (exe);
- return result;
- }
-
- result = real_load (assemblies_path, aname->culture, exe);
- if (result) {
- g_free (dll);
- g_free (exe);
- return result;
- }
+ if (result == NULL && assemblies_path && assemblies_path [0] != NULL) {
+ result = real_load (assemblies_path, aname->culture, aname->name);
}
-
- g_free (dll);
- g_free (exe);
+
return NULL;
}
if (!g_ascii_strncasecmp (value, "PublicKeyToken=", 15)) {
tmp++;
value += 15;
- if (*value && strcmp (value, "null")) {
+ if (*value && strncmp (value, "null", 4)) {
gchar *t = g_strdup (value);
g_strchug (t);
- aname->public_tok_value = g_strdup (g_strchomp (value));
+ g_strlcpy (aname->public_key_token, g_strchomp (value), MONO_PUBLIC_KEY_TOKEN_LENGTH);
g_free (t);
- continue;
}
+ continue;
}
g_strfreev (parts);
MonoArray *raw_symbol_store, MonoObject *evidence)
{
MonoAssembly *ass;
+ MonoReflectionAssembly *refass = NULL;
MonoDomain *domain = ad->data;
MonoImageOpenStatus status;
guint32 raw_assembly_len = mono_array_length (raw_assembly);
return NULL;
}
- return mono_assembly_get_object (domain, ass);
+ refass = mono_assembly_get_object (domain, ass);
+ refass->evidence = evidence;
+ return refass;
}
MonoReflectionAssembly *
MONO_ARCH_SAVE_REGS;
- /* FIXME : examine evidence? */
-
g_assert (assRef != NULL);
if (!get_info_from_assembly_name (assRef, &aname)) {
mono_raise_exception (exc);
}
- if (refass != NULL)
- return refass;
+ if (refass == NULL)
+ refass = mono_assembly_get_object (domain, ass);
- return mono_assembly_get_object (domain, ass);
+ refass->evidence = evidence;
+ return refass;
}
void
mono_raise_exception (exc);
}
- if (domain == mono_root_domain) {
+ if (domain == mono_get_root_domain ()) {
mono_raise_exception (mono_get_exception_cannot_unload_appdomain ("The default appdomain can not be unloaded."));
return;
}
* Unloading seems to cause problems when running NUnit/NAnt, hence
* this workaround.
*/
- if (getenv ("MONO_NO_UNLOAD"))
+ if (g_getenv ("MONO_NO_UNLOAD"))
return;
mono_domain_unload (domain);
MonoMethod *method;
char *filename;
gint32 res;
+ MonoReflectionAssembly *refass;
MONO_ARCH_SAVE_REGS;
if (!args)
args = (MonoArray *) mono_array_new (ad->data, mono_defaults.string_class, 0);
+ refass = mono_assembly_get_object (ad->data, assembly);
+ refass->evidence = evidence;
+
res = mono_runtime_exec_main (method, (MonoArray *)args, NULL);
return res;
MonoString *
ves_icall_System_AppDomain_InternalGetProcessGuid (MonoString* newguid)
{
+ MonoDomain* mono_root_domain = mono_get_root_domain ();
mono_domain_lock (mono_root_domain);
if (process_guid_set) {
mono_domain_unlock (mono_root_domain);
domain->state = MONO_APPDOMAIN_UNLOADED;
- //printf ("UNLOADED %s.\n", domain->friendly_name);
+ /* printf ("UNLOADED %s.\n", domain->friendly_name); */
mono_domain_free (domain, FALSE);
{
HANDLE thread_handle;
guint32 tid;
- gboolean ret;
MonoAppDomainState prev_state;
MonoMethod *method;
MonoObject *exc;
unload_data thread_data;
- //printf ("UNLOAD STARTING FOR %s.\n", domain->friendly_name);
+ /* printf ("UNLOAD STARTING FOR %s.\n", domain->friendly_name); */
/* Atomically change our state to UNLOADING */
prev_state = InterlockedCompareExchange (&domain->state,
*/
#if 0
thread_handle = CreateThread (NULL, 0, unload_thread_main, &thread_data, 0, &tid);
+#else
+#if defined(PLATFORM_WIN32) && defined (HAVE_GC_BOEHM)
+ thread_handle = GC_CreateThread (NULL, 0, unload_thread_main, &thread_data, CREATE_SUSPENDED, &tid);
#else
thread_handle = CreateThread (NULL, 0, unload_thread_main, &thread_data, CREATE_SUSPENDED, &tid);
+#endif
ResumeThread (thread_handle);
#endif
- ret = WaitForSingleObject (thread_handle, INFINITE);
+
+ while (WaitForSingleObjectEx (thread_handle, INFINITE, FALSE) == WAIT_IO_COMPLETION)
+ ; /* wait for the thread */
+
if (thread_data.failure_reason) {
MonoException *ex;