#include <mono/os/gc_wrapper.h>
+#include <mono/utils/mono-compiler.h>
#include <mono/metadata/object.h>
#include <mono/metadata/object-internals.h>
#include <mono/metadata/domain-internals.h>
#include <mono/metadata/cil-coff.h>
#include <mono/metadata/rawbuffer.h>
#include <mono/metadata/metadata-internals.h>
+#include <mono/metadata/gc-internal.h>
#include <mono/metadata/mono-debug-debugger.h>
+#include <mono/metadata/appdomain.h>
+#include <metadata/threads.h>
/* #define DEBUG_DOMAIN_UNLOAD */
/* we need to use both the Tls* functions and __thread because
- * the gc needs to see all the appcontext
+ * some archs may generate faster jit code with one meachanism
+ * or the other (we used to do it because tls slots were GC-tracked,
+ * but we can't depend on this).
*/
-static guint32 context_thread_id = -1;
static guint32 appdomain_thread_id = -1;
#ifdef HAVE_KW_THREAD
-static __thread MonoDomain * tls_appdomain;
-static __thread MonoAppContext * tls_appcontext;
+static __thread MonoDomain * tls_appdomain MONO_TLS_FAST;
#define GET_APPDOMAIN() tls_appdomain
#define SET_APPDOMAIN(x) do { \
tls_appdomain = x; \
TlsSetValue (appdomain_thread_id, x); \
} while (FALSE)
-#define GET_APPCONTEXT() tls_appcontext
-#define SET_APPCONTEXT(x) do { \
- tls_appcontext = x; \
- TlsSetValue (context_thread_id, x); \
-} while (FALSE)
-
#else
+
#define GET_APPDOMAIN() ((MonoDomain *)TlsGetValue (appdomain_thread_id))
#define SET_APPDOMAIN(x) TlsSetValue (appdomain_thread_id, x);
-#define GET_APPCONTEXT() ((MonoAppContext *)TlsGetValue (context_thread_id))
-#define SET_APPCONTEXT(x) TlsSetValue (context_thread_id, x);
#endif
-static gint32 appdomain_id_counter = 0;
+#define GET_APPCONTEXT() (mono_thread_current ()->current_appcontext)
+#define SET_APPCONTEXT(x) mono_thread_current ()->current_appcontext = (x)
-static MonoGHashTable * appdomains_list = NULL;
+static guint16 appdomain_list_size = 0;
+static guint16 appdomain_next = 0;
+static MonoDomain **appdomains_list = NULL;
static CRITICAL_SECTION appdomains_mutex;
static MonoDomain *mono_root_domain = NULL;
-/* RuntimeInfo: Contains information about versions supported by this runtime */
-typedef struct {
- const char* runtime_version;
- const char* framework_version;
-} RuntimeInfo;
-
/* AppConfigInfo: Information about runtime versions supported by an
* aplication.
*/
int startup_count;
} AppConfigInfo;
-static RuntimeInfo *current_runtime = NULL;
+/*
+ * AotModuleInfo: Contains information about AOT modules.
+ */
+typedef struct {
+ MonoImage *image;
+ gpointer start, end;
+} AotModuleInfo;
+
+static const MonoRuntimeInfo *current_runtime = NULL;
+
+static MonoJitInfoFindInAot jit_info_find_in_aot_func = NULL;
+
+/*
+ * Contains information about AOT loaded code.
+ */
+static MonoJitInfoTable *aot_modules = NULL;
/* This is the list of runtime versions supported by this JIT.
*/
-static RuntimeInfo supported_runtimes[] = {
- {"v1.0.3705", "1.0"}, {"v1.1.4322", "1.0"}, {"v2.0.40607","2.0"}
+static const MonoRuntimeInfo supported_runtimes[] = {
+ {"v1.0.3705", "1.0", { {1,0,5000,0}, {7,0,5000,0} } },
+ {"v1.1.4322", "1.0", { {1,0,5000,0}, {7,0,5000,0} } },
+ {"v2.0.50215","2.0", { {2,0,3600,0}, {8,0,3600,0} } }
};
+
/* The stable runtime version */
#define DEFAULT_RUNTIME_VERSION "v1.1.4322"
-static RuntimeInfo*
-get_runtime_from_exe (const char *exe_file);
+static void
+get_runtimes_from_exe (const char *exe_file, const MonoRuntimeInfo** runtimes);
-static RuntimeInfo*
+static const MonoRuntimeInfo*
get_runtime_by_version (const char *version);
+static MonoImage*
+mono_jit_info_find_aot_module (guint8* addr);
+
guint32
mono_domain_get_tls_key (void)
{
return appdomain_thread_id;
}
+gint32
+mono_domain_get_tls_offset (void)
+{
+ int offset = -1;
+ MONO_THREAD_VAR_OFFSET (tls_appdomain, offset);
+/* __asm ("jmp 1f; .section writetext, \"awx\"; 1: movl $tls_appdomain@ntpoff, %0; jmp 2f; .previous; 2:"
+ : "=r" (offset));*/
+ return offset;
+}
+
static MonoJitInfoTable *
mono_jit_info_table_new (void)
{
mono_jit_info_table_find (MonoDomain *domain, char *addr)
{
MonoJitInfoTable *table = domain->jit_info_table;
- int left = 0, right;
+ MonoJitInfo *ji;
+ guint left = 0, right;
mono_domain_lock (domain);
right = table->len;
while (left < right) {
- int pos = (left + right) / 2;
- MonoJitInfo *ji = g_array_index (table, gpointer, pos);
- char *start = ji->code_start;
- char *end = start + ji->code_size;
+ guint pos = (left + right) / 2;
+ ji = g_array_index (table, gpointer, pos);
- if (addr < start)
+ if (addr < (char*)ji->code_start)
right = pos;
- else if (addr >= end)
+ else if (addr >= (char*)ji->code_start + ji->code_size)
left = pos + 1;
else {
mono_domain_unlock (domain);
mono_domain_unlock (domain);
/* maybe it is shared code, so we also search in the root domain */
+ ji = NULL;
if (domain != mono_root_domain)
- return mono_jit_info_table_find (mono_root_domain, addr);
+ ji = mono_jit_info_table_find (mono_root_domain, addr);
- return NULL;
+ if (ji == NULL) {
+ /* Maybe its an AOT module */
+ MonoImage *image = mono_jit_info_find_aot_module (addr);
+ if (image)
+ ji = jit_info_find_in_aot_func (domain, image, addr);
+ }
+
+ return ji;
}
void
mono_domain_lock (domain);
pos = mono_jit_info_table_index (table, start);
+ if (g_array_index (table, gpointer, pos) != ji) {
+ MonoJitInfo *ji2 = g_array_index (table, gpointer, pos);
+ g_assert (ji == ji2);
+ }
g_assert (g_array_index (table, gpointer, pos) == ji);
g_array_remove_index (table, pos);
mono_domain_unlock (domain);
}
-static gboolean
+static int
+aot_info_table_index (MonoJitInfoTable *table, char *addr)
+{
+ int left = 0, right = table->len;
+
+ while (left < right) {
+ int pos = (left + right) / 2;
+ AotModuleInfo *ainfo = g_array_index (table, gpointer, pos);
+ char *start = ainfo->start;
+ char *end = ainfo->end;
+
+ if (addr < start)
+ right = pos;
+ else if (addr >= end)
+ left = pos + 1;
+ else
+ return pos;
+ }
+
+ return left;
+}
+
+void
+mono_jit_info_add_aot_module (MonoImage *image, gpointer start, gpointer end)
+{
+ AotModuleInfo *ainfo = g_new0 (AotModuleInfo, 1);
+ int pos;
+
+ ainfo->image = image;
+ ainfo->start = start;
+ ainfo->end = end;
+
+ EnterCriticalSection (&appdomains_mutex);
+
+ if (!aot_modules)
+ aot_modules = mono_jit_info_table_new ();
+
+ pos = aot_info_table_index (aot_modules, start);
+
+ g_array_insert_val (aot_modules, pos, ainfo);
+
+ LeaveCriticalSection (&appdomains_mutex);
+}
+
+static MonoImage*
+mono_jit_info_find_aot_module (guint8* addr)
+{
+ guint left = 0, right;
+
+ if (!aot_modules)
+ return NULL;
+
+ EnterCriticalSection (&appdomains_mutex);
+
+ right = aot_modules->len;
+ while (left < right) {
+ guint pos = (left + right) / 2;
+ AotModuleInfo *ai = g_array_index (aot_modules, gpointer, pos);
+
+ if (addr < (guint8*)ai->start)
+ right = pos;
+ else if (addr >= (guint8*)ai->end)
+ left = pos + 1;
+ else {
+ LeaveCriticalSection (&appdomains_mutex);
+ return ai->image;
+ }
+ }
+
+ LeaveCriticalSection (&appdomains_mutex);
+
+ return NULL;
+}
+
+void
+mono_install_jit_info_find_in_aot (MonoJitInfoFindInAot func)
+{
+ jit_info_find_in_aot_func = func;
+}
+
+gboolean
mono_string_equal (MonoString *s1, MonoString *s2)
{
int l1 = mono_string_length (s1);
return memcmp (mono_string_chars (s1), mono_string_chars (s2), l1 * 2) == 0;
}
-static guint
+guint
mono_string_hash (MonoString *s)
{
const guint16 *p = mono_string_chars (s);
return h;
}
-#if HAVE_BOEHM_GC
-static void
-domain_finalizer (void *obj, void *data) {
- /*g_print ("domain finalized\n");*/
+static gboolean
+mono_ptrarray_equal (gpointer *s1, gpointer *s2)
+{
+ int len = GPOINTER_TO_INT (s1 [0]);
+ if (len != GPOINTER_TO_INT (s2 [0]))
+ return FALSE;
+
+ return memcmp (s1 + 1, s2 + 1, len * sizeof(gpointer)) == 0;
+}
+
+static guint
+mono_ptrarray_hash (gpointer *s)
+{
+ int i;
+ int len = GPOINTER_TO_INT (s [0]);
+ guint hash = 0;
+
+ for (i = 1; i < len; i++)
+ hash += GPOINTER_TO_UINT (s [i]);
+
+ return hash;
+}
+
+/*
+ * Allocate an id for domain and set domain->domain_id.
+ * LOCKING: must be called while holding appdomains_mutex.
+ * We try to assign low numbers to the domain, so it can be used
+ * as an index in data tables to lookup domain-specific info
+ * with minimal memory overhead. We also try not to reuse the
+ * same id too quickly (to help debugging).
+ */
+static int
+domain_id_alloc (MonoDomain *domain)
+{
+ int id = -1, i;
+ if (!appdomains_list) {
+ appdomain_list_size = 2;
+ appdomains_list = mono_gc_alloc_fixed (appdomain_list_size * sizeof (void*), NULL);
+ }
+ for (i = appdomain_next; i < appdomain_list_size; ++i) {
+ if (!appdomains_list [i]) {
+ id = i;
+ break;
+ }
+ }
+ if (id == -1) {
+ for (i = 0; i < appdomain_next; ++i) {
+ if (!appdomains_list [i]) {
+ id = i;
+ break;
+ }
+ }
+ }
+ if (id == -1) {
+ MonoDomain **new_list;
+ int new_size = appdomain_list_size * 2;
+ if (new_size >= (1 << 16))
+ g_assert_not_reached ();
+ id = appdomain_list_size;
+ new_list = mono_gc_alloc_fixed (new_size * sizeof (void*), NULL);
+ memcpy (new_list, appdomains_list, appdomain_list_size * sizeof (void*));
+ mono_gc_free_fixed (appdomains_list);
+ appdomains_list = new_list;
+ appdomain_list_size = new_size;
+ }
+ domain->domain_id = id;
+ appdomains_list [id] = domain;
+ appdomain_next++;
+ if (appdomain_next > appdomain_list_size)
+ appdomain_next = 0;
+ return id;
}
-#endif
MonoDomain *
mono_domain_create (void)
{
MonoDomain *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
+ domain = mono_gc_alloc_fixed (sizeof (MonoDomain), NULL);
domain->domain = NULL;
domain->setup = NULL;
domain->friendly_name = NULL;
domain->mp = mono_mempool_new ();
domain->code_mp = mono_code_manager_new ();
domain->env = mono_g_hash_table_new ((GHashFunc)mono_string_hash, (GCompareFunc)mono_string_equal);
- domain->assemblies_by_name = g_hash_table_new (g_str_hash, g_str_equal);
- domain->assemblies = NULL;
- domain->class_vtable_hash = g_hash_table_new (NULL, NULL);
- domain->proxy_vtable_hash = mono_g_hash_table_new ((GHashFunc)mono_string_hash, (GCompareFunc)mono_string_equal);
- domain->static_data_hash = mono_g_hash_table_new (NULL, NULL);
- domain->jit_code_hash = g_hash_table_new (NULL, NULL);
+ domain->domain_assemblies = NULL;
+ domain->class_vtable_hash = g_hash_table_new (mono_aligned_addr_hash, NULL);
+ domain->proxy_vtable_hash = mono_g_hash_table_new ((GHashFunc)mono_ptrarray_hash, (GCompareFunc)mono_ptrarray_equal);
+ domain->static_data_hash = mono_g_hash_table_new (mono_aligned_addr_hash, NULL);
+ domain->jit_code_hash = g_hash_table_new (mono_aligned_addr_hash, NULL);
domain->ldstr_table = mono_g_hash_table_new ((GHashFunc)mono_string_hash, (GCompareFunc)mono_string_equal);
domain->jit_info_table = mono_jit_info_table_new ();
- domain->class_init_trampoline_hash = g_hash_table_new (NULL, NULL);
- domain->jump_trampoline_hash = g_hash_table_new (NULL, NULL);
- domain->finalizable_objects_hash = g_hash_table_new (NULL, NULL);
- domain->domain_id = InterlockedIncrement (&appdomain_id_counter);
+ domain->class_init_trampoline_hash = g_hash_table_new (mono_aligned_addr_hash, NULL);
+ domain->jump_trampoline_hash = g_hash_table_new (mono_aligned_addr_hash, NULL);
+ domain->finalizable_objects_hash = g_hash_table_new (mono_aligned_addr_hash, NULL);
+ domain->jit_trampoline_hash = g_hash_table_new (mono_aligned_addr_hash, NULL);
InitializeCriticalSection (&domain->lock);
+ InitializeCriticalSection (&domain->assemblies_lock);
EnterCriticalSection (&appdomains_mutex);
- mono_g_hash_table_insert(appdomains_list, GINT_TO_POINTER(domain->domain_id), domain);
+ domain_id_alloc (domain);
LeaveCriticalSection (&appdomains_mutex);
return domain;
mono_init_internal (const char *filename, const char *exe_filename, const char *runtime_version)
{
static MonoDomain *domain = NULL;
- MonoAssembly *ass;
+ MonoAssembly *ass = NULL;
MonoImageOpenStatus status = MONO_IMAGE_OK;
- MonoAssemblyName corlib_aname;
+ const MonoRuntimeInfo* runtimes [G_N_ELEMENTS (supported_runtimes) + 1];
+ int n;
if (domain)
g_assert_not_reached ();
MONO_GC_PRE_INIT ();
appdomain_thread_id = TlsAlloc ();
- context_thread_id = TlsAlloc ();
InitializeCriticalSection (&appdomains_mutex);
/* FIXME: When should we release this memory? */
MONO_GC_REGISTER_ROOT (appdomains_list);
- appdomains_list = mono_g_hash_table_new (g_direct_hash, g_direct_equal);
domain = mono_domain_create ();
mono_root_domain = domain;
SET_APPDOMAIN (domain);
+ /* Get a list of runtimes supported by the exe */
if (exe_filename != NULL) {
- current_runtime = get_runtime_from_exe (exe_filename);
+ get_runtimes_from_exe (exe_filename, runtimes);
} else if (runtime_version != NULL) {
- current_runtime = get_runtime_by_version (runtime_version);
+ runtimes [0] = get_runtime_by_version (runtime_version);
+ runtimes [1] = NULL;
}
- if (current_runtime == NULL) {
+ if (runtimes [0] == NULL) {
+ const MonoRuntimeInfo *default_runtime = get_runtime_by_version (DEFAULT_RUNTIME_VERSION);
+ runtimes [0] = default_runtime;
+ runtimes [1] = NULL;
g_print ("WARNING: The runtime version supported by this application is unavailable.\n");
- current_runtime = get_runtime_by_version (DEFAULT_RUNTIME_VERSION);
- g_print ("Using default runtime: %s\n", current_runtime->runtime_version);
+ g_print ("Using default runtime: %s\n", default_runtime->runtime_version);
+ }
+
+ /* The selected runtime will be the first one for which there is a mscrolib.dll */
+ for (n = 0; runtimes [n] != NULL && ass == NULL; n++) {
+ current_runtime = runtimes [n];
+ ass = mono_assembly_load_corlib (current_runtime, &status);
+ if (status != MONO_IMAGE_OK && status != MONO_IMAGE_ERROR_ERRNO)
+ break;
}
- /* find the corlib */
- corlib_aname.name = "mscorlib";
- ass = mono_assembly_load (&corlib_aname, NULL, &status);
if ((status != MONO_IMAGE_OK) || (ass == NULL)) {
switch (status){
case MONO_IMAGE_ERROR_ERRNO: {
- char *corlib_file = g_build_filename (mono_assembly_getrootdir (), "mono", mono_get_framework_version (), "mscorlib.dll", NULL);
+ char *corlib_file = g_build_filename (mono_assembly_getrootdir (), "mono", current_runtime->framework_version, "mscorlib.dll", NULL);
g_print ("The assembly mscorlib.dll was not found or could not be loaded.\n");
g_print ("It should have been installed in the `%s' directory.\n", corlib_file);
g_free (corlib_file);
mono_defaults.runtimesecurityframe_class = mono_class_from_name (
mono_defaults.corlib, "System.Security", "RuntimeSecurityFrame");
- g_assert (mono_defaults.runtimesecurityframe_class != 0);
+
+ mono_defaults.executioncontext_class = mono_class_from_name (
+ mono_defaults.corlib, "System.Threading", "ExecutionContext");
+
+ /*
+ * Note that mono_defaults.generic_array_class is only non-NULL if we're
+ * using the 2.0 corlib.
+ */
+ mono_class_init (mono_defaults.array_class);
+ mono_defaults.generic_array_class = mono_class_from_name (
+ mono_defaults.corlib, "System", "Array/InternalArray`1");
domain->friendly_name = g_path_get_basename (filename);
*
* Returns: the current domain.
*/
-inline MonoDomain *
+MonoDomain *
mono_domain_get ()
{
return GET_APPDOMAIN ();
*
* Sets the current domain to @domain.
*/
-inline void
+void
mono_domain_set_internal (MonoDomain *domain)
{
SET_APPDOMAIN (domain);
SET_APPCONTEXT (domain->default_context);
}
-typedef struct {
- MonoDomainFunc func;
- gpointer user_data;
-} DomainInfo;
-
-static void
-copy_hash_entry (gpointer key, gpointer data, gpointer user_data)
-{
- MonoGHashTable *dest = (MonoGHashTable*)user_data;
-
- mono_g_hash_table_insert (dest, key, data);
-}
-
-static void
-foreach_domain (gpointer key, gpointer data, gpointer user_data)
-{
- DomainInfo *dom_info = user_data;
-
- dom_info->func ((MonoDomain*)data, dom_info->user_data);
-}
-
void
mono_domain_foreach (MonoDomainFunc func, gpointer user_data)
{
- DomainInfo dom_info;
- MonoGHashTable *copy;
+ int i, size;
+ MonoDomain **copy;
/*
- * Create a copy of the hashtable to avoid calling the user callback
+ * Create a copy of the data to avoid calling the user callback
* inside the lock because that could lead to deadlocks.
* We can do this because this function is not perf. critical.
*/
- copy = mono_g_hash_table_new (NULL, NULL);
EnterCriticalSection (&appdomains_mutex);
- mono_g_hash_table_foreach (appdomains_list, copy_hash_entry, copy);
+ size = appdomain_list_size;
+ copy = mono_gc_alloc_fixed (appdomain_list_size * sizeof (void*), NULL);
+ memcpy (copy, appdomains_list, appdomain_list_size * sizeof (void*));
LeaveCriticalSection (&appdomains_mutex);
- dom_info.func = func;
- dom_info.user_data = user_data;
- mono_g_hash_table_foreach (copy, foreach_domain, &dom_info);
+ for (i = 0; i < size; ++i) {
+ if (copy [i])
+ func (copy [i], user_data);
+ }
- mono_g_hash_table_destroy (copy);
+ mono_gc_free_fixed (copy);
}
/**
mono_domain_assembly_open (MonoDomain *domain, const char *name)
{
MonoAssembly *ass;
-
- mono_domain_lock (domain);
- if ((ass = g_hash_table_lookup (domain->assemblies_by_name, name))) {
- mono_domain_unlock (domain);
- return ass;
+ GSList *tmp;
+
+ mono_domain_assemblies_lock (domain);
+ for (tmp = domain->domain_assemblies; tmp; tmp = tmp->next) {
+ ass = tmp->data;
+ if (strcmp (name, ass->aname.name) == 0) {
+ mono_domain_assemblies_unlock (domain);
+ return ass;
+ }
}
- mono_domain_unlock (domain);
+ mono_domain_assemblies_unlock (domain);
if (!(ass = mono_assembly_open (name, NULL)))
return NULL;
return ass;
}
-static void
-remove_assembly (gpointer key, gpointer value, gpointer user_data)
-{
- mono_assembly_close ((MonoAssembly *)value);
-}
-
-static void
-add_assembly (gpointer key, gpointer value, gpointer user_data)
-{
- g_hash_table_insert ((GHashTable*)user_data, value, value);
-}
-
static void
dynamic_method_info_free (gpointer key, gpointer value, gpointer user_data)
{
void
mono_domain_free (MonoDomain *domain, gboolean force)
{
- GHashTable *unique_assemblies;
- GList *tmp;
+ GSList *tmp;
if ((domain == mono_root_domain) && !force) {
g_warning ("cant unload root domain");
return;
}
EnterCriticalSection (&appdomains_mutex);
- mono_g_hash_table_remove (appdomains_list, GINT_TO_POINTER(domain->domain_id));
+ appdomains_list [domain->domain_id] = NULL;
LeaveCriticalSection (&appdomains_mutex);
/* FIXME: free delegate_hash_table when it's used */
domain->entry_assembly = NULL;
g_free (domain->friendly_name);
domain->friendly_name = NULL;
- /* some assemblies are in domain->assemblies_by_name and some only in domain->assemblies:
- * collect them in unique_assemblies so we don't free them twice.
- */
- unique_assemblies = g_hash_table_new (NULL, NULL);
- g_hash_table_foreach (domain->assemblies_by_name, add_assembly, unique_assemblies);
- for (tmp = domain->assemblies; tmp; tmp = tmp->next)
- g_hash_table_insert (unique_assemblies, tmp->data, tmp->data);
- g_hash_table_foreach (unique_assemblies, remove_assembly, NULL);
- g_hash_table_destroy (unique_assemblies);
- g_hash_table_destroy (domain->assemblies_by_name);
- domain->assemblies_by_name = NULL;
- g_list_free (domain->assemblies);
- domain->assemblies = NULL;
+ for (tmp = domain->domain_assemblies; tmp; tmp = tmp->next) {
+ MonoAssembly *ass = tmp->data;
+ /*g_print ("Unloading domain %p, assembly %s, refcount: %d\n", domain, ass->aname.name, ass->ref_count);*/
+ mono_assembly_close (ass);
+ }
+ g_slist_free (domain->domain_assemblies);
+ domain->domain_assemblies = NULL;
mono_g_hash_table_destroy (domain->env);
domain->env = NULL;
domain->jump_trampoline_hash = NULL;
g_hash_table_destroy (domain->finalizable_objects_hash);
domain->finalizable_objects_hash = NULL;
+ g_hash_table_destroy (domain->jit_trampoline_hash);
+ domain->jit_trampoline_hash = NULL;
if (domain->special_static_fields) {
g_hash_table_destroy (domain->special_static_fields);
domain->special_static_fields = NULL;
}
+ DeleteCriticalSection (&domain->assemblies_lock);
DeleteCriticalSection (&domain->lock);
domain->setup = NULL;
/* FIXME: anything else required ? */
-#if HAVE_BOEHM_GC
-#else
- g_free (domain);
-#endif
+ mono_gc_free_fixed (domain);
if ((domain == mono_root_domain))
mono_root_domain = NULL;
MonoDomain * domain;
EnterCriticalSection (&appdomains_mutex);
- domain = mono_g_hash_table_lookup (appdomains_list, GINT_TO_POINTER(domainid));
+ if (domainid < appdomain_list_size)
+ domain = appdomains_list [domainid];
+ else
+ domain = NULL;
LeaveCriticalSection (&appdomains_mutex);
return domain;
}
-static RuntimeInfo*
+static const MonoRuntimeInfo*
get_runtime_by_version (const char *version)
{
int n;
return NULL;
}
-static RuntimeInfo*
-get_runtime_from_exe (const char *exe_file)
+static void
+get_runtimes_from_exe (const char *exe_file, const MonoRuntimeInfo** runtimes)
{
AppConfigInfo* app_config;
char *version;
char *config_name;
- RuntimeInfo* runtime = NULL;
+ const MonoRuntimeInfo* runtime = NULL;
MonoImage *image = NULL;
config_name = g_strconcat (exe_file, ".config", NULL);
* If there are no such elements, look for a requiredRuntime element.
*/
if (app_config->supported_runtimes != NULL) {
+ int n = 0;
GSList *list = app_config->supported_runtimes;
- while (list != NULL && runtime == NULL) {
+ while (list != NULL) {
version = (char*) list->data;
runtime = get_runtime_by_version (version);
+ if (runtime != NULL)
+ runtimes [n++] = runtime;
list = g_slist_next (list);
}
+ runtimes [n] = NULL;
app_config_free (app_config);
- return runtime;
+ return;
}
/* Check the requiredRuntime element. This is for 1.0 apps only. */
if (app_config->required_runtime != NULL) {
- runtime = get_runtime_by_version (app_config->required_runtime);
+ runtimes [0] = get_runtime_by_version (app_config->required_runtime);
+ runtimes [1] = NULL;
app_config_free (app_config);
- return runtime;
+ return;
}
app_config_free (app_config);
}
* a default runtime and leave to the initialization method the work of
* reporting the error.
*/
- return get_runtime_by_version (DEFAULT_RUNTIME_VERSION);
+ runtimes [0] = get_runtime_by_version (DEFAULT_RUNTIME_VERSION);
+ runtimes [1] = NULL;
+ return;
}
- runtime = get_runtime_by_version (image->version);
-
- return runtime;
+ runtimes [0] = get_runtime_by_version (image->version);
+ runtimes [1] = NULL;
}
-const char*
-mono_get_framework_version (void)
-{
- return current_runtime->framework_version;
-}
-const char*
-mono_get_runtime_version (void)
+/**
+ * mono_get_runtime_info:
+ *
+ * Returns: the version of the current runtime instance.
+ */
+const MonoRuntimeInfo*
+mono_get_runtime_info (void)
{
- return current_runtime->runtime_version;
+ return current_runtime;
}
gchar *
mono_debugger_check_runtime_version (const char *filename)
{
- RuntimeInfo *rinfo;
+ const MonoRuntimeInfo* runtimes [G_N_ELEMENTS (supported_runtimes) + 1];
+ const MonoRuntimeInfo *rinfo;
+
+ get_runtimes_from_exe (filename, runtimes);
+ rinfo = runtimes [0];
- rinfo = get_runtime_from_exe (filename);
if (!rinfo)
return g_strdup_printf ("Cannot get runtime version from assembly `%s'", filename);
projects / mono.git / blobdiff