#include <mono/metadata/threads-types.h>
#include <mono/metadata/tokentype.h>
#include <mono/utils/mono-uri.h>
-#include <mono/utils/mono-logger.h>
+#include <mono/utils/mono-logger-internal.h>
#include <mono/utils/mono-path.h>
#include <mono/utils/mono-stdlib.h>
#include <mono/utils/mono-io-portability.h>
* Changes which are already detected at runtime, like the addition
* of icalls, do not require an increment.
*/
-#define MONO_CORLIB_VERSION 86
+#define MONO_CORLIB_VERSION 91
typedef struct
{
int runtime_count;
int assemblybinding_count;
MonoDomain *domain;
+ gchar *filename;
} RuntimeConfig;
CRITICAL_SECTION mono_delegate_section;
return load_function (filename, runtime_version);
}
-/*
+/**
* mono_runtime_set_no_exec:
*
- * Instructs the runtime to operate in static mode, i.e. avoid/do not allow managed
- * code execution. This is useful for running the AOT compiler on platforms which
- * allow full-aot execution only.
- * This should be called before mono_runtime_init ().
+ * Instructs the runtime to operate in static mode, i.e. avoid/do not
+ * allow managed code execution. This is useful for running the AOT
+ * compiler on platforms which allow full-aot execution only. This
+ * should be called before mono_runtime_init ().
*/
void
mono_runtime_set_no_exec (gboolean val)
no_exec = val;
}
+/**
+ * mono_runtime_get_no_exec:
+ *
+ * If true, then the runtime will not allow managed code execution.
+ */
gboolean
mono_runtime_get_no_exec (void)
{
}
static void
-create_exceptions (MonoDomain *domain)
+create_domain_objects (MonoDomain *domain)
{
+ MonoDomain *old_domain = mono_domain_get ();
MonoString *arg;
+ if (domain != old_domain) {
+ mono_thread_push_appdomain_ref (domain);
+ mono_domain_set_internal_with_options (domain, FALSE);
+ }
+
/*
* Create an instance early since we can't do it when there is no memory.
*/
arg = mono_string_new (domain, "Out of memory");
domain->out_of_memory_ex = mono_exception_from_name_two_strings (mono_defaults.corlib, "System", "OutOfMemoryException", arg, NULL);
-
+
/*
* These two are needed because the signal handlers might be executing on
* an alternate stack, and Boehm GC can't handle that.
arg = mono_string_new (domain, "The requested operation caused a stack overflow.");
domain->stack_overflow_ex = mono_exception_from_name_two_strings (mono_defaults.corlib, "System", "StackOverflowException", arg, NULL);
+ /*The ephemeron tombstone i*/
+ domain->ephemeron_tombstone = mono_object_new (domain, mono_defaults.object_class);
+
+ if (domain != old_domain) {
+ mono_thread_pop_appdomain_ref ();
+ mono_domain_set_internal_with_options (old_domain, FALSE);
+ }
+
/*
* This class is used during exception handling, so initialize it here, to prevent
* stack overflows while handling stack overflows.
mono_type_initialization_init ();
if (!mono_runtime_get_no_exec ())
- create_exceptions (domain);
+ create_domain_objects (domain);
/* GC init has to happen after thread init */
mono_gc_init ();
return *(gint32*)((gchar*)value + sizeof (MonoObject));
}
+/**
+ * mono_check_corlib_version
+ *
+ * Checks that the corlib that is loaded matches the version of this runtime.
+ *
+ * Returns: NULL if the runtime will work with the corlib, or a g_malloc
+ * allocated string with the error otherwise.
+ */
const char*
mono_check_corlib_version (void)
{
return NULL;
}
+/**
+ * mono_context_init:
+ * @domain: The domain where the System.Runtime.Remoting.Context.Context is initialized
+ *
+ * Initializes the @domain's default System.Runtime.Remoting's Context.
+ */
void
mono_context_init (MonoDomain *domain)
{
mono_type_initialization_cleanup ();
mono_monitor_cleanup ();
-
-#ifndef HOST_WIN32
- _wapi_cleanup ();
-#endif
}
static MonoDomainFunc quit_function = NULL;
mono_context_init (data);
+ data->setup = copy_app_domain_setup (data, setup);
mono_set_private_bin_path_from_config (data);
-
add_assemblies_to_domain (data, mono_defaults.corlib->assembly, NULL);
- data->setup = copy_app_domain_setup (data, setup);
-
#ifndef DISABLE_SHADOW_COPY
/*FIXME, guard this for when the debugger is not running */
shadow_location = get_shadow_assembly_location_base (data, &error);
g_free (shadow_location);
#endif
- create_exceptions (data);
+ create_domain_objects (data);
return ad;
}
g_assert (field);
}
+ /*pedump doesn't create an appdomin, so the domain object doesn't exist.*/
+ if (!domain->domain)
+ return FALSE;
+
mono_field_get_value ((MonoObject*)(domain->domain), field, &o);
return o != NULL;
}
runtime_config->assemblybinding_count--;
}
+static void
+parse_error (GMarkupParseContext *context, GError *error, gpointer user_data)
+{
+ RuntimeConfig *state = user_data;
+ const gchar *msg;
+ const gchar *filename;
+
+ filename = state && state->filename ? (gchar *) state->filename : "<unknown>";
+ msg = error && error->message ? error->message : "";
+ g_warning ("Error parsing %s: %s", filename, msg);
+}
+
static const GMarkupParser
mono_parser = {
start_element,
end_element,
NULL,
NULL,
- NULL
+ parse_error
};
void
gsize len;
GMarkupParseContext *context;
RuntimeConfig runtime_config;
+ gint offset;
if (!domain || !domain->setup || !domain->setup->configuration_file)
return;
g_free (config_file);
return;
}
- g_free (config_file);
runtime_config.runtime_count = 0;
runtime_config.assemblybinding_count = 0;
runtime_config.domain = domain;
+ runtime_config.filename = config_file;
+ offset = 0;
+ if (len > 3 && text [0] == '\xef' && text [1] == (gchar) '\xbb' && text [2] == '\xbf')
+ offset = 3; /* Skip UTF-8 BOM */
+
context = g_markup_parse_context_new (&mono_parser, 0, &runtime_config, NULL);
- if (g_markup_parse_context_parse (context, text, len, NULL))
+ if (g_markup_parse_context_parse (context, text + offset, len - offset, NULL))
g_markup_parse_context_end_parse (context, NULL);
g_markup_parse_context_free (context);
g_free (text);
+ g_free (config_file);
}
MonoAppDomain *
MonoReflectionAssembly *assembly;
MonoDomain *domain = mono_domain_get ();
char *aname_str;
+ MonoString *str;
aname_str = mono_stringify_assembly_name (aname);
/* FIXME: We invoke managed code here, so there is a potential for deadlocks */
- assembly = mono_try_assembly_resolve (domain, mono_string_new (domain, aname_str), refonly);
-
+ str = mono_string_new (domain, aname_str);
+ if (!str) {
+ g_free (aname_str);
+ return NULL;
+ }
+ assembly = mono_try_assembly_resolve (domain, str, refonly);
g_free (aname_str);
if (assembly)
gboolean copy_result;
strcpy (src + srclen - tail_len, extension);
- if (!g_file_test (src, G_FILE_TEST_IS_REGULAR))
+
+ if (IS_PORTABILITY_CASE) {
+ gchar *file = mono_portability_find_file (src, TRUE);
+
+ if (file == NULL)
+ return TRUE;
+
+ g_free (file);
+ } else if (!g_file_test (src, G_FILE_TEST_IS_REGULAR)) {
return TRUE;
+ }
+
orig = g_utf8_to_utf16 (src, strlen (src), NULL, NULL, NULL);
strcpy (target + targetlen - tail_len, extension);
DeleteFile (dest);
copy_result = CopyFile (orig, dest, FALSE);
+
+ /* Fix for bug #556884 - make sure the files have the correct mode so that they can be
+ * overwritten when updated in their original locations. */
+ if (copy_result)
+ copy_result = SetFileAttributes (dest, FILE_ATTRIBUTE_NORMAL);
+
g_free (orig);
g_free (dest);
mono_is_shadow_copy_enabled (MonoDomain *domain, const gchar *dir_name)
{
MonoError error;
- const char *version;
MonoAppDomainSetup *setup;
gchar *all_dirs;
gchar **dir_ptr;
if (setup == NULL || setup->shadow_copy_files == NULL)
return FALSE;
- version = mono_get_runtime_info ()->framework_version;
-
- /* For 1.x, not NULL is enough. In 2.0 it has to be "true" */
- if (*version <= '1') {
- shadow_enabled = TRUE;
- } else {
- shadow_status_string = mono_string_to_utf8_checked (setup->shadow_copy_files, &error);
- if (!mono_error_ok (&error)) {
- mono_error_cleanup (&error);
- return FALSE;
- }
- shadow_enabled = !g_ascii_strncasecmp (shadow_status_string, "true", 4);
- g_free (shadow_status_string);
+ shadow_status_string = mono_string_to_utf8_checked (setup->shadow_copy_files, &error);
+ if (!mono_error_ok (&error)) {
+ mono_error_cleanup (&error);
+ return FALSE;
}
-
+ shadow_enabled = !g_ascii_strncasecmp (shadow_status_string, "true", 4);
+ g_free (shadow_status_string);
+
if (!shadow_enabled)
return FALSE;
dest = g_utf8_to_utf16 (shadow, strlen (shadow), NULL, NULL, NULL);
DeleteFile (dest);
copy_result = CopyFile (orig, dest, FALSE);
+
+ /* Fix for bug #556884 - make sure the files have the correct mode so that they can be
+ * overwritten when updated in their original locations. */
+ if (copy_result)
+ copy_result = SetFileAttributes (dest, FILE_ATTRIBUTE_NORMAL);
+
g_free (dest);
g_free (orig);
}
static void
-clear_cached_vtable (gpointer key, gpointer value, gpointer user_data)
+clear_cached_vtable (MonoVTable *vtable)
{
- MonoClass *klass = (MonoClass*)key;
- MonoVTable *vtable = value;
- MonoDomain *domain = (MonoDomain*)user_data;
+ MonoClass *klass = vtable->klass;
+ MonoDomain *domain = vtable->domain;
MonoClassRuntimeInfo *runtime_info;
runtime_info = klass->runtime_info;
mono_gc_free_fixed (vtable->data);
}
-static void
-zero_static_data (gpointer key, gpointer value, gpointer user_data)
+static G_GNUC_UNUSED void
+zero_static_data (MonoVTable *vtable)
{
- MonoClass *klass = (MonoClass*)key;
- MonoVTable *vtable = value;
+ MonoClass *klass = vtable->klass;
if (vtable->data && klass->has_static_refs)
memset (vtable->data, 0, mono_class_data_size (klass));
g_assert (class);
- if (class->reflection_info)
- mono_gc_deregister_root ((char*) &class->reflection_info);
+ mono_class_free_ref_info (class);
}
static void
while (list) {
MonoClass *class = list->data;
- g_assert (class->reflection_info);
- mono_gc_deregister_root ((char*) &class->reflection_info);
+ mono_class_free_ref_info (class);
list = list->next;
}
{
unload_data *data = (unload_data*)arg;
MonoDomain *domain = data->domain;
+ MonoThread *thread;
+ int i;
/* Have to attach to the runtime so shutdown can wait for this thread */
- mono_thread_attach (mono_get_root_domain ());
+ thread = mono_thread_attach (mono_get_root_domain ());
/*
* FIXME: Abort our parent thread last, so we can return a failure
* now be null we won't do any unnecessary copies and after
* the collection there won't be any more remsets.
*/
- g_hash_table_foreach (domain->class_vtable_hash, zero_static_data, domain);
+ for (i = 0; i < domain->class_vtable_array->len; ++i)
+ zero_static_data (g_ptr_array_index (domain->class_vtable_array, i));
mono_gc_collect (0);
#endif
- g_hash_table_foreach (domain->class_vtable_hash, clear_cached_vtable, domain);
+ for (i = 0; i < domain->class_vtable_array->len; ++i)
+ clear_cached_vtable (g_ptr_array_index (domain->class_vtable_array, i));
#ifdef HAVE_SGEN_GC
deregister_reflection_info_roots (domain);
#endif
mono_gc_collect (mono_gc_max_generation ());
+ mono_thread_detach (thread);
+
return 0;
}
*exc = (MonoObject *) mono_get_exception_cannot_unload_appdomain ("Appdomain is already unloaded.");
return;
default:
- g_warning ("Incalid appdomain state %d", prev_state);
+ g_warning ("Invalid appdomain state %d", prev_state);
g_assert_not_reached ();
}
}
projects / mono.git / blobdiff