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

Disk: WriteDriver: Fix parameter shadowing

v0.3.0-dev
Paul Hollinsky 2022-02-24 23:46:10 -05:00
parent 241502c2a2
commit 0b27e88da1
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
disk/diskwritedriver.cpp
View File

@ -50,11 +50,11 @@ optional<uint64_t> WriteDriver::writeLogicalDisk(Communication& com, device_even
t = APIEvent::Type::EOFReached; t = APIEvent::Type::EOFReached;
report(t, s); report(t, s);
}; };
auto amount = readDriver.readLogicalDisk(com, reportFromRead, currentBlock * idealBlockSize, auto bytesTransferred = readDriver.readLogicalDisk(com, reportFromRead, currentBlock * idealBlockSize,
atomicBuffer.data(), idealBlockSize, timeout); 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(bytesTransferred != idealBlockSize)
break; // readLogicalDisk reports its own errors break; // readLogicalDisk reports its own errors
const bool useAlignedWriteBuffer = (posWithinCurrentBlock != 0 || curAmt != idealBlockSize); const bool useAlignedWriteBuffer = (posWithinCurrentBlock != 0 || curAmt != idealBlockSize);
@ -64,28 +64,28 @@ optional<uint64_t> WriteDriver::writeLogicalDisk(Communication& com, device_even
} }
start = std::chrono::high_resolution_clock::now(); start = std::chrono::high_resolution_clock::now();
amount = writeLogicalDiskAligned(com, report, currentBlock * idealBlockSize, atomicBuffer.data(), bytesTransferred = writeLogicalDiskAligned(com, report, currentBlock * idealBlockSize, atomicBuffer.data(),
useAlignedWriteBuffer ? alignedWriteBuffer.data() : (from + fromOffset), idealBlockSize, timeout); useAlignedWriteBuffer ? alignedWriteBuffer.data() : (from + fromOffset), 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 == RetryAtomic) { if(bytesTransferred == RetryAtomic) {
// The user may want to log these events in order to see how many atomic misses they are getting // The user may want to log these events in order to see how many atomic misses they are getting
report(APIEvent::Type::AtomicOperationRetried, APIEvent::Severity::EventInfo); report(APIEvent::Type::AtomicOperationRetried, APIEvent::Severity::EventInfo);
continue; continue;
} }
if(!amount.has_value() || *amount < curAmt) { if(!bytesTransferred.has_value() || *bytesTransferred < 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 || amount.value_or(0u) != 0u) ? APIEvent::Type::EOFReached : report((blocksProcessed || bytesTransferred.value_or(0u) != 0u) ? APIEvent::Type::EOFReached :
APIEvent::Type::ParameterOutOfRange, APIEvent::Severity::Error); APIEvent::Type::ParameterOutOfRange, APIEvent::Severity::Error);
break; break;
} }
if(!ret) if(!ret)
ret.emplace(); ret.emplace();
*ret += std::min<uint64_t>(*amount, curAmt); *ret += std::min<uint64_t>(*bytesTransferred, curAmt);
blocksProcessed++; blocksProcessed++;
} }