#include <mono/metadata/marshal.h>
#include <mono/io-layer/io-layer.h>
#include <mono/metadata/object-internals.h>
+#include <mono/metadata/mono-debug-debugger.h>
#include <mono/utils/mono-compiler.h>
#include <mono/os/gc_wrapper.h>
/*#define LIBGC_DEBUG(a) do { a; } while (0)*/
#define LIBGC_DEBUG(a)
+/* Provide this for systems with glib < 2.6 */
+#ifndef G_GSIZE_FORMAT
+# if GLIB_SIZEOF_LONG == 8
+# define G_GSIZE_FORMAT "lu"
+# else
+# define G_GSIZE_FORMAT "u"
+# endif
+#endif
+
struct StartInfo
{
guint32 (*func)(void *);
int offset;
} StaticDataInfo;
-/* Number of cached culture objects in the MonoThread->culture_info array */
+/* Number of cached culture objects in the MonoThread->cached_culture_info array
+ * (per-type): we use the first NUM entries for CultureInfo and the last for
+ * UICultureInfo. So the size of the array is really NUM_CACHED_CULTURES * 2.
+ */
#define NUM_CACHED_CULTURES 4
+#define CULTURES_START_IDX 0
+#define UICULTURES_START_IDX NUM_CACHED_CULTURES
/*
* The "os_handle" field of the WaitHandle class.
static MonoClassField *wait_handle_os_handle_field = NULL;
/* Controls access to the 'threads' hash table */
+#define mono_threads_lock() EnterCriticalSection (&threads_mutex)
+#define mono_threads_unlock() LeaveCriticalSection (&threads_mutex)
static CRITICAL_SECTION threads_mutex;
/* Controls access to context static data */
+#define mono_contexts_lock() EnterCriticalSection (&contexts_mutex)
+#define mono_contexts_unlock() LeaveCriticalSection (&contexts_mutex)
static CRITICAL_SECTION contexts_mutex;
/* Holds current status of static data heap */
static MonoThreadAttachCB mono_thread_attach_cb = NULL;
/* function called at thread cleanup */
-static MonoThreadCleanupFunc mono_thread_cleanup = NULL;
-
-/* function called when a new thread has been created */
-static MonoThreadCallbacks *mono_thread_callbacks = NULL;
+static MonoThreadCleanupFunc mono_thread_cleanup_fn = NULL;
/* The default stack size for each thread */
static guint32 default_stacksize = 0;
static void thread_adjust_static_data (MonoThread *thread);
static void mono_init_static_data_info (StaticDataInfo *static_data);
static guint32 mono_alloc_static_data_slot (StaticDataInfo *static_data, guint32 size, guint32 align);
+static gboolean mono_thread_resume (MonoThread* thread);
+static void mono_thread_start (MonoThread *thread);
+static void signal_thread_state_change (MonoThread *thread);
/* Spin lock for InterlockedXXX 64 bit functions */
+#define mono_interlocked_lock() EnterCriticalSection (&interlocked_mutex)
+#define mono_interlocked_unlock() LeaveCriticalSection (&interlocked_mutex)
static CRITICAL_SECTION interlocked_mutex;
-/* Controls access to interruption flag */
-static CRITICAL_SECTION interruption_mutex;
-
/* global count of thread interruptions requested */
static gint32 thread_interruption_requested = 0;
+/* Event signaled when a thread changes its background mode */
+static HANDLE background_change_event;
+
guint32
mono_thread_get_tls_key (void)
{
*/
static void handle_store(MonoThread *thread)
{
- EnterCriticalSection(&threads_mutex);
+ mono_threads_lock ();
- THREAD_DEBUG (g_message (G_GNUC_PRETTY_FUNCTION ": thread %p ID %d", thread, thread->tid));
+ THREAD_DEBUG (g_message ("%s: thread %p ID %"G_GSIZE_FORMAT, __func__, thread, (gsize)thread->tid));
if(threads==NULL) {
MONO_GC_REGISTER_ROOT (threads);
/* We don't need to duplicate thread->handle, because it is
* only closed when the thread object is finalized by the GC.
*/
- mono_g_hash_table_insert(threads, GUINT_TO_POINTER(thread->tid), thread);
- LeaveCriticalSection(&threads_mutex);
+ mono_g_hash_table_insert(threads, (gpointer)(gsize)(thread->tid),
+ thread);
+
+ mono_threads_unlock ();
}
-static void handle_remove(guint32 tid)
+static void handle_remove(gsize tid)
{
- THREAD_DEBUG (g_message (G_GNUC_PRETTY_FUNCTION ": thread ID %d", tid));
+ THREAD_DEBUG (g_message ("%s: thread ID %"G_GSIZE_FORMAT, __func__, tid));
- EnterCriticalSection(&threads_mutex);
+ mono_threads_lock ();
+
if (threads)
- mono_g_hash_table_remove (threads, GUINT_TO_POINTER(tid));
+ mono_g_hash_table_remove (threads, (gpointer)tid);
- LeaveCriticalSection(&threads_mutex);
+ mono_threads_unlock ();
/* Don't close the handle here, wait for the object finalizer
* to do it. Otherwise, the following race condition applies:
static void thread_cleanup (MonoThread *thread)
{
+ g_assert (thread != NULL);
+
mono_release_type_locks (thread);
if (!mono_monitor_enter (thread->synch_lock))
if (thread->serialized_culture_info)
g_free (thread->serialized_culture_info);
- mono_gc_free_fixed (thread->culture_info);
- mono_gc_free_fixed (thread->ui_culture_info);
+ thread->cached_culture_info = NULL;
- if (mono_thread_cleanup)
- mono_thread_cleanup (thread);
+ if (mono_thread_cleanup_fn)
+ mono_thread_cleanup_fn (thread);
}
-static guint32 start_wrapper(void *data)
+static guint32 WINAPI start_wrapper(void *data)
{
struct StartInfo *start_info=(struct StartInfo *)data;
guint32 (*start_func)(void *);
void *start_arg;
- guint32 tid;
+ gsize tid;
MonoThread *thread=start_info->obj;
MonoObject *start_delegate = start_info->delegate;
- THREAD_DEBUG (g_message (G_GNUC_PRETTY_FUNCTION ": (%d) Start wrapper", GetCurrentThreadId ()));
-
+ THREAD_DEBUG (g_message ("%s: (%"G_GSIZE_FORMAT") Start wrapper", __func__, GetCurrentThreadId ()));
+
/* We can be sure start_info->obj->tid and
* start_info->obj->handle have been set, because the thread
* was created suspended, and these values were set before the
mono_thread_new_init (tid, &tid, start_func);
thread->stack_ptr = &tid;
- LIBGC_DEBUG (g_message (G_GNUC_PRETTY_FUNCTION
- ": (%d,%d) Setting thread stack to %p",
- GetCurrentThreadId (), getpid (), thread->stack_ptr));
+ LIBGC_DEBUG (g_message ("%s: (%"G_GSIZE_FORMAT",%d) Setting thread stack to %p", __func__, GetCurrentThreadId (), getpid (), thread->stack_ptr));
- THREAD_DEBUG (g_message (G_GNUC_PRETTY_FUNCTION
- ": (%d) Setting current_object_key to %p",
- GetCurrentThreadId (), thread));
+ THREAD_DEBUG (g_message ("%s: (%"G_GSIZE_FORMAT") Setting current_object_key to %p", __func__, GetCurrentThreadId (), thread));
mono_profiler_thread_start (tid);
thread_adjust_static_data (thread);
#ifdef DEBUG
- g_message (G_GNUC_PRETTY_FUNCTION "start_wrapper for %d\n", thread->tid);
+ g_message ("%s: start_wrapper for %"G_GSIZE_FORMAT, __func__,
+ thread->tid);
#endif
- /* start_func is set only for unamanged start functions */
+ /* start_func is set only for unmanaged start functions */
if (start_func) {
start_func (start_arg);
} else {
* call thread_cleanup() on this thread's behalf.
*/
- THREAD_DEBUG (g_message (G_GNUC_PRETTY_FUNCTION ": (%d) Start wrapper terminating",
- GetCurrentThreadId ()));
+ THREAD_DEBUG (g_message ("%s: (%"G_GSIZE_FORMAT") Start wrapper terminating", __func__, GetCurrentThreadId ()));
+
+ thread_cleanup (thread);
/* Remove the reference to the thread object in the TLS data,
* so the thread object can be finalized. This won't be
*/
SET_CURRENT_OBJECT (NULL);
- thread_cleanup (thread);
-
return(0);
}
-void mono_thread_new_init (guint32 tid, gpointer stack_start, gpointer func)
+void mono_thread_new_init (gsize tid, gpointer stack_start, gpointer func)
{
if (mono_thread_start_cb) {
mono_thread_start_cb (tid, stack_start, func);
}
-
- if (mono_thread_callbacks)
- (* mono_thread_callbacks->thread_created) (tid, stack_start, func);
}
void mono_threads_set_default_stacksize (guint32 stacksize)
MonoThread *thread;
HANDLE thread_handle;
struct StartInfo *start_info;
- guint32 tid;
-
+ gsize tid;
+
thread=(MonoThread *)mono_object_new (domain,
mono_defaults.thread_class);
/* Create suspended, so we can do some housekeeping before the thread
* starts
*/
- thread_handle = CreateThread(NULL, default_stacksize_for_thread (thread), start_wrapper, start_info,
+ thread_handle = CreateThread(NULL, default_stacksize_for_thread (thread), (LPTHREAD_START_ROUTINE)start_wrapper, start_info,
CREATE_SUSPENDED, &tid);
- THREAD_DEBUG (g_message (G_GNUC_PRETTY_FUNCTION ": Started thread ID %d (handle %p)",
- tid, thread_handle));
- g_assert (thread_handle);
+ THREAD_DEBUG (g_message ("%s: Started thread ID %"G_GSIZE_FORMAT" (handle %p)", __func__, tid, thread_handle));
+ if (thread_handle == NULL) {
+ /* The thread couldn't be created, so throw an exception */
+ mono_raise_exception (mono_get_exception_execution_engine ("Couldn't create thread"));
+ return;
+ }
thread->handle=thread_handle;
thread->tid=tid;
- thread->synch_lock=mono_object_new (domain, mono_defaults.object_class);
+ MONO_OBJECT_SETREF (thread, synch_lock, mono_object_new (domain, mono_defaults.object_class));
handle_store(thread);
{
MonoThread *thread;
HANDLE thread_handle;
- guint32 tid;
+ gsize tid;
if ((thread = mono_thread_current ())) {
+ if (domain != mono_domain_get ())
+ mono_domain_set (domain, TRUE);
/* Already attached */
return thread;
}
- if (!mono_gc_is_gc_thread ()) {
- g_error ("Thread %p calling into managed code is not registered with the GC. On UNIX, this can be fixed by #include-ing <gc.h> before <pthread.h> in the file containing the thread creation code.", GetCurrentThread ());
+ if (!mono_gc_register_thread (&domain)) {
+ g_error ("Thread %"G_GSIZE_FORMAT" calling into managed code is not registered with the GC. On UNIX, this can be fixed by #include-ing <gc.h> before <pthread.h> in the file containing the thread creation code.", GetCurrentThreadId ());
}
thread = (MonoThread *)mono_object_new (domain,
tid=GetCurrentThreadId ();
-#ifdef PLATFORM_WIN32
/*
* The handle returned by GetCurrentThread () is a pseudo handle, so it can't be used to
* refer to the thread from other threads for things like aborting.
*/
DuplicateHandle (GetCurrentProcess (), thread_handle, GetCurrentProcess (), &thread_handle,
THREAD_ALL_ACCESS, TRUE, 0);
-#endif
thread->handle=thread_handle;
thread->tid=tid;
- thread->synch_lock=mono_object_new (domain, mono_defaults.object_class);
+ thread->stack_ptr = &tid;
+ MONO_OBJECT_SETREF (thread, synch_lock, mono_object_new (domain, mono_defaults.object_class));
- THREAD_DEBUG (g_message (G_GNUC_PRETTY_FUNCTION ": Attached thread ID %d (handle %p)",
- tid, thread_handle));
+ THREAD_DEBUG (g_message ("%s: Attached thread ID %"G_GSIZE_FORMAT" (handle %p)", __func__, tid, thread_handle));
handle_store(thread);
- THREAD_DEBUG (g_message (G_GNUC_PRETTY_FUNCTION ": (%d) Setting current_object_key to %p",
- GetCurrentThreadId (), thread));
+ THREAD_DEBUG (g_message ("%s: (%"G_GSIZE_FORMAT") Setting current_object_key to %p", __func__, GetCurrentThreadId (), thread));
SET_CURRENT_OBJECT (thread);
mono_domain_set (domain, TRUE);
{
g_return_if_fail (thread != NULL);
- THREAD_DEBUG (g_message (G_GNUC_PRETTY_FUNCTION "mono_thread_detach for %d\n", thread->tid));
- SET_CURRENT_OBJECT (NULL);
+ THREAD_DEBUG (g_message ("%s: mono_thread_detach for %"G_GSIZE_FORMAT, __func__, (gsize)thread->tid));
thread_cleanup (thread);
+
+ SET_CURRENT_OBJECT (NULL);
+
+ /* Don't need to CloseHandle this thread, even though we took a
+ * reference in mono_thread_attach (), because the GC will do it
+ * when the Thread object is finalised.
+ */
}
void
{
MonoThread *thread = mono_thread_current ();
- SET_CURRENT_OBJECT (NULL);
thread_cleanup (thread);
+ SET_CURRENT_OBJECT (NULL);
/* we could add a callback here for embedders to use. */
if (thread == mono_thread_get_main ())
{
guint32 (*start_func)(void *);
struct StartInfo *start_info;
- MonoMethod *im;
HANDLE thread;
- guint32 tid;
+ gsize tid;
MONO_ARCH_SAVE_REGS;
- THREAD_DEBUG (g_message(G_GNUC_PRETTY_FUNCTION
- ": Trying to start a new thread: this (%p) start (%p)", this, start));
+ THREAD_DEBUG (g_message("%s: Trying to start a new thread: this (%p) start (%p)", __func__, this, start));
-/* FIXME: remove the code inside BROKEN_THREAD_START once martin gets rid of the
- * thread_start_compile_func stuff.
- */
-#define BROKEN_THREAD_START
-#ifdef BROKEN_THREAD_START
- im = mono_get_delegate_invoke (start->vtable->klass);
- im = mono_marshal_get_delegate_invoke (im);
- if (mono_thread_callbacks)
- start_func = (* mono_thread_callbacks->thread_start_compile_func) (im);
- else
- start_func = mono_compile_method (im);
+ mono_monitor_enter (this->synch_lock);
- if(start_func==NULL) {
- g_warning(G_GNUC_PRETTY_FUNCTION
- ": Can't locate start method!");
- return(NULL);
- } else {
-#else
+ if ((this->state & ThreadState_Unstarted) == 0) {
+ mono_monitor_exit (this->synch_lock);
+ mono_raise_exception (mono_get_exception_thread_state ("Thread has already been started."));
+ return NULL;
+ }
+
+ if ((this->state & ThreadState_Aborted) != 0) {
+ mono_monitor_exit (this->synch_lock);
+ return this;
+ }
start_func = NULL;
{
-#endif
/* This is freed in start_wrapper */
start_info = g_new0 (struct StartInfo, 1);
start_info->func = start_func;
-#ifdef BROKEN_THREAD_START
- start_info->start_arg = start;
-#else
- start_info->start_arg = this->start_obj;
-#endif
+ start_info->start_arg = this->start_obj; /* FIXME: GC object stored in unmanaged memory */
start_info->delegate = start;
start_info->obj = this;
start_info->domain = mono_domain_get ();
this->start_notify=CreateSemaphore (NULL, 0, 0x7fffffff, NULL);
if(this->start_notify==NULL) {
- g_warning (G_GNUC_PRETTY_FUNCTION ": CreateSemaphore error 0x%x", GetLastError ());
+ mono_monitor_exit (this->synch_lock);
+ g_warning ("%s: CreateSemaphore error 0x%x", __func__, GetLastError ());
return(NULL);
}
- thread=CreateThread(NULL, default_stacksize_for_thread (this), start_wrapper, start_info,
+ thread=CreateThread(NULL, default_stacksize_for_thread (this), (LPTHREAD_START_ROUTINE)start_wrapper, start_info,
CREATE_SUSPENDED, &tid);
if(thread==NULL) {
- g_warning(G_GNUC_PRETTY_FUNCTION
- ": CreateThread error 0x%x", GetLastError());
+ mono_monitor_exit (this->synch_lock);
+ g_warning("%s: CreateThread error 0x%x", __func__, GetLastError());
return(NULL);
}
* store the handle till then.
*/
- THREAD_DEBUG (g_message (G_GNUC_PRETTY_FUNCTION
- ": Started thread ID %d (handle %p)", tid, thread));
+ mono_thread_start (this);
+
+ this->state &= ~ThreadState_Unstarted;
+
+ THREAD_DEBUG (g_message ("%s: Started thread ID %"G_GSIZE_FORMAT" (handle %p)", __func__, tid, thread));
+ mono_monitor_exit (this->synch_lock);
return(thread);
}
}
{
MONO_ARCH_SAVE_REGS;
- THREAD_DEBUG (g_message (G_GNUC_PRETTY_FUNCTION ": Closing thread %p, handle %p",
- this, thread));
+ THREAD_DEBUG (g_message ("%s: Closing thread %p, handle %p", __func__, this, thread));
CloseHandle (thread);
}
-void ves_icall_System_Threading_Thread_Start_internal(MonoThread *this,
- HANDLE thread)
+static void mono_thread_start (MonoThread *thread)
{
MONO_ARCH_SAVE_REGS;
- THREAD_DEBUG (g_message (G_GNUC_PRETTY_FUNCTION ": (%d) Launching thread %p (%d)",
- GetCurrentThreadId (), this, this->tid));
+ THREAD_DEBUG (g_message ("%s: (%"G_GSIZE_FORMAT") Launching thread %p (%"G_GSIZE_FORMAT")", __func__, GetCurrentThreadId (), thread, (gsize)thread->tid));
/* Only store the handle when the thread is about to be
* launched, to avoid the main thread deadlocking while trying
* to clean up a thread that will never be signalled.
*/
- handle_store(this);
-
- if (mono_thread_callbacks)
- (* mono_thread_callbacks->start_resume) (this->tid);
-
- ResumeThread(thread);
+ handle_store (thread);
- if (mono_thread_callbacks)
- (* mono_thread_callbacks->end_resume) (this->tid);
+ ResumeThread (thread->handle);
- if(this->start_notify!=NULL) {
+ if(thread->start_notify!=NULL) {
/* Wait for the thread to set up its TLS data etc, so
* theres no potential race condition if someone tries
* to look up the data believing the thread has
* started
*/
- THREAD_DEBUG (g_message (G_GNUC_PRETTY_FUNCTION
- ": (%d) waiting for thread %p (%d) to start",
- GetCurrentThreadId (), this, this->tid));
+ THREAD_DEBUG (g_message ("%s: (%"G_GSIZE_FORMAT") waiting for thread %p (%"G_GSIZE_FORMAT") to start", __func__, GetCurrentThreadId (), thread, (gsize)thread->tid));
- WaitForSingleObjectEx (this->start_notify, INFINITE, FALSE);
- CloseHandle (this->start_notify);
- this->start_notify=NULL;
+ WaitForSingleObjectEx (thread->start_notify, INFINITE, FALSE);
+ CloseHandle (thread->start_notify);
+ thread->start_notify = NULL;
}
- THREAD_DEBUG (g_message (G_GNUC_PRETTY_FUNCTION
- ": (%d) Done launching thread %p (%d)",
- GetCurrentThreadId (), this, this->tid));
+ THREAD_DEBUG (g_message ("%s: (%"G_GSIZE_FORMAT") Done launching thread %p (%"G_GSIZE_FORMAT")", __func__, GetCurrentThreadId (), thread, (gsize)thread->tid));
}
void ves_icall_System_Threading_Thread_Sleep_internal(gint32 ms)
MONO_ARCH_SAVE_REGS;
- THREAD_DEBUG (g_message (G_GNUC_PRETTY_FUNCTION ": Sleeping for %d ms", ms));
+ THREAD_DEBUG (g_message ("%s: Sleeping for %d ms", __func__, ms));
+ mono_thread_current_check_pending_interrupt ();
+
mono_monitor_enter (thread->synch_lock);
thread->state |= ThreadState_WaitSleepJoin;
mono_monitor_exit (thread->synch_lock);
mono_monitor_exit (thread->synch_lock);
}
+void ves_icall_System_Threading_Thread_SpinWait_internal (gint32 iterations)
+{
+ gint32 i;
+
+ for(i = 0; i < iterations; i++) {
+ /* We're busy waiting, but at least we can tell the
+ * scheduler to let someone else have a go...
+ */
+ Sleep (0);
+ }
+}
+
gint32
ves_icall_System_Threading_Thread_GetDomainID (void)
{
MonoString*
ves_icall_System_Threading_Thread_GetName_internal (MonoThread *this_obj)
{
+ MonoString* str;
+ mono_monitor_enter (this_obj->synch_lock);
+
if (!this_obj->name)
- return NULL;
+ str = NULL;
else
- return mono_string_new_utf16 (mono_domain_get (), this_obj->name, this_obj->name_len);
+ str = mono_string_new_utf16 (mono_domain_get (), this_obj->name, this_obj->name_len);
+
+ mono_monitor_exit (this_obj->synch_lock);
+ return str;
}
void
ves_icall_System_Threading_Thread_SetName_internal (MonoThread *this_obj, MonoString *name)
{
- if (this_obj->name)
- g_free (this_obj->name);
+ mono_monitor_enter (this_obj->synch_lock);
+
+ if (this_obj->name) {
+ mono_monitor_exit (this_obj->synch_lock);
+ mono_raise_exception (mono_get_exception_invalid_operation ("Thread.Name can only be set once."));
+ return;
+ }
if (name) {
this_obj->name = g_new (gunichar2, mono_string_length (name));
memcpy (this_obj->name, mono_string_chars (name), mono_string_length (name) * 2);
}
else
this_obj->name = NULL;
+
+ mono_monitor_exit (this_obj->synch_lock);
}
-MonoObject*
-ves_icall_System_Threading_Thread_GetCachedCurrentCulture (MonoThread *this)
+static MonoObject*
+lookup_cached_culture (MonoThread *this, MonoDomain *domain, int start_idx)
{
MonoObject *res;
- MonoDomain *domain;
int i;
- /* No need to lock here */
- if (this->culture_info) {
+ if (this->cached_culture_info) {
domain = mono_domain_get ();
- for (i = 0; i < NUM_CACHED_CULTURES; ++i) {
- res = this->culture_info [i];
+ for (i = start_idx; i < start_idx + NUM_CACHED_CULTURES; ++i) {
+ res = mono_array_get (this->cached_culture_info, MonoObject*, i);
if (res && res->vtable->domain == domain)
return res;
}
return NULL;
}
+MonoObject*
+ves_icall_System_Threading_Thread_GetCachedCurrentCulture (MonoThread *this)
+{
+ return lookup_cached_culture (this, mono_domain_get (), CULTURES_START_IDX);
+}
+
MonoArray*
ves_icall_System_Threading_Thread_GetSerializedCurrentCulture (MonoThread *this)
{
if (this->serialized_culture_info) {
res = mono_array_new (mono_domain_get (), mono_defaults.byte_class, this->serialized_culture_info_len);
memcpy (mono_array_addr (res, guint8, 0), this->serialized_culture_info, this->serialized_culture_info_len);
- }
- else
+ } else {
res = NULL;
+ }
mono_monitor_exit (this->synch_lock);
return res;
}
-void
-ves_icall_System_Threading_Thread_SetCachedCurrentCulture (MonoThread *this, MonoObject *culture)
+static void
+cache_culture (MonoThread *this, MonoObject *culture, int start_idx)
{
int i;
MonoDomain *domain = mono_domain_get ();
+ MonoObject *obj;
+ int free_slot = -1;
+ int same_domain_slot = -1;
mono_monitor_enter (this->synch_lock);
- if (!this->culture_info) {
- this->culture_info = mono_gc_alloc_fixed (sizeof (MonoObject*) * NUM_CACHED_CULTURES, NULL);
- }
-
- for (i = 0; i < NUM_CACHED_CULTURES; ++i) {
- if (this->culture_info [i]) {
- if (this->culture_info [i]->vtable->domain == domain)
- /* Replace */
- break;
+ if (!this->cached_culture_info)
+ this->cached_culture_info = mono_array_new (mono_object_domain (this), mono_defaults.object_class, NUM_CACHED_CULTURES * 2);
+
+ for (i = start_idx; i < start_idx + NUM_CACHED_CULTURES; ++i) {
+ obj = mono_array_get (this->cached_culture_info, MonoObject*, i);
+ /* Free entry */
+ if (!obj) {
+ free_slot = i;
+ /* we continue, because there may be a slot used with the same domain */
+ continue;
}
- else
- /* Free entry */
+ /* Replace */
+ if (obj->vtable->domain == domain) {
+ same_domain_slot = i;
break;
+ }
}
- if (i < NUM_CACHED_CULTURES)
- this->culture_info [i] = culture;
+ if (same_domain_slot >= 0)
+ mono_array_setref (this->cached_culture_info, same_domain_slot, culture);
+ else if (free_slot >= 0)
+ mono_array_setref (this->cached_culture_info, free_slot, culture);
+ /* we may want to replace an existing entry here, even when no suitable slot is found */
mono_monitor_exit (this->synch_lock);
}
+void
+ves_icall_System_Threading_Thread_SetCachedCurrentCulture (MonoThread *this, MonoObject *culture)
+{
+ cache_culture (this, culture, CULTURES_START_IDX);
+}
+
void
ves_icall_System_Threading_Thread_SetSerializedCurrentCulture (MonoThread *this, MonoArray *arr)
{
MonoObject*
ves_icall_System_Threading_Thread_GetCachedCurrentUICulture (MonoThread *this)
{
- MonoObject *res;
- MonoDomain *domain;
- int i;
-
- /* No need to lock here */
- if (this->ui_culture_info) {
- domain = mono_domain_get ();
- for (i = 0; i < NUM_CACHED_CULTURES; ++i) {
- res = this->ui_culture_info [i];
- if (res && res->vtable->domain == domain)
- return res;
- }
- }
-
- return NULL;
+ return lookup_cached_culture (this, mono_domain_get (), UICULTURES_START_IDX);
}
MonoArray*
if (this->serialized_ui_culture_info) {
res = mono_array_new (mono_domain_get (), mono_defaults.byte_class, this->serialized_ui_culture_info_len);
memcpy (mono_array_addr (res, guint8, 0), this->serialized_ui_culture_info, this->serialized_ui_culture_info_len);
- }
- else
+ } else {
res = NULL;
+ }
mono_monitor_exit (this->synch_lock);
return res;
void
ves_icall_System_Threading_Thread_SetCachedCurrentUICulture (MonoThread *this, MonoObject *culture)
{
- int i;
- MonoDomain *domain = mono_domain_get ();
-
- mono_monitor_enter (this->synch_lock);
- if (!this->ui_culture_info) {
- this->ui_culture_info = mono_gc_alloc_fixed (sizeof (MonoObject*) * NUM_CACHED_CULTURES, NULL);
- }
-
- for (i = 0; i < NUM_CACHED_CULTURES; ++i) {
- if (this->ui_culture_info [i]) {
- if (this->ui_culture_info [i]->vtable->domain == domain)
- /* Replace */
- break;
- }
- else
- /* Free entry */
- break;
- }
- if (i < NUM_CACHED_CULTURES)
- this->ui_culture_info [i] = culture;
- mono_monitor_exit (this->synch_lock);
+ cache_culture (this, culture, UICULTURES_START_IDX);
}
void
MonoThread *
mono_thread_current (void)
{
- THREAD_DEBUG (g_message (G_GNUC_PRETTY_FUNCTION ": returning %p", GET_CURRENT_OBJECT ()));
+ THREAD_DEBUG (g_message ("%s: returning %p", __func__, GET_CURRENT_OBJECT ()));
return GET_CURRENT_OBJECT ();
}
MONO_ARCH_SAVE_REGS;
mono_monitor_enter (this->synch_lock);
+
+ if ((this->state & ThreadState_Unstarted) != 0) {
+ mono_monitor_exit (this->synch_lock);
+ mono_raise_exception (mono_get_exception_thread_state ("Thread has not been started."));
+ return FALSE;
+ }
+
+ mono_thread_current_check_pending_interrupt ();
+
this->state |= ThreadState_WaitSleepJoin;
mono_monitor_exit (this->synch_lock);
if(ms== -1) {
ms=INFINITE;
}
- THREAD_DEBUG (g_message (G_GNUC_PRETTY_FUNCTION ": joining thread handle %p, %d ms",
- thread, ms));
+ THREAD_DEBUG (g_message ("%s: joining thread handle %p, %d ms", __func__, thread, ms));
ret=WaitForSingleObjectEx (thread, ms, TRUE);
mono_monitor_exit (this->synch_lock);
if(ret==WAIT_OBJECT_0) {
- THREAD_DEBUG (g_message (G_GNUC_PRETTY_FUNCTION ": join successful"));
+ THREAD_DEBUG (g_message ("%s: join successful", __func__));
return(TRUE);
}
- THREAD_DEBUG (g_message (G_GNUC_PRETTY_FUNCTION ": join failed"));
+ THREAD_DEBUG (g_message ("%s: join failed", __func__));
return(FALSE);
}
MONO_ARCH_SAVE_REGS;
+ /* Do this WaitSleepJoin check before creating objects */
+ mono_thread_current_check_pending_interrupt ();
+
numhandles = mono_array_length(mono_handles);
handles = g_new0(HANDLE, numhandles);
g_free(handles);
if(ret==WAIT_FAILED) {
- THREAD_WAIT_DEBUG (g_message (G_GNUC_PRETTY_FUNCTION ": (%d) Wait failed",
- GetCurrentThreadId ()));
+ THREAD_WAIT_DEBUG (g_message ("%s: (%"G_GSIZE_FORMAT") Wait failed", __func__, GetCurrentThreadId ()));
return(FALSE);
} else if(ret==WAIT_TIMEOUT || ret == WAIT_IO_COMPLETION) {
/* Do we want to try again if we get
* WaitHandle doesn't give any clues. (We'd have to
* fiddle with the timeout if we retry.)
*/
- THREAD_WAIT_DEBUG (g_message (G_GNUC_PRETTY_FUNCTION ": (%d) Wait timed out",
- GetCurrentThreadId ()));
+ THREAD_WAIT_DEBUG (g_message ("%s: (%"G_GSIZE_FORMAT") Wait timed out", __func__, GetCurrentThreadId ()));
return(FALSE);
}
MONO_ARCH_SAVE_REGS;
+ /* Do this WaitSleepJoin check before creating objects */
+ mono_thread_current_check_pending_interrupt ();
+
numhandles = mono_array_length(mono_handles);
handles = g_new0(HANDLE, numhandles);
g_free(handles);
- THREAD_WAIT_DEBUG (g_message (G_GNUC_PRETTY_FUNCTION ": (%d) returning %d",
- GetCurrentThreadId (), ret));
+ THREAD_WAIT_DEBUG (g_message ("%s: (%"G_GSIZE_FORMAT") returning %d", __func__, GetCurrentThreadId (), ret));
/*
* These need to be here. See MSDN dos on WaitForMultipleObjects.
MONO_ARCH_SAVE_REGS;
- THREAD_WAIT_DEBUG (g_message (G_GNUC_PRETTY_FUNCTION ": (%d) waiting for %p, %d ms",
- GetCurrentThreadId (), handle, ms));
+ THREAD_WAIT_DEBUG (g_message ("%s: (%"G_GSIZE_FORMAT") waiting for %p, %d ms", __func__, GetCurrentThreadId (), handle, ms));
if(ms== -1) {
ms=INFINITE;
}
+ mono_thread_current_check_pending_interrupt ();
+
mono_monitor_enter (thread->synch_lock);
thread->state |= ThreadState_WaitSleepJoin;
mono_monitor_exit (thread->synch_lock);
mono_monitor_exit (thread->synch_lock);
if(ret==WAIT_FAILED) {
- THREAD_WAIT_DEBUG (g_message (G_GNUC_PRETTY_FUNCTION ": (%d) Wait failed",
- GetCurrentThreadId ()));
+ THREAD_WAIT_DEBUG (g_message ("%s: (%"G_GSIZE_FORMAT") Wait failed", __func__, GetCurrentThreadId ()));
return(FALSE);
} else if(ret==WAIT_TIMEOUT || ret == WAIT_IO_COMPLETION) {
/* Do we want to try again if we get
* WaitHandle doesn't give any clues. (We'd have to
* fiddle with the timeout if we retry.)
*/
- THREAD_WAIT_DEBUG (g_message (G_GNUC_PRETTY_FUNCTION ": (%d) Wait timed out",
- GetCurrentThreadId ()));
+ THREAD_WAIT_DEBUG (g_message ("%s: (%"G_GSIZE_FORMAT") Wait timed out", __func__, GetCurrentThreadId ()));
return(FALSE);
}
ReleaseMutex(handle);
}
-HANDLE ves_icall_System_Threading_Events_CreateEvent_internal (MonoBoolean manual, MonoBoolean initial, MonoString *name) {
+HANDLE ves_icall_System_Threading_Mutex_OpenMutex_internal (MonoString *name,
+ gint32 rights,
+ gint32 *error)
+{
+ HANDLE ret;
+
+ MONO_ARCH_SAVE_REGS;
+
+ *error = ERROR_SUCCESS;
+
+ ret = OpenMutex (rights, FALSE, mono_string_chars (name));
+ if (ret == NULL) {
+ *error = GetLastError ();
+ }
+
+ return(ret);
+}
+
+
+HANDLE ves_icall_System_Threading_Semaphore_CreateSemaphore_internal (gint32 initialCount, gint32 maximumCount, MonoString *name, MonoBoolean *created)
+{
+ HANDLE sem;
+
+ MONO_ARCH_SAVE_REGS;
+
+ *created = TRUE;
+
+ if (name == NULL) {
+ sem = CreateSemaphore (NULL, initialCount, maximumCount, NULL);
+ } else {
+ sem = CreateSemaphore (NULL, initialCount, maximumCount,
+ mono_string_chars (name));
+
+ if (GetLastError () == ERROR_ALREADY_EXISTS) {
+ *created = FALSE;
+ }
+ }
+
+ return(sem);
+}
+
+gint32 ves_icall_System_Threading_Semaphore_ReleaseSemaphore_internal (HANDLE handle, gint32 releaseCount, MonoBoolean *fail)
+{
+ gint32 prevcount;
+
+ MONO_ARCH_SAVE_REGS;
+
+ *fail = !ReleaseSemaphore (handle, releaseCount, &prevcount);
+
+ return (prevcount);
+}
+
+HANDLE ves_icall_System_Threading_Semaphore_OpenSemaphore_internal (MonoString *name, gint32 rights, gint32 *error)
+{
+ HANDLE ret;
+
+ MONO_ARCH_SAVE_REGS;
+
+ *error = ERROR_SUCCESS;
+
+ ret = OpenSemaphore (rights, FALSE, mono_string_chars (name));
+ if (ret == NULL) {
+ *error = GetLastError ();
+ }
+
+ return(ret);
+}
+
+HANDLE ves_icall_System_Threading_Events_CreateEvent_internal (MonoBoolean manual, MonoBoolean initial, MonoString *name, MonoBoolean *created)
+{
+ HANDLE event;
+
MONO_ARCH_SAVE_REGS;
- return(CreateEvent (NULL, manual, initial,
- name==NULL?NULL:mono_string_chars (name)));
+ *created = TRUE;
+
+ if (name == NULL) {
+ event = CreateEvent (NULL, manual, initial, NULL);
+ } else {
+ event = CreateEvent (NULL, manual, initial,
+ mono_string_chars (name));
+
+ if (GetLastError () == ERROR_ALREADY_EXISTS) {
+ *created = FALSE;
+ }
+ }
+
+ return(event);
}
gboolean ves_icall_System_Threading_Events_SetEvent_internal (HANDLE handle) {
CloseHandle (handle);
}
+HANDLE ves_icall_System_Threading_Events_OpenEvent_internal (MonoString *name,
+ gint32 rights,
+ gint32 *error)
+{
+ HANDLE ret;
+
+ MONO_ARCH_SAVE_REGS;
+
+ *error = ERROR_SUCCESS;
+
+ ret = OpenEvent (rights, FALSE, mono_string_chars (name));
+ if (ret == NULL) {
+ *error = GetLastError ();
+ }
+
+ return(ret);
+}
+
gint32 ves_icall_System_Threading_Interlocked_Increment_Int (gint32 *location)
{
MONO_ARCH_SAVE_REGS;
MONO_ARCH_SAVE_REGS;
- EnterCriticalSection(&interlocked_mutex);
+ mono_interlocked_lock ();
ret = ++ *location;
- LeaveCriticalSection(&interlocked_mutex);
+ mono_interlocked_unlock ();
return ret;
MONO_ARCH_SAVE_REGS;
- EnterCriticalSection(&interlocked_mutex);
+ mono_interlocked_lock ();
ret = -- *location;
- LeaveCriticalSection(&interlocked_mutex);
+ mono_interlocked_unlock ();
return ret;
}
* According to MSDN, this function is only atomic with regards to the
* other Interlocked functions on 32 bit platforms.
*/
- EnterCriticalSection(&interlocked_mutex);
+ mono_interlocked_lock ();
res = *location;
*location = value;
- LeaveCriticalSection(&interlocked_mutex);
+ mono_interlocked_unlock ();
return res;
#endif
* According to MSDN, this function is only atomic with regards to the
* other Interlocked functions on 32 bit platforms.
*/
- EnterCriticalSection(&interlocked_mutex);
+ mono_interlocked_lock ();
res = *location;
*location = value;
- LeaveCriticalSection(&interlocked_mutex);
+ mono_interlocked_unlock ();
return res;
#endif
#else
gdouble old;
- EnterCriticalSection(&interlocked_mutex);
+ mono_interlocked_lock ();
old = *location;
if (old == comparand)
*location = value;
- LeaveCriticalSection(&interlocked_mutex);
+ mono_interlocked_unlock ();
return old;
#endif
#else
gint64 old;
- EnterCriticalSection(&interlocked_mutex);
+ mono_interlocked_lock ();
old = *location;
if (old == comparand)
*location = value;
- LeaveCriticalSection(&interlocked_mutex);
+ mono_interlocked_unlock ();
return old;
#endif
}
+MonoObject*
+ves_icall_System_Threading_Interlocked_CompareExchange_T (MonoObject **location, MonoObject *value, MonoObject *comparand)
+{
+ MONO_ARCH_SAVE_REGS;
+
+ return InterlockedCompareExchangePointer ((gpointer *)location, value, comparand);
+}
+
+MonoObject*
+ves_icall_System_Threading_Interlocked_Exchange_T (MonoObject **location, MonoObject *value)
+{
+ MONO_ARCH_SAVE_REGS;
+
+ return InterlockedExchangePointer ((gpointer *)location, value);
+}
+
gint32
ves_icall_System_Threading_Interlocked_Add_Int (gint32 *location, gint32 value)
{
#else
gint32 orig;
- EnterCriticalSection(&interlocked_mutex);
+ mono_interlocked_lock ();
orig = *location;
*location = orig + value;
- LeaveCriticalSection(&interlocked_mutex);
+ mono_interlocked_unlock ();
- return orig;
+ return orig + value;
#endif
}
#else
gint64 orig;
- EnterCriticalSection(&interlocked_mutex);
+ mono_interlocked_lock ();
orig = *location;
*location = orig + value;
- LeaveCriticalSection(&interlocked_mutex);
+ mono_interlocked_unlock ();
- return orig;
+ return orig + value;
#endif
}
#else
gint64 res;
- EnterCriticalSection(&interlocked_mutex);
+ mono_interlocked_lock ();
res = *location;
- LeaveCriticalSection(&interlocked_mutex);
+ mono_interlocked_unlock ();
return res;
#endif
}
+void
+ves_icall_System_Threading_Thread_MemoryBarrier (void)
+{
+ /* Should be implemented as a JIT intrinsic */
+ mono_raise_exception (mono_get_exception_not_implemented (NULL));
+}
+
+void
+ves_icall_System_Threading_Thread_ClrState (MonoThread* this, guint32 state)
+{
+ mono_monitor_enter (this->synch_lock);
+ this->state &= ~state;
+ if (state & ThreadState_Background) {
+ /* If the thread changes the background mode, the main thread has to
+ * be notified, since it has to rebuild the list of threads to
+ * wait for.
+ */
+ SetEvent (background_change_event);
+ }
+ mono_monitor_exit (this->synch_lock);
+}
+
+void
+ves_icall_System_Threading_Thread_SetState (MonoThread* this, guint32 state)
+{
+ mono_monitor_enter (this->synch_lock);
+ this->state |= state;
+ if (state & ThreadState_Background) {
+ /* If the thread changes the background mode, the main thread has to
+ * be notified, since it has to rebuild the list of threads to
+ * wait for.
+ */
+ SetEvent (background_change_event);
+ }
+ mono_monitor_exit (this->synch_lock);
+}
+
+guint32
+ves_icall_System_Threading_Thread_GetState (MonoThread* this)
+{
+ guint32 state;
+ mono_monitor_enter (this->synch_lock);
+ state = this->state;
+ mono_monitor_exit (this->synch_lock);
+ return state;
+}
+
+void ves_icall_System_Threading_Thread_Interrupt_internal (MonoThread *this)
+{
+ gboolean throw = FALSE;
+
+ mono_monitor_enter (this->synch_lock);
+
+ /* Clear out any previous request */
+ this->thread_interrupt_requested = FALSE;
+
+ if (this->state & ThreadState_WaitSleepJoin) {
+ throw = TRUE;
+ } else {
+ this->thread_interrupt_requested = TRUE;
+ }
+
+ mono_monitor_exit (this->synch_lock);
+
+ if (throw) {
+ signal_thread_state_change (this);
+ }
+}
+
+void mono_thread_current_check_pending_interrupt ()
+{
+ MonoThread *thread = mono_thread_current ();
+ gboolean throw = FALSE;
+
+ mono_monitor_enter (thread->synch_lock);
+
+ if (thread->thread_interrupt_requested) {
+ throw = TRUE;
+ thread->thread_interrupt_requested = FALSE;
+ }
+
+ mono_monitor_exit (thread->synch_lock);
+
+ if (throw) {
+ mono_raise_exception (mono_get_exception_thread_interrupted ());
+ }
+}
+
int
mono_thread_get_abort_signal (void)
{
-#ifdef __MINGW32__
+#if defined (__MINGW32__) || defined (_MSC_VER)
return -1;
#else
#ifndef SIGRTMIN
return SIGUSR1;
#else
+ static int abort_signum = -1;
+ int i;
+ if (abort_signum != -1)
+ return abort_signum;
+ /* we try to avoid SIGRTMIN and any one that might have been set already, see bug #75387 */
+ for (i = SIGRTMIN + 1; i < SIGRTMAX; ++i) {
+ struct sigaction sinfo;
+ sigaction (i, NULL, &sinfo);
+ if (sinfo.sa_handler == SIG_DFL && (void*)sinfo.sa_sigaction == (void*)SIG_DFL) {
+ abort_signum = i;
+ return i;
+ }
+ }
+ /* fallback to the old way */
return SIGRTMIN;
#endif
-#endif /* __MINGW32__ */
+#endif /*defined (__MINGW32__) || defined (_MSC_VER) */
}
-#ifdef __MINGW32__
-static CALLBACK void interruption_request_apc (ULONG_PTR param)
+#if defined (__MINGW32__) || defined (_MSC_VER)
+static void CALLBACK interruption_request_apc (ULONG_PTR param)
{
MonoException* exc = mono_thread_request_interruption (FALSE);
if (exc) mono_raise_exception (exc);
- return 0;
}
-#endif /* __MINGW32__ */
+#endif /* defined (__MINGW32__) || defined (_MSC_VER) */
/*
* signal_thread_state_change
mono_raise_exception (exc);
}
-#ifdef __MINGW32__
- QueueUserAPC (interruption_request_apc, thread->handle, NULL);
+#if defined (__MINGW32__) || defined (_MSC_VER)
+ QueueUserAPC ((PAPCFUNC)interruption_request_apc, thread->handle, NULL);
#else
/* fixme: store the state somewhere */
#ifdef PTHREAD_POINTER_ID
- pthread_kill (GUINT_TO_POINTER(thread->tid), mono_thread_get_abort_signal ());
+ pthread_kill ((gpointer)(gsize)(thread->tid), mono_thread_get_abort_signal ());
#else
pthread_kill (thread->tid, mono_thread_get_abort_signal ());
#endif
-#endif /* __MINGW32__ */
+#endif /* defined (__MINGW32__) || defined (__MSC_VER) */
}
void
mono_monitor_enter (thread->synch_lock);
if ((thread->state & ThreadState_AbortRequested) != 0 ||
- (thread->state & ThreadState_StopRequested) != 0)
+ (thread->state & ThreadState_StopRequested) != 0 ||
+ (thread->state & ThreadState_Stopped) != 0)
{
mono_monitor_exit (thread->synch_lock);
return;
}
+ if ((thread->state & ThreadState_Unstarted) != 0) {
+ thread->state |= ThreadState_Aborted;
+ mono_monitor_exit (thread->synch_lock);
+ return;
+ }
+
thread->state |= ThreadState_AbortRequested;
- thread->abort_state = state;
+ MONO_OBJECT_SETREF (thread, abort_state, state);
thread->abort_exc = NULL;
mono_monitor_exit (thread->synch_lock);
- THREAD_DEBUG (g_message (G_GNUC_PRETTY_FUNCTION
- ": (%d) Abort requested for %p (%d)", GetCurrentThreadId (),
- thread, thread->tid));
+ THREAD_DEBUG (g_message ("%s: (%"G_GSIZE_FORMAT") Abort requested for %p (%"G_GSIZE_FORMAT")", __func__, GetCurrentThreadId (), thread, (gsize)thread->tid));
/* Make sure the thread is awake */
- ves_icall_System_Threading_Thread_Resume (thread);
+ mono_thread_resume (thread);
signal_thread_state_change (thread);
}
MONO_ARCH_SAVE_REGS;
mono_monitor_enter (thread->synch_lock);
-
+
thread->state &= ~ThreadState_AbortRequested;
if (!thread->abort_exc) {
mono_monitor_exit (thread->synch_lock);
}
-void
-ves_icall_System_Threading_Thread_Suspend (MonoThread *thread)
+static gboolean
+mono_thread_suspend (MonoThread *thread)
{
MONO_ARCH_SAVE_REGS;
mono_monitor_enter (thread->synch_lock);
+ if ((thread->state & ThreadState_Unstarted) != 0 ||
+ (thread->state & ThreadState_Aborted) != 0 ||
+ (thread->state & ThreadState_Stopped) != 0)
+ {
+ mono_monitor_exit (thread->synch_lock);
+ return FALSE;
+ }
+
if ((thread->state & ThreadState_Suspended) != 0 ||
(thread->state & ThreadState_SuspendRequested) != 0 ||
(thread->state & ThreadState_StopRequested) != 0)
{
mono_monitor_exit (thread->synch_lock);
- return;
+ return TRUE;
}
thread->state |= ThreadState_SuspendRequested;
mono_monitor_exit (thread->synch_lock);
signal_thread_state_change (thread);
+ return TRUE;
}
void
-ves_icall_System_Threading_Thread_Resume (MonoThread *thread)
+ves_icall_System_Threading_Thread_Suspend (MonoThread *thread)
+{
+ if (!mono_thread_suspend (thread))
+ mono_raise_exception (mono_get_exception_thread_state ("Thread has not been started, or is dead."));
+}
+
+static gboolean
+mono_thread_resume (MonoThread *thread)
{
MONO_ARCH_SAVE_REGS;
if ((thread->state & ThreadState_SuspendRequested) != 0) {
thread->state &= ~ThreadState_SuspendRequested;
mono_monitor_exit (thread->synch_lock);
- return;
+ return TRUE;
}
-
- if ((thread->state & ThreadState_Suspended) == 0)
+
+ if ((thread->state & ThreadState_Suspended) == 0 ||
+ (thread->state & ThreadState_Unstarted) != 0 ||
+ (thread->state & ThreadState_Aborted) != 0 ||
+ (thread->state & ThreadState_Stopped) != 0)
{
mono_monitor_exit (thread->synch_lock);
- return;
+ return FALSE;
}
thread->resume_event = CreateEvent (NULL, TRUE, FALSE, NULL);
+ if (thread->resume_event == NULL) {
+ mono_monitor_exit (thread->synch_lock);
+ return(FALSE);
+ }
/* Awake the thread */
SetEvent (thread->suspend_event);
WaitForSingleObject (thread->resume_event, INFINITE);
CloseHandle (thread->resume_event);
thread->resume_event = NULL;
+
+ return TRUE;
+}
+
+void
+ves_icall_System_Threading_Thread_Resume (MonoThread *thread)
+{
+ if (!mono_thread_resume (thread))
+ mono_raise_exception (mono_get_exception_thread_state ("Thread has not been started, or is dead."));
}
static gboolean
}
/* Make sure the thread is awake */
- ves_icall_System_Threading_Thread_Resume (thread);
-
+ mono_thread_resume (thread);
+
thread->state |= ThreadState_StopRequested;
thread->state &= ~ThreadState_AbortRequested;
InitializeCriticalSection(&threads_mutex);
InitializeCriticalSection(&interlocked_mutex);
InitializeCriticalSection(&contexts_mutex);
- InitializeCriticalSection(&interruption_mutex);
+ background_change_event = CreateEvent (NULL, TRUE, FALSE, NULL);
+ g_assert(background_change_event != NULL);
mono_init_static_data_info (&thread_static_info);
mono_init_static_data_info (&context_static_info);
current_object_key=TlsAlloc();
- THREAD_DEBUG (g_message (G_GNUC_PRETTY_FUNCTION ": Allocated current_object_key %d",
- current_object_key));
+ THREAD_DEBUG (g_message ("%s: Allocated current_object_key %d", __func__, current_object_key));
mono_thread_start_cb = start_cb;
mono_thread_attach_cb = attach_cb;
GetCurrentProcess ();
}
-void
-mono_threads_install_cleanup (MonoThreadCleanupFunc func)
+void mono_thread_cleanup (void)
{
- mono_thread_cleanup = func;
+#if !defined(PLATFORM_WIN32) && !defined(RUN_IN_SUBTHREAD)
+ /* The main thread must abandon any held mutexes (particularly
+ * important for named mutexes as they are shared across
+ * processes, see bug 74680.) This will happen when the
+ * thread exits, but if it's not running in a subthread it
+ * won't exit in time.
+ */
+ /* Using non-w32 API is a nasty kludge, but I couldn't find
+ * anything in the documentation that would let me do this
+ * here yet still be safe to call on windows.
+ */
+ _wapi_thread_signal_self (mono_environment_exitcode_get ());
+#endif
+
+#if 0
+ /* This stuff needs more testing, it seems one of these
+ * critical sections can be locked when mono_thread_cleanup is
+ * called.
+ */
+ DeleteCriticalSection (&threads_mutex);
+ DeleteCriticalSection (&interlocked_mutex);
+ DeleteCriticalSection (&contexts_mutex);
+ CloseHandle (background_change_event);
+#endif
+
+ TlsFree (current_object_key);
}
-void mono_install_thread_callbacks (MonoThreadCallbacks *callbacks)
+void
+mono_threads_install_cleanup (MonoThreadCleanupFunc func)
{
- mono_thread_callbacks = callbacks;
+ mono_thread_cleanup_fn = func;
}
-#ifdef THREAD_DEBUG
+G_GNUC_UNUSED
static void print_tids (gpointer key, gpointer value, gpointer user)
{
- g_message ("Waiting for: %d", GPOINTER_TO_UINT(key));
+ /* GPOINTER_TO_UINT breaks horribly if sizeof(void *) >
+ * sizeof(uint) and a cast to uint would overflow
+ */
+ /* Older versions of glib don't have G_GSIZE_FORMAT, so just
+ * print this as a pointer.
+ */
+ g_message ("Waiting for: %p", key);
}
-#endif
struct wait_data
{
{
guint32 i, ret;
- THREAD_DEBUG (g_message(G_GNUC_PRETTY_FUNCTION
- ": %d threads to wait for in this batch", wait->num));
+ THREAD_DEBUG (g_message("%s: %d threads to wait for in this batch", __func__, wait->num));
ret=WaitForMultipleObjectsEx(wait->num, wait->handles, TRUE, timeout, FALSE);
if(ret==WAIT_FAILED) {
/* See the comment in build_wait_tids() */
- THREAD_DEBUG (g_message (G_GNUC_PRETTY_FUNCTION ": Wait failed"));
+ THREAD_DEBUG (g_message ("%s: Wait failed", __func__));
return;
}
return;
for(i=0; i<wait->num; i++) {
- guint32 tid=wait->threads[i]->tid;
+ gsize tid = wait->threads[i]->tid;
- if(mono_g_hash_table_lookup (threads, GUINT_TO_POINTER(tid))!=NULL) {
+ if(mono_g_hash_table_lookup (threads, (gpointer)tid)!=NULL) {
/* This thread must have been killed, because
* it hasn't cleaned itself up. (It's just
* possible that the thread exited before the
* same thread.)
*/
- THREAD_DEBUG (g_message (G_GNUC_PRETTY_FUNCTION
- ": cleaning up after thread %d", tid));
+ THREAD_DEBUG (g_message ("%s: cleaning up after thread %"G_GSIZE_FORMAT, __func__, tid));
thread_cleanup (wait->threads[i]);
}
}
}
+static void wait_for_tids_or_state_change (struct wait_data *wait, guint32 timeout)
+{
+ guint32 i, ret, count;
+
+ THREAD_DEBUG (g_message("%s: %d threads to wait for in this batch", __func__, wait->num));
+
+ /* Add the thread state change event, so it wakes up if a thread changes
+ * to background mode.
+ */
+ count = wait->num;
+ if (count < MAXIMUM_WAIT_OBJECTS) {
+ wait->handles [count] = background_change_event;
+ count++;
+ }
+
+ ret=WaitForMultipleObjectsEx (count, wait->handles, FALSE, timeout, FALSE);
+
+ if(ret==WAIT_FAILED) {
+ /* See the comment in build_wait_tids() */
+ THREAD_DEBUG (g_message ("%s: Wait failed", __func__));
+ return;
+ }
+
+ for(i=0; i<wait->num; i++)
+ CloseHandle (wait->handles[i]);
+
+ if (ret == WAIT_TIMEOUT)
+ return;
+
+ if (ret < wait->num) {
+ gsize tid = wait->threads[ret]->tid;
+ mono_threads_lock ();
+ if (mono_g_hash_table_lookup (threads, (gpointer)tid)!=NULL) {
+ /* See comment in wait_for_tids about thread cleanup */
+ mono_threads_unlock ();
+ THREAD_DEBUG (g_message ("%s: cleaning up after thread %"G_GSIZE_FORMAT, __func__, tid));
+ thread_cleanup (wait->threads [ret]);
+ } else
+ mono_threads_unlock ();
+ }
+}
+
static void build_wait_tids (gpointer key, gpointer value, gpointer user)
{
struct wait_data *wait=(struct wait_data *)user;
MonoThread *thread=(MonoThread *)value;
/* Ignore background threads, we abort them later */
- if (thread->state & ThreadState_Background)
+ mono_monitor_enter (thread->synch_lock);
+ if (thread->state & ThreadState_Background) {
+ THREAD_DEBUG (g_message ("%s: ignoring background thread %"G_GSIZE_FORMAT, __func__, (gsize)thread->tid));
+ mono_monitor_exit (thread->synch_lock);
return; /* just leave, ignore */
+ }
+ mono_monitor_exit (thread->synch_lock);
- if (mono_gc_is_finalizer_thread (thread))
+ if (mono_gc_is_finalizer_thread (thread)) {
+ THREAD_DEBUG (g_message ("%s: ignoring finalizer thread %"G_GSIZE_FORMAT, __func__, (gsize)thread->tid));
return;
+ }
- if (thread == mono_thread_current ())
+ if (thread == mono_thread_current ()) {
+ THREAD_DEBUG (g_message ("%s: ignoring current thread %"G_GSIZE_FORMAT, __func__, (gsize)thread->tid));
return;
+ }
- if (thread == mono_thread_get_main ())
+ if (thread == mono_thread_get_main ()) {
+ THREAD_DEBUG (g_message ("%s: ignoring main thread %"G_GSIZE_FORMAT, __func__, (gsize)thread->tid));
return;
+ }
handle = OpenThread (THREAD_ALL_ACCESS, TRUE, thread->tid);
- if (handle == NULL)
+ if (handle == NULL) {
+ THREAD_DEBUG (g_message ("%s: ignoring unopenable thread %"G_GSIZE_FORMAT, __func__, (gsize)thread->tid));
return;
+ }
wait->handles[wait->num]=handle;
wait->threads[wait->num]=thread;
wait->num++;
+
+ THREAD_DEBUG (g_message ("%s: adding thread %"G_GSIZE_FORMAT, __func__, (gsize)thread->tid));
} else {
/* Just ignore the rest, we can't do anything with
* them yet
remove_and_abort_threads (gpointer key, gpointer value, gpointer user)
{
struct wait_data *wait=(struct wait_data *)user;
- guint32 self = GetCurrentThreadId ();
+ gsize self = GetCurrentThreadId ();
MonoThread *thread = (MonoThread *) value;
HANDLE handle;
+ if (wait->num >= MAXIMUM_WAIT_OBJECTS)
+ return FALSE;
+
/* The finalizer thread is not a background thread */
- if (thread->tid != self && thread->state & ThreadState_Background) {
+ if (thread->tid != self && (thread->state & ThreadState_Background) != 0) {
handle = OpenThread (THREAD_ALL_ACCESS, TRUE, thread->tid);
if (handle == NULL)
return FALSE;
- wait->handles[wait->num]=thread->handle;
- wait->threads[wait->num]=thread;
- wait->num++;
-
if(thread->state & ThreadState_AbortRequested ||
thread->state & ThreadState_Aborted) {
- THREAD_DEBUG (g_message (G_GNUC_PRETTY_FUNCTION ": Thread id %d already aborting", thread->tid));
+ THREAD_DEBUG (g_message ("%s: Thread id %"G_GSIZE_FORMAT" already aborting", __func__, (gsize)thread->tid));
return(TRUE);
}
-
- THREAD_DEBUG (g_print (G_GNUC_PRETTY_FUNCTION ": Aborting id: %d\n", thread->tid));
+
+ /* printf ("A: %d\n", wait->num); */
+ wait->handles[wait->num]=thread->handle;
+ wait->threads[wait->num]=thread;
+ wait->num++;
+
+ THREAD_DEBUG (g_print ("%s: Aborting id: %"G_GSIZE_FORMAT"\n", __func__, (gsize)thread->tid));
mono_thread_stop (thread);
return TRUE;
}
struct wait_data *wait=g_new0 (struct wait_data, 1);
/* join each thread that's still running */
- THREAD_DEBUG (g_message (G_GNUC_PRETTY_FUNCTION ": Joining each running thread..."));
+ THREAD_DEBUG (g_message ("%s: Joining each running thread...", __func__));
- EnterCriticalSection (&threads_mutex);
+ mono_threads_lock ();
if(threads==NULL) {
- THREAD_DEBUG (g_message(G_GNUC_PRETTY_FUNCTION ": No threads"));
- LeaveCriticalSection (&threads_mutex);
+ THREAD_DEBUG (g_message("%s: No threads", __func__));
+ mono_threads_unlock ();
return;
}
- LeaveCriticalSection (&threads_mutex);
+ mono_threads_unlock ();
do {
- EnterCriticalSection (&threads_mutex);
- THREAD_DEBUG (g_message (G_GNUC_PRETTY_FUNCTION
- ":There are %d threads to join", mono_g_hash_table_size (threads));
+ mono_threads_lock ();
+ THREAD_DEBUG (g_message ("%s: There are %d threads to join", __func__, mono_g_hash_table_size (threads));
mono_g_hash_table_foreach (threads, print_tids, NULL));
+ ResetEvent (background_change_event);
wait->num=0;
mono_g_hash_table_foreach (threads, build_wait_tids, wait);
- LeaveCriticalSection (&threads_mutex);
+ mono_threads_unlock ();
if(wait->num>0) {
/* Something to wait for */
- wait_for_tids (wait, INFINITE);
+ wait_for_tids_or_state_change (wait, INFINITE);
}
+ THREAD_DEBUG (g_message ("%s: I have %d threads after waiting.", __func__, wait->num));
} while(wait->num>0);
-
- mono_thread_pool_cleanup ();
- EnterCriticalSection(&threads_mutex);
+ mono_runtime_set_shutting_down ();
+
+ THREAD_DEBUG (g_message ("%s: threadpool cleanup", __func__));
+ mono_thread_pool_cleanup ();
/*
* Remove everything but the finalizer thread and self.
* Also abort all the background threads
* */
- wait->num = 0;
- mono_g_hash_table_foreach_remove (threads, remove_and_abort_threads, wait);
+ do {
+ mono_threads_lock ();
- LeaveCriticalSection(&threads_mutex);
+ wait->num = 0;
+ mono_g_hash_table_foreach_remove (threads, remove_and_abort_threads, wait);
- if(wait->num>0) {
- /* Something to wait for */
- wait_for_tids (wait, INFINITE);
- }
+ mono_threads_unlock ();
+
+ THREAD_DEBUG (g_message ("%s: wait->num is now %d", __func__, wait->num));
+ if(wait->num>0) {
+ /* Something to wait for */
+ wait_for_tids (wait, INFINITE);
+ }
+ } while (wait->num > 0);
+
/*
* give the subthreads a chance to really quit (this is mainly needed
* to get correct user and system times from getrusage/wait/time(1)).
static void terminate_thread (gpointer key, gpointer value, gpointer user)
{
MonoThread *thread=(MonoThread *)value;
- guint32 self=GPOINTER_TO_UINT (user);
- if(thread->tid!=self) {
+ if(thread->tid != (gsize)user) {
/*TerminateThread (thread->handle, -1);*/
}
}
void mono_thread_abort_all_other_threads (void)
{
- guint32 self=GetCurrentThreadId ();
+ gsize self = GetCurrentThreadId ();
- EnterCriticalSection (&threads_mutex);
- THREAD_DEBUG (g_message (G_GNUC_PRETTY_FUNCTION ":There are %d threads to abort",
- mono_g_hash_table_size (threads));
- mono_g_hash_table_foreach (threads, print_tids, NULL));
+ mono_threads_lock ();
+ THREAD_DEBUG (g_message ("%s: There are %d threads to abort", __func__,
+ mono_g_hash_table_size (threads));
+ mono_g_hash_table_foreach (threads, print_tids, NULL));
- mono_g_hash_table_foreach (threads, terminate_thread,
- GUINT_TO_POINTER (self));
+ mono_g_hash_table_foreach (threads, terminate_thread, (gpointer)self);
- LeaveCriticalSection (&threads_mutex);
+ mono_threads_unlock ();
}
-static void suspend_thread (gpointer key, gpointer value, gpointer user)
+static void
+collect_threads (gpointer key, gpointer value, gpointer user_data)
{
- MonoThread *thread=(MonoThread *)value;
- guint32 self=GPOINTER_TO_UINT (user);
-
- if ((thread->tid!=self) && !mono_gc_is_finalizer_thread (thread))
- SuspendThread (thread->handle);
+ MonoThread *thread = (MonoThread*)value;
+ struct wait_data *wait = (struct wait_data*)user_data;
+ HANDLE handle;
+
+ if (wait->num<MAXIMUM_WAIT_OBJECTS) {
+ handle = OpenThread (THREAD_ALL_ACCESS, TRUE, thread->tid);
+ if (handle == NULL)
+ return;
+
+ wait->handles [wait->num] = handle;
+ wait->threads [wait->num] = thread;
+ wait->num++;
+ }
}
/*
*/
void mono_thread_suspend_all_other_threads (void)
{
- guint32 self=GetCurrentThreadId ();
+ struct wait_data *wait = g_new0 (struct wait_data, 1);
+ int i, waitnum;
+ gsize self = GetCurrentThreadId ();
+ gpointer *events;
+ guint32 eventidx = 0;
+
+ /*
+ * Make a copy of the hashtable since we can't do anything with
+ * threads while threads_mutex is held.
+ */
+ mono_threads_lock ();
+ mono_g_hash_table_foreach (threads, collect_threads, wait);
+ mono_threads_unlock ();
+
+ events = g_new0 (gpointer, wait->num);
+ waitnum = 0;
+ /* Get the suspended events that we'll be waiting for */
+ for (i = 0; i < wait->num; ++i) {
+ MonoThread *thread = wait->threads [i];
+
+ if ((thread->tid == self) || mono_gc_is_finalizer_thread (thread)) {
+ //CloseHandle (wait->handles [i]);
+ wait->threads [i] = NULL; /* ignore this thread in next loop */
+ continue;
+ }
+
+ mono_monitor_enter (thread->synch_lock);
+
+ if ((thread->state & ThreadState_Suspended) != 0 ||
+ (thread->state & ThreadState_SuspendRequested) != 0 ||
+ (thread->state & ThreadState_StopRequested) != 0 ||
+ (thread->state & ThreadState_Stopped) != 0) {
+ mono_monitor_exit (thread->synch_lock);
+ CloseHandle (wait->handles [i]);
+ wait->threads [i] = NULL; /* ignore this thread in next loop */
+ continue;
+ }
+
+ /* Convert abort requests into suspend requests */
+ if ((thread->state & ThreadState_AbortRequested) != 0)
+ thread->state &= ~ThreadState_AbortRequested;
+
+ thread->state |= ThreadState_SuspendRequested;
+
+ if (thread->suspended_event == NULL) {
+ thread->suspended_event = CreateEvent (NULL, TRUE, FALSE, NULL);
+ if (thread->suspended_event == NULL) {
+ /* Forget this one and go on to the next */
+ mono_monitor_exit (thread->synch_lock);
+ continue;
+ }
+ }
+
+ events [eventidx++] = thread->suspended_event;
+ mono_monitor_exit (thread->synch_lock);
+
+ /* Signal the thread to suspend */
+ signal_thread_state_change (thread);
+ }
+
+ WaitForMultipleObjectsEx (eventidx, events, TRUE, INFINITE, FALSE);
+ for (i = 0; i < wait->num; ++i) {
+ MonoThread *thread = wait->threads [i];
+
+ if (thread == NULL)
+ continue;
+
+ mono_monitor_enter (thread->synch_lock);
+ CloseHandle (thread->suspended_event);
+ thread->suspended_event = NULL;
+ mono_monitor_exit (thread->synch_lock);
+ }
+
+ g_free (events);
+ g_free (wait);
+}
+
+/**
+ * mono_threads_request_thread_dump:
+ *
+ * Ask all threads except the current to print their stacktrace to stdout.
+ */
+void
+mono_threads_request_thread_dump (void)
+{
+ struct wait_data *wait = g_new0 (struct wait_data, 1);
+ int i;
- EnterCriticalSection (&threads_mutex);
- mono_g_hash_table_foreach (threads, suspend_thread,
- GUINT_TO_POINTER (self));
- LeaveCriticalSection (&threads_mutex);
+ /*
+ * Make a copy of the hashtable since we can't do anything with
+ * threads while threads_mutex is held.
+ */
+ mono_threads_lock ();
+ mono_g_hash_table_foreach (threads, collect_threads, wait);
+ mono_threads_unlock ();
+
+ for (i = 0; i < wait->num; ++i) {
+ MonoThread *thread = wait->threads [i];
+
+ if (!mono_gc_is_finalizer_thread (thread) && (thread != mono_thread_current ()) && !thread->thread_dump_requested) {
+ thread->thread_dump_requested = TRUE;
+
+ signal_thread_state_change (thread);
+ }
+
+ CloseHandle (wait->handles [i]);
+ }
}
/*
MonoThread *thread = mono_thread_current ();
if (thread) {
- /* printf ("PUSH REF: %x -> %s.\n", thread->tid, domain->friendly_name); */
- EnterCriticalSection (&threads_mutex);
+ /* printf ("PUSH REF: %"G_GSIZE_FORMAT" -> %s.\n", (gsize)thread->tid, domain->friendly_name); */
+ mono_threads_lock ();
thread->appdomain_refs = g_slist_prepend (thread->appdomain_refs, domain);
- LeaveCriticalSection (&threads_mutex);
+ mono_threads_unlock ();
}
}
MonoThread *thread = mono_thread_current ();
if (thread) {
- /* printf ("POP REF: %x -> %s.\n", thread->tid, ((MonoDomain*)(thread->appdomain_refs->data))->friendly_name); */
- EnterCriticalSection (&threads_mutex);
+ /* printf ("POP REF: %"G_GSIZE_FORMAT" -> %s.\n", (gsize)thread->tid, ((MonoDomain*)(thread->appdomain_refs->data))->friendly_name); */
+ mono_threads_lock ();
/* FIXME: How can the list be empty ? */
if (thread->appdomain_refs)
thread->appdomain_refs = g_slist_remove (thread->appdomain_refs, thread->appdomain_refs->data);
- LeaveCriticalSection (&threads_mutex);
+ mono_threads_unlock ();
}
}
mono_thread_has_appdomain_ref (MonoThread *thread, MonoDomain *domain)
{
gboolean res;
- EnterCriticalSection (&threads_mutex);
+ mono_threads_lock ();
res = g_slist_find (thread->appdomain_refs, domain) != NULL;
- LeaveCriticalSection (&threads_mutex);
+ mono_threads_unlock ();
return res;
}
MonoDomain *domain = data->domain;
if (mono_thread_has_appdomain_ref (thread, domain)) {
- /* printf ("ABORTING THREAD %p BECAUSE IT REFERENCES DOMAIN %s.\n", thread->tid, domain->friendly_name); */
HANDLE handle = OpenThread (THREAD_ALL_ACCESS, TRUE, thread->tid);
if (handle == NULL)
return;
+ /* printf ("ABORTING THREAD %p BECAUSE IT REFERENCES DOMAIN %s.\n", thread->tid, domain->friendly_name); */
+
ves_icall_System_Threading_Thread_Abort (thread, NULL);
if(data->wait.num<MAXIMUM_WAIT_OBJECTS) {
start_time = GetTickCount ();
do {
- EnterCriticalSection (&threads_mutex);
+ mono_threads_lock ();
user_data.domain = domain;
user_data.wait.num = 0;
mono_g_hash_table_foreach (threads, abort_appdomain_thread, &user_data);
- LeaveCriticalSection (&threads_mutex);
+ mono_threads_unlock ();
if (user_data.wait.num > 0)
- wait_for_tids (&user_data.wait, timeout);
+ /*
+ * We should wait for the threads either to abort, or to leave the
+ * domain. We can't do the latter, so we wait with a timeout.
+ */
+ wait_for_tids (&user_data.wait, 100);
/* Update remaining time */
timeout -= GetTickCount () - start_time;
int i;
/* No locking needed here */
+ /* FIXME: why no locking? writes to the cache are protected with synch_lock above */
- if (thread->culture_info) {
- for (i = 0; i < NUM_CACHED_CULTURES; ++i) {
- if (thread->culture_info [i] && thread->culture_info [i]->vtable->domain == domain)
- thread->culture_info [i] = NULL;
- }
- }
- if (thread->ui_culture_info) {
- for (i = 0; i < NUM_CACHED_CULTURES; ++i) {
- if (thread->ui_culture_info [i] && thread->ui_culture_info [i]->vtable->domain == domain)
- thread->ui_culture_info [i] = NULL;
+ if (thread->cached_culture_info) {
+ for (i = 0; i < NUM_CACHED_CULTURES * 2; ++i) {
+ MonoObject *obj = mono_array_get (thread->cached_culture_info, MonoObject*, i);
+ if (obj && obj->vtable->domain == domain)
+ mono_array_set (thread->cached_culture_info, MonoObject*, i, NULL);
}
}
}
void
mono_threads_clear_cached_culture (MonoDomain *domain)
{
- EnterCriticalSection (&threads_mutex);
+ mono_threads_lock ();
mono_g_hash_table_foreach (threads, clear_cached_culture, domain);
- LeaveCriticalSection (&threads_mutex);
+ mono_threads_unlock ();
}
/*
{
guint32 offset;
- EnterCriticalSection (&threads_mutex);
+ mono_threads_lock ();
if (thread_static_info.offset || thread_static_info.idx > 0) {
/* get the current allocated size */
offset = thread_static_info.offset | ((thread_static_info.idx + 1) << 24);
mono_alloc_static_data (&(thread->static_data), offset);
}
- LeaveCriticalSection (&threads_mutex);
+ mono_threads_unlock ();
}
static void
guint32 offset;
if (static_type == SPECIAL_STATIC_THREAD)
{
- EnterCriticalSection (&threads_mutex);
+ mono_threads_lock ();
offset = mono_alloc_static_data_slot (&thread_static_info, size, align);
/* This can be called during startup */
if (threads != NULL)
mono_g_hash_table_foreach (threads, alloc_thread_static_data_helper, GUINT_TO_POINTER (offset));
- LeaveCriticalSection (&threads_mutex);
+ mono_threads_unlock ();
}
else
{
g_assert (static_type == SPECIAL_STATIC_CONTEXT);
- EnterCriticalSection (&contexts_mutex);
+ mono_contexts_lock ();
offset = mono_alloc_static_data_slot (&context_static_info, size, align);
- LeaveCriticalSection (&contexts_mutex);
+ mono_contexts_unlock ();
offset |= 0x80000000; /* Set the high bit to indicate context static data */
}
return offset;
*/
MonoAppContext *context = mono_context_get ();
if (!context->static_data || !context->static_data [idx]) {
- EnterCriticalSection (&contexts_mutex);
+ mono_contexts_lock ();
mono_alloc_static_data (&(context->static_data), offset);
- LeaveCriticalSection (&contexts_mutex);
+ mono_contexts_unlock ();
}
return ((char*) context->static_data [idx]) + (offset & 0xffffff);
}
}
-static void gc_stop_world (gpointer key, gpointer value, gpointer user)
-{
- MonoThread *thread=(MonoThread *)value;
- guint32 self=GPOINTER_TO_UINT (user);
-
- LIBGC_DEBUG (g_message (G_GNUC_PRETTY_FUNCTION ": %d - %d", self, thread->tid));
-
- if(thread->tid==self)
- return;
-
- SuspendThread (thread->handle);
-}
-
-void mono_gc_stop_world (void)
-{
- guint32 self=GetCurrentThreadId ();
+static MonoClassField *local_slots = NULL;
- LIBGC_DEBUG (g_message (G_GNUC_PRETTY_FUNCTION ": %d - %p", self, threads));
-
- EnterCriticalSection (&threads_mutex);
-
- if (threads != NULL)
- mono_g_hash_table_foreach (threads, gc_stop_world, GUINT_TO_POINTER (self));
-
- LeaveCriticalSection (&threads_mutex);
-}
+typedef struct {
+ /* local tls data to get locals_slot from a thread */
+ guint32 offset;
+ int idx;
+ /* index in the locals_slot array */
+ int slot;
+} LocalSlotID;
-static void gc_start_world (gpointer key, gpointer value, gpointer user)
+static void
+clear_local_slot (gpointer key, gpointer value, gpointer user_data)
{
- MonoThread *thread=(MonoThread *)value;
- guint32 self=GPOINTER_TO_UINT (user);
-
- LIBGC_DEBUG (g_message (G_GNUC_PRETTY_FUNCTION ": %d - %d", self, thread->tid));
-
- if(thread->tid==self)
+ LocalSlotID *sid = user_data;
+ MonoThread *thread = (MonoThread*)value;
+ MonoArray *slots_array;
+ /*
+ * the static field is stored at: ((char*) thread->static_data [idx]) + (offset & 0xffffff);
+ * it is for the right domain, so we need to check if it is allocated an initialized
+ * for the current thread.
+ */
+ /*g_print ("handling thread %p\n", thread);*/
+ if (!thread->static_data || !thread->static_data [sid->idx])
return;
-
- ResumeThread (thread->handle);
+ slots_array = *(MonoArray **)(((char*) thread->static_data [sid->idx]) + (sid->offset & 0xffffff));
+ if (!slots_array || sid->slot >= mono_array_length (slots_array))
+ return;
+ mono_array_set (slots_array, MonoObject*, sid->slot, NULL);
}
-void mono_gc_start_world (void)
+void
+mono_thread_free_local_slot_values (int slot, MonoBoolean thread_local)
{
- guint32 self=GetCurrentThreadId ();
-
- LIBGC_DEBUG (g_message (G_GNUC_PRETTY_FUNCTION ": %d - %p", self, threads));
-
- EnterCriticalSection (&threads_mutex);
-
- if (threads != NULL)
- mono_g_hash_table_foreach (threads, gc_start_world, GUINT_TO_POINTER (self));
-
- LeaveCriticalSection (&threads_mutex);
+ MonoDomain *domain;
+ LocalSlotID sid;
+ sid.slot = slot;
+ if (thread_local) {
+ void *addr = NULL;
+ if (!local_slots) {
+ local_slots = mono_class_get_field_from_name (mono_defaults.thread_class, "local_slots");
+ if (!local_slots) {
+ g_warning ("local_slots field not found in Thread class");
+ return;
+ }
+ }
+ domain = mono_domain_get ();
+ mono_domain_lock (domain);
+ if (domain->special_static_fields)
+ addr = g_hash_table_lookup (domain->special_static_fields, local_slots);
+ mono_domain_unlock (domain);
+ if (!addr)
+ return;
+ /*g_print ("freeing slot %d at %p\n", slot, addr);*/
+ sid.offset = GPOINTER_TO_UINT (addr);
+ sid.offset &= 0x7fffffff;
+ sid.idx = (sid.offset >> 24) - 1;
+ mono_threads_lock ();
+ mono_g_hash_table_foreach (threads, clear_local_slot, &sid);
+ mono_threads_unlock ();
+ } else {
+ /* FIXME: clear the slot for MonoAppContexts, too */
+ }
}
#ifdef __MINGW32__
if (thread->interruption_requested) {
/* this will consume pending APC calls */
WaitForSingleObjectEx (GetCurrentThread(), 0, TRUE);
- EnterCriticalSection (&interruption_mutex);
- thread_interruption_requested--;
- LeaveCriticalSection (&interruption_mutex);
+ InterlockedDecrement (&thread_interruption_requested);
thread->interruption_requested = FALSE;
}
if ((thread->state & ThreadState_AbortRequested) != 0) {
if (thread->abort_exc == NULL)
- thread->abort_exc = mono_get_exception_thread_abort ();
+ MONO_OBJECT_SETREF (thread, abort_exc, mono_get_exception_thread_abort ());
mono_monitor_exit (thread->synch_lock);
return thread->abort_exc;
}
thread->state &= ~ThreadState_SuspendRequested;
thread->state |= ThreadState_Suspended;
thread->suspend_event = CreateEvent (NULL, TRUE, FALSE, NULL);
+ if (thread->suspend_event == NULL) {
+ mono_monitor_exit (thread->synch_lock);
+ return(NULL);
+ }
+ if (thread->suspended_event)
+ SetEvent (thread->suspended_event);
mono_monitor_exit (thread->synch_lock);
WaitForSingleObject (thread->suspend_event, INFINITE);
thread->state &= ~ThreadState_Suspended;
/* The thread that requested the resume will have replaced this event
- * and will be waiting for it
+ * and will be waiting for it
*/
SetEvent (thread->resume_event);
mono_monitor_exit (thread->synch_lock);
mono_monitor_exit (thread->synch_lock);
mono_thread_exit ();
return NULL;
+ } else if (thread->thread_interrupt_requested) {
+ mono_monitor_exit (thread->synch_lock);
+ return(mono_get_exception_thread_interrupted ());
}
mono_monitor_exit (thread->synch_lock);
/* Can't stop while in unmanaged code. Increase the global interruption
request count. When exiting the unmanaged method the count will be
checked and the thread will be interrupted. */
-
- EnterCriticalSection (&interruption_mutex);
- thread_interruption_requested++;
- LeaveCriticalSection (&interruption_mutex);
-
+
+ InterlockedIncrement (&thread_interruption_requested);
thread->interruption_requested = TRUE;
mono_monitor_exit (thread->synch_lock);
-
+
/* this will awake the thread if it is in WaitForSingleObject
- or similar */
- QueueUserAPC (dummy_apc, thread->handle, NULL);
-
+ or similar */
+ QueueUserAPC ((PAPCFUNC)dummy_apc, thread->handle, NULL);
return NULL;
}
else {
MonoThread *thread = mono_thread_current ();
/* The thread may already be stopping */
- if (thread == NULL)
+ if (thread == NULL)
return;
-
+
if (thread->interruption_requested && (bypass_abort_protection || !is_running_protected_wrapper ())) {
MonoException* exc = mono_thread_execute_interruption (thread);
if (exc) mono_raise_exception (exc);
{
return &thread_interruption_requested;
}
-
-#ifdef WITH_INCLUDED_LIBGC
-
-static void gc_push_all_stacks (gpointer key, gpointer value, gpointer user)
-{
- MonoThread *thread=(MonoThread *)value;
- guint32 *selfp=(guint32 *)user, self = *selfp;
-
- LIBGC_DEBUG (g_message (G_GNUC_PRETTY_FUNCTION ": %d - %d - %p", self, thread->tid, thread->stack_ptr));
-
- if(thread->tid==self) {
- LIBGC_DEBUG (g_message (G_GNUC_PRETTY_FUNCTION ": %p - %p", selfp, thread->stack_ptr));
- GC_push_all_stack (selfp, thread->stack_ptr);
- return;
- }
-
-#ifdef PLATFORM_WIN32
- GC_win32_push_thread_stack (thread->handle, thread->stack_ptr);
-#else
- mono_wapi_push_thread_stack (thread->handle, thread->stack_ptr);
-#endif
-}
-
-void mono_gc_push_all_stacks (void)
-{
- guint32 self=GetCurrentThreadId ();
-
- LIBGC_DEBUG (g_message (G_GNUC_PRETTY_FUNCTION ": %d - %p", self, threads));
-
- EnterCriticalSection (&threads_mutex);
-
- if (threads != NULL)
- mono_g_hash_table_foreach (threads, gc_push_all_stacks, &self);
-
- LeaveCriticalSection (&threads_mutex);
-}
-
-#endif /* WITH_INCLUDED_LIBGC */