hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix output timeout while waiting for delay buffer

Browse source
This commit is contained in:
Balder 2023-07-20 10:30:31 +02:00 • committed by Thulinma
parent 0ec2800894
commit 22e0036b8b
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/output/output.cpp
View file

@ -1076,8 +1076,13 @@ namespace Mist{
uint64_t delayTime = JSON::Value(targetParams["pushdelay"]).asInt()*1000; uint64_t delayTime = JSON::Value(targetParams["pushdelay"]).asInt()*1000;
if (endTime() - startTime() < delayTime){ if (endTime() - startTime() < delayTime){
uint64_t waitTime = delayTime - (endTime() - startTime()); uint64_t waitTime = delayTime - (endTime() - startTime());
uint64_t waitTarget = Util::bootMS() + waitTime;
INFO_MSG("Waiting for buffer to fill up: waiting %" PRIu64 "ms", waitTime); INFO_MSG("Waiting for buffer to fill up: waiting %" PRIu64 "ms", waitTime);
Util::wait(waitTime); while (Util::bootMS() < waitTarget && keepGoing()){
Util::sleep(250);
meta.reloadReplacedPagesIfNeeded();
stats();
}
if (endTime() - startTime() < delayTime){ if (endTime() - startTime() < delayTime){
WARN_MSG("Waited for %" PRIu64 "ms, but buffer still too small for a push delay of %" PRIu64 "ms. Doing the best we can.", waitTime, delayTime); WARN_MSG("Waited for %" PRIu64 "ms, but buffer still too small for a push delay of %" PRIu64 "ms. Doing the best we can.", waitTime, delayTime);
} }