Merge branch 'master' of https://github.com/bvanassche/fio

* 'master' of https://github.com/bvanassche/fio:
  Introduce enum fio_q_status
  Remove dead code from fio_io_sync()
  gfapi: Make fio_gf_queue() set the I/O unit error status instead of returning -EINVAL
  Change return type of td_io_commit() into void
  Simplify num2str()
  Introduce enum n2s_unit
  Declare stat_calc_lat_nu() static

diff --git a/backend.c b/backend.c
index a2a0b3da61458f4e6171c868f2fb07b4b77faa38..d5cb6ef56fa89e3636524bc3e13d74c1f0d24115 100644 (file)
--- a/backend.c
+++ b/backend.c
@@ -268,7 +268,7 @@ static void cleanup_pending_aio(struct thread_data *td)
 static bool fio_io_sync(struct thread_data *td, struct fio_file *f)
 {
        struct io_u *io_u = __get_io_u(td);
-       int ret;
+       enum fio_q_status ret;
 
        if (!io_u)
                return true;
@@ -283,16 +283,13 @@ static bool fio_io_sync(struct thread_data *td, struct fio_file *f)
 
 requeue:
        ret = td_io_queue(td, io_u);
-       if (ret < 0) {
-               td_verror(td, io_u->error, "td_io_queue");
-               put_io_u(td, io_u);
-               return true;
-       } else if (ret == FIO_Q_QUEUED) {
-               if (td_io_commit(td))
-                       return true;
+       switch (ret) {
+       case FIO_Q_QUEUED:
+               td_io_commit(td);
                if (io_u_queued_complete(td, 1) < 0)
                        return true;
-       } else if (ret == FIO_Q_COMPLETED) {
+               break;
+       case FIO_Q_COMPLETED:
                if (io_u->error) {
                        td_verror(td, io_u->error, "td_io_queue");
                        return true;
@@ -300,9 +297,9 @@ requeue:
 
                if (io_u_sync_complete(td, io_u) < 0)
                        return true;
-       } else if (ret == FIO_Q_BUSY) {
-               if (td_io_commit(td))
-                       return true;
+               break;
+       case FIO_Q_BUSY:
+               td_io_commit(td);
                goto requeue;
        }
 
@@ -453,8 +450,6 @@ int io_queue_event(struct thread_data *td, struct io_u *io_u, int *ret,
                   enum fio_ddir ddir, uint64_t *bytes_issued, int from_verify,
                   struct timespec *comp_time)
 {
-       int ret2;
-
        switch (*ret) {
        case FIO_Q_COMPLETED:
                if (io_u->error) {
@@ -530,9 +525,7 @@ sync_done:
                if (!from_verify)
                        unlog_io_piece(td, io_u);
                requeue_io_u(td, &io_u);
-               ret2 = td_io_commit(td);
-               if (ret2 < 0)
-                       *ret = ret2;
+               td_io_commit(td);
                break;
        default:
                assert(*ret < 0);
@@ -605,7 +598,7 @@ static bool in_flight_overlap(struct io_u_queue *q, struct io_u *io_u)
        return overlap;
 }
 
-static int io_u_submit(struct thread_data *td, struct io_u *io_u)
+static enum fio_q_status io_u_submit(struct thread_data *td, struct io_u *io_u)
 {
        /*
         * Check for overlap if the user asked us to, and we have

diff --git a/engines/cpu.c b/engines/cpu.c
index d0b4a895afcb78c3619adebb15854236a324785c..37f9bbad501a113e0f4f4fc0c4ebcd22fca2bb5b 100644 (file)
--- a/engines/cpu.c
+++ b/engines/cpu.c
@@ -53,7 +53,8 @@ static struct fio_option options[] = {
 };
 
 
-static int fio_cpuio_queue(struct thread_data *td, struct io_u fio_unused *io_u)
+static enum fio_q_status
+fio_cpuio_queue(struct thread_data *td, struct io_u fio_unused *io_u)
 {
        struct cpu_options *co = td->eo;
 

diff --git a/engines/dev-dax.c b/engines/dev-dax.c
index caae1e09b5f8112d1725a5300b43ed4d1a9a56da..807d8505b21121999bb5f6b6626e7ab0aced1877 100644 (file)
--- a/engines/dev-dax.c
+++ b/engines/dev-dax.c
@@ -182,7 +182,8 @@ done:
        return 0;
 }
 
-static int fio_devdax_queue(struct thread_data *td, struct io_u *io_u)
+static enum fio_q_status
+fio_devdax_queue(struct thread_data *td, struct io_u *io_u)
 {
        fio_ro_check(td, io_u);
        io_u->error = 0;

diff --git a/engines/e4defrag.c b/engines/e4defrag.c
index 3619450d295d15c344616114c491cddddcfcb0f0..22d523125875a872180d70a7cbdc2b3d8eb948e9 100644 (file)
--- a/engines/e4defrag.c
+++ b/engines/e4defrag.c
@@ -127,7 +127,8 @@ static void fio_e4defrag_cleanup(struct thread_data *td)
 }
 
 
-static int fio_e4defrag_queue(struct thread_data *td, struct io_u *io_u)
+static enum fio_q_status
+fio_e4defrag_queue(struct thread_data *td, struct io_u *io_u)
 {
 
        int ret;

diff --git a/engines/falloc.c b/engines/falloc.c
index bb3ac85045b2f16fd650abe2c2081371acd6f2c1..a1f6a242b11bb60fe5742923105cfe394907145a 100644 (file)
--- a/engines/falloc.c
+++ b/engines/falloc.c
@@ -66,7 +66,8 @@ open_again:
 #ifndef FALLOC_FL_PUNCH_HOLE
 #define FALLOC_FL_PUNCH_HOLE    0x02 /* de-allocates range */
 #endif 
-static int fio_fallocate_queue(struct thread_data *td, struct io_u *io_u)
+static enum fio_q_status
+fio_fallocate_queue(struct thread_data *td, struct io_u *io_u)
 {
        struct fio_file *f = io_u->file;
        int ret;

diff --git a/engines/filecreate.c b/engines/filecreate.c
index 6fa041cdbaa1421b775b2ecfcf68a479c2d507f0..fb3f389791d9c61a4f14ce4b68953b608ee20648 100644 (file)
--- a/engines/filecreate.c
+++ b/engines/filecreate.c
@@ -55,7 +55,8 @@ static int open_file(struct thread_data *td, struct fio_file *f)
        return 0;
 }
 
-static int queue_io(struct thread_data *td, struct io_u fio_unused *io_u)
+static enum fio_q_status
+queue_io(struct thread_data *td, struct io_u fio_unused *io_u)
 {
        return FIO_Q_COMPLETED;
 }

diff --git a/engines/ftruncate.c b/engines/ftruncate.c
index 14e115f221b6434b65771905c24ad89d34cd7c55..4ff511ea7e2193eb3656eb841cb56c6ca3a4cc78 100644 (file)
--- a/engines/ftruncate.c
+++ b/engines/ftruncate.c
@@ -11,7 +11,8 @@
 
 #include "../fio.h"
 
-static int fio_ftruncate_queue(struct thread_data *td, struct io_u *io_u)
+static enum fio_q_status
+fio_ftruncate_queue(struct thread_data *td, struct io_u *io_u)
 {
        struct fio_file *f = io_u->file;
        int ret;

diff --git a/engines/fusion-aw.c b/engines/fusion-aw.c
index 77844ffe4b724fa7420ea51f1b2c1b8d78c1caf6..eb5fdf504ea65ea4cab8ef546d29bde7c44b72d9 100644 (file)
--- a/engines/fusion-aw.c
+++ b/engines/fusion-aw.c
@@ -34,7 +34,7 @@ struct fas_data {
        size_t sector_size;
 };
 
-static int queue(struct thread_data *td, struct io_u *io_u)
+static enum fio_q_status queue(struct thread_data *td, struct io_u *io_u)
 {
        struct fas_data *d = FILE_ENG_DATA(io_u->file);
        int rc;

diff --git a/engines/glusterfs_async.c b/engines/glusterfs_async.c
index eb8df453524d7d5de7dfbc3d84f53ae5d5fa57d7..9e1c4bf038f3b3ce2fbe27f3ddb19cffbd6f3dd2 100644 (file)
--- a/engines/glusterfs_async.c
+++ b/engines/glusterfs_async.c
@@ -93,8 +93,8 @@ static void gf_async_cb(glfs_fd_t * fd, ssize_t ret, void *data)
        iou->io_complete = 1;
 }
 
-static int fio_gf_async_queue(struct thread_data fio_unused * td,
-                             struct io_u *io_u)
+static enum fio_q_status fio_gf_async_queue(struct thread_data fio_unused * td,
+                                           struct io_u *io_u)
 {
        struct gf_data *g = td->io_ops_data;
        int r;

diff --git a/engines/glusterfs_sync.c b/engines/glusterfs_sync.c
index 25d05b251fbbd44233ea47b0b138a554d2cec637..a10e0ed68197fc592986063044322d9927f58577 100644 (file)
--- a/engines/glusterfs_sync.c
+++ b/engines/glusterfs_sync.c
@@ -29,7 +29,7 @@ static int fio_gf_prep(struct thread_data *td, struct io_u *io_u)
        return 0;
 }
 
-static int fio_gf_queue(struct thread_data *td, struct io_u *io_u)
+static enum fio_q_status fio_gf_queue(struct thread_data *td, struct io_u *io_u)
 {
        struct gf_data *g = td->io_ops_data;
        int ret = 0;
@@ -47,7 +47,8 @@ static int fio_gf_queue(struct thread_data *td, struct io_u *io_u)
                ret = glfs_fdatasync(g->fd);
        else {
                log_err("unsupported operation.\n");
-               return -EINVAL;
+               io_u->error = EINVAL;
+               return FIO_Q_COMPLETED;
        }
        dprint(FD_FILE, "fio len %lu ret %d\n", io_u->xfer_buflen, ret);
        if (io_u->file && ret >= 0 && ddir_rw(io_u->ddir))

diff --git a/engines/guasi.c b/engines/guasi.c
index 9644ee59d4a4fdd39e1a82cebd2d3ede95fad414..4d33290850efd25dfb0792f613c03a4342219e2f 100644 (file)
--- a/engines/guasi.c
+++ b/engines/guasi.c
@@ -113,7 +113,8 @@ static int fio_guasi_getevents(struct thread_data *td, unsigned int min,
        return n;
 }
 
-static int fio_guasi_queue(struct thread_data *td, struct io_u *io_u)
+static enum fio_q_status
+fio_guasi_queue(struct thread_data *td, struct io_u *io_u)
 {
        struct guasi_data *ld = td->io_ops_data;
 

diff --git a/engines/libaio.c b/engines/libaio.c
index 7d59df3869f12238d3ebdefc6ae4f85145b9de85..0e2263a743ad657244cc61a5a97ba0ba1b5d2e9a 100644 (file)
--- a/engines/libaio.c
+++ b/engines/libaio.c
@@ -177,7 +177,8 @@ static int fio_libaio_getevents(struct thread_data *td, unsigned int min,
        return r < 0 ? r : events;
 }
 
-static int fio_libaio_queue(struct thread_data *td, struct io_u *io_u)
+static enum fio_q_status
+fio_libaio_queue(struct thread_data *td, struct io_u *io_u)
 {
        struct libaio_data *ld = td->io_ops_data;
 

diff --git a/engines/libhdfs.c b/engines/libhdfs.c
index 96a0871d873ee8813876ce4ee47709de8b3c5b58..37694fafcb0269231c34d1fba6b2d26ca0855cdf 100644 (file)
--- a/engines/libhdfs.c
+++ b/engines/libhdfs.c
@@ -165,7 +165,8 @@ static int fio_hdfsio_prep(struct thread_data *td, struct io_u *io_u)
        return 0;
 }
 
-static int fio_hdfsio_queue(struct thread_data *td, struct io_u *io_u)
+static enum fio_q_status
+fio_hdfsio_queue(struct thread_data *td, struct io_u *io_u)
 {
        struct hdfsio_data *hd = td->io_ops_data;
        struct hdfsio_options *options = td->eo;

diff --git a/engines/libpmem.c b/engines/libpmem.c
index dbb3f5c69c0f6546dbd7d08ed277aa06ab9e19aa..c3abe2a05542700bf7625671d314739bde285383 100644 (file)
--- a/engines/libpmem.c
+++ b/engines/libpmem.c
@@ -457,7 +457,8 @@ done:
        return 0;
 }
 
-static int fio_libpmem_queue(struct thread_data *td, struct io_u *io_u)
+static enum fio_q_status
+fio_libpmem_queue(struct thread_data *td, struct io_u *io_u)
 {
        fio_ro_check(td, io_u);
        io_u->error = 0;

diff --git a/engines/mmap.c b/engines/mmap.c
index 9dbefc8214dd71d7dc569864d7c571f7391fc5d7..856547befda3dea5e42ece3a123ed35c70663f66 100644 (file)
--- a/engines/mmap.c
+++ b/engines/mmap.c
@@ -177,7 +177,8 @@ done:
        return 0;
 }
 
-static int fio_mmapio_queue(struct thread_data *td, struct io_u *io_u)
+static enum fio_q_status
+fio_mmapio_queue(struct thread_data *td, struct io_u *io_u)
 {
        struct fio_file *f = io_u->file;
        struct fio_mmap_data *fmd = FILE_ENG_DATA(f);

diff --git a/engines/mtd.c b/engines/mtd.c
index 5f822fc1f52009c9b60aa8cd9bd18fd3d9186f35..9e154836a5a61094c51e5c74634d128a9fdcaec5 100644 (file)
--- a/engines/mtd.c
+++ b/engines/mtd.c
@@ -71,7 +71,8 @@ static int fio_mtd_is_bad(struct thread_data *td,
        return ret;
 }
 
-static int fio_mtd_queue(struct thread_data *td, struct io_u *io_u)
+static enum fio_q_status
+fio_mtd_queue(struct thread_data *td, struct io_u *io_u)
 {
        struct fio_file *f = io_u->file;
        struct fio_mtd_data *fmd = FILE_ENG_DATA(f);

diff --git a/engines/net.c b/engines/net.c
index 4540e0e4d7c7eea9b9001f16cafb756225f3661a..8c25c4e5b12f254fbcd6d2eba1125f5d991f835a 100644 (file)
--- a/engines/net.c
+++ b/engines/net.c
@@ -642,8 +642,8 @@ static int fio_netio_recv(struct thread_data *td, struct io_u *io_u)
        return ret;
 }
 
-static int __fio_netio_queue(struct thread_data *td, struct io_u *io_u,
-                            enum fio_ddir ddir)
+static enum fio_q_status
+__fio_netio_queue(struct thread_data *td, struct io_u *io_u, enum fio_ddir ddir)
 {
        struct netio_data *nd = td->io_ops_data;
        struct netio_options *o = td->eo;
@@ -687,7 +687,8 @@ static int __fio_netio_queue(struct thread_data *td, struct io_u *io_u,
        return FIO_Q_COMPLETED;
 }
 
-static int fio_netio_queue(struct thread_data *td, struct io_u *io_u)
+static enum fio_q_status
+fio_netio_queue(struct thread_data *td, struct io_u *io_u)
 {
        struct netio_options *o = td->eo;
        int ret;

diff --git a/engines/null.c b/engines/null.c
index 8c26ad7179aa1589720e7d6e3d4e84e4261d3cc8..b1718e5c9a35fea7826fadcff340762e373c0e14 100644 (file)
--- a/engines/null.c
+++ b/engines/null.c
@@ -56,8 +56,8 @@ static int null_commit(struct thread_data *td, struct null_data *nd)
        return 0;
 }
 
-static int null_queue(struct thread_data *td, struct null_data *nd,
-                     struct io_u *io_u)
+static enum fio_q_status
+null_queue(struct thread_data *td, struct null_data *nd, struct io_u *io_u)
 {
        fio_ro_check(td, io_u);
 
@@ -118,7 +118,8 @@ static int fio_null_commit(struct thread_data *td)
        return null_commit(td, td->io_ops_data);
 }
 
-static int fio_null_queue(struct thread_data *td, struct io_u *io_u)
+static enum fio_q_status
+fio_null_queue(struct thread_data *td, struct io_u *io_u)
 {
        return null_queue(td, td->io_ops_data, io_u);
 }

diff --git a/engines/pmemblk.c b/engines/pmemblk.c
index 264eb713cf7906ae7acb43737706e345b718a769..e2c558929ff22b883d7ae2d8abfbc787265e6695 100644 (file)
--- a/engines/pmemblk.c
+++ b/engines/pmemblk.c
@@ -342,7 +342,8 @@ static int fio_pmemblk_get_file_size(struct thread_data *td, struct fio_file *f)
        return 0;
 }
 
-static int fio_pmemblk_queue(struct thread_data *td, struct io_u *io_u)
+static enum fio_q_status
+fio_pmemblk_queue(struct thread_data *td, struct io_u *io_u)
 {
        struct fio_file *f = io_u->file;
        fio_pmemblk_file_t pmb = FILE_ENG_DATA(f);

diff --git a/engines/posixaio.c b/engines/posixaio.c
index bddb1ec3f2697e43dff46dcc726ed31e419f27f0..4ac019578a7f8114a254ce425e8a4e76b74211cd 100644 (file)
--- a/engines/posixaio.c
+++ b/engines/posixaio.c
@@ -166,8 +166,8 @@ static struct io_u *fio_posixaio_event(struct thread_data *td, int event)
        return pd->aio_events[event];
 }
 
-static int fio_posixaio_queue(struct thread_data *td,
-                             struct io_u *io_u)
+static enum fio_q_status fio_posixaio_queue(struct thread_data *td,
+                                           struct io_u *io_u)
 {
        struct posixaio_data *pd = td->io_ops_data;
        os_aiocb_t *aiocb = &io_u->aiocb;

diff --git a/engines/rados.c b/engines/rados.c
index dc0d7b1ef3b921eb1807318afb32a3d12da9d31f..f3795c5742ecfd3bd36ebe5f321ce1450d3d4cff 100644 (file)
--- a/engines/rados.c
+++ b/engines/rados.c
@@ -251,7 +251,8 @@ static void fio_rados_cleanup(struct thread_data *td)
        }
 }
 
-static int fio_rados_queue(struct thread_data *td, struct io_u *io_u)
+static enum fio_q_status
+fio_rados_queue(struct thread_data *td, struct io_u *io_u)
 {
        struct rados_data *rados = td->io_ops_data;
        struct fio_rados_iou *fri = io_u->engine_data;

diff --git a/engines/rbd.c b/engines/rbd.c
index 6582b06d287825a605780153ca3fa7bcd88af8a4..cf7337f00745198f21cd23379ea3362c8e6ee3cd 100644 (file)
--- a/engines/rbd.c
+++ b/engines/rbd.c
@@ -462,7 +462,8 @@ static int fio_rbd_getevents(struct thread_data *td, unsigned int min,
        return events;
 }
 
-static int fio_rbd_queue(struct thread_data *td, struct io_u *io_u)
+static enum fio_q_status
+fio_rbd_queue(struct thread_data *td, struct io_u *io_u)
 {
        struct rbd_data *rbd = td->io_ops_data;
        struct fio_rbd_iou *fri = io_u->engine_data;

diff --git a/engines/rdma.c b/engines/rdma.c
index 8def6eba0783ef4494b8b9f555974906d5ae450d..67c5aa7e23eb1f65b47ea5ad4b93886b630f2e82 100644 (file)
--- a/engines/rdma.c
+++ b/engines/rdma.c
@@ -791,7 +791,8 @@ static int fio_rdmaio_recv(struct thread_data *td, struct io_u **io_us,
        return i;
 }
 
-static int fio_rdmaio_queue(struct thread_data *td, struct io_u *io_u)
+static enum fio_q_status
+fio_rdmaio_queue(struct thread_data *td, struct io_u *io_u)
 {
        struct rdmaio_data *rd = td->io_ops_data;
 

diff --git a/engines/sg.c b/engines/sg.c
index c2c0de39ef82903464f728f3e4ea489de993f538..56e5d18ab60ba90edb05b69c079fae70a2fdc104 100644 (file)
--- a/engines/sg.c
+++ b/engines/sg.c
@@ -236,8 +236,9 @@ re_read:
        return r;
 }
 
-static int fio_sgio_ioctl_doio(struct thread_data *td,
-                              struct fio_file *f, struct io_u *io_u)
+static enum fio_q_status
+fio_sgio_ioctl_doio(struct thread_data *td, struct fio_file *f,
+                   struct io_u *io_u)
 {
        struct sgio_data *sd = td->io_ops_data;
        struct sg_io_hdr *hdr = &io_u->hdr;
@@ -377,7 +378,8 @@ static int fio_sgio_prep(struct thread_data *td, struct io_u *io_u)
        return 0;
 }
 
-static int fio_sgio_queue(struct thread_data *td, struct io_u *io_u)
+static enum fio_q_status
+fio_sgio_queue(struct thread_data *td, struct io_u *io_u)
 {
        struct sg_io_hdr *hdr = &io_u->hdr;
        int ret, do_sync = 0;

diff --git a/engines/skeleton_external.c b/engines/skeleton_external.c
index 56f89f957b5f502ccfe0add680ac80c6ef9d4a85..7e08afbb0fb34ed415d6a5548903c675baf97f70 100644 (file)
--- a/engines/skeleton_external.c
+++ b/engines/skeleton_external.c
@@ -90,7 +90,8 @@ static int fio_skeleton_cancel(struct thread_data *td, struct io_u *io_u)
  * io_u->xfer_buflen. Residual data count may be set in io_u->resid
  * for a short read/write.
  */
-static int fio_skeleton_queue(struct thread_data *td, struct io_u *io_u)
+static enum fio_q_status
+fio_skeleton_queue(struct thread_data *td, struct io_u *io_u)
 {
        /*
         * Double sanity check to catch errant write on a readonly setup

diff --git a/engines/splice.c b/engines/splice.c
index 08fc857454ea2f82a38bf2dee3c6d91154bf1df4..18403608cbc61276de93e96116020e071ab096ba 100644 (file)
--- a/engines/splice.c
+++ b/engines/splice.c
@@ -199,7 +199,8 @@ static int fio_splice_write(struct thread_data *td, struct io_u *io_u)
        return io_u->xfer_buflen;
 }
 
-static int fio_spliceio_queue(struct thread_data *td, struct io_u *io_u)
+static enum fio_q_status
+fio_spliceio_queue(struct thread_data *td, struct io_u *io_u)
 {
        struct spliceio_data *sd = td->io_ops_data;
        int ret = 0;

diff --git a/engines/sync.c b/engines/sync.c
index d5b4012f80338440068e242fa64f823ae02453cf..722320ef6de6b5dd5dc0eb3246d9c75746786174 100644 (file)
--- a/engines/sync.c
+++ b/engines/sync.c
@@ -110,7 +110,8 @@ static int fio_io_end(struct thread_data *td, struct io_u *io_u, int ret)
 }
 
 #ifdef CONFIG_PWRITEV
-static int fio_pvsyncio_queue(struct thread_data *td, struct io_u *io_u)
+static enum fio_q_status
+fio_pvsyncio_queue(struct thread_data *td, struct io_u *io_u)
 {
        struct syncio_data *sd = td->io_ops_data;
        struct iovec *iov = &sd->iovecs[0];
@@ -137,7 +138,8 @@ static int fio_pvsyncio_queue(struct thread_data *td, struct io_u *io_u)
 #endif
 
 #ifdef FIO_HAVE_PWRITEV2
-static int fio_pvsyncio2_queue(struct thread_data *td, struct io_u *io_u)
+static enum fio_q_status
+fio_pvsyncio2_queue(struct thread_data *td, struct io_u *io_u)
 {
        struct syncio_data *sd = td->io_ops_data;
        struct psyncv2_options *o = td->eo;
@@ -169,7 +171,8 @@ static int fio_pvsyncio2_queue(struct thread_data *td, struct io_u *io_u)
 #endif
 
 
-static int fio_psyncio_queue(struct thread_data *td, struct io_u *io_u)
+static enum fio_q_status
+fio_psyncio_queue(struct thread_data *td, struct io_u *io_u)
 {
        struct fio_file *f = io_u->file;
        int ret;
@@ -189,7 +192,8 @@ static int fio_psyncio_queue(struct thread_data *td, struct io_u *io_u)
        return fio_io_end(td, io_u, ret);
 }
 
-static int fio_syncio_queue(struct thread_data *td, struct io_u *io_u)
+static enum fio_q_status
+fio_syncio_queue(struct thread_data *td, struct io_u *io_u)
 {
        struct fio_file *f = io_u->file;
        int ret;
@@ -260,7 +264,8 @@ static void fio_vsyncio_set_iov(struct syncio_data *sd, struct io_u *io_u,
        sd->queued++;
 }
 
-static int fio_vsyncio_queue(struct thread_data *td, struct io_u *io_u)
+static enum fio_q_status
+fio_vsyncio_queue(struct thread_data *td, struct io_u *io_u)
 {
        struct syncio_data *sd = td->io_ops_data;
 

diff --git a/engines/windowsaio.c b/engines/windowsaio.c
index 94393931eeb38eb490ad76ab32305fd4b771a433..2b932f71460f196287e26b5f99d1509378ce3565 100644 (file)
--- a/engines/windowsaio.c
+++ b/engines/windowsaio.c
@@ -354,7 +354,8 @@ static int fio_windowsaio_getevents(struct thread_data *td, unsigned int min,
        return dequeued;
 }
 
-static int fio_windowsaio_queue(struct thread_data *td, struct io_u *io_u)
+static enum fio_q_status
+fio_windowsaio_queue(struct thread_data *td, struct io_u *io_u)
 {
        struct fio_overlapped *o = io_u->engine_data;
        LPOVERLAPPED lpOvl = &o->o;

diff --git a/init.c b/init.c
index 07d1cdd31df2b1cba4f4ce8a07b3c4ed96e92353..9257d47c0180af0ff4635418eb4718d254297df4 100644 (file)
--- a/init.c
+++ b/init.c
@@ -833,11 +833,11 @@ static int fixup_options(struct thread_data *td)
                }
        }
 
-       if (!o->unit_base) {
+       if (o->unit_base == N2S_NONE) {
                if (td_ioengine_flagged(td, FIO_BIT_BASED))
-                       o->unit_base = 1;
+                       o->unit_base = N2S_BITPERSEC;
                else
-                       o->unit_base = 8;
+                       o->unit_base = N2S_BYTEPERSEC;
        }
 
 #ifndef FIO_HAVE_ANY_FALLOCATE

diff --git a/io_u.c b/io_u.c
index 633f6175170f4c88004c71fa14e756cf55d22480..5b4c0df06ad5774aa6ffde99407465b5d8335e61 100644 (file)
--- a/io_u.c
+++ b/io_u.c
@@ -610,11 +610,8 @@ int io_u_quiesce(struct thread_data *td)
         * io's that have been actually submitted to an async engine,
         * and cur_depth is meaningless for sync engines.
         */
-       if (td->io_u_queued || td->cur_depth) {
-               int fio_unused ret;
-
-               ret = td_io_commit(td);
-       }
+       if (td->io_u_queued || td->cur_depth)
+               td_io_commit(td);
 
        while (td->io_u_in_flight) {
                int ret;

diff --git a/ioengines.c b/ioengines.c
index a8ec79de473bf235424e9fac80996c112a744364..6ffd27f10ec9e303b16a7e00ffefec000cab67d2 100644 (file)
--- a/ioengines.c
+++ b/ioengines.c
@@ -276,11 +276,11 @@ out:
        return r;
 }
 
-int td_io_queue(struct thread_data *td, struct io_u *io_u)
+enum fio_q_status td_io_queue(struct thread_data *td, struct io_u *io_u)
 {
        const enum fio_ddir ddir = acct_ddir(io_u);
        unsigned long buflen = io_u->xfer_buflen;
-       int ret;
+       enum fio_q_status ret;
 
        dprint_io_u(io_u, "queue");
        fio_ro_check(td, io_u);
@@ -361,18 +361,13 @@ int td_io_queue(struct thread_data *td, struct io_u *io_u)
                        td->ts.total_io_u[io_u->ddir]++;
                }
        } else if (ret == FIO_Q_QUEUED) {
-               int r;
-
                td->io_u_queued++;
 
                if (ddir_rw(io_u->ddir) || ddir_sync(io_u->ddir))
                        td->ts.total_io_u[io_u->ddir]++;
 
-               if (td->io_u_queued >= td->o.iodepth_batch) {
-                       r = td_io_commit(td);
-                       if (r < 0)
-                               return r;
-               }
+               if (td->io_u_queued >= td->o.iodepth_batch)
+                       td_io_commit(td);
        }
 
        if (!td_ioengine_flagged(td, FIO_SYNCIO)) {
@@ -410,14 +405,14 @@ int td_io_init(struct thread_data *td)
        return ret;
 }
 
-int td_io_commit(struct thread_data *td)
+void td_io_commit(struct thread_data *td)
 {
        int ret;
 
        dprint(FD_IO, "calling ->commit(), depth %d\n", td->cur_depth);
 
        if (!td->cur_depth || !td->io_u_queued)
-               return 0;
+               return;
 
        io_u_mark_depth(td, td->io_u_queued);
 
@@ -432,8 +427,6 @@ int td_io_commit(struct thread_data *td)
         */
        td->io_u_in_flight += td->io_u_queued;
        td->io_u_queued = 0;
-
-       return 0;
 }
 
 int td_io_open_file(struct thread_data *td, struct fio_file *f)

diff --git a/ioengines.h b/ioengines.h
index a0674aeabebfd5cccc49fb2a578b736dbac58054..feb21db893456ae4ba5948d47f620f13e3ba3c46 100644 (file)
--- a/ioengines.h
+++ b/ioengines.h
@@ -7,12 +7,12 @@
 #include "flist.h"
 #include "io_u.h"
 
-#define FIO_IOOPS_VERSION      23
+#define FIO_IOOPS_VERSION      24
 
 /*
  * io_ops->queue() return values
  */
-enum {
+enum fio_q_status {
        FIO_Q_COMPLETED = 0,            /* completed sync */
        FIO_Q_QUEUED    = 1,            /* queued, will complete async */
        FIO_Q_BUSY      = 2,            /* no more room, call ->commit() */
@@ -26,7 +26,7 @@ struct ioengine_ops {
        int (*setup)(struct thread_data *);
        int (*init)(struct thread_data *);
        int (*prep)(struct thread_data *, struct io_u *);
-       int (*queue)(struct thread_data *, struct io_u *);
+       enum fio_q_status (*queue)(struct thread_data *, struct io_u *);
        int (*commit)(struct thread_data *);
        int (*getevents)(struct thread_data *, unsigned int, unsigned int, const struct timespec *);
        struct io_u *(*event)(struct thread_data *, int);
@@ -74,9 +74,9 @@ typedef void (*get_ioengine_t)(struct ioengine_ops **);
  */
 extern int __must_check td_io_init(struct thread_data *);
 extern int __must_check td_io_prep(struct thread_data *, struct io_u *);
-extern int __must_check td_io_queue(struct thread_data *, struct io_u *);
+extern enum fio_q_status __must_check td_io_queue(struct thread_data *, struct io_u *);
 extern int __must_check td_io_getevents(struct thread_data *, unsigned int, unsigned int, const struct timespec *);
-extern int __must_check td_io_commit(struct thread_data *);
+extern void td_io_commit(struct thread_data *);
 extern int __must_check td_io_open_file(struct thread_data *, struct fio_file *);
 extern int td_io_close_file(struct thread_data *, struct fio_file *);
 extern int td_io_unlink_file(struct thread_data *, struct fio_file *);

diff --git a/lib/num2str.c b/lib/num2str.c
index 387c5d7b322dc1947d095c9eeed03a8b3fae75a4..40fb3aec923d3ce6199b64d0cf4c791c92e2151a 100644 (file)
--- a/lib/num2str.c
+++ b/lib/num2str.c
@@ -14,22 +14,30 @@
  * @maxlen: max number of digits in the output string (not counting prefix and units, but counting .)
  * @base: multiplier for num (e.g., if num represents Ki, use 1024)
  * @pow2: select unit prefix - 0=power-of-10 decimal SI, nonzero=power-of-2 binary IEC
- * @units: select units - N2S_* macros defined in num2str.h
+ * @units: select units - N2S_* constants defined in num2str.h
  * @returns a malloc'd buffer containing "number[<unit prefix>][<units>]"
  */
-char *num2str(uint64_t num, int maxlen, int base, int pow2, int units)
+char *num2str(uint64_t num, int maxlen, int base, int pow2, enum n2s_unit units)
 {
        const char *sistr[] = { "", "k", "M", "G", "T", "P" };
        const char *iecstr[] = { "", "Ki", "Mi", "Gi", "Ti", "Pi" };
        const char **unitprefix;
-       const char *unitstr[] = { "", "/s", "B", "bit", "B/s", "bit/s" };
+       static const char *const unitstr[] = {
+               [N2S_NONE]      = "",
+               [N2S_PERSEC]    = "/s",
+               [N2S_BYTE]      = "B",
+               [N2S_BIT]       = "bit",
+               [N2S_BYTEPERSEC]= "B/s",
+               [N2S_BITPERSEC] = "bit/s"
+       };
        const unsigned int thousand[] = { 1000, 1024 };
        unsigned int modulo;
-       int unit_index = 0, post_index, carry = 0;
+       int post_index, carry = 0;
        char tmp[32], fmt[32];
        char *buf;
 
        compiletime_assert(sizeof(sistr) == sizeof(iecstr), "unit prefix arrays must be identical sizes");
+       assert(units < ARRAY_SIZE(unitstr));
 
        buf = malloc(128);
        if (!buf)
@@ -44,21 +52,18 @@ char *num2str(uint64_t num, int maxlen, int base, int pow2, int units)
                base /= thousand[!!pow2];
 
        switch (units) {
+       case N2S_NONE:
+               break;
        case N2S_PERSEC:
-               unit_index = 1;
                break;
        case N2S_BYTE:
-               unit_index = 2;
                break;
        case N2S_BIT:
-               unit_index = 3;
                num *= 8;
                break;
        case N2S_BYTEPERSEC:
-               unit_index = 4;
                break;
        case N2S_BITPERSEC:
-               unit_index = 5;
                num *= 8;
                break;
        }
@@ -87,7 +92,7 @@ done:
                        post_index = 0;
 
                sprintf(buf, "%llu%s%s", (unsigned long long) num,
-                       unitprefix[post_index], unitstr[unit_index]);
+                       unitprefix[post_index], unitstr[units]);
                return buf;
        }
 
@@ -110,6 +115,6 @@ done:
        sprintf(tmp, fmt, (double)modulo / (double)thousand[!!pow2]);
 
        sprintf(buf, "%llu.%s%s%s", (unsigned long long) num, &tmp[2],
-                       unitprefix[post_index], unitstr[unit_index]);
+                       unitprefix[post_index], unitstr[units]);
        return buf;
 }

diff --git a/lib/num2str.h b/lib/num2str.h
index 81358a1e3a4c734fd2c81f3afa73c8395c4d1f62..797288b5af891a616a082f161ac1fb32d6e663f9 100644 (file)
--- a/lib/num2str.h
+++ b/lib/num2str.h
@@ -3,13 +3,15 @@
 
 #include <inttypes.h>
 
-#define N2S_NONE       0
-#define N2S_BITPERSEC  1       /* match unit_base for bit rates */
-#define N2S_PERSEC     2
-#define N2S_BIT                3
-#define N2S_BYTE       4
-#define N2S_BYTEPERSEC 8       /* match unit_base for byte rates */
-
-extern char *num2str(uint64_t, int, int, int, int);
+enum n2s_unit {
+       N2S_NONE        = 0,
+       N2S_PERSEC      = 1,
+       N2S_BYTE        = 2,
+       N2S_BIT         = 3,
+       N2S_BYTEPERSEC  = 4,
+       N2S_BITPERSEC   = 5,
+};
+
+extern char *num2str(uint64_t, int, int, int, enum n2s_unit);
 
 #endif

diff --git a/options.c b/options.c
index 1b3ea04d203ac84c0a9179310182eb089518c26c..0b3a895d14d83ab00d5c495b9393e307bba1c4c2 100644 (file)
--- a/options.c
+++ b/options.c
@@ -4425,15 +4425,15 @@ struct fio_option fio_options[FIO_MAX_OPTS] = {
                .prio   = 1,
                .posval = {
                          { .ival = "0",
-                           .oval = 0,
+                           .oval = N2S_NONE,
                            .help = "Auto-detect",
                          },
                          { .ival = "8",
-                           .oval = 8,
+                           .oval = N2S_BYTEPERSEC,
                            .help = "Normal (byte based)",
                          },
                          { .ival = "1",
-                           .oval = 1,
+                           .oval = N2S_BITPERSEC,
                            .help = "Bit based",
                          },
                },

diff --git a/stat.c b/stat.c
index 7b9dd3b1f1f1384e990ad02b4fe9a8bdfdc6769f..c89a7f06e74824f857ddcfd22a0d45e320fa5826 100644 (file)
--- a/stat.c
+++ b/stat.c
@@ -362,7 +362,7 @@ static void stat_calc_lat(struct thread_stat *ts, double *dst,
  * To keep the terse format unaltered, add all of the ns latency
  * buckets to the first us latency bucket
  */
-void stat_calc_lat_nu(struct thread_stat *ts, double *io_u_lat_u)
+static void stat_calc_lat_nu(struct thread_stat *ts, double *io_u_lat_u)
 {
        unsigned long ntotal = 0, total = ddir_rw_sum(ts->total_io_u);
        int i;