diff options
| author | marha <marha@users.sourceforge.net> | 2010-12-28 16:10:20 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-12-28 16:10:20 +0000 |
| commit | 807c6931fe683fd844ceec1b023232181e6aae03 (patch) | |
| tree | 1a131ed95fe2200d0ad33da8f7755a7ed2364adc /xorg-server/os/utils.c | |
| parent | 973099dda7e49e5abe29819a7124b3b1e7bd8b92 (diff) | |
| download | vcxsrv-807c6931fe683fd844ceec1b023232181e6aae03.tar.gz vcxsrv-807c6931fe683fd844ceec1b023232181e6aae03.tar.bz2 vcxsrv-807c6931fe683fd844ceec1b023232181e6aae03.zip | |
xserver and mesa git update 28-12-2010
Diffstat (limited to 'xorg-server/os/utils.c')
| -rw-r--r-- | xorg-server/os/utils.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/xorg-server/os/utils.c b/xorg-server/os/utils.c index 260c3a99c..eb3ba91bb 100644 --- a/xorg-server/os/utils.c +++ b/xorg-server/os/utils.c @@ -427,7 +427,21 @@ GetTimeInMillis(void) #ifdef MONOTONIC_CLOCK
struct timespec tp;
- if (clock_gettime(CLOCK_MONOTONIC, &tp) == 0)
+ static clockid_t clockid;
+ if (!clockid) {
+#ifdef CLOCK_MONOTONIC_COARSE
+ if (clock_getres(CLOCK_MONOTONIC_COARSE, &tp) == 0 &&
+ (tp.tv_nsec / 1000) <= 1000 &&
+ clock_gettime(CLOCK_MONOTONIC_COARSE, &tp) == 0)
+ clockid = CLOCK_MONOTONIC_COARSE;
+ else
+#endif
+ if (clock_gettime(CLOCK_MONOTONIC, &tp) == 0)
+ clockid = CLOCK_MONOTONIC;
+ else
+ clockid = ~0L;
+ }
+ if (clockid != ~0L && clock_gettime(clockid, &tp) == 0)
return (tp.tv_sec * 1000) + (tp.tv_nsec / 1000000L);
#endif
|