diff --git a/lib/defines.h b/lib/defines.h index 1cc05535..6b4ebc04 100644 --- a/lib/defines.h +++ b/lib/defines.h @@ -89,6 +89,7 @@ static const char * DBG_LVL_LIST[] = {"NONE", "FAIL", "ERROR", "WARN", "INFO", " #define SHM_STREAM_INDEX "MstSTRM%s" //%s stream name #define SHM_TRACK_META "MstTRAK%s@%lu" //%s stream name, %lu track ID #define SHM_TRACK_INDEX "MstTRID%s@%lu" //%s stream name, %lu track ID +#define SHM_TRACK_INDEX_SIZE 8192 #define SHM_TRACK_DATA "MstDATA%s@%lu_%lu" //%s stream name, %lu track ID, %lu page # #define SHM_STATISTICS "MstSTAT" #define SHM_USERS "MstUSER%s" //%s stream name diff --git a/src/input/input_buffer.cpp b/src/input/input_buffer.cpp index 7f133ec1..e69b889e 100644 --- a/src/input/input_buffer.cpp +++ b/src/input/input_buffer.cpp @@ -211,7 +211,7 @@ namespace Mist { //Delete most if not all track indexes and data pages. for (long unsigned i = 1; i <= 24; ++i){ snprintf(pageName, NAME_BUFFER_SIZE, SHM_TRACK_INDEX, streamName.c_str(), i); - IPC::sharedPage indexPage(pageName, 8192, false, false); + IPC::sharedPage indexPage(pageName, SHM_TRACK_INDEX_SIZE, false, false); indexPage.master = true; if (indexPage.mapped){ char * mappedPointer = indexPage.mapped; @@ -600,7 +600,7 @@ namespace Mist { char firstPage[NAME_BUFFER_SIZE]; snprintf(firstPage, NAME_BUFFER_SIZE, SHM_TRACK_INDEX, config->getString("streamname").c_str(), finalMap); - nProxy.metaPages[finalMap].init(firstPage, 8192, false); + nProxy.metaPages[finalMap].init(firstPage, SHM_TRACK_INDEX_SIZE, false); //Update the metadata for this track updateTrackMeta(finalMap); @@ -753,7 +753,7 @@ namespace Mist { if (!nProxy.metaPages.count(value) || !nProxy.metaPages[value].mapped) { char firstPage[NAME_BUFFER_SIZE]; snprintf(firstPage, NAME_BUFFER_SIZE, SHM_TRACK_INDEX, config->getString("streamname").c_str(), value); - nProxy.metaPages[value].init(firstPage, 8192, false, false); + nProxy.metaPages[value].init(firstPage, SHM_TRACK_INDEX_SIZE, false, false); } if (nProxy.metaPages[value].mapped) { //Update the metadata for this track diff --git a/src/io.cpp b/src/io.cpp index 91691e4d..8f078c4e 100644 --- a/src/io.cpp +++ b/src/io.cpp @@ -102,7 +102,7 @@ namespace Mist { { char pageName[NAME_BUFFER_SIZE]; snprintf(pageName, NAME_BUFFER_SIZE, SHM_TRACK_INDEX, streamName.c_str(), mapTid); - IPC::sharedPage checkPage(pageName, 8 * 1024 * 1024, false, false); + IPC::sharedPage checkPage(pageName, SHM_TRACK_INDEX_SIZE, false, false); if (!checkPage.mapped){ WARN_MSG("The buffer deleted our index. Re-negotiating..."); trackState.erase(tid); @@ -562,7 +562,7 @@ namespace Mist { trackState[tid] = FILL_ACC; char pageName[NAME_BUFFER_SIZE]; snprintf(pageName, NAME_BUFFER_SIZE, SHM_TRACK_INDEX, streamName.c_str(), tid); - metaPages[tid].init(pageName, 8 * 1024 * 1024, true); + metaPages[tid].init(pageName, SHM_TRACK_INDEX_SIZE, true); metaPages[tid].master = false; return; } @@ -634,7 +634,7 @@ namespace Mist { snprintf(pageName, NAME_BUFFER_SIZE, SHM_TRACK_INDEX, streamName.c_str(), finalTid); - metaPages[tid].init(pageName, 8 * 1024 * 1024, true); + metaPages[tid].init(pageName, SHM_TRACK_INDEX_SIZE, true); metaPages[tid].master = false; Bit::htobl(tmp + offset, finalTid | 0xC0000000); Bit::htobs(tmp + offset + 4, firstPage); @@ -719,7 +719,7 @@ namespace Mist { trackState[tid] = FILL_ACC; char pageName[NAME_BUFFER_SIZE]; snprintf(pageName, NAME_BUFFER_SIZE, SHM_TRACK_INDEX, streamName.c_str(), finalTid); - metaPages[tid].init(pageName, 8 * 1024 * 1024, true); + metaPages[tid].init(pageName, SHM_TRACK_INDEX_SIZE, true); metaPages[tid].master = false; break; }