2004-09-07 Atsushi Enomoto <atsushi@ximian.com>

[mono.git] / mono / metadata / appdomain.c

diff --git a/mono/metadata/appdomain.c b/mono/metadata/appdomain.c
index 7ddf4e3c05408739e9fa33881f98dec52635717f..90dbf53ffb00f513de731bcc79760c13051ae28e 100644 (file)
--- a/mono/metadata/appdomain.c
+++ b/mono/metadata/appdomain.c
@@ -17,6 +17,7 @@
 
 #include <mono/metadata/object.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>
@@ -26,7 +27,7 @@
 #include <mono/metadata/marshal.h>
 #include <mono/utils/mono-uri.h>
 
-#define MONO_CORLIB_VERSION 22
+#define MONO_CORLIB_VERSION 24
 
 CRITICAL_SECTION mono_delegate_section;
 
@@ -70,6 +71,7 @@ mono_runtime_init (MonoDomain *domain, MonoThreadStartCB start_cb,
        MonoClass *class;
        MonoString *arg;
        
+       MONO_GC_PRE_INIT ();
        mono_marshal_init ();
        
        mono_install_assembly_preload_hook (mono_domain_assembly_preload, NULL);
@@ -185,7 +187,7 @@ void
 mono_runtime_quit ()
 {
        if (quit_function != NULL)
-               quit_function (mono_root_domain, NULL);
+               quit_function (mono_get_root_domain (), NULL);
 }
 
 gboolean
@@ -356,6 +358,16 @@ ves_icall_System_AppDomain_getCurDomain ()
        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)
 {
@@ -546,9 +558,17 @@ reduce_path (const gchar *dirname)
        for (tmp = list; tmp; tmp = tmp->next) {
                gchar *data = (gchar *) tmp->data;
 
-               if (data && *data)
-                       g_string_append_printf (result, "%c%s", G_DIR_SEPARATOR,
-                                                               (char *) 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;
@@ -633,7 +653,12 @@ set_domain_search_path (MonoDomain *domain)
        }
 
        for (i = 1; pvt_split && i < npaths; i++) {
-               tmp [i] = g_build_filename (tmp [0], pvt_split [i - 1], NULL);
+               if (g_path_is_absolute (pvt_split [i - 1])) {
+                       tmp [i] = g_strdup (pvt_split [i - 1]);
+               } else {
+                       tmp [i] = g_build_filename (tmp [0], pvt_split [i - 1], NULL);
+               }
+
                if (strchr (tmp [i], '.')) {
                        gchar *reduced;
                        gchar *freeme;
@@ -791,7 +816,6 @@ free_assembly_name (MonoAssemblyName *aname)
        g_free ((void *) aname->name);
        g_free ((void *) aname->culture);
        g_free ((void *) aname->hash_value);
-       g_free ((void *) aname->public_tok_value);
 }
 
 static gboolean
@@ -858,7 +882,7 @@ get_info_from_assembly_name (MonoString *assRef, MonoAssemblyName *aname)
                        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;
@@ -878,6 +902,7 @@ ves_icall_System_AppDomain_LoadAssemblyRaw (MonoAppDomain *ad,
                                                                                        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);
@@ -899,7 +924,9 @@ ves_icall_System_AppDomain_LoadAssemblyRaw (MonoAppDomain *ad,
                return NULL; 
        }
 
-       return mono_assembly_get_object (domain, ass); 
+       refass = mono_assembly_get_object (domain, ass);
+       refass->evidence = evidence;
+       return refass;
 }
 
 MonoReflectionAssembly *
@@ -913,8 +940,6 @@ ves_icall_System_AppDomain_LoadAssembly (MonoAppDomain *ad,  MonoString *assRef,
 
        MONO_ARCH_SAVE_REGS;
 
-       /* FIXME : examine evidence? */
-
        g_assert (assRef != NULL);
 
        if (!get_info_from_assembly_name (assRef, &aname)) {
@@ -935,10 +960,11 @@ ves_icall_System_AppDomain_LoadAssembly (MonoAppDomain *ad,  MonoString *assRef,
                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
@@ -953,7 +979,7 @@ ves_icall_System_AppDomain_InternalUnload (gint32 domain_id)
                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;
        }
@@ -988,6 +1014,7 @@ ves_icall_System_AppDomain_ExecuteAssembly (MonoAppDomain *ad, MonoString *file,
        MonoMethod *method;
        char *filename;
        gint32 res;
+       MonoReflectionAssembly *refass;
 
        MONO_ARCH_SAVE_REGS;
 
@@ -1010,6 +1037,9 @@ ves_icall_System_AppDomain_ExecuteAssembly (MonoAppDomain *ad, MonoString *file,
        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;
@@ -1114,6 +1144,7 @@ ves_icall_System_AppDomain_InternalSetContext (MonoAppContext *mc)
 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);
@@ -1180,7 +1211,7 @@ unload_thread_main (void *arg)
 
        domain->state = MONO_APPDOMAIN_UNLOADED;
 
-       //printf ("UNLOADED %s.\n", domain->friendly_name);
+       /* printf ("UNLOADED %s.\n", domain->friendly_name); */
 
        mono_domain_free (domain, FALSE);
 
@@ -1210,7 +1241,7 @@ mono_domain_unload (MonoDomain *domain)
        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,
@@ -1252,8 +1283,12 @@ mono_domain_unload (MonoDomain *domain)
         */ 
 #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