cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=d41b47f47e6bace28bb700d2aa8737cddb4b465b
commit d41b47f47e6bace28bb700d2aa8737cddb4b465b Author: Benjamin Jacobs <[email protected]> Date: Mon Jun 6 11:16:44 2016 -0700 ecore_time.c: do not mess with the representation of clockid_t. Clockid_t should be used as an opaque type. Some platform might want to (and even do, e.g. DragonFlyBSD) declare clockid_t as an unsigned. On such platform, testing the sign of clockid_t is never false, and assigning it a negative value is an UB, which makes this code unlikely to work as intended. Fixes black window on dragonfly! Thanks to gcc for spotting this. CC lib/ecore/lib_ecore_libecore_la-ecore_time.lo In file included from ../src/lib/eina/Eina.h:215:0, from lib/ecore/Ecore.h:304, from lib/ecore/ecore_time.c:18: lib/ecore/ecore_time.c: In function 'ecore_time_get': Signed-off-by: Cedric BAIL <[email protected]> --- src/lib/ecore/ecore_time.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/lib/ecore/ecore_time.c b/src/lib/ecore/ecore_time.c index 30c54f1..2c871e2 100644 --- a/src/lib/ecore/ecore_time.c +++ b/src/lib/ecore/ecore_time.c @@ -19,7 +19,8 @@ #include "ecore_private.h" #if defined (HAVE_CLOCK_GETTIME) || defined (EXOTIC_PROVIDE_CLOCK_GETTIME) -static clockid_t _ecore_time_clock_id = -1; +static clockid_t _ecore_time_clock_id; +static Eina_Bool _ecore_time_got_clock_id = EINA_FALSE; #elif defined(__APPLE__) && defined(__MACH__) static double _ecore_time_clock_conversion = 1e-9; #endif @@ -31,7 +32,7 @@ ecore_time_get(void) #if defined (HAVE_CLOCK_GETTIME) || defined (EXOTIC_PROVIDE_CLOCK_GETTIME) struct timespec t; - if (EINA_UNLIKELY(_ecore_time_clock_id < 0)) + if (EINA_UNLIKELY(!_ecore_time_got_clock_id)) return ecore_time_unix_get(); if (EINA_UNLIKELY(clock_gettime(_ecore_time_clock_id, &t))) @@ -88,22 +89,23 @@ _ecore_time_init(void) #if defined (HAVE_CLOCK_GETTIME) || defined (EXOTIC_PROVIDE_CLOCK_GETTIME) struct timespec t; - if (_ecore_time_clock_id != -1) return; + if (_ecore_time_got_clock_id) return; if (!clock_gettime(CLOCK_MONOTONIC, &t)) { _ecore_time_clock_id = CLOCK_MONOTONIC; + _ecore_time_got_clock_id = EINA_TRUE; DBG("using CLOCK_MONOTONIC."); } else if (!clock_gettime(CLOCK_REALTIME, &t)) { /* may go backwards */ _ecore_time_clock_id = CLOCK_REALTIME; + _ecore_time_got_clock_id = EINA_TRUE; WRN("CLOCK_MONOTONIC not available. Fallback to CLOCK_REALTIME."); } else { - _ecore_time_clock_id = -2; CRI("Cannot get a valid clock_gettime() clock id! " "Fallback to unix time."); } --
