#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 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;
{
mono_threads_lock ();
- THREAD_DEBUG (g_message (G_GNUC_PRETTY_FUNCTION ": thread %p ID %"G_GSIZE_FORMAT, thread, (gsize)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);
static void handle_remove(gsize tid)
{
- THREAD_DEBUG (g_message (G_GNUC_PRETTY_FUNCTION ": thread ID %"G_GSIZE_FORMAT, tid));
+ THREAD_DEBUG (g_message ("%s: thread ID %"G_GSIZE_FORMAT, __func__, tid));
mono_threads_lock ();
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 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 ": (%"G_GSIZE_FORMAT") 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
- ": (%"G_GSIZE_FORMAT",%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
- ": (%"G_GSIZE_FORMAT") 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 %"G_GSIZE_FORMAT,
+ g_message ("%s: start_wrapper for %"G_GSIZE_FORMAT, __func__,
thread->tid);
#endif
* call thread_cleanup() on this thread's behalf.
*/
- THREAD_DEBUG (g_message (G_GNUC_PRETTY_FUNCTION ": (%"G_GSIZE_FORMAT") Start wrapper terminating", GetCurrentThreadId ()));
+ THREAD_DEBUG (g_message ("%s: (%"G_GSIZE_FORMAT") Start wrapper terminating", __func__, GetCurrentThreadId ()));
/* Remove the reference to the thread object in the TLS data,
* so the thread object can be finalized. This won't be
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)
HANDLE thread_handle;
struct StartInfo *start_info;
gsize tid;
-
+
thread=(MonoThread *)mono_object_new (domain,
mono_defaults.thread_class);
*/
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 %"G_GSIZE_FORMAT" (handle %p)",
- tid, 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"));
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);
gsize tid;
if ((thread = mono_thread_current ())) {
+ if (domain != mono_domain_get ())
+ mono_domain_set (domain, TRUE);
/* Already attached */
return thread;
}
if (!mono_gc_register_thread (&domain)) {
- 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 ());
+ 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 %"G_GSIZE_FORMAT" (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 ": (%"G_GSIZE_FORMAT") 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 %"G_GSIZE_FORMAT, thread->tid));
+ THREAD_DEBUG (g_message ("%s: mono_thread_detach for %"G_GSIZE_FORMAT, __func__, (gsize)thread->tid));
SET_CURRENT_OBJECT (NULL);
thread_cleanup (thread);
+
+ /* 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
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));
mono_monitor_enter (this->synch_lock);
/* This is freed in start_wrapper */
start_info = g_new0 (struct StartInfo, 1);
start_info->func = start_func;
- start_info->start_arg = this->start_obj;
+ 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) {
mono_monitor_exit (this->synch_lock);
- g_warning (G_GNUC_PRETTY_FUNCTION ": CreateSemaphore error 0x%x", GetLastError ());
+ g_warning ("%s: CreateSemaphore error 0x%x", __func__, GetLastError ());
return(NULL);
}
CREATE_SUSPENDED, &tid);
if(thread==NULL) {
mono_monitor_exit (this->synch_lock);
- g_warning(G_GNUC_PRETTY_FUNCTION
- ": CreateThread error 0x%x", GetLastError());
+ g_warning("%s: CreateThread error 0x%x", __func__, GetLastError());
return(NULL);
}
this->state &= ~ThreadState_Unstarted;
- THREAD_DEBUG (g_message (G_GNUC_PRETTY_FUNCTION ": Started thread ID %"G_GSIZE_FORMAT" (handle %p)", tid, thread));
+ 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);
}
{
MONO_ARCH_SAVE_REGS;
- THREAD_DEBUG (g_message (G_GNUC_PRETTY_FUNCTION ": (%"G_GSIZE_FORMAT") Launching thread %p (%"G_GSIZE_FORMAT")", GetCurrentThreadId (), thread, (gsize)thread->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
*/
handle_store (thread);
- if (mono_thread_callbacks)
- (* mono_thread_callbacks->start_resume) (thread->tid);
-
ResumeThread (thread->handle);
- if (mono_thread_callbacks)
- (* mono_thread_callbacks->end_resume) (thread->tid);
-
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
* started
*/
- THREAD_DEBUG (g_message (G_GNUC_PRETTY_FUNCTION ": (%"G_GSIZE_FORMAT") waiting for thread %p (%"G_GSIZE_FORMAT") to start", GetCurrentThreadId (), thread, (gsize)thread->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 (thread->start_notify, INFINITE, FALSE);
CloseHandle (thread->start_notify);
thread->start_notify = NULL;
}
- THREAD_DEBUG (g_message (G_GNUC_PRETTY_FUNCTION ": (%"G_GSIZE_FORMAT") Done launching thread %p (%"G_GSIZE_FORMAT")", GetCurrentThreadId (), thread, (gsize)thread->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_monitor_enter (thread->synch_lock);
thread->state |= ThreadState_WaitSleepJoin;
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 ();
}
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);
}
g_free(handles);
if(ret==WAIT_FAILED) {
- THREAD_WAIT_DEBUG (g_message (G_GNUC_PRETTY_FUNCTION ": (%"G_GSIZE_FORMAT") 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 ": (%"G_GSIZE_FORMAT") Wait timed out", GetCurrentThreadId ()));
+ THREAD_WAIT_DEBUG (g_message ("%s: (%"G_GSIZE_FORMAT") Wait timed out", __func__, GetCurrentThreadId ()));
return(FALSE);
}
g_free(handles);
- THREAD_WAIT_DEBUG (g_message (G_GNUC_PRETTY_FUNCTION ": (%"G_GSIZE_FORMAT") 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 ": (%"G_GSIZE_FORMAT") 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_monitor_exit (thread->synch_lock);
if(ret==WAIT_FAILED) {
- THREAD_WAIT_DEBUG (g_message (G_GNUC_PRETTY_FUNCTION ": (%"G_GSIZE_FORMAT") 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 ": (%"G_GSIZE_FORMAT") Wait timed out", GetCurrentThreadId ()));
+ THREAD_WAIT_DEBUG (g_message ("%s: (%"G_GSIZE_FORMAT") Wait timed out", __func__, GetCurrentThreadId ()));
return(FALSE);
}
*location = orig + value;
mono_interlocked_unlock ();
- return orig;
+ return orig + value;
#endif
}
*location = orig + value;
mono_interlocked_unlock ();
- return orig;
+ return orig + value;
#endif
}
}
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 ": (%"G_GSIZE_FORMAT") Abort requested for %p (%"G_GSIZE_FORMAT")", GetCurrentThreadId (), thread, (gsize)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 */
mono_thread_resume (thread);
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
}
-void mono_install_thread_callbacks (MonoThreadCallbacks *callbacks)
+void
+mono_threads_install_cleanup (MonoThreadCleanupFunc func)
{
- mono_thread_callbacks = callbacks;
+ mono_thread_cleanup_fn = func;
}
G_GNUC_UNUSED
{
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;
}
* same thread.)
*/
- THREAD_DEBUG (g_message (G_GNUC_PRETTY_FUNCTION ": cleaning up after thread %"G_GSIZE_FORMAT, tid));
+ THREAD_DEBUG (g_message ("%s: cleaning up after thread %"G_GSIZE_FORMAT, __func__, tid));
thread_cleanup (wait->threads[i]);
}
}
{
guint32 i, ret, count;
- 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));
/* Add the thread state change event, so it wakes up if a thread changes
* to background mode.
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;
}
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 (G_GNUC_PRETTY_FUNCTION
- ": cleaning up after thread %"G_GSIZE_FORMAT, tid));
+ THREAD_DEBUG (g_message ("%s: cleaning up after thread %"G_GSIZE_FORMAT, __func__, tid));
thread_cleanup (wait->threads [ret]);
} else
mono_threads_unlock ();
/* Ignore background threads, we abort them later */
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
if(thread->state & ThreadState_AbortRequested ||
thread->state & ThreadState_Aborted) {
- THREAD_DEBUG (g_message (G_GNUC_PRETTY_FUNCTION ": Thread id %"G_GSIZE_FORMAT" already aborting", (gsize)thread->tid));
+ THREAD_DEBUG (g_message ("%s: Thread id %"G_GSIZE_FORMAT" already aborting", __func__, (gsize)thread->tid));
return(TRUE);
}
wait->threads[wait->num]=thread;
wait->num++;
- THREAD_DEBUG (g_print (G_GNUC_PRETTY_FUNCTION ": Aborting id: %"G_GSIZE_FORMAT"\n", (gsize)thread->tid));
+ 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__));
mono_threads_lock ();
if(threads==NULL) {
- THREAD_DEBUG (g_message(G_GNUC_PRETTY_FUNCTION ": No threads"));
+ THREAD_DEBUG (g_message("%s: No threads", __func__));
mono_threads_unlock ();
return;
}
do {
mono_threads_lock ();
- THREAD_DEBUG (g_message (G_GNUC_PRETTY_FUNCTION
- ":There are %d threads to join", mono_g_hash_table_size (threads));
+ 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);
/* Something to wait for */
wait_for_tids_or_state_change (wait, INFINITE);
}
- THREAD_DEBUG (g_message ("I have %d threads after waiting.", wait->num));
+ THREAD_DEBUG (g_message ("%s: I have %d threads after waiting.", __func__, wait->num));
} while(wait->num>0);
mono_runtime_set_shutting_down ();
- THREAD_DEBUG (g_message ("threadpool cleanup"));
+ THREAD_DEBUG (g_message ("%s: threadpool cleanup", __func__));
mono_thread_pool_cleanup ();
/*
mono_threads_unlock ();
- THREAD_DEBUG (g_message ("wait->num is now %d", wait->num));
+ 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);
-
-#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_abandon_mutexes (GetCurrentThread ());
-#endif
/*
* give the subthreads a chance to really quit (this is mainly needed
gsize self = GetCurrentThreadId ();
mono_threads_lock ();
- 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));
+ 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, (gpointer)self);
mono_threads_request_thread_dump (void)
{
struct wait_data *wait = g_new0 (struct wait_data, 1);
- int i, waitnum;
- gsize self = GetCurrentThreadId ();
- gpointer *events;
- guint32 eventidx = 0;
+ int i;
/*
* Make a copy of the hashtable since we can't do anything with
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);
}
}
}
}
}
-static void gc_stop_world (gpointer key, gpointer value, gpointer user)
-{
- MonoThread *thread=(MonoThread *)value;
-
- LIBGC_DEBUG (g_message (G_GNUC_PRETTY_FUNCTION ": %"G_GSIZE_FORMAT" - %"G_GSIZE_FORMAT, (gsize)user, (gsize)thread->tid));
-
- if(thread->tid == (gsize)user)
- return;
-
- SuspendThread (thread->handle);
-}
-
-void mono_gc_stop_world (void)
-{
- gsize self = GetCurrentThreadId ();
-
- LIBGC_DEBUG (g_message (G_GNUC_PRETTY_FUNCTION ": %"G_GSIZE_FORMAT" - %p", self, threads));
-
- mono_threads_lock ();
+static MonoClassField *local_slots = NULL;
- if (threads != NULL)
- mono_g_hash_table_foreach (threads, gc_stop_world, (gpointer)self);
-
- mono_threads_unlock ();
-}
+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;
-
- LIBGC_DEBUG (g_message (G_GNUC_PRETTY_FUNCTION ": %"G_GSIZE_FORMAT" - %"G_GSIZE_FORMAT, (gsize)user, (gsize)thread->tid));
-
- if(thread->tid == (gsize)user)
+ 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)
{
- gsize self = GetCurrentThreadId ();
-
- LIBGC_DEBUG (g_message (G_GNUC_PRETTY_FUNCTION ": %"G_GSIZE_FORMAT" - %p", self, threads));
-
- mono_threads_lock ();
-
- if (threads != NULL)
- mono_g_hash_table_foreach (threads, gc_start_world, (gpointer)self);
-
- mono_threads_unlock ();
+ 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->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;
}
{
return &thread_interruption_requested;
}
-
-static void debugger_create_all_threads (gpointer key, gpointer value, gpointer user)
-{
- MonoThread *thread = (MonoThread *)value;
- (* mono_thread_callbacks->thread_created) (thread->tid, thread->stack_ptr, NULL);
-}
-
-void
-mono_debugger_create_all_threads (void)
-{
- mono_threads_lock ();
- mono_g_hash_table_foreach (threads, debugger_create_all_threads, NULL);
- mono_threads_unlock ();
-}
projects / mono.git / blobdiff