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

ecore: fix function call order to actually make mallinfo call work.

This commit is contained in:
Cedric Bail 2013-08-27 15:57:05 +09:00
parent 091c5425c6
commit d2da83fed8
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,7 +34,6 @@
#if HAVE_MALLINFO
#include <malloc.h>
static Ecore_Version _version = { VMAJ, VMIN, VMIC, VREV };
EAPI Ecore_Version *ecore_version = &_version;
@ -281,19 +280,20 @@ ecore_init(void)
eina_lock_new(&_ecore_main_loop_lock);
#if defined(GLIB_INTEGRATION_ALWAYS)
if (_ecore_glib_always_integrate) ecore_main_loop_glib_integrate();
#endif
_ecore_parent = eo_add(ECORE_PARENT_CLASS, NULL);
#if HAVE_MALLINFO
if (getenv("ECORE_MEM_STAT"))
{
_ecore_memory_pid = getpid();
ecore_animator_add(_ecore_memory_statistic, NULL);
_ecore_memory_statistic(NULL);
}
#endif
#if defined(GLIB_INTEGRATION_ALWAYS)
if (_ecore_glib_always_integrate) ecore_main_loop_glib_integrate();
#endif
_ecore_parent = eo_add(ECORE_PARENT_CLASS, NULL);
#ifdef HAVE_SYSTEMD
if (getenv("WATCHDOG_USEC"))
{
@ -310,13 +310,12 @@ ecore_init(void)
}
#endif
ecore_system_modules_load();
eina_log_timing(_ecore_log_dom,
EINA_LOG_STATE_STOP,
EINA_LOG_STATE_INIT);
ecore_system_modules_load();
return _ecore_init_count;
shutdown_mempool: