tanner/logiops
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bug described in 698971a

Browse Source 
Feels like a hacky workaround, may come back to this later.
This commit is contained in:
pixl 2020-06-21 20:11:45 -04:00
parent 261d82390b
commit bd080e7ef6
No known key found for this signature in database
GPG Key ID: 1866C148CD593B6E
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/logid/backend/raw/RawDevice.cpp
View File

@ -208,6 +208,7 @@ std::vector<uint8_t> RawDevice::_respondToReport
int RawDevice::_sendReport(const std::vector<uint8_t>& report) int RawDevice::_sendReport(const std::vector<uint8_t>& report)
{ {
std::lock_guard<std::mutex> lock(dev_io);
if(logid::global_verbosity == LogLevel::RAWREPORT) { if(logid::global_verbosity == LogLevel::RAWREPORT) {
printf("[RAWREPORT] %s OUT: ", path.c_str()); printf("[RAWREPORT] %s OUT: ", path.c_str());
for(auto &i : report) for(auto &i : report)
@ -217,11 +218,15 @@ int RawDevice::_sendReport(const std::vector<uint8_t>& report)
assert(supportedReport(report[0], report.size())); assert(supportedReport(report[0], report.size()));
std::lock_guard<std::mutex> lock(dev_io);
int ret = ::write(fd, report.data(), report.size()); int ret = ::write(fd, report.data(), report.size());
if(ret == -1) {
///TODO: This seems like a hacky solution
// Try again before failing
ret = ::write(fd, report.data(), report.size());
if(ret == -1) if(ret == -1)
throw std::system_error(errno, std::system_category(), throw std::system_error(errno, std::system_category(),
"_sendReport write failed"); "_sendReport write failed");
}
return ret; return ret;
} }