aboutsummaryrefslogtreecommitdiff
path: root/util/throttle.c
diff options
context:
space:
mode:
authorStefan Hajnoczi <stefanha@redhat.com>2015-07-08 15:10:09 +0100
committerPeter Maydell <peter.maydell@linaro.org>2015-07-20 17:01:00 +0100
commit13566fe3e584e7b14a6f45246976b91677dc2a77 (patch)
tree5d62375ef4c36a58db30feef2a65c7bcadfa44f7 /util/throttle.c
parentdcc8a3ab632d0f11a1bf3b08381cf0f93e616b9f (diff)
timer: rename NSEC_PER_SEC due to Mac OS X header clash
Commit e0cf11f31c24cfb17f44ed46c254d84c78e7f6e9 ("timer: Use a single definition of NSEC_PER_SEC for the whole codebase") renamed NANOSECONDS_PER_SECOND to NSEC_PER_SEC. On Mac OS X there is a <dispatch/time.h> system header which also defines NSEC_PER_SEC. This causes compiler warnings. Let's use the old name instead. It's longer but it doesn't clash. Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> Message-id: 1436364609-7929-1-git-send-email-stefanha@redhat.com Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'util/throttle.c')
-rw-r--r--util/throttle.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/util/throttle.c b/util/throttle.c
index ec70476f8f..706c13111e 100644
--- a/util/throttle.c
+++ b/util/throttle.c
@@ -36,7 +36,7 @@ void throttle_leak_bucket(LeakyBucket *bkt, int64_t delta_ns)
double leak;
/* compute how much to leak */
- leak = (bkt->avg * (double) delta_ns) / NSEC_PER_SEC;
+ leak = (bkt->avg * (double) delta_ns) / NANOSECONDS_PER_SECOND;
/* make the bucket leak */
bkt->level = MAX(bkt->level - leak, 0);
@@ -72,7 +72,7 @@ static void throttle_do_leak(ThrottleState *ts, int64_t now)
*/
static int64_t throttle_do_compute_wait(double limit, double extra)
{
- double wait = extra * NSEC_PER_SEC;
+ double wait = extra * NANOSECONDS_PER_SECOND;
wait /= limit;
return wait;
}