Commit 81144732289348ac0904292e2528be7cb3862a18
2013-08-18T11:39:09
Set high resolution timing on windows within the cgsleep functions.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97
diff --git a/util.c b/util.c
index 43f5005..a84d278 100644
--- a/util.c
+++ b/util.c
@@ -890,12 +890,18 @@ void cgsleep_ms(int ms)
struct timespec ts_start, ts_end;
int ret;
+#ifdef WIN32
+ timeBeginPeriod(1);
+#endif
clock_gettime(CLOCK_MONOTONIC, &ts_start);
ms_to_timespec(&ts_end, ms);
timeraddspec(&ts_end, &ts_start);
do {
ret = clock_nanosleep(CLOCK_MONOTONIC, TIMER_ABSTIME, &ts_end, NULL);
} while (ret == EINTR);
+#ifdef WIN32
+ timeEndPeriod(1);
+#endif
}
void cgsleep_us(int64_t us)
@@ -903,12 +909,18 @@ void cgsleep_us(int64_t us)
struct timespec ts_start, ts_end;
int ret;
+#ifdef WIN32
+ timeBeginPeriod(1);
+#endif
clock_gettime(CLOCK_MONOTONIC, &ts_start);
us_to_timespec(&ts_end, us);
timeraddspec(&ts_end, &ts_start);
do {
ret = clock_nanosleep(CLOCK_MONOTONIC, TIMER_ABSTIME, &ts_end, NULL);
} while (ret == EINTR);
+#ifdef WIN32
+ timeEndPeriod(1);
+#endif
}
/* Reentrant version of cgsleep functions allow start time to be set separately
@@ -916,6 +928,9 @@ void cgsleep_us(int64_t us)
* counted in the sleep. */
void cgsleep_prepare_r(struct timespec *ts_start)
{
+#ifdef WIN32
+ timeBeginPeriod(1);
+#endif
clock_gettime(CLOCK_MONOTONIC, ts_start);
}
@@ -929,6 +944,9 @@ void cgsleep_ms_r(struct timespec *ts_start, int ms)
do {
ret = clock_nanosleep(CLOCK_MONOTONIC, TIMER_ABSTIME, &ts_end, NULL);
} while (ret == EINTR);
+#ifdef WIN32
+ timeEndPeriod(1);
+#endif
}
void cgsleep_us_r(struct timespec *ts_start, int us)
@@ -941,31 +959,22 @@ void cgsleep_us_r(struct timespec *ts_start, int us)
do {
ret = clock_nanosleep(CLOCK_MONOTONIC, TIMER_ABSTIME, &ts_end, NULL);
} while (ret == EINTR);
+#ifdef WIN32
+ timeEndPeriod(1);
+#endif
}
/* Provide a ms based sleep that uses nanosleep to avoid poor usleep accuracy
* on SMP machines */
void nmsleep(unsigned int msecs)
{
-#ifdef WIN32
- timeBeginPeriod(1);
-#endif
cgsleep_ms((int)msecs);
-#ifdef WIN32
- timeEndPeriod(1);
-#endif
}
/* Same for usecs */
void nusleep(unsigned int usecs)
{
-#ifdef WIN32
- timeBeginPeriod(1);
-#endif
cgsleep_us((int64_t)usecs);
-#ifdef WIN32
- timeEndPeriod(1);
-#endif
}
/* Returns the microseconds difference between end and start times as a double */