X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.c;h=632b0025a4e5a8476f1694c91562a57b6cc56580;hp=b4415fa7d942c2413018fb1f174345c9cb74c339;hb=2be3eec330360e6735fb4e7d70907e11eaa346f8;hpb=e235d5f883d7640d6ca2255cbdc43762b1fe6959

diff --git a/fio.c b/fio.c
index b4415fa7..632b0025 100644
--- a/fio.c
+++ b/fio.c
@@ -37,6 +37,8 @@
 #include "fio.h"
 #include "hash.h"
 #include "smalloc.h"
+#include "verify.h"
+#include "diskutil.h"
 
 unsigned long page_mask;
 unsigned long page_size;
@@ -52,6 +54,7 @@ int temp_stall_ts;
 unsigned long done_secs = 0;
 
 static struct fio_mutex *startup_mutex;
+static struct fio_mutex *writeout_mutex;
 static volatile int fio_abort;
 static int exit_value;
 static struct itimerval itimer;
@@ -169,28 +172,22 @@ static void set_sig_handlers(void)
 	sigaction(SIGQUIT, &act, NULL);
 }
 
-static inline int should_check_rate(struct thread_data *td)
-{
-	struct thread_options *o = &td->o;
-
-	/*
-	 * If some rate setting was given, we need to check it
-	 */
-	if (o->rate || o->ratemin || o->rate_iops || o->rate_iops_min)
-		return 1;
-
-	return 0;
-}
-
 /*
  * Check if we are above the minimum rate given.
  */
-static int check_min_rate(struct thread_data *td, struct timeval *now)
+static int __check_min_rate(struct thread_data *td, struct timeval *now,
+			    enum td_ddir ddir)
 {
 	unsigned long long bytes = 0;
 	unsigned long iops = 0;
 	unsigned long spent;
 	unsigned long rate;
+	unsigned int ratemin = 0;
+	unsigned int rate_iops = 0;
+	unsigned int rate_iops_min = 0;
+
+	if (!td->o.ratemin[ddir] && !td->o.rate_iops_min[ddir])
+		return 0;
 
 	/*
 	 * allow a 2 second settle period in the beginning
@@ -198,38 +195,35 @@ static int check_min_rate(struct thread_data *td, struct timeval *now)
 	if (mtime_since(&td->start, now) < 2000)
 		return 0;
 
-	if (td_read(td)) {
-		iops += td->io_blocks[DDIR_READ];
-		bytes += td->this_io_bytes[DDIR_READ];
-	}
-	if (td_write(td)) {
-		iops += td->io_blocks[DDIR_WRITE];
-		bytes += td->this_io_bytes[DDIR_WRITE];
-	}
+	iops += td->io_blocks[ddir];
+	bytes += td->this_io_bytes[ddir];
+	ratemin += td->o.ratemin[ddir];
+	rate_iops += td->o.rate_iops[ddir];
+	rate_iops_min += td->o.rate_iops_min[ddir];
 
 	/*
 	 * if rate blocks is set, sample is running
 	 */
-	if (td->rate_bytes || td->rate_blocks) {
-		spent = mtime_since(&td->lastrate, now);
+	if (td->rate_bytes[ddir] || td->rate_blocks[ddir]) {
+		spent = mtime_since(&td->lastrate[ddir], now);
 		if (spent < td->o.ratecycle)
 			return 0;
 
-		if (td->o.rate) {
+		if (td->o.rate[ddir]) {
 			/*
 			 * check bandwidth specified rate
 			 */
-			if (bytes < td->rate_bytes) {
+			if (bytes < td->rate_bytes[ddir]) {
 				log_err("%s: min rate %u not met\n", td->o.name,
-								td->o.ratemin);
+								ratemin);
 				return 1;
 			} else {
-				rate = (bytes - td->rate_bytes) / spent;
-				if (rate < td->o.ratemin ||
-				    bytes < td->rate_bytes) {
+				rate = ((bytes - td->rate_bytes[ddir]) * 1000) / spent;
+				if (rate < ratemin ||
+				    bytes < td->rate_bytes[ddir]) {
 					log_err("%s: min rate %u not met, got"
 						" %luKiB/sec\n", td->o.name,
-							td->o.ratemin, rate);
+							ratemin, rate);
 					return 1;
 				}
 			}
@@ -237,29 +231,41 @@ static int check_min_rate(struct thread_data *td, struct timeval *now)
 			/*
 			 * checks iops specified rate
 			 */
-			if (iops < td->o.rate_iops) {
+			if (iops < rate_iops) {
 				log_err("%s: min iops rate %u not met\n",
-						td->o.name, td->o.rate_iops);
+						td->o.name, rate_iops);
 				return 1;
 			} else {
-				rate = (iops - td->rate_blocks) / spent;
-				if (rate < td->o.rate_iops_min ||
-				    iops < td->rate_blocks) {
+				rate = ((iops - td->rate_blocks[ddir]) * 1000) / spent;
+				if (rate < rate_iops_min ||
+				    iops < td->rate_blocks[ddir]) {
 					log_err("%s: min iops rate %u not met,"
 						" got %lu\n", td->o.name,
-							td->o.rate_iops_min,
-							rate);
+							rate_iops_min, rate);
 				}
 			}
 		}
 	}
 
-	td->rate_bytes = bytes;
-	td->rate_blocks = iops;
-	memcpy(&td->lastrate, now, sizeof(*now));
+	td->rate_bytes[ddir] = bytes;
+	td->rate_blocks[ddir] = iops;
+	memcpy(&td->lastrate[ddir], now, sizeof(*now));
 	return 0;
 }
 
+static int check_min_rate(struct thread_data *td, struct timeval *now,
+			  unsigned long *bytes_done)
+{
+	int ret = 0;
+
+	if (bytes_done[0])
+		ret |= __check_min_rate(td, now, 0);
+	if (bytes_done[1])
+		ret |= __check_min_rate(td, now, 1);
+
+	return ret;
+}
+
 static inline int runtime_exceeded(struct thread_data *td, struct timeval *t)
 {
 	if (!td->o.timeout)
@@ -283,7 +289,7 @@ static void cleanup_pending_aio(struct thread_data *td)
 	/*
 	 * get immediately available events, if any
 	 */
-	r = io_u_queued_complete(td, 0);
+	r = io_u_queued_complete(td, 0, NULL);
 	if (r < 0)
 		return;
 
@@ -311,7 +317,7 @@ static void cleanup_pending_aio(struct thread_data *td)
 	}
 
 	if (td->cur_depth)
-		r = io_u_queued_complete(td, td->cur_depth);
+		r = io_u_queued_complete(td, td->cur_depth, NULL);
 }
 
 /*
@@ -341,7 +347,7 @@ requeue:
 		put_io_u(td, io_u);
 		return 1;
 	} else if (ret == FIO_Q_QUEUED) {
-		if (io_u_queued_complete(td, 1) < 0)
+		if (io_u_queued_complete(td, 1, NULL) < 0)
 			return 1;
 	} else if (ret == FIO_Q_COMPLETED) {
 		if (io_u->error) {
@@ -349,7 +355,7 @@ requeue:
 			return 1;
 		}
 
-		if (io_u_sync_complete(td, io_u) < 0)
+		if (io_u_sync_complete(td, io_u, NULL) < 0)
 			return 1;
 	} else if (ret == FIO_Q_BUSY) {
 		if (td_io_commit(td))
@@ -382,7 +388,7 @@ static void do_verify(struct thread_data *td)
 	 * read from disk.
 	 */
 	for_each_file(td, f, i) {
-		if (!(f->flags & FIO_FILE_OPEN))
+		if (!fio_file_open(f))
 			continue;
 		if (fio_io_sync(td, f))
 			break;
@@ -453,7 +459,7 @@ static void do_verify(struct thread_data *td)
 				requeue_io_u(td, &io_u);
 			} else {
 sync_done:
-				ret = io_u_sync_complete(td, io_u);
+				ret = io_u_sync_complete(td, io_u, NULL);
 				if (ret < 0)
 					break;
 			}
@@ -491,7 +497,7 @@ sync_done:
 				 * and do the verification on them through
 				 * the callback handler
 				 */
-				if (io_u_queued_complete(td, min_events) < 0) {
+				if (io_u_queued_complete(td, min_events, NULL) < 0) {
 					ret = -1;
 					break;
 				}
@@ -505,7 +511,7 @@ sync_done:
 		min_events = td->cur_depth;
 
 		if (min_events)
-			ret = io_u_queued_complete(td, min_events);
+			ret = io_u_queued_complete(td, min_events, NULL);
 	} else
 		cleanup_pending_aio(td);
 
@@ -518,7 +524,6 @@ sync_done:
  */
 static void do_io(struct thread_data *td)
 {
-	unsigned long usec;
 	unsigned int i;
 	int ret = 0;
 
@@ -529,7 +534,7 @@ static void do_io(struct thread_data *td)
 
 	while ((td->this_io_bytes[0] + td->this_io_bytes[1]) < td->o.size) {
 		struct timeval comp_time;
-		long bytes_done = 0;
+		unsigned long bytes_done[2] = { 0, 0 };
 		int min_evts = 0;
 		struct io_u *io_u;
 		int ret2, full;
@@ -591,12 +596,13 @@ static void do_io(struct thread_data *td)
 				requeue_io_u(td, &io_u);
 			} else {
 sync_done:
-				if (should_check_rate(td))
+				if (__should_check_rate(td, 0) ||
+				    __should_check_rate(td, 1))
 					fio_gettime(&comp_time, NULL);
 
-				bytes_done = io_u_sync_complete(td, io_u);
-				if (bytes_done < 0)
-					ret = bytes_done;
+				ret = io_u_sync_complete(td, io_u, bytes_done);
+				if (ret < 0)
+					break;
 			}
 			break;
 		case FIO_Q_QUEUED:
@@ -632,34 +638,25 @@ sync_done:
 			if (full && !min_evts)
 				min_evts = 1;
 
-			if (should_check_rate(td))
+			if (__should_check_rate(td, 0) ||
+			    __should_check_rate(td, 1))
 				fio_gettime(&comp_time, NULL);
 
 			do {
-				ret = io_u_queued_complete(td, min_evts);
-				if (ret <= 0)
+				ret = io_u_queued_complete(td, min_evts, bytes_done);
+				if (ret < 0)
 					break;
 
-				bytes_done += ret;
 			} while (full && (td->cur_depth > td->o.iodepth_low));
 		}
 
 		if (ret < 0)
 			break;
-		if (!bytes_done)
+		if (!(bytes_done[0] + bytes_done[1]))
 			continue;
 
-		/*
-		 * the rate is batched for now, it should work for batches
-		 * of completions except the very first one which may look
-		 * a little bursty
-		 */
-		if (!in_ramp_time(td) && should_check_rate(td)) {
-			usec = utime_since(&td->tv_cache, &comp_time);
-
-			rate_throttle(td, usec, bytes_done);
-
-			if (check_min_rate(td, &comp_time)) {
+		if (!in_ramp_time(td) && should_check_rate(td, bytes_done)) {
+			if (check_min_rate(td, &comp_time, bytes_done)) {
 				if (exitall_on_terminate)
 					terminate_threads(td->groupid);
 				td_verror(td, EIO, "check_min_rate");
@@ -693,13 +690,13 @@ sync_done:
 
 		i = td->cur_depth;
 		if (i)
-			ret = io_u_queued_complete(td, i);
+			ret = io_u_queued_complete(td, i, NULL);
 
 		if (should_fsync(td) && td->o.end_fsync) {
 			td_set_runstate(td, TD_FSYNCING);
 
 			for_each_file(td, f, i) {
-				if (!(f->flags & FIO_FILE_OPEN))
+				if (!fio_file_open(f))
 					continue;
 				fio_io_sync(td, f);
 			}
@@ -733,7 +730,7 @@ static int init_io_u(struct thread_data *td)
 {
 	struct io_u *io_u;
 	unsigned int max_bs;
-	int i, max_units;
+	int cl_align, i, max_units;
 	char *p;
 
 	max_units = td->o.iodepth;
@@ -761,10 +758,20 @@ static int init_io_u(struct thread_data *td)
 	else
 		p = td->orig_buffer;
 
+	cl_align = os_cache_line_size();
+
 	for (i = 0; i < max_units; i++) {
+		void *ptr;
+
 		if (td->terminate)
 			return 1;
-		io_u = malloc(sizeof(*io_u));
+
+		if (posix_memalign(&ptr, cl_align, sizeof(*io_u))) {
+			log_err("fio: posix_memalign=%s\n", strerror(errno));
+			break;
+		}
+
+		io_u = ptr;
 		memset(io_u, 0, sizeof(*io_u));
 		INIT_FLIST_HEAD(&io_u->list);
 
@@ -865,9 +872,8 @@ static void reset_io_counters(struct thread_data *td)
 	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;
-	td->rate_bytes = 0;
-	td->rate_blocks = 0;
-	td->rw_end_set[0] = td->rw_end_set[1] = 0;
+	td->rate_bytes[0] = td->rate_bytes[1] = 0;
+	td->rate_blocks[0] = td->rate_blocks[1] = 0;
 
 	td->last_was_sync = 0;
 
@@ -876,6 +882,11 @@ static void reset_io_counters(struct thread_data *td)
 	 */
 	if (td->o.time_based || td->o.loops)
 		td->nr_done_files = 0;
+
+	/*
+	 * Set the same seed to get repeatable runs
+	 */
+	td_fill_rand_seeds(td);
 }
 
 void reset_all_stats(struct thread_data *td)
@@ -897,24 +908,31 @@ void reset_all_stats(struct thread_data *td)
 	memcpy(&td->start, &tv, sizeof(tv));
 }
 
-static int clear_io_state(struct thread_data *td)
+static void clear_io_state(struct thread_data *td)
 {
 	struct fio_file *f;
 	unsigned int i;
-	int ret;
 
 	reset_io_counters(td);
 
 	close_files(td);
+	for_each_file(td, f, i)
+		fio_file_clear_done(f);
+}
 
-	ret = 0;
-	for_each_file(td, f, i) {
-		f->flags &= ~FIO_FILE_DONE;
-		ret = td_io_open_file(td, f);
-		if (ret)
-			break;
-	}
+static int exec_string(const char *string)
+{
+	int ret, newlen = strlen(string) + 1 + 8;
+	char *str;
 
+	str = malloc(newlen);
+	sprintf(str, "sh -c %s", string);
+
+	ret = system(str);
+	if (ret == -1)
+		log_err("fio: exec of cmd <%s> failed\n", str);
+
+	free(str);
 	return ret;
 }
 
@@ -1003,14 +1021,16 @@ static void *thread_main(void *data)
 	if (td_io_init(td))
 		goto err;
 
-	if (open_files(td))
-		goto err;
-
 	if (init_random_map(td))
 		goto err;
 
 	if (td->o.exec_prerun) {
-		if (system(td->o.exec_prerun) < 0)
+		if (exec_string(td->o.exec_prerun))
+			goto err;
+	}
+
+	if (td->o.pre_read) {
+		if (pre_read_files(td) < 0)
 			goto err;
 	}
 
@@ -1024,12 +1044,12 @@ static void *thread_main(void *data)
 		memcpy(&td->ts.stat_sample_time, &td->start, sizeof(td->start));
 		memcpy(&td->tv_cache, &td->start, sizeof(td->start));
 
-		if (td->o.ratemin)
+		if (td->o.ratemin[0] || td->o.ratemin[1])
 			memcpy(&td->lastrate, &td->ts.stat_sample_time,
 							sizeof(td->lastrate));
 
-		if (clear_state && clear_io_state(td))
-			break;
+		if (clear_state)
+			clear_io_state(td);
 
 		prune_io_piece_log(td);
 
@@ -1038,21 +1058,11 @@ static void *thread_main(void *data)
 		clear_state = 1;
 
 		if (td_read(td) && td->io_bytes[DDIR_READ]) {
-			if (td->rw_end_set[DDIR_READ])
-				elapsed = utime_since(&td->start,
-						      &td->rw_end[DDIR_READ]);
-			else
-				elapsed = utime_since_now(&td->start);
-
+			elapsed = utime_since_now(&td->start);
 			runtime[DDIR_READ] += elapsed;
 		}
 		if (td_write(td) && td->io_bytes[DDIR_WRITE]) {
-			if (td->rw_end_set[DDIR_WRITE])
-				elapsed = utime_since(&td->start,
-						      &td->rw_end[DDIR_WRITE]);
-			else
-				elapsed = utime_since_now(&td->start);
-
+			elapsed = utime_since_now(&td->start);
 			runtime[DDIR_WRITE] += elapsed;
 		}
 
@@ -1064,8 +1074,7 @@ static void *thread_main(void *data)
 		    (td->io_ops->flags & FIO_UNIDIR))
 			continue;
 
-		if (clear_io_state(td))
-			break;
+		clear_io_state(td);
 
 		fio_gettime(&td->start, NULL);
 
@@ -1084,6 +1093,7 @@ static void *thread_main(void *data)
 	td->ts.io_bytes[0] = td->io_bytes[0];
 	td->ts.io_bytes[1] = td->io_bytes[1];
 
+	fio_mutex_down(writeout_mutex);
 	if (td->ts.bw_log) {
 		if (td->o.bw_log_file) {
 			finish_log_named(td, td->ts.bw_log,
@@ -1094,7 +1104,7 @@ static void *thread_main(void *data)
 	if (td->ts.slat_log) {
 		if (td->o.lat_log_file) {
 			finish_log_named(td, td->ts.slat_log,
-						td->o.lat_log_file, "clat");
+						td->o.lat_log_file, "slat");
 		} else
 			finish_log(td, td->ts.slat_log, "slat");
 	}
@@ -1105,10 +1115,9 @@ static void *thread_main(void *data)
 		} else
 			finish_log(td, td->ts.clat_log, "clat");
 	}
-	if (td->o.exec_postrun) {
-		if (system(td->o.exec_postrun) < 0)
-			log_err("fio: postrun %s failed\n", td->o.exec_postrun);
-	}
+	fio_mutex_up(writeout_mutex);
+	if (td->o.exec_postrun)
+		exec_string(td->o.exec_postrun);
 
 	if (exitall_on_terminate)
 		terminate_threads(td->groupid);
@@ -1241,8 +1250,8 @@ static void reap_threads(int *nr_running, int *t_rate, int *m_rate)
 		continue;
 reaped:
 		(*nr_running)--;
-		(*m_rate) -= td->o.ratemin;
-		(*t_rate) -= td->o.rate;
+		(*m_rate) -= (td->o.ratemin[0] + td->o.ratemin[1]);
+		(*t_rate) -= (td->o.rate[0] + td->o.rate[1]);
 		if (!td->pid)
 			pending--;
 
@@ -1362,8 +1371,10 @@ static void run_threads(void)
 			 * its own files. so close them, if we opened them
 			 * for creation
 			 */
-			for_each_file(td, f, i)
-				td_io_close_file(td, f);
+			for_each_file(td, f, i) {
+				if (fio_file_open(f))
+					td_io_close_file(td, f);
+			}
 		}
 
 		init_disk_util(td);
@@ -1497,8 +1508,8 @@ static void run_threads(void)
 				td_set_runstate(td, TD_RUNNING);
 			nr_running++;
 			nr_started--;
-			m_rate += td->o.ratemin;
-			t_rate += td->o.rate;
+			m_rate += td->o.ratemin[0] + td->o.ratemin[1];
+			t_rate += td->o.rate[0] + td->o.rate[1];
 			todo--;
 			fio_mutex_up(td->mutex);
 		}
@@ -1552,6 +1563,7 @@ int main(int argc, char *argv[])
 	}
 
 	startup_mutex = fio_mutex_init(0);
+	writeout_mutex = fio_mutex_init(1);
 
 	set_genesis_time();
 
@@ -1569,5 +1581,6 @@ int main(int argc, char *argv[])
 	}
 
 	fio_mutex_remove(startup_mutex);
+	fio_mutex_remove(writeout_mutex);
 	return exit_value;
 }