X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;ds=sidebyside;f=time.c;h=cb44c209ec984a1d74ecc0b48054f999c0eed007;hb=08aae9a0d5f3d24152abd7515984439bbfd3c05d;hp=c7f898be3db3a853b0328c742478c8657e41eda1;hpb=b990b5c06801d6d25e3fcc5415efbbe7bb23341e;p=fio.git

diff --git a/time.c b/time.c
index c7f898be..cb44c209 100644
--- a/time.c
+++ b/time.c
@@ -3,6 +3,8 @@
 
 #include "fio.h"
 
+static struct timeval genesis;
+
 unsigned long utime_since(struct timeval *s, struct timeval *e)
 {
 	double sec, usec;
@@ -23,7 +25,7 @@ static unsigned long utime_since_now(struct timeval *s)
 {
 	struct timeval t;
 
-	gettimeofday(&t, NULL);
+	fio_gettime(&t, NULL);
 	return utime_since(s, &t);
 }
 
@@ -47,8 +49,9 @@ unsigned long mtime_since(struct timeval *s, struct timeval *e)
 unsigned long mtime_since_now(struct timeval *s)
 {
 	struct timeval t;
+	void *p = __builtin_return_address(0);
 
-	gettimeofday(&t, NULL);
+	fio_gettime(&t, p);
 	return mtime_since(s, &t);
 }
 
@@ -64,7 +67,7 @@ void __usec_sleep(unsigned int usec)
 {
 	struct timeval start;
 
-	gettimeofday(&start, NULL);
+	fio_gettime(&start, NULL);
 	while (utime_since_now(&start) < usec)
 		nop;
 }
@@ -97,14 +100,14 @@ void usec_sleep(struct thread_data *td, unsigned long usec)
 }
 
 void rate_throttle(struct thread_data *td, unsigned long time_spent,
-		   unsigned int bytes)
+		   unsigned int bytes, int ddir)
 {
 	unsigned long usec_cycle;
 
 	if (!td->rate)
 		return;
 
-	usec_cycle = td->rate_usec_cycle * (bytes / td->min_bs);
+	usec_cycle = td->rate_usec_cycle * (bytes / td->min_bs[ddir]);
 
 	if (time_spent < usec_cycle) {
 		unsigned long s = usec_cycle - time_spent;
@@ -120,3 +123,18 @@ void rate_throttle(struct thread_data *td, unsigned long time_spent,
 		td->rate_pending_usleep -= overtime;
 	}
 }
+
+unsigned long mtime_since_genesis(void)
+{
+	return mtime_since_now(&genesis);
+}
+
+static void fio_init time_init(void)
+{
+	fio_gettime(&genesis, NULL);
+}
+
+void fill_start_time(struct timeval *t)
+{
+	memcpy(t, &genesis, sizeof(genesis));
+}