borisfaure
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "ecore: Update to not use deprecated mallinfo" 

Reverting this, for now, because some distro's are still not
updated... This should probably use a malloc version check, but I
don't have time this week for a proper fix...

This reverts commit 17137316ee.
This commit is contained in:
Christopher Michael 2021-02-17 10:52:20 -05:00
parent ccf77acc22
commit 1842d3997a
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/lib/ecore/ecore.c
View File

@ -51,8 +51,8 @@ EAPI double _efl_startup_time = 0;
Global = Local; Global = Local;
static Eina_Bool _ecore_memory_statistic(void *data); static Eina_Bool _ecore_memory_statistic(void *data);
static size_t _ecore_memory_max_total = 0; static int _ecore_memory_max_total = 0;
static size_t _ecore_memory_max_free = 0; static int _ecore_memory_max_free = 0;
static pid_t _ecore_memory_pid = 0; static pid_t _ecore_memory_pid = 0;
#ifdef HAVE_MALLOC_INFO #ifdef HAVE_MALLOC_INFO
static FILE *_ecore_memory_statistic_file = NULL; static FILE *_ecore_memory_statistic_file = NULL;
@ -437,7 +437,7 @@ ecore_shutdown(void)
{ {
_ecore_memory_statistic(NULL); _ecore_memory_statistic(NULL);
ERR("[%i] Memory MAX total: %lu, free: %lu", ERR("[%i] Memory MAX total: %i, free: %i",
_ecore_memory_pid, _ecore_memory_pid,
_ecore_memory_max_total, _ecore_memory_max_total,
_ecore_memory_max_free); _ecore_memory_max_free);
@ -971,12 +971,12 @@ _ecore_memory_statistic(EINA_UNUSED void *data)
static int frame = 0; static int frame = 0;
#endif #endif
#ifdef HAVE_MALLINFO #ifdef HAVE_MALLINFO
struct mallinfo2 mi; struct mallinfo mi;
static size_t uordblks = 0; static int uordblks = 0;
static size_t fordblks = 0; static int fordblks = 0;
Eina_Bool changed = EINA_FALSE; Eina_Bool changed = EINA_FALSE;
mi = mallinfo2(); mi = mallinfo();
#define HAS_CHANGED(Global, Local) \ #define HAS_CHANGED(Global, Local) \
if (Global != Local) \ if (Global != Local) \
@ -989,7 +989,7 @@ _ecore_memory_statistic(EINA_UNUSED void *data)
HAS_CHANGED(fordblks, mi.fordblks); HAS_CHANGED(fordblks, mi.fordblks);
if (changed) if (changed)
ERR("[%i] Memory total: %lu, free: %lu", ERR("[%i] Memory total: %i, free: %i",
_ecore_memory_pid, _ecore_memory_pid,
mi.uordblks, mi.uordblks,
mi.fordblks); mi.fordblks);