mirror/bsnes
1
0
Fork 0
mirror of https://github.com/bsnes-emu/bsnes.git synced 2025-09-09 03:10:48 +02:00
Code Issues Projects Releases Wiki Activity

Fixed potential deadlocks

Browse Source
This commit is contained in:
Lior Halphon
2023-08-12 13:34:57 +03:00
parent 7e6f1f866e
commit 3168e0e1fa
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Cocoa/Document.m
View File

@@ -125,6 +125,7 @@ enum model {
void (^ volatile _pendingAtomicBlock)();
NSDate *_fileModificationTime;
__weak NSThread *_emulationThread;
}
static void boot_rom_load(GB_gameboy_t *gb, GB_boot_rom_t type)
@@ -606,7 +607,7 @@ static unsigned *multiplication_table_for_frequency(unsigned frequency)
}
if (_running) return;
_running = true;
[[[NSThread alloc] initWithTarget:self selector:@selector(run) object:nil] start];
[_emulationThread = [[NSThread alloc] initWithTarget:self selector:@selector(run) object:nil] start];
}
- (void) stop
@@ -1584,7 +1585,7 @@ static bool is_path_writeable(const char *path)
GB_write_memory(&_gb, addr, value);
}
- (void) performAtomicBlock: (void (^)())block
- (void)performAtomicBlock: (void (^)())block
{
while (!GB_is_inited(&_gb));
bool isRunning = _running && !GB_debugger_is_stopped(&_gb);
@@ -1601,6 +1602,11 @@ static bool is_path_writeable(const char *path)
return;
}
if ([NSThread currentThread] == _emulationThread) {
block();
return;
}
_pendingAtomicBlock = block;
while (_pendingAtomicBlock);
}