X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.c;h=4c761c038bd170f16d0d10c094c69e96f7fa503f;hp=a175be7a1f6bc07c13107d5f8be9152e14c67aea;hb=ae4020f762a87c428a430ffff1c10dd2a3644e98;hpb=02bcaa8c31feb93c61b701d143a7eea3efd2124d

diff --git a/fio.c b/fio.c
index a175be7a..4c761c03 100644
--- a/fio.c
+++ b/fio.c
@@ -47,11 +47,19 @@ int shm_id = 0;
 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)
 
-static void terminate_threads(int group_id)
+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)
 {
 	struct thread_data *td;
 	int i;
@@ -60,6 +68,8 @@ static void terminate_threads(int group_id)
 		if (group_id == TERMINATE_ALL || groupid == td->groupid) {
 			td->terminate = 1;
 			td->start_delay = 0;
+			if (forced_kill)
+				td_set_runstate(td, TD_EXITED);
 		}
 	}
 }
@@ -72,10 +82,15 @@ 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\n");
+			printf("\nfio: terminating on signal %d\n", sig);
 			fflush(stdout);
-			terminate_threads(TERMINATE_ALL);
+			terminate_threads(TERMINATE_ALL, 0);
 			break;
 	}
 }
@@ -105,7 +120,7 @@ static int check_min_rate(struct thread_data *td, struct timeval *now)
 
 		rate = (td->this_io_bytes[ddir] - td->rate_bytes) / spent;
 		if (rate < td->ratemin) {
-			fprintf(f_out, "%s: min rate %d not met, got %ldKiB/sec\n", td->name, td->ratemin, rate);
+			fprintf(f_out, "%s: min rate %u not met, got %luKiB/sec\n", td->name, td->ratemin, rate);
 			return 1;
 		}
 	}
@@ -125,11 +140,6 @@ static inline int runtime_exceeded(struct thread_data *td, struct timeval *t)
 	return 0;
 }
 
-static inline void td_set_runstate(struct thread_data *td, int runstate)
-{
-	td->runstate = runstate;
-}
-
 static struct fio_file *get_next_file(struct thread_data *td)
 {
 	unsigned int old_next_file = td->next_file;
@@ -242,7 +252,7 @@ static int fio_io_sync(struct thread_data *td, struct fio_file *f)
  * The main verify engine. Runs over the writes we previusly submitted,
  * reads the blocks back in, and checks the crc/md5 of the data.
  */
-void do_verify(struct thread_data *td)
+static void do_verify(struct thread_data *td)
 {
 	struct io_u *io_u, *v_io_u = NULL;
 	struct io_completion_data icd;
@@ -379,7 +389,6 @@ static void do_io(struct thread_data *td)
 	td_set_runstate(td, TD_RUNNING);
 
 	while (td->this_io_bytes[td->ddir] < td->io_size) {
-		struct timespec ts = { .tv_sec = 0, .tv_nsec = 0};
 		struct timespec *timeout;
 		int min_evts = 0;
 		struct io_u *io_u;
@@ -407,6 +416,8 @@ static void do_io(struct thread_data *td)
 		add_slat_sample(td, io_u->ddir, mtime_since(&io_u->start_time, &io_u->issue_time));
 
 		if (td->cur_depth < td->iodepth) {
+			struct timespec ts = { .tv_sec = 0, .tv_nsec = 0};
+
 			timeout = &ts;
 			min_evts = 0;
 		} else {
@@ -439,16 +450,21 @@ static void do_io(struct thread_data *td)
 
 		if (check_min_rate(td, &icd.time)) {
 			if (exitall_on_terminate)
-				terminate_threads(td->groupid);
-			td_verror(td, ENOMEM);
+				terminate_threads(td->groupid, 0);
+			td_verror(td, ENODATA);
 			break;
 		}
 
 		if (runtime_exceeded(td, &icd.time))
 			break;
 
-		if (td->thinktime)
-			usec_sleep(td, td->thinktime);
+		if (td->thinktime) {
+			unsigned long long b;
+
+			b = td->io_blocks[0] + td->io_blocks[1];
+			if (!(b % td->thinktime_blocks))
+				usec_sleep(td, td->thinktime);
+		}
 	}
 
 	if (!td->error) {
@@ -507,7 +523,12 @@ static int init_io_u(struct thread_data *td)
 		max_units = td->iodepth;
 
 	max_bs = max(td->max_bs[DDIR_READ], td->max_bs[DDIR_WRITE]);
-	td->orig_buffer_size = max_bs * max_units + MASK;
+	td->orig_buffer_size = max_bs * max_units;
+
+	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;
 
 	if (allocate_io_mem(td))
 		return 1;
@@ -605,6 +626,7 @@ static void clear_io_state(struct thread_data *td)
  */
 static void *thread_main(void *data)
 {
+	unsigned long long runtime[2];
 	struct thread_data *td = data;
 
 	if (!td->use_thread)
@@ -658,13 +680,14 @@ static void *thread_main(void *data)
 	if (open_files(td))
 		goto err;
 
-	fio_gettime(&td->epoch, NULL);
-
 	if (td->exec_prerun)
 		system(td->exec_prerun);
 
+	fio_gettime(&td->epoch, NULL);
+	getrusage(RUSAGE_SELF, &td->ru_start);
+
+	runtime[0] = runtime[1] = 0;
 	while (td->loops--) {
-		getrusage(RUSAGE_SELF, &td->ru_start);
 		fio_gettime(&td->start, NULL);
 		memcpy(&td->stat_sample_time, &td->start, sizeof(td->start));
 
@@ -679,11 +702,9 @@ static void *thread_main(void *data)
 		else
 			do_io(td);
 
-		td->runtime[td->ddir] += mtime_since_now(&td->start);
+		runtime[td->ddir] += utime_since_now(&td->start);
 		if (td_rw(td) && td->io_bytes[td->ddir ^ 1])
-			td->runtime[td->ddir ^ 1] = td->runtime[td->ddir];
-
-		update_rusage_stat(td);
+			runtime[td->ddir ^ 1] = runtime[td->ddir];
 
 		if (td->error || td->terminate)
 			break;
@@ -696,12 +717,17 @@ static void *thread_main(void *data)
 
 		do_verify(td);
 
-		td->runtime[DDIR_READ] += mtime_since_now(&td->start);
+		runtime[DDIR_READ] += utime_since_now(&td->start);
 
 		if (td->error || td->terminate)
 			break;
 	}
 
+	update_rusage_stat(td);
+	fio_gettime(&td->end_time, NULL);
+	td->runtime[0] = runtime[0] / 1000;
+	td->runtime[1] = runtime[1] / 1000;
+
 	if (td->bw_log)
 		finish_log(td, td->bw_log, "bw");
 	if (td->slat_log)
@@ -714,7 +740,7 @@ static void *thread_main(void *data)
 		system(td->exec_postrun);
 
 	if (exitall_on_terminate)
-		terminate_threads(td->groupid);
+		terminate_threads(td->groupid, 0);
 
 err:
 	close_files(td);
@@ -789,7 +815,7 @@ static void reap_threads(int *nr_running, int *t_rate, int *m_rate)
 	}
 
 	if (*nr_running == cputhreads && !pending)
-		terminate_threads(TERMINATE_ALL);
+		terminate_threads(TERMINATE_ALL, 0);
 }
 
 /*
@@ -811,6 +837,7 @@ static void run_threads(void)
 
 	signal(SIGINT, sig_handler);
 	signal(SIGALRM, sig_handler);
+	signal(SIGSEGV, sig_handler);
 
 	todo = thread_number;
 	nr_running = 0;
@@ -820,10 +847,10 @@ static void run_threads(void)
 	for_each_td(td, i) {
 		print_status_init(td->thread_number - 1);
 
-		init_disk_util(td);
-
-		if (!td->create_serialize)
+		if (!td->create_serialize) {
+			init_disk_util(td);
 			continue;
+		}
 
 		/*
 		 * do file setup here so it happens sequentially,
@@ -834,6 +861,8 @@ static void run_threads(void)
 			td_set_runstate(td, TD_REAPED);
 			todo--;
 		}
+
+		init_disk_util(td);
 	}
 
 	while (todo) {
@@ -897,7 +926,7 @@ static void run_threads(void)
 		 */
 		fio_gettime(&this_start, NULL);
 		left = this_jobs;
-		while (left) {
+		while (left && !fio_abort) {
 			if (mtime_since_now(&this_start) > JOB_START_TIMEOUT)
 				break;
 
@@ -971,10 +1000,22 @@ int main(int argc, char *argv[])
 		return 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();
-	show_run_stats();
+
+	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;
 }