X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.c;h=a175be7a1f6bc07c13107d5f8be9152e14c67aea;hp=011c13a31a6e2cabea1ea4254d69b9a16604726d;hb=02bcaa8c31feb93c61b701d143a7eea3efd2124d;hpb=a00735e66f9ec42549da94eba3170e543b542904

diff --git a/fio.c b/fio.c
index 011c13a3..a175be7a 100644
--- a/fio.c
+++ b/fio.c
@@ -45,7 +45,6 @@ int groupid = 0;
 int thread_number = 0;
 int shm_id = 0;
 int temp_stall_ts;
-char *fio_inst_prefix = _INST_PREFIX;
 
 static volatile int startup_sem;
 
@@ -245,7 +244,6 @@ static int fio_io_sync(struct thread_data *td, struct fio_file *f)
  */
 void do_verify(struct thread_data *td)
 {
-	struct timeval t;
 	struct io_u *io_u, *v_io_u = NULL;
 	struct io_completion_data icd;
 	struct fio_file *f;
@@ -266,14 +264,15 @@ void do_verify(struct thread_data *td)
 		if (td->terminate)
 			break;
 
-		gettimeofday(&t, NULL);
-		if (runtime_exceeded(td, &t))
-			break;
-
 		io_u = __get_io_u(td);
 		if (!io_u)
 			break;
 
+		if (runtime_exceeded(td, &io_u->start_time)) {
+			put_io_u(td, io_u);
+			break;
+		}
+
 		if (get_next_verify(td, io_u)) {
 			put_io_u(td, io_u);
 			break;
@@ -314,6 +313,7 @@ void do_verify(struct thread_data *td)
 		v_io_u = td->io_ops->event(td, 0);
 		icd.nr = 1;
 		icd.error = 0;
+		fio_gettime(&icd.time, NULL);
 		io_completed(td, v_io_u, &icd);
 
 		if (icd.error) {
@@ -350,7 +350,7 @@ static void do_cpuio(struct thread_data *td)
 	int i = 0;
 
 	while (!td->terminate) {
-		gettimeofday(&e, NULL);
+		fio_gettime(&e, NULL);
 
 		if (runtime_exceeded(td, &e))
 			break;
@@ -371,7 +371,7 @@ static void do_cpuio(struct thread_data *td)
 static void do_io(struct thread_data *td)
 {
 	struct io_completion_data icd;
-	struct timeval s, e;
+	struct timeval s;
 	unsigned long usec;
 	struct fio_file *f;
 	int i, ret = 0;
@@ -433,26 +433,25 @@ static void do_io(struct thread_data *td)
 		 * of completions except the very first one which may look
 		 * a little bursty
 		 */
-		gettimeofday(&e, NULL);
-		usec = utime_since(&s, &e);
+		usec = utime_since(&s, &icd.time);
 
 		rate_throttle(td, usec, icd.bytes_done[td->ddir], td->ddir);
 
-		if (check_min_rate(td, &e)) {
-			if (rate_quit)
+		if (check_min_rate(td, &icd.time)) {
+			if (exitall_on_terminate)
 				terminate_threads(td->groupid);
 			td_verror(td, ENOMEM);
 			break;
 		}
 
-		if (runtime_exceeded(td, &e))
+		if (runtime_exceeded(td, &icd.time))
 			break;
 
 		if (td->thinktime)
 			usec_sleep(td, td->thinktime);
 	}
 
-	if (!ret) {
+	if (!td->error) {
 		if (td->cur_depth)
 			cleanup_pending_aio(td);
 
@@ -656,15 +655,17 @@ static void *thread_main(void *data)
 
 	if (!td->create_serialize && setup_files(td))
 		goto err;
+	if (open_files(td))
+		goto err;
 
-	gettimeofday(&td->epoch, NULL);
+	fio_gettime(&td->epoch, NULL);
 
 	if (td->exec_prerun)
 		system(td->exec_prerun);
 
 	while (td->loops--) {
 		getrusage(RUSAGE_SELF, &td->ru_start);
-		gettimeofday(&td->start, NULL);
+		fio_gettime(&td->start, NULL);
 		memcpy(&td->stat_sample_time, &td->start, sizeof(td->start));
 
 		if (td->ratemin)
@@ -691,7 +692,7 @@ static void *thread_main(void *data)
 			continue;
 
 		clear_io_state(td);
-		gettimeofday(&td->start, NULL);
+		fio_gettime(&td->start, NULL);
 
 		do_verify(td);
 
@@ -751,12 +752,12 @@ static void *fork_main(int shmid, int offset)
 static void reap_threads(int *nr_running, int *t_rate, int *m_rate)
 {
 	struct thread_data *td;
-	int i, cputhreads;
+	int i, cputhreads, pending;
 
 	/*
 	 * reap exited threads (TD_EXITED -> TD_REAPED)
 	 */
-	cputhreads = 0;
+	pending = cputhreads = 0;
 	for_each_td(td, i) {
 		/*
 		 * ->io_ops is NULL for a thread that has closed its
@@ -765,8 +766,12 @@ static void reap_threads(int *nr_running, int *t_rate, int *m_rate)
 		if (td->io_ops && td->io_ops->flags & FIO_CPUIO)
 			cputhreads++;
 
-		if (td->runstate != TD_EXITED)
+		if (td->runstate != TD_EXITED) {
+			if (td->runstate < TD_RUNNING)
+				pending++;
+
 			continue;
+		}
 
 		td_set_runstate(td, TD_REAPED);
 
@@ -783,7 +788,7 @@ static void reap_threads(int *nr_running, int *t_rate, int *m_rate)
 		(*t_rate) -= td->rate;
 	}
 
-	if (*nr_running == cputhreads)
+	if (*nr_running == cputhreads && !pending)
 		terminate_threads(TERMINATE_ALL);
 }
 
@@ -831,8 +836,6 @@ static void run_threads(void)
 		}
 	}
 
-	time_init();
-
 	while (todo) {
 		struct thread_data *map[MAX_JOBS];
 		struct timeval this_start;
@@ -892,7 +895,7 @@ static void run_threads(void)
 		 * Wait for the started threads to transition to
 		 * TD_INITIALIZED.
 		 */
-		gettimeofday(&this_start, NULL);
+		fio_gettime(&this_start, NULL);
 		left = this_jobs;
 		while (left) {
 			if (mtime_since_now(&this_start) > JOB_START_TIMEOUT)