Re: [E-devel] [EGIT] [core/efl] master 01/01: Revert "ecore: Update to not use deprecated mallinfo"

Thu, 18 Feb 2021 06:26:23 -0800

Yea, an #ifdef in code, along with some version checking in meson, so we can decide which mallinfo to use ... 

I'll add a patch for that next week (no time this week sadly).

dh


On 2/18/21 5:01 AM, Carsten Haitzler wrote:

On Wed, 17 Feb 2021 07:53:25 -0800 Christopher Michael <[email protected]>
said:

Actually dh - you were on the right path. I've also been seeing the "this is
deprecated" warnings in recent weeks or so... but it seems this has to become
an ifdef and compile-time check or so...


devilhorns pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=1842d3997a88e22421eddeed49be50a0db08b7ce

commit 1842d3997a88e22421eddeed49be50a0db08b7ce
Author: Christopher Michael <[email protected]>
Date:   Wed Feb 17 10:52:20 2021 -0500

     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. 
---
  src/lib/ecore/ecore.c | 16 ++++++++--------
  1 file 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);

--







_______________________________________________
enlightenment-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel

Reply via email to