Skip to content
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

Internal monitor impl not using coop mutex causing deadlocks on Android. #112358

Merged
merged 1 commit into from
Feb 10, 2025
Merged

Internal monitor impl not using coop mutex causing deadlocks on Android. #112358

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
8 changes: 4 additions & 4 deletions src/mono/mono/metadata/monitor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,9 @@ struct _MonitorArray {
MonoThreadsSync monitors [MONO_ZERO_LEN_ARRAY];
};

#define mono_monitor_allocator_lock() mono_os_mutex_lock (&monitor_mutex)
#define mono_monitor_allocator_unlock() mono_os_mutex_unlock (&monitor_mutex)
static mono_mutex_t monitor_mutex;
#define mono_monitor_allocator_lock() mono_coop_mutex_lock (&monitor_mutex)
#define mono_monitor_allocator_unlock() mono_coop_mutex_unlock (&monitor_mutex)
static MonoCoopMutex monitor_mutex;
static MonoThreadsSync *monitor_freelist;
static MonitorArray *monitor_allocated;
static int array_size = 16;
Expand Down Expand Up @@ -255,7 +255,7 @@ lock_word_new_flat (gint32 owner)
void
mono_monitor_init (void)
{
mono_os_mutex_init_recursive (&monitor_mutex);
mono_coop_mutex_init_recursive (&monitor_mutex);
}

static int
Expand Down
Loading