mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 15:32:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

eitd/sectionsd.cpp: restore HOUSEKEEPING_SLEEP to 5 min, replace depreciated mallinfo with malloc_stats call

Browse Source
This commit is contained in:
[CST] Focus
2012-04-27 16:43:09 +04:00
parent c9fd73bb10
commit ccf1f32e9c
1 changed files with 9 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/eitd/sectionsd.cpp
View File

@@ -77,8 +77,8 @@ static bool sectionsd_ready = false;
static unsigned int max_events; static unsigned int max_events;
/* period to remove old events */ /* period to remove old events */
//#define HOUSEKEEPING_SLEEP (5 * 60) // sleep 5 minutes #define HOUSEKEEPING_SLEEP (5 * 60) // sleep 5 minutes
#define HOUSEKEEPING_SLEEP (30) // FIXME 1 min for testing //#define HOUSEKEEPING_SLEEP (30) // FIXME 1 min for testing
/* period to clean cached sections and force restart sections read */ /* period to clean cached sections and force restart sections read */
#define META_HOUSEKEEPING (24 * 60 * 60) / HOUSEKEEPING_SLEEP // meta housekeeping after XX housekeepings - every 24h - #define META_HOUSEKEEPING (24 * 60 * 60) / HOUSEKEEPING_SLEEP // meta housekeeping after XX housekeepings - every 24h -
@@ -981,8 +981,6 @@ static void commandDumpStatusInformation(int /*connfd*/, char* /*data*/, const u
// unsigned anzServices=services.size(); // unsigned anzServices=services.size();
unlockServices(); unlockServices();
struct mallinfo speicherinfo = mallinfo();
// struct rusage resourceUsage; // struct rusage resourceUsage;
// getrusage(RUSAGE_CHILDREN, &resourceUsage); // getrusage(RUSAGE_CHILDREN, &resourceUsage);
// getrusage(RUSAGE_SELF, &resourceUsage); // getrusage(RUSAGE_SELF, &resourceUsage);
@@ -1002,20 +1000,17 @@ static void commandDumpStatusInformation(int /*connfd*/, char* /*data*/, const u
"Number of cached nvod-events: %u\n" "Number of cached nvod-events: %u\n"
"Number of cached meta-services: %u\n" "Number of cached meta-services: %u\n"
// "Resource-usage: maxrss: %ld ixrss: %ld idrss: %ld isrss: %ld\n" // "Resource-usage: maxrss: %ld ixrss: %ld idrss: %ld isrss: %ld\n"
"Total size of memory occupied by chunks handed out by malloc: %d (%dkb)\n"
"Total bytes memory allocated with `sbrk' by malloc, in bytes: %d (%dkb)\n"
#ifdef ENABLE_FREESATEPG #ifdef ENABLE_FREESATEPG
"FreeSat enabled\n" "FreeSat enabled\n"
#else #else
"" ""
#endif #endif
,ctime(&zeit), ,ctime(&zeit),
secondsToCache / (60*60L), secondsExtendedTextCache / (60*60L), oldEventsAre / 60, anzServices, anzNVODservices, anzEvents, anzNVODevents, anzMetaServices, secondsToCache / (60*60L), secondsExtendedTextCache / (60*60L), oldEventsAre / 60, anzServices, anzNVODservices, anzEvents, anzNVODevents, anzMetaServices
// resourceUsage.ru_maxrss, resourceUsage.ru_ixrss, resourceUsage.ru_idrss, resourceUsage.ru_isrss, // resourceUsage.ru_maxrss, resourceUsage.ru_ixrss, resourceUsage.ru_idrss, resourceUsage.ru_isrss,
speicherinfo.uordblks, speicherinfo.uordblks / 1024,
speicherinfo.arena, speicherinfo.arena / 1024
); );
printf("%s\n", stati); printf("%s\n", stati);
malloc_stats();
return ; return ;
} }
@@ -1147,11 +1142,7 @@ static void commandFreeMemory(int connfd, char * /*data*/, const unsigned /*data
unlockEvents(); unlockEvents();
//FIXME debug malloc_stats();
struct mallinfo meminfo = mallinfo();
printf("total size of memory occupied by chunks handed out by malloc: %d\n"
"total bytes memory allocated with `sbrk' by malloc, in bytes: %d (%dkB)\n",
meminfo.uordblks, meminfo.arena, meminfo.arena / 1024);
} }
static void commandReadSIfromXML(int connfd, char *data, const unsigned dataLength) static void commandReadSIfromXML(int connfd, char *data, const unsigned dataLength)
@@ -1927,14 +1918,10 @@ bool CSdtThread::addServices()
/* helper function for the housekeeping-thread */ /* helper function for the housekeeping-thread */
static void print_meminfo(void) static void print_meminfo(void)
{ {
#if 0
if (!sections_debug) if (!sections_debug)
return; return;
#endif
struct mallinfo meminfo = mallinfo(); malloc_stats();
xprintf("total size of memory occupied by chunks handed out by malloc: %d\n"
"total bytes memory allocated with `sbrk' by malloc, in bytes: %d (%dkB)\n",
meminfo.uordblks, meminfo.arena, meminfo.arena / 1024);
} }
//--------------------------------------------------------------------- //---------------------------------------------------------------------
@@ -1983,7 +1970,7 @@ static void *houseKeepingThread(void *)
printf("[sectionsd] Removed %d old events (%d left).\n", anzEventsAlt - mySIeventsOrderUniqueKey.size(), mySIeventsOrderUniqueKey.size()); printf("[sectionsd] Removed %d old events (%d left).\n", anzEventsAlt - mySIeventsOrderUniqueKey.size(), mySIeventsOrderUniqueKey.size());
if (mySIeventsOrderUniqueKey.size() != anzEventsAlt) if (mySIeventsOrderUniqueKey.size() != anzEventsAlt)
{ {
//print_meminfo(); print_meminfo();
dprintf("Removed %d old events.\n", anzEventsAlt - mySIeventsOrderUniqueKey.size()); dprintf("Removed %d old events.\n", anzEventsAlt - mySIeventsOrderUniqueKey.size());
} }
anzEventsAlt = mySIeventsOrderUniqueKey.size(); anzEventsAlt = mySIeventsOrderUniqueKey.size();
@@ -1992,7 +1979,7 @@ static void *houseKeepingThread(void *)
readLockEvents(); readLockEvents();
if (mySIeventsOrderUniqueKey.size() != anzEventsAlt) if (mySIeventsOrderUniqueKey.size() != anzEventsAlt)
{ {
//print_meminfo(); print_meminfo();
dprintf("Removed %d waste events.\n", anzEventsAlt - mySIeventsOrderUniqueKey.size()); dprintf("Removed %d waste events.\n", anzEventsAlt - mySIeventsOrderUniqueKey.size());
} }