aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/ecore/ecore.c
diff options
context:
space:
mode:
authorCedric Bail <cedric.bail@samsung.com>2013-08-27 15:57:05 +0900
committerCedric Bail <cedric.bail@samsung.com>2013-08-27 15:57:05 +0900
commitd2da83fed87fdf9a3f4c8cda0990f00b3dc68326 (patch)
tree50c42f8327ba9401830c78f0f473b1aee7c2333f /src/lib/ecore/ecore.c
parenteldbus: Handle correclty the last unref of a object path or conn in service c... (diff)
downloadefl-d2da83fed87fdf9a3f4c8cda0990f00b3dc68326.tar.gz
ecore: fix function call order to actually make mallinfo call work.
Diffstat (limited to 'src/lib/ecore/ecore.c')
-rw-r--r--src/lib/ecore/ecore.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/lib/ecore/ecore.c b/src/lib/ecore/ecore.c
index bd7f077a96..c563005796 100644
--- a/src/lib/ecore/ecore.c
+++ b/src/lib/ecore/ecore.c
@@ -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: