cedric pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=dcf2c0d8f8e744c861d65b320a92b287f953e2fe
commit dcf2c0d8f8e744c861d65b320a92b287f953e2fe Author: Cedric BAIL <[email protected]> Date: Mon Nov 3 06:38:17 2014 +0100 elementary: report time correctly when benchmarking time to first frame. --- src/lib/elm_general.h | 4 ++-- src/lib/elm_win.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/elm_general.h b/src/lib/elm_general.h index a800f24..2ce7236 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 extern EAPI double _elm_startup_time; #ifndef ELM_LIB_QUICKLAUNCH -#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 */ +#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 */ #else /** @deprecated macro to be used after the elm_main() function. * Do not define ELM_LIB_QUICKLAUNCH * Compile your programs with -fpie and -pie -rdynamic instead, to generate a single binary (linkable executable). */ -#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; } +#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; } #endif /**************************************************************************/ diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c index abbf5da..8defbc3 100644 --- a/src/lib/elm_win.c +++ b/src/lib/elm_win.c @@ -289,7 +289,7 @@ EAPI double _elm_startup_time = 0; static void _elm_win_first_frame_do(void *data, Evas *e EINA_UNUSED, void *event_info EINA_UNUSED) { - double end = ecore_time_get(); + double end = ecore_time_unix_get(); char *first = data; switch (*first) --
