ControllerInterface: Add synchronisation

Since we may have to add/access devices from different threads, this
adds synchronisation to anything that touches m_devices.
This commit is contained in:
Léo Lam 2016-06-12 17:31:41 +02:00
parent fd29e5c4cc
commit d3e2ae35ff
3 changed files with 7 additions and 0 deletions

View File

@ -104,6 +104,8 @@ void ControllerInterface::Shutdown()
if (!m_is_init)
return;
std::lock_guard<std::mutex> lk(m_devices_mutex);
for (ciface::Core::Device* d : m_devices)
{
// Set outputs to ZERO before destroying device
@ -141,6 +143,7 @@ void ControllerInterface::Shutdown()
void ControllerInterface::AddDevice(ciface::Core::Device* device)
{
std::lock_guard<std::mutex> lk(m_devices_mutex);
m_devices.push_back(device);
}
@ -151,6 +154,7 @@ void ControllerInterface::AddDevice(ciface::Core::Device* device)
//
void ControllerInterface::UpdateInput()
{
std::lock_guard<std::mutex> lk(m_devices_mutex);
for (ciface::Core::Device* d : m_devices)
d->UpdateInput();
}

View File

@ -6,6 +6,7 @@
#include <algorithm>
#include <map>
#include <mutex>
#include <sstream>
#include <string>
#include <vector>

View File

@ -4,6 +4,7 @@
#pragma once
#include <mutex>
#include <string>
#include <vector>
@ -167,6 +168,7 @@ public:
Device* FindDevice(const DeviceQualifier& devq) const;
protected:
std::mutex m_devices_mutex;
std::vector<Device*> m_devices;
};
}