#include <signal.h>
#include <string.h>
-#if defined(__OpenBSD__)
+#if defined(__OpenBSD__) || defined(__FreeBSD__)
#include <pthread.h>
#include <pthread_np.h>
#endif
mono_array_set (thread->cached_culture_info, MonoObject*, i, NULL);
}
- /* if the thread is not in the hash it has been removed already */
- if (!handle_remove (thread)) {
- /* This needs to be called even if handle_remove () fails */
- if (mono_thread_cleanup_fn)
- mono_thread_cleanup_fn (thread);
- return;
- }
- mono_release_type_locks (thread);
-
ensure_synch_cs_set (thread);
EnterCriticalSection (thread->synch_cs);
thread->state &= ~ThreadState_Background;
LeaveCriticalSection (thread->synch_cs);
+
+ /*
+ An interruption request has leaked to cleanup. Adjust the global counter.
+
+ This can happen is the abort source thread finds the abortee (this) thread
+ in unmanaged code. If this thread never trips back to managed code or check
+ the local flag it will be left set and positively unbalance the global counter.
+ Leaving the counter unbalanced will cause a performance degradation since all threads
+ will now keep checking their local flags all the time.
+ */
+ if (InterlockedExchange (&thread->interruption_requested, 0))
+ InterlockedDecrement (&thread_interruption_requested);
+
+ /* if the thread is not in the hash it has been removed already */
+ if (!handle_remove (thread)) {
+ /* This needs to be called even if handle_remove () fails */
+ if (mono_thread_cleanup_fn)
+ mono_thread_cleanup_fn (thread);
+ return;
+ }
+ mono_release_type_locks (thread);
+
mono_profiler_thread_end (thread->tid);
if (thread == mono_thread_internal_current ())
internal->apartment_state=ThreadApartmentState_Unknown;
internal->thread_pinning_ref = internal;
internal->managed_id = get_next_managed_thread_id ();
- MONO_GC_REGISTER_ROOT (internal->thread_pinning_ref);
+ MONO_GC_REGISTER_ROOT_PINNING (internal->thread_pinning_ref);
internal->synch_cs = g_new0 (CRITICAL_SECTION, 1);
InitializeCriticalSection (internal->synch_cs);
if (handle_store (thread))
ResumeThread (thread_handle);
+ /* Check that the managed and unmanaged layout of MonoInternalThread matches */
+ g_assert (((char*)&internal->unused2 - (char*)internal) == mono_defaults.internal_thread_class->fields [mono_defaults.internal_thread_class->field.count - 1].offset);
+
return internal;
}
thread->apartment_state=ThreadApartmentState_Unknown;
thread->thread_pinning_ref = thread;
thread->managed_id = get_next_managed_thread_id ();
- MONO_GC_REGISTER_ROOT (thread->thread_pinning_ref);
+ MONO_GC_REGISTER_ROOT_PINNING (thread->thread_pinning_ref);
thread->stack_ptr = &tid;
internal->handle=thread;
internal->tid=tid;
internal->thread_pinning_ref = internal;
- MONO_GC_REGISTER_ROOT (internal->thread_pinning_ref);
+ MONO_GC_REGISTER_ROOT_PINNING (internal->thread_pinning_ref);
/* Don't call handle_store() here, delay it to Start.
return(FALSE);
}
+static gint32
+mono_wait_uninterrupted (MonoInternalThread *thread, gboolean multiple, guint32 numhandles, gpointer *handles, gboolean waitall, gint32 ms, gboolean alertable)
+{
+ MonoException *exc;
+ guint32 ret;
+ gint64 start;
+ gint32 diff_ms;
+ gint32 wait = ms;
+
+ start = (ms == -1) ? 0 : mono_100ns_ticks ();
+ do {
+ if (multiple)
+ ret = WaitForMultipleObjectsEx (numhandles, handles, waitall, wait, alertable);
+ else
+ ret = WaitForSingleObjectEx (handles [0], ms, alertable);
+
+ if (ret != WAIT_IO_COMPLETION)
+ break;
+
+ exc = mono_thread_execute_interruption (thread);
+ if (exc)
+ mono_raise_exception (exc);
+
+ if (ms == -1)
+ continue;
+
+ /* Re-calculate ms according to the time passed */
+ diff_ms = (mono_100ns_ticks () - start) / 10000;
+ if (diff_ms >= ms) {
+ ret = WAIT_TIMEOUT;
+ break;
+ }
+ wait = ms - diff_ms;
+ } while (TRUE);
+
+ return ret;
+}
+
/* FIXME: exitContext isnt documented */
gboolean ves_icall_System_Threading_WaitHandle_WaitAll_internal(MonoArray *mono_handles, gint32 ms, gboolean exitContext)
{
mono_thread_set_state (thread, ThreadState_WaitSleepJoin);
- ret=WaitForMultipleObjectsEx(numhandles, handles, TRUE, ms, TRUE);
+ ret = mono_wait_uninterrupted (thread, TRUE, numhandles, handles, TRUE, ms, TRUE);
mono_thread_clr_state (thread, ThreadState_WaitSleepJoin);
if(ret==WAIT_FAILED) {
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
- * WAIT_IO_COMPLETION? The documentation for
- * WaitHandle doesn't give any clues. (We'd have to
- * fiddle with the timeout if we retry.)
- */
+ } else if(ret==WAIT_TIMEOUT) {
THREAD_WAIT_DEBUG (g_message ("%s: (%"G_GSIZE_FORMAT") Wait timed out", __func__, GetCurrentThreadId ()));
return(FALSE);
}
guint32 i;
MonoObject *waitHandle;
MonoInternalThread *thread = mono_thread_internal_current ();
- guint32 start;
/* Do this WaitSleepJoin check before creating objects */
mono_thread_current_check_pending_interrupt ();
mono_thread_set_state (thread, ThreadState_WaitSleepJoin);
- start = (ms == -1) ? 0 : mono_msec_ticks ();
- do {
- ret = WaitForMultipleObjectsEx (numhandles, handles, FALSE, ms, TRUE);
- if (ret != WAIT_IO_COMPLETION)
- break;
- if (ms != -1) {
- guint32 diff;
-
- diff = mono_msec_ticks () - start;
- ms -= diff;
- if (ms <= 0)
- break;
- }
- } while (ms == -1 || ms > 0);
+ ret = mono_wait_uninterrupted (thread, TRUE, numhandles, handles, FALSE, ms, TRUE);
mono_thread_clr_state (thread, ThreadState_WaitSleepJoin);
mono_thread_set_state (thread, ThreadState_WaitSleepJoin);
- ret=WaitForSingleObjectEx (handle, ms, TRUE);
+ ret = mono_wait_uninterrupted (thread, FALSE, 1, &handle, FALSE, ms, TRUE);
mono_thread_clr_state (thread, ThreadState_WaitSleepJoin);
if(ret==WAIT_FAILED) {
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
- * WAIT_IO_COMPLETION? The documentation for
- * WaitHandle doesn't give any clues. (We'd have to
- * fiddle with the timeout if we retry.)
- */
+ } else if(ret==WAIT_TIMEOUT) {
THREAD_WAIT_DEBUG (g_message ("%s: (%"G_GSIZE_FORMAT") Wait timed out", __func__, GetCurrentThreadId ()));
return(FALSE);
}
}
static void
-update_tls_reference_bitmap (guint32 offset, uintptr_t *bitmap, int max_set)
+update_tls_reference_bitmap (guint32 offset, uintptr_t *bitmap, int numbits)
{
int i;
int idx = (offset >> 24) - 1;
offset &= 0xffffff;
offset /= sizeof (gpointer);
/* offset is now the bitmap offset */
- for (i = 0; i < max_set; ++i) {
+ for (i = 0; i < numbits; ++i) {
if (bitmap [i / sizeof (uintptr_t)] & (1L << (i & (sizeof (uintptr_t) * 8 -1))))
rb [(offset + i) / (sizeof (uintptr_t) * 8)] |= (1L << ((offset + i) & (sizeof (uintptr_t) * 8 -1)));
}
*/
guint32
-mono_alloc_special_static_data (guint32 static_type, guint32 size, guint32 align, uintptr_t *bitmap, int max_set)
+mono_alloc_special_static_data (guint32 static_type, guint32 size, guint32 align, uintptr_t *bitmap, int numbits)
{
guint32 offset;
if (static_type == SPECIAL_STATIC_THREAD) {
} else {
offset = mono_alloc_static_data_slot (&thread_static_info, size, align);
}
- update_tls_reference_bitmap (offset, bitmap, max_set);
+ update_tls_reference_bitmap (offset, bitmap, numbits);
/* This can be called during startup */
if (threads != NULL)
mono_g_hash_table_foreach (threads, alloc_thread_static_data_helper, GUINT_TO_POINTER (offset));
/* TlsDatum is a struct, so we subtract the object header size offset */
bitmap = mono_class_compute_bitmap (klass, default_bitmap, sizeof (default_bitmap) * 8, - (int)(sizeof (MonoObject) / sizeof (gpointer)), &max_set, FALSE);
size = mono_type_size (type->type, &align);
- tls_offset = mono_alloc_special_static_data (SPECIAL_STATIC_THREAD, size, align, (uintptr_t*)bitmap, max_set);
+ tls_offset = mono_alloc_special_static_data (SPECIAL_STATIC_THREAD, size, align, (uintptr_t*)bitmap, max_set + 1);
if (bitmap != default_bitmap)
g_free (bitmap);
tlsrec = g_new0 (MonoTlsDataRecord, 1);
if (InterlockedCompareExchange (&thread->interruption_requested, 1, 0) == 1)
return NULL;
+ InterlockedIncrement (&thread_interruption_requested);
if (!running_managed || is_running_protected_wrapper ()) {
/* 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. */
- InterlockedIncrement (&thread_interruption_requested);
if (mono_thread_notify_pending_exc_fn && !running_managed)
/* The JIT will notify the thread about the interruption */
mono_thread_info_resume (mono_thread_info_get_tid (info));
return;
}
+ InterlockedIncrement (&thread_interruption_requested);
ji = mono_thread_info_get_last_managed (info);
protected_wrapper = ji && mono_threads_is_critical_method (ji->method);
* functions in the io-layer until the signal handler calls QueueUserAPC which will
* make it return.
*/
- InterlockedIncrement (&thread_interruption_requested);
#ifndef HOST_WIN32
interrupt_handle = wapi_prepare_interrupt_thread (thread->handle);
#endif
projects / mono.git / blobdiff