Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[marshal] Use a MonoCoopMutex for marshal_mutex #9408

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lambdageek merged 1 commit into from
Jul 3, 2018
Merged

[marshal] Use a MonoCoopMutex for marshal_mutex #9408

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions mono/metadata/marshal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,9 @@ enum {
* The marshal lock is a non-recursive complex lock that sits below the domain lock in the
* runtime locking latice. Which means it can take simple locks suck as the image lock.
*/
#define mono_marshal_lock() mono_locks_os_acquire (&marshal_mutex, MarshalLock)
#define mono_marshal_unlock() mono_locks_os_release (&marshal_mutex, MarshalLock)
static mono_mutex_t marshal_mutex;
#define mono_marshal_lock() mono_locks_coop_acquire (&marshal_mutex, MarshalLock)
#define mono_marshal_unlock() mono_locks_coop_release (&marshal_mutex, MarshalLock)
static MonoCoopMutex marshal_mutex;
static gboolean marshal_mutex_initialized;

static MonoNativeTlsKey last_error_tls_id;
Expand Down Expand Up @@ -217,7 +217,7 @@ mono_marshal_init (void)

if (!module_initialized) {
module_initialized = TRUE;
mono_os_mutex_init_recursive (&marshal_mutex);
mono_coop_mutex_init_recursive (&marshal_mutex);
marshal_mutex_initialized = TRUE;

register_icall (ves_icall_System_Threading_Thread_ResetAbort, "ves_icall_System_Threading_Thread_ResetAbort", "void", TRUE);
Expand Down Expand Up @@ -292,7 +292,7 @@ mono_marshal_cleanup (void)

mono_native_tls_free (load_type_info_tls_id);
mono_native_tls_free (last_error_tls_id);
mono_os_mutex_destroy (&marshal_mutex);
mono_coop_mutex_destroy (&marshal_mutex);
marshal_mutex_initialized = FALSE;
}

Expand Down