Skip to content

Guard device adding and removing with mutex #513

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SeppoTakalo wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Guard device adding and removing with mutex #513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/logid/backend/raw/DeviceMonitor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,10 +157,12 @@ void DeviceMonitor::_addHandler(const std::string& device, int tries) {
try {
auto supported_reports = backend::hidpp::getSupportedReports(
RawDevice::getReportDescriptor(device));
if (supported_reports)
if (supported_reports) {
std::lock_guard<std::mutex> lock(_devices_mutex);
addDevice(device);
else
} else {
logPrintf(DEBUG, "Unsupported device %s ignored", device.c_str());
}
} catch (backend::DeviceNotReady& e) {
if (tries == max_tries) {
logPrintf(WARN, "Failed to add device %s after %d tries. Treating as failure.",
Expand All @@ -182,6 +184,7 @@ void DeviceMonitor::_addHandler(const std::string& device, int tries) {

void DeviceMonitor::_removeHandler(const std::string& device) {
try {
std::lock_guard<std::mutex> lock(_devices_mutex);
removeDevice(device);
} catch (std::exception& e) {
logPrintf(WARN, "Error removing device %s: %s",
Expand Down
4 changes: 3 additions & 1 deletion src/logid/backend/raw/DeviceMonitor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,9 @@ namespace logid::backend::raw {
bool _ready;

std::weak_ptr<DeviceMonitor> _self;

mutable std::mutex _devices_mutex;
};
}

#endif //LOGID_BACKEND_RAW_DEVICEMONITOR_H
#endif //LOGID_BACKEND_RAW_DEVICEMONITOR_H