X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.c;h=dc228a8764f11e667f8bdfd04d854d3fd5d0d15a;hp=5bced2469ceaa217fbb67af80e9e29fc532f7582;hb=53cdc6864f7471b28cc9b40a5314ab43e5b1cb5e;hpb=9cc935a15e2ca54e6bdff4c18bd432dff3fbfaee

diff --git a/fio.c b/fio.c
index 5bced246..dc228a87 100644
--- a/fio.c
+++ b/fio.c
@@ -2,6 +2,7 @@
  * fio - the flexible io tester
  *
  * Copyright (C) 2005 Jens Axboe <axboe@suse.de>
+ * Copyright (C) 2006 Jens Axboe <axboe@kernel.dk>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -43,7 +44,8 @@ int thread_number = 0;
 static char run_str[MAX_JOBS + 1];
 int shm_id = 0;
 static struct timeval genesis;
-static int temp_stall_ts;
+int temp_stall_ts;
+char *fio_inst_prefix = _INST_PREFIX;
 
 static void print_thread_status(void);
 
@@ -103,23 +105,32 @@ static void sig_handler(int sig)
 	}
 }
 
-static int random_map_free(struct thread_data *td, unsigned long long block)
+/*
+ * The ->file_map[] contains a map of blocks we have or have not done io
+ * to yet. Used to make sure we cover the entire range in a fair fashion.
+ */
+static int random_map_free(struct thread_data *td, struct fio_file *f,
+			   unsigned long long block)
 {
-	unsigned int idx = RAND_MAP_IDX(td, block);
-	unsigned int bit = RAND_MAP_BIT(td, block);
+	unsigned int idx = RAND_MAP_IDX(td, f, block);
+	unsigned int bit = RAND_MAP_BIT(td, f, block);
 
-	return (td->file_map[idx] & (1UL << bit)) == 0;
+	return (f->file_map[idx] & (1UL << bit)) == 0;
 }
 
-static int get_next_free_block(struct thread_data *td, unsigned long long *b)
+/*
+ * Return the next free block in the map.
+ */
+static int get_next_free_block(struct thread_data *td, struct fio_file *f,
+			       unsigned long long *b)
 {
 	int i;
 
 	*b = 0;
 	i = 0;
-	while ((*b) * td->min_bs < td->io_size) {
-		if (td->file_map[i] != -1UL) {
-			*b += ffz(td->file_map[i]);
+	while ((*b) * td->min_bs < f->file_size) {
+		if (f->file_map[i] != -1UL) {
+			*b += ffz(f->file_map[i]);
 			return 0;
 		}
 
@@ -130,7 +141,11 @@ static int get_next_free_block(struct thread_data *td, unsigned long long *b)
 	return 1;
 }
 
-static void mark_random_map(struct thread_data *td, struct io_u *io_u)
+/*
+ * Mark a given offset as used in the map.
+ */
+static void mark_random_map(struct thread_data *td, struct fio_file *f,
+			    struct io_u *io_u)
 {
 	unsigned long long block = io_u->offset / (unsigned long long) td->min_bs;
 	unsigned int blocks = 0;
@@ -138,15 +153,15 @@ static void mark_random_map(struct thread_data *td, struct io_u *io_u)
 	while (blocks < (io_u->buflen / td->min_bs)) {
 		unsigned int idx, bit;
 
-		if (!random_map_free(td, block))
+		if (!random_map_free(td, f, block))
 			break;
 
-		idx = RAND_MAP_IDX(td, block);
-		bit = RAND_MAP_BIT(td, block);
+		idx = RAND_MAP_IDX(td, f, block);
+		bit = RAND_MAP_BIT(td, f, block);
 
-		assert(idx < td->num_maps);
+		assert(idx < f->num_maps);
 
-		td->file_map[idx] |= (1UL << bit);
+		f->file_map[idx] |= (1UL << bit);
 		block++;
 		blocks++;
 	}
@@ -155,7 +170,13 @@ 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)
+/*
+ * For random io, generate a random new block and see if it's used. Repeat
+ * until we find a free one. For sequential io, just return the end of
+ * the last io issued.
+ */
+static int get_next_offset(struct thread_data *td, struct fio_file *f,
+			   unsigned long long *offset)
 {
 	unsigned long long b, rb;
 	long r;
@@ -167,19 +188,19 @@ static int get_next_offset(struct thread_data *td, unsigned long long *offset)
 		do {
 			r = os_random_long(&td->random_state);
 			b = ((max_blocks - 1) * r / (unsigned long long) (RAND_MAX+1.0));
-			rb = b + (td->file_offset / td->min_bs);
+			rb = b + (f->file_offset / td->min_bs);
 			loops--;
-		} while (!random_map_free(td, rb) && loops);
+		} while (!random_map_free(td, f, rb) && loops);
 
 		if (!loops) {
-			if (get_next_free_block(td, &b))
+			if (get_next_free_block(td, f, &b))
 				return 1;
 		}
 	} else
-		b = td->last_pos / td->min_bs;
+		b = f->last_pos / td->min_bs;
 
-	*offset = (b * td->min_bs) + td->file_offset;
-	if (*offset > td->real_file_size)
+	*offset = (b * td->min_bs) + f->file_offset;
+	if (*offset > f->file_size)
 		return 1;
 
 	return 0;
@@ -204,6 +225,9 @@ static unsigned int get_next_buflen(struct thread_data *td)
 	return buflen;
 }
 
+/*
+ * Check if we are above the minimum rate given.
+ */
 static int check_min_rate(struct thread_data *td, struct timeval *now)
 {
 	unsigned long spent;
@@ -352,6 +376,11 @@ static void fill_md5(struct verify_header *hdr, void *p, unsigned int len)
 	memcpy(hdr->md5_digest, md5_ctx.hash, sizeof(md5_ctx.hash));
 }
 
+/*
+ * Return the data direction for the next io_u. If the job is a
+ * mixed read/write workload, check the rwmix cycle and switch if
+ * necessary.
+ */
 static int get_rw_ddir(struct thread_data *td)
 {
 	if (td_rw(td)) {
@@ -410,7 +439,7 @@ static void populate_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))
+	if (td->io_ops->prep && td->io_ops->prep(td, io_u))
 		return 1;
 
 	return 0;
@@ -418,12 +447,14 @@ static int td_io_prep(struct thread_data *td, struct io_u *io_u)
 
 void put_io_u(struct thread_data *td, struct io_u *io_u)
 {
+	io_u->file = NULL;
 	list_del(&io_u->list);
 	list_add(&io_u->list, &td->io_u_freelist);
 	td->cur_depth--;
 }
 
-static int fill_io_u(struct thread_data *td, struct io_u *io_u)
+static int fill_io_u(struct thread_data *td, struct fio_file *f,
+		     struct io_u *io_u)
 {
 	/*
 	 * If using an iolog, grab next piece if any available.
@@ -434,7 +465,7 @@ static int fill_io_u(struct thread_data *td, struct io_u *io_u)
 	/*
 	 * No log, let the seq/rand engine retrieve the next position.
 	 */
-	if (!get_next_offset(td, &io_u->offset)) {
+	if (!get_next_offset(td, f, &io_u->offset)) {
 		io_u->buflen = get_next_buflen(td);
 
 		if (io_u->buflen) {
@@ -446,6 +477,7 @@ static int fill_io_u(struct thread_data *td, struct io_u *io_u)
 			if (td->write_iolog)
 				write_iolog_put(td, io_u);
 
+			io_u->file = f;
 			return 0;
 		}
 	}
@@ -472,7 +504,11 @@ struct io_u *__get_io_u(struct thread_data *td)
 	return io_u;
 }
 
-static struct io_u *get_io_u(struct thread_data *td)
+/*
+ * Return an io_u to be processed. Gets a buflen and offset, sets direction,
+ * etc. The returned io_u is fully ready to be prepped and submitted.
+ */
+static struct io_u *get_io_u(struct thread_data *td, struct fio_file *f)
 {
 	struct io_u *io_u;
 
@@ -482,16 +518,16 @@ static struct io_u *get_io_u(struct thread_data *td)
 
 	if (td->zone_bytes >= td->zone_size) {
 		td->zone_bytes = 0;
-		td->last_pos += td->zone_skip;
+		f->last_pos += td->zone_skip;
 	}
 
-	if (fill_io_u(td, io_u)) {
+	if (fill_io_u(td, f, io_u)) {
 		put_io_u(td, io_u);
 		return NULL;
 	}
 
-	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 + io_u->offset > f->file_size)
+		io_u->buflen = f->file_size - io_u->offset;
 
 	if (!io_u->buflen) {
 		put_io_u(td, io_u);
@@ -499,9 +535,9 @@ static struct io_u *get_io_u(struct thread_data *td)
 	}
 
 	if (!td->read_iolog && !td->sequential)
-		mark_random_map(td, io_u);
+		mark_random_map(td, f, io_u);
 
-	td->last_pos += io_u->buflen;
+	f->last_pos += io_u->buflen;
 
 	if (td->verify != VERIFY_NONE)
 		populate_io_u(td, io_u);
@@ -539,10 +575,21 @@ static int get_next_verify(struct thread_data *td, struct io_u *io_u)
 	return 1;
 }
 
-static int sync_td(struct thread_data *td)
+static struct fio_file *get_next_file(struct thread_data *td)
 {
-	if (td->io_sync)
-		return td->io_sync(td);
+	struct fio_file *f = &td->files[td->next_file];
+
+	td->next_file++;
+	if (td->next_file >= td->nr_files)
+		td->next_file = 0;
+
+	return f;
+}
+
+static int td_io_sync(struct thread_data *td, struct fio_file *f)
+{
+	if (td->io_ops->sync)
+		return td->io_ops->sync(td, f);
 
 	return 0;
 }
@@ -550,14 +597,14 @@ static int sync_td(struct thread_data *td)
 static int io_u_getevents(struct thread_data *td, int min, int max,
 			  struct timespec *t)
 {
-	return td->io_getevents(td, min, max, t);
+	return td->io_ops->getevents(td, min, max, t);
 }
 
 static int io_u_queue(struct thread_data *td, struct io_u *io_u)
 {
 	gettimeofday(&io_u->issue_time, NULL);
 
-	return td->io_queue(td, io_u);
+	return td->io_ops->queue(td, io_u);
 }
 
 #define iocb_time(iocb)	((unsigned long) (iocb)->data)
@@ -601,13 +648,17 @@ static void ios_completed(struct thread_data *td,struct io_completion_data *icd)
 	icd->bytes_done[0] = icd->bytes_done[1] = 0;
 
 	for (i = 0; i < icd->nr; i++) {
-		io_u = td->io_event(td, i);
+		io_u = td->io_ops->event(td, i);
 
 		io_completed(td, io_u, icd);
 		put_io_u(td, io_u);
 	}
 }
 
+/*
+ * When job exits, we can cancel the in-flight IO if we are using async
+ * io. Attempt to do so.
+ */
 static void cleanup_pending_aio(struct thread_data *td)
 {
 	struct timespec ts = { .tv_sec = 0, .tv_nsec = 0};
@@ -628,11 +679,11 @@ static void cleanup_pending_aio(struct thread_data *td)
 	/*
 	 * now cancel remaining active events
 	 */
-	if (td->io_cancel) {
+	if (td->io_ops->cancel) {
 		list_for_each_safe(entry, n, &td->io_u_busylist) {
 			io_u = list_entry(entry, struct io_u, list);
 
-			r = td->io_cancel(td, io_u);
+			r = td->io_ops->cancel(td, io_u);
 			if (!r)
 				put_io_u(td, io_u);
 		}
@@ -661,11 +712,16 @@ static int do_io_u_verify(struct thread_data *td, struct io_u **io_u)
 	return ret;
 }
 
+/*
+ * The main verify engine. Runs over the writes we previusly submitted,
+ * reads the blocks back in, and checks the crc/md5 of the data.
+ */
 static void do_verify(struct thread_data *td)
 {
 	struct timeval t;
 	struct io_u *io_u, *v_io_u = NULL;
 	struct io_completion_data icd;
+	struct fio_file *f;
 	int ret;
 
 	td_set_runstate(td, TD_VERIFYING);
@@ -687,6 +743,12 @@ static void do_verify(struct thread_data *td)
 			break;
 		}
 
+		f = get_next_file(td);
+		if (!f)
+			break;
+
+		io_u->file = f;
+
 		if (td_io_prep(td, io_u)) {
 			put_io_u(td, io_u);
 			break;
@@ -713,7 +775,7 @@ static void do_verify(struct thread_data *td)
 			break;
 		}
 
-		v_io_u = td->io_event(td, 0);
+		v_io_u = td->io_ops->event(td, 0);
 		icd.nr = 1;
 		icd.error = 0;
 		io_completed(td, v_io_u, &icd);
@@ -742,7 +804,32 @@ static void do_verify(struct thread_data *td)
 }
 
 /*
- * Main IO worker functions. It retrieves io_u's to process and queues
+ * Not really an io thread, all it does is burn CPU cycles in the specified
+ * manner.
+ */
+static void do_cpuio(struct thread_data *td)
+{
+	struct timeval e;
+	int split = 100 / td->cpuload;
+	int i = 0;
+
+	while (!td->terminate) {
+		gettimeofday(&e, NULL);
+
+		if (runtime_exceeded(td, &e))
+			break;
+
+		if (!(i % split))
+			__usec_sleep(10000);
+		else
+			usec_sleep(td, 10000);
+
+		i++;
+	}
+}
+
+/*
+ * Main IO worker function. It retrieves io_u's to process and queues
  * and reaps them, checking for rate and errors along the way.
  */
 static void do_io(struct thread_data *td)
@@ -750,6 +837,8 @@ static void do_io(struct thread_data *td)
 	struct io_completion_data icd;
 	struct timeval s, e;
 	unsigned long usec;
+	struct fio_file *f;
+	int i;
 
 	td_set_runstate(td, TD_RUNNING);
 
@@ -762,7 +851,11 @@ static void do_io(struct thread_data *td)
 		if (td->terminate)
 			break;
 
-		io_u = get_io_u(td);
+		f = get_next_file(td);
+		if (!f)
+			break;
+
+		io_u = get_io_u(td, f);
 		if (!io_u)
 			break;
 
@@ -822,7 +915,7 @@ static void do_io(struct thread_data *td)
 
 		if (should_fsync(td) && td->fsync_blocks &&
 		    (td->io_blocks[DDIR_WRITE] % td->fsync_blocks) == 0)
-			sync_td(td);
+			td_io_sync(td, f);
 	}
 
 	if (td->cur_depth)
@@ -830,34 +923,17 @@ static void do_io(struct thread_data *td)
 
 	if (should_fsync(td) && td->end_fsync) {
 		td_set_runstate(td, TD_FSYNCING);
-		sync_td(td);
+		for_each_file(td, f, i)
+			td_io_sync(td, f);
 	}
 }
 
-static void cleanup_io(struct thread_data *td)
-{
-	if (td->io_cleanup)
-		td->io_cleanup(td);
-}
-
 static int init_io(struct thread_data *td)
 {
-	if (td->io_engine == FIO_SYNCIO)
-		return fio_syncio_init(td);
-	else if (td->io_engine == FIO_MMAPIO)
-		return fio_mmapio_init(td);
-	else if (td->io_engine == FIO_LIBAIO)
-		return fio_libaio_init(td);
-	else if (td->io_engine == FIO_POSIXAIO)
-		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 {
-		log_err("bad io_engine %d\n", td->io_engine);
-		return 1;
-	}
+	if (td->io_ops->init)
+		return td->io_ops->init(td);
+
+	return 0;
 }
 
 static void cleanup_io_u(struct thread_data *td)
@@ -893,7 +969,10 @@ static int init_io_u(struct thread_data *td)
 	int i, max_units;
 	char *p;
 
-	if (td->io_engine & FIO_SYNCIO)
+	if (td->io_ops->flags & FIO_CPUIO)
+		return 0;
+
+	if (td->io_ops->flags & FIO_SYNCIO)
 		max_units = 1;
 	else
 		max_units = td->iodepth;
@@ -941,284 +1020,6 @@ static int init_io_u(struct thread_data *td)
 	return 0;
 }
 
-static int create_file(struct thread_data *td, unsigned long long size)
-{
-	unsigned long long left;
-	unsigned int bs;
-	char *b;
-	int r;
-
-	/*
-	 * unless specifically asked for overwrite, let normal io extend it
-	 */
-	if (!td->overwrite) {
-		td->real_file_size = size;
-		return 0;
-	}
-
-	if (!size) {
-		log_err("Need size for create\n");
-		td_verror(td, EINVAL);
-		return 1;
-	}
-
-	temp_stall_ts = 1;
-	fprintf(f_out, "%s: Laying out IO file (%LuMiB)\n",td->name,size >> 20);
-
-	td->fd = open(td->file_name, O_WRONLY | O_CREAT | O_TRUNC, 0644);
-	if (td->fd < 0) {
-		td_verror(td, errno);
-		goto done_noclose;
-	}
-
-	if (ftruncate(td->fd, td->file_size) == -1) {
-		td_verror(td, errno);
-		goto done;
-	}
-
-	td->io_size = td->file_size;
-	b = malloc(td->max_bs);
-	memset(b, 0, td->max_bs);
-
-	left = size;
-	while (left && !td->terminate) {
-		bs = td->max_bs;
-		if (bs > left)
-			bs = left;
-
-		r = write(td->fd, b, bs);
-
-		if (r == (int) bs) {
-			left -= bs;
-			continue;
-		} else {
-			if (r < 0)
-				td_verror(td, errno);
-			else
-				td_verror(td, EIO);
-
-			break;
-		}
-	}
-
-	if (td->terminate)
-		unlink(td->file_name);
-	else if (td->create_fsync)
-		fsync(td->fd);
-
-	free(b);
-done:
-	close(td->fd);
-	td->fd = -1;
-done_noclose:
-	temp_stall_ts = 0;
-	return 0;
-}
-
-static int file_size(struct thread_data *td)
-{
-	struct stat st;
-
-	if (td->overwrite) {
-		if (fstat(td->fd, &st) == -1) {
-			td_verror(td, errno);
-			return 1;
-		}
-
-		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)
-{
-	unsigned long long bytes;
-	int r;
-
-	r = blockdev_size(td->fd, &bytes);
-	if (r) {
-		td_verror(td, r);
-		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 > 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 = 0;
-
-	if (td->filetype == FIO_TYPE_FILE)
-		ret = file_size(td);
-	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->real_file_size) {
-		log_err("%s: offset extends end (%Lu > %Lu)\n", td->name, td->file_offset, td->real_file_size);
-		return 1;
-	}
-
-	td->io_size = td->file_size;
-	if (td->io_size == 0) {
-		log_err("%s: no io blocks\n", td->name);
-		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;
-}
-
-static int setup_file_mmap(struct thread_data *td)
-{
-	int flags;
-
-	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) {
-		td->mmap = NULL;
-		td_verror(td, errno);
-		return 1;
-	}
-
-	if (td->invalidate_cache) {
-		if (madvise(td->mmap, td->file_size, MADV_DONTNEED) < 0) {
-			td_verror(td, errno);
-			return 1;
-		}
-	}
-
-	if (td->sequential) {
-		if (madvise(td->mmap, td->file_size, MADV_SEQUENTIAL) < 0) {
-			td_verror(td, errno);
-			return 1;
-		}
-	} else {
-		if (madvise(td->mmap, td->file_size, MADV_RANDOM) < 0) {
-			td_verror(td, errno);
-			return 1;
-		}
-	}
-
-	return 0;
-}
-
-static int setup_file_plain(struct thread_data *td)
-{
-	if (td->invalidate_cache) {
-		if (fadvise(td->fd, td->file_offset, td->file_size, POSIX_FADV_DONTNEED) < 0) {
-			td_verror(td, errno);
-			return 1;
-		}
-	}
-
-	if (td->sequential) {
-		if (fadvise(td->fd, td->file_offset, td->file_size, POSIX_FADV_SEQUENTIAL) < 0) {
-			td_verror(td, errno);
-			return 1;
-		}
-	} else {
-		if (fadvise(td->fd, td->file_offset, td->file_size, POSIX_FADV_RANDOM) < 0) {
-			td_verror(td, errno);
-			return 1;
-		}
-	}
-
-	return 0;
-}
-
-static int setup_file(struct thread_data *td)
-{
-	struct stat st;
-	int flags = 0;
-
-	if (stat(td->file_name, &st) == -1) {
-		if (errno != ENOENT) {
-			td_verror(td, errno);
-			return 1;
-		}
-		if (!td->create_file) {
-			td_verror(td, ENOENT);
-			return 1;
-		}
-		if (create_file(td, td->file_size))
-			return 1;
-	} else if (td->filetype == FIO_TYPE_FILE &&
-		   st.st_size < (off_t) td->file_size) {
-		if (create_file(td, td->file_size))
-			return 1;
-	}
-
-	if (td->odirect)
-		flags |= OS_O_DIRECT;
-
-	if (td_write(td) || td_rw(td)) {
-		if (td->filetype == FIO_TYPE_FILE) {
-			if (!td->overwrite)
-				flags |= O_TRUNC;
-
-			flags |= O_CREAT;
-		}
-		if (td->sync_io)
-			flags |= O_SYNC;
-
-		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) {
-		td_verror(td, errno);
-		return 1;
-	}
-
-	if (get_file_size(td))
-		return 1;
-
-	if (td->io_engine != FIO_MMAPIO)
-		return setup_file_plain(td);
-	else
-		return setup_file_mmap(td);
-}
-
 static int switch_ioscheduler(struct thread_data *td)
 {
 	char tmp[256], tmp2[128];
@@ -1269,18 +1070,27 @@ static int switch_ioscheduler(struct thread_data *td)
 
 static void clear_io_state(struct thread_data *td)
 {
-	if (td->io_engine == FIO_SYNCIO)
-		lseek(td->fd, SEEK_SET, 0);
+	struct fio_file *f;
+	int i;
 
-	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));
+	for_each_file(td, f, i) {
+		f->last_pos = 0;
+		if (td->io_ops->flags & FIO_SYNCIO)
+			lseek(f->fd, SEEK_SET, 0);
+
+		if (f->file_map)
+			memset(f->file_map, 0, f->num_maps * sizeof(long));
+	}
 }
 
+/*
+ * Entry point for the thread based jobs. The process based jobs end up
+ * here as well, after a little setup.
+ */
 static void *thread_main(void *data)
 {
 	struct thread_data *td = data;
@@ -1316,7 +1126,7 @@ static void *thread_main(void *data)
 		}
 	}
 
-	if (nice(td->nice) < 0) {
+	if (nice(td->nice) == -1) {
 		td_verror(td, errno);
 		goto err;
 	}
@@ -1331,7 +1141,7 @@ static void *thread_main(void *data)
 	fio_sem_up(&startup_sem);
 	fio_sem_down(&td->mutex);
 
-	if (!td->create_serialize && setup_file(td))
+	if (!td->create_serialize && setup_files(td))
 		goto err;
 
 	gettimeofday(&td->epoch, NULL);
@@ -1350,7 +1160,10 @@ static void *thread_main(void *data)
 		clear_io_state(td);
 		prune_io_piece_log(td);
 
-		do_io(td);
+		if (td->io_ops->flags & FIO_CPUIO)
+			do_cpuio(td);
+		else
+			do_io(td);
 
 		td->runtime[td->ddir] += mtime_since_now(&td->start);
 		if (td_rw(td) && td->io_bytes[td->ddir ^ 1])
@@ -1390,19 +1203,18 @@ static void *thread_main(void *data)
 		terminate_threads(td->groupid);
 
 err:
-	if (td->fd != -1) {
-		close(td->fd);
-		td->fd = -1;
-	}
-	if (td->mmap)
-		munmap(td->mmap, td->file_size);
-	cleanup_io(td);
+	close_files(td);
+	close_ioengine(td);
 	cleanup_io_u(td);
 	td_set_runstate(td, TD_EXITED);
 	return NULL;
 
 }
 
+/*
+ * We cannot pass the td data into a forked process, so attach the td and
+ * pass it to the thread worker.
+ */
 static void *fork_main(int shmid, int offset)
 {
 	struct thread_data *td;
@@ -1420,6 +1232,9 @@ static void *fork_main(int shmid, int offset)
 	return NULL;
 }
 
+/*
+ * Sets the status of the 'td' in the printed status map.
+ */
 static void check_str_update(struct thread_data *td)
 {
 	char c = run_str[td->thread_number - 1];
@@ -1471,6 +1286,9 @@ static void check_str_update(struct thread_data *td)
 	run_str[td->thread_number - 1] = c;
 }
 
+/*
+ * Convert seconds to a printable string.
+ */
 static void eta_to_str(char *str, int eta_sec)
 {
 	unsigned int d, h, m, s;
@@ -1499,6 +1317,9 @@ static void eta_to_str(char *str, int eta_sec)
 	str += sprintf(str, "%02ds", s);
 }
 
+/*
+ * Best effort calculation of the estimated pending runtime of a job.
+ */
 static int thread_eta(struct thread_data *td, unsigned long elapsed)
 {
 	unsigned long long bytes_total, bytes_done;
@@ -1564,6 +1385,10 @@ static int thread_eta(struct thread_data *td, unsigned long elapsed)
 	return eta_sec;
 }
 
+/*
+ * Print status of the jobs we know about. This includes rate estimates,
+ * ETA, thread state, etc.
+ */
 static void print_thread_status(void)
 {
 	unsigned long elapsed = time_since_now(&genesis);
@@ -1623,7 +1448,7 @@ static void print_thread_status(void)
 	printf("Threads running: %d", nr_running);
 	if (m_rate || t_rate)
 		printf(", commitrate %d/%dKiB/sec", t_rate, m_rate);
-	if (eta_sec != INT_MAX) {
+	if (eta_sec != INT_MAX && nr_running) {
 		perc *= 100.0;
 		printf(": [%s] [%3.2f%% done] [eta %s]", run_str, perc,eta_str);
 	}
@@ -1632,16 +1457,22 @@ static void print_thread_status(void)
 	free(eta_secs);
 }
 
+/*
+ * Run over the job map and reap the threads that have exited, if any.
+ */
 static void reap_threads(int *nr_running, int *t_rate, int *m_rate)
 {
-	int i;
+	int i, cputhreads;
 
 	/*
 	 * reap exited threads (TD_EXITED -> TD_REAPED)
 	 */
-	for (i = 0; i < thread_number; i++) {
+	for (i = 0, cputhreads = 0; i < thread_number; i++) {
 		struct thread_data *td = &threads[i];
 
+		if (td->io_ops->flags & FIO_CPUIO)
+			cputhreads++;
+
 		if (td->runstate != TD_EXITED)
 			continue;
 
@@ -1659,6 +1490,9 @@ static void reap_threads(int *nr_running, int *t_rate, int *m_rate)
 		(*m_rate) -= td->ratemin;
 		(*t_rate) -= td->rate;
 	}
+
+	if (*nr_running == cputhreads)
+		terminate_threads(TERMINATE_ALL);
 }
 
 static void fio_unpin_memory(void *pinned)
@@ -1703,6 +1537,9 @@ static void *fio_pin_memory(void)
 	return ptr;
 }
 
+/*
+ * Main function for kicking off and reaping jobs, as needed.
+ */
 static void run_threads(void)
 {
 	struct thread_data *td;
@@ -1740,7 +1577,7 @@ static void run_threads(void)
 		 * we don't want X number of threads getting their
 		 * client data interspersed on disk
 		 */
-		if (setup_file(td)) {
+		if (setup_files(td)) {
 			td_set_runstate(td, TD_REAPED);
 			todo--;
 		}