#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif /* HAVE_UNISTD_H */
-#ifndef NATIVE_WIN32
+#ifndef G_OS_WIN32
#include <sys/time.h>
-#endif /* NATIVE_WIN32 */
+#endif /* G_OS_WIN32 */
-#ifdef NATIVE_WIN32
+#ifdef G_OS_WIN32
#include <windows.h>
-#endif /* NATIVE_WIN32 */
+#endif /* G_OS_WIN32 */
typedef struct _GRealTimer GRealTimer;
struct _GRealTimer
{
-#ifdef NATIVE_WIN32
+#ifdef G_OS_WIN32
DWORD start;
DWORD end;
-#else /* !NATIVE_WIN32 */
+#else /* !G_OS_WIN32 */
struct timeval start;
struct timeval end;
-#endif /* !NATIVE_WIN32 */
+#endif /* !G_OS_WIN32 */
guint active : 1;
};
timer = g_new (GRealTimer, 1);
timer->active = TRUE;
-#ifdef NATIVE_WIN32
+#ifdef G_OS_WIN32
timer->start = GetTickCount ();
-#else /* !NATIVE_WIN32 */
+#else /* !G_OS_WIN32 */
gettimeofday (&timer->start, NULL);
-#endif /* !NATIVE_WIN32 */
+#endif /* !G_OS_WIN32 */
return ((GTimer*) timer);
}
rtimer = (GRealTimer*) timer;
rtimer->active = TRUE;
-#ifdef NATIVE_WIN32
+#ifdef G_OS_WIN32
rtimer->start = GetTickCount ();
-#else /* !NATIVE_WIN32 */
+#else /* !G_OS_WIN32 */
gettimeofday (&rtimer->start, NULL);
-#endif /* !NATIVE_WIN32 */
+#endif /* !G_OS_WIN32 */
}
void
rtimer = (GRealTimer*) timer;
rtimer->active = FALSE;
-#ifdef NATIVE_WIN32
+#ifdef G_OS_WIN32
rtimer->end = GetTickCount ();
-#else /* !NATIVE_WIN32 */
+#else /* !G_OS_WIN32 */
gettimeofday (&rtimer->end, NULL);
-#endif /* !NATIVE_WIN32 */
+#endif /* !G_OS_WIN32 */
}
void
rtimer = (GRealTimer*) timer;
-#ifdef NATIVE_WIN32
+#ifdef G_OS_WIN32
rtimer->start = GetTickCount ();
-#else /* !NATIVE_WIN32 */
+#else /* !G_OS_WIN32 */
gettimeofday (&rtimer->start, NULL);
-#endif /* !NATIVE_WIN32 */
+#endif /* !G_OS_WIN32 */
}
gdouble
{
GRealTimer *rtimer;
gdouble total;
-#ifndef NATIVE_WIN32
+#ifndef G_OS_WIN32
struct timeval elapsed;
-#endif /* NATIVE_WIN32 */
+#endif /* G_OS_WIN32 */
g_return_val_if_fail (timer != NULL, 0);
rtimer = (GRealTimer*) timer;
-#ifdef NATIVE_WIN32
+#ifdef G_OS_WIN32
if (rtimer->active)
rtimer->end = GetTickCount ();
*microseconds =
((rtimer->end - rtimer->start) % 1000) * 1000;
}
-#else /* !NATIVE_WIN32 */
+#else /* !G_OS_WIN32 */
if (rtimer->active)
gettimeofday (&rtimer->end, NULL);
if (rtimer->start.tv_usec > rtimer->end.tv_usec)
{
- rtimer->end.tv_usec += 1000000;
+ rtimer->end.tv_usec += G_MICROSEC;
rtimer->end.tv_sec--;
}
elapsed.tv_sec = rtimer->end.tv_sec - rtimer->start.tv_sec;
total = elapsed.tv_sec + ((gdouble) elapsed.tv_usec / 1e6);
+ if (total < 0)
+ {
+ total = 0;
- if (microseconds)
+ if (microseconds)
+ *microseconds = 0;
+ }
+ else if (microseconds)
*microseconds = elapsed.tv_usec;
-#endif /* !NATIVE_WIN32 */
+
+#endif /* !G_OS_WIN32 */
return total;
}
+
+void
+g_usleep (gulong microseconds)
+{
+#ifdef G_OS_WIN32
+ Sleep (microseconds / 1000);
+#else
+ struct timeval tv;
+ tv.tv_sec = microseconds / G_MICROSEC;
+ tv.tv_usec = microseconds % G_MICROSEC;
+ select(0, NULL, NULL, NULL, &tv);
+#endif
+}
+