6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-11-02 02:16:18 +00:00
Code Issues Projects Releases Wiki Activity

Corrects some minor outstanding data races.

Browse Source
This commit is contained in:
Thomas Harte
2018-02-18 16:37:07 -05:00
parent c8a4432c63
commit a005dabbe3
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Analyser/Dynamic/MultiMachine/Implementation/MultiCRTMachine.cpp
View File

@@ -34,17 +34,15 @@ void MultiCRTMachine::perform_parallel(const std::function<void(::CRTMachine::Ma
queues_[index].enqueue([&mutex, &condition, crt_machine, function, &outstanding_machines]() {
if(crt_machine) function(crt_machine);
{
std::lock_guard<std::mutex> lock(mutex);
outstanding_machines--;
}
std::lock_guard<std::mutex> lock(mutex);
outstanding_machines--;
condition.notify_all();
});
}
}
std::unique_lock<std::mutex> lock(mutex);
if(outstanding_machines) condition.wait(lock, [&outstanding_machines] { return !outstanding_machines; });
condition.wait(lock, [&outstanding_machines] { return !outstanding_machines; });
}
void MultiCRTMachine::perform_serial(const std::function<void (::CRTMachine::Machine *)> &function) {
@@ -100,7 +98,6 @@ bool MultiCRTMachine::get_clock_is_unlimited() {
void MultiCRTMachine::did_change_machine_order() {
if(speaker_) {
std::lock_guard<std::mutex> machines_lock(machines_mutex_);
speaker_->set_new_front_machine(machines_.front().get());
}
}