AuroraSupport/AuroraRuntime
2
1
Fork 0
Code Issues 27 Pull Requests Releases Wiki Activity

[+] IIOPipeWork::GetBytesProcessedInterframe

Browse Source 
[*] IOPipeProcessors will now cap reported progression to the requested length if the requested page size would mean we overrun it.
This commit is contained in:
Reece Wilson 2023-04-25 06:36:31 +01:00
parent f52175d7ce
commit 664eb270dc
3 changed files with 53 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Include/Aurora/IO/IIOPipeWork.hpp
View File

@ -46,5 +46,11 @@ namespace Aurora::IO
* @return
*/
virtual AuUInt64 GetBytesProcessed() = 0;
/**
* @brief bytes read written to the destination. can be used under any callback to determine interframe progress
* @return
*/
virtual AuUInt64 GetBytesProcessedInterframe() = 0;
};
}

48
Source/IO/AuIOPipeProcessor.cpp
View File

@ -183,6 +183,11 @@ namespace Aurora::IO
return this->uBytesWritten_;
}
AuUInt64 IOPipeWork::GetBytesProcessedInterframe()
{
return this->uBytesWritten_ + this->bytesProcessedInterframe_;
}
void IOPipeWork::PrepareStream()
{
if (!this->buffer_.IsEmpty())
@ -322,12 +327,16 @@ namespace Aurora::IO
AuUInt32 IOPipeWork::TryPump()
{
AuUInt bytesProcessedTotal {};
AuUInt &bytesProcessedTotal = this->bytesProcessedInterframe_;
AuUInt bytesProcessed {};
bool bIsCullingLastFrame {};
bytesProcessedTotal = 0;
do
{
AuUInt canRead = this->buffer_.RemainingBytes();
AuUInt canRead2 = this->buffer_.RemainingBytes();
AuUInt canRead = canRead2;
if (!canRead)
{
break;
@ -342,6 +351,18 @@ namespace Aurora::IO
auto oldReadHeadPtr = this->buffer_.readPtr;
auto readHead = oldReadHeadPtr - this->buffer_.base;
auto oldWriteHeadPtr = this->buffer_.writePtr;
auto writeHead = oldWriteHeadPtr - this->buffer_.base;
auto uInterframeProgress = this->GetBytesProcessedInterframe();
if (bIsCullingLastFrame = (canRead2 + uInterframeProgress > this->uBytesWrittenLimit_))
{
auto uLastFrameBytes = this->uBytesWrittenLimit_ - uInterframeProgress;
auto uAbsDataToRead = AuMin<AuUInt>(canRead, uLastFrameBytes);
this->buffer_.writePtr = this->buffer_.readPtr + uAbsDataToRead;
}
if (pProtocolStack)
{
pProtocolStack->DoTick();
@ -394,6 +415,17 @@ namespace Aurora::IO
bytesProcessedTotal += bytesProcessed;
if (oldWriteHeadPtr != this->buffer_.writePtr)
{
this->buffer_.writePtr = this->buffer_.base + writeHead;
}
if (bIsCullingLastFrame)
{
this->bShouldReadNext = false;
break;
}
if (this->buffer_.readPtr == this->buffer_.writePtr)
{
this->buffer_.readPtr = this->buffer_.base;
@ -441,9 +473,12 @@ namespace Aurora::IO
}
while (AuExchange(bytesProcessed, 0));
if (this->buffer_.readPtr == this->buffer_.base)
if (!bIsCullingLastFrame)
{
this->bShouldReadNext = true;
if (this->buffer_.readPtr == this->buffer_.base)
{
this->bShouldReadNext = true;
}
}
this->uBytesWritten_ += bytesProcessedTotal;
@ -455,6 +490,11 @@ namespace Aurora::IO
this->request.pListener->OnPipePartialEvent(bytesProcessedTotal);
}
if (bIsCullingLastFrame)
{
TerminateOnThread(false);
}
return bytesProcessedTotal;
}

3
Source/IO/AuIOPipeProcessor.hpp
View File

@ -56,6 +56,7 @@ namespace Aurora::IO
virtual AuInt64 GetStartTickMS() override;
virtual AuUInt64 GetBytesProcessed() override;
virtual AuUInt64 GetBytesProcessedInterframe() override;
virtual double GetPredictedThroughput() override;
@ -108,6 +109,8 @@ namespace Aurora::IO
AuUInt uBytesWrittenTarget_ {};
AuByteBuffer buffer_;
Utility::ThroughputCalculator throughput_;
AuUInt bytesProcessedInterframe_ {};
};