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

Converted previously hardcoded default sizes for shared memory pages to defines.

Browse source
This commit is contained in:
Thulinma 2015-01-27 12:03:52 +01:00
parent c99e0bc3ef
commit 43d35cf29b
8 changed files with 21 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/input/input.cpp
View file

@ -146,9 +146,9 @@ namespace Mist {
//after this player functionality
#ifdef __CYGWIN__
metaPage.init(config->getString("streamname"), 8 * 1024 * 1024, true);
metaPage.init(config->getString("streamname"), DEFAULT_META_PAGE_SIZE, true);
#else
metaPage.init(config->getString("streamname"), (isBuffer ? 8 * 1024 * 1024 : myMeta.getSendLen()), true);
metaPage.init(config->getString("streamname"), (isBuffer ? DEFAULT_META_PAGE_SIZE : myMeta.getSendLen()), true);
#endif
myMeta.writeTo(metaPage.mapped);
userPage.init(config->getString("streamname") + "_users", 30, true);
@ -240,7 +240,7 @@ namespace Mist {
pagesByTrack[it->first].rbegin()->second.keyNum++;
pagesByTrack[it->first].rbegin()->second.partNum += it->second.keys[i].getParts();
pagesByTrack[it->first].rbegin()->second.dataSize += it->second.keySizes[i];
if (pagesByTrack[it->first].rbegin()->second.dataSize > 8 * 1024 * 1024){
if (pagesByTrack[it->first].rbegin()->second.dataSize > FLIP_DATA_PAGE_SIZE){
newData = true;
}
}
@ -275,7 +275,7 @@ namespace Mist {
indexPages[tid].init(tmpId, 8 * 1024, true);//Pages of 8kb in size, room for 512 parts.
}
if (myMeta.tracks[tid].keys[bookKeeping[tid].curKey].getParts() + 1 == curData[tid].partNum){
if (curData[tid].dataSize > 8 * 1024 * 1024) {
if (curData[tid].dataSize > FLIP_DATA_PAGE_SIZE) {
pagesByTrack[tid][bookKeeping[tid].first] = curData[tid];
bookKeeping[tid].first += curData[tid].keyNum;
curData[tid].keyNum = 0;
@ -331,7 +331,7 @@ namespace Mist {
int pageIdLen = snprintf(pageId, 100, "%s%u_%u", config->getString("streamname").c_str(), track, pageNum);
std::string tmpString(pageId, pageIdLen);
#ifdef __CYGWIN__
dataPages[track][pageNum].init(tmpString, 26 * 1024 * 1024, true);
dataPages[track][pageNum].init(tmpString, DEFAULT_DATA_PAGE_SIZE, true);
#else
dataPages[track][pageNum].init(tmpString, it->second.dataSize, true);
#endif

2
src/input/input_buffer.cpp
View file

@ -323,7 +323,7 @@ namespace Mist {
std::string strName = config->getString("streamname");
Util::sanitizeName(strName);
strName = strName.substr(0,(strName.find('+')));
IPC::sharedPage serverCfg("!mistConfig", 4*1024*1024, false, false); ///< Contains server configuration and capabilities
IPC::sharedPage serverCfg("!mistConfig", DEFAULT_CONF_PAGE_SIZE, false, false); ///< Contains server configuration and capabilities
IPC::semaphore configLock("!mistConfLock", O_CREAT | O_RDWR, ACCESSPERMS, 1);
configLock.wait();
DTSC::Scan streamCfg = DTSC::Scan(serverCfg.mapped, serverCfg.len).getMember("streams").getMember(strName);