#include <glib.h>
#include <string.h>
#include <pthread.h>
-#include <signal.h>
#include <sched.h>
#include <sys/time.h>
#include <errno.h>
#define WAIT_DEBUG(code) do { } while (0)
#endif
-/* Hash threads with tids. I thought of using TLS for this, but that
- * would have to set the data in the new thread, which is more hassle
- */
-static mono_once_t thread_hash_once = MONO_ONCE_INIT;
-static pthread_key_t thread_hash_key;
-
struct _WapiHandleOps _wapi_thread_ops = {
NULL, /* close */
NULL, /* signal */
NULL /* prewait */
};
-static mono_once_t thread_ops_once=MONO_ONCE_INIT;
+static mono_once_t thread_ops_once = MONO_ONCE_INIT;
-static void thread_ops_init (void)
+static void
+thread_ops_init (void)
{
_wapi_handle_register_capabilities (WAPI_HANDLE_THREAD,
WAPI_HANDLE_CAP_WAIT);
}
-void _wapi_thread_cleanup (void)
+void
+_wapi_thread_cleanup (void)
{
- int ret;
-
- ret = pthread_key_delete (thread_hash_key);
- g_assert (ret == 0);
}
-/* Called by thread_exit(), but maybe indirectly by
- * mono_thread_manage() via mono_thread_signal_self() too
- */
-static void _wapi_thread_abandon_mutexes (gpointer handle)
+static gpointer
+get_current_thread_handle (void)
{
- struct _WapiHandle_thread *thread_handle;
+ MonoThreadInfo *info;
+
+ info = mono_thread_info_current ();
+ g_assert (info);
+ g_assert (info->handle);
+ return info->handle;
+}
+
+static WapiHandle_thread*
+lookup_thread (HANDLE handle)
+{
+ WapiHandle_thread *thread;
gboolean ok;
- int i;
- pid_t pid = _wapi_getpid ();
- pthread_t tid = pthread_self ();
-
- DEBUG ("%s: Thread %p abandoning held mutexes", __func__, handle);
- if (handle == NULL) {
- handle = _wapi_thread_handle_from_id (pthread_self ());
- if (handle == NULL) {
- /* Something gone badly wrong... */
- return;
- }
- }
-
ok = _wapi_lookup_handle (handle, WAPI_HANDLE_THREAD,
- (gpointer *)&thread_handle);
- if (ok == FALSE) {
- g_warning ("%s: error looking up thread handle %p", __func__,
- handle);
- return;
- }
-
- if (!pthread_equal (thread_handle->id, tid)) {
- return;
- }
-
- for (i = 0; i < thread_handle->owned_mutexes->len; i++) {
- gpointer mutex = g_ptr_array_index (thread_handle->owned_mutexes, i);
-
- _wapi_mutex_abandon (mutex, pid, tid);
- _wapi_thread_disown_mutex (mutex);
- }
+ (gpointer *)&thread);
+ g_assert (ok);
+ return thread;
}
-static void
-_wapi_thread_set_termination_details (gpointer handle,
- guint32 exitstatus)
+static WapiHandle_thread*
+get_current_thread (void)
{
- struct _WapiHandle_thread *thread_handle;
- gboolean ok;
- int thr_ret;
+ gpointer handle;
+
+ handle = get_current_thread_handle ();
+ return lookup_thread (handle);
+}
+
+void
+wapi_thread_handle_set_exited (gpointer handle, guint32 exitstatus)
+{
+ WapiHandle_thread *thread_handle;
+ int i, thr_ret;
+ pid_t pid = _wapi_getpid ();
+ pthread_t tid = pthread_self ();
if (_wapi_handle_issignalled (handle) ||
_wapi_handle_type (handle) == WAPI_HANDLE_UNUSED) {
DEBUG ("%s: Thread %p terminating", __func__, handle);
- _wapi_thread_abandon_mutexes (handle);
-
- ok = _wapi_lookup_handle (handle, WAPI_HANDLE_THREAD,
- (gpointer *)&thread_handle);
- if (ok == FALSE) {
- g_warning ("%s: error looking up thread handle %p", __func__,
- handle);
+ thread_handle = lookup_thread (handle);
- return;
+ DEBUG ("%s: Thread %p abandoning held mutexes", __func__, handle);
+
+ for (i = 0; i < thread_handle->owned_mutexes->len; i++) {
+ gpointer mutex = g_ptr_array_index (thread_handle->owned_mutexes, i);
+
+ _wapi_mutex_abandon (mutex, pid, tid);
+ _wapi_thread_disown_mutex (mutex);
}
+ g_ptr_array_free (thread_handle->owned_mutexes, TRUE);
- pthread_cleanup_push ((void(*)(void *))_wapi_handle_unlock_handle,
- handle);
thr_ret = _wapi_handle_lock_handle (handle);
g_assert (thr_ret == 0);
-
- g_ptr_array_free (thread_handle->owned_mutexes, TRUE);
_wapi_handle_set_signal_state (handle, TRUE, TRUE);
thr_ret = _wapi_handle_unlock_handle (handle);
g_assert (thr_ret == 0);
- pthread_cleanup_pop (0);
DEBUG("%s: Recording thread handle %p id %ld status as %d",
__func__, handle, thread_handle->id, exitstatus);
_wapi_handle_unref (handle);
}
-void _wapi_thread_signal_self (guint32 exitstatus)
-{
- gpointer handle;
-
- handle = _wapi_thread_handle_from_id (pthread_self ());
- if (handle == NULL) {
- /* Something gone badly wrong... */
- return;
- }
-
- _wapi_thread_set_termination_details (handle, exitstatus);
-}
-
-void
-wapi_thread_handle_set_exited (gpointer handle, guint32 exitstatus)
-{
- _wapi_thread_set_termination_details (handle, exitstatus);
-}
-
-static void thread_hash_init(void)
-{
- int thr_ret;
-
- thr_ret = pthread_key_create (&thread_hash_key, NULL);
- g_assert (thr_ret == 0);
-}
-
/*
* wapi_create_thread_handle:
*
gpointer
wapi_create_thread_handle (void)
{
- struct _WapiHandle_thread thread_handle = {0}, *thread;
+ WapiHandle_thread thread_handle = {0}, *thread;
gpointer handle;
- int res;
- mono_once (&thread_hash_once, thread_hash_init);
mono_once (&thread_ops_once, thread_ops_init);
thread_handle.owned_mutexes = g_ptr_array_new ();
return NULL;
}
- res = _wapi_lookup_handle (handle, WAPI_HANDLE_THREAD,
- (gpointer *)&thread);
- g_assert (res);
-
- res = pthread_setspecific (thread_hash_key, handle);
- g_assert (!res);
+ thread = lookup_thread (handle);
thread->id = pthread_self ();
return handle;
}
-/* The only time this function is called when tid != pthread_self ()
- * is from OpenThread (), so we can fast-path most cases by just
- * looking up the handle in TLS. OpenThread () must cope with a NULL
- * return and do a handle search in that case.
- */
-gpointer _wapi_thread_handle_from_id (pthread_t tid)
-{
- gpointer ret;
-
- if (pthread_equal (tid, pthread_self ()) &&
- (ret = pthread_getspecific (thread_hash_key)) != NULL) {
- /* We know the handle */
-
- DEBUG ("%s: Returning %p for self thread %ld from TLS",
- __func__, ret, tid);
-
- return(ret);
- }
-
- DEBUG ("%s: Returning NULL for unknown or non-self thread %ld",
- __func__, tid);
-
-
- return(NULL);
-}
-
-static gboolean find_thread_by_id (gpointer handle, gpointer user_data)
+void
+wapi_ref_thread_handle (gpointer handle)
{
- pthread_t tid = (pthread_t)user_data;
- struct _WapiHandle_thread *thread_handle;
- gboolean ok;
-
- /* Ignore threads that have already exited (ie they are signalled) */
- if (_wapi_handle_issignalled (handle) == FALSE) {
- ok = _wapi_lookup_handle (handle, WAPI_HANDLE_THREAD,
- (gpointer *)&thread_handle);
- if (ok == FALSE) {
- /* It's possible that the handle has vanished
- * during the _wapi_search_handle before it
- * gets here, so don't spam the console with
- * warnings.
- */
- return(FALSE);
- }
-
- DEBUG ("%s: looking at thread %ld from process %d", __func__, thread_handle->id, 0);
-
- if (pthread_equal (thread_handle->id, tid)) {
- DEBUG ("%s: found the thread we are looking for",
- __func__);
- return(TRUE);
- }
- }
-
- DEBUG ("%s: not found %ld, returning FALSE", __func__, tid);
-
- return(FALSE);
+ _wapi_handle_ref (handle);
}
-/* NB tid is 32bit in MS API, but we need 64bit on amd64 and s390x
- * (and probably others)
- */
-gpointer OpenThread (guint32 access G_GNUC_UNUSED, gboolean inherit G_GNUC_UNUSED, gsize tid)
+gpointer
+wapi_get_current_thread_handle (void)
{
- gpointer ret=NULL;
-
- mono_once (&thread_hash_once, thread_hash_init);
- mono_once (&thread_ops_once, thread_ops_init);
-
- DEBUG ("%s: looking up thread %"G_GSIZE_FORMAT, __func__, tid);
-
- ret = _wapi_thread_handle_from_id ((pthread_t)tid);
- if (ret == NULL) {
- /* We need to search for this thread */
- ret = _wapi_search_handle (WAPI_HANDLE_THREAD, find_thread_by_id, (gpointer)tid, NULL, FALSE/*TRUE*/); /* FIXME: have a proper look at this, me might not need to set search_shared = TRUE */
- } else {
- /* if _wapi_search_handle() returns a found handle, it
- * refs it itself
- */
- _wapi_handle_ref (ret);
- }
-
- DEBUG ("%s: returning thread handle %p", __func__, ret);
-
- return(ret);
+ return get_current_thread_handle ();
}
/**
* and amd64. This doesn't really break the API, it just embraces and
* extends it on 64bit platforms :)
*/
-gsize GetCurrentThreadId(void)
+gsize
+GetCurrentThreadId (void)
{
- pthread_t tid = pthread_self();
-
-#ifdef PTHREAD_POINTER_ID
- /* Don't use GPOINTER_TO_UINT here, it can't cope with
- * sizeof(void *) > sizeof(uint) when a cast to uint would
- * overflow
- */
- return((gsize)tid);
-#else
- return(tid);
-#endif
-}
-
-gpointer _wapi_thread_duplicate ()
-{
- MonoThreadInfo *info;
-
- mono_once (&thread_hash_once, thread_hash_init);
- mono_once (&thread_ops_once, thread_ops_init);
+ MonoNativeThreadId id;
- info = mono_thread_info_current ();
- if (!info->handle) {
- info->handle = wapi_create_thread_handle ();
- } else {
- _wapi_handle_ref (info->handle);
- }
- return info->handle;
-}
-
-/**
- * GetCurrentThread:
- *
- * Looks up the handle associated with the current thread. Under
- * Windows this is a pseudohandle, and must be duplicated with
- * DuplicateHandle() for some operations.
- *
- * Return value: The current thread handle, or %NULL on failure.
- * (Unknown whether Windows has a possible failure here. It may be
- * necessary to implement the pseudohandle-constant behaviour).
- */
-gpointer GetCurrentThread(void)
-{
- mono_once(&thread_hash_once, thread_hash_init);
- mono_once (&thread_ops_once, thread_ops_init);
-
- return(_WAPI_THREAD_CURRENT);
+ id = mono_native_thread_id_get ();
+ return MONO_NATIVE_THREAD_ID_TO_UINT (id);
}
/**
* value of zero causes the thread to relinquish its time slice. A
* value of %INFINITE causes an infinite delay.
*/
-guint32 SleepEx(guint32 ms, gboolean alertable)
+guint32
+SleepEx (guint32 ms, gboolean alertable)
{
- struct timespec req, rem;
int ms_quot, ms_rem;
int ret;
gpointer current_thread = NULL;
+#if defined (__linux__) && !defined(PLATFORM_ANDROID)
+ struct timespec start, target;
+#else
+ struct timespec rem;
+#endif
DEBUG("%s: Sleeping for %d ms", __func__, ms);
if (alertable) {
- current_thread = _wapi_thread_handle_from_id (pthread_self ());
- if (current_thread == NULL) {
- SetLastError (ERROR_INVALID_HANDLE);
- return(WAIT_FAILED);
- }
+ current_thread = get_current_thread_handle ();
- if (_wapi_thread_apc_pending (current_thread)) {
- _wapi_thread_dispatch_apc_queue (current_thread);
+ if (_wapi_thread_cur_apc_pending ())
return WAIT_IO_COMPLETION;
- }
}
if(ms==0) {
ms_quot = ms / 1000;
ms_rem = ms % 1000;
+#if defined (__linux__) && !defined(PLATFORM_ANDROID)
+ /* Use clock_nanosleep () to prevent time drifting problems when nanosleep () is interrupted by signals */
+ ret = clock_gettime (CLOCK_MONOTONIC, &start);
+ g_assert (ret == 0);
+ target = start;
+ target.tv_sec += ms_quot;
+ target.tv_nsec += ms_rem * 1000000;
+ if (target.tv_nsec > 999999999) {
+ target.tv_nsec -= 999999999;
+ target.tv_sec ++;
+ }
+
+ while (TRUE) {
+ ret = clock_nanosleep (CLOCK_MONOTONIC, TIMER_ABSTIME, &target, NULL);
+
+ if (alertable && _wapi_thread_cur_apc_pending ())
+ return WAIT_IO_COMPLETION;
+
+ if (ret == 0)
+ break;
+ }
+
+#else
+ struct timespec req;
+
req.tv_sec=ms_quot;
req.tv_nsec=ms_rem*1000000;
-
+
again:
memset (&rem, 0, sizeof (rem));
ret=nanosleep(&req, &rem);
- if (alertable && _wapi_thread_apc_pending (current_thread)) {
- _wapi_thread_dispatch_apc_queue (current_thread);
+ if (alertable && _wapi_thread_cur_apc_pending ())
return WAIT_IO_COMPLETION;
- }
if(ret==-1) {
/* Sleep interrupted with rem time remaining */
goto again;
}
+#endif /* __linux__ */
+
return 0;
}
-void Sleep(guint32 ms)
+void
+Sleep(guint32 ms)
{
SleepEx(ms, FALSE);
}
-gboolean _wapi_thread_cur_apc_pending (void)
-{
- gpointer thread = _wapi_thread_handle_from_id (pthread_self ());
-
- if (thread == NULL) {
- SetLastError (ERROR_INVALID_HANDLE);
- return(FALSE);
- }
-
- return(_wapi_thread_apc_pending (thread));
-}
-
-gboolean _wapi_thread_apc_pending (gpointer handle)
-{
- struct _WapiHandle_thread *thread;
- gboolean ok;
-
- ok = _wapi_lookup_handle (handle, WAPI_HANDLE_THREAD,
- (gpointer *)&thread);
- if (ok == FALSE) {
- /* This might happen at process shutdown, as all
- * thread handles are forcibly closed. If a thread
- * still has an alertable wait the final
- * _wapi_thread_apc_pending check will probably fail
- * to find the handle
- */
- DEBUG ("%s: error looking up thread handle %p", __func__,
- handle);
- return (FALSE);
- }
-
- return(thread->has_apc || thread->wait_handle == INTERRUPTION_REQUESTED_HANDLE);
-}
-
-gboolean _wapi_thread_dispatch_apc_queue (gpointer handle)
-{
- /* We don't support calling APC functions */
- struct _WapiHandle_thread *thread;
- gboolean ok;
-
- ok = _wapi_lookup_handle (handle, WAPI_HANDLE_THREAD,
- (gpointer *)&thread);
- g_assert (ok);
-
- thread->has_apc = FALSE;
-
- return(TRUE);
-}
-
-/*
- * wapi_interrupt_self:
- *
- * If this function called from a signal handler, and the thread was waiting when receiving
- * the signal, the wait will be broken after the signal handler returns.
- * This function is async-signal-safe.
- */
-void
-wapi_thread_interrupt_self (void)
+gboolean
+_wapi_thread_cur_apc_pending (void)
{
- HANDLE handle;
- struct _WapiHandle_thread *thread_handle;
- gboolean ok;
-
- handle = _wapi_thread_handle_from_id (pthread_self ());
- g_assert (handle);
+ WapiHandle_thread *thread;
- ok = _wapi_lookup_handle (handle, WAPI_HANDLE_THREAD,
- (gpointer *)&thread_handle);
- if (ok == FALSE) {
- g_warning ("%s: error looking up thread handle %p", __func__,
- handle);
- return;
- }
-
- /* No locking/memory barriers are needed here */
- thread_handle->has_apc = TRUE;
+ thread = lookup_thread (get_current_thread_handle ());
+ return thread->wait_handle == INTERRUPTION_REQUESTED_HANDLE;
}
/*
* wapi_interrupt_thread:
*
- * This is not part of the WIN32 API.
* The state of the thread handle HANDLE is set to 'interrupted' which means that
* if the thread calls one of the WaitFor functions, the function will return with
* WAIT_IO_COMPLETION instead of waiting. Also, if the thread was waiting when
* target thread didn't receive the interrupt signal yet, in this case it should
* call the wait function again. This essentially means that the target thread will
* busy wait until it is ready to process the interruption.
- * FIXME: get rid of QueueUserAPC and thread->has_apc, SleepEx seems to require it.
*/
-void wapi_interrupt_thread (gpointer thread_handle)
-{
- gpointer wait_handle;
-
- wait_handle = wapi_prepare_interrupt_thread (thread_handle);
- wapi_finish_interrupt_thread (wait_handle);
-}
-
-gpointer wapi_prepare_interrupt_thread (gpointer thread_handle)
+gpointer
+wapi_prepare_interrupt_thread (gpointer thread_handle)
{
- struct _WapiHandle_thread *thread;
- gboolean ok;
+ WapiHandle_thread *thread;
gpointer prev_handle, wait_handle;
-
- ok = _wapi_lookup_handle (thread_handle, WAPI_HANDLE_THREAD,
- (gpointer *)&thread);
- g_assert (ok);
+
+ thread = lookup_thread (thread_handle); /* FIXME this is wrong, move this whole thing to MonoThreads where it can be done lockfree */
while (TRUE) {
wait_handle = thread->wait_handle;
return wait_handle;
}
-void wapi_finish_interrupt_thread (gpointer wait_handle)
+void
+wapi_finish_interrupt_thread (gpointer wait_handle)
{
pthread_cond_t *cond;
mono_mutex_t *mutex;
* This is not part of the WIN32 API.
* Set the 'interrupted' state of the calling thread if it's NULL.
*/
-void wapi_self_interrupt (void)
+void
+wapi_self_interrupt (void)
{
gpointer wait_handle;
- gpointer thread_handle;
- thread_handle = OpenThread (0, 0, GetCurrentThreadId ());
- wait_handle = wapi_prepare_interrupt_thread (thread_handle);
+ wait_handle = wapi_prepare_interrupt_thread (get_current_thread_handle ());
if (wait_handle)
/* ref added by set_wait_handle */
_wapi_handle_unref (wait_handle);
-
- _wapi_handle_unref (thread_handle);
}
/*
* Clear the 'interrupted' state of the calling thread.
* This function is signal safe
*/
-void wapi_clear_interruption (void)
+void
+wapi_clear_interruption (void)
{
- struct _WapiHandle_thread *thread;
- gboolean ok;
+ WapiHandle_thread *thread;
gpointer prev_handle;
- gpointer thread_handle;
- thread_handle = OpenThread (0, 0, GetCurrentThreadId ());
- ok = _wapi_lookup_handle (thread_handle, WAPI_HANDLE_THREAD,
- (gpointer *)&thread);
- g_assert (ok);
+ thread = get_current_thread ();
prev_handle = InterlockedCompareExchangePointer (&thread->wait_handle,
NULL, INTERRUPTION_REQUESTED_HANDLE);
if (prev_handle == INTERRUPTION_REQUESTED_HANDLE)
WAIT_DEBUG (printf ("%p: state -> NORMAL.\n", GetCurrentThreadId ()););
-
- _wapi_handle_unref (thread_handle);
-}
-
-char* wapi_current_thread_desc ()
-{
- struct _WapiHandle_thread *thread;
- int i;
- gboolean ok;
- gpointer handle;
- gpointer thread_handle;
- GString* text;
- char *res;
-
- thread_handle = OpenThread (0, 0, GetCurrentThreadId ());
- ok = _wapi_lookup_handle (thread_handle, WAPI_HANDLE_THREAD,
- (gpointer *)&thread);
- if (!ok)
- return g_strdup_printf ("thread handle %p state : lookup failure", thread_handle);
-
- handle = thread->wait_handle;
- text = g_string_new (0);
- g_string_append_printf (text, "thread handle %p state : ", thread_handle);
-
- if (!handle)
- g_string_append_printf (text, "not waiting");
- else if (handle == INTERRUPTION_REQUESTED_HANDLE)
- g_string_append_printf (text, "interrupted state");
- else
- g_string_append_printf (text, "waiting on %p : %s ", handle, _wapi_handle_typename[_wapi_handle_type (handle)]);
- g_string_append_printf (text, " owns (");
- for (i = 0; i < thread->owned_mutexes->len; i++) {
- gpointer mutex = g_ptr_array_index (thread->owned_mutexes, i);
- if (i > 0)
- g_string_append_printf (text, ", %p", mutex);
- else
- g_string_append_printf (text, "%p", mutex);
- }
- g_string_append_printf (text, ")");
-
- res = text->str;
- g_string_free (text, FALSE);
- return res;
}
/**
* Set the wait handle for the current thread to HANDLE. Return TRUE on success, FALSE
* if the thread is in interrupted state, and cannot start waiting.
*/
-gboolean wapi_thread_set_wait_handle (gpointer handle)
+gboolean
+wapi_thread_set_wait_handle (gpointer handle)
{
- struct _WapiHandle_thread *thread;
- gboolean ok;
+ WapiHandle_thread *thread;
gpointer prev_handle;
- gpointer thread_handle;
- thread_handle = OpenThread (0, 0, GetCurrentThreadId ());
- ok = _wapi_lookup_handle (thread_handle, WAPI_HANDLE_THREAD,
- (gpointer *)&thread);
- g_assert (ok);
+ thread = get_current_thread ();
prev_handle = InterlockedCompareExchangePointer (&thread->wait_handle,
handle, NULL);
- _wapi_handle_unref (thread_handle);
-
if (prev_handle == NULL) {
/* thread->wait_handle acts as an additional reference to the handle */
_wapi_handle_ref (handle);
*
* Clear the wait handle of the current thread.
*/
-void wapi_thread_clear_wait_handle (gpointer handle)
+void
+wapi_thread_clear_wait_handle (gpointer handle)
{
- struct _WapiHandle_thread *thread;
- gboolean ok;
+ WapiHandle_thread *thread;
gpointer prev_handle;
- gpointer thread_handle;
- thread_handle = OpenThread (0, 0, GetCurrentThreadId ());
- ok = _wapi_lookup_handle (thread_handle, WAPI_HANDLE_THREAD,
- (gpointer *)&thread);
- g_assert (ok);
+ thread = get_current_thread ();
prev_handle = InterlockedCompareExchangePointer (&thread->wait_handle,
NULL, handle);
-
if (prev_handle == handle) {
_wapi_handle_unref (handle);
WAIT_DEBUG (printf ("%p: state -> NORMAL.\n", GetCurrentThreadId ()););
g_assert (prev_handle == INTERRUPTION_REQUESTED_HANDLE || prev_handle == NULL);
WAIT_DEBUG (printf ("%p: finished waiting.\n", GetCurrentThreadId ()););
}
-
- _wapi_handle_unref (thread_handle);
}
-void _wapi_thread_own_mutex (gpointer mutex)
+void
+_wapi_thread_own_mutex (gpointer mutex)
{
- struct _WapiHandle_thread *thread_handle;
- gboolean ok;
- gpointer thread;
+ WapiHandle_thread *thread;
- thread = _wapi_thread_handle_from_id (pthread_self ());
- if (thread == NULL) {
- g_warning ("%s: error looking up thread by ID", __func__);
- return;
- }
-
- ok = _wapi_lookup_handle (thread, WAPI_HANDLE_THREAD,
- (gpointer *)&thread_handle);
- if (ok == FALSE) {
- g_warning ("%s: error looking up thread handle %p", __func__,
- thread);
- return;
- }
+ thread = get_current_thread ();
_wapi_handle_ref (mutex);
- g_ptr_array_add (thread_handle->owned_mutexes, mutex);
+ g_ptr_array_add (thread->owned_mutexes, mutex);
}
-void _wapi_thread_disown_mutex (gpointer mutex)
+void
+_wapi_thread_disown_mutex (gpointer mutex)
{
- struct _WapiHandle_thread *thread_handle;
- gboolean ok;
- gpointer thread;
+ WapiHandle_thread *thread;
- thread = _wapi_thread_handle_from_id (pthread_self ());
- if (thread == NULL) {
- g_warning ("%s: error looking up thread by ID", __func__);
- return;
- }
-
- ok = _wapi_lookup_handle (thread, WAPI_HANDLE_THREAD,
- (gpointer *)&thread_handle);
- if (ok == FALSE) {
- g_warning ("%s: error looking up thread handle %p", __func__,
- thread);
- return;
- }
+ thread = get_current_thread ();
_wapi_handle_unref (mutex);
- g_ptr_array_remove (thread_handle->owned_mutexes, mutex);
+ g_ptr_array_remove (thread->owned_mutexes, mutex);
+}
+
+char*
+wapi_current_thread_desc (void)
+{
+ WapiHandle_thread *thread;
+ gpointer thread_handle;
+ int i;
+ gpointer handle;
+ GString* text;
+ char *res;
+
+ thread_handle = get_current_thread_handle ();
+ thread = lookup_thread (thread_handle);
+
+ handle = thread->wait_handle;
+ text = g_string_new (0);
+ g_string_append_printf (text, "thread handle %p state : ", thread_handle);
+
+ if (!handle)
+ g_string_append_printf (text, "not waiting");
+ else if (handle == INTERRUPTION_REQUESTED_HANDLE)
+ g_string_append_printf (text, "interrupted state");
+ else
+ g_string_append_printf (text, "waiting on %p : %s ", handle, _wapi_handle_typename[_wapi_handle_type (handle)]);
+ g_string_append_printf (text, " owns (");
+ for (i = 0; i < thread->owned_mutexes->len; i++) {
+ gpointer mutex = g_ptr_array_index (thread->owned_mutexes, i);
+ if (i > 0)
+ g_string_append_printf (text, ", %p", mutex);
+ else
+ g_string_append_printf (text, "%p", mutex);
+ }
+ g_string_append_printf (text, ")");
+
+ res = text->str;
+ g_string_free (text, FALSE);
+ return res;
}