*
* Copyright 2001-2003 Ximian, Inc (http://www.ximian.com)
* Copyright 2004-2009 Novell, Inc (http://www.novell.com)
+ * Copyright 2011 Xamarin, Inc (http://www.xamarin.com)
*/
#include <config.h>
#include <mono/utils/mono-logger-internal.h>
#include <mono/utils/mono-membar.h>
#include <mono/utils/mono-counters.h>
+#include <mono/utils/hazard-pointer.h>
+#include <mono/utils/mono-tls.h>
#include <mono/metadata/object.h>
#include <mono/metadata/object-internals.h>
#include <mono/metadata/domain-internals.h>
* or the other (we used to do it because tls slots were GC-tracked,
* but we can't depend on this).
*/
-static guint32 appdomain_thread_id = -1;
-
-/*
- * Avoid calling TlsSetValue () if possible, since in the io-layer, it acquires
- * a global lock (!) so it is a contention point.
- */
-#if (defined(__i386__) || defined(__x86_64__)) && !defined(HOST_WIN32)
-#define NO_TLS_SET_VALUE
-#endif
+static MonoNativeTlsKey appdomain_thread_id;
#ifdef MONO_HAVE_FAST_TLS
#define GET_APPDOMAIN() ((MonoDomain*)MONO_FAST_TLS_GET(tls_appdomain))
-#ifdef NO_TLS_SET_VALUE
#define SET_APPDOMAIN(x) do { \
MONO_FAST_TLS_SET (tls_appdomain,x); \
+ mono_native_tls_set_value (appdomain_thread_id, x); \
} while (FALSE)
-#else
-#define SET_APPDOMAIN(x) do { \
- MONO_FAST_TLS_SET (tls_appdomain,x); \
- TlsSetValue (appdomain_thread_id, x); \
-} while (FALSE)
-#endif
#else /* !MONO_HAVE_FAST_TLS */
-#define GET_APPDOMAIN() ((MonoDomain *)TlsGetValue (appdomain_thread_id))
-#define SET_APPDOMAIN(x) TlsSetValue (appdomain_thread_id, x);
+#define GET_APPDOMAIN() ((MonoDomain *)mono_native_tls_get_value (appdomain_thread_id))
+#define SET_APPDOMAIN(x) mono_native_tls_set_value (appdomain_thread_id, x);
#endif
static MonoImage*
mono_jit_info_find_aot_module (guint8* addr);
-guint32
+MonoNativeTlsKey
mono_domain_get_tls_key (void)
{
return appdomain_thread_id;
g_free (table);
}
-/* Can be called with hp==NULL, in which case it acts as an ordinary
- pointer fetch. It's used that way indirectly from
- mono_jit_info_table_add(), which doesn't have to care about hazards
- because it holds the respective domain lock. */
-static gpointer
-get_hazardous_pointer (gpointer volatile *pp, MonoThreadHazardPointers *hp, int hazard_index)
-{
- gpointer p;
-
- for (;;) {
- /* Get the pointer */
- p = *pp;
- /* If we don't have hazard pointers just return the
- pointer. */
- if (!hp)
- return p;
- /* Make it hazardous */
- mono_hazard_pointer_set (hp, hazard_index, p);
- /* Check that it's still the same. If not, try
- again. */
- if (*pp != p) {
- mono_hazard_pointer_clear (hp, hazard_index);
- continue;
- }
- break;
- }
-
- return p;
-}
-
/* The jit_info_table is sorted in ascending order by the end
* addresses of the compiled methods. The reason why we have to do
* this is that once we introduce tombstones, it becomes possible for
domain->jit_info_free_queue = NULL;
domain->finalizable_objects_hash = g_hash_table_new (mono_aligned_addr_hash, NULL);
domain->track_resurrection_handles_hash = g_hash_table_new (mono_aligned_addr_hash, NULL);
+ domain->ftnptrs_hash = g_hash_table_new (mono_aligned_addr_hash, NULL);
InitializeCriticalSection (&domain->lock);
InitializeCriticalSection (&domain->assemblies_lock);
#ifdef HOST_WIN32
/* Avoid system error message boxes. */
SetErrorMode (SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX);
-#ifdef ENABLE_COREE
- mono_load_coree (exe_filename);
-#endif
#endif
mono_perfcounters_init ();
mono_gc_base_init ();
MONO_FAST_TLS_INIT (tls_appdomain);
- appdomain_thread_id = TlsAlloc ();
+ mono_native_tls_alloc (&appdomain_thread_id, NULL);
InitializeCriticalSection (&appdomains_mutex);
* exe_image, and close it during shutdown.
*/
get_runtimes_from_exe (exe_filename, &exe_image, runtimes);
-#ifdef ENABLE_COREE
+#ifdef HOST_WIN32
if (!exe_image) {
exe_image = mono_assembly_open_from_bundle (exe_filename, NULL, FALSE);
if (!exe_image)
mono_debug_cleanup ();
mono_metadata_cleanup ();
- TlsFree (appdomain_thread_id);
+ mono_native_tls_free (appdomain_thread_id);
DeleteCriticalSection (&appdomains_mutex);
- /*
- * This should be called last as TlsGetValue ()/TlsSetValue () can be called during
- * shutdown.
- */
#ifndef HOST_WIN32
_wapi_cleanup ();
#endif
g_hash_table_destroy (domain->generic_virtual_cases);
domain->generic_virtual_cases = NULL;
}
+ if (domain->generic_virtual_thunks) {
+ g_hash_table_destroy (domain->generic_virtual_thunks);
+ domain->generic_virtual_thunks = NULL;
+ }
+ if (domain->ftnptrs_hash) {
+ g_hash_table_destroy (domain->ftnptrs_hash);
+ domain->ftnptrs_hash = NULL;
+ }
DeleteCriticalSection (&domain->finalizable_objects_hash_lock);
DeleteCriticalSection (&domain->assemblies_lock);
if (next >= size) {
/* 'data' is allocated by alloc_fixed */
gpointer *new_array = mono_gc_alloc_fixed (sizeof (gpointer) * (size * 2), MONO_GC_ROOT_DESCR_FOR_FIXED (size * 2));
- memcpy (new_array, domain->static_data_array, sizeof (gpointer) * size);
+ mono_gc_memmove (new_array, domain->static_data_array, sizeof (gpointer) * size);
size *= 2;
new_array [1] = GINT_TO_POINTER (size);
mono_gc_free_fixed (domain->static_data_array);
do_partial_match = FALSE;
for (n=0; n<max; n++) {
- if (do_partial_match && strncmp (version, supported_runtimes[n].runtime_version, vlen) == 0)
+ if (do_partial_match && strncmp (version, supported_runtimes[n].runtime_version, 4) == 0)
return &supported_runtimes[n];
if (strcmp (version, supported_runtimes[n].runtime_version) == 0)
return &supported_runtimes[n];
projects / mono.git / blobdiff