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

Fixed VoD no-load/slow-load 100% CPU usage

Browse source
This commit is contained in:
Thulinma 2016-09-15 15:55:17 +02:00
parent c74b3e4b8a
commit 53dfcfe131
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/output/output.cpp
View file

@ -849,25 +849,28 @@ namespace Mist {
//check where the next key is //check where the next key is
nxtKeyNum[nxt.tid] = getKeyForTime(nxt.tid, thisPacket.getTime()); nxtKeyNum[nxt.tid] = getKeyForTime(nxt.tid, thisPacket.getTime());
int nextPage = pageNumForKey(nxt.tid, nxtKeyNum[nxt.tid]+1); int nextPage = pageNumForKey(nxt.tid, nxtKeyNum[nxt.tid]+1);
//are we live, and the next key hasn't shown up on another page, then we're waiting. //if the next key hasn't shown up on another page, then we're waiting.
if (myMeta.live && currKeyOpen.count(nxt.tid) && (currKeyOpen[nxt.tid] == (unsigned int)nextPage || nextPage == -1)){ //VoD might be slow, so we check VoD case also, just in case
if (currKeyOpen.count(nxt.tid) && (currKeyOpen[nxt.tid] == (unsigned int)nextPage || nextPage == -1)){
if (++emptyCount < 100){ if (++emptyCount < 100){
Util::wait(250); Util::wait(250);
//we're waiting for new data to show up //we're waiting for new data to show up
if (emptyCount % 8 == 0){ if (emptyCount % 8 == 0){
reconnect();//reconnect every 2 seconds reconnect();//reconnect every 2 seconds
}else{ }else{
if (emptyCount % 4 == 0){ //updating meta is only useful with live streams
if (myMeta.live && emptyCount % 4 == 0){
updateMeta(); updateMeta();
} }
} }
}else{ }else{
//after ~25 seconds, give up and drop the track. //after ~25 seconds, give up and drop the track.
dropTrack(nxt.tid, "could not reload empty packet"); dropTrack(nxt.tid, "EOP: data wait timeout");
} }
return false; return false;
} }
//The next key showed up on another page!
//We've simply reached the end of the page. Load the next key = next page. //We've simply reached the end of the page. Load the next key = next page.
loadPageForKey(nxt.tid, ++nxtKeyNum[nxt.tid]); loadPageForKey(nxt.tid, ++nxtKeyNum[nxt.tid]);
nxt.offset = 0; nxt.offset = 0;