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

diff --git a/time.c b/time.c
index 6d79ecdc..ef05094e 100644
--- a/time.c
+++ b/time.c
@@ -10,7 +10,7 @@ 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) {
@@ -23,9 +23,9 @@ unsigned long long utime_since(struct timeval *s, struct timeval *e)
 	 */
 	if (sec < 0 || (sec == 0 && usec < 0))
 		return 0;
-	
+
 	ret = sec * 1000000ULL + usec;
-	
+
 	return ret;
 }
 
@@ -78,7 +78,7 @@ unsigned long time_since_now(struct timeval *s)
 /*
  * busy looping version for the last few usec
  */
-void __usec_sleep(unsigned int usec)
+void usec_spin(unsigned int usec)
 {
 	struct timeval start;
 
@@ -96,7 +96,7 @@ void usec_sleep(struct thread_data *td, unsigned long usec)
 		unsigned long ts = usec;
 
 		if (usec < ns_granularity) {
-			__usec_sleep(usec);
+			usec_spin(usec);
 			break;
 		}
 
@@ -122,52 +122,40 @@ void usec_sleep(struct thread_data *td, unsigned long usec)
 	} while (!td->terminate);
 }
 
-void rate_throttle(struct thread_data *td, unsigned long time_spent,
-		   unsigned int bytes)
+unsigned long mtime_since_genesis(void)
 {
-	unsigned long usec_cycle;
-	unsigned int bs;
-
-	if (!td->o.rate && !td->o.rate_iops)
-		return;
-
-	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;
+	return mtime_since_now(&genesis);
+}
 
-		td->rate_pending_usleep += s;
+int in_ramp_time(struct thread_data *td)
+{
+	return td->o.ramp_time && !td->ramp_time_over;
+}
 
-		if (td->rate_pending_usleep >= 100000) {
-			struct timeval t;
+int ramp_time_over(struct thread_data *td)
+{
+	struct timeval tv;
 
-			fio_gettime(&t, NULL);
-			usec_sleep(td, td->rate_pending_usleep);
-			td->rate_pending_usleep -= utime_since_now(&t);
-		}
-	} else {
-		long overtime = time_spent - usec_cycle;
+	if (!td->o.ramp_time || td->ramp_time_over)
+		return 1;
 
-		td->rate_pending_usleep -= overtime;
+	fio_gettime(&tv, NULL);
+	if (mtime_since(&td->epoch, &tv) >= td->o.ramp_time * 1000) {
+		td->ramp_time_over = 1;
+		reset_all_stats(td);
+		td_set_runstate(td, TD_RAMP);
+		return 1;
 	}
-}
 
-unsigned long mtime_since_genesis(void)
-{
-	return mtime_since_now(&genesis);
+	return 0;
 }
 
-static void fio_init time_init(void)
+void fio_time_init(void)
 {
 	int i;
 
+	fio_clock_init();
+
 	/*
 	 * Check the granularity of the nanosleep function
 	 */