Skip to content

[wasm] Fixes for issue #108519 #108543

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
kg merged 2 commits into from
Oct 8, 2024
Merged

[wasm] Fixes for issue #108519 #108543

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d875378
Fixes for issue 108519
kg Oct 4, 2024
84b10f8
Fix build
kg Oct 4, 2024
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
9 changes: 7 additions & 2 deletions src/mono/mono/mini/interp/jiterpreter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1604,6 +1604,7 @@ static void
free_queue (void *ptr) {
mono_os_mutex_lock (&queue_mutex);
// WARNING: Ensure we do not call into the runtime or JS while holding this mutex!
g_assert (shared_queues);
g_ptr_array_remove_fast (shared_queues, ptr);
g_ptr_array_free ((GPtrArray *)ptr, TRUE);
mono_os_mutex_unlock (&queue_mutex);
Expand Down Expand Up @@ -1645,8 +1646,9 @@ get_queue (int queue) {
GPtrArray *result = NULL;
if ((result = (GPtrArray *)mono_native_tls_get_value (key)) == NULL) {
g_assert (mono_native_tls_set_value (key, result = g_ptr_array_new ()));
mono_os_mutex_lock (&queue_mutex);
// WARNING: Ensure we do not call into the runtime or JS while holding this mutex!
Copy link
Contributor

@dlemstra dlemstra Oct 7, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a tiny style comment. In the rest of the code this comment is after the mono_os_mutex_lock call.

p.s. For me this way is more clear...

mono_os_mutex_lock (&queue_mutex);
g_assert (shared_queues);
g_ptr_array_add (shared_queues, result);
mono_os_mutex_unlock (&queue_mutex);
}
Expand All @@ -1656,8 +1658,11 @@ get_queue (int queue) {
// Purges this item from all queues
void
mono_jiterp_tlqueue_purge_all (gpointer item) {
mono_os_mutex_lock (&queue_mutex);
// HACK: Call get_queue_key to ensure the queues are initialized before enumerating them
get_queue_key (0);

// WARNING: Ensure we do not call into the runtime or JS while holding this mutex!
mono_os_mutex_lock (&queue_mutex);
for (int i = 0; i < shared_queues->len; i++) {
GPtrArray *queue = (GPtrArray *)g_ptr_array_index (shared_queues, i);
gboolean ok = g_ptr_array_remove_fast (queue, item);
Expand Down