X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=time.c;h=f637afb51487f291f7413cae596e969b8491e084;hp=5755b67e78e7c71e0b33f426ea807ec19bb6f9d0;hb=d19251c4a191dd024bec82be876f57f7770e32f6;hpb=4780fa263c038646ab803b63f23f486b2b7b1140

diff --git a/time.c b/time.c
index 5755b67e..f637afb5 100644
--- a/time.c
+++ b/time.c
@@ -5,99 +5,50 @@
 
 static struct timeval genesis;
 static unsigned long ns_granularity;
-unsigned long long genesis_cycles;
 
-unsigned long long utime_since(struct timeval *s, struct timeval *e)
+void timeval_add_msec(struct timeval *tv, unsigned int msec)
 {
-	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) {
-		sec--;
-		usec += 1000000;
-	}
-
-	/*
-	 * time warp bug on some kernels?
-	 */
-	if (sec < 0 || (sec == 0 && usec < 0))
-		return 0;
-
-	ret = sec * 1000000ULL + usec;
-
-	return ret;
-}
-
-unsigned long long utime_since_now(struct timeval *s)
-{
-	struct timeval t;
-
-	fio_gettime(&t, NULL);
-	return utime_since(s, &t);
-}
+	unsigned int adj_usec = 1000 * msec;
 
-unsigned long mtime_since(struct timeval *s, struct timeval *e)
-{
-	long sec, usec, ret;
+	tv->tv_usec += adj_usec;
+	if (adj_usec >= 1000000) {
+		unsigned int adj_sec = adj_usec / 1000000;
 
-	sec = e->tv_sec - s->tv_sec;
-	usec = e->tv_usec - s->tv_usec;
-	if (sec > 0 && usec < 0) {
-		sec--;
-		usec += 1000000;
+		tv->tv_usec -=  adj_sec * 1000000;
+		tv->tv_sec += adj_sec;
+	}
+	if (tv->tv_usec >= 1000000){
+		tv->tv_usec -= 1000000;
+		tv->tv_sec++;
 	}
-
-	sec *= 1000UL;
-	usec /= 1000UL;
-	ret = sec + usec;
-
-	/*
-	 * time warp bug on some kernels?
-	 */
-	if (ret < 0)
-		ret = 0;
-
-	return ret;
-}
-
-unsigned long mtime_since_now(struct timeval *s)
-{
-	struct timeval t;
-	void *p = __builtin_return_address(0);
-
-	fio_gettime(&t, p);
-	return mtime_since(s, &t);
-}
-
-unsigned long time_since_now(struct timeval *s)
-{
-	return mtime_since_now(s) / 1000;
 }
 
 /*
  * busy looping version for the last few usec
  */
-void usec_spin(unsigned int usec)
+uint64_t usec_spin(unsigned int usec)
 {
 	struct timeval start;
+	uint64_t t;
 
 	fio_gettime(&start, NULL);
-	while (utime_since_now(&start) < usec)
+	while ((t = utime_since_now(&start)) < usec)
 		nop;
+
+	return t;
 }
 
-void usec_sleep(struct thread_data *td, unsigned long usec)
+uint64_t usec_sleep(struct thread_data *td, unsigned long usec)
 {
 	struct timespec req;
 	struct timeval tv;
+	uint64_t t = 0;
 
 	do {
 		unsigned long ts = usec;
 
 		if (usec < ns_granularity) {
-			usec_spin(usec);
+			t += usec_spin(usec);
 			break;
 		}
 
@@ -116,42 +67,68 @@ void usec_sleep(struct thread_data *td, unsigned long usec)
 			break;
 
 		ts = utime_since_now(&tv);
+		t += ts;
 		if (ts >= usec)
 			break;
 
 		usec -= ts;
 	} while (!td->terminate);
+
+	return t;
 }
 
-unsigned long mtime_since_genesis(void)
+uint64_t time_since_genesis(void)
+{
+	return time_since_now(&genesis);
+}
+
+uint64_t mtime_since_genesis(void)
 {
 	return mtime_since_now(&genesis);
 }
 
-int in_ramp_time(struct thread_data *td)
+uint64_t utime_since_genesis(void)
+{
+	return utime_since_now(&genesis);
+}
+
+bool in_ramp_time(struct thread_data *td)
 {
 	return td->o.ramp_time && !td->ramp_time_over;
 }
 
-int ramp_time_over(struct thread_data *td)
+static void parent_update_ramp(struct thread_data *td)
+{
+	struct thread_data *parent = td->parent;
+
+	if (!parent || parent->ramp_time_over)
+		return;
+
+	reset_all_stats(parent);
+	parent->ramp_time_over = 1;
+	td_set_runstate(parent, TD_RAMP);
+}
+
+bool ramp_time_over(struct thread_data *td)
 {
 	struct timeval tv;
 
 	if (!td->o.ramp_time || td->ramp_time_over)
-		return 1;
+		return true;
 
 	fio_gettime(&tv, NULL);
-	if (mtime_since(&td->epoch, &tv) >= td->o.ramp_time * 1000) {
+	if (utime_since(&td->epoch, &tv) >= td->o.ramp_time) {
 		td->ramp_time_over = 1;
 		reset_all_stats(td);
 		td_set_runstate(td, TD_RAMP);
-		return 1;
+		parent_update_ramp(td);
+		return true;
 	}
 
-	return 0;
+	return false;
 }
 
-void fio_init fio_time_init(void)
+void fio_time_init(void)
 {
 	int i;
 
@@ -180,7 +157,17 @@ void fio_init fio_time_init(void)
 void set_genesis_time(void)
 {
 	fio_gettime(&genesis, NULL);
-	genesis_cycles = get_cpu_clock();
+}
+
+void set_epoch_time(struct thread_data *td, int log_unix_epoch)
+{
+	fio_gettime(&td->epoch, NULL);
+	if (log_unix_epoch) {
+		struct timeval tv;
+		gettimeofday(&tv, NULL);
+		td->unix_epoch = (unsigned long long)(tv.tv_sec) * 1000 +
+		                 (unsigned long long)(tv.tv_usec) / 1000;
+	}
 }
 
 void fill_start_time(struct timeval *t)