[PATCH] fio: show group stats after individual job stats
[disktools.git] / fio.c
diff --git a/fio.c b/fio.c
index 872e77dcc82472b31b241d214923cbd708ad1c70..aa45e3c2f95052c3a64ec48e8d8e4c395fe976e7 100644 (file)
--- a/fio.c
+++ b/fio.c
 #include <errno.h>
 #include <signal.h>
 #include <time.h>
-#include <ctype.h>
-#include <sched.h>
-#include <libaio.h>
 #include <math.h>
-#include <limits.h>
-#include <sys/time.h>
+#include <assert.h>
+#include <pthread.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
-#include <semaphore.h>
 #include <sys/ipc.h>
 #include <sys/shm.h>
+#include <sys/ioctl.h>
 #include <asm/unistd.h>
 
-#define MAX_JOBS       (1024)
-
-/*
- * assume we don't have _get either, if _set isn't defined
- */
-#ifndef __NR_ioprio_set
-
-#if defined(__i386__)
-#define __NR_ioprio_set                289
-#define __NR_ioprio_get                290
-#elif defined(__powerpc__) || defined(__powerpc64__)
-#define __NR_ioprio_set                273
-#define __NR_ioprio_get                274
-#elif defined(__x86_64__)
-#define __NR_ioprio_set                251
-#define __NR_ioprio_get                252
-#elif defined(__ia64__)
-#define __NR_ioprio_set                1274
-#define __NR_ioprio_get                1275
-#elif defined(__alpha__)
-#define __NR_ioprio_set                442
-#define __NR_ioprio_get                443
-#elif defined(__s390x__) || defined(__s390__)
-#define __NR_ioprio_set                282
-#define __NR_ioprio_get                283
-#else
-#error "Unsupported arch"
-#endif
-
-#endif
-
-static int ioprio_set(int which, int who, int ioprio)
-{
-       return syscall(__NR_ioprio_set, which, who, ioprio);
-}
-
-enum {
-       IOPRIO_WHO_PROCESS = 1,
-       IOPRIO_WHO_PGRP,
-       IOPRIO_WHO_USER,
-};
-
-#define IOPRIO_CLASS_SHIFT     13
+#include "fio.h"
 
 #define MASK   (4095)
 
-#define DEF_BS         (4096)
-#define DEF_TIMEOUT    (30)
-#define DEF_RATE_CYCLE (1000)
-#define DEF_ODIRECT    (1)
-#define DEF_SEQUENTIAL (1)
-#define DEF_RAND_REPEAT        (1)
-#define DEF_OVERWRITE  (0)
-#define DEF_CREATE     (1)
-
 #define ALIGN(buf)     (char *) (((unsigned long) (buf) + MASK) & ~(MASK))
 
-static int repeatable = DEF_RAND_REPEAT;
-static int rate_quit = 1;
-
-static int thread_number;
-static char *ini_file;
-
-static int max_jobs = MAX_JOBS;
-
-static int shm_id;
-
-enum {
-       DDIR_READ = 0,
-       DDIR_WRITE,
-};
+int groupid = 0;
+int thread_number = 0;
+char run_str[MAX_JOBS + 1];
+int shm_id = 0;
 
 /*
  * thread life cycle
@@ -118,121 +54,50 @@ enum {
 enum {
        TD_NOT_CREATED = 0,
        TD_CREATED,
-       TD_STARTED,
+       TD_RUNNING,
+       TD_VERIFYING,
        TD_EXITED,
        TD_REAPED,
 };
 
-#define td_read(td)            ((td)->ddir == DDIR_READ)
-#define should_fsync(td)       (!td_read(td) && !(td)->odirect)
+/*
+ * The io unit
+ */
+struct io_u {
+       struct iocb iocb;
+       struct timeval start_time;
+       struct timeval issue_time;
 
-struct thread_data {
-       char file_name[256];
-       int thread_number;
-       int error;
-       int fd;
-       pid_t pid;
        char *buf;
-       volatile int terminate;
-       volatile int runstate;
-       unsigned int ddir;
-       unsigned int ioprio;
-       unsigned int sequential;
-       unsigned int bs;
-       unsigned int odirect;
-       unsigned int delay_sleep;
-       unsigned int fsync_blocks;
-       unsigned int start_delay;
-       unsigned int timeout;
-       unsigned int use_aio;
-       unsigned int create_file;
-       unsigned int overwrite;
-       unsigned long long file_size;
-       unsigned long long file_offset;
-       cpu_set_t cpumask;
-
-       io_context_t *aio_ctx;
-       struct iocb *aio_iocbs;
-       unsigned int aio_depth;
-       unsigned int aio_cur_depth;
-       struct io_event *aio_events;
-       char *aio_iocbs_status;
-
-       unsigned int rate;
-       unsigned int ratemin;
-       unsigned int ratecycle;
-       unsigned long rate_usec_cycle;
-       long rate_pending_usleep;
-       unsigned long rate_blocks;
-       struct timeval lastrate;
-
-       unsigned long max_latency;      /* msec */
-       unsigned long min_latency;      /* msec */
-       unsigned long runtime;          /* sec */
-       unsigned long blocks;
-       unsigned long io_blocks;
-       unsigned long last_block;
-       sem_t mutex;
-       struct drand48_data random_state;
-
-       /*
-        * bandwidth and latency stats
-        */
-       unsigned long stat_time;
-       unsigned long stat_time_sq;
-       unsigned long stat_time_samples;
-       unsigned long stat_io_blocks;
-       unsigned long stat_bw;
-       unsigned long stat_bw_sq;
-       unsigned long stat_bw_samples;
-       struct timeval stat_sample_time;
+       unsigned int buflen;
+       unsigned long long offset;
 
-       struct timeval start;
+       struct list_head list;
 };
 
-static struct thread_data *threads;
-static struct thread_data def_thread;
+#define should_fsync(td)       (td_write(td) && !(td)->odirect)
 
 static sem_t startup_sem;
 
-static void sig_handler(int sig)
+#define TERMINATE_ALL          (-1)
+
+static void terminate_threads(int groupid)
 {
        int i;
 
        for (i = 0; i < thread_number; i++) {
                struct thread_data *td = &threads[i];
 
-               td->terminate = 1;
-               td->start_delay = 0;
+               if (groupid == TERMINATE_ALL || groupid == td->groupid) {
+                       td->terminate = 1;
+                       td->start_delay = 0;
+               }
        }
 }
 
-static int init_random_state(struct thread_data *td)
+static void sig_handler(int sig)
 {
-       unsigned long seed = 123;
-
-       if (td->sequential)
-               return 0;
-
-       if (!repeatable) {
-               int fd = open("/dev/random", O_RDONLY);
-
-               if (fd == -1) {
-                       td->error = errno;
-                       return 1;
-               }
-
-               if (read(fd, &seed, sizeof(seed)) < (int) sizeof(seed)) {
-                       td->error = EIO;
-                       close(fd);
-                       return 1;
-               }
-
-               close(fd);
-       }
-
-       srand48_r(seed, &td->random_state);
-       return 0;
+       terminate_threads(TERMINATE_ALL);
 }
 
 static unsigned long utime_since(struct timeval *s, struct timeval *e)
@@ -251,6 +116,14 @@ static unsigned long utime_since(struct timeval *s, struct timeval *e)
        return sec + usec;
 }
 
+static unsigned long utime_since_now(struct timeval *s)
+{
+       struct timeval t;
+
+       gettimeofday(&t, NULL);
+       return utime_since(s, &t);
+}
+
 static unsigned long mtime_since(struct timeval *s, struct timeval *e)
 {
        double sec, usec;
@@ -281,40 +154,176 @@ static inline unsigned long msec_now(struct timeval *s)
        return s->tv_sec * 1000 + s->tv_usec / 1000;
 }
 
-static unsigned long get_next_offset(struct thread_data *td)
+static int random_map_free(struct thread_data *td, unsigned long long block)
+{
+       unsigned int idx = RAND_MAP_IDX(td, block);
+       unsigned int bit = RAND_MAP_BIT(td, block);
+
+       return (td->file_map[idx] & (1UL << bit)) == 0;
+}
+
+static int get_next_free_block(struct thread_data *td, 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]);
+                       return 0;
+               }
+
+               *b += BLOCKS_PER_MAP;
+               i++;
+       }
+
+       return 1;
+}
+
+static void mark_random_map(struct thread_data *td, struct io_u *io_u)
 {
-       unsigned long b;
+       unsigned long block = io_u->offset / td->min_bs;
+       unsigned int blocks = 0;
+
+       while (blocks < (io_u->buflen / td->min_bs)) {
+               int idx, bit;
+
+               if (!random_map_free(td, block))
+                       break;
+
+               idx = RAND_MAP_IDX(td, block);
+               bit = RAND_MAP_BIT(td, block);
+
+               assert(idx < td->num_maps);
+
+               td->file_map[idx] |= (1UL << bit);
+               block++;
+               blocks++;
+       }
+
+       if ((blocks * td->min_bs) < io_u->buflen)
+               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) {
-               lrand48_r(&td->random_state, &r);
-               b = (1+(double) (td->blocks-1) * r / (RAND_MAX+1.0));
-       } else {
-               b = td->last_block;
-               td->last_block++;
-       }
+               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 b * td->bs + td->file_offset;
+       return 0;
 }
 
-static void add_stat_sample(struct thread_data *td, unsigned long msec)
+static unsigned int get_next_buflen(struct thread_data *td)
 {
-       unsigned long spent;
+       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)
+               buflen = td->io_size - td->this_io_bytes;
 
-       td->stat_time += msec;
-       td->stat_time_sq += msec * msec;
-       td->stat_time_samples++;
+       return buflen;
+}
+
+static inline void add_stat_sample(struct thread_data *td, struct io_stat *is,
+                                  unsigned long val)
+{
+       if (val > is->max_val)
+               is->max_val = val;
+       if (val < is->min_val)
+               is->min_val = val;
+
+       is->val += val;
+       is->val_sq += val * val;
+       is->samples++;
+}
 
-       spent = mtime_since_now(&td->stat_sample_time);
-       if (spent >= 500) {
-               unsigned long rate = ((td->io_blocks - td->stat_io_blocks) * td->bs) / spent;
+static void add_log_sample(struct thread_data *td, struct io_log *log,
+                          unsigned long val)
+{
+       if (log->nr_samples == log->max_samples) {
+               int new_size = sizeof(struct io_sample) * log->max_samples * 2;
 
-               td->stat_bw += rate;
-               td->stat_bw_sq += rate * rate;
-               gettimeofday(&td->stat_sample_time, NULL);
-               td->stat_io_blocks = td->io_blocks;
-               td->stat_bw_samples++;
+               log->log = realloc(log->log, new_size);
+               log->max_samples <<= 1;
        }
+
+       log->log[log->nr_samples].val = val;
+       log->log[log->nr_samples].time = mtime_since_now(&td->start);
+       log->nr_samples++;
+}
+
+static void add_clat_sample(struct thread_data *td, unsigned long msec)
+{
+       add_stat_sample(td, &td->clat_stat, msec);
+
+       if (td->lat_log)
+               add_log_sample(td, td->lat_log, msec);
+}
+
+static void add_slat_sample(struct thread_data *td, unsigned long msec)
+{
+       add_stat_sample(td, &td->slat_stat, msec);
+}
+
+static void add_bw_sample(struct thread_data *td)
+{
+       unsigned long spent = mtime_since_now(&td->stat_sample_time);
+       unsigned long rate;
+
+       if (spent < td->bw_avg_time)
+               return;
+
+       rate = (td->this_io_bytes - td->stat_io_bytes) / spent;
+       add_stat_sample(td, &td->bw_stat, rate);
+
+       if (td->bw_log)
+               add_log_sample(td, td->bw_log, rate);
+
+       gettimeofday(&td->stat_sample_time, NULL);
+       td->stat_io_bytes = td->this_io_bytes;
+}
+
+/*
+ * busy looping version for the last few usec
+ */
+static void __usec_sleep(int usec)
+{
+       struct timeval start;
+
+       gettimeofday(&start, NULL);
+       while (utime_since_now(&start) < usec)
+               nop;
 }
 
 static void usec_sleep(int usec)
@@ -323,22 +332,32 @@ static void usec_sleep(int usec)
        struct timespec rem;
 
        do {
+               if (usec < 5000) {
+                       __usec_sleep(usec);
+                       break;
+               }
                rem.tv_sec = rem.tv_nsec = 0;
                nanosleep(&req, &rem);
                if (!rem.tv_nsec)
                        break;
 
                req.tv_nsec = rem.tv_nsec;
+               usec = rem.tv_nsec * 1000;
        } while (1);
 }
 
-static void rate_throttle(struct thread_data *td, unsigned long time_spent)
+static void rate_throttle(struct thread_data *td, unsigned long time_spent,
+                         unsigned int bytes)
 {
+       unsigned long usec_cycle;
+
        if (!td->rate)
                return;
 
-       if (time_spent < td->rate_usec_cycle) {
-               unsigned long s = td->rate_usec_cycle - time_spent;
+       usec_cycle = td->rate_usec_cycle * (bytes / td->min_bs);
+
+       if (time_spent < usec_cycle) {
+               unsigned long s = usec_cycle - time_spent;
 
                td->rate_pending_usleep += s;
                if (td->rate_pending_usleep >= 100000) {
@@ -346,7 +365,7 @@ static void rate_throttle(struct thread_data *td, unsigned long time_spent)
                        td->rate_pending_usleep = 0;
                }
        } else {
-               long overtime = time_spent - td->rate_usec_cycle;
+               long overtime = time_spent - usec_cycle;
 
                td->rate_pending_usleep -= overtime;
        }
@@ -366,1111 +385,1198 @@ static int check_min_rate(struct thread_data *td, struct timeval *now)
        /*
         * if rate blocks is set, sample is running
         */
-       if (td->rate_blocks) {
+       if (td->rate_bytes) {
                spent = mtime_since(&td->lastrate, now);
                if (spent < td->ratecycle)
                        return 0;
 
-               rate = ((td->io_blocks - td->rate_blocks) * td->bs) / spent;
+               rate = (td->this_io_bytes - td->rate_bytes) / spent;
                if (rate < td->ratemin) {
                        printf("Client%d: min rate %d not met, got %ldKiB/sec\n", td->thread_number, td->ratemin, rate);
                        if (rate_quit)
-                               sig_handler(0);
+                               terminate_threads(td->groupid);
                        return 1;
                }
        }
 
-       td->rate_blocks = td->io_blocks;
+       td->rate_bytes = td->this_io_bytes;
        memcpy(&td->lastrate, now, sizeof(*now));
        return 0;
 }
 
 static inline int runtime_exceeded(struct thread_data *td, struct timeval *t)
 {
+       if (!td->timeout)
+               return 0;
        if (mtime_since(&td->start, t) >= td->timeout * 1000)
                return 1;
 
        return 0;
 }
 
-static void do_sync_io(struct thread_data *td)
+static void fill_random_bytes(struct thread_data *td,
+                             unsigned char *p, unsigned int len)
 {
-       struct timeval s, e;
-       unsigned long blocks, msec, usec;
+       unsigned int todo;
+       double r;
 
-       for (blocks = 0; blocks < td->blocks; blocks++) {
-               off_t offset = get_next_offset(td);
-               int ret;
+       while (len) {
+               drand48_r(&td->verify_state, &r);
 
-               if (td->terminate)
-                       break;
+               /*
+                * lrand48_r seems to be broken and only fill the bottom
+                * 32-bits, even on 64-bit archs with 64-bit longs
+                */
+               todo = sizeof(r);
+               if (todo > len)
+                       todo = len;
 
-               if (lseek(td->fd, offset, SEEK_SET) == -1) {
-                       td->error = errno;
-                       break;
-               }
+               memcpy(p, &r, todo);
 
-               if (td->delay_sleep)
-                       usec_sleep(td->delay_sleep);
+               len -= todo;
+               p += todo;
+       }
+}
 
-               gettimeofday(&s, NULL);
+static void hexdump(void *buffer, int len)
+{
+       unsigned char *p = buffer;
+       int i;
 
-               if (td_read(td))
-                       ret = read(td->fd, td->buf, td->bs);
-               else
-                       ret = write(td->fd, td->buf, td->bs);
+       for (i = 0; i < len; i++)
+               printf("%02x", p[i]);
+       printf("\n");
+}
 
-               if (ret < (int) td->bs) {
-                       if (ret == -1)
-                               td->error = errno;
-                       break;
-               }
+static int verify_io_u(struct io_u *io_u)
+{
+       struct verify_header *hdr = (struct verify_header *) io_u->buf;
+       unsigned char *p = (unsigned char *) io_u->buf;
+       struct md5_ctx md5_ctx;
+       int ret;
 
-               td->io_blocks++;
+       if (hdr->fio_magic != FIO_HDR_MAGIC)
+               return 1;
 
-               if (should_fsync(td) && td->fsync_blocks &&
-                   (td->io_blocks % td->fsync_blocks) == 0)
-                       fsync(td->fd);
+       memset(&md5_ctx, 0, sizeof(md5_ctx));
+       p += sizeof(*hdr);
+       md5_update(&md5_ctx, p, hdr->len - sizeof(*hdr));
 
-               gettimeofday(&e, NULL);
+       ret = memcmp(hdr->md5_digest, md5_ctx.hash, sizeof(md5_ctx.hash));
+       if (ret) {
+               hexdump(hdr->md5_digest, sizeof(hdr->md5_digest));
+               hexdump(md5_ctx.hash, sizeof(md5_ctx.hash));
+       }
 
-               usec = utime_since(&s, &e);
+       return ret;
+}
 
-               rate_throttle(td, usec);
+/*
+ * fill body of io_u->buf with random data and add a header with the
+ * (eg) sha1sum of that data.
+ */
+static void populate_io_u(struct thread_data *td, struct io_u *io_u)
+{
+       struct md5_ctx md5_ctx;
+       struct verify_header hdr;
+       unsigned char *p = (unsigned char *) io_u->buf;
+
+       hdr.fio_magic = FIO_HDR_MAGIC;
+       hdr.len = io_u->buflen;
+       p += sizeof(hdr);
+       fill_random_bytes(td, p, io_u->buflen - sizeof(hdr));
+
+       memset(&md5_ctx, 0, sizeof(md5_ctx));
+       md5_update(&md5_ctx, p, io_u->buflen - sizeof(hdr));
+       memcpy(hdr.md5_digest, md5_ctx.hash, sizeof(md5_ctx.hash));
+       memcpy(io_u->buf, &hdr, sizeof(hdr));
+}
 
-               if (check_min_rate(td, &e)) {
-                       td->error = ENODATA;
-                       break;
-               }
+static 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--;
+}
 
-               msec = usec / 1000;
-               add_stat_sample(td, msec);
+#define queue_full(td) (list_empty(&(td)->io_u_freelist))
 
-               if (msec < td->min_latency)
-                       td->min_latency = msec;
-               if (msec > td->max_latency)
-                       td->max_latency = msec;
+static struct io_u *__get_io_u(struct thread_data *td)
+{
+       struct io_u *io_u;
 
-               if (runtime_exceeded(td, &e))
-                       break;
-       }
+       if (queue_full(td))
+               return NULL;
 
-       if (should_fsync(td))
-               fsync(td->fd);
+       io_u = list_entry(td->io_u_freelist.next, struct io_u, list);
+       list_del(&io_u->list);
+       list_add(&io_u->list, &td->io_u_busylist);
+       td->cur_depth++;
+       return io_u;
 }
 
-static void aio_put_iocb(struct thread_data *td, struct iocb *iocb)
+static struct io_u *get_io_u(struct thread_data *td)
 {
-       long offset = ((long) iocb - (long) td->aio_iocbs)/ sizeof(struct iocb);
+       struct io_u *io_u;
 
-       td->aio_iocbs_status[offset] = 0;
-       td->aio_cur_depth--;
-}
+       io_u = __get_io_u(td);
+       if (!io_u)
+               return NULL;
 
-static struct iocb *aio_get_iocb(struct thread_data *td, struct timeval *t)
-{
-       struct iocb *iocb = NULL;
-       unsigned int i;
+       if (get_next_offset(td, &io_u->offset)) {
+               put_io_u(td, io_u);
+               return NULL;
+       }
 
-       for (i = 0; i < td->aio_depth; i++) {
-               if (td->aio_iocbs_status[i] == 0) {
-                       td->aio_iocbs_status[i] = 1;
-                       iocb = &td->aio_iocbs[i];
-                       break;
-               }
+       io_u->buflen = get_next_buflen(td);
+       if (!io_u->buflen) {
+               put_io_u(td, io_u);
+               return NULL;
        }
 
-       if (iocb) {
-               off_t off = get_next_offset(td);
-               char *p = td->buf + i * td->bs;
+       if (io_u->buflen + io_u->offset > td->file_size)
+               io_u->buflen = td->file_size - io_u->offset;
+
+       if (!td->sequential)
+               mark_random_map(td, io_u);
+
+       td->last_bytes += io_u->buflen;
+
+       if (td->verify)
+               populate_io_u(td, io_u);
 
+       if (td->use_aio) {
                if (td_read(td))
-                       io_prep_pread(iocb, td->fd, p, td->bs, off);
+                       io_prep_pread(&io_u->iocb, td->fd, io_u->buf, io_u->buflen, io_u->offset);
                else
-                       io_prep_pwrite(iocb, td->fd, p, td->bs, off);
-
-               io_set_callback(iocb, (io_callback_t) msec_now(t));
+                       io_prep_pwrite(&io_u->iocb, td->fd, io_u->buf, io_u->buflen, io_u->offset);
        }
 
-       return iocb;
+       gettimeofday(&io_u->start_time, NULL);
+       return io_u;
 }
 
-static int aio_submit(struct thread_data *td, struct iocb *iocb)
+static inline void td_set_runstate(struct thread_data *td, int runstate)
 {
-       int ret;
+       td->old_runstate = td->runstate;
+       td->runstate = runstate;
+}
 
-       do {
-               ret = io_submit(*td->aio_ctx, 1, &iocb);
-               if (ret == 1)
-                       return 0;
+static int get_next_verify(struct thread_data *td,
+                          unsigned long long *offset, unsigned int *len)
+{
+       struct io_piece *ipo;
 
-               if (errno == EINTR)
-                       continue;
-               else if (errno == EAGAIN)
-                       usleep(100);
-               else
-                       break;
-       } while (1);
+       if (list_empty(&td->io_hist_list))
+               return 1;
 
-       return 1;
-}
+       ipo = list_entry(td->io_hist_list.next, struct io_piece, list);
+       list_del(&ipo->list);
 
-#define iocb_time(iocb)        ((unsigned long) (iocb)->data)
+       *offset = ipo->offset;
+       *len = ipo->len;
+       free(ipo);
+       return 0;
+}
 
-static void do_async_io(struct thread_data *td)
+static void prune_io_piece_log(struct thread_data *td)
 {
-       struct timeval s, e;
-       unsigned long blocks, msec, usec;
+       struct io_piece *ipo;
 
-       for (blocks = 0; blocks < td->blocks; blocks++) {
-               struct timespec ts = { .tv_sec = 0, .tv_nsec = 0};
-               struct timespec *timeout;
-               int ret, i, min_evts = 0;
-               struct iocb *iocb;
+       while (!list_empty(&td->io_hist_list)) {
+               ipo = list_entry(td->io_hist_list.next, struct io_piece, list);
 
-               if (td->terminate)
-                       break;
+               list_del(&ipo->list);
+               free(ipo);
+       }
+}
+
+/*
+ * log a succesful write, so we can unwind the log for verify
+ */
+static void log_io_piece(struct thread_data *td, struct io_u *io_u)
+{
+       struct io_piece *ipo = malloc(sizeof(struct io_piece));
+       struct list_head *entry;
 
-               if (td->delay_sleep)
-                       usec_sleep(td->delay_sleep);
+       INIT_LIST_HEAD(&ipo->list);
+       ipo->offset = io_u->offset;
+       ipo->len = io_u->buflen;
 
-               gettimeofday(&s, NULL);
+       /*
+        * for random io where the writes extend the file, it will typically
+        * be laid out with the block scattered as written. it's faster to
+        * read them in in that order again, so don't sort
+        */
+       if (td->sequential || !td->overwrite) {
+               list_add_tail(&ipo->list, &td->io_hist_list);
+               return;
+       }
 
-               iocb = aio_get_iocb(td, &s);
+       /*
+        * for random io, sort the list so verify will run faster
+        */
+       entry = &td->io_hist_list;
+       while ((entry = entry->prev) != &td->io_hist_list) {
+               struct io_piece *__ipo = list_entry(entry, struct io_piece, list);
 
-               ret = aio_submit(td, iocb);
-               if (ret) {
-                       td->error = errno;
+               if (__ipo->offset < ipo->offset)
                        break;
-               }
+       }
 
-               td->aio_cur_depth++;
+       list_add(&ipo->list, entry);
+}
 
-               if (td->aio_cur_depth < td->aio_depth) {
-                       timeout = &ts;
-                       min_evts = 0;
-               } else {
-                       timeout = NULL;
-                       min_evts = 1;
-               }
+static void do_sync_verify(struct thread_data *td)
+{
+       struct timeval t;
+       struct io_u *io_u = NULL;
+       int ret;
 
-               ret = io_getevents(*td->aio_ctx, min_evts, td->aio_cur_depth, td->aio_events, timeout);
-               if (ret < 0) {
-                       td->error = errno;
-                       break;
-               } else if (!ret)
-                       continue;
+       td_set_runstate(td, TD_VERIFYING);
 
-               gettimeofday(&e, NULL);
+       io_u = __get_io_u(td);
 
-               for (i = 0; i < ret; i++) {
-                       struct io_event *ev = td->aio_events + i;
+       if (!td->odirect) {
+               if (fadvise(td->fd, td->file_offset, td->io_size, POSIX_FADV_DONTNEED) < 0) {
+                       td->error = errno;
+                       goto out;
+               }
+       }
 
-                       td->io_blocks++;
+       do {
+               if (td->terminate)
+                       break;
 
-                       iocb = ev->obj;
+               gettimeofday(&t, NULL);
+               if (runtime_exceeded(td, &t))
+                       break;
 
-                       msec = msec_now(&e) - iocb_time(iocb);
-                       add_stat_sample(td, msec);
+               if (get_next_verify(td, &io_u->offset, &io_u->buflen))
+                       break;
 
-                       if (msec < td->min_latency)
-                               td->min_latency = msec;
-                       if (msec > td->max_latency)
-                               td->max_latency = msec;
+               if (td->cur_off != io_u->offset) {
+                       if (lseek(td->fd, io_u->offset, SEEK_SET) == -1) {
+                               td->error = errno;
+                               break;
+                       }
+               }
 
-                       aio_put_iocb(td, iocb);
+               ret = read(td->fd, io_u->buf, io_u->buflen);
+               if (ret < (int) io_u->buflen) {
+                       if (ret == -1) {
+                               td->error = errno;
+                               break;
+                       } else if (!ret)
+                               break;
+                       else
+                               io_u->buflen = ret;
                }
 
-               /*
-                * the rate is batched for now, it should work for batches
-                * of completions except the very first one which may look
-                * a little bursty
-                */
-               usec = utime_since(&s, &e);
+               if (verify_io_u(io_u))
+                       break;
+
+               td->cur_off = io_u->offset + io_u->buflen;
+       } while (1);
+
+out:
+       td_set_runstate(td, TD_RUNNING);
+       put_io_u(td, io_u);
+}
+
+static void do_sync_io(struct thread_data *td)
+{
+       unsigned long msec, usec;
+       struct io_u *io_u = NULL;
+       struct timeval e;
 
-               rate_throttle(td, usec);
+       while (td->this_io_bytes < td->io_size) {
+               int ret;
+
+               if (td->terminate)
+                       break;
+
+               io_u = get_io_u(td);
+               if (!io_u)
+                       break;
+
+               if (td->cur_off != io_u->offset) {
+                       if (lseek(td->fd, io_u->offset, SEEK_SET) == -1) {
+                               td->error = errno;
+                               break;
+                       }
+               }
+
+               if (td_read(td))
+                       ret = read(td->fd, io_u->buf, io_u->buflen);
+               else
+                       ret = write(td->fd, io_u->buf, io_u->buflen);
+
+               if (ret < (int) io_u->buflen) {
+                       if (ret == -1)
+                               td->error = errno;
+                       break;
+               }
+
+               if (td_write(td))
+                       log_io_piece(td, io_u);
+
+               td->io_blocks++;
+               td->io_bytes += io_u->buflen;
+               td->this_io_bytes += io_u->buflen;
+               td->cur_off = io_u->offset + io_u->buflen;
+
+               gettimeofday(&e, NULL);
+
+               usec = utime_since(&io_u->start_time, &e);
+
+               rate_throttle(td, usec, io_u->buflen);
 
                if (check_min_rate(td, &e)) {
                        td->error = ENODATA;
                        break;
                }
 
+               msec = usec / 1000;
+               add_clat_sample(td, msec);
+               add_bw_sample(td);
+
                if (runtime_exceeded(td, &e))
                        break;
+
+               put_io_u(td, io_u);
+               io_u = NULL;
+
+               if (td->thinktime)
+                       usec_sleep(td->thinktime);
+
+               if (should_fsync(td) && td->fsync_blocks &&
+                   (td->io_blocks % td->fsync_blocks) == 0)
+                       fsync(td->fd);
+       }
+
+       if (io_u)
+               put_io_u(td, io_u);
+
+       if (should_fsync(td))
+               fsync(td->fd);
+}
+
+static int io_u_getevents(struct thread_data *td, int min, int max,
+                         struct timespec *t)
+{
+       int r;
+
+       do {
+               r = io_getevents(td->aio_ctx, min, max, td->aio_events, t);
+               if (r != -EAGAIN && r != -EINTR)
+                       break;
+       } while (1);
+
+       return r;
+}
+
+static int io_u_queue(struct thread_data *td, struct io_u *io_u)
+{
+       struct iocb *iocb = &io_u->iocb;
+       int ret;
+
+       do {
+               ret = io_submit(td->aio_ctx, 1, &iocb);
+               if (ret == 1)
+                       return 0;
+               else if (ret == -EAGAIN)
+                       usleep(100);
+               else if (ret == -EINTR)
+                       continue;
+               else
+                       break;
+       } while (1);
+
+       return ret;
+}
+
+#define iocb_time(iocb)        ((unsigned long) (iocb)->data)
+#define ev_to_iou(ev)  (struct io_u *) ((unsigned long) (ev)->obj)
+
+static int ios_completed(struct thread_data *td, int nr)
+{
+       unsigned long msec;
+       struct io_u *io_u;
+       struct timeval e;
+       int i, bytes_done;
+
+       gettimeofday(&e, NULL);
+
+       for (i = 0, bytes_done = 0; i < nr; i++) {
+               io_u = ev_to_iou(td->aio_events + i);
+
+               td->io_blocks++;
+               td->io_bytes += io_u->buflen;
+               td->this_io_bytes += io_u->buflen;
+
+               msec = mtime_since(&io_u->issue_time, &e);
+
+               add_clat_sample(td, msec);
+               add_bw_sample(td);
+
+               if (td_write(td))
+                       log_io_piece(td, io_u);
+
+               bytes_done += io_u->buflen;
+               put_io_u(td, io_u);
        }
+
+       return bytes_done;
 }
 
 static void cleanup_pending_aio(struct thread_data *td)
 {
        struct timespec ts = { .tv_sec = 0, .tv_nsec = 0};
-       unsigned int i;
+       struct list_head *entry, *n;
+       struct io_u *io_u;
        int r;
 
        /*
         * get immediately available events, if any
         */
-       r = io_getevents(*td->aio_ctx, 0, td->aio_cur_depth, td->aio_events, &ts);
-       if (r > 0) {
-               for (i = 0; i < r; i++)
-                       aio_put_iocb(td, &td->aio_iocbs[i]);
-       }
+       r = io_u_getevents(td, 0, td->cur_depth, &ts);
+       if (r > 0)
+               ios_completed(td, r);
 
        /*
         * now cancel remaining active events
         */
-       for (i = 0; i < td->aio_depth; i++) {
-               if (td->aio_iocbs_status[i] == 0)
-                       continue;
+       list_for_each_safe(entry, n, &td->io_u_busylist) {
+               io_u = list_entry(entry, struct io_u, list);
 
-               r = io_cancel(*td->aio_ctx, &td->aio_iocbs[i], td->aio_events);
+               r = io_cancel(td->aio_ctx, &io_u->iocb, td->aio_events);
                if (!r)
-                       aio_put_iocb(td, &td->aio_iocbs[i]);
+                       put_io_u(td, io_u);
        }
 
-       if (td->aio_cur_depth)
-               io_getevents(*td->aio_ctx, td->aio_cur_depth, td->aio_cur_depth, td->aio_events, NULL);
-}
-
-static void cleanup_aio(struct thread_data *td)
-{
-       if (td->aio_cur_depth)
-               cleanup_pending_aio(td);
-
-       if (td->aio_ctx) {
-               io_destroy(*td->aio_ctx);
-               free(td->aio_ctx);
+       if (td->cur_depth) {
+               r = io_u_getevents(td, td->cur_depth, td->cur_depth, NULL);
+               if (r > 0)
+                       ios_completed(td, r);
        }
-       if (td->aio_iocbs)
-               free(td->aio_iocbs);
-       if (td->aio_events)
-               free(td->aio_events);
-       if (td->aio_iocbs_status)
-               free(td->aio_iocbs_status);
 }
 
-static int init_aio(struct thread_data *td)
+static int async_do_verify(struct thread_data *td, struct io_u **io_u)
 {
-       td->aio_ctx = malloc(sizeof(*td->aio_ctx));
+       struct io_u *v_io_u = *io_u;
+       int ret = 0;
 
-       if (io_queue_init(td->aio_depth, td->aio_ctx)) {
-               td->error = errno;
-               return 1;
+       if (v_io_u) {
+               ret = verify_io_u(v_io_u);
+               put_io_u(td, v_io_u);
+               *io_u = NULL;
        }
 
-       td->aio_iocbs = malloc(td->aio_depth * sizeof(struct iocb));
-       td->aio_events = malloc(td->aio_depth * sizeof(struct io_event));
-       td->aio_iocbs_status = malloc(td->aio_depth * sizeof(char));
-       return 0;
+       return ret;
 }
 
-static int create_file(struct thread_data *td)
+static void do_async_verify(struct thread_data *td)
 {
-       unsigned int i;
-       char *b;
+       struct timeval t;
+       struct io_u *io_u, *v_io_u = NULL;
+       int ret;
 
-       if (!td->file_size) {
-               fprintf(stderr, "Need size for create\n");
-               td->error = EINVAL;
-               return 1;
-       }
+       td_set_runstate(td, TD_VERIFYING);
 
-       /*
-        * unless specifically asked for overwrite, let normal io extend it
-        */
-       if (!td_read(td) && !td->overwrite)
-               return 0;
+       do {
+               if (td->terminate)
+                       break;
 
-       td->fd = open(td->file_name, O_WRONLY | O_CREAT | O_TRUNC, 0644);
-       if (td->fd < 0) {
-               td->error = errno;
-               return 1;
-       }
+               gettimeofday(&t, NULL);
+               if (runtime_exceeded(td, &t))
+                       break;
 
-       td->blocks = td->file_size / td->bs;
-       b = malloc(td->bs);
-       memset(b, 0, td->bs);
+               io_u = __get_io_u(td);
+               if (!io_u)
+                       break;
 
-       for (i = 0; i < td->blocks; i++) {
-               int r = write(td->fd, b, td->bs);
+               if (get_next_verify(td, &io_u->offset, &io_u->buflen)) {
+                       put_io_u(td, io_u);
+                       break;
+               }
 
-               if (r == td->bs)
-                       continue;
-               else {
-                       if (r < 0)
-                               td->error = errno;
-                       else
-                               td->error = EIO;
+               io_prep_pread(&io_u->iocb, td->fd, io_u->buf, io_u->buflen, io_u->offset);
+               ret = io_u_queue(td, io_u);
+               if (ret) {
+                       put_io_u(td, io_u);
+                       td->error = ret;
+                       break;
+               }
 
+               /*
+                * we have one pending to verify, do that while the next
+                * we are doing io on the next one
+                */
+               if (async_do_verify(td, &v_io_u))
+                       break;
+
+               ret = io_u_getevents(td, 1, 1, NULL);
+               if (ret != 1) {
+                       if (ret < 0)
+                               td->error = ret;
                        break;
                }
-       }
 
-       fsync(td->fd);
-       close(td->fd);
-       td->fd = -1;
-       free(b);
-       return 0;
-}
+               v_io_u = ev_to_iou(td->aio_events);
 
-static int file_exists(struct thread_data *td)
-{
-       struct stat st;
+               td->cur_off = v_io_u->offset + v_io_u->buflen;
 
-       if (stat(td->file_name, &st) != -1)
-               return 1;
+               /*
+                * if we can't submit more io, we need to verify now
+                */
+               if (queue_full(td) && async_do_verify(td, &v_io_u))
+                       break;
 
-       return errno != ENOENT;
+       } while (1);
+
+       async_do_verify(td, &v_io_u);
+
+       if (td->cur_depth)
+               cleanup_pending_aio(td);
+
+       td_set_runstate(td, TD_RUNNING);
 }
 
-static int setup_file(struct thread_data *td)
+static void do_async_io(struct thread_data *td)
 {
-       struct stat st;
-       int flags = 0;
+       struct timeval s, e;
+       unsigned long usec;
 
-       if (!file_exists(td)) {
-               if (!td->create_file) {
-                       td->error = ENOENT;
-                       return 1;
+       while (td->this_io_bytes < td->io_size) {
+               struct timespec ts = { .tv_sec = 0, .tv_nsec = 0};
+               struct timespec *timeout;
+               int ret, min_evts = 0;
+               struct io_u *io_u;
+               unsigned int bytes_done;
+
+               if (td->terminate)
+                       break;
+
+               io_u = get_io_u(td);
+               if (!io_u)
+                       break;
+
+               memcpy(&s, &io_u->start_time, sizeof(s));
+
+               ret = io_u_queue(td, io_u);
+               if (ret) {
+                       put_io_u(td, io_u);
+                       td->error = ret;
+                       break;
                }
-               if (create_file(td))
-                       return 1;
-       }
 
-       if (td->odirect)
-               flags |= O_DIRECT;
+               gettimeofday(&io_u->issue_time, NULL);
+               add_slat_sample(td, mtime_since(&io_u->start_time, &io_u->issue_time));
+               if (td->cur_depth < td->aio_depth) {
+                       timeout = &ts;
+                       min_evts = 0;
+               } else {
+                       timeout = NULL;
+                       min_evts = 1;
+               }
 
-       if (td_read(td))
-               td->fd = open(td->file_name, flags | O_RDONLY);
-       else {
-               if (!td->overwrite)
-                       flags |= O_TRUNC;
+               ret = io_u_getevents(td, min_evts, td->cur_depth, timeout);
+               if (ret < 0) {
+                       td->error = ret;
+                       break;
+               } else if (!ret)
+                       continue;
 
-               td->fd = open(td->file_name, flags | O_WRONLY | O_CREAT, 0600);
-       }
+               bytes_done = ios_completed(td, ret);
 
-       if (td->fd == -1) {
-               td->error = errno;
-               return 1;
-       }
+               /*
+                * the rate is batched for now, it should work for batches
+                * of completions except the very first one which may look
+                * a little bursty
+                */
+               gettimeofday(&e, NULL);
+               usec = utime_since(&s, &e);
 
-       if (td_read(td)) {
-               if (fstat(td->fd, &st) == -1) {
-                       td->error = errno;
-                       return 1;
+               rate_throttle(td, usec, bytes_done);
+
+               if (check_min_rate(td, &e)) {
+                       td->error = ENODATA;
+                       break;
                }
 
-               if (td->file_size > st.st_size)
-                       st.st_size = td->file_size;
-       } else {
-               if (!td->file_size)
-                       td->file_size = 1024 * 1024 * 1024;
+               if (runtime_exceeded(td, &e))
+                       break;
 
-               st.st_size = td->file_size;
+               if (td->thinktime)
+                       usec_sleep(td->thinktime);
+
+               if (should_fsync(td) && td->fsync_blocks &&
+                   (td->io_blocks % td->fsync_blocks) == 0)
+                       fsync(td->fd);
        }
 
-       td->blocks = (st.st_size - td->file_offset) / td->bs;
-       if (!td->blocks) {
-               fprintf(stderr, "Client%d: no io blocks\n", td->thread_number);
-               td->error = EINVAL;
+       if (td->cur_depth)
+               cleanup_pending_aio(td);
+
+       if (should_fsync(td))
+               fsync(td->fd);
+}
+
+static void cleanup_aio(struct thread_data *td)
+{
+       io_destroy(td->aio_ctx);
+
+       if (td->aio_events)
+               free(td->aio_events);
+}
+
+static int init_aio(struct thread_data *td)
+{
+       if (io_queue_init(td->aio_depth, &td->aio_ctx)) {
+               td->error = errno;
                return 1;
        }
 
+       td->aio_events = malloc(td->aio_depth * sizeof(struct io_event));
        return 0;
 }
 
-static void *thread_main(int shm_id, int offset, char *argv[])
+static void cleanup_io_u(struct thread_data *td)
 {
-       struct thread_data *td;
-       void *data, *ptr = NULL;
-       int ret = 1;
+       struct list_head *entry, *n;
+       struct io_u *io_u;
 
-       setsid();
+       list_for_each_safe(entry, n, &td->io_u_freelist) {
+               io_u = list_entry(entry, struct io_u, list);
 
-       data = shmat(shm_id, NULL, 0);
-       td = data + offset * sizeof(struct thread_data);
-       td->pid = getpid();
+               list_del(&io_u->list);
+               free(io_u);
+       }
 
-       td->fd = -1;
+       if (td->mem_type == MEM_MALLOC)
+               free(td->orig_buffer);
+       else if (td->mem_type == MEM_SHM) {
+               struct shmid_ds sbuf;
 
-       if (sched_setaffinity(td->pid, sizeof(td->cpumask), &td->cpumask) == -1) {
-               td->error = errno;
-               goto err;
+               shmdt(td->orig_buffer);
+               shmctl(td->shm_id, IPC_RMID, &sbuf);
        }
+}
 
-       printf("Client%d (pid=%u) started\n", td->thread_number, td->pid);
+static int init_io_u(struct thread_data *td)
+{
+       struct io_u *io_u;
+       int i, max_units, mem_size;
+       char *p;
 
-       sprintf(argv[0], "fio%d", offset);
+       if (!td->use_aio)
+               max_units = 1;
+       else
+               max_units = td->aio_depth;
 
-       if (td->use_aio && init_aio(td))
-               goto err;
+       mem_size = td->max_bs * max_units + MASK;
 
-       if (init_random_state(td))
-               goto err;
+       if (td->mem_type == MEM_MALLOC)
+               td->orig_buffer = malloc(mem_size);
+       else if (td->mem_type == MEM_SHM) {
+               td->shm_id = shmget(IPC_PRIVATE, mem_size, IPC_CREAT | 0600);
+               if (td->shm_id < 0) {
+                       td->error = errno;
+                       perror("shmget");
+                       return 1;
+               }
 
-       if (td->ioprio) {
-               if (ioprio_set(IOPRIO_WHO_PROCESS, 0, td->ioprio) == -1) {
+               td->orig_buffer = shmat(td->shm_id, NULL, 0);
+               if (td->orig_buffer == (void *) -1) {
                        td->error = errno;
-                       goto err;
+                       perror("shmat");
+                       return 1;
                }
        }
 
-       if (setup_file(td))
-               goto err;
-
-       sem_post(&startup_sem);
-       sem_wait(&td->mutex);
-
-       gettimeofday(&td->start, NULL);
-
-       if (td->ratemin)
-               memcpy(&td->lastrate, &td->start, sizeof(td->start));
+       INIT_LIST_HEAD(&td->io_u_freelist);
+       INIT_LIST_HEAD(&td->io_u_busylist);
+       INIT_LIST_HEAD(&td->io_hist_list);
 
-       memcpy(&td->stat_sample_time, &td->start, sizeof(td->start));
+       p = ALIGN(td->orig_buffer);
+       for (i = 0; i < max_units; i++) {
+               io_u = malloc(sizeof(*io_u));
+               memset(io_u, 0, sizeof(*io_u));
+               INIT_LIST_HEAD(&io_u->list);
 
-       if (!td->use_aio) {
-               ptr = malloc(td->bs + MASK);
-               td->buf = ALIGN(ptr);
-               do_sync_io(td);
-       } else {
-               ptr = malloc(td->bs * td->aio_depth + MASK);
-               td->buf = ALIGN(ptr);
-               do_async_io(td);
+               io_u->buf = p + td->max_bs * i;
+               list_add(&io_u->list, &td->io_u_freelist);
        }
 
-       td->runtime = mtime_since_now(&td->start);
-       ret = 0;
-err:
-       if (td->use_aio)
-               cleanup_aio(td);
-       if (td->fd != -1) {
-               close(td->fd);
-               td->fd = -1;
-       }
-       if (ret) {
-               sem_post(&startup_sem);
-               sem_wait(&td->mutex);
-       }
-       if (ptr)
-               free(ptr);
-       td->runstate = TD_EXITED;
-       shmdt(data);
-       return NULL;
+       return 0;
 }
 
-static void free_shm(void)
+static int create_file(struct thread_data *td)
 {
-       shmdt(threads);
-}
+       unsigned long long left;
+       unsigned int bs;
+       char *b;
+       int r;
 
-static void show_thread_status(struct thread_data *td)
-{
-       int prio, prio_class;
-       unsigned long bw = 0;
-       double n_lat, n_bw, m_lat, m_bw, dev_lat, dev_bw;
+       /*
+        * unless specifically asked for overwrite, let normal io extend it
+        */
+       if (td_write(td) && !td->overwrite)
+               return 0;
 
-       if (!td->io_blocks && !td->error)
-               return;
+       if (!td->file_size) {
+               fprintf(stderr, "Need size for create\n");
+               td->error = EINVAL;
+               return 1;
+       }
 
-       if (td->runtime)
-               bw = (td->io_blocks * td->bs) / td->runtime;
+       printf("Client%d: Laying out IO file\n", td->thread_number);
 
-       prio = td->ioprio & 0xff;
-       prio_class = td->ioprio >> IOPRIO_CLASS_SHIFT;
+       td->fd = open(td->file_name, O_WRONLY | O_CREAT | O_TRUNC, 0644);
+       if (td->fd < 0) {
+               td->error = errno;
+               return 1;
+       }
 
-       n_lat = (double) td->stat_time_samples;
-       n_bw = (double) td->stat_bw_samples;
+       if (ftruncate(td->fd, td->file_size) == -1) {
+               td->error = errno;
+               return 1;
+       }
 
-       m_lat = (double) td->stat_time / n_lat;
-       dev_lat = sqrt(((double) td->stat_time_sq - (m_lat * m_lat) / n_lat) / (n_lat - 1));
-       m_bw = (double) td->stat_bw / n_bw;
-       dev_bw = sqrt(((double) td->stat_bw_sq - (m_bw * m_bw) / n_bw) / (n_bw - 1));
+       td->io_size = td->file_size;
+       b = malloc(td->max_bs);
+       memset(b, 0, td->max_bs);
 
-       printf("Client%d: err=%2d, io=%6luMiB, bw=%6luKiB/sec, latmax=%5lumsec, latavg=%5.02fmsec, latdev=%5.02fmsec, bwavg=%5.02fKiB/sec, bwdev=%5.02fKiB/sec\n", td->thread_number, td->error, td->io_blocks * td->bs >> 20, bw, td->max_latency, m_lat, dev_lat, m_bw, dev_bw);
-}
+       left = td->file_size;
+       while (left) {
+               bs = td->max_bs;
+               if (bs > left)
+                       bs = left;
 
-static int setup_rate(struct thread_data *td)
-{
-       int nr_reads_per_sec;
+               r = write(td->fd, b, bs);
 
-       if (!td->rate)
-               return 0;
+               if (r == (int) bs) {
+                       left -= bs;
+                       continue;
+               } else {
+                       if (r < 0)
+                               td->error = errno;
+                       else
+                               td->error = EIO;
 
-       if (td->rate < td->ratemin) {
-               fprintf(stderr, "min rate larger than nominal rate\n");
-               return -1;
+                       break;
+               }
        }
 
-       nr_reads_per_sec = td->rate * 1024 / td->bs;
-       td->rate_usec_cycle = 1000000 / nr_reads_per_sec;
-       td->rate_pending_usleep = 0;
+       if (td->create_fsync)
+               fsync(td->fd);
+
+       close(td->fd);
+       td->fd = -1;
+       free(b);
        return 0;
 }
 
-static struct thread_data *get_new_job(int global)
+static int file_exists(struct thread_data *td)
 {
-       struct thread_data *td;
-
-       if (global)
-               return &def_thread;
-       if (thread_number >= max_jobs)
-               return NULL;
+       struct stat st;
 
-       td = &threads[thread_number++];
-       memset(td, 0, sizeof(*td));
-
-       td->thread_number = thread_number;
-       td->ddir = def_thread.ddir;
-       td->bs = def_thread.bs;
-       td->odirect = def_thread.odirect;
-       td->ratecycle = def_thread.ratecycle;
-       td->sequential = def_thread.sequential;
-       td->timeout = def_thread.timeout;
-       td->create_file = def_thread.create_file;
-       td->overwrite = def_thread.overwrite;
-       memcpy(&td->cpumask, &def_thread.cpumask, sizeof(td->cpumask));
-
-       return td;
-}
+       if (stat(td->file_name, &st) != -1)
+               return 1;
 
-static void put_job(struct thread_data *td)
-{
-       memset(&threads[td->thread_number - 1], 0, sizeof(*td));
-       thread_number--;
+       return errno != ENOENT;
 }
 
-static int add_job(struct thread_data *td, const char *filename, int prioclass,
-                  int prio)
+static int get_file_size(struct thread_data *td)
 {
-       if (td == &def_thread)
-               return 0;
-
-       strcpy(td->file_name, filename);
-       sem_init(&td->mutex, 1, 0);
-       td->min_latency = 10000000;
-       td->ioprio = (prioclass << IOPRIO_CLASS_SHIFT) | prio;
+       size_t bytes = 0;
+       struct stat st;
 
-       if (td->use_aio && !td->aio_depth)
-               td->aio_depth = 1;
+       if (fstat(td->fd, &st) == -1) {
+               td->error = errno;
+               return 1;
+       }
 
-       if (setup_rate(td))
-               return -1;
+       /*
+        * if block device, get size via BLKGETSIZE64 ioctl. try that as well
+        * if this is a link, fall back to st.st_size if it fails
+        */
+       if (S_ISBLK(st.st_mode) || S_ISLNK(st.st_mode)) {
+               if (ioctl(td->fd, BLKGETSIZE64, &bytes)) {
+                       if (S_ISBLK(st.st_mode)) {
+                               td->error = errno;
+                               return 1;
+                       } else
+                               bytes = st.st_size;
+               }
+       } else
+               bytes = st.st_size;
 
-       printf("Client%d: file=%s, rw=%d, prio=%d/%d, seq=%d, odir=%d, bs=%d, rate=%d, aio=%d, aio_depth=%d\n", td->thread_number, filename, td->ddir, prioclass, prio, td->sequential, td->odirect, td->bs, td->rate, td->use_aio, td->aio_depth);
-       return 0;
-}
+       if (td_read(td)) {
+               if (td->file_size > bytes)
+                       bytes = td->file_size;
+       } else {
+               if (!td->file_size)
+                       td->file_size = 1024 * 1024 * 1024;
 
-static void fill_cpu_mask(cpu_set_t cpumask, int cpu)
-{
-       unsigned int i;
+               bytes = td->file_size;
+       }
 
-       CPU_ZERO(&cpumask);
+       if (td->file_offset > bytes) {
+               fprintf(stderr, "Client%d: offset larger than length\n", td->thread_number);
+               return 1;
+       }
 
-       for (i = 0; i < sizeof(int) * 8; i++) {
-               if ((1 << i) & cpu)
-                       CPU_SET(i, &cpumask);
+       td->io_size = bytes - td->file_offset;
+       if (td->io_size == 0) {
+               fprintf(stderr, "Client%d: no io blocks\n", td->thread_number);
+               td->error = EINVAL;
+               return 1;
        }
+
+       return 0;
 }
 
-static void fill_option(const char *input, char *output)
+static int setup_file(struct thread_data *td)
 {
-       int i;
+       int flags = 0;
 
-       i = 0;
-       while (input[i] != ',' && input[i] != '}' && input[i] != '\0') {
-               output[i] = input[i];
-               i++;
+       if (!file_exists(td)) {
+               if (!td->create_file) {
+                       td->error = ENOENT;
+                       return 1;
+               }
+               if (create_file(td))
+                       return 1;
        }
 
-       output[i] = '\0';
-}
+       if (td->odirect)
+               flags |= O_DIRECT;
 
-/*
- * convert string after '=' into decimal value, noting any size suffix
- */
-static int str_cnv(char *p, unsigned long long *val)
-{
-       unsigned long mult;
-       char *str;
-       int len;
+       if (td_read(td))
+               td->fd = open(td->file_name, flags | O_RDONLY);
+       else {
+               if (!td->overwrite)
+                       flags |= O_TRUNC;
+               if (td->sync_io)
+                       flags |= O_SYNC;
+               if (td->verify)
+                       flags |= O_RDWR;
+               else
+                       flags |= O_WRONLY;
 
-       str = strstr(p, "=");
-       if (!str)
+               td->fd = open(td->file_name, flags | O_CREAT, 0600);
+       }
+
+       if (td->fd == -1) {
+               td->error = errno;
                return 1;
+       }
 
-       str++;
-       len = strlen(str);
-       mult = 1;
+       if (get_file_size(td))
+               return 1;
 
-       switch (str[len - 2]) {
-               case 'k':
-               case 'K':
-                       mult = 1024;
-                       break;
-               case 'm':
-               case 'M':
-                       mult = 1024 * 1024;
-                       break;
-               case 'g':
-               case 'G':
-                       mult = 1024 * 1024 * 1024;
-                       break;
+       if (td_write(td) && ftruncate(td->fd, td->file_size) == -1) {
+               td->error = errno;
+               return 1;
        }
 
-       *val = strtoul(str, NULL, 10);
-       if (*val == ULONG_MAX && errno == ERANGE)
-               return 1;
+       if (td->invalidate_cache) {
+               if (fadvise(td->fd, td->file_offset, td->file_size, POSIX_FADV_DONTNEED) < 0) {
+                       td->error = errno;
+                       return 1;
+               }
+       }
 
-       *val *= mult;
        return 0;
-
 }
 
-/*
- * job key words:
- *
- * file=
- * bs=
- * rw=
- * direct=
- */
-static void parse_jobs_cmd(int argc, char *argv[], int index)
+static void clear_io_state(struct thread_data *td)
 {
-       struct thread_data *td;
-       unsigned int prio, prioclass, cpu;
-       char *string, *filename, *p, *c;
-       int i;
+       if (!td->use_aio)
+               lseek(td->fd, SEEK_SET, 0);
 
-       string = malloc(256);
-       filename = malloc(256);
+       td->cur_off = 0;
+       td->last_bytes = 0;
+       td->stat_io_bytes = 0;
+       td->this_io_bytes = 0;
 
-       for (i = index; i < argc; i++) {
-               p = argv[i];
+       if (td->file_map)
+               memset(td->file_map, 0, td->num_maps * sizeof(long));
+}
 
-               c = strpbrk(p, "{");
-               if (!c)
-                       break;
+static void update_rusage_stat(struct thread_data *td)
+{
+       if (!td->runtime)
+               return;
 
-               filename[0] = 0;
+       getrusage(RUSAGE_SELF, &td->ru_end);
 
-               td = get_new_job(0);
-               if (!td)
-                       break;
+       td->usr_time += mtime_since(&td->ru_start.ru_utime, &td->ru_end.ru_utime);
+       td->sys_time += mtime_since(&td->ru_start.ru_stime, &td->ru_end.ru_stime);
+       td->ctx += td->ru_end.ru_nvcsw + td->ru_end.ru_nivcsw - (td->ru_start.ru_nvcsw + td->ru_start.ru_nivcsw);
 
-               prioclass = 2;
-               prio = 4;
+       
+       memcpy(&td->ru_start, &td->ru_end, sizeof(td->ru_end));
+}
 
-               c = strstr(p, "rw=");
-               if (c) {
-                       c += 3;
-                       if (*c == '0')
-                               td->ddir = DDIR_READ;
-                       else
-                               td->ddir = DDIR_WRITE;
-               }
+static void *thread_main(void *data)
+{
+       struct thread_data *td = data;
+       int ret = 1;
 
-               c = strstr(p, "prio=");
-               if (c) {
-                       c += 5;
-                       prio = *c - '0';
-               }
+       setsid();
+       td->pid = getpid();
+
+       if (init_io_u(td))
+               goto err;
 
-               c = strstr(p, "prioclass=");
-               if (c) {
-                       c += 10;
-                       prioclass = *c - '0';
-               }
+       if (sched_setaffinity(td->pid, sizeof(td->cpumask), &td->cpumask) == -1) {
+               td->error = errno;
+               goto err;
+       }
 
-               c = strstr(p, "file=");
-               if (c) {
-                       c += 5;
-                       fill_option(c, filename);
-               }
+       if (td->use_aio && init_aio(td))
+               goto err;
 
-               c = strstr(p, "bs=");
-               if (c) {
-                       c += 3;
-                       fill_option(c, string);
-                       td->bs = strtoul(string, NULL, 10);
-                       td->bs <<= 10;
+       if (td->ioprio) {
+               if (ioprio_set(IOPRIO_WHO_PROCESS, 0, td->ioprio) == -1) {
+                       td->error = errno;
+                       goto err;
                }
+       }
 
-               c = strstr(p, "direct=");
-               if (c) {
-                       c += 7;
-                       if (*c != '0')
-                               td->odirect = 1;
-                       else
-                               td->odirect = 0;
-               }
+       sem_post(&startup_sem);
+       sem_wait(&td->mutex);
 
-               c = strstr(p, "delay=");
-               if (c) {
-                       c += 6;
-                       fill_option(c, string);
-                       td->delay_sleep = strtoul(string, NULL, 10);
-               }
+       if (!td->create_serialize && setup_file(td))
+               goto err;
 
-               c = strstr(p, "rate=");
-               if (c) {
-                       c += 5;
-                       fill_option(c, string);
-                       td->rate = strtoul(string, NULL, 10);
-               }
+       if (init_random_state(td))
+               goto err;
 
-               c = strstr(p, "ratemin=");
-               if (c) {
-                       c += 8;
-                       fill_option(c, string);
-                       td->ratemin = strtoul(string, NULL, 10);
-               }
+       while (td->loops--) {
+               getrusage(RUSAGE_SELF, &td->ru_start);
+               gettimeofday(&td->start, NULL);
+               memcpy(&td->stat_sample_time, &td->start, sizeof(td->start));
 
-               c = strstr(p, "ratecycle=");
-               if (c) {
-                       c += 10;
-                       fill_option(c, string);
-                       td->ratecycle = strtoul(string, NULL, 10);
-               }
+               if (td->ratemin)
+                       memcpy(&td->lastrate, &td->stat_sample_time, sizeof(td->lastrate));
 
-               c = strstr(p, "cpumask=");
-               if (c) {
-                       c += 8;
-                       fill_option(c, string);
-                       cpu = strtoul(string, NULL, 10);
-                       fill_cpu_mask(td->cpumask, cpu);
-               }
+               clear_io_state(td);
+               prune_io_piece_log(td);
 
-               c = strstr(p, "fsync=");
-               if (c) {
-                       c += 6;
-                       fill_option(c, string);
-                       td->fsync_blocks = strtoul(string, NULL, 10);
-               }
+               if (!td->use_aio)
+                       do_sync_io(td);
+               else
+                       do_async_io(td);
 
-               c = strstr(p, "startdelay=");
-               if (c) {
-                       c += 11;
-                       fill_option(c, string);
-                       td->start_delay = strtoul(string, NULL, 10);
-               }
+               if (td->error)
+                       break;
 
-               c = strstr(p, "timeout=");
-               if (c) {
-                       c += 8;
-                       fill_option(c, string);
-                       td->timeout = strtoul(string, NULL, 10);
-               }
+               td->runtime += mtime_since_now(&td->start);
+               update_rusage_stat(td);
 
-               c = strstr(p, "size=");
-               if (c) {
-                       c += 5;
-                       str_cnv(c, &td->file_size);
-               }
+               if (!td->verify)
+                       continue;
 
-               c = strstr(p, "offset=");
-               if (c) {
-                       c += 7;
-                       str_cnv(c, &td->file_offset);
-               }
+               clear_io_state(td);
 
-               c = strstr(p, "aio_depth=");
-               if (c) {
-                       c += 10;
-                       fill_option(c, string);
-                       td->aio_depth = strtoul(string, NULL, 10);
-               }
+               if (!td->use_aio)
+                       do_sync_verify(td);
+               else
+                       do_async_verify(td);
 
-               c = strstr(p, "aio");
-               if (c)
-                       td->use_aio = 1;
+               if (td->error)
+                       break;
+       }
 
-               c = strstr(p, "create");
-               if (c)
-                       td->create_file = 1;
+       ret = 0;
 
-               c = strstr(p, "overwrite");
-               if (c)
-                       td->overwrite = 1;
+       if (td->bw_log)
+               finish_log(td, td->bw_log, "bw");
+       if (td->lat_log)
+               finish_log(td, td->lat_log, "lat");
 
-               c = strstr(p, "random");
-               if (c)
-                       td->sequential = 0;
-               c = strstr(p, "sequential");
-               if (c)
-                       td->sequential = 1;
+       if (exitall_on_terminate)
+               terminate_threads(td->groupid);
 
-               if (add_job(td, filename, prioclass, prio))
-                       put_job(td);
+err:
+       if (td->fd != -1) {
+               close(td->fd);
+               td->fd = -1;
+       }
+       if (td->use_aio)
+               cleanup_aio(td);
+       cleanup_io_u(td);
+       if (ret) {
+               sem_post(&startup_sem);
+               sem_wait(&td->mutex);
        }
+       td_set_runstate(td, TD_EXITED);
+       return NULL;
 
-       free(string);
-       free(filename);
 }
 
-static int check_strcnv(char *p, char *name, unsigned long long *val)
+static void *fork_main(int shm_id, int offset)
 {
-       if (!strstr(p, name))
-               return 1;
+       struct thread_data *td;
+       void *data;
+
+       data = shmat(shm_id, NULL, 0);
+       if (data == (void *) -1) {
+               perror("shmat");
+               return NULL;
+       }
 
-       return str_cnv(p, val);
+       td = data + offset * sizeof(struct thread_data);
+       thread_main(td);
+       shmdt(data);
+       return NULL;
 }
 
-static int check_int(char *p, char *name, unsigned int *val)
+static int calc_lat(struct io_stat *is, unsigned long *min, unsigned long *max,
+                   double *mean, double *dev)
 {
-       char str[128];
-
-       sprintf(str, "%s=%%d", name);
-       if (sscanf(p, str, val) == 1)
-               return 0;
+       double n;
 
-       sprintf(str, "%s = %%d", name);
-       if (sscanf(p, str, val) == 1)
+       if (is->samples == 0)
                return 0;
 
-       return 1;
-}
-
-static int is_empty_or_comment(char *line)
-{
-       unsigned int i;
-
-       for (i = 0; i < strlen(line); i++) {
-               if (line[i] == ';')
-                       return 1;
-               if (!isspace(line[i]) && !iscntrl(line[i]))
-                       return 0;
-       }
+       *min = is->min_val;
+       *max = is->max_val;
 
+       n = (double) is->samples;
+       *mean = (double) is->val / n;
+       *dev = sqrt(((double) is->val_sq - (*mean * *mean) / n) / (n - 1));
        return 1;
 }
 
-static int parse_jobs_ini(char *file)
+static void show_thread_status(struct thread_data *td,
+                              struct group_run_stats *rs)
 {
-       unsigned int prioclass, prio, cpu, global;
-       struct thread_data *td;
-       char *string, *name;
-       fpos_t off;
-       FILE *f;
-       char *p;
-
-       f = fopen(file, "r");
-       if (!f) {
-               perror("fopen");
-               return 1;
-       }
-
-       string = malloc(4096);
-       name = malloc(256);
+       int prio, prio_class;
+       unsigned long min, max, bw = 0;
+       double mean, dev, usr_cpu, sys_cpu;
 
-       while ((p = fgets(string, 4096, f)) != NULL) {
-               if (is_empty_or_comment(p))
-                       continue;
-               if (sscanf(p, "[%s]", name) != 1)
-                       continue;
+       if (!td->io_bytes && !td->error)
+               return;
 
-               global = !strncmp(name, "global", 6);
+       if (td->runtime)
+               bw = td->io_bytes / td->runtime;
 
-               name[strlen(name) - 1] = '\0';
+       prio = td->ioprio & 0xff;
+       prio_class = td->ioprio >> IOPRIO_CLASS_SHIFT;
 
-               td = get_new_job(global);
-               if (!td)
-                       break;
+       printf("Client%d (g=%d): err=%2d, io=%6luMiB, bw=%6luKiB/s, runt=%6lumsec\n", td->thread_number, td->groupid, td->error, td->io_bytes >> 20, bw, td->runtime);
 
-               prioclass = 2;
-               prio = 4;
+       if (calc_lat(&td->slat_stat, &min, &max, &mean, &dev))
+               printf("  slat (msec): min=%5lu, max=%5lu, avg=%5.02f, dev=%5.02f\n", min, max, mean, dev);
+       if (calc_lat(&td->clat_stat, &min, &max, &mean, &dev))
+               printf("  clat (msec): min=%5lu, max=%5lu, avg=%5.02f, dev=%5.02f\n", min, max, mean, dev);
+       if (calc_lat(&td->bw_stat, &min, &max, &mean, &dev)) {
+               double p_of_agg;
 
-               fgetpos(f, &off);
-               while ((p = fgets(string, 4096, f)) != NULL) {
-                       if (is_empty_or_comment(p))
-                               continue;
-                       if (strstr(p, "["))
-                               break;
-                       if (!check_int(p, "bs", &td->bs)) {
-                               td->bs <<= 10;
-                               fgetpos(f, &off);
-                               continue;
-                       }
-                       if (!check_int(p, "rw", &td->ddir)) {
-                               fgetpos(f, &off);
-                               continue;
-                       }
-                       if (!check_int(p, "prio", &prio)) {
-                               fgetpos(f, &off);
-                               continue;
-                       }
-                       if (!check_int(p, "prioclass", &prioclass)) {
-                               fgetpos(f, &off);
-                               continue;
-                       }
-                       if (!check_int(p, "direct", &td->odirect)) {
-                               fgetpos(f, &off);
-                               continue;
-                       }
-                       if (!check_int(p, "rate", &td->rate)) {
-                               fgetpos(f, &off);
-                               continue;
-                       }
-                       if (!check_int(p, "ratemin", &td->ratemin)) {
-                               fgetpos(f, &off);
-                               continue;
-                       }
-                       if (!check_int(p, "ratecycle", &td->ratecycle)) {
-                               fgetpos(f, &off);
-                               continue;
-                       }
-                       if (!check_int(p, "delay", &td->delay_sleep)) {
-                               fgetpos(f, &off);
-                               continue;
-                       }
-                       if (!check_int(p, "cpumask", &cpu)) {
-                               fill_cpu_mask(td->cpumask, cpu);
-                               fgetpos(f, &off);
-                               continue;
-                       }
-                       if (!check_int(p, "fsync", &td->fsync_blocks)) {
-                               fgetpos(f, &off);
-                               continue;
-                       }
-                       if (!check_int(p, "startdelay", &td->start_delay)) {
-                               fgetpos(f, &off);
-                               continue;
-                       }
-                       if (!check_int(p, "timeout", &td->timeout)) {
-                               fgetpos(f, &off);
-                               continue;
-                       }
-                       if (!check_int(p, "aio_depth", &td->aio_depth)) {
-                               fgetpos(f, &off);
-                               continue;
-                       }
-                       if (!check_strcnv(p, "size", &td->file_size)) {
-                               fgetpos(f, &off);
-                               continue;
-                       }
-                       if (!check_strcnv(p, "offset", &td->file_offset)) {
-                               fgetpos(f, &off);
-                               continue;
-                       }
-                       if (!strncmp(p, "sequential", 10)) {
-                               td->sequential = 1;
-                               fgetpos(f, &off);
-                               continue;
-                       }
-                       if (!strncmp(p, "random", 6)) {
-                               td->sequential = 0;
-                               fgetpos(f, &off);
-                               continue;
-                       }
-                       if (!strncmp(p, "aio", 3)) {
-                               td->use_aio = 1;
-                               fgetpos(f, &off);
-                               continue;
-                       }
-                       if (!strncmp(p, "create", 6)) {
-                               td->create_file = 1;
-                               fgetpos(f, &off);
-                               continue;
-                       }
-                       if (!strncmp(p, "overwrite", 9)) {
-                               td->overwrite = 1;
-                               fgetpos(f, &off);
-                               continue;
-                       }
-                       printf("Client%d: bad option %s\n",td->thread_number,p);
-               }
-               fsetpos(f, &off);
+               p_of_agg = mean * 100 / (double) rs->agg[td->ddir];
+               printf("  bw (KiB/s) : min=%5lu, max=%5lu, per=%3.2f%%, avg=%5.02f, dev=%5.02f\n", min, max, p_of_agg, mean, dev);
+       }
 
-               if (add_job(td, name, prioclass, prio))
-                       put_job(td);
+       if (td->runtime) {
+               usr_cpu = (double) td->usr_time * 100 / (double) td->runtime;
+               sys_cpu = (double) td->sys_time * 100 / (double) td->runtime;
+       } else {
+               usr_cpu = 0;
+               sys_cpu = 0;
        }
 
-       free(string);
-       free(name);
-       fclose(f);
-       return 0;
+       printf("  cpu        : usr=%3.2f%%, sys=%3.2f%%, ctx=%lu\n", usr_cpu, sys_cpu, td->ctx);
 }
 
-static int parse_options(int argc, char *argv[])
+static void print_thread_status(struct thread_data *td, int nr_running,
+                               int t_rate, int m_rate)
 {
-       int i;
+       printf("Threads now running: %d", nr_running);
+       if (m_rate || t_rate)
+               printf(", commitrate %d/%dKiB/sec", t_rate, m_rate);
+       printf(" : [%s]\r", run_str);
+       fflush(stdout);
+}
 
-       for (i = 1; i < argc; i++) {
-               char *parm = argv[i];
+static void check_str_update(struct thread_data *td, int n, int t, int m)
+{
+       char c = run_str[td->thread_number - 1];
 
-               if (parm[0] != '-')
-                       break;
+       if (td->runstate == td->old_runstate)
+               return;
 
-               parm++;
-               switch (*parm) {
-                       case 's':
-                               parm++;
-                               def_thread.sequential = !!atoi(parm);
-                               break;
-                       case 'b':
-                               parm++;
-                               def_thread.bs = atoi(parm);
-                               def_thread.bs <<= 10;
-                               if (!def_thread.bs) {
-                                       printf("bad block size\n");
-                                       def_thread.bs = DEF_BS;
-                               }
-                               break;
-                       case 't':
-                               parm++;
-                               def_thread.timeout = atoi(parm);
-                               break;
-                       case 'r':
-                               parm++;
-                               repeatable = !!atoi(parm);
-                               break;
-                       case 'R':
-                               parm++;
-                               rate_quit = !!atoi(parm);
-                               break;
-                       case 'o':
-                               parm++;
-                               def_thread.odirect = !!atoi(parm);
-                               break;
-                       case 'f':
-                               if (i + 1 >= argc) {
-                                       printf("-f needs file as arg\n");
-                                       break;
-                               }
-                               ini_file = strdup(argv[i+1]);
-                               i++;
-                               break;
-                       default:
-                               printf("bad option %s\n", argv[i]);
-                               break;
-               }
+       switch (td->runstate) {
+               case TD_REAPED:
+                       c = '_';
+                       break;
+               case TD_EXITED:
+                       c = 'E';
+                       break;
+               case TD_RUNNING:
+                       if (td_read(td)) {
+                               if (td->sequential)
+                                       c = 'R';
+                               else
+                                       c = 'r';
+                       } else {
+                               if (td->sequential)
+                                       c = 'W';
+                               else
+                                       c = 'w';
+                       }
+                       break;
+               case TD_VERIFYING:
+                       c = 'V';
+                       break;
+               case TD_CREATED:
+                       c = 'C';
+                       break;
+               case TD_NOT_CREATED:
+                       c = 'P';
+                       break;
+               default:
+                       printf("state %d\n", td->runstate);
        }
 
-       return i;
+       run_str[td->thread_number - 1] = c;
+       print_thread_status(td, n, t, m);
+       td->old_runstate = td->runstate;
 }
 
 static void reap_threads(int *nr_running, int *t_rate, int *m_rate)
 {
        int i;
 
+       /*
+        * reap exited threads (TD_EXITED -> TD_REAPED)
+        */
        for (i = 0; i < thread_number; i++) {
                struct thread_data *td = &threads[i];
 
+               check_str_update(td, *nr_running, *t_rate, *m_rate);
+
                if (td->runstate != TD_EXITED)
                        continue;
 
-               printf("Client%d: done\n", td->thread_number);
-               td->runstate = TD_REAPED;
-               waitpid(td->pid, NULL, 0);
+               td_set_runstate(td, TD_REAPED);
+
+               if (td->use_thread) {
+                       long ret;
+
+                       if (pthread_join(td->thread, (void *) &ret))
+                               perror("thread_join");
+               } else
+                       waitpid(td->pid, NULL, 0);
+
                (*nr_running)--;
                (*m_rate) -= td->ratemin;
                (*t_rate) -= td->rate;
-
-               if (td->terminate)
-                       continue;
-
-               printf("Threads now running: %d", *nr_running);
-               if (*m_rate || *t_rate)
-                       printf(", rate %d/%dKiB/sec", *t_rate, *m_rate);
-               printf("\n");
+               check_str_update(td, *nr_running, *t_rate, *m_rate);
        }
 }
 
@@ -1479,9 +1585,7 @@ static void run_threads(char *argv[])
        struct timeval genesis;
        struct thread_data *td;
        unsigned long spent;
-       int i, todo, nr_running, m_rate, t_rate;
-
-       gettimeofday(&genesis, NULL);
+       int i, todo, nr_running, m_rate, t_rate, nr_started;
 
        printf("Starting %d threads\n", thread_number);
        fflush(stdout);
@@ -1490,9 +1594,32 @@ static void run_threads(char *argv[])
 
        todo = thread_number;
        nr_running = 0;
+       nr_started = 0;
        m_rate = t_rate = 0;
 
+       for (i = 0; i < thread_number; i++) {
+               td = &threads[i];
+
+               if (!td->create_serialize)
+                       continue;
+
+               /*
+                * do file setup here so it happens sequentially,
+                * we don't want X number of threads getting their
+                * client data interspersed on disk
+                */
+               if (setup_file(td)) {
+                       td_set_runstate(td, TD_REAPED);
+                       todo--;
+               }
+       }
+
+       gettimeofday(&genesis, NULL);
+
        while (todo) {
+               /*
+                * create threads (TD_NOT_CREATED -> TD_CREATED)
+                */
                for (i = 0; i < thread_number; i++) {
                        td = &threads[i];
 
@@ -1515,33 +1642,56 @@ static void run_threads(char *argv[])
                                        continue;
                        }
 
-                       td->runstate = TD_CREATED;
+                       if (td->stonewall && (nr_started || nr_running))
+                               break;
+
+                       td_set_runstate(td, TD_CREATED);
+                       check_str_update(td, nr_running, t_rate, m_rate);
                        sem_init(&startup_sem, 1, 1);
                        todo--;
+                       nr_started++;
 
-                       if (fork())
-                               sem_wait(&startup_sem);
-                       else {
-                               thread_main(shm_id, i, argv);
-                               exit(0);
+                       if (td->use_thread) {
+                               if (pthread_create(&td->thread, NULL, thread_main, td)) {
+                                       perror("thread_create");
+                                       nr_started--;
+                               }
+                       } else {
+                               if (fork())
+                                       sem_wait(&startup_sem);
+                               else {
+                                       fork_main(shm_id, i);
+                                       exit(0);
+                               }
                        }
                }
 
+               /*
+                * start created threads (TD_CREATED -> TD_RUNNING)
+                */
                for (i = 0; i < thread_number; i++) {
                        struct thread_data *td = &threads[i];
 
-                       if (td->runstate == TD_CREATED) {
-                               td->runstate = TD_STARTED;
-                               nr_running++;
-                               m_rate += td->ratemin;
-                               t_rate += td->rate;
-                               sem_post(&td->mutex);
-
-                               printf("Threads now running: %d", nr_running);
-                               if (m_rate || t_rate)
-                                       printf(", rate %d/%dKiB/sec", t_rate, m_rate);
-                               printf("\n");
-                       }
+                       if (td->runstate != TD_CREATED)
+                               continue;
+
+                       td_set_runstate(td, TD_RUNNING);
+                       nr_running++;
+                       nr_started--;
+                       m_rate += td->ratemin;
+                       t_rate += td->rate;
+                       check_str_update(td, nr_running, t_rate, m_rate);
+                       sem_post(&td->mutex);
+               }
+
+               for (i = 0; i < thread_number; i++) {
+                       struct thread_data *td = &threads[i];
+
+                       if (td->runstate != TD_RUNNING &&
+                           td->runstate != TD_VERIFYING)
+                               continue;
+
+                       check_str_update(td, nr_running, t_rate, m_rate);
                }
 
                reap_threads(&nr_running, &t_rate, &m_rate);
@@ -1556,128 +1706,92 @@ static void run_threads(char *argv[])
        }
 }
 
-int setup_thread_area(void)
+static void show_group_stats(struct group_run_stats *rs, int id)
 {
-       /*
-        * 1024 is too much on some machines, scale max_jobs if
-        * we get a failure that looks like too large a shm segment
-        */
-       do {
-               int s = max_jobs * sizeof(struct thread_data);
+       printf("\nRun status group %d:\n", id);
 
-               shm_id = shmget(0, s, IPC_CREAT | 0600);
-               if (shm_id != -1)
-                       break;
-               if (errno != EINVAL) {
-                       perror("shmget");
-                       break;
-               }
+       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]);
+       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]);
+}
 
-               max_jobs >>= 1;
-       } while (1);
+static void show_run_stats(void)
+{
+       struct group_run_stats *runstats, *rs;
+       struct thread_data *td;
+       int i;
 
-       if (shm_id == -1)
-               return 1;
+       runstats = malloc(sizeof(struct group_run_stats) * (groupid + 1));
 
-       threads = shmat(shm_id, NULL, 0);
-       if (threads == (void *) -1) {
-               perror("shmat");
-               return 1;
+       for (i = 0; i < groupid + 1; i++) {
+               rs = &runstats[i];
+
+               memset(rs, 0, sizeof(*rs));
+               rs->min_bw[0] = rs->min_run[0] = ~0UL;
+               rs->min_bw[1] = rs->min_run[1] = ~0UL;
        }
 
-       atexit(free_shm);
-       return 0;
-}
+       for (i = 0; i < thread_number; i++) {
+               unsigned long bw = 0;
 
-int main(int argc, char *argv[])
-{
-       static unsigned long max_run[2], min_run[2], total_blocks[2];
-       static unsigned long max_bw[2], min_bw[2], maxl[2], minl[2];
-       static unsigned long read_mb, write_mb, read_agg, write_agg;
-       int i;
+               td = &threads[i];
 
-       if (setup_thread_area())
-               return 1;
+               if (td->error)
+                       continue;
 
-       if (sched_getaffinity(getpid(), sizeof(cpu_set_t), &def_thread.cpumask) == -1) {
-               perror("sched_getaffinity");
-               return 1;
-       }
+               rs = &runstats[td->groupid];
 
-       /*
-        * fill globals
-        */
-       def_thread.ddir = DDIR_READ;
-       def_thread.bs = DEF_BS;
-       def_thread.odirect = DEF_ODIRECT;
-       def_thread.ratecycle = DEF_RATE_CYCLE;
-       def_thread.sequential = DEF_SEQUENTIAL;
-       def_thread.timeout = DEF_TIMEOUT;
-       def_thread.create_file = DEF_CREATE;
-       def_thread.overwrite = DEF_OVERWRITE;
-
-       i = parse_options(argc, argv);
-
-       if (ini_file) {
-               if (parse_jobs_ini(ini_file))
-                       return 1;
-       } else
-               parse_jobs_cmd(argc, argv, i);
+               if (td->runtime < rs->min_run[td->ddir])
+                       rs->min_run[td->ddir] = td->runtime;
+               if (td->runtime > rs->max_run[td->ddir])
+                       rs->max_run[td->ddir] = td->runtime;
 
-       if (!thread_number) {
-               printf("Nothing to do\n");
-               return 1;
+               if (td->runtime)
+                       bw = td->io_bytes / td->runtime;
+               if (bw < rs->min_bw[td->ddir])
+                       rs->min_bw[td->ddir] = bw;
+               if (bw > rs->max_bw[td->ddir])
+                       rs->max_bw[td->ddir] = bw;
+
+               rs->io_mb[td->ddir] += td->io_bytes >> 20;
        }
 
-       run_threads(argv);
+       for (i = 0; i < groupid + 1; i++) {
+               rs = &runstats[i];
+
+               if (rs->max_run[0])
+                       rs->agg[0] = (rs->io_mb[0]*1024*1000) / rs->max_run[0];
+               if (rs->max_run[1])
+                       rs->agg[1] = (rs->io_mb[1]*1024*1000) / rs->max_run[1];
+       }
 
-       min_bw[0] = min_run[0] = ~0UL;
-       min_bw[1] = min_run[1] = ~0UL;
-       minl[0] = minl[1] = ~0UL;
        for (i = 0; i < thread_number; i++) {
-               struct thread_data *td = &threads[i];
-               unsigned long bw = 0;
+               td = &threads[i];
+               rs = &runstats[td->groupid];
 
-               if (td->error)
-                       goto show_stat;
+               if (!td->error)
+                       show_thread_status(td, rs);
+       }
 
-               if (td->runtime < min_run[td->ddir])
-                       min_run[td->ddir] = td->runtime;
-               if (td->runtime > max_run[td->ddir])
-                       max_run[td->ddir] = td->runtime;
+       for (i = 0; i < groupid + 1; i++)
+               show_group_stats(&runstats[i], i);
+}
 
-               if (td->runtime)
-                       bw = (td->io_blocks * td->bs) / td->runtime;
-               if (bw < min_bw[td->ddir])
-                       min_bw[td->ddir] = bw;
-               if (bw > max_bw[td->ddir])
-                       max_bw[td->ddir] = bw;
-               if (td->max_latency < minl[td->ddir])
-                       minl[td->ddir] = td->max_latency;
-               if (td->max_latency > maxl[td->ddir])
-                       maxl[td->ddir] = td->max_latency;
-
-               total_blocks[td->ddir] += td->io_blocks;
-
-               if (td_read(td)) {
-                       read_mb += (td->bs * td->io_blocks) >> 20;
-                       if (td->runtime)
-                               read_agg += (td->io_blocks * td->bs) / td->runtime;
-               } else {
-                       write_mb += (td->bs * td->io_blocks) >> 20;
-                       if (td->runtime)
-                               write_agg += (td->io_blocks * td->bs) / td->runtime;
-               }
+int main(int argc, char *argv[])
+{
+       memset(run_str, 0, sizeof(run_str));
+
+       if (parse_options(argc, argv))
+               return 1;
 
-show_stat:
-               show_thread_status(td);
+       if (!thread_number) {
+               printf("Nothing to do\n");
+               return 1;
        }
 
-       printf("Run status:\n");
-       if (max_run[DDIR_READ])
-               printf("   READ: io=%luMiB, aggrb=%lu, minl=%lu, maxl=%lu, minb=%lu, maxb=%lu, mint=%lumsec, maxt=%lumsec\n", read_mb, read_agg, minl[0], maxl[0], min_bw[0], max_bw[0], min_run[0], max_run[0]);
-       if (max_run[DDIR_WRITE])
-               printf("  WRITE: io=%luMiB, aggrb=%lu, minl=%lu, maxl=%lu, minb=%lu, maxb=%lu, mint=%lumsec, maxt=%lumsec\n", write_mb, write_agg, minl[1], maxl[1], min_bw[1], max_bw[1], min_run[1], max_run[1]);
+       run_threads(argv);
+       show_run_stats();
 
        return 0;
 }