X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.c;h=61fd098958704473113dfa5cb6a76c795ce7f8a7;hp=7ddde7d18561393c692e44a6cc6f6b09e942b3e5;hb=429ca0735f71961ffe52c5ac102b0a14ee1b2c4c;hpb=7d6c5283afe6fb5187d2e2a330376ad65f472537

diff --git a/fio.c b/fio.c
index 7ddde7d1..61fd0989 100644
--- a/fio.c
+++ b/fio.c
@@ -26,20 +26,19 @@
 #include <string.h>
 #include <signal.h>
 #include <time.h>
-#include <assert.h>
+#include <locale.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <sys/ipc.h>
 #include <sys/shm.h>
-#include <sys/ioctl.h>
 #include <sys/mman.h>
 
 #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;
@@ -48,6 +47,7 @@ int temp_stall_ts;
 
 static volatile int startup_sem;
 static volatile int fio_abort;
+static int exit_value;
 
 struct io_log *agg_io_log[2];
 
@@ -82,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);
@@ -388,7 +383,7 @@ static void do_io(struct thread_data *td)
 
 	td_set_runstate(td, TD_RUNNING);
 
-	while (td->this_io_bytes[td->ddir] < td->io_size) {
+	while ((td->this_io_bytes[0] + td->this_io_bytes[1]) < td->io_size) {
 		struct timespec *timeout;
 		int min_evts = 0;
 		struct io_u *io_u;
@@ -406,11 +401,21 @@ 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 {
+				put_io_u(td, io_u);
+				break;
+			}
 		}
 
 		add_slat_sample(td, io_u->ddir, mtime_since(&io_u->start_time, &io_u->issue_time));
@@ -528,7 +533,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;
@@ -684,8 +689,10 @@ static void *thread_main(void *data)
 	if (td_io_init(td))
 		goto err;
 
-	if (td->exec_prerun)
-		system(td->exec_prerun);
+	if (td->exec_prerun) {
+		if (system(td->exec_prerun) < 0)
+			goto err;
+	}
 
 	fio_gettime(&td->epoch, NULL);
 	getrusage(RUSAGE_SELF, &td->ru_start);
@@ -740,8 +747,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);
@@ -803,6 +812,9 @@ static void reap_threads(int *nr_running, int *t_rate, int *m_rate)
 			continue;
 		}
 
+		if (td->error)
+			exit_value++;
+
 		td_set_runstate(td, TD_REAPED);
 
 		if (td->use_thread) {
@@ -841,7 +853,6 @@ static void run_threads(void)
 
 	signal(SIGINT, sig_handler);
 	signal(SIGALRM, sig_handler);
-	signal(SIGSEGV, sig_handler);
 
 	todo = thread_number;
 	nr_running = 0;
@@ -996,6 +1007,15 @@ static void run_threads(void)
 
 int main(int argc, char *argv[])
 {
+	long ps;
+
+	/*
+	 * We need locale for number printing, if it isn't set then just
+	 * go with the US format.
+	 */
+	if (!getenv("LC_NUMERIC"))
+		setlocale(LC_NUMERIC, "en_US");
+
 	if (parse_options(argc, argv))
 		return 1;
 
@@ -1004,6 +1024,14 @@ 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]);
@@ -1021,5 +1049,5 @@ int main(int argc, char *argv[])
 		}
 	}
 
-	return 0;
+	return exit_value;
 }