X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.c;h=cedbfb0d44e61bce100fbe5bf1b902d5b4a91ebe;hp=bcabe3354b34c313fa77bda95463065d324a4176;hb=f3059de171cf9afd8b4968a681dcd1738f82bc6f;hpb=697a606cc0af1c39ac18998c344a522199accb36

diff --git a/fio.c b/fio.c
index bcabe335..cedbfb0d 100644
--- a/fio.c
+++ b/fio.c
@@ -125,9 +125,6 @@ static void sig_int(int sig)
 	}
 }
 
-/*
- * We need to rearm on BSD/solaris. Switch this to sigaction in the future...
- */
 static void set_sig_handlers(void)
 {
 	struct sigaction act;
@@ -243,7 +240,7 @@ static inline int runtime_exceeded(struct thread_data *td, struct timeval *t)
  */
 static void cleanup_pending_aio(struct thread_data *td)
 {
-	struct list_head *entry, *n;
+	struct flist_head *entry, *n;
 	struct io_u *io_u;
 	int r;
 
@@ -258,8 +255,8 @@ static void cleanup_pending_aio(struct thread_data *td)
 	 * now cancel remaining active events
 	 */
 	if (td->io_ops->cancel) {
-		list_for_each_safe(entry, n, &td->io_u_busylist) {
-			io_u = list_entry(entry, struct io_u, list);
+		flist_for_each_safe(entry, n, &td->io_u_busylist) {
+			io_u = flist_entry(entry, struct io_u, list);
 
 			/*
 			 * if the io_u isn't in flight, then that generally
@@ -358,7 +355,7 @@ static void do_verify(struct thread_data *td)
 
 	io_u = NULL;
 	while (!td->terminate) {
-		int ret2;
+		int ret2, full;
 
 		io_u = __get_io_u(td);
 		if (!io_u)
@@ -395,7 +392,7 @@ static void do_verify(struct thread_data *td)
 				 * zero read, fail
 				 */
 				if (!bytes) {
-					td_verror(td, ENODATA, "full resid");
+					td_verror(td, EIO, "full resid");
 					put_io_u(td, io_u);
 					break;
 				}
@@ -438,19 +435,25 @@ sync_done:
 		 * if we can queue more, do so. but check if there are
 		 * completed io_u's first.
 		 */
-		min_events = 0;
-		if (queue_full(td) || ret == FIO_Q_BUSY) {
-			if (td->cur_depth >= td->o.iodepth_low)
-				min_events = td->cur_depth - td->o.iodepth_low;
-			if (!min_events)
+		full = queue_full(td) || ret == FIO_Q_BUSY;
+		if (full || !td->o.iodepth_batch_complete) {
+			min_events = td->o.iodepth_batch_complete;
+			if (full && !min_events)
 				min_events = 1;
-		}
 
-		/*
-		 * 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) < 0)
+			do {
+				/*
+				 * 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) < 0) {
+					ret = -1;
+					break;
+				}
+			} while (full && (td->cur_depth > td->o.iodepth_low));
+		}
+		if (ret < 0)
 			break;
 	}
 
@@ -483,7 +486,7 @@ static void do_io(struct thread_data *td)
 		long bytes_done = 0;
 		int min_evts = 0;
 		struct io_u *io_u;
-		int ret2;
+		int ret2, full;
 
 		if (td->terminate)
 			break;
@@ -523,7 +526,7 @@ static void do_io(struct thread_data *td)
 				 * zero read, fail
 				 */
 				if (!bytes) {
-					td_verror(td, ENODATA, "full resid");
+					td_verror(td, EIO, "full resid");
 					put_io_u(td, io_u);
 					break;
 				}
@@ -573,18 +576,25 @@ sync_done:
 		/*
 		 * See if we need to complete some commands
 		 */
-		if (queue_full(td) || ret == FIO_Q_BUSY) {
-			min_evts = 0;
-			if (td->cur_depth >= td->o.iodepth_low)
-				min_evts = td->cur_depth - td->o.iodepth_low;
-			if (!min_evts)
+		full = queue_full(td) || ret == FIO_Q_BUSY;
+		if (full || !td->o.iodepth_batch_complete) {
+			min_evts = td->o.iodepth_batch_complete;
+			if (full && !min_evts)
 				min_evts = 1;
+
 			fio_gettime(&comp_time, NULL);
-			bytes_done = io_u_queued_complete(td, min_evts);
-			if (bytes_done < 0)
-				break;
+
+			do {
+				ret = io_u_queued_complete(td, min_evts);
+				if (ret <= 0)
+					break;
+
+				bytes_done += ret;
+			} while (full && (td->cur_depth > td->o.iodepth_low));
 		}
 
+		if (ret < 0)
+			break;
 		if (!bytes_done)
 			continue;
 
@@ -600,7 +610,7 @@ sync_done:
 		if (check_min_rate(td, &comp_time)) {
 			if (exitall_on_terminate)
 				terminate_threads(td->groupid);
-			td_verror(td, ENODATA, "check_min_rate");
+			td_verror(td, EIO, "check_min_rate");
 			break;
 		}
 
@@ -653,13 +663,13 @@ sync_done:
 
 static void cleanup_io_u(struct thread_data *td)
 {
-	struct list_head *entry, *n;
+	struct flist_head *entry, *n;
 	struct io_u *io_u;
 
-	list_for_each_safe(entry, n, &td->io_u_freelist) {
-		io_u = list_entry(entry, struct io_u, list);
+	flist_for_each_safe(entry, n, &td->io_u_freelist) {
+		io_u = flist_entry(entry, struct io_u, list);
 
-		list_del(&io_u->list);
+		flist_del(&io_u->list);
 		free(io_u);
 	}
 
@@ -703,7 +713,7 @@ static int init_io_u(struct thread_data *td)
 			return 1;
 		io_u = malloc(sizeof(*io_u));
 		memset(io_u, 0, sizeof(*io_u));
-		INIT_LIST_HEAD(&io_u->list);
+		INIT_FLIST_HEAD(&io_u->list);
 
 		if (!(td->io_ops->flags & FIO_NOIO)) {
 			io_u->buf = p + max_bs * i;
@@ -714,7 +724,7 @@ static int init_io_u(struct thread_data *td)
 
 		io_u->index = i;
 		io_u->flags = IO_U_F_FREE;
-		list_add(&io_u->list, &td->io_u_freelist);
+		flist_add(&io_u->list, &td->io_u_freelist);
 	}
 
 	io_u_init_timeout();
@@ -850,11 +860,11 @@ static void *thread_main(void *data)
 
 	dprint(FD_PROCESS, "jobs pid=%d started\n", (int) td->pid);
 
-	INIT_LIST_HEAD(&td->io_u_freelist);
-	INIT_LIST_HEAD(&td->io_u_busylist);
-	INIT_LIST_HEAD(&td->io_u_requeues);
-	INIT_LIST_HEAD(&td->io_log_list);
-	INIT_LIST_HEAD(&td->io_hist_list);
+	INIT_FLIST_HEAD(&td->io_u_freelist);
+	INIT_FLIST_HEAD(&td->io_u_busylist);
+	INIT_FLIST_HEAD(&td->io_u_requeues);
+	INIT_FLIST_HEAD(&td->io_log_list);
+	INIT_FLIST_HEAD(&td->io_hist_list);
 	td->io_hist_tree = RB_ROOT;
 
 	td_set_runstate(td, TD_INITIALIZED);