sven
/
libicsneo
mirror of https://github.com/intrepidcs/libicsneo.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Device: Add mutex for disk info requests to temporarily work around WiVIClient timeout issues

add-device-sharing
Jonathan Schwartz 2022-04-15 15:18:14 -04:00 committed by Paul Hollinsky
parent c2de1dfdf1
commit 44ad06d4bb
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
device/device.cpp
View File

@ -528,6 +528,9 @@ optional<bool> Device::isLogicalDiskConnected() {
return nullopt; return nullopt;
} }
// This doesn't *really* make sense here but because the disk read redirects the parser until it is done, we'll lock this
// just to avoid the timeout.
std::lock_guard<std::mutex> lg(diskLock);
const auto info = com->getLogicalDiskInfoSync(); const auto info = com->getLogicalDiskInfoSync();
if (!info) { if (!info) {
report(APIEvent::Type::Timeout, APIEvent::Severity::Error); report(APIEvent::Type::Timeout, APIEvent::Severity::Error);
@ -543,6 +546,9 @@ optional<uint64_t> Device::getLogicalDiskSize() {
return nullopt; return nullopt;
} }
// This doesn't *really* make sense here but because the disk read redirects the parser until it is done, we'll lock this
// just to avoid the timeout.
std::lock_guard<std::mutex> lg(diskLock);
const auto info = com->getLogicalDiskInfoSync(); const auto info = com->getLogicalDiskInfoSync();
if (!info) { if (!info) {
report(APIEvent::Type::Timeout, APIEvent::Severity::Error); report(APIEvent::Type::Timeout, APIEvent::Severity::Error);