mirror of
https://github.com/TomHarte/CLK.git
synced 2024-10-09 04:55:20 +00:00
Merge pull request #592 from TomHarte/RecursiveMultiMachine
Resolves a potential deadlock on multi machine handover.
This commit is contained in:
commit
56e691f256
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
using namespace Analyser::Dynamic;
|
using namespace Analyser::Dynamic;
|
||||||
|
|
||||||
MultiCRTMachine::MultiCRTMachine(const std::vector<std::unique_ptr<::Machine::DynamicMachine>> &machines, std::mutex &machines_mutex) :
|
MultiCRTMachine::MultiCRTMachine(const std::vector<std::unique_ptr<::Machine::DynamicMachine>> &machines, std::recursive_mutex &machines_mutex) :
|
||||||
machines_(machines), machines_mutex_(machines_mutex), queues_(machines.size()) {
|
machines_(machines), machines_mutex_(machines_mutex), queues_(machines.size()) {
|
||||||
speaker_ = MultiSpeaker::create(machines);
|
speaker_ = MultiSpeaker::create(machines);
|
||||||
}
|
}
|
||||||
@ -25,7 +25,7 @@ void MultiCRTMachine::perform_parallel(const std::function<void(::CRTMachine::Ma
|
|||||||
std::condition_variable condition;
|
std::condition_variable condition;
|
||||||
std::mutex mutex;
|
std::mutex mutex;
|
||||||
{
|
{
|
||||||
std::lock_guard<std::mutex> machines_lock(machines_mutex_);
|
std::lock_guard<decltype(machines_mutex_)> machines_lock(machines_mutex_);
|
||||||
std::lock_guard<std::mutex> lock(mutex);
|
std::lock_guard<std::mutex> lock(mutex);
|
||||||
outstanding_machines = machines_.size();
|
outstanding_machines = machines_.size();
|
||||||
|
|
||||||
@ -46,7 +46,7 @@ void MultiCRTMachine::perform_parallel(const std::function<void(::CRTMachine::Ma
|
|||||||
}
|
}
|
||||||
|
|
||||||
void MultiCRTMachine::perform_serial(const std::function<void (::CRTMachine::Machine *)> &function) {
|
void MultiCRTMachine::perform_serial(const std::function<void (::CRTMachine::Machine *)> &function) {
|
||||||
std::lock_guard<std::mutex> machines_lock(machines_mutex_);
|
std::lock_guard<decltype(machines_mutex_)> machines_lock(machines_mutex_);
|
||||||
for(const auto &machine: machines_) {
|
for(const auto &machine: machines_) {
|
||||||
CRTMachine::Machine *const crt_machine = machine->crt_machine();
|
CRTMachine::Machine *const crt_machine = machine->crt_machine();
|
||||||
if(crt_machine) function(crt_machine);
|
if(crt_machine) function(crt_machine);
|
||||||
|
@ -31,7 +31,7 @@ namespace Dynamic {
|
|||||||
*/
|
*/
|
||||||
class MultiCRTMachine: public CRTMachine::Machine {
|
class MultiCRTMachine: public CRTMachine::Machine {
|
||||||
public:
|
public:
|
||||||
MultiCRTMachine(const std::vector<std::unique_ptr<::Machine::DynamicMachine>> &machines, std::mutex &machines_mutex);
|
MultiCRTMachine(const std::vector<std::unique_ptr<::Machine::DynamicMachine>> &machines, std::recursive_mutex &machines_mutex);
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
Informs the MultiCRTMachine that the order of machines has changed; the MultiCRTMachine
|
Informs the MultiCRTMachine that the order of machines has changed; the MultiCRTMachine
|
||||||
@ -60,7 +60,7 @@ class MultiCRTMachine: public CRTMachine::Machine {
|
|||||||
private:
|
private:
|
||||||
void run_for(const Cycles cycles) override {}
|
void run_for(const Cycles cycles) override {}
|
||||||
const std::vector<std::unique_ptr<::Machine::DynamicMachine>> &machines_;
|
const std::vector<std::unique_ptr<::Machine::DynamicMachine>> &machines_;
|
||||||
std::mutex &machines_mutex_;
|
std::recursive_mutex &machines_mutex_;
|
||||||
std::vector<Concurrency::AsyncTaskQueue> queues_;
|
std::vector<Concurrency::AsyncTaskQueue> queues_;
|
||||||
MultiSpeaker *speaker_ = nullptr;
|
MultiSpeaker *speaker_ = nullptr;
|
||||||
Delegate *delegate_ = nullptr;
|
Delegate *delegate_ = nullptr;
|
||||||
|
@ -73,7 +73,7 @@ bool MultiMachine::would_collapse(const std::vector<std::unique_ptr<DynamicMachi
|
|||||||
}
|
}
|
||||||
|
|
||||||
void MultiMachine::multi_crt_did_run_machines() {
|
void MultiMachine::multi_crt_did_run_machines() {
|
||||||
std::lock_guard<std::mutex> machines_lock(machines_mutex_);
|
std::lock_guard<decltype(machines_mutex_)> machines_lock(machines_mutex_);
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
for(const auto &machine: machines_) {
|
for(const auto &machine: machines_) {
|
||||||
CRTMachine::Machine *crt = machine->crt_machine();
|
CRTMachine::Machine *crt = machine->crt_machine();
|
||||||
|
@ -62,7 +62,7 @@ class MultiMachine: public ::Machine::DynamicMachine, public MultiCRTMachine::De
|
|||||||
void multi_crt_did_run_machines() override;
|
void multi_crt_did_run_machines() override;
|
||||||
|
|
||||||
std::vector<std::unique_ptr<DynamicMachine>> machines_;
|
std::vector<std::unique_ptr<DynamicMachine>> machines_;
|
||||||
std::mutex machines_mutex_;
|
std::recursive_mutex machines_mutex_;
|
||||||
|
|
||||||
MultiConfigurable configurable_;
|
MultiConfigurable configurable_;
|
||||||
MultiCRTMachine crt_machine_;
|
MultiCRTMachine crt_machine_;
|
||||||
|
Loading…
Reference in New Issue
Block a user