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

Improvements/tests for SEM_LIVE locking

Browse source
This commit is contained in:
Thulinma 2020-09-30 17:24:57 +02:00
parent 3aeebd1a4a
commit bafe30e234
5 changed files with 53 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/input/input_buffer.cpp
View file

@ -195,9 +195,16 @@ namespace Mist {
if (!liveMeta){
static char liveSemName[NAME_BUFFER_SIZE];
snprintf(liveSemName, NAME_BUFFER_SIZE, SEM_LIVE, streamName.c_str());
liveMeta = new IPC::semaphore(liveSemName, O_CREAT | O_RDWR, ACCESSPERMS, 1);
liveMeta = new IPC::semaphore(liveSemName, O_CREAT | O_RDWR, ACCESSPERMS, 8);
}
liveMeta->wait();
liveMeta->wait();
liveMeta->wait();
liveMeta->wait();
liveMeta->wait();
liveMeta->wait();
liveMeta->wait();
liveMeta->wait();
if (!nProxy.metaPages.count(0) || !nProxy.metaPages[0].mapped) {
char pageName[NAME_BUFFER_SIZE];
@ -208,6 +215,13 @@ namespace Mist {
myMeta.writeTo(nProxy.metaPages[0].mapped);
memset(nProxy.metaPages[0].mapped + myMeta.getSendLen(), 0, (nProxy.metaPages[0].len > myMeta.getSendLen() ? std::min((size_t)(nProxy.metaPages[0].len - myMeta.getSendLen()), (size_t)4) : 0));
liveMeta->post();
liveMeta->post();
liveMeta->post();
liveMeta->post();
liveMeta->post();
liveMeta->post();
liveMeta->post();
liveMeta->post();
}
///Checks if removing a key from this track is allowed/safe, and if so, removes it.
@ -515,12 +529,12 @@ namespace Mist {
updateTrackMeta(finalMap);
hasPush = true;
}
//Update the metadata to reflect all changes
updateMeta();
//Write the final mapped track number and keyframe number to the user page element
//This is used to resume pushing as well as pushing new tracks
userConn.setTrackId(index, finalMap);
userConn.setKeynum(index, myMeta.tracks[finalMap].keys.size());
//Update the metadata to reflect all changes
updateMeta();
continue;
}
//Set the temporary track id for this item, and increase the temporary value for use with the next track
@ -643,12 +657,16 @@ namespace Mist {
myMeta.tracks[finalMap].lastms = 0;
myMeta.tracks[finalMap].trackID = finalMap;
}
//Update the metadata to reflect all changes
updateMeta();
//Write the final mapped track number and keyframe number to the user page element
//This is used to resume pushing as well as pushing new tracks
userConn.setTrackId(index, finalMap);
userConn.setKeynum(index, myMeta.tracks[finalMap].keys.size());
//Update the metadata to reflect all changes
updateMeta();
if (myMeta.tracks[finalMap].keys.size()){
userConn.setKeynum(index, myMeta.tracks[finalMap].keys.rbegin()->getNumber());
}else{
userConn.setKeynum(index, 0);
}
}
//If the track is active, and this is the element responsible for pushing it
if (activeTracks.count(value) && pushLocation[value] == data) {
@ -694,7 +712,6 @@ namespace Mist {
for (std::map<unsigned long, DTSCPageData>::iterator pageIt = locations.begin(); pageIt != locations.end(); pageIt++) {
updateMetaFromPage(tNum, pageIt->first);
}
updateMeta();
}
void inputBuffer::updateMetaFromPage(unsigned long tNum, unsigned long pageNum) {