X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.c;h=f185055241921a89d56595d478715711fe4bece9;hp=6f122c9bbd0c68692df441d3c1edcf317145771e;hb=4f97e0046deb9729371404a2919d9461939db5d7;hpb=ebac4655dd3624f3296ff83be48e0cdc02852f18

diff --git a/fio.c b/fio.c
index 6f122c9b..f1850552 100644
--- a/fio.c
+++ b/fio.c
@@ -51,28 +51,33 @@ static char run_str[MAX_JOBS + 1];
 int shm_id = 0;
 static LIST_HEAD(disk_list);
 static struct itimerval itimer;
+static struct timeval genesis;
 
 static void update_io_ticks(void);
 static void disk_util_timer_arm(void);
 static void print_thread_status(void);
 
+extern unsigned long long mlock_size;
+
 /*
  * thread life cycle
  */
 enum {
 	TD_NOT_CREATED = 0,
 	TD_CREATED,
+	TD_INITIALIZED,
 	TD_RUNNING,
 	TD_VERIFYING,
 	TD_EXITED,
 	TD_REAPED,
 };
 
-#define should_fsync(td)	(td_write(td) && (!(td)->odirect || (td)->override_sync))
+#define should_fsync(td)	((td_write(td) || td_rw(td)) && (!(td)->odirect || (td)->override_sync))
 
 static sem_t startup_sem;
 
 #define TERMINATE_ALL		(-1)
+#define JOB_START_TIMEOUT	(5 * 1000)
 
 static void terminate_threads(int group_id)
 {
@@ -158,6 +163,11 @@ static inline unsigned long msec_now(struct timeval *s)
 	return s->tv_sec * 1000 + s->tv_usec / 1000;
 }
 
+static unsigned long time_since_now(struct timeval *s)
+{
+	return mtime_since_now(s) / 1000;
+}
+
 static int random_map_free(struct thread_data *td, unsigned long long block)
 {
 	unsigned int idx = RAND_MAP_IDX(td, block);
@@ -187,7 +197,7 @@ static int get_next_free_block(struct thread_data *td, unsigned long long *b)
 
 static void mark_random_map(struct thread_data *td, struct io_u *io_u)
 {
-	unsigned long block = io_u->offset / td->min_bs;
+	unsigned long long block = io_u->offset / (unsigned long long) td->min_bs;
 	unsigned int blocks = 0;
 
 	while (blocks < (io_u->buflen / td->min_bs)) {
@@ -210,55 +220,6 @@ static void mark_random_map(struct thread_data *td, struct io_u *io_u)
 		io_u->buflen = blocks * td->min_bs;
 }
 
-static int get_next_offset(struct thread_data *td, unsigned long long *offset)
-{
-	unsigned long long b, rb;
-	long r;
-
-	if (!td->sequential) {
-		unsigned long max_blocks = td->io_size / td->min_bs;
-		int loops = 50;
-
-		do {
-			lrand48_r(&td->random_state, &r);
-			b = ((max_blocks - 1) * r / (RAND_MAX+1.0));
-			rb = b + (td->file_offset / td->min_bs);
-			loops--;
-		} while (!random_map_free(td, rb) && loops);
-
-		if (!loops) {
-			if (get_next_free_block(td, &b))
-				return 1;
-		}
-	} else
-		b = td->last_bytes / td->min_bs;
-
-	*offset = (b * td->min_bs) + td->file_offset;
-	if (*offset > td->file_size)
-		return 1;
-
-	return 0;
-}
-
-static unsigned int get_next_buflen(struct thread_data *td)
-{
-	unsigned int buflen;
-	long r;
-
-	if (td->min_bs == td->max_bs)
-		buflen = td->min_bs;
-	else {
-		lrand48_r(&td->bsrange_state, &r);
-		buflen = (1 + (double) (td->max_bs - 1) * r / (RAND_MAX + 1.0));
-		buflen = (buflen + td->min_bs - 1) & ~(td->min_bs - 1);
-	}
-
-	if (buflen > td->io_size - td->this_io_bytes[td->ddir])
-		buflen = td->io_size - td->this_io_bytes[td->ddir];
-
-	return buflen;
-}
-
 static inline void add_stat_sample(struct io_stat *is, unsigned long val)
 {
 	if (val > is->max_val)
@@ -321,6 +282,55 @@ static void add_bw_sample(struct thread_data *td, int ddir)
 	td->stat_io_bytes[ddir] = td->this_io_bytes[ddir];
 }
 
+static int get_next_offset(struct thread_data *td, unsigned long long *offset)
+{
+	unsigned long long b, rb;
+	long r;
+
+	if (!td->sequential) {
+		unsigned long long max_blocks = td->io_size / td->min_bs;
+		int loops = 50;
+
+		do {
+			lrand48_r(&td->random_state, &r);
+			b = ((max_blocks - 1) * r / (unsigned long long) (RAND_MAX+1.0));
+			rb = b + (td->file_offset / td->min_bs);
+			loops--;
+		} while (!random_map_free(td, rb) && loops);
+
+		if (!loops) {
+			if (get_next_free_block(td, &b))
+				return 1;
+		}
+	} else
+		b = td->last_pos / td->min_bs;
+
+	*offset = (b * td->min_bs) + td->file_offset;
+	if (*offset > td->real_file_size)
+		return 1;
+
+	return 0;
+}
+
+static unsigned int get_next_buflen(struct thread_data *td)
+{
+	unsigned int buflen;
+	long r;
+
+	if (td->min_bs == td->max_bs)
+		buflen = td->min_bs;
+	else {
+		lrand48_r(&td->bsrange_state, &r);
+		buflen = (1 + (double) (td->max_bs - 1) * r / (RAND_MAX + 1.0));
+		buflen = (buflen + td->min_bs - 1) & ~(td->min_bs - 1);
+	}
+
+	if (buflen > td->io_size - td->this_io_bytes[td->ddir])
+		buflen = td->io_size - td->this_io_bytes[td->ddir];
+
+	return buflen;
+}
+
 /*
  * busy looping version for the last few usec
  */
@@ -535,6 +545,37 @@ static void fill_md5(struct verify_header *hdr, void *p, unsigned int len)
 	memcpy(hdr->md5_digest, md5_ctx.hash, sizeof(md5_ctx.hash));
 }
 
+static int get_rw_ddir(struct thread_data *td)
+{
+	if (td_rw(td)) {
+		struct timeval now;
+		unsigned long elapsed;
+
+		gettimeofday(&now, NULL);
+	 	elapsed = mtime_since_now(&td->rwmix_switch);
+
+		/*
+		 * Check if it's time to seed a new data direction.
+		 */
+		if (elapsed >= td->rwmixcycle) {
+			unsigned long v;
+			long r;
+
+			lrand48_r(&td->random_state, &r);
+			v = 100UL * r / (unsigned long) (RAND_MAX + 1.0);
+			if (v < td->rwmixread)
+				td->rwmix_ddir = DDIR_READ;
+			else
+				td->rwmix_ddir = DDIR_WRITE;
+			memcpy(&td->rwmix_switch, &now, sizeof(now));
+		}
+		return td->rwmix_ddir;
+	} else if (td_read(td))
+		return DDIR_READ;
+	else
+		return DDIR_WRITE;
+}
+
 /*
  * fill body of io_u->buf with random data and add a header with the
  * (eg) sha1sum of that data.
@@ -560,16 +601,76 @@ static void populate_io_u(struct thread_data *td, struct io_u *io_u)
 	memcpy(io_u->buf, &hdr, sizeof(hdr));
 }
 
-static void put_io_u(struct thread_data *td, struct io_u *io_u)
+static int td_io_prep(struct thread_data *td, struct io_u *io_u)
+{
+	if (td->io_prep && td->io_prep(td, io_u))
+		return 1;
+
+	return 0;
+}
+
+void put_io_u(struct thread_data *td, struct io_u *io_u)
 {
 	list_del(&io_u->list);
 	list_add(&io_u->list, &td->io_u_freelist);
 	td->cur_depth--;
 }
 
+static void write_iolog_put(struct thread_data *td, struct io_u *io_u)
+{
+	fprintf(td->iolog_f, "%d,%llu,%u\n", io_u->ddir, io_u->offset, io_u->buflen);
+}
+
+static int read_iolog_get(struct thread_data *td, struct io_u *io_u)
+{
+	struct io_piece *ipo;
+
+	if (!list_empty(&td->io_log_list)) {
+		ipo = list_entry(td->io_log_list.next, struct io_piece, list);
+		list_del(&ipo->list);
+		io_u->offset = ipo->offset;
+		io_u->buflen = ipo->len;
+		io_u->ddir = ipo->ddir;
+		free(ipo);
+		return 0;
+	}
+
+	return 1;
+}
+
+static int fill_io_u(struct thread_data *td, struct io_u *io_u)
+{
+	/*
+	 * If using an iolog, grab next piece if any available.
+	 */
+	if (td->read_iolog)
+		return read_iolog_get(td, io_u);
+
+	/*
+	 * No log, let the seq/rand engine retrieve the next position.
+	 */
+	if (!get_next_offset(td, &io_u->offset)) {
+		io_u->buflen = get_next_buflen(td);
+
+		if (io_u->buflen) {
+			io_u->ddir = get_rw_ddir(td);
+
+			/*
+			 * If using a write iolog, store this entry.
+			 */
+			if (td->write_iolog)
+				write_iolog_put(td, io_u);
+
+			return 0;
+		}
+	}
+
+	return 1;
+}
+
 #define queue_full(td)	(list_empty(&(td)->io_u_freelist))
 
-static struct io_u *__get_io_u(struct thread_data *td)
+struct io_u *__get_io_u(struct thread_data *td)
 {
 	struct io_u *io_u;
 
@@ -585,19 +686,6 @@ static struct io_u *__get_io_u(struct thread_data *td)
 	return io_u;
 }
 
-static int td_io_prep(struct thread_data *td, struct io_u *io_u, int read)
-{
-	if (read)
-		io_u->ddir = DDIR_READ;
-	else
-		io_u->ddir = DDIR_WRITE;
-
-	if (td->io_prep && td->io_prep(td, io_u))
-		return 1;
-
-	return 0;
-}
-
 static struct io_u *get_io_u(struct thread_data *td)
 {
 	struct io_u *io_u;
@@ -606,34 +694,33 @@ static struct io_u *get_io_u(struct thread_data *td)
 	if (!io_u)
 		return NULL;
 
-	if (get_next_offset(td, &io_u->offset)) {
-		put_io_u(td, io_u);
-		return NULL;
+	if (td->zone_bytes >= td->zone_size) {
+		td->zone_bytes = 0;
+		td->last_pos += td->zone_skip;
 	}
 
-	io_u->buflen = get_next_buflen(td);
-	if (!io_u->buflen) {
+	if (fill_io_u(td, io_u)) {
 		put_io_u(td, io_u);
 		return NULL;
 	}
 
-	if (io_u->buflen + io_u->offset > td->file_size)
-		io_u->buflen = td->file_size - io_u->offset;
+	if (io_u->buflen + io_u->offset > td->real_file_size)
+		io_u->buflen = td->real_file_size - io_u->offset;
 
 	if (!io_u->buflen) {
 		put_io_u(td, io_u);
 		return NULL;
 	}
 
-	if (!td->sequential)
+	if (!td->read_iolog && !td->sequential)
 		mark_random_map(td, io_u);
 
-	td->last_bytes += io_u->buflen;
+	td->last_pos += io_u->buflen;
 
 	if (td->verify != VERIFY_NONE)
 		populate_io_u(td, io_u);
 
-	if (td_io_prep(td, io_u, td_read(td))) {
+	if (td_io_prep(td, io_u)) {
 		put_io_u(td, io_u);
 		return NULL;
 	}
@@ -648,8 +735,7 @@ static inline void td_set_runstate(struct thread_data *td, int runstate)
 	td->runstate = runstate;
 }
 
-static int get_next_verify(struct thread_data *td,
-			   unsigned long long *offset, unsigned int *len)
+static int get_next_verify(struct thread_data *td, struct io_u *io_u)
 {
 	struct io_piece *ipo;
 
@@ -659,8 +745,9 @@ static int get_next_verify(struct thread_data *td,
 	ipo = list_entry(td->io_hist_list.next, struct io_piece, list);
 	list_del(&ipo->list);
 
-	*offset = ipo->offset;
-	*len = ipo->len;
+	io_u->offset = ipo->offset;
+	io_u->buflen = ipo->len;
+	io_u->ddir = DDIR_READ;
 	free(ipo);
 	return 0;
 }
@@ -713,6 +800,94 @@ static void log_io_piece(struct thread_data *td, struct io_u *io_u)
 	list_add(&ipo->list, entry);
 }
 
+static void write_iolog_close(struct thread_data *td)
+{
+	fflush(td->iolog_f);
+	fclose(td->iolog_f);
+	free(td->iolog_buf);
+}
+
+static int init_iolog(struct thread_data *td)
+{
+	unsigned long long offset;
+	unsigned int bytes;
+	char *str, *p;
+	FILE *f;
+	int rw, i, reads, writes;
+
+	if (!td->read_iolog && !td->write_iolog)
+		return 0;
+
+	if (td->read_iolog)
+		f = fopen(td->iolog_file, "r");
+	else
+		f = fopen(td->iolog_file, "w");
+
+	if (!f) {
+		perror("fopen iolog");
+		printf("file %s, %d/%d\n", td->iolog_file, td->read_iolog, td->write_iolog);
+		return 1;
+	}
+
+	/*
+	 * That's it for writing, setup a log buffer and we're done.
+	  */
+	if (td->write_iolog) {
+		td->iolog_f = f;
+		td->iolog_buf = malloc(8192);
+		setvbuf(f, td->iolog_buf, _IOFBF, 8192);
+		return 0;
+	}
+
+	/*
+	 * Read in the read iolog and store it, reuse the infrastructure
+	 * for doing verifications.
+	 */
+	str = malloc(4096);
+	reads = writes = i = 0;
+	while ((p = fgets(str, 4096, f)) != NULL) {
+		struct io_piece *ipo;
+
+		if (sscanf(p, "%d,%llu,%u", &rw, &offset, &bytes) != 3) {
+			fprintf(stderr, "bad iolog: %s\n", p);
+			continue;
+		}
+		if (rw == DDIR_READ)
+			reads++;
+		else if (rw == DDIR_WRITE)
+			writes++;
+		else {
+			fprintf(stderr, "bad ddir: %d\n", rw);
+			continue;
+		}
+
+		ipo = malloc(sizeof(*ipo));
+		INIT_LIST_HEAD(&ipo->list);
+		ipo->offset = offset;
+		ipo->len = bytes;
+		if (bytes > td->max_bs)
+			td->max_bs = bytes;
+		ipo->ddir = rw;
+		list_add_tail(&ipo->list, &td->io_log_list);
+		i++;
+	}
+
+	free(str);
+	fclose(f);
+
+	if (!i)
+		return 1;
+
+	if (reads && !writes)
+		td->ddir = DDIR_READ;
+	else if (!reads && writes)
+		td->ddir = DDIR_READ;
+	else
+		td->iomix = 1;
+
+	return 0;
+}
+
 static int sync_td(struct thread_data *td)
 {
 	if (td->io_sync)
@@ -745,21 +920,23 @@ static void io_completed(struct thread_data *td, struct io_u *io_u,
 	gettimeofday(&e, NULL);
 
 	if (!io_u->error) {
-		int idx = io_u->ddir;
+		unsigned int bytes = io_u->buflen - io_u->resid;
+		const int idx = io_u->ddir;
 
 		td->io_blocks[idx]++;
-		td->io_bytes[idx] += (io_u->buflen - io_u->resid);
-		td->this_io_bytes[idx] += (io_u->buflen - io_u->resid);
+		td->io_bytes[idx] += bytes;
+		td->zone_bytes += bytes;
+		td->this_io_bytes[idx] += bytes;
 
 		msec = mtime_since(&io_u->issue_time, &e);
 
-		add_clat_sample(td, io_u->ddir, msec);
-		add_bw_sample(td, io_u->ddir);
+		add_clat_sample(td, idx, msec);
+		add_bw_sample(td, idx);
 
-		if (td_write(td) && io_u->ddir == DDIR_WRITE)
+		if ((td_rw(td) || td_write(td)) && idx == DDIR_WRITE)
 			log_io_piece(td, io_u);
 
-		icd->bytes_done[idx] += (io_u->buflen - io_u->resid);
+		icd->bytes_done[idx] += bytes;
 	} else
 		icd->error = io_u->error;
 }
@@ -854,12 +1031,12 @@ static void do_verify(struct thread_data *td)
 		if (!io_u)
 			break;
 
-		if (get_next_verify(td, &io_u->offset, &io_u->buflen)) {
+		if (get_next_verify(td, io_u)) {
 			put_io_u(td, io_u);
 			break;
 		}
 
-		if (td_io_prep(td, io_u, 1)) {
+		if (td_io_prep(td, io_u)) {
 			put_io_u(td, io_u);
 			break;
 		}
@@ -897,8 +1074,6 @@ static void do_verify(struct thread_data *td)
 			break;
 		}
 
-		td->cur_off = v_io_u->offset + v_io_u->buflen;
-
 		/*
 		 * if we can't submit more io, we need to verify now
 		 */
@@ -996,7 +1171,7 @@ static void do_io(struct thread_data *td)
 	if (td->cur_depth)
 		cleanup_pending_aio(td);
 
-	if (should_fsync(td))
+	if (should_fsync(td) && td->end_fsync)
 		sync_td(td);
 }
 
@@ -1018,6 +1193,8 @@ static int init_io(struct thread_data *td)
 		return fio_posixaio_init(td);
 	else if (td->io_engine == FIO_SGIO)
 		return fio_sgio_init(td);
+	else if (td->io_engine == FIO_SPLICEIO)
+		return fio_spliceio_init(td);
 	else {
 		fprintf(stderr, "bad io_engine %d\n", td->io_engine);
 		return 1;
@@ -1091,10 +1268,6 @@ static int init_io_u(struct thread_data *td)
 		}
 	}
 
-	INIT_LIST_HEAD(&td->io_u_freelist);
-	INIT_LIST_HEAD(&td->io_u_busylist);
-	INIT_LIST_HEAD(&td->io_hist_list);
-
 	p = ALIGN(td->orig_buffer);
 	for (i = 0; i < max_units; i++) {
 		io_u = malloc(sizeof(*io_u));
@@ -1102,6 +1275,7 @@ static int init_io_u(struct thread_data *td)
 		INIT_LIST_HEAD(&io_u->list);
 
 		io_u->buf = p + td->max_bs * i;
+		io_u->index = i;
 		list_add(&io_u->list, &td->io_u_freelist);
 	}
 
@@ -1192,15 +1366,18 @@ static int file_size(struct thread_data *td)
 		return 1;
 	}
 
-	if (!td->file_size)
-		td->file_size = st.st_size;
+	td->real_file_size = st.st_size;
 
+	if (!td->file_size || td->file_size > td->real_file_size)
+		td->file_size = td->real_file_size;
+
+	td->file_size -= td->file_offset;
 	return 0;
 }
 
 static int bdev_size(struct thread_data *td)
 {
-	size_t bytes;
+	unsigned long long bytes;
 	int r;
 
 	r = blockdev_size(td->fd, &bytes);
@@ -1209,39 +1386,47 @@ static int bdev_size(struct thread_data *td)
 		return 1;
 	}
 
+	td->real_file_size = bytes;
+
 	/*
 	 * no extend possibilities, so limit size to device size if too large
 	 */
-	if (!td->file_size || td->file_size > bytes)
-		td->file_size = bytes;
+	if (!td->file_size || td->file_size > td->real_file_size)
+		td->file_size = td->real_file_size;
 
+	td->file_size -= td->file_offset;
 	return 0;
 }
 
 static int get_file_size(struct thread_data *td)
 {
-	int ret;
+	int ret = 0;
 
 	if (td->filetype == FIO_TYPE_FILE)
 		ret = file_size(td);
-	else
+	else if (td->filetype == FIO_TYPE_BD)
 		ret = bdev_size(td);
+	else
+		td->real_file_size = -1;
 
 	if (ret)
 		return ret;
 
-	if (td->file_offset > td->file_size) {
-		fprintf(stderr, "Client%d: offset larger than length (%Lu > %Lu)\n", td->thread_number, td->file_offset, td->file_size);
+	if (td->file_offset > td->real_file_size) {
+		fprintf(stderr, "Client%d: offset extends end (%Lu > %Lu)\n", td->thread_number, td->file_offset, td->real_file_size);
 		return 1;
 	}
 
-	td->io_size = td->file_size - td->file_offset;
+	td->io_size = td->file_size;
 	if (td->io_size == 0) {
 		fprintf(stderr, "Client%d: no io blocks\n", td->thread_number);
 		td_verror(td, EINVAL);
 		return 1;
 	}
 
+	if (!td->zone_size)
+		td->zone_size = td->io_size;
+
 	td->total_io_size = td->io_size * td->loops;
 	return 0;
 }
@@ -1250,14 +1435,15 @@ static int setup_file_mmap(struct thread_data *td)
 {
 	int flags;
 
-	if (td_read(td))
-		flags = PROT_READ;
-	else {
+	if (td_rw(td))
+		flags = PROT_READ | PROT_WRITE;
+	else if (td_write(td)) {
 		flags = PROT_WRITE;
 
 		if (td->verify != VERIFY_NONE)
 			flags |= PROT_READ;
-	}
+	} else
+		flags = PROT_READ;
 
 	td->mmap = mmap(NULL, td->file_size, flags, MAP_SHARED, td->fd, td->file_offset);
 	if (td->mmap == MAP_FAILED) {
@@ -1329,7 +1515,7 @@ static int setup_file(struct thread_data *td)
 		if (create_file(td, td->file_size, 0))
 			return 1;
 	} else if (td->filetype == FIO_TYPE_FILE) {
-		if (st.st_size < td->file_size) {
+		if (st.st_size < (off_t) td->file_size) {
 			if (create_file(td, td->file_size - st.st_size, 1))
 				return 1;
 		}
@@ -1338,9 +1524,7 @@ static int setup_file(struct thread_data *td)
 	if (td->odirect)
 		flags |= O_DIRECT;
 
-	if (td_read(td))
-		td->fd = open(td->file_name, flags | O_RDONLY);
-	else {
+	if (td_write(td) || td_rw(td)) {
 		if (td->filetype == FIO_TYPE_FILE) {
 			if (!td->overwrite)
 				flags |= O_TRUNC;
@@ -1353,6 +1537,13 @@ static int setup_file(struct thread_data *td)
 		flags |= O_RDWR;
 
 		td->fd = open(td->file_name, flags, 0600);
+	} else {
+		if (td->filetype == FIO_TYPE_CHAR)
+			flags |= O_RDWR;
+		else
+			flags |= O_RDONLY;
+
+		td->fd = open(td->file_name, flags);
 	}
 
 	if (td->fd == -1) {
@@ -1581,10 +1772,12 @@ static void init_disk_util(struct thread_data *td)
 		return;
 
 	/*
-	 * if this is inside a partition dir, jump back to parent
+	 * If there's a ../queue/ directory there, we are inside a partition.
+	 * Check if that is the case and jump back. For loop/md/dm etc we
+	 * are already in the right spot.
 	 */
-	sprintf(tmp, "%s/queue", foo);
-	if (stat(tmp, &st)) {
+	sprintf(tmp, "%s/../queue", foo);
+	if (!stat(tmp, &st)) {
 		p = dirname(foo);
 		sprintf(tmp, "%s/queue", p);
 		if (stat(tmp, &st)) {
@@ -1609,10 +1802,10 @@ static void clear_io_state(struct thread_data *td)
 	if (td->io_engine == FIO_SYNCIO)
 		lseek(td->fd, SEEK_SET, 0);
 
-	td->cur_off = 0;
-	td->last_bytes = 0;
+	td->last_pos = 0;
 	td->stat_io_bytes[0] = td->stat_io_bytes[1] = 0;
 	td->this_io_bytes[0] = td->this_io_bytes[1] = 0;
+	td->zone_bytes = 0;
 
 	if (td->file_map)
 		memset(td->file_map, 0, td->num_maps * sizeof(long));
@@ -1636,13 +1829,17 @@ static void update_rusage_stat(struct thread_data *td)
 static void *thread_main(void *data)
 {
 	struct thread_data *td = data;
-	int ret = 1;
 
 	if (!td->use_thread)
 		setsid();
 
 	td->pid = getpid();
 
+	INIT_LIST_HEAD(&td->io_u_freelist);
+	INIT_LIST_HEAD(&td->io_u_busylist);
+	INIT_LIST_HEAD(&td->io_hist_list);
+	INIT_LIST_HEAD(&td->io_log_list);
+
 	if (init_io_u(td))
 		goto err;
 
@@ -1654,6 +1851,9 @@ static void *thread_main(void *data)
 	if (init_io(td))
 		goto err;
 
+	if (init_iolog(td))
+		goto err;
+
 	if (td->ioprio) {
 		if (ioprio_set(IOPRIO_WHO_PROCESS, 0, td->ioprio) == -1) {
 			td_verror(td, errno);
@@ -1661,15 +1861,21 @@ static void *thread_main(void *data)
 		}
 	}
 
+	if (nice(td->nice) < 0) {
+		td_verror(td, errno);
+		goto err;
+	}
+
+	if (init_random_state(td))
+		goto err;
+
+	td_set_runstate(td, TD_INITIALIZED);
 	sem_post(&startup_sem);
 	sem_wait(&td->mutex);
 
 	if (!td->create_serialize && setup_file(td))
 		goto err;
 
-	if (init_random_state(td))
-		goto err;
-
 	gettimeofday(&td->epoch, NULL);
 
 	while (td->loops--) {
@@ -1686,6 +1892,9 @@ static void *thread_main(void *data)
 		do_io(td);
 
 		td->runtime[td->ddir] += mtime_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);
 
 		if (td->error || td->terminate)
@@ -1705,14 +1914,14 @@ static void *thread_main(void *data)
 			break;
 	}
 
-	ret = 0;
-
 	if (td->bw_log)
 		finish_log(td, td->bw_log, "bw");
 	if (td->slat_log)
 		finish_log(td, td->slat_log, "slat");
 	if (td->clat_log)
 		finish_log(td, td->clat_log, "clat");
+	if (td->write_iolog)
+		write_iolog_close(td);
 
 	if (exitall_on_terminate)
 		terminate_threads(td->groupid);
@@ -1726,10 +1935,6 @@ err:
 		munmap(td->mmap, td->file_size);
 	cleanup_io(td);
 	cleanup_io_u(td);
-	if (ret) {
-		sem_post(&startup_sem);
-		sem_wait(&td->mutex);
-	}
 	td_set_runstate(td, TD_EXITED);
 	return NULL;
 
@@ -1776,14 +1981,15 @@ static void show_ddir_status(struct thread_data *td, struct group_run_stats *rs,
 			     int ddir)
 {
 	char *ddir_str[] = { "read ", "write" };
-	unsigned long min, max, bw;
+	unsigned long min, max;
+	unsigned long long bw;
 	double mean, dev;
 
 	if (!td->runtime[ddir])
 		return;
 
 	bw = td->io_bytes[ddir] / td->runtime[ddir];
-	printf("  %s: io=%6luMiB, bw=%6luKiB/s, runt=%6lumsec\n", ddir_str[ddir], td->io_bytes[ddir] >> 20, bw, td->runtime[ddir]);
+	printf("  %s: io=%6lluMiB, bw=%6lluKiB/s, runt=%6lumsec\n", ddir_str[ddir], td->io_bytes[ddir] >> 20, bw, td->runtime[ddir]);
 
 	if (calc_lat(&td->slat_stat[ddir], &min, &max, &mean, &dev))
 		printf("    slat (msec): min=%5lu, max=%5lu, avg=%5.02f, dev=%5.02f\n", min, max, mean, dev);
@@ -1810,7 +2016,8 @@ static void show_thread_status(struct thread_data *td,
 	printf("Client%d (groupid=%d): err=%2d:\n", td->thread_number, td->groupid, td->error);
 
 	show_ddir_status(td, rs, td->ddir);
-	show_ddir_status(td, rs, td->ddir ^ 1);
+	if (td->io_bytes[td->ddir ^ 1])
+		show_ddir_status(td, rs, td->ddir ^ 1);
 
 	if (td->runtime[0] + td->runtime[1]) {
 		double runt = td->runtime[0] + td->runtime[1];
@@ -1840,7 +2047,12 @@ static void check_str_update(struct thread_data *td)
 			c = 'E';
 			break;
 		case TD_RUNNING:
-			if (td_read(td)) {
+			if (td_rw(td)) {
+				if (td->sequential)
+					c = 'M';
+				else
+					c = 'm';
+			} else if (td_read(td)) {
 				if (td->sequential)
 					c = 'R';
 				else
@@ -1858,6 +2070,9 @@ static void check_str_update(struct thread_data *td)
 		case TD_CREATED:
 			c = 'C';
 			break;
+		case TD_INITIALIZED:
+			c = 'I';
+			break;
 		case TD_NOT_CREATED:
 			c = 'P';
 			break;
@@ -1869,13 +2084,109 @@ static void check_str_update(struct thread_data *td)
 	td->old_runstate = td->runstate;
 }
 
+static void eta_to_str(char *str, int eta_sec)
+{
+	unsigned int d, h, m, s;
+	static int always_d, always_h;
+
+	d = h = m = s = 0;
+
+	s = eta_sec % 60;
+	eta_sec /= 60;
+	m = eta_sec % 60;
+	eta_sec /= 60;
+	h = eta_sec % 24;
+	eta_sec /= 24;
+	d = eta_sec;
+
+	if (d || always_d) {
+		always_d = 1;
+		str += sprintf(str, "%02dd:", d);
+	}
+	if (h || always_h) {
+		always_h = 1;
+		str += sprintf(str, "%02dh:", h);
+	}
+
+	str += sprintf(str, "%02dm:", m);
+	str += sprintf(str, "%02ds", s);
+}
+
+static int thread_eta(struct thread_data *td, unsigned long elapsed)
+{
+	unsigned long long bytes_total, bytes_done;
+	unsigned int eta_sec = 0;
+
+	bytes_total = td->total_io_size;
+
+	/*
+	 * if writing, bytes_total will be twice the size. If mixing,
+	 * assume a 50/50 split and thus bytes_total will be 50% larger.
+	 */
+	if (td->verify) {
+		if (td_rw(td))
+			bytes_total = bytes_total * 3 / 2;
+		else
+			bytes_total <<= 1;
+	}
+	if (td->zone_size && td->zone_skip)
+		bytes_total /= (td->zone_skip / td->zone_size);
+
+	if (td->runstate == TD_RUNNING || td->runstate == TD_VERIFYING) {
+		double perc;
+
+		bytes_done = td->io_bytes[DDIR_READ] + td->io_bytes[DDIR_WRITE];
+		perc = (double) bytes_done / (double) bytes_total;
+		if (perc > 1.0)
+			perc = 1.0;
+
+		eta_sec = (elapsed * (1.0 / perc)) - elapsed;
+
+		if (td->timeout && eta_sec > (td->timeout - elapsed))
+			eta_sec = td->timeout - elapsed;
+	} else if (td->runstate == TD_NOT_CREATED || td->runstate == TD_CREATED
+			|| td->runstate == TD_INITIALIZED) {
+		int t_eta = 0, r_eta = 0;
+
+		/*
+		 * We can only guess - assume it'll run the full timeout
+		 * if given, otherwise assume it'll run at the specified rate.
+		 */
+		if (td->timeout)
+			t_eta = td->timeout + td->start_delay - elapsed;
+		if (td->rate) {
+			r_eta = (bytes_total / 1024) / td->rate;
+			r_eta += td->start_delay - elapsed;
+		}
+
+		if (r_eta && t_eta)
+			eta_sec = min(r_eta, t_eta);
+		else if (r_eta)
+			eta_sec = r_eta;
+		else if (t_eta)
+			eta_sec = t_eta;
+		else
+			eta_sec = INT_MAX;
+	} else {
+		/*
+		 * thread is already done
+		 */
+		eta_sec = 0;
+	}
+
+	return eta_sec;
+}
+
 static void print_thread_status(void)
 {
-	unsigned long long bytes_done, bytes_total;
-	int i, nr_running, t_rate, m_rate;
-	double perc;
+	unsigned long elapsed = time_since_now(&genesis);
+	int i, nr_running, t_rate, m_rate, *eta_secs, eta_sec;
+	char eta_str[32];
+	double perc = 0.0;
+
+	eta_secs = malloc(thread_number * sizeof(int));
+	memset(eta_secs, 0, thread_number * sizeof(int));
 
-	bytes_done = bytes_total = 0;
 	nr_running = t_rate = m_rate = 0;
 	for (i = 0; i < thread_number; i++) {
 		struct thread_data *td = &threads[i];
@@ -1886,27 +2197,44 @@ static void print_thread_status(void)
 			m_rate += td->ratemin;
 		}
 
-		bytes_total += td->total_io_size;
-		if (td->verify)
-			bytes_total += td->total_io_size;
-
-		bytes_done += td->io_bytes[DDIR_READ] +td->io_bytes[DDIR_WRITE];
+		if (elapsed >= 3)
+			eta_secs[i] = thread_eta(td, elapsed);
+		else
+			eta_secs[i] = INT_MAX;
 
 		check_str_update(td);
 	}
 
-	perc = 0;
-	if (bytes_total && bytes_done) {
-		perc = (double) 100 * bytes_done / (double) bytes_total;
-		if (perc > 100.0)
-			perc = 100.0;
+	if (exitall_on_terminate)
+		eta_sec = INT_MAX;
+	else
+		eta_sec = 0;
+
+	for (i = 0; i < thread_number; i++) {
+		if (exitall_on_terminate) {
+			if (eta_secs[i] < eta_sec)
+				eta_sec = eta_secs[i];
+		} else {
+			if (eta_secs[i] > eta_sec)
+				eta_sec = eta_secs[i];
+		}
+	}
+
+	if (eta_sec != INT_MAX && elapsed) {
+		perc = (double) elapsed / (double) (elapsed + eta_sec);
+		eta_to_str(eta_str, eta_sec);
 	}
 
-	printf("Threads now running: %d", nr_running);
+	printf("Threads now running (%d)", nr_running);
 	if (m_rate || t_rate)
 		printf(", commitrate %d/%dKiB/sec", t_rate, m_rate);
-	printf(" : [%s] [%3.2f%% done]\r", run_str, perc);
+	if (eta_sec != INT_MAX) {
+		perc *= 100.0;
+		printf(": [%s] [%3.2f%% done] [eta %s]", run_str, perc,eta_str);
+	}
+	printf("\r");
 	fflush(stdout);
+	free(eta_secs);
 }
 
 static void reap_threads(int *nr_running, int *t_rate, int *m_rate)
@@ -1938,12 +2266,60 @@ static void reap_threads(int *nr_running, int *t_rate, int *m_rate)
 	}
 }
 
+static void fio_unpin_memory(void *pinned)
+{
+	if (pinned) {
+		if (munlock(pinned, mlock_size) < 0)
+			perror("munlock");
+		munmap(pinned, mlock_size);
+	}
+}
+
+static void *fio_pin_memory(void)
+{
+	long pagesize, pages;
+	void *ptr;
+
+	if (!mlock_size)
+		return NULL;
+
+	/*
+	 * Don't allow mlock of more than real_mem-128MB
+	 */
+	pagesize = sysconf(_SC_PAGESIZE);
+	pages = sysconf(_SC_PHYS_PAGES);
+	if (pages != -1 && pagesize != -1) {
+		unsigned long long real_mem = pages * pagesize;
+
+		if ((mlock_size + 128 * 1024 * 1024) > real_mem) {
+			mlock_size = real_mem - 128 * 1024 * 1024;
+			printf("fio: limiting mlocked memory to %lluMiB\n",
+							mlock_size >> 20);
+		}
+	}
+
+	ptr = mmap(NULL, mlock_size, PROT_READ | PROT_WRITE, MAP_PRIVATE | OS_MAP_ANON, 0, 0);
+	if (!ptr) {
+		perror("malloc locked mem");
+		return NULL;
+	}
+	if (mlock(ptr, mlock_size) < 0) {
+		munmap(ptr, mlock_size);
+		perror("mlock");
+		return NULL;
+	}
+
+	return ptr;
+}
+
 static void run_threads(void)
 {
-	struct timeval genesis;
 	struct thread_data *td;
 	unsigned long spent;
 	int i, todo, nr_running, m_rate, t_rate, nr_started;
+	void *mlocked_mem;
+
+	mlocked_mem = fio_pin_memory();
 
 	printf("Starting %d thread%s\n", thread_number, thread_number > 1 ? "s" : "");
 	fflush(stdout);
@@ -1980,6 +2356,10 @@ static void run_threads(void)
 	gettimeofday(&genesis, NULL);
 
 	while (todo) {
+		struct thread_data *map[MAX_JOBS];
+		struct timeval this_start;
+		int this_jobs = 0, left;
+
 		/*
 		 * create threads (TD_NOT_CREATED -> TD_CREATED)
 		 */
@@ -2008,9 +2388,13 @@ static void run_threads(void)
 			if (td->stonewall && (nr_started || nr_running))
 				break;
 
+			/*
+			 * Set state to created. Thread will transition
+			 * to TD_INITIALIZED when it's done setting up.
+			 */
 			td_set_runstate(td, TD_CREATED);
+			map[this_jobs++] = td;
 			sem_init(&startup_sem, 0, 1);
-			todo--;
 			nr_started++;
 
 			if (td->use_thread) {
@@ -2029,12 +2413,53 @@ static void run_threads(void)
 		}
 
 		/*
-		 * start created threads (TD_CREATED -> TD_RUNNING)
+		 * Wait for the started threads to transition to
+		 * TD_INITIALIZED.
+		 */
+		printf("fio: Waiting for threads to initialize...\n");
+		gettimeofday(&this_start, NULL);
+		left = this_jobs;
+		while (left) {
+			if (mtime_since_now(&this_start) > JOB_START_TIMEOUT)
+				break;
+
+			usleep(100000);
+
+			for (i = 0; i < this_jobs; i++) {
+				td = map[i];
+				if (!td)
+					continue;
+				if (td->runstate == TD_INITIALIZED) {
+					map[i] = NULL;
+					left--;
+				} else if (td->runstate >= TD_EXITED) {
+					map[i] = NULL;
+					left--;
+					todo--;
+					nr_running++; /* work-around... */
+				}
+			}
+		}
+
+		if (left) {
+			fprintf(stderr, "fio: %d jobs failed to start\n", left);
+			for (i = 0; i < this_jobs; i++) {
+				td = map[i];
+				if (!td)
+					continue;
+				kill(td->pid, SIGTERM);
+			}
+			break;
+		}
+
+		/*
+		 * start created threads (TD_INITIALIZED -> TD_RUNNING).
 		 */
+		printf("fio: Go for launch\n");
 		for (i = 0; i < thread_number; i++) {
 			td = &threads[i];
 
-			if (td->runstate != TD_CREATED)
+			if (td->runstate != TD_INITIALIZED)
 				continue;
 
 			td_set_runstate(td, TD_RUNNING);
@@ -2042,6 +2467,7 @@ static void run_threads(void)
 			nr_started--;
 			m_rate += td->ratemin;
 			t_rate += td->rate;
+			todo--;
 			sem_post(&td->mutex);
 		}
 
@@ -2057,6 +2483,7 @@ static void run_threads(void)
 	}
 
 	update_io_ticks();
+	fio_unpin_memory(mlocked_mem);
 }
 
 static void show_group_stats(struct group_run_stats *rs, int id)
@@ -2064,9 +2491,9 @@ static void show_group_stats(struct group_run_stats *rs, int id)
 	printf("\nRun status group %d (all jobs):\n", id);
 
 	if (rs->max_run[DDIR_READ])
-		printf("   READ: io=%luMiB, aggrb=%lu, minb=%lu, maxb=%lu, mint=%lumsec, maxt=%lumsec\n", rs->io_mb[0], rs->agg[0], rs->min_bw[0], rs->max_bw[0], rs->min_run[0], rs->max_run[0]);
+		printf("   READ: io=%lluMiB, aggrb=%llu, minb=%llu, maxb=%llu, mint=%llumsec, maxt=%llumsec\n", rs->io_mb[0], rs->agg[0], rs->min_bw[0], rs->max_bw[0], rs->min_run[0], rs->max_run[0]);
 	if (rs->max_run[DDIR_WRITE])
-		printf("  WRITE: io=%luMiB, aggrb=%lu, minb=%lu, maxb=%lu, mint=%lumsec, maxt=%lumsec\n", rs->io_mb[1], rs->agg[1], rs->min_bw[1], rs->max_bw[1], rs->min_run[1], rs->max_run[1]);
+		printf("  WRITE: io=%lluMiB, aggrb=%llu, minb=%llu, maxb=%llu, mint=%llumsec, maxt=%llumsec\n", rs->io_mb[1], rs->agg[1], rs->min_bw[1], rs->max_bw[1], rs->min_run[1], rs->max_run[1]);
 }
 
 static void show_disk_util(void)
@@ -2107,7 +2534,7 @@ static void show_run_stats(void)
 	}
 
 	for (i = 0; i < thread_number; i++) {
-		unsigned long rbw, wbw;
+		unsigned long long rbw, wbw;
 
 		td = &threads[i];
 
@@ -2129,9 +2556,9 @@ static void show_run_stats(void)
 
 		rbw = wbw = 0;
 		if (td->runtime[0])
-			rbw = td->io_bytes[0] / td->runtime[0];
+			rbw = td->io_bytes[0] / (unsigned long long) td->runtime[0];
 		if (td->runtime[1])
-			wbw = td->io_bytes[1] / td->runtime[1];
+			wbw = td->io_bytes[1] / (unsigned long long) td->runtime[1];
 
 		if (rbw < rs->min_bw[0])
 			rs->min_bw[0] = rbw;