summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2014-11-03 06:38:17 +0100
committerCedric BAIL <cedric@osg.samsung.com>2014-11-03 06:38:48 +0100
commitdcf2c0d8f8e744c861d65b320a92b287f953e2fe (patch)
tree26a6b0c6676f0aa4a1322aa55bd5b3d846de2bf0
parent666bee0aec9ecbccf43bbc2fea736d7d6f965565 (diff)
elementary: report time correctly when benchmarking time to first frame.
-rw-r--r--src/lib/elm_general.h4
-rw-r--r--src/lib/elm_win.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/elm_general.h b/src/lib/elm_general.h
index a800f242a..2ce72367f 100644
--- a/src/lib/elm_general.h
+++ b/src/lib/elm_general.h
@@ -163,13 +163,13 @@ typedef Eina_Bool (*Elm_Event_Cb)(void *data, Evas_Object *obj, Evas
163extern EAPI double _elm_startup_time; 163extern EAPI double _elm_startup_time;
164 164
165#ifndef ELM_LIB_QUICKLAUNCH 165#ifndef ELM_LIB_QUICKLAUNCH
166#define ELM_MAIN() int main(int argc, char **argv) { int ret; _elm_startup_time = ecore_time_get(); elm_init(argc, argv); ret = elm_main(argc, argv); elm_shutdown(); return ret; } /**< macro to be used after the elm_main() function */ 166#define ELM_MAIN() int main(int argc, char **argv) { int ret; _elm_startup_time = ecore_time_unix_get(); elm_init(argc, argv); ret = elm_main(argc, argv); elm_shutdown(); return ret; } /**< macro to be used after the elm_main() function */
167#else 167#else
168/** @deprecated macro to be used after the elm_main() function. 168/** @deprecated macro to be used after the elm_main() function.
169 * Do not define ELM_LIB_QUICKLAUNCH 169 * Do not define ELM_LIB_QUICKLAUNCH
170 * Compile your programs with -fpie and -pie -rdynamic instead, to generate a single binary (linkable executable). 170 * Compile your programs with -fpie and -pie -rdynamic instead, to generate a single binary (linkable executable).
171 */ 171 */
172#define ELM_MAIN() int main(int argc, char **argv) { int ret; _elm_startup_time = ecore_time_get(); ret = elm_quicklaunch_fallback(argc, argv); elm_shutdown(); return ret; } 172#define ELM_MAIN() int main(int argc, char **argv) { int ret; _elm_startup_time = ecore_time_unix_get(); ret = elm_quicklaunch_fallback(argc, argv); elm_shutdown(); return ret; }
173#endif 173#endif
174 174
175/**************************************************************************/ 175/**************************************************************************/
diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index abbf5dad0..8defbc3ab 100644
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -289,7 +289,7 @@ EAPI double _elm_startup_time = 0;
289static void 289static void
290_elm_win_first_frame_do(void *data, Evas *e EINA_UNUSED, void *event_info EINA_UNUSED) 290_elm_win_first_frame_do(void *data, Evas *e EINA_UNUSED, void *event_info EINA_UNUSED)
291{ 291{
292 double end = ecore_time_get(); 292 double end = ecore_time_unix_get();
293 char *first = data; 293 char *first = data;
294 294
295 switch (*first) 295 switch (*first)