mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-01 18:01:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Conflicts:
	lib/libdvbsub/dvbsubtitle.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/neutrinoyparser.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 69d8616a91
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-12 (Sun, 12 Mar 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-03-12 22:03:03 +01:00
parent aa805890c7 c3245e8661
commit ca99393430
32 changed files with 593 additions and 317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/eitd/sectionsd.cpp
View File

@@ -55,6 +55,8 @@
#include "xmlutil.h"
#include "debug.h"
#include <compatibility.h>
//#define ENABLE_SDT //FIXME
//#define DEBUG_SDT_THREAD
@@ -1067,11 +1069,7 @@ static void commandDumpStatusInformation(int /*connfd*/, char* /*data*/, const u
// resourceUsage.ru_maxrss, resourceUsage.ru_ixrss, resourceUsage.ru_idrss, resourceUsage.ru_isrss,
);
printf("%s\n", stati);
#ifdef __UCLIBC__
malloc_stats(NULL);
#else
malloc_stats();
#endif
comp_malloc_stats(NULL);
return ;
}
@@ -1200,11 +1198,7 @@ static void FreeMemory()
unlockEvents();
#ifdef __UCLIBC__
malloc_stats(NULL);
#else
malloc_stats();
#endif
comp_malloc_stats(NULL);
xprintf("[sectionsd] free memory done\n");
//wakeupAll(); //FIXME should we re-start eit here ?
}
@@ -2098,11 +2092,7 @@ static void print_meminfo(void)
if (!sections_debug)
return;
#ifdef __UCLIBC__
malloc_stats(NULL);
#else
malloc_stats();
#endif
comp_malloc_stats(NULL);
}
//---------------------------------------------------------------------