X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=time.c;h=80f8ca499f159f9e9473219c74480b89e6394652;hp=08ef078277ba125d43d1ce956db2ea92091e0793;hb=127f686514ef8b1d9ab6ed702971b205454974e6;hpb=fd841467ce4a5875dba2d21da6851936b46fdb08

diff --git a/time.c b/time.c
index 08ef0782..80f8ca49 100644
--- a/time.c
+++ b/time.c
@@ -109,22 +109,34 @@ void usec_sleep(struct thread_data *td, unsigned long usec)
 }
 
 void rate_throttle(struct thread_data *td, unsigned long time_spent,
-		   unsigned int bytes, int ddir)
+		   unsigned int bytes)
 {
 	unsigned long usec_cycle;
+	unsigned int bs;
 
-	if (!td->rate)
+	if (!td->rate && !td->rate_iops)
 		return;
 
-	usec_cycle = td->rate_usec_cycle * (bytes / td->min_bs[ddir]);
+	if (td_rw(td))
+		bs = td->rw_min_bs;
+	else if (td_read(td))
+		bs = td->min_bs[DDIR_READ];
+	else
+		bs = td->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;
@@ -142,8 +154,6 @@ static void fio_init time_init(void)
 {
 	int i;
 
-	fio_gettime(&genesis, NULL);
-
 	/*
 	 * Check the granularity of the nanosleep function
 	 */
@@ -164,6 +174,11 @@ static void fio_init time_init(void)
 	}
 }
 
+void set_genesis_time(void)
+{
+	fio_gettime(&genesis, NULL);
+}
+
 void fill_start_time(struct timeval *t)
 {
 	memcpy(t, &genesis, sizeof(genesis));