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

Disk: Proper error reporting for EOF

v0.3.0-dev
Paul Hollinsky 2022-02-24 23:40:55 -05:00
parent 9d2d94d22b
commit 242c7259ac
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
disk/diskreaddriver.cpp
View File

@ -40,11 +40,12 @@ optional<uint64_t> ReadDriver::readLogicalDisk(Communication& com, device_eventh
useAlignedReadBuffer ? alignedReadBuffer.data() : (into + intoOffset), idealBlockSize, timeout); useAlignedReadBuffer ? alignedReadBuffer.data() : (into + intoOffset), idealBlockSize, timeout);
timeout -= std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::high_resolution_clock::now() - start); timeout -= std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::high_resolution_clock::now() - start);
if(!readAmount.has_value() || *readAmount == 0) { if(!readAmount.has_value() || *readAmount < curAmt) {
if(timeout < std::chrono::milliseconds::zero()) if(timeout < std::chrono::milliseconds::zero())
report(APIEvent::Type::Timeout, APIEvent::Severity::Error); report(APIEvent::Type::Timeout, APIEvent::Severity::Error);
else else
report(blocksProcessed ? APIEvent::Type::EOFReached : APIEvent::Type::ParameterOutOfRange, APIEvent::Severity::Error); report((blocksProcessed || readAmount.value_or(0u) != 0u) ? APIEvent::Type::EOFReached :
APIEvent::Type::ParameterOutOfRange, APIEvent::Severity::Error);
break; break;
} }

23
disk/diskwritedriver.cpp
View File

@ -40,17 +40,17 @@ optional<uint64_t> WriteDriver::writeLogicalDisk(Communication& com, device_even
curAmt = static_cast<uint32_t>(amountLeft); curAmt = static_cast<uint32_t>(amountLeft);
auto start = std::chrono::high_resolution_clock::now(); auto start = std::chrono::high_resolution_clock::now();
auto amount = readDriver.readLogicalDisk(com, report, currentBlock * idealBlockSize, atomicBuffer.data(), const auto reportFromRead = [&report, &blocksProcessed](APIEvent::Type t, APIEvent::Severity s) {
idealBlockSize, timeout); if(t == APIEvent::Type::ParameterOutOfRange && blocksProcessed)
t = APIEvent::Type::EOFReached;
report(t, s);
};
auto amount = readDriver.readLogicalDisk(com, reportFromRead, currentBlock * idealBlockSize,
atomicBuffer.data(), idealBlockSize, timeout);
timeout -= std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::high_resolution_clock::now() - start); timeout -= std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::high_resolution_clock::now() - start);
if(amount != idealBlockSize) { if(amount != idealBlockSize)
if(timeout < std::chrono::milliseconds::zero()) break; // readLogicalDisk reports its own errors
report(APIEvent::Type::Timeout, APIEvent::Severity::Error);
else
report(blocksProcessed ? APIEvent::Type::EOFReached : APIEvent::Type::ParameterOutOfRange, APIEvent::Severity::Error);
break;
}
const bool useAlignedWriteBuffer = (posWithinCurrentBlock != 0 || curAmt != idealBlockSize); const bool useAlignedWriteBuffer = (posWithinCurrentBlock != 0 || curAmt != idealBlockSize);
if(useAlignedWriteBuffer) { if(useAlignedWriteBuffer) {
@ -70,11 +70,12 @@ optional<uint64_t> WriteDriver::writeLogicalDisk(Communication& com, device_even
continue; continue;
} }
if(!amount.has_value() || *amount == 0) { if(!amount.has_value() || *amount < curAmt) {
if(timeout < std::chrono::milliseconds::zero()) if(timeout < std::chrono::milliseconds::zero())
report(APIEvent::Type::Timeout, APIEvent::Severity::Error); report(APIEvent::Type::Timeout, APIEvent::Severity::Error);
else else
report(blocksProcessed ? APIEvent::Type::EOFReached : APIEvent::Type::ParameterOutOfRange, APIEvent::Severity::Error); report((blocksProcessed || amount.value_or(0u) != 0u) ? APIEvent::Type::EOFReached :
APIEvent::Type::ParameterOutOfRange, APIEvent::Severity::Error);
break; break;
} }