mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-01 18:01:06 +02:00
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2e4d5a0d28
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-09 (Thu, 09 Mar 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -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 ?
|
||||
}
|
||||
@@ -2056,11 +2050,7 @@ static void print_meminfo(void)
|
||||
if (!sections_debug)
|
||||
return;
|
||||
|
||||
#ifdef __UCLIBC__
|
||||
malloc_stats(NULL);
|
||||
#else
|
||||
malloc_stats();
|
||||
#endif
|
||||
comp_malloc_stats(NULL);
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------
|
||||
|
Reference in New Issue
Block a user