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

Ensures safe machine release upon window closure.

Browse Source
This commit is contained in:
Thomas Harte 2017-09-30 20:07:04 -04:00
parent 326857a84d
commit 5f99f4442c
2 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
OSBindings/Mac/Clock Signal/Documents/MachineDocument.swift
View File

@ -95,9 +95,16 @@ class MachineDocument:
} }
override func close() { override func close() {
bestEffortUpdater.flush() optionsPanel?.setIsVisible(false)
optionsPanel = nil
openGLView.delegate = nil
bestEffortUpdater.delegate = nil
bestEffortUpdater = nil
actionLock.lock() actionLock.lock()
drawLock.lock() drawLock.lock()
machine = nil
openGLView.invalidate() openGLView.invalidate()
openGLView.openGLContext!.makeCurrentContext() openGLView.openGLContext!.makeCurrentContext()
actionLock.unlock() actionLock.unlock()

31
OSBindings/Mac/Clock Signal/Updater/CSBestEffortUpdater.m
View File

@ -20,6 +20,7 @@
NSTimeInterval _previousTimeInterval; NSTimeInterval _previousTimeInterval;
NSTimeInterval _cyclesError; NSTimeInterval _cyclesError;
BOOL _hasSkipped; BOOL _hasSkipped;
id<CSBestEffortUpdaterDelegate> _delegate;
} }
- (instancetype)init - (instancetype)init
@ -35,15 +36,12 @@
return self; return self;
} }
- (void)update - (void)update {
{
// Always post an -openGLView:didUpdateToTime: if a previous one isn't still ongoing. This is the hook upon which the substantial processing occurs. // Always post an -openGLView:didUpdateToTime: if a previous one isn't still ongoing. This is the hook upon which the substantial processing occurs.
if(!atomic_flag_test_and_set(&_updateIsOngoing)) if(!atomic_flag_test_and_set(&_updateIsOngoing)) {
{
dispatch_async(_serialDispatchQueue, ^{ dispatch_async(_serialDispatchQueue, ^{
NSTimeInterval timeInterval = [NSDate timeIntervalSinceReferenceDate]; NSTimeInterval timeInterval = [NSDate timeIntervalSinceReferenceDate];
if(_previousTimeInterval > DBL_EPSILON && timeInterval > _previousTimeInterval) if(_previousTimeInterval > DBL_EPSILON && timeInterval > _previousTimeInterval) {
{
NSTimeInterval timeToRunFor = timeInterval - _previousTimeInterval; NSTimeInterval timeToRunFor = timeInterval - _previousTimeInterval;
double cyclesToRunFor = timeToRunFor * self.clockRate + _cyclesError; double cyclesToRunFor = timeToRunFor * self.clockRate + _cyclesError;
@ -58,18 +56,29 @@
_hasSkipped = NO; _hasSkipped = NO;
atomic_flag_clear(&_updateIsOngoing); atomic_flag_clear(&_updateIsOngoing);
}); });
} } else {
else
{
dispatch_async(_serialDispatchQueue, ^{ dispatch_async(_serialDispatchQueue, ^{
_hasSkipped = YES; _hasSkipped = YES;
}); });
} }
} }
- (void)flush - (void)flush {
{
dispatch_sync(_serialDispatchQueue, ^{}); dispatch_sync(_serialDispatchQueue, ^{});
} }
- (void)setDelegate:(id<CSBestEffortUpdaterDelegate>)delegate {
dispatch_sync(_serialDispatchQueue, ^{
_delegate = delegate;
});
}
- (id<CSBestEffortUpdaterDelegate>)delegate {
__block id<CSBestEffortUpdaterDelegate> delegate;
dispatch_sync(_serialDispatchQueue, ^{
delegate = _delegate;
});
return delegate;
}
@end @end