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

Fix for TS Input CPU Usage

Browse source
This commit is contained in:
Erik Zandvliet 2015-10-05 17:08:10 +02:00
parent 8567e5192a
commit 01472ca88d
2 changed files with 40 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/input/input.cpp
View file

@ -211,6 +211,8 @@ namespace Mist {
if (thisPacket) { if (thisPacket) {
continueNegotiate(thisPacket.getTrackId()); continueNegotiate(thisPacket.getTrackId());
bufferLivePacket(thisPacket); bufferLivePacket(thisPacket);
} else {
Util::sleep(100);
} }
getNext(); getNext();
userClient.keepAlive(); userClient.keepAlive();

6
src/io.cpp
View file

@ -177,6 +177,10 @@ namespace Mist {
return; return;
} }
unsigned long mapTid = trackMap[tid]; unsigned long mapTid = trackMap[tid];
if (!pagesByTrack.count(tid)){
//The buffer does not control the datapages, indicated by no pagesByTrack entry.
return;
}
//If the given pagenumber is not a valid page on this track, do nothing //If the given pagenumber is not a valid page on this track, do nothing
if (!pagesByTrack[tid].count(pageNumber)){ if (!pagesByTrack[tid].count(pageNumber)){
INFO_MSG("Can't remove page %lu on track %lu~>%lu as it is not a valid page number.", pageNumber, tid, mapTid); INFO_MSG("Can't remove page %lu on track %lu~>%lu as it is not a valid page number.", pageNumber, tid, mapTid);
@ -192,7 +196,7 @@ namespace Mist {
#else #else
toErase.init(pageName, pagesByTrack[tid][pageNumber].dataSize, false); toErase.init(pageName, pagesByTrack[tid][pageNumber].dataSize, false);
#endif #endif
//Set the master flag so that the page will be destoryed once it leaves scope //Set the master flag so that the page will be destroyed once it leaves scope
#if defined(__CYGWIN__) || defined(_WIN32) #if defined(__CYGWIN__) || defined(_WIN32)
IPC::releasePage(pageName); IPC::releasePage(pageName);
#endif #endif