diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/sandglass_impl.h | 2 | ||||
| -rw-r--r-- | src/timespec.c | 6 | ||||
| -rw-r--r-- | src/tsc.c | 15 |
3 files changed, 16 insertions, 7 deletions
diff --git a/src/sandglass_impl.h b/src/sandglass_impl.h index 07a3616..689c6bf 100644 --- a/src/sandglass_impl.h +++ b/src/sandglass_impl.h @@ -41,6 +41,6 @@ void sandglass_get_currtime(struct timespec *ts); void sandglass_timespec_add(struct timespec *ts, const struct timespec *d); void sandglass_timespec_sub(struct timespec *ts, const struct timespec *d); int sandglass_timespec_cmp(const struct timespec *a, const struct timespec *b); -void sandglass_spin(struct timespec *ts); +void sandglass_spin(const struct timespec *ts); #endif /* SANDGLASS_IMPL_H_INCLUDED */
\ No newline at end of file diff --git a/src/timespec.c b/src/timespec.c index f8ab791..c077f8b 100644 --- a/src/timespec.c +++ b/src/timespec.c @@ -91,7 +91,7 @@ sandglass_timespec_cmp(const struct timespec *a, const struct timespec *b) /* Spins for the time interval specified by ts */ void -sandglass_spin(struct timespec *ts) +sandglass_spin(const struct timespec *ts) { struct timespec curr, until; sandglass_get_currtime(&curr); @@ -102,8 +102,4 @@ sandglass_spin(struct timespec *ts) do { sandglass_get_currtime(&curr); } while (sandglass_timespec_cmp(&curr, &until) < 0); - - /* Adjust ts to the time actually waited */ - sandglass_timespec_sub(&curr, &until); - sandglass_timespec_add(ts, &curr); } @@ -29,11 +29,24 @@ sandglass_tsc_resolution() { static long tsc = 0; static struct timespec ts = { .tv_sec = 0, .tv_nsec = 10000000L }; + struct timespec curr, until; if (tsc == 0) { + sandglass_get_currtime(&curr); + until = curr; + sandglass_timespec_add(&until, &ts); tsc = sandglass_get_tsc(); - sandglass_spin(&ts); + + /* Spin */ + do { + sandglass_get_currtime(&curr); + } while (sandglass_timespec_cmp(&curr, &until) < 0); + tsc = sandglass_get_tsc() - tsc; + + /* Adjust ts to the time actually waited */ + sandglass_timespec_sub(&curr, &until); + sandglass_timespec_add(&ts, &curr); } return tsc*1.0e9/ts.tv_nsec; |