summaryrefslogtreecommitdiff
path: root/src/lib/ecore
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
parent091c5425c6cdf0a1acb4728c7fd1d0dc57667ffd (diff)
ecore: fix function call order to actually make mallinfo call work.
Diffstat (limited to 'src/lib/ecore')
-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 @@
34#if HAVE_MALLINFO 34#if HAVE_MALLINFO
35#include <malloc.h> 35#include <malloc.h>
36 36
37
38static Ecore_Version _version = { VMAJ, VMIN, VMIC, VREV }; 37static Ecore_Version _version = { VMAJ, VMIN, VMIC, VREV };
39EAPI Ecore_Version *ecore_version = &_version; 38EAPI Ecore_Version *ecore_version = &_version;
40 39
@@ -281,19 +280,20 @@ ecore_init(void)
281 280
282 eina_lock_new(&_ecore_main_loop_lock); 281 eina_lock_new(&_ecore_main_loop_lock);
283 282
283#if defined(GLIB_INTEGRATION_ALWAYS)
284 if (_ecore_glib_always_integrate) ecore_main_loop_glib_integrate();
285#endif
286 _ecore_parent = eo_add(ECORE_PARENT_CLASS, NULL);
287
284#if HAVE_MALLINFO 288#if HAVE_MALLINFO
285 if (getenv("ECORE_MEM_STAT")) 289 if (getenv("ECORE_MEM_STAT"))
286 { 290 {
287 _ecore_memory_pid = getpid(); 291 _ecore_memory_pid = getpid();
288 ecore_animator_add(_ecore_memory_statistic, NULL); 292 ecore_animator_add(_ecore_memory_statistic, NULL);
293 _ecore_memory_statistic(NULL);
289 } 294 }
290#endif 295#endif
291 296
292#if defined(GLIB_INTEGRATION_ALWAYS)
293 if (_ecore_glib_always_integrate) ecore_main_loop_glib_integrate();
294#endif
295 _ecore_parent = eo_add(ECORE_PARENT_CLASS, NULL);
296
297#ifdef HAVE_SYSTEMD 297#ifdef HAVE_SYSTEMD
298 if (getenv("WATCHDOG_USEC")) 298 if (getenv("WATCHDOG_USEC"))
299 { 299 {
@@ -310,13 +310,12 @@ ecore_init(void)
310 } 310 }
311#endif 311#endif
312 312
313 ecore_system_modules_load();
314
313 eina_log_timing(_ecore_log_dom, 315 eina_log_timing(_ecore_log_dom,
314 EINA_LOG_STATE_STOP, 316 EINA_LOG_STATE_STOP,
315 EINA_LOG_STATE_INIT); 317 EINA_LOG_STATE_INIT);
316 318
317
318 ecore_system_modules_load();
319
320 return _ecore_init_count; 319 return _ecore_init_count;
321 320
322shutdown_mempool: 321shutdown_mempool: