X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.c;h=0b0a5e8e540851e032e0004e23175b7cfcd798e3;hp=84819d9f51e996b2a25c35f1da29a62772b99e8b;hb=16edf25dba269ee9e8239130e75b690440b1e120;hpb=6ce15a32b28f359b3753ef65d883ab2d824e19f2

diff --git a/fio.c b/fio.c
index 84819d9f..0b0a5e8e 100644
--- a/fio.c
+++ b/fio.c
@@ -37,9 +37,9 @@
 #include "fio.h"
 #include "os.h"
 
-#define MASK	(4095)
-
-#define ALIGN(buf)	(char *) (((unsigned long) (buf) + MASK) & ~(MASK))
+static unsigned long page_mask;
+#define ALIGN(buf)	\
+	(char *) (((unsigned long) (buf) + page_mask) & ~page_mask)
 
 int groupid = 0;
 int thread_number = 0;
@@ -49,6 +49,8 @@ int temp_stall_ts;
 static volatile int startup_sem;
 static volatile int fio_abort;
 
+struct io_log *agg_io_log[2];
+
 #define TERMINATE_ALL		(-1)
 #define JOB_START_TIMEOUT	(5 * 1000)
 
@@ -80,11 +82,6 @@ static void sig_handler(int sig)
 			disk_util_timer_arm();
 			print_thread_status();
 			break;
-		case SIGSEGV:
-			fprintf(stderr, "fio: got segfault, aborting\n");
-			terminate_threads(TERMINATE_ALL, 1);
-			fio_abort = 1;
-			exit(0);
 		default:
 			printf("\nfio: terminating on signal %d\n", sig);
 			fflush(stdout);
@@ -404,11 +401,22 @@ static void do_io(struct thread_data *td)
 
 		memcpy(&s, &io_u->start_time, sizeof(s));
 
+requeue:
 		ret = td_io_queue(td, io_u);
 		if (ret) {
-			td_verror(td, io_u->error);
-			put_io_u(td, io_u);
-			break;
+			if (ret > 0 && (io_u->xfer_buflen != io_u->resid) &&
+			    io_u->resid) {
+				/*
+				 * short read/write. requeue.
+				 */
+				io_u->xfer_buflen = io_u->resid;
+				io_u->xfer_buf += ret;
+				goto requeue;
+			} else {
+				td_verror(td, io_u->error);
+				put_io_u(td, io_u);
+				break;
+			}
 		}
 
 		add_slat_sample(td, io_u->ddir, mtime_since(&io_u->start_time, &io_u->issue_time));
@@ -449,7 +457,7 @@ static void do_io(struct thread_data *td)
 		if (check_min_rate(td, &icd.time)) {
 			if (exitall_on_terminate)
 				terminate_threads(td->groupid, 0);
-			td_verror(td, ENOMEM);
+			td_verror(td, ENODATA);
 			break;
 		}
 
@@ -526,7 +534,7 @@ static int init_io_u(struct thread_data *td)
 	if (td->mem_type == MEM_SHMHUGE || td->mem_type == MEM_MMAPHUGE)
 		td->orig_buffer_size = (td->orig_buffer_size + td->hugepage_size - 1) & ~(td->hugepage_size - 1);
 	else
-		td->orig_buffer_size += MASK;
+		td->orig_buffer_size += page_mask;
 
 	if (allocate_io_mem(td))
 		return 1;
@@ -645,9 +653,6 @@ static void *thread_main(void *data)
 		goto err;
 	}
 
-	if (td_io_init(td))
-		goto err;
-
 	if (init_iolog(td))
 		goto err;
 
@@ -678,8 +683,17 @@ static void *thread_main(void *data)
 	if (open_files(td))
 		goto err;
 
-	if (td->exec_prerun)
-		system(td->exec_prerun);
+	/*
+	 * 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 (td->exec_prerun) {
+		if (system(td->exec_prerun) < 0)
+			goto err;
+	}
 
 	fio_gettime(&td->epoch, NULL);
 	getrusage(RUSAGE_SELF, &td->ru_start);
@@ -734,8 +748,10 @@ static void *thread_main(void *data)
 		finish_log(td, td->clat_log, "clat");
 	if (td->write_iolog_file)
 		write_iolog_close(td);
-	if (td->exec_postrun)
-		system(td->exec_postrun);
+	if (td->exec_postrun) {
+		if (system(td->exec_postrun) < 0)
+			log_err("fio: postrun %s failed\n", td->exec_postrun);
+	}
 
 	if (exitall_on_terminate)
 		terminate_threads(td->groupid, 0);
@@ -835,7 +851,6 @@ static void run_threads(void)
 
 	signal(SIGINT, sig_handler);
 	signal(SIGALRM, sig_handler);
-	signal(SIGSEGV, sig_handler);
 
 	todo = thread_number;
 	nr_running = 0;
@@ -990,6 +1005,8 @@ static void run_threads(void)
 
 int main(int argc, char *argv[])
 {
+	long ps;
+
 	if (parse_options(argc, argv))
 		return 1;
 
@@ -998,12 +1015,30 @@ int main(int argc, char *argv[])
 		return 1;
 	}
 
+	ps = sysconf(_SC_PAGESIZE);
+	if (ps < 0) {
+		log_err("Failed to get page size\n");
+		return 1;
+	}
+
+	page_mask = ps - 1;
+
+	if (write_bw_log) {
+		setup_log(&agg_io_log[DDIR_READ]);
+		setup_log(&agg_io_log[DDIR_WRITE]);
+	}
+
 	disk_util_timer_arm();
 
 	run_threads();
 
-	if (!fio_abort)
+	if (!fio_abort) {
 		show_run_stats();
+		if (write_bw_log) {
+			__finish_log(agg_io_log[DDIR_READ],"agg-read_bw.log");
+			__finish_log(agg_io_log[DDIR_WRITE],"agg-write_bw.log");
+		}
+	}
 
 	return 0;
 }