X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=time.c;h=4fbc98bbc57f8b781d95c7a8362ce8b8ab348700;hp=4bf68a998f8ee43bff9c81eef6ed68127801fc17;hb=7172cfe8e0e918cc279eb501986f6ec78cc7aad9;hpb=413dd459a7710ba421061e840dd9ac3161c70f20

diff --git a/time.c b/time.c
index 4bf68a99..4fbc98bb 100644
--- a/time.c
+++ b/time.c
@@ -8,7 +8,7 @@ static unsigned long ns_granularity;
 
 unsigned long utime_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;
@@ -17,9 +17,16 @@ unsigned long utime_since(struct timeval *s, struct timeval *e)
 		usec += 1000000;
 	}
 
-	sec *= (double) 1000000;
+	sec *= 1000000UL;
+	ret = sec + usec;
 
-	return sec + usec;
+	/*
+	 * time warp bug on some kernels?
+	 */
+	if (ret < 0)
+		ret = 0;
+
+	return ret;
 }
 
 unsigned long utime_since_now(struct timeval *s)
@@ -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)
@@ -112,19 +126,31 @@ void rate_throttle(struct thread_data *td, unsigned long time_spent,
 		   unsigned int bytes)
 {
 	unsigned long usec_cycle;
+	unsigned int bs;
 
-	if (!td->rate)
+	if (!td->o.rate && !td->o.rate_iops)
 		return;
 
-	usec_cycle = td->rate_usec_cycle * (bytes / td->rw_min_bs);
+	if (td_rw(td))
+		bs = td->o.rw_min_bs;
+	else if (td_read(td))
+		bs = td->o.min_bs[DDIR_READ];
+	else
+		bs = td->o.min_bs[DDIR_WRITE];
+
+	usec_cycle = td->rate_usec_cycle * (bytes / bs);
 
 	if (time_spent < usec_cycle) {
 		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;