Changeset 335 for libcaca/trunk/src/time.cTweet

Timestamp:

Jan 11, 2004, 2:45:57 AM (19 years ago)

Author:

Sam Hocevar

Message:

• configure.ac: + Check for gettimeofday().
• src/time.c: + Created _caca_time(). + Ported _caca_getticks() to the Win32 API.
• src/caca.c: + Properly builds on Win32.
• test/event.c: + Added <stdlib.h> because we use malloc().

File:

• libcaca/trunk/src/time.c (modified) (2 diffs)

libcaca/trunk/src/time.c

@@ -34 +34 @@
 #include <time.h>
 
+#if defined(USE_WIN32)
+#   include <windows.h>
+#endif
+
+#include <unistd.h>
+
 #include "caca.h"
 #include "caca_internals.h"
 
+void _caca_sleep(unsigned int usec)
+{
+#if defined(HAVE_USLEEP)
+        usleep(usec);
+#elif defined(HAVE_SLEEP)
+        Sleep(usec / 1000);
+#else
+        SLEEP
+#endif
+}
+
 unsigned int _caca_getticks(struct caca_timer *timer)
 {
+#if defined(HAVE_GETTIMEOFDAY)
     struct timeval tv;
+#elif defined(USE_WIN32)
+    static long long int freq = -1LL;
+    long long int usec;
+#endif
     unsigned int ticks = 0;
+    int new_sec, new_usec;
 
+#if defined(HAVE_GETTIMEOFDAY)
     gettimeofday(&tv, NULL);
+    new_sec = tv.tv_sec;
+    new_usec = tv.tv_usec;
+#elif defined(USE_WIN32)
+    if(freq == -1LL)
+    {
+        if(!QueryPerformanceFrequency((LARGE_INTEGER *)&freq))
+            freq = 0;
+    }
+
+    QueryPerformanceCounter((LARGE_INTEGER *)&usec);
+    new_sec = usec / freq;
+    new_usec = usec % freq;
+#endif
 
     if(timer->last_sec != 0)
@@ -48 +85 @@
         /* If the delay was greater than 60 seconds, return 10 seconds
          * otherwise we may overflow our ticks counter. */
-        if(tv.tv_sec >= timer->last_sec + 60)
+        if(new_sec >= timer->last_sec + 60)
             ticks = 60 * 1000000;
         else
         {
-            ticks = (tv.tv_sec - timer->last_sec) * 1000000;
-            ticks += tv.tv_usec;
+            ticks = (new_sec - timer->last_sec) * 1000000;
+            ticks += new_usec;
             ticks -= timer->last_usec;
         }
     }
 
-    timer->last_sec = tv.tv_sec;
-    timer->last_usec = tv.tv_usec;
+    timer->last_sec = new_sec;
+    timer->last_usec = new_usec;
 
     return ticks;