Merge pull request #1698 from ludovic-henry/socket-reorg-2

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

diff --git a/mono/metadata/domain.c b/mono/metadata/domain.c
index 1b0f53daee7693c4823857c52528eec994b43bd6..d2d92fd51c9868342956d7ca8876457c1d0fca8f 100755 (executable)
--- a/mono/metadata/domain.c
+++ b/mono/metadata/domain.c
@@ -713,6 +713,10 @@ mono_init_internal (const char *filename, const char *exe_filename, const char *
                 mono_defaults.corlib, "System", "MonoType");
        g_assert (mono_defaults.monotype_class != 0);
 
+       mono_defaults.runtimetype_class = mono_class_from_name (
+                mono_defaults.corlib, "System", "RuntimeType");
+       g_assert (mono_defaults.runtimetype_class != 0);
+
        mono_defaults.exception_class = mono_class_from_name (
                 mono_defaults.corlib, "System", "Exception");
        g_assert (mono_defaults.exception_class != 0);
@@ -1915,3 +1919,17 @@ mono_get_aot_cache_config (void)
 {
        return &aot_cache_config;
 }
+
+void
+mono_domain_lock (MonoDomain *domain)
+{
+       MONO_PREPARE_BLOCKING
+       mono_locks_acquire (&(domain)->lock, DomainLock);
+       MONO_FINISH_BLOCKING
+}
+
+void
+mono_domain_unlock (MonoDomain *domain)
+{
+       mono_locks_release (&(domain)->lock, DomainLock);
+}