[EGIT] [core/efl] master 01/02: Ecore: more precise implementation of ecore_time_get on Windows

[Vincent Torri]

stefan pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=33304d656cf5a1b4580ce711851c3ebc57f1acea

commit 33304d656cf5a1b4580ce711851c3ebc57f1acea
Author: Vincent Torri <vincent.to...@gmail.com>
Date:   Sat Aug 22 05:56:05 2020 +0000

    Ecore: more precise implementation of ecore_time_get on Windows
    
    Implement directly monotonic clock on Windows, to have more accurate results
    
    Reviewed-by: João Paulo Taylor Ienczak Zanette 
<joao....@expertisesolutions.com.br>
    Reviewed-by: Stefan Schmidt <ste...@datenfreihafen.org>
    Differential Revision: https://phab.enlightenment.org/D12112
---
 src/lib/ecore/ecore_time.c | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/lib/ecore/ecore_time.c b/src/lib/ecore/ecore_time.c
index f2afe0e860..9f039e2b59 100644
--- a/src/lib/ecore/ecore_time.c
+++ b/src/lib/ecore/ecore_time.c
@@ -13,10 +13,16 @@
 
 #include <time.h>
 
+#ifdef _WIN32
+# include <evil_private.h> /* gettimeofday */
+#endif
+
 #include "Ecore.h"
 #include "ecore_private.h"
 
-#if defined (HAVE_CLOCK_GETTIME)
+#if defined(_WIN32)
+static LONGLONG _ecore_time_freq;
+#elif defined (HAVE_CLOCK_GETTIME)
 static clockid_t _ecore_time_clock_id;
 static Eina_Bool _ecore_time_got_clock_id = EINA_FALSE;
 #elif defined(__APPLE__) && defined(__MACH__)
@@ -26,7 +32,12 @@ static double _ecore_time_clock_conversion = 1e-9;
 EAPI double
 ecore_time_get(void)
 {
-#if defined (HAVE_CLOCK_GETTIME)
+#ifdef _WIN32
+   LARGE_INTEGER count;
+
+   QueryPerformanceCounter(&count);
+   return (double)count.QuadPart/ (double)_ecore_time_freq;
+#elif defined (HAVE_CLOCK_GETTIME)
    struct timespec t;
 
    if (EINA_UNLIKELY(!_ecore_time_got_clock_id))
@@ -39,8 +50,6 @@ ecore_time_get(void)
      }
 
    return (double)t.tv_sec + (((double)t.tv_nsec) / 1000000000.0);
-#elif defined(_WIN32)
-   return evil_time_get();
 #elif defined(__APPLE__) && defined(__MACH__)
    return _ecore_time_clock_conversion * (double)mach_absolute_time();
 #else
@@ -82,7 +91,12 @@ ecore_loop_time_set(double t)
 void
 _ecore_time_init(void)
 {
-#if defined(HAVE_CLOCK_GETTIME)
+#if defined(_WIN32)
+   LARGE_INTEGER freq;
+
+   QueryPerformanceFrequency(&freq);
+   _ecore_time_freq = freq.QuadPart;
+#elif defined(HAVE_CLOCK_GETTIME)
    struct timespec t;
 
    if (_ecore_time_got_clock_id) return;
@@ -103,18 +117,16 @@ _ecore_time_init(void)
    else
      CRI("Cannot get a valid clock_gettime() clock id! Fallback to unix time");
 #else
-# ifndef _WIN32
-#  if defined(__APPLE__) && defined(__MACH__)
+# if defined(__APPLE__) && defined(__MACH__)
    mach_timebase_info_data_t info;
    kern_return_t err = mach_timebase_info(&info);
    if (err == 0)
      _ecore_time_clock_conversion = 1e-9 * (double)info.numer / 
(double)info.denom;
    else
      WRN("Unable to get timebase info. Fallback to nanoseconds");
-#  else
-#   warning "Your platform isn't supported yet"
+# else
+#  warning "Your platform isn't supported yet"
    CRI("Platform does not support clock_gettime. Fallback to unix time");
-#  endif
 # endif
 #endif
    ecore_loop_time_set(ecore_time_get());

--