X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.c;h=773f10698c83433748e78791431dcbf5a78883bc;hp=90bad972727e403ff9474ef71e913b63790bd7fb;hb=c3383b96a3d8dddd719a8d4d2888485edf9b3812;hpb=838bc709279964bdcc64070d4eb2777a0f79bcbb

diff --git a/fio.c b/fio.c
index 90bad972..773f1069 100644
--- a/fio.c
+++ b/fio.c
@@ -54,19 +54,20 @@ unsigned long done_secs = 0;
 static struct fio_mutex *startup_mutex;
 static volatile int fio_abort;
 static int exit_value;
+static struct itimerval itimer;
 
 struct io_log *agg_io_log[2];
 
 #define TERMINATE_ALL		(-1)
 #define JOB_START_TIMEOUT	(5 * 1000)
 
-static inline void td_set_runstate(struct thread_data *td, int runstate)
+void td_set_runstate(struct thread_data *td, int runstate)
 {
 	if (td->runstate == runstate)
 		return;
 
-	dprint(FD_PROCESS, "pid=%d: runstate %d -> %d\n", td->pid, td->runstate,
-								runstate);
+	dprint(FD_PROCESS, "pid=%d: runstate %d -> %d\n", (int) td->pid,
+						td->runstate, runstate);
 	td->runstate = runstate;
 }
 
@@ -80,7 +81,7 @@ static void terminate_threads(int group_id)
 	for_each_td(td, i) {
 		if (group_id == TERMINATE_ALL || groupid == td->groupid) {
 			dprint(FD_PROCESS, "setting terminate on %s/%d\n",
-							td->o.name, td->pid);
+						td->o.name, (int) td->pid);
 			td->terminate = 1;
 			td->o.start_delay = 0;
 
@@ -99,22 +100,62 @@ static void terminate_threads(int group_id)
 	}
 }
 
-static void sig_handler(int sig)
+static void status_timer_arm(void)
 {
-	switch (sig) {
-	case SIGALRM:
+	itimer.it_value.tv_sec = 0;
+	itimer.it_value.tv_usec = DISK_UTIL_MSEC * 1000;
+	setitimer(ITIMER_REAL, &itimer, NULL);
+}
+
+static void sig_alrm(int fio_unused sig)
+{
+	if (threads) {
 		update_io_ticks();
-		disk_util_timer_arm();
 		print_thread_status();
-		break;
-	default:
+		status_timer_arm();
+	}
+}
+
+static void sig_int(int sig)
+{
+	if (threads) {
 		printf("\nfio: terminating on signal %d\n", sig);
 		fflush(stdout);
 		terminate_threads(TERMINATE_ALL);
-		break;
 	}
 }
 
+static void sig_ill(int fio_unused sig)
+{
+	if (!threads)
+		return;
+
+	log_err("fio: illegal instruction. your cpu does not support "
+		"the sse4.2 instruction for crc32c\n");
+	terminate_threads(TERMINATE_ALL);
+	exit(4);
+}
+
+static void set_sig_handlers(void)
+{
+	struct sigaction act;
+
+	memset(&act, 0, sizeof(act));
+	act.sa_handler = sig_alrm;
+	act.sa_flags = SA_RESTART;
+	sigaction(SIGALRM, &act, NULL);
+
+	memset(&act, 0, sizeof(act));
+	act.sa_handler = sig_int;
+	act.sa_flags = SA_RESTART;
+	sigaction(SIGINT, &act, NULL);
+
+	memset(&act, 0, sizeof(act));
+	act.sa_handler = sig_ill;
+	act.sa_flags = SA_RESTART;
+	sigaction(SIGILL, &act, NULL);
+}
+
 /*
  * Check if we are above the minimum rate given.
  */
@@ -215,7 +256,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;
 
@@ -230,8 +271,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
@@ -330,7 +371,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)
@@ -367,7 +408,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;
 				}
@@ -410,19 +451,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;
 	}
 
@@ -448,14 +495,17 @@ static void do_io(struct thread_data *td)
 	unsigned int i;
 	int ret = 0;
 
-	td_set_runstate(td, TD_RUNNING);
+	if (in_ramp_time(td))
+		td_set_runstate(td, TD_RAMP);
+	else
+		td_set_runstate(td, TD_RUNNING);
 
 	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;
 		struct io_u *io_u;
-		int ret2;
+		int ret2, full;
 
 		if (td->terminate)
 			break;
@@ -479,7 +529,9 @@ static void do_io(struct thread_data *td)
 		if (td->o.verify != VERIFY_NONE && io_u->ddir == DDIR_READ) {
 			io_u->end_io = verify_io_u;
 			td_set_runstate(td, TD_VERIFYING);
-		} else
+		} else if (in_ramp_time(td))
+			td_set_runstate(td, TD_RAMP);
+		else
 			td_set_runstate(td, TD_RUNNING);
 
 		ret = td_io_queue(td, io_u);
@@ -495,7 +547,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;
 				}
@@ -545,18 +597,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;
 
@@ -565,15 +624,17 @@ sync_done:
 		 * of completions except the very first one which may look
 		 * a little bursty
 		 */
-		usec = utime_since(&s, &comp_time);
+		if (!in_ramp_time(td)) {
+			usec = utime_since(&s, &comp_time);
 
-		rate_throttle(td, usec, bytes_done);
+			rate_throttle(td, usec, bytes_done);
 
-		if (check_min_rate(td, &comp_time)) {
-			if (exitall_on_terminate)
-				terminate_threads(td->groupid);
-			td_verror(td, ENODATA, "check_min_rate");
-			break;
+			if (check_min_rate(td, &comp_time)) {
+				if (exitall_on_terminate)
+					terminate_threads(td->groupid);
+				td_verror(td, EIO, "check_min_rate");
+				break;
+			}
 		}
 
 		if (td->o.thinktime) {
@@ -625,13 +686,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);
 	}
 
@@ -675,7 +736,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;
@@ -686,7 +747,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();
@@ -771,12 +832,8 @@ static int keep_running(struct thread_data *td)
 	return 0;
 }
 
-static int clear_io_state(struct thread_data *td)
+static void reset_io_counters(struct thread_data *td)
 {
-	struct fio_file *f;
-	unsigned int i;
-	int ret;
-
 	td->ts.stat_io_bytes[0] = td->ts.stat_io_bytes[1] = 0;
 	td->this_io_bytes[0] = td->this_io_bytes[1] = 0;
 	td->zone_bytes = 0;
@@ -791,6 +848,34 @@ static int clear_io_state(struct thread_data *td)
 	 */
 	if (td->o.time_based || td->o.loops)
 		td->nr_done_files = 0;
+}
+
+void reset_all_stats(struct thread_data *td)
+{
+	struct timeval tv;
+	int i;
+
+	reset_io_counters(td);
+
+	for (i = 0; i < 2; i++) {
+		td->io_bytes[i] = 0;
+		td->io_blocks[i] = 0;
+		td->io_issues[i] = 0;
+		td->ts.total_io_u[i] = 0;
+	}
+	
+	fio_gettime(&tv, NULL);
+	memcpy(&td->epoch, &tv, sizeof(tv));
+	memcpy(&td->start, &tv, sizeof(tv));
+}
+
+static int clear_io_state(struct thread_data *td)
+{
+	struct fio_file *f;
+	unsigned int i;
+	int ret;
+
+	reset_io_counters(td);
 
 	close_files(td);
 
@@ -820,13 +905,13 @@ static void *thread_main(void *data)
 
 	td->pid = getpid();
 
-	dprint(FD_PROCESS, "jobs pid=%d started\n", td->pid);
+	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);
@@ -972,7 +1057,7 @@ static void *thread_main(void *data)
 
 err:
 	if (td->error)
-		printf("fio: pid=%d, err=%d/%s\n", td->pid, td->error,
+		printf("fio: pid=%d, err=%d/%s\n", (int) td->pid, td->error,
 							td->verror);
 	close_and_free_files(td);
 	close_ioengine(td);
@@ -1060,8 +1145,8 @@ static void reap_threads(int *nr_running, int *t_rate, int *m_rate)
 		ret = waitpid(td->pid, &status, flags);
 		if (ret < 0) {
 			if (errno == ECHILD) {
-				log_err("fio: pid=%d disappeared %d\n", td->pid,
-								td->runstate);
+				log_err("fio: pid=%d disappeared %d\n",
+						(int) td->pid, td->runstate);
 				td_set_runstate(td, TD_REAPED);
 				goto reaped;
 			}
@@ -1072,7 +1157,7 @@ static void reap_threads(int *nr_running, int *t_rate, int *m_rate)
 
 				if (sig != SIGQUIT)
 					log_err("fio: pid=%d, got signal=%d\n",
-								td->pid, sig);
+							(int) td->pid, sig);
 				td_set_runstate(td, TD_REAPED);
 				goto reaped;
 			}
@@ -1134,8 +1219,7 @@ static void run_threads(void)
 		fflush(stdout);
 	}
 
-	signal(SIGINT, sig_handler);
-	signal(SIGALRM, sig_handler);
+	set_sig_handlers();
 
 	todo = thread_number;
 	nr_running = 0;
@@ -1158,8 +1242,8 @@ static void run_threads(void)
 		if (setup_files(td)) {
 			exit_value++;
 			if (td->error)
-				log_err("fio: pid=%d, err=%d/%s\n", td->pid,
-							td->error, td->verror);
+				log_err("fio: pid=%d, err=%d/%s\n",
+					(int) td->pid, td->error, td->verror);
 			td_set_runstate(td, TD_REAPED);
 			todo--;
 		} else {
@@ -1233,12 +1317,15 @@ static void run_threads(void)
 				if (pthread_detach(td->thread) < 0)
 					perror("pthread_detach");
 			} else {
+				pid_t pid;
 				dprint(FD_PROCESS, "will fork\n");
-				if (!fork()) {
+				pid = fork();
+				if (!pid) {
 					int ret = fork_main(shm_id, i);
 
-					exit(ret);
-				}
+					_exit(ret);
+				} else if (i == fio_debug_jobno)
+					*fio_debug_jobp = pid;
 			}
 			fio_mutex_down(startup_mutex);
 		}
@@ -1289,7 +1376,10 @@ static void run_threads(void)
 			if (td->runstate != TD_INITIALIZED)
 				continue;
 
-			td_set_runstate(td, TD_RUNNING);
+			if (in_ramp_time(td))
+				td_set_runstate(td, TD_RAMP);
+			else
+				td_set_runstate(td, TD_RUNNING);
 			nr_running++;
 			nr_started--;
 			m_rate += td->o.ratemin;
@@ -1350,7 +1440,7 @@ int main(int argc, char *argv[])
 
 	set_genesis_time();
 
-	disk_util_timer_arm();
+	status_timer_arm();
 
 	run_threads();