X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=time.c;h=6d79ecdca3036515f89aa0df5bd9a38b4b7085f8;hp=c5b67ff11e88eac9205359fb1c09bb3fa4db3fe7;hb=10927316a4bd0e2ceba98e62c062e352c0e312fe;hpb=4e991c23d2d06484f581eb5e2105bc102cb35941

diff --git a/time.c b/time.c
index c5b67ff1..6d79ecdc 100644
--- a/time.c
+++ b/time.c
@@ -6,10 +6,11 @@
 static struct timeval genesis;
 static unsigned long ns_granularity;
 
-unsigned long utime_since(struct timeval *s, struct timeval *e)
+unsigned long long utime_since(struct timeval *s, struct timeval *e)
 {
 	long sec, usec;
-
+	unsigned long long ret;
+	
 	sec = e->tv_sec - s->tv_sec;
 	usec = e->tv_usec - s->tv_usec;
 	if (sec > 0 && usec < 0) {
@@ -17,12 +18,18 @@ unsigned long utime_since(struct timeval *s, struct timeval *e)
 		usec += 1000000;
 	}
 
-	sec *= (double) 1000000;
-
-	return sec + usec;
+	/*
+	 * time warp bug on some kernels?
+	 */
+	if (sec < 0 || (sec == 0 && usec < 0))
+		return 0;
+	
+	ret = sec * 1000000ULL + usec;
+	
+	return ret;
 }
 
-unsigned long utime_since_now(struct timeval *s)
+unsigned long long utime_since_now(struct timeval *s)
 {
 	struct timeval t;
 
@@ -32,7 +39,7 @@ unsigned long utime_since_now(struct timeval *s)
 
 unsigned long mtime_since(struct timeval *s, struct timeval *e)
 {
-	long sec, usec;
+	long sec, usec, ret;
 
 	sec = e->tv_sec - s->tv_sec;
 	usec = e->tv_usec - s->tv_usec;
@@ -41,10 +48,17 @@ unsigned long mtime_since(struct timeval *s, struct timeval *e)
 		usec += 1000000;
 	}
 
-	sec *= (double) 1000;
-	usec /= (double) 1000;
+	sec *= 1000UL;
+	usec /= 1000UL;
+	ret = sec + usec;
 
-	return sec + usec;
+	/*
+	 * time warp bug on some kernels?
+	 */
+	if (ret < 0)
+		ret = 0;
+
+	return ret;
 }
 
 unsigned long mtime_since_now(struct timeval *s)
@@ -114,15 +128,15 @@ void rate_throttle(struct thread_data *td, unsigned long time_spent,
 	unsigned long usec_cycle;
 	unsigned int bs;
 
-	if (!td->rate && !td->rate_iops)
+	if (!td->o.rate && !td->o.rate_iops)
 		return;
 
 	if (td_rw(td))
-		bs = td->rw_min_bs;
+		bs = td->o.rw_min_bs;
 	else if (td_read(td))
-		bs = td->min_bs[DDIR_READ];
+		bs = td->o.min_bs[DDIR_READ];
 	else
-		bs = td->min_bs[DDIR_WRITE];
+		bs = td->o.min_bs[DDIR_WRITE];
 
 	usec_cycle = td->rate_usec_cycle * (bytes / bs);
 
@@ -130,9 +144,13 @@ void rate_throttle(struct thread_data *td, unsigned long time_spent,
 		unsigned long s = usec_cycle - time_spent;
 
 		td->rate_pending_usleep += s;
+
 		if (td->rate_pending_usleep >= 100000) {
+			struct timeval t;
+
+			fio_gettime(&t, NULL);
 			usec_sleep(td, td->rate_pending_usleep);
-			td->rate_pending_usleep = 0;
+			td->rate_pending_usleep -= utime_since_now(&t);
 		}
 	} else {
 		long overtime = time_spent - usec_cycle;