#undef DEBUG
/* This is used to serialise mutex creation when names are given
- * (FIXME: make it process-shared)
*/
-static mono_mutex_t named_mutex_mutex = MONO_MUTEX_INITIALIZER;
+static mono_mutex_t named_mutex_mutex;
static void mutex_close_shared (gpointer handle);
static void mutex_signal(gpointer handle);
static void mutex_ops_init (void)
{
+ int thr_ret;
+#if defined(_POSIX_THREAD_PROCESS_SHARED) && _POSIX_THREAD_PROCESS_SHARED != -1
+ pthread_mutexattr_t mutex_shared_attr;
+
+ thr_ret = mono_mutexattr_init (&mutex_shared_attr);
+ g_assert (thr_ret == 0);
+
+ thr_ret = mono_mutexattr_setpshared (&mutex_shared_attr,
+ PTHREAD_PROCESS_SHARED);
+ g_assert (thr_ret == 0);
+
+ thr_ret = mono_mutex_init (&named_mutex_mutex, &mutex_shared_attr);
+ g_assert (thr_ret == 0);
+#else
+ thr_ret = mono_mutex_init (&named_mutex_mutex, NULL);
+#endif
+
_wapi_handle_register_capabilities (WAPI_HANDLE_MUTEX,
WAPI_HANDLE_CAP_WAIT |
WAPI_HANDLE_CAP_SIGNAL |
} else {
#ifdef DEBUG
g_message (G_GNUC_PRETTY_FUNCTION
- ": mutex handle %p not owned by %d:%ld", handle,
- getpid (), pthread_self ());
+ ": mutex handle %p not owned by %d:%ld, but locked %d times by %d:%ld", handle, getpid (), pthread_self (), mutex_handle->recursion, mutex_handle->pid, mutex_handle->tid);
#endif
return(FALSE);
}
}
+struct mutex_check_data
+{
+ pid_t pid;
+ pthread_t tid;
+};
+
+static gboolean mutex_check (gpointer handle, gpointer user_data)
+{
+ struct _WapiHandle_mutex *mutex_handle;
+ gboolean ok;
+ struct mutex_check_data *data = (struct mutex_check_data *)user_data;
+ int thr_ret;
+
+ ok = _wapi_lookup_handle (handle, WAPI_HANDLE_MUTEX,
+ (gpointer *)&mutex_handle, NULL);
+ if (ok == FALSE) {
+ g_warning (G_GNUC_PRETTY_FUNCTION
+ ": error looking up mutex handle %p", handle);
+ return(FALSE);
+ }
+
+ pthread_cleanup_push ((void(*)(void *))_wapi_handle_unlock_handle,
+ handle);
+ thr_ret = _wapi_handle_lock_handle (handle);
+ g_assert (thr_ret == 0);
+
+ if (mutex_handle->pid == data->pid &&
+ mutex_handle->tid == data->tid) {
+#ifdef DEBUG
+ g_message (G_GNUC_PRETTY_FUNCTION
+ ": Mutex handle %p abandoned!", handle);
+#endif
+
+ mutex_handle->recursion = 0;
+ mutex_handle->pid = 0;
+ mutex_handle->tid = 0;
+
+ _wapi_handle_set_signal_state (handle, TRUE, FALSE);
+ }
+
+ thr_ret = _wapi_handle_unlock_handle (handle);
+ g_assert (thr_ret == 0);
+ pthread_cleanup_pop (0);
+
+ /* Return false to keep searching */
+ return(FALSE);
+}
+
+/* When a thread exits, any mutexes it still holds need to be signalled */
+void _wapi_mutex_check_abandoned (pid_t pid, pthread_t tid)
+{
+ struct mutex_check_data data;
+
+ data.pid = pid;
+ data.tid = tid;
+
+ _wapi_search_handle (WAPI_HANDLE_MUTEX, mutex_check, &data, NULL,
+ NULL);
+}
+
/**
* CreateMutex:
* @security: Ignored for now.
gpointer handle;
gboolean ok;
gchar *utf8_name;
+ int thr_ret;
+ gpointer ret = NULL;
mono_once (&mutex_ops_once, mutex_ops_init);
+ /* w32 seems to guarantee that opening named mutexes can't
+ * race each other
+ */
+ pthread_cleanup_push ((void(*)(void *))mono_mutex_unlock_in_cleanup,
+ (void *)&named_mutex_mutex);
+ thr_ret = mono_mutex_lock (&named_mutex_mutex);
+ g_assert (thr_ret == 0);
+
+ /* Need to blow away any old errors here, because code tests
+ * for ERROR_ALREADY_EXISTS on success (!) to see if a mutex
+ * was freshly created
+ */
+ SetLastError (ERROR_SUCCESS);
+
if(name!=NULL) {
utf8_name=g_utf16_to_utf8 (name, -1, NULL, NULL, NULL);
- /* w32 seems to guarantee that opening named mutexes can't
- * race each other
- */
- mono_mutex_lock (&named_mutex_mutex);
} else {
utf8_name=NULL;
}
* object.
*/
g_free (utf8_name);
- mono_mutex_unlock (&named_mutex_mutex);
SetLastError (ERROR_INVALID_HANDLE);
- return(NULL);
+ goto cleanup;
} else if (handle!=NULL) {
g_free (utf8_name);
- mono_mutex_unlock (&named_mutex_mutex);
_wapi_handle_ref (handle);
- return(handle);
+ ret = handle;
+
+ /* Not an error, but this is how the caller is
+ * informed that the mutex wasn't freshly
+ * created
+ */
+ SetLastError (ERROR_ALREADY_EXISTS);
+ goto cleanup;
}
/* Otherwise fall through to create the mutex. */
}
if(utf8_name!=NULL) {
g_free (utf8_name);
}
- if(name!=NULL) {
- mono_mutex_unlock (&named_mutex_mutex);
- }
-
- return(NULL);
+ goto cleanup;
}
- _wapi_handle_lock_handle (handle);
+ pthread_cleanup_push ((void(*)(void *))_wapi_handle_unlock_handle,
+ handle);
+ thr_ret = _wapi_handle_lock_handle (handle);
+ g_assert (thr_ret == 0);
ok=_wapi_lookup_handle (handle, WAPI_HANDLE_MUTEX,
(gpointer *)&mutex_handle, NULL);
g_free (utf8_name);
}
- if(name!=NULL) {
- mono_mutex_unlock (&named_mutex_mutex);
- }
-
- _wapi_handle_unlock_handle (handle);
- return(NULL);
+ goto handle_cleanup;
}
-
+ ret = handle;
+
if(utf8_name!=NULL) {
mutex_handle->sharedns.name=_wapi_handle_scratch_store (
utf8_name, strlen (utf8_name));
handle);
#endif
- _wapi_handle_unlock_handle (handle);
-
if(utf8_name!=NULL) {
g_free (utf8_name);
}
+
+handle_cleanup:
+ thr_ret = _wapi_handle_unlock_handle (handle);
+ g_assert (thr_ret == 0);
+ pthread_cleanup_pop (0);
- if(name!=NULL) {
- mono_mutex_unlock (&named_mutex_mutex);
- }
-
- return(handle);
+cleanup:
+ thr_ret = mono_mutex_unlock (&named_mutex_mutex);
+ g_assert (thr_ret == 0);
+ pthread_cleanup_pop (0);
+
+ return(ret);
}
/**
gboolean ok;
pthread_t tid=pthread_self();
pid_t pid=getpid ();
+ int thr_ret;
+ gboolean ret = FALSE;
ok=_wapi_lookup_handle (handle, WAPI_HANDLE_MUTEX,
(gpointer *)&mutex_handle, NULL);
return(FALSE);
}
- _wapi_handle_lock_handle (handle);
+ pthread_cleanup_push ((void(*)(void *))_wapi_handle_unlock_handle,
+ handle);
+ thr_ret = _wapi_handle_lock_handle (handle);
+ g_assert (thr_ret == 0);
#ifdef DEBUG
g_message(G_GNUC_PRETTY_FUNCTION ": Releasing mutex handle %p",
g_message(G_GNUC_PRETTY_FUNCTION ": We don't own mutex handle %p (owned by %d:%ld, me %d:%ld)", handle, mutex_handle->pid, mutex_handle->tid, pid, tid);
#endif
- _wapi_handle_unlock_handle (handle);
- return(FALSE);
+ goto cleanup;
}
-
+ ret = TRUE;
+
/* OK, we own this mutex */
mutex_handle->recursion--;
_wapi_handle_set_signal_state (handle, TRUE, FALSE);
}
- _wapi_handle_unlock_handle (handle);
+cleanup:
+ thr_ret = _wapi_handle_unlock_handle (handle);
+ g_assert (thr_ret == 0);
+ pthread_cleanup_pop (0);
- return(TRUE);
+ return(ret);
}
projects / mono.git / blobdiff