o5r/plan9port
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

devdraw: avoid deadlock on pre-Mojave macOS

Browse source
This commit is contained in:
Russ Cox 2019-04-05 15:04:10 -04:00
parent dc60de7b64
commit 26c6b25795
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/cmd/devdraw/cocoa-screen.m
View file

@ -541,6 +541,11 @@ _flushmemscreen(Rectangle r)
return; return;
rect = NSMakeRect(r.min.x, r.min.y, Dx(r), Dy(r)); rect = NSMakeRect(r.min.x, r.min.y, Dx(r), Dy(r));
// This can get blocked behind responding to mouse events,
// which need to acquire the zlock, so let go of it during
// the flush. Perhaps the waitUntilDone:YES is wrong?
zunlock();
[appdelegate [appdelegate
performSelectorOnMainThread:@selector(callflushimg:) performSelectorOnMainThread:@selector(callflushimg:)
withObject:[NSValue valueWithRect:rect] withObject:[NSValue valueWithRect:rect]
@ -548,6 +553,7 @@ _flushmemscreen(Rectangle r)
modes:[NSArray arrayWithObjects: modes:[NSArray arrayWithObjects:
NSRunLoopCommonModes, NSRunLoopCommonModes,
@"waiting image", nil]]; @"waiting image", nil]];
zlock();
} }
static void drawimg(NSRect, uint); static void drawimg(NSRect, uint);