Mon Mar 25 13:04:56 CET 2002 Paolo Molaro <lupus@ximian.com>

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

diff --git a/mono/metadata/appdomain.c b/mono/metadata/appdomain.c
index d2c381d55a9b3ac2dedc9ad14f8fcbf3dcafbfef..c2623daad31b2d1a8ac3b8ab884d7095e25daf0c 100644 (file)
--- a/mono/metadata/appdomain.c
+++ b/mono/metadata/appdomain.c
@@ -121,6 +121,13 @@ ldstr_equal (const char *str1, const char *str2) {
        return memcmp (str1, str2, len) == 0;
 }
 
+#if HAVE_BOEHM_GC
+static void
+domain_finalizer (void *obj, void *data) {
+       g_print ("domain finalized\n");
+}
+#endif
+
 static MonoDomain *
 mono_create_domain ()
 {
@@ -128,6 +135,7 @@ mono_create_domain ()
 
 #if HAVE_BOEHM_GC
        domain = GC_malloc (sizeof (MonoDomain));
+       GC_register_finalizer (domain, domain_finalizer, NULL, NULL, NULL);
 #else
        domain = g_new0 (MonoDomain, 1);
 #endif
@@ -138,9 +146,9 @@ mono_create_domain ()
        domain->mp = mono_mempool_new ();
        domain->env = g_hash_table_new (g_str_hash, g_str_equal);
        domain->assemblies = g_hash_table_new (g_str_hash, g_str_equal);
-       domain->class_vtable_hash = g_hash_table_new (NULL, NULL);
+       domain->class_vtable_hash = mono_g_hash_table_new (NULL, NULL);
        domain->jit_code_hash = g_hash_table_new (NULL, NULL);
-       domain->ldstr_table = g_hash_table_new ((GHashFunc)ldstr_hash, (GCompareFunc)ldstr_equal);
+       domain->ldstr_table = mono_g_hash_table_new ((GHashFunc)ldstr_hash, (GCompareFunc)ldstr_equal);
        domain->jit_info_table = mono_jit_info_table_new ();
        return domain;
 }
@@ -279,7 +287,8 @@ mono_init (const char *filename)
        g_assert (mono_defaults.multicastdelegate_class != 0 );
 
        mono_defaults.asyncresult_class = mono_class_from_name (
-               mono_defaults.corlib, "System", "MonoAsyncResult");
+               mono_defaults.corlib, "System.Runtime.Remoting.Messaging", 
+               "AsyncResult");
        g_assert (mono_defaults.asyncresult_class != 0 );
 
        mono_defaults.waithandle_class = mono_class_from_name (
@@ -306,6 +315,9 @@ mono_init (const char *filename)
                 mono_defaults.corlib, "System", "Exception");
        g_assert (mono_defaults.exception_class != 0);
 
+       mono_defaults.thread_class = mono_class_from_name (
+                mono_defaults.corlib, "System.Threading", "Thread");
+       g_assert (mono_defaults.thread_class != 0);
 
        class = mono_class_from_name (mono_defaults.corlib, "System", "AppDomainSetup");
        setup = (MonoAppDomainSetup *) mono_object_new (domain, class);
@@ -643,9 +655,9 @@ mono_domain_unload (MonoDomain *domain, gboolean force)
 
        g_hash_table_destroy (domain->env);
        g_hash_table_destroy (domain->assemblies);
-       g_hash_table_destroy (domain->class_vtable_hash);
+       mono_g_hash_table_destroy (domain->class_vtable_hash);
        g_hash_table_destroy (domain->jit_code_hash);
-       g_hash_table_destroy (domain->ldstr_table);
+       mono_g_hash_table_destroy (domain->ldstr_table);
        mono_jit_info_table_free (domain->jit_info_table);
        mono_mempool_destroy (domain->mp);