X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.c;h=43cc6af14e8ab632f731ae4106fce2b4e27ce5e7;hp=920639395cbda1101ba57c36b7cc421f6a3d4f27;hb=860a3044085c676632f9832a78133cd9847cbe62;hpb=e1161c325f7866bae879e686d1c673ca32ab09ae

diff --git a/fio.c b/fio.c
index 92063939..43cc6af1 100644
--- a/fio.c
+++ b/fio.c
@@ -60,17 +60,20 @@ static inline void td_set_runstate(struct thread_data *td, int runstate)
 	td->runstate = runstate;
 }
 
-static void terminate_threads(int group_id, int forced_kill)
+static void terminate_threads(int group_id)
 {
 	struct thread_data *td;
 	int i;
 
 	for_each_td(td, i) {
 		if (group_id == TERMINATE_ALL || groupid == td->groupid) {
+			/*
+			 * if the thread is running, just let it exit
+			 */
+			if (td->runstate < TD_RUNNING)
+				kill(td->pid, SIGQUIT);
 			td->terminate = 1;
 			td->start_delay = 0;
-			if (forced_kill)
-				td_set_runstate(td, TD_EXITED);
 		}
 	}
 }
@@ -86,7 +89,7 @@ static void sig_handler(int sig)
 		default:
 			printf("\nfio: terminating on signal %d\n", sig);
 			fflush(stdout);
-			terminate_threads(TERMINATE_ALL, 0);
+			terminate_threads(TERMINATE_ALL);
 			break;
 	}
 }
@@ -96,9 +99,15 @@ static void sig_handler(int sig)
  */
 static int check_min_rate(struct thread_data *td, struct timeval *now)
 {
+	unsigned long long bytes = 0;
 	unsigned long spent;
 	unsigned long rate;
-	int ddir = td->ddir;
+
+	/*
+	 * No minimum rate set, always ok
+	 */
+	if (!td->ratemin)
+		return 0;
 
 	/*
 	 * allow a 2 second settle period in the beginning
@@ -106,6 +115,11 @@ static int check_min_rate(struct thread_data *td, struct timeval *now)
 	if (mtime_since(&td->start, now) < 2000)
 		return 0;
 
+	if (td_read(td))
+		bytes += td->this_io_bytes[DDIR_READ];
+	if (td_write(td))
+		bytes += td->this_io_bytes[DDIR_WRITE];
+
 	/*
 	 * if rate blocks is set, sample is running
 	 */
@@ -114,14 +128,19 @@ static int check_min_rate(struct thread_data *td, struct timeval *now)
 		if (spent < td->ratecycle)
 			return 0;
 
-		rate = (td->this_io_bytes[ddir] - td->rate_bytes) / spent;
-		if (rate < td->ratemin) {
-			fprintf(f_out, "%s: min rate %u not met, got %luKiB/sec\n", td->name, td->ratemin, rate);
+		if (bytes < td->rate_bytes) {
+			fprintf(f_out, "%s: min rate %u not met\n", td->name, td->ratemin);
 			return 1;
+		} else {
+			rate = (bytes - td->rate_bytes) / spent;
+			if (rate < td->ratemin || bytes < td->rate_bytes) {
+				fprintf(f_out, "%s: min rate %u not met, got %luKiB/sec\n", td->name, td->ratemin, rate);
+				return 1;
+			}
 		}
 	}
 
-	td->rate_bytes = td->this_io_bytes[ddir];
+	td->rate_bytes = bytes;
 	memcpy(&td->lastrate, now, sizeof(*now));
 	return 0;
 }
@@ -149,7 +168,7 @@ static void cleanup_pending_aio(struct thread_data *td)
 	/*
 	 * get immediately available events, if any
 	 */
-	r = io_u_queued_complete(td, 0, NULL);
+	r = io_u_queued_complete(td, 0);
 	if (r < 0)
 		return;
 
@@ -177,7 +196,7 @@ static void cleanup_pending_aio(struct thread_data *td)
 	}
 
 	if (td->cur_depth)
-		r = io_u_queued_complete(td, td->cur_depth, NULL);
+		r = io_u_queued_complete(td, td->cur_depth);
 }
 
 /*
@@ -207,7 +226,7 @@ requeue:
 		put_io_u(td, io_u);
 		return 1;
 	} else if (ret == FIO_Q_QUEUED) {
-		if (io_u_queued_complete(td, 1, NULL) < 0)
+		if (io_u_queued_complete(td, 1) < 0)
 			return 1;
 	} else if (ret == FIO_Q_COMPLETED) {
 		if (io_u->error) {
@@ -215,7 +234,7 @@ requeue:
 			return 1;
 		}
 
-		if (io_u_sync_complete(td, io_u, NULL) < 0)
+		if (io_u_sync_complete(td, io_u) < 0)
 			return 1;
 	} else if (ret == FIO_Q_BUSY) {
 		if (td_io_commit(td))
@@ -227,7 +246,7 @@ requeue:
 }
 
 /*
- * The main verify engine. Runs over the writes we previusly submitted,
+ * The main verify engine. Runs over the writes we previously submitted,
  * reads the blocks back in, and checks the crc/md5 of the data.
  */
 static void do_verify(struct thread_data *td)
@@ -254,6 +273,8 @@ static void do_verify(struct thread_data *td)
 
 	io_u = NULL;
 	while (!td->terminate) {
+		int ret2;
+
 		io_u = __get_io_u(td);
 		if (!io_u)
 			break;
@@ -272,29 +293,33 @@ static void do_verify(struct thread_data *td)
 			put_io_u(td, io_u);
 			break;
 		}
-requeue:
-		ret = td_io_queue(td, io_u);
 
+		io_u->end_io = verify_io_u;
+
+		ret = td_io_queue(td, io_u);
 		switch (ret) {
 		case FIO_Q_COMPLETED:
 			if (io_u->error)
 				ret = -io_u->error;
-			if (io_u->xfer_buflen != io_u->resid && io_u->resid) {
+			else if (io_u->xfer_buflen != io_u->resid && io_u->resid) {
 				int bytes = io_u->xfer_buflen - io_u->resid;
 
 				io_u->xfer_buflen = io_u->resid;
 				io_u->xfer_buf += bytes;
-				goto requeue;
+				requeue_io_u(td, &io_u);
+			} else {
+				ret = io_u_sync_complete(td, io_u);
+				if (ret < 0)
+					break;
 			}
-			ret = io_u_sync_complete(td, io_u, verify_io_u);
-			if (ret < 0)
-				break;
 			continue;
 		case FIO_Q_QUEUED:
 			break;
 		case FIO_Q_BUSY:
 			requeue_io_u(td, &io_u);
-			ret = td_io_commit(td);
+			ret2 = td_io_commit(td);
+			if (ret2 < 0)
+				ret = ret2;
 			break;
 		default:
 			assert(ret < 0);
@@ -321,11 +346,16 @@ requeue:
 		 * Reap required number of io units, if any, and do the
 		 * verification on them through the callback handler
 		 */
-		if (io_u_queued_complete(td, min_events, verify_io_u) < 0)
+		if (io_u_queued_complete(td, min_events) < 0)
 			break;
 	}
 
-	if (td->cur_depth)
+	if (!td->error) {
+		min_events = td->cur_depth;
+
+		if (min_events)
+			ret = io_u_queued_complete(td, min_events);
+	} else
 		cleanup_pending_aio(td);
 
 	td_set_runstate(td, TD_RUNNING);
@@ -373,6 +403,7 @@ static void do_io(struct thread_data *td)
 		long bytes_done = 0;
 		int min_evts = 0;
 		struct io_u *io_u;
+		int ret2;
 
 		if (td->terminate)
 			break;
@@ -387,26 +418,24 @@ static void do_io(struct thread_data *td)
 			put_io_u(td, io_u);
 			break;
 		}
-requeue:
-		ret = td_io_queue(td, io_u);
 
+		ret = td_io_queue(td, io_u);
 		switch (ret) {
 		case FIO_Q_COMPLETED:
-			if (io_u->error) {
-				ret = io_u->error;
-				break;
-			}
-			if (io_u->xfer_buflen != io_u->resid && io_u->resid) {
+			if (io_u->error)
+				ret = -io_u->error;
+			else if (io_u->xfer_buflen != io_u->resid && io_u->resid) {
 				int bytes = io_u->xfer_buflen - io_u->resid;
 
 				io_u->xfer_buflen = io_u->resid;
 				io_u->xfer_buf += bytes;
-				goto requeue;
+				requeue_io_u(td, &io_u);
+			} else {
+				fio_gettime(&comp_time, NULL);
+				bytes_done = io_u_sync_complete(td, io_u);
+				if (bytes_done < 0)
+					ret = bytes_done;
 			}
-			fio_gettime(&comp_time, NULL);
-			bytes_done = io_u_sync_complete(td, io_u, NULL);
-			if (bytes_done < 0)
-				ret = bytes_done;
 			break;
 		case FIO_Q_QUEUED:
 			/*
@@ -419,7 +448,9 @@ requeue:
 			break;
 		case FIO_Q_BUSY:
 			requeue_io_u(td, &io_u);
-			ret = td_io_commit(td);
+			ret2 = td_io_commit(td);
+			if (ret2 < 0)
+				ret = ret2;
 			break;
 		default:
 			assert(ret < 0);
@@ -443,7 +474,7 @@ requeue:
 			}
 
 			fio_gettime(&comp_time, NULL);
-			bytes_done = io_u_queued_complete(td, min_evts, NULL);
+			bytes_done = io_u_queued_complete(td, min_evts);
 			if (bytes_done < 0)
 				break;
 		}
@@ -458,11 +489,11 @@ requeue:
 		 */
 		usec = utime_since(&s, &comp_time);
 
-		rate_throttle(td, usec, bytes_done, td->ddir);
+		rate_throttle(td, usec, bytes_done);
 
 		if (check_min_rate(td, &comp_time)) {
 			if (exitall_on_terminate)
-				terminate_threads(td->groupid, 0);
+				terminate_threads(td->groupid);
 			td_verror(td, ENODATA, "check_min_rate");
 			break;
 		}
@@ -487,15 +518,17 @@ requeue:
 	if (!td->error) {
 		struct fio_file *f;
 
-		if (td->cur_depth)
-			cleanup_pending_aio(td);
+		i = td->cur_depth;
+		if (i)
+			ret = io_u_queued_complete(td, i);
 
 		if (should_fsync(td) && td->end_fsync) {
 			td_set_runstate(td, TD_FSYNCING);
 			for_each_file(td, f, i)
 				fio_io_sync(td, f);
 		}
-	}
+	} else
+		cleanup_pending_aio(td);
 }
 
 static void cleanup_io_u(struct thread_data *td)
@@ -701,16 +734,13 @@ static void *thread_main(void *data)
 
 	if (!td->create_serialize && setup_files(td))
 		goto err;
-	if (open_files(td))
-		goto err;
 
-	/*
-	 * Do this late, as some IO engines would like to have the
-	 * files setup prior to initializing structures.
-	 */
 	if (td_io_init(td))
 		goto err;
 
+	if (open_files(td))
+		goto err;
+
 	if (td->exec_prerun) {
 		if (system(td->exec_prerun) < 0)
 			goto err;
@@ -736,10 +766,11 @@ static void *thread_main(void *data)
 		else
 			do_io(td);
 
-		runtime[td->ddir] += utime_since_now(&td->start);
-		if (td_rw(td) && td->io_bytes[td->ddir ^ 1])
-			runtime[td->ddir ^ 1] = runtime[td->ddir];
-
+		if (td_read(td) && td->io_bytes[DDIR_READ])
+			runtime[DDIR_READ] += utime_since_now(&td->start);
+		if (td_write(td) && td->io_bytes[DDIR_WRITE])
+			runtime[DDIR_WRITE] += utime_since_now(&td->start);
+		
 		if (td->error || td->terminate)
 			break;
 
@@ -758,9 +789,11 @@ static void *thread_main(void *data)
 	}
 
 	update_rusage_stat(td);
-	fio_gettime(&td->end_time, NULL);
-	td->runtime[0] = runtime[0] / 1000;
-	td->runtime[1] = runtime[1] / 1000;
+	td->ts.runtime[0] = runtime[0] / 1000;
+	td->ts.runtime[1] = runtime[1] / 1000;
+	td->ts.total_run_time = mtime_since_now(&td->epoch);
+	td->ts.io_bytes[0] = td->io_bytes[0];
+	td->ts.io_bytes[1] = td->io_bytes[1];
 
 	if (td->ts.bw_log)
 		finish_log(td, td->ts.bw_log, "bw");
@@ -776,7 +809,7 @@ static void *thread_main(void *data)
 	}
 
 	if (exitall_on_terminate)
-		terminate_threads(td->groupid, 0);
+		terminate_threads(td->groupid);
 
 err:
 	if (td->error)
@@ -862,7 +895,8 @@ static void reap_threads(int *nr_running, int *t_rate, int *m_rate)
 			if (WIFSIGNALED(status)) {
 				int sig = WTERMSIG(status);
 
-				log_err("fio: pid=%d, got signal=%d\n", td->pid, sig);
+				if (sig != SIGQUIT)
+					log_err("fio: pid=%d, got signal=%d\n", td->pid, sig);
 				td_set_runstate(td, TD_REAPED);
 				goto reaped;
 			}
@@ -896,7 +930,7 @@ reaped:
 	}
 
 	if (*nr_running == cputhreads && !pending)
-		terminate_threads(TERMINATE_ALL, 0);
+		terminate_threads(TERMINATE_ALL);
 }
 
 /*