Skip to content

Fix GCD deadlock on sync queue draw #113

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
jdtsmith merged 1 commit into from
Nov 17, 2025
Merged

Fix GCD deadlock on sync queue draw #113

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
15 changes: 11 additions & 4 deletions src/macappkit.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7630,6 +7630,7 @@ - (NSCandidateListTouchBarItem *)candidateListTouchBarItem
static bool saved_focus_view_modified_p;
#if DRAWING_USE_GCD
static dispatch_queue_t global_focus_drawing_queue;
static const void * kDrawingQueueKey = &kDrawingQueueKey;
#endif

static void
Expand All @@ -7651,8 +7652,12 @@ - (NSCandidateListTouchBarItem *)candidateListTouchBarItem
if (mac_drawing_use_gcd)
{
if (global_focus_drawing_queue == NULL)
global_focus_drawing_queue =
dispatch_queue_create ("org.gnu.Emacs.drawing", NULL);
{
global_focus_drawing_queue =
dispatch_queue_create ("org.gnu.Emacs.drawing", NULL);
dispatch_queue_set_specific(global_focus_drawing_queue, kDrawingQueueKey,
(void *)kDrawingQueueKey, NULL);
}
}
else
{
Expand All @@ -7671,8 +7676,10 @@ - (NSCandidateListTouchBarItem *)candidateListTouchBarItem
mac_draw_queue_sync (void)
{
#if DRAWING_USE_GCD
if (global_focus_drawing_queue)
dispatch_sync (global_focus_drawing_queue, ^{});
if (global_focus_drawing_queue &&
/* Avoid deadlock if already on the drawing queue */
!dispatch_get_specific(kDrawingQueueKey))
dispatch_sync (global_focus_drawing_queue, ^{});
#endif
}

Expand Down