X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=time.c;h=08ef078277ba125d43d1ce956db2ea92091e0793;hp=6c9eb0a894c951b08b09ad653594a8884fc13bbf;hb=311b84aeb3f8eba70191353b4b9fe0a2576f9d95;hpb=690089990d051d86b4ef2b6fd5c1972c0dd4897b;ds=sidebyside

diff --git a/time.c b/time.c
index 6c9eb0a8..08ef0782 100644
--- a/time.c
+++ b/time.c
@@ -4,10 +4,11 @@
 #include "fio.h"
 
 static struct timeval genesis;
+static unsigned long ns_granularity;
 
 unsigned long utime_since(struct timeval *s, struct timeval *e)
 {
-	double sec, usec;
+	long sec, usec;
 
 	sec = e->tv_sec - s->tv_sec;
 	usec = e->tv_usec - s->tv_usec;
@@ -31,7 +32,7 @@ unsigned long utime_since_now(struct timeval *s)
 
 unsigned long mtime_since(struct timeval *s, struct timeval *e)
 {
-	double sec, usec;
+	long sec, usec;
 
 	sec = e->tv_sec - s->tv_sec;
 	usec = e->tv_usec - s->tv_usec;
@@ -74,28 +75,36 @@ void __usec_sleep(unsigned int usec)
 
 void usec_sleep(struct thread_data *td, unsigned long usec)
 {
-	struct timespec req, rem;
-
-	req.tv_sec = usec / 1000000;
-	req.tv_nsec = usec * 1000 - req.tv_sec * 1000000;
+	struct timespec req;
+	struct timeval tv;
 
 	do {
-		if (usec < 5000) {
+		unsigned long ts = usec;
+
+		if (usec < ns_granularity) {
 			__usec_sleep(usec);
 			break;
 		}
 
-		rem.tv_sec = rem.tv_nsec = 0;
-		if (nanosleep(&req, &rem) < 0)
-			break;
+		ts = usec - ns_granularity;
 
-		if ((rem.tv_sec + rem.tv_nsec) == 0)
+		if (ts >= 1000000) {
+			req.tv_sec = ts / 1000000;
+			ts -= 1000000 * req.tv_sec;
+		} else
+			req.tv_sec = 0;
+
+		req.tv_nsec = ts * 1000;
+		fio_gettime(&tv, NULL);
+
+		if (nanosleep(&req, NULL) < 0)
 			break;
 
-		req.tv_nsec = rem.tv_nsec;
-		req.tv_sec = rem.tv_sec;
+		ts = utime_since_now(&tv);
+		if (ts >= usec)
+			break;
 
-		usec = rem.tv_sec * 1000000 + rem.tv_nsec / 1000;
+		usec -= ts;
 	} while (!td->terminate);
 }
 
@@ -131,7 +140,28 @@ unsigned long mtime_since_genesis(void)
 
 static void fio_init time_init(void)
 {
+	int i;
+
 	fio_gettime(&genesis, NULL);
+
+	/*
+	 * Check the granularity of the nanosleep function
+	 */
+	for (i = 0; i < 10; i++) {
+		struct timeval tv;
+		struct timespec ts;
+		unsigned long elapsed;
+
+		fio_gettime(&tv, NULL);
+		ts.tv_sec = 0;
+		ts.tv_nsec = 1000;
+
+		nanosleep(&ts, NULL);
+		elapsed = utime_since_now(&tv);
+
+		if (elapsed > ns_granularity)
+			ns_granularity = elapsed;
+	}
 }
 
 void fill_start_time(struct timeval *t)