X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.c;h=4d225f84b409a7efde36394e05dd296157ad851b;hp=f6c3fc8fe555ca31e78b7eb1666dfa6ac27185f7;hb=e9459e5a14b577ead39d666c051c7ce4db12bc75;hpb=d23bb327374520295509bbd98912c8091b701a3e

diff --git a/fio.c b/fio.c
index f6c3fc8f..4d225f84 100644
--- a/fio.c
+++ b/fio.c
@@ -35,7 +35,6 @@
 #include <sys/mman.h>
 
 #include "fio.h"
-#include "os.h"
 
 unsigned long page_mask;
 unsigned long page_size;
@@ -70,10 +69,7 @@ static void terminate_threads(int group_id)
 
 	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)
+			if (td->runstate <= TD_RUNNING)
 				kill(td->pid, SIGQUIT);
 			td->terminate = 1;
 			td->o.start_delay = 0;
@@ -333,6 +329,7 @@ static void do_verify(struct thread_data *td)
 				ret = -io_u->error;
 			else if (io_u->resid) {
 				int bytes = io_u->xfer_buflen - io_u->resid;
+				struct fio_file *f = io_u->file;
 
 				/*
 				 * zero read, fail
@@ -342,10 +339,20 @@ static void do_verify(struct thread_data *td)
 					put_io_u(td, io_u);
 					break;
 				}
+
 				io_u->xfer_buflen = io_u->resid;
 				io_u->xfer_buf += bytes;
+				io_u->offset += bytes;
+				f->last_completed_pos = io_u->offset;
+
+				td->ts.short_io_u[io_u->ddir]++;
+
+				if (io_u->offset == f->real_file_size)
+					goto sync_done;
+
 				requeue_io_u(td, &io_u);
 			} else {
+sync_done:
 				ret = io_u_sync_complete(td, io_u);
 				if (ret < 0)
 					break;
@@ -412,7 +419,7 @@ static void do_io(struct thread_data *td)
 
 	td_set_runstate(td, TD_RUNNING);
 
-	while ((td->this_io_bytes[0] + td->this_io_bytes[1]) < td->io_size) {
+	while ((td->this_io_bytes[0] + td->this_io_bytes[1]) < td->o.size) {
 		struct timeval comp_time;
 		long bytes_done = 0;
 		int min_evts = 0;
@@ -440,6 +447,7 @@ static void do_io(struct thread_data *td)
 				ret = -io_u->error;
 			else if (io_u->resid) {
 				int bytes = io_u->xfer_buflen - io_u->resid;
+				struct fio_file *f = io_u->file;
 
 				/*
 				 * zero read, fail
@@ -452,8 +460,17 @@ static void do_io(struct thread_data *td)
 
 				io_u->xfer_buflen = io_u->resid;
 				io_u->xfer_buf += bytes;
+				io_u->offset += bytes;
+				f->last_completed_pos = io_u->offset;
+
+				td->ts.short_io_u[io_u->ddir]++;
+
+				if (io_u->offset == f->real_file_size)
+					goto sync_done;
+
 				requeue_io_u(td, &io_u);
 			} else {
+sync_done:
 				fio_gettime(&comp_time, NULL);
 				bytes_done = io_u_sync_complete(td, io_u);
 				if (bytes_done < 0)
@@ -576,14 +593,17 @@ static void cleanup_io_u(struct thread_data *td)
 /*
  * "randomly" fill the buffer contents
  */
-static void fill_rand_buf(struct io_u *io_u, int max_bs)
+static void fill_io_buf(struct thread_data *td, struct io_u *io_u, int max_bs)
 {
 	int *ptr = io_u->buf;
 
-	while ((void *) ptr - io_u->buf < max_bs) {
-		*ptr = rand() * 0x9e370001;
-		ptr++;
-	}
+	if (!td->o.zero_buffers) {
+		while ((void *) ptr - io_u->buf < max_bs) {
+			*ptr = rand() * 0x9e370001;
+			ptr++;
+		}
+	} else
+		memset(ptr, 0, max_bs);
 }
 
 static int init_io_u(struct thread_data *td)
@@ -624,8 +644,9 @@ static int init_io_u(struct thread_data *td)
 		INIT_LIST_HEAD(&io_u->list);
 
 		io_u->buf = p + max_bs * i;
-		if (td_write(td) || td_rw(td))
-			fill_rand_buf(io_u, max_bs);
+
+		if (td_write(td))
+			fill_io_buf(td, io_u, max_bs);
 
 		io_u->index = i;
 		io_u->flags = IO_U_F_FREE;
@@ -650,7 +671,11 @@ static int switch_ioscheduler(struct thread_data *td)
 
 	f = fopen(tmp, "r+");
 	if (!f) {
-		td_verror(td, errno, "fopen");
+		if (errno == ENOENT) {
+			log_err("fio: os or kernel doesn't support IO scheduler switching\n");
+			return 0;
+		}
+		td_verror(td, errno, "fopen iosched");
 		return 1;
 	}
 
@@ -735,8 +760,9 @@ static void *thread_main(void *data)
 	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_hist_list);
 	INIT_LIST_HEAD(&td->io_log_list);
+	INIT_LIST_HEAD(&td->io_hist_list);
+	td->io_hist_tree = RB_ROOT;
 
 	if (init_io_u(td))
 		goto err_sem;
@@ -977,6 +1003,7 @@ static void reap_threads(int *nr_running, int *t_rate, int *m_rate)
 		/*
 		 * thread is not dead, continue
 		 */
+		pending++;
 		continue;
 reaped:
 		if (td->o.use_thread) {
@@ -989,6 +1016,7 @@ reaped:
 		(*nr_running)--;
 		(*m_rate) -= td->o.ratemin;
 		(*t_rate) -= td->o.rate;
+		pending--;
 
 		if (td->error)
 			exit_value++;
@@ -1196,10 +1224,8 @@ int main(int argc, char *argv[])
 	if (parse_options(argc, argv))
 		return 1;
 
-	if (!thread_number) {
-		log_err("Nothing to do\n");
-		return 1;
-	}
+	if (!thread_number)
+		return 0;
 
 	ps = sysconf(_SC_PAGESIZE);
 	if (ps < 0) {