summaryrefslogtreecommitdiff
path: root/src/lib/ecore
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@samsung.com>2013-03-27 21:42:55 +0900
committerCedric BAIL <cedric.bail@samsung.com>2013-03-27 21:43:45 +0900
commit2063e4353d86bdd89d66f6aca69a480f92254b93 (patch)
treef21c0a269e491868ccbaf20728732ee9a05ddc37 /src/lib/ecore
parent1d5692baa697fd2764767a6f2df5f7f360baf7f8 (diff)
efl: integrate eina_log_timing.
Diffstat (limited to 'src/lib/ecore')
-rw-r--r--src/lib/ecore/ecore.c16
1 files changed, 12 insertions, 4 deletions
diff --git a/src/lib/ecore/ecore.c b/src/lib/ecore/ecore.c
index 4efb5631af..fbc0f7f143 100644
--- a/src/lib/ecore/ecore.c
+++ b/src/lib/ecore/ecore.c
@@ -135,8 +135,6 @@ ecore_init(void)
135 if (++_ecore_init_count != 1) 135 if (++_ecore_init_count != 1)
136 return _ecore_init_count; 136 return _ecore_init_count;
137 137
138 eo_init();
139
140 setlocale(LC_CTYPE, ""); 138 setlocale(LC_CTYPE, "");
141 /* 139 /*
142 if (strcmp(nl_langinfo(CODESET), "UTF-8")) 140 if (strcmp(nl_langinfo(CODESET), "UTF-8"))
@@ -156,6 +154,9 @@ ecore_init(void)
156 EINA_LOG_ERR("Ecore was unable to create a log domain."); 154 EINA_LOG_ERR("Ecore was unable to create a log domain.");
157 goto shutdown_log_dom; 155 goto shutdown_log_dom;
158 } 156 }
157
158 eo_init();
159
159 if (getenv("ECORE_FPS_DEBUG")) _ecore_fps_debug = 1; 160 if (getenv("ECORE_FPS_DEBUG")) _ecore_fps_debug = 1;
160 if (_ecore_fps_debug) _ecore_fps_debug_init(); 161 if (_ecore_fps_debug) _ecore_fps_debug_init();
161 if (!ecore_mempool_init()) goto shutdown_mempool; 162 if (!ecore_mempool_init()) goto shutdown_mempool;
@@ -194,10 +195,15 @@ ecore_init(void)
194#endif 195#endif
195 _ecore_parent = eo_add(ECORE_PARENT_CLASS, NULL); 196 _ecore_parent = eo_add(ECORE_PARENT_CLASS, NULL);
196 197
198 eina_log_timing(_ecore_log_dom,
199 EINA_LOG_STATE_STOP,
200 EINA_LOG_STATE_INIT);
201
197 return _ecore_init_count; 202 return _ecore_init_count;
198 203
199shutdown_mempool: 204shutdown_mempool:
200 ecore_mempool_shutdown(); 205 ecore_mempool_shutdown();
206 eo_shutdown();
201shutdown_log_dom: 207shutdown_log_dom:
202 eina_shutdown(); 208 eina_shutdown();
203shutdown_evil: 209shutdown_evil:
@@ -205,8 +211,6 @@ shutdown_evil:
205 evil_shutdown(); 211 evil_shutdown();
206#endif 212#endif
207 213
208 eo_shutdown();
209
210 return --_ecore_init_count; 214 return --_ecore_init_count;
211} 215}
212 216
@@ -238,6 +242,10 @@ ecore_shutdown(void)
238 if (--_ecore_init_count != 0) 242 if (--_ecore_init_count != 0)
239 goto unlock; 243 goto unlock;
240 244
245 eina_log_timing(_ecore_log_dom,
246 EINA_LOG_STATE_START,
247 EINA_LOG_STATE_SHUTDOWN);
248
241 if (_ecore_fps_debug) _ecore_fps_debug_shutdown(); 249 if (_ecore_fps_debug) _ecore_fps_debug_shutdown();
242 _ecore_coroutine_shutdown(); 250 _ecore_coroutine_shutdown();
243 _ecore_poller_shutdown(); 251 _ecore_poller_shutdown();