*
* (c) 2001-2003 Ximian, Inc. (http://www.ximian.com)
*/
-
+#undef ASSEMBLY_LOAD_DEBUG
#include <config.h>
#include <glib.h>
#include <string.h>
+#include <unistd.h>
#include <mono/os/gc_wrapper.h>
#include <mono/metadata/marshal.h>
#include <mono/metadata/monitor.h>
#include <mono/metadata/threadpool.h>
+#include <mono/metadata/mono-debug.h>
#include <mono/utils/mono-uri.h>
+#include <mono/utils/mono-logger.h>
+#include <mono/utils/mono-path.h>
+#include <mono/utils/mono-stdlib.h>
-#define MONO_CORLIB_VERSION 41
+#define MONO_CORLIB_VERSION 54
CRITICAL_SECTION mono_delegate_section;
/* This ends up calling any pending pending (for at most 2 seconds) */
mono_gc_cleanup ();
+ mono_thread_cleanup ();
+
mono_network_cleanup ();
+
+ mono_marshal_cleanup ();
+
+ mono_type_initialization_cleanup ();
+
+ mono_monitor_cleanup ();
}
static MonoDomainFunc quit_function = NULL;
MonoObject *
ves_icall_System_AppDomain_GetData (MonoAppDomain *ad, MonoString *name)
{
- MonoDomain *add = ad->data;
+ MonoDomain *add;
MonoObject *o;
char *str;
MONO_ARCH_SAVE_REGS;
g_assert (ad != NULL);
+ add = ad->data;
+ g_assert (add != NULL);
if (name == NULL)
mono_raise_exception (mono_get_exception_argument_null ("name"));
void
ves_icall_System_AppDomain_SetData (MonoAppDomain *ad, MonoString *name, MonoObject *data)
{
- MonoDomain *add = ad->data;
+ MonoDomain *add;
MONO_ARCH_SAVE_REGS;
g_assert (ad != NULL);
+ add = ad->data;
+ g_assert (add != NULL);
if (name == NULL)
mono_raise_exception (mono_get_exception_argument_null ("name"));
MonoAppDomain *
ves_icall_System_AppDomain_createDomain (MonoString *friendly_name, MonoAppDomainSetup *setup)
{
- MonoDomain *domain = mono_domain_get ();
MonoClass *adclass;
MonoAppDomain *ad;
MonoDomain *data;
- GSList *tmp;
MONO_ARCH_SAVE_REGS;
if (!setup->application_base) {
/* Inherit from the root domain since MS.NET does this */
MonoDomain *root = mono_get_root_domain ();
- setup->application_base = mono_string_new_utf16 (data, mono_string_chars (root->setup->application_base), mono_string_length (root->setup->application_base));
+ if (root->setup->application_base)
+ MONO_OBJECT_SETREF (setup, application_base, mono_string_new_utf16 (data, mono_string_chars (root->setup->application_base), mono_string_length (root->setup->application_base)));
}
mono_context_init (data);
- /* The new appdomain should have all assemblies loaded */
- mono_domain_assemblies_lock (domain);
- /*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_assemblies_unlock (domain);
+ add_assemblies_to_domain (data, mono_defaults.corlib->assembly, NULL);
return ad;
}
continue;
if (ass->corlib_internal)
continue;
- mono_array_set (res, gpointer, i, mono_assembly_get_object (domain, ass));
+ mono_array_setref (res, i, mono_assembly_get_object (domain, ass));
++i;
}
mono_domain_assemblies_unlock (domain);
mono_assembly_addref (ass);
g_hash_table_insert (ht, ass, ass);
domain->domain_assemblies = g_slist_prepend (domain->domain_assemblies, ass);
+ mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, "Assembly %s %p added to domain %s, ref_count=%d\n", ass->aname.name, ass, domain->friendly_name, ass->ref_count);
}
if (ass->image->references) {
if (!domain->domain)
/* This can happen during startup */
return;
-
+#ifdef ASSEMBLY_LOAD_DEBUG
+ fprintf (stderr, "Loading %s into domain %s\n", assembly->aname.name, domain->friendly_name);
+#endif
klass = domain->domain->mbr.obj.vtable->klass;
mono_domain_assemblies_lock (domain);
mono_runtime_invoke (assembly_load_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)
{
gchar *reduced;
gchar *freeme;
- reduced = reduce_path (tmp [i]);
+ reduced = mono_path_canonicalize (tmp [i]);
if (appbaselen == -1)
appbaselen = strlen (tmp [0]);
g_strfreev (pvt_split);
}
+static char *
+make_shadow_copy (const char *filename)
+{
+ gchar *tmp;
+ guint16 *orig, *dest;
+ MonoDomain *domain = mono_domain_get ();
+ char *db;
+ int fd;
+ gboolean copy_result;
+ MonoException *exc;
+
+ db = mono_string_to_utf8 (domain->setup->dynamic_base);
+ tmp = g_build_filename (db, "shadow-XXXXXX", NULL);
+ fd = mono_mkstemp (tmp);
+ if (fd == -1) {
+ exc = mono_get_exception_execution_engine ("Failed to create shadow copy (mkstemp).");
+ g_free (tmp);
+ g_free (db);
+ mono_raise_exception (exc);
+ }
+ close (fd);
+ remove (tmp);
+ orig = g_utf8_to_utf16 (filename, strlen (filename), NULL, NULL, NULL);
+ dest = g_utf8_to_utf16 (tmp, strlen (tmp), NULL, NULL, NULL);
+ copy_result = CopyFile (orig, dest, TRUE);
+ g_free (dest);
+ g_free (orig);
+ g_free (db);
+
+ if (copy_result == FALSE) {
+ g_free (tmp);
+ exc = mono_get_exception_execution_engine ("Failed to create shadow copy (CopyFile).");
+ mono_raise_exception (exc);
+ }
+ return tmp;
+}
+
static gboolean
try_load_from (MonoAssembly **assembly, const gchar *path1, const gchar *path2,
- const gchar *path3, const gchar *path4, gboolean refonly)
+ const gchar *path3, const gchar *path4,
+ gboolean refonly, gboolean is_private)
{
+
gchar *fullpath;
*assembly = NULL;
fullpath = g_build_filename (path1, path2, path3, path4, NULL);
- if (g_file_test (fullpath, G_FILE_TEST_IS_REGULAR))
+ if (g_file_test (fullpath, G_FILE_TEST_IS_REGULAR)) {
+ if (is_private) {
+ char *new_path = make_shadow_copy (fullpath);
+ g_free (fullpath);
+ fullpath = new_path;
+ }
+
*assembly = mono_assembly_open_full (fullpath, NULL, refonly);
+ }
g_free (fullpath);
return (*assembly != NULL);
gchar *filename;
const gchar *local_culture;
gint len;
+ gboolean is_private = FALSE;
if (!culture || *culture == '\0') {
local_culture = "";
len = strlen (filename);
for (path = search_path; *path; path++) {
- if (**path == '\0')
+ if (**path == '\0') {
+ is_private = TRUE;
continue; /* Ignore empty ApplicationBase */
+ }
/* 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, refonly))
+ if (try_load_from (&result, *path, local_culture, "", filename, refonly, is_private))
break;
/* 2nd try: [culture]/[name].exe (culture may be empty) */
strcpy (filename + len - 4, ".exe");
- if (try_load_from (&result, *path, local_culture, "", filename, refonly))
+ if (try_load_from (&result, *path, local_culture, "", filename, refonly, is_private))
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, refonly))
+ if (try_load_from (&result, *path, local_culture, name, filename, refonly, is_private))
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, refonly))
+ if (try_load_from (&result, *path, local_culture, name, filename, refonly, is_private))
break;
}
ass = mono_assembly_open_full (filename, &status, refOnly);
- g_free (name);
-
if (!ass){
- MonoException *exc = mono_get_exception_file_not_found (fname);
+ MonoException *exc;
+
+ if (status == MONO_IMAGE_IMAGE_INVALID)
+ exc = mono_get_exception_bad_image_format2 (NULL, fname);
+ else
+ exc = mono_get_exception_file_not_found2 (NULL, fname);
+ g_free (name);
mono_raise_exception (exc);
}
+ g_free (name);
+
return mono_assembly_get_object (domain, ass);
}
guint32 raw_assembly_len = mono_array_length (raw_assembly);
MonoImage *image = mono_image_open_from_data_full (mono_array_addr (raw_assembly, gchar, 0), raw_assembly_len, TRUE, NULL, refonly);
- if (raw_symbol_store)
- mono_raise_exception (mono_get_exception_not_implemented ("LoadAssemblyRaw: Raw Symbol Store not Implemented"));
-
if (!image) {
mono_raise_exception (mono_get_exception_bad_image_format (""));
return NULL;
}
+ if (raw_symbol_store != NULL)
+ mono_debug_init_2_memory (image, mono_array_addr (raw_symbol_store, guint8, 0), mono_array_length (raw_symbol_store));
+
ass = mono_assembly_load_from_full (image, "", &status, refonly);
+
if (!ass) {
mono_image_close (image);
mono_raise_exception (mono_get_exception_bad_image_format (""));
}
refass = mono_assembly_get_object (domain, ass);
- refass->evidence = evidence;
+ MONO_OBJECT_SETREF (refass, evidence, evidence);
return refass;
}
MonoException *exc;
/* This is a parse error... */
- exc = mono_get_exception_file_not_found (assRef);
+ exc = mono_get_exception_file_not_found2 (NULL, assRef);
mono_raise_exception (exc);
}
if (!ass && (refass = try_assembly_resolve (domain, assRef, refOnly)) == NULL){
/* FIXME: it doesn't make much sense since we really don't have a filename ... */
- MonoException *exc = mono_get_exception_file_not_found (assRef);
+ MonoException *exc = mono_get_exception_file_not_found2 (NULL, assRef);
mono_raise_exception (exc);
}
if (refass == NULL)
refass = mono_assembly_get_object (domain, ass);
- refass->evidence = evidence;
+ MONO_OBJECT_SETREF (refass, evidence, evidence);
return refass;
}
g_free (filename);
if (!assembly)
- mono_raise_exception (mono_get_exception_file_not_found (file));
+ mono_raise_exception (mono_get_exception_file_not_found2 (NULL, file));
image = assembly->image;
args = (MonoArray *) mono_array_new (ad->data, mono_defaults.string_class, 0);
refass = mono_assembly_get_object (ad->data, assembly);
- refass->evidence = evidence;
+ MONO_OBJECT_SETREF (refass, evidence, evidence);
res = mono_runtime_exec_main (method, (MonoArray *)args, NULL);
/* printf ("UNLOADED %s.\n", domain->friendly_name); */
+ /* remove from the handle table the items related to this domain */
+ mono_gchandle_free_domain (domain);
+
mono_domain_free (domain, FALSE);
mono_gc_collect (mono_gc_max_generation ());
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 */
+ CloseHandle (thread_handle);
return;
}
+ CloseHandle (thread_handle);
mono_domain_set (caller_domain, FALSE);
projects / mono.git / blobdiff