cedric pushed a commit to branch master.
commit 2063e4353d86bdd89d66f6aca69a480f92254b93
Author: Cedric BAIL <[email protected]>
Date: Wed Mar 27 21:42:55 2013 +0900
efl: integrate eina_log_timing.
---
ChangeLog | 2 ++
src/lib/ecore/ecore.c | 16 ++++++++++++----
src/lib/ecore_audio/ecore_audio.c | 7 +++++++
src/lib/ecore_con/ecore_con.c | 8 ++++++++
src/lib/ecore_evas/ecore_evas.c | 8 ++++++++
src/lib/edje/edje_main.c | 8 ++++++++
src/lib/eet/eet_lib.c | 8 ++++++++
src/lib/eio/eio_main.c | 8 ++++++++
src/lib/eo/eo.c | 8 ++++++++
src/lib/evas/canvas/evas_main.c | 17 +++++++++++++----
10 files changed, 82 insertions(+), 8 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 0313cdb..9750a2d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
2013-03-27 Cedric Bail
* Eina: Add eina_log_timing.
+ * Ecore, Ecore_Audio, Ecore_Con, Ecore_Evas,
+ Edje, Eet, Eio, Eo, Evas: use eina_log_timing.
2013-03-27 Jihoon Kim
diff --git a/src/lib/ecore/ecore.c b/src/lib/ecore/ecore.c
index 4efb563..fbc0f7f 100644
--- a/src/lib/ecore/ecore.c
+++ b/src/lib/ecore/ecore.c
@@ -135,8 +135,6 @@ ecore_init(void)
if (++_ecore_init_count != 1)
return _ecore_init_count;
- eo_init();
-
setlocale(LC_CTYPE, "");
/*
if (strcmp(nl_langinfo(CODESET), "UTF-8"))
@@ -156,6 +154,9 @@ ecore_init(void)
EINA_LOG_ERR("Ecore was unable to create a log domain.");
goto shutdown_log_dom;
}
+
+ eo_init();
+
if (getenv("ECORE_FPS_DEBUG")) _ecore_fps_debug = 1;
if (_ecore_fps_debug) _ecore_fps_debug_init();
if (!ecore_mempool_init()) goto shutdown_mempool;
@@ -194,10 +195,15 @@ ecore_init(void)
#endif
_ecore_parent = eo_add(ECORE_PARENT_CLASS, NULL);
+ eina_log_timing(_ecore_log_dom,
+ EINA_LOG_STATE_STOP,
+ EINA_LOG_STATE_INIT);
+
return _ecore_init_count;
shutdown_mempool:
ecore_mempool_shutdown();
+ eo_shutdown();
shutdown_log_dom:
eina_shutdown();
shutdown_evil:
@@ -205,8 +211,6 @@ shutdown_evil:
evil_shutdown();
#endif
- eo_shutdown();
-
return --_ecore_init_count;
}
@@ -238,6 +242,10 @@ ecore_shutdown(void)
if (--_ecore_init_count != 0)
goto unlock;
+ eina_log_timing(_ecore_log_dom,
+ EINA_LOG_STATE_START,
+ EINA_LOG_STATE_SHUTDOWN);
+
if (_ecore_fps_debug) _ecore_fps_debug_shutdown();
_ecore_coroutine_shutdown();
_ecore_poller_shutdown();
diff --git a/src/lib/ecore_audio/ecore_audio.c
b/src/lib/ecore_audio/ecore_audio.c
index 1a1e863..883039f 100644
--- a/src/lib/ecore_audio/ecore_audio.c
+++ b/src/lib/ecore_audio/ecore_audio.c
@@ -100,6 +100,10 @@ ecore_audio_init(void)
if (mod)
ecore_audio_modules = eina_list_append(ecore_audio_modules, mod);
+ eina_log_timing(_ecore_audio_log_dom,
+ EINA_LOG_STATE_STOP,
+ EINA_LOG_STATE_INIT);
+
return _ecore_audio_init_count;
}
@@ -111,6 +115,9 @@ ecore_audio_shutdown(void)
return _ecore_audio_init_count;
/* FIXME: Shutdown all the inputs and outputs first */
+ eina_log_timing(_ecore_audio_log_dom,
+ EINA_LOG_STATE_START,
+ EINA_LOG_STATE_SHUTDOWN);
#ifdef HAVE_ALSA
ecore_audio_alsa_shutdown();
diff --git a/src/lib/ecore_con/ecore_con.c b/src/lib/ecore_con/ecore_con.c
index c2a31d5..d561468 100644
--- a/src/lib/ecore_con/ecore_con.c
+++ b/src/lib/ecore_con/ecore_con.c
@@ -223,6 +223,10 @@ ecore_con_init(void)
sd_fd_max = sd_listen_fds(0);
#endif
+ eina_log_timing(_ecore_con_log_dom,
+ EINA_LOG_STATE_STOP,
+ EINA_LOG_STATE_INIT);
+
return _ecore_con_init_count;
}
@@ -235,6 +239,10 @@ ecore_con_shutdown(void)
if (--_ecore_con_init_count != 0)
return _ecore_con_init_count;
+ eina_log_timing(_ecore_con_log_dom,
+ EINA_LOG_STATE_START,
+ EINA_LOG_STATE_SHUTDOWN);
+
EINA_LIST_FOREACH_SAFE(servers, l, l2, svr)
{
Ecore_Con_Event_Server_Add *ev;
diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c
index e22ab33..114007e 100644
--- a/src/lib/ecore_evas/ecore_evas.c
+++ b/src/lib/ecore_evas/ecore_evas.c
@@ -314,6 +314,10 @@ ecore_evas_init(void)
_ecore_evas_engine_init();
+ eina_log_timing(_ecore_evas_log_dom,
+ EINA_LOG_STATE_STOP,
+ EINA_LOG_STATE_INIT);
+
if (getenv("ECORE_EVAS_COMP_NOSYNC"))
_ecore_evas_app_comp_sync = 0;
return _ecore_evas_init_count;
@@ -332,6 +336,10 @@ ecore_evas_shutdown(void)
if (--_ecore_evas_init_count != 0)
return _ecore_evas_init_count;
+ eina_log_timing(_ecore_evas_log_dom,
+ EINA_LOG_STATE_START,
+ EINA_LOG_STATE_SHUTDOWN);
+
while (ecore_evases) _ecore_evas_free(ecore_evases);
if (_ecore_evas_fps_debug) _ecore_evas_fps_debug_shutdown();
diff --git a/src/lib/edje/edje_main.c b/src/lib/edje/edje_main.c
index b16836a..f8116b5 100644
--- a/src/lib/edje/edje_main.c
+++ b/src/lib/edje/edje_main.c
@@ -101,6 +101,10 @@ edje_init(void)
_edje_calc_params_map_cow = eina_cow_add("Edje Calc Params Map", sizeof
(Edje_Calc_Params), 8, &default_calc_map);
_edje_calc_params_physics_cow= eina_cow_add("Edje Calc Params Physics",
sizeof (Edje_Calc_Params_Physics), 8, &default_calc_physics);
+ eina_log_timing(_edje_default_log_dom,
+ EINA_LOG_STATE_STOP,
+ EINA_LOG_STATE_INIT);
+
return _edje_init_count;
shutdown_all:
@@ -139,6 +143,10 @@ _edje_shutdown_core(void)
{
if (_edje_users > 0) return;
+ eina_log_timing(_edje_default_log_dom,
+ EINA_LOG_STATE_START,
+ EINA_LOG_STATE_SHUTDOWN);
+
_edje_file_cache_shutdown();
_edje_color_class_members_free();
_edje_color_class_hash_free();
diff --git a/src/lib/eet/eet_lib.c b/src/lib/eet/eet_lib.c
index cbe7da4..5a0c34e 100644
--- a/src/lib/eet/eet_lib.c
+++ b/src/lib/eet/eet_lib.c
@@ -590,6 +590,10 @@ eet_init(void)
OpenSSL_add_all_algorithms();
#endif /* ifdef HAVE_OPENSSL */
+ eina_log_timing(_eet_log_dom_global,
+ EINA_LOG_STATE_STOP,
+ EINA_LOG_STATE_INIT);
+
return eet_init_count;
#ifdef HAVE_GNUTLS
@@ -617,6 +621,10 @@ eet_shutdown(void)
if (--eet_init_count != 0)
return eet_init_count;
+ eina_log_timing(_eet_log_dom_global,
+ EINA_LOG_STATE_START,
+ EINA_LOG_STATE_SHUTDOWN);
+
eet_clearcache();
if (eet_writers_num || eet_readers_num)
diff --git a/src/lib/eio/eio_main.c b/src/lib/eio/eio_main.c
index 8de81c7..6e9d843 100644
--- a/src/lib/eio/eio_main.c
+++ b/src/lib/eio/eio_main.c
@@ -228,6 +228,10 @@ eio_init(void)
eio_monitor_init();
+ eina_log_timing(_eio_log_dom_global,
+ EINA_LOG_STATE_STOP,
+ EINA_LOG_STATE_INIT);
+
return _eio_init_count;
unregister_log_domain:
@@ -254,6 +258,10 @@ eio_shutdown(void)
if (--_eio_init_count != 0)
return _eio_init_count;
+ eina_log_timing(_eio_log_dom_global,
+ EINA_LOG_STATE_START,
+ EINA_LOG_STATE_SHUTDOWN);
+
eio_monitor_shutdown();
eina_lock_free(&(direct_info_pool.lock));
diff --git a/src/lib/eo/eo.c b/src/lib/eo/eo.c
index d14920e..7baa049 100644
--- a/src/lib/eo/eo.c
+++ b/src/lib/eo/eo.c
@@ -1449,6 +1449,10 @@ eo_init(void)
_eo_class_isa_func(NULL, NULL, NULL);
#endif
+ eina_log_timing(_eo_log_dom,
+ EINA_LOG_STATE_STOP,
+ EINA_LOG_STATE_INIT);
+
return EINA_TRUE;
}
@@ -1461,6 +1465,10 @@ eo_shutdown(void)
if (--_eo_init_count > 0)
return EINA_TRUE;
+ eina_log_timing(_eo_log_dom,
+ EINA_LOG_STATE_START,
+ EINA_LOG_STATE_SHUTDOWN);
+
for (i = 0 ; i < _eo_classes_last_id ; i++, cls_itr++)
{
if (*cls_itr)
diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c
index bd30ee3..9963434 100644
--- a/src/lib/evas/canvas/evas_main.c
+++ b/src/lib/evas/canvas/evas_main.c
@@ -24,8 +24,6 @@ evas_init(void)
if (++_evas_init_count != 1)
return _evas_init_count;
- eo_init();
-
#ifdef LKDEBUG
if (getenv("EVAS_LOCK_DEBUG"))
{
@@ -50,6 +48,8 @@ evas_init(void)
goto shutdown_eina;
}
+ eo_init();
+
evas_module_init();
if (!evas_async_events_init())
goto shutdown_module;
@@ -60,6 +60,10 @@ evas_init(void)
evas_thread_init();
+ eina_log_timing(_evas_log_dom_global,
+ EINA_LOG_STATE_STOP,
+ EINA_LOG_STATE_INIT);
+
return _evas_init_count;
shutdown_module:
@@ -86,6 +90,10 @@ evas_shutdown(void)
if (--_evas_init_count != 0)
return _evas_init_count;
+ eina_log_timing(_evas_log_dom_global,
+ EINA_LOG_STATE_START,
+ EINA_LOG_STATE_SHUTDOWN);
+
eina_cow_del(evas_object_proxy_cow);
eina_cow_del(evas_object_map_cow);
evas_object_map_cow = NULL;
@@ -104,14 +112,15 @@ evas_shutdown(void)
evas_font_dir_cache_free();
evas_common_shutdown();
evas_module_shutdown();
+ eo_shutdown();
+
eina_log_domain_unregister(_evas_log_dom_global);
+
eina_shutdown();
#ifdef HAVE_EVIL
evil_shutdown();
#endif
- eo_shutdown();
-
return _evas_init_count;
}
--
------------------------------------------------------------------------------
Own the Future-Intel® Level Up Game Demo Contest 2013
Rise to greatness in Intel's independent game demo contest.
Compete for recognition, cash, and the chance to get your game
on Steam. $5K grand prize plus 10 genre and skill prizes.
Submit your demo by 6/6/13. http://p.sf.net/sfu/intel_levelupd2d
