diff options
| author | Christopher Michael <devilhorns@comcast.net> | 2021-02-17 10:52:20 -0500 |
|---|---|---|
| committer | Christopher Michael <devilhorns@comcast.net> | 2021-02-17 10:53:15 -0500 |
| commit | 1842d3997a88e22421eddeed49be50a0db08b7ce (patch) | |
| tree | 17b4f5b55691498cf0f1f24a791db674662154f3 | |
| parent | ccf77acc2202ee3f4e649c7bb24116302b512508 (diff) | |
| download | efl-1842d3997a88e22421eddeed49be50a0db08b7ce.tar.gz | |
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 17137316eeb728a30c3c14e4b3a2f1cd8765bbfc.
| -rw-r--r-- | src/lib/ecore/ecore.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/ecore/ecore.c b/src/lib/ecore/ecore.c index c3ffaa4165..0d79b621b2 100644 --- a/src/lib/ecore/ecore.c +++ b/src/lib/ecore/ecore.c @@ -51,8 +51,8 @@ EAPI double _efl_startup_time = 0; Global = Local; static Eina_Bool _ecore_memory_statistic(void *data); -static size_t _ecore_memory_max_total = 0; -static size_t _ecore_memory_max_free = 0; +static int _ecore_memory_max_total = 0; +static int _ecore_memory_max_free = 0; static pid_t _ecore_memory_pid = 0; #ifdef HAVE_MALLOC_INFO static FILE *_ecore_memory_statistic_file = NULL; @@ -437,7 +437,7 @@ ecore_shutdown(void) { _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_max_total, _ecore_memory_max_free); @@ -971,12 +971,12 @@ _ecore_memory_statistic(EINA_UNUSED void *data) static int frame = 0; #endif #ifdef HAVE_MALLINFO - struct mallinfo2 mi; - static size_t uordblks = 0; - static size_t fordblks = 0; + struct mallinfo mi; + static int uordblks = 0; + static int fordblks = 0; Eina_Bool changed = EINA_FALSE; - mi = mallinfo2(); + mi = mallinfo(); #define HAS_CHANGED(Global, Local) \ if (Global != Local) \ @@ -989,7 +989,7 @@ _ecore_memory_statistic(EINA_UNUSED void *data) HAS_CHANGED(fordblks, mi.fordblks); if (changed) - ERR("[%i] Memory total: %lu, free: %lu", + ERR("[%i] Memory total: %i, free: %i", _ecore_memory_pid, mi.uordblks, mi.fordblks); |