6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-23 03:32:32 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #771 from TomHarte/MacShutdownRace

Browse Source 
Ensure race condition workaround is applied for all CVDisplayLinkStops.
This commit is contained in:
Thomas Harte 2020-03-11 22:47:17 -04:00 committed by GitHub
commit a74d8bd6e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
OSBindings/Mac/Clock Signal/Views/CSOpenGLView.m
View File

@ -41,12 +41,7 @@
- (void)setupDisplayLink {
// Kill the existing link if there is one, then wait until its final shout is definitely done.
if(_displayLink) {
const double duration = CVDisplayLinkGetActualOutputVideoRefreshPeriod(_displayLink);
CVDisplayLinkStop(_displayLink);
// This is a workaround; I could find no way to ensure that a callback from the display
// link is not currently ongoing.
usleep((useconds_t)ceil(duration * 1000000.0));
[self invalidate];
CVDisplayLinkRelease(_displayLink);
}
@ -118,7 +113,13 @@ static CVReturn DisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTimeSt
}
- (void)invalidate {
const double duration = CVDisplayLinkGetActualOutputVideoRefreshPeriod(_displayLink);
CVDisplayLinkStop(_displayLink);
// This is a workaround; I could find no way to ensure that a callback from the display
// link is not currently ongoing. In short: call stop, wait for an entire refresh period,
// then assume (/hope) the coast is clear.
usleep((useconds_t)ceil(duration * 1000000.0));
}
- (void)dealloc {