rand: cleanup rand_between() and helpers

[fio.git] / engines / sync.c

diff --git a/engines/sync.c b/engines/sync.c
index 433e4fa24afaa6e7f94cb0d5cfa3ea2176558342..b3e1c9db8ba3eeb9d87567dc53b69de5759be715 100644 (file)
--- a/engines/sync.c
+++ b/engines/sync.c
@@ -10,15 +10,15 @@
 #include <unistd.h>
 #include <sys/uio.h>
 #include <errno.h>
-#include <assert.h>
 
 #include "../fio.h"
 #include "../optgroup.h"
+#include "../lib/rand.h"
 
 /*
  * Sync engine uses engine_data to store last offset
  */
-#define LAST_POS(f)    ((f)->engine_data)
+#define LAST_POS(f)    ((f)->engine_pos)
 
 struct syncio_data {
        struct iovec *iovecs;
@@ -30,12 +30,15 @@ struct syncio_data {
        unsigned long long last_offset;
        struct fio_file *last_file;
        enum fio_ddir last_ddir;
+
+       struct frand_state rand_state;
 };
 
 #ifdef FIO_HAVE_PWRITEV2
 struct psyncv2_options {
        void *pad;
        unsigned int hipri;
+       unsigned int hipri_percentage;
 };
 
 static struct fio_option options[] = {
@@ -48,6 +51,18 @@ static struct fio_option options[] = {
                .category = FIO_OPT_C_ENGINE,
                .group  = FIO_OPT_G_INVALID,
        },
+       {
+               .name   = "hipri_percentage",
+               .lname  = "RWF_HIPRI_PERCENTAGE",
+               .type   = FIO_OPT_INT,
+               .off1   = offsetof(struct psyncv2_options, hipri_percentage),
+               .minval = 0,
+               .maxval = 100,
+               .def    = "100",
+               .help   = "Probabilistically set RWF_HIPRI for pwritev2/preadv2",
+               .category = FIO_OPT_C_ENGINE,
+               .group  = FIO_OPT_G_INVALID,
+       },
        {
                .name   = NULL,
        },
@@ -95,9 +110,10 @@ 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 syncio_data *sd = td->io_ops_data;
        struct iovec *iov = &sd->iovecs[0];
        struct fio_file *f = io_u->file;
        int ret;
@@ -122,9 +138,10 @@ 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 syncio_data *sd = td->io_ops_data;
        struct psyncv2_options *o = td->eo;
        struct iovec *iov = &sd->iovecs[0];
        struct fio_file *f = io_u->file;
@@ -132,7 +149,8 @@ static int fio_pvsyncio2_queue(struct thread_data *td, struct io_u *io_u)
 
        fio_ro_check(td, io_u);
 
-       if (o->hipri)
+       if (o->hipri &&
+           (rand_between(&sd->rand_state, 1, 100) <= o->hipri_percentage))
                flags |= RWF_HIPRI;
 
        iov->iov_base = io_u->xfer_buf;
@@ -152,8 +170,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;
@@ -173,7 +191,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;
@@ -197,7 +216,7 @@ static int fio_vsyncio_getevents(struct thread_data *td, unsigned int min,
                                 unsigned int max,
                                 const struct timespec fio_unused *t)
 {
-       struct syncio_data *sd = td->io_ops->data;
+       struct syncio_data *sd = td->io_ops_data;
        int ret;
 
        if (min) {
@@ -212,14 +231,14 @@ static int fio_vsyncio_getevents(struct thread_data *td, unsigned int min,
 
 static struct io_u *fio_vsyncio_event(struct thread_data *td, int event)
 {
-       struct syncio_data *sd = td->io_ops->data;
+       struct syncio_data *sd = td->io_ops_data;
 
        return sd->io_us[event];
 }
 
 static int fio_vsyncio_append(struct thread_data *td, struct io_u *io_u)
 {
-       struct syncio_data *sd = td->io_ops->data;
+       struct syncio_data *sd = td->io_ops_data;
 
        if (ddir_sync(io_u->ddir))
                return 0;
@@ -244,9 +263,10 @@ 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;
+       struct syncio_data *sd = td->io_ops_data;
 
        fio_ro_check(td, io_u);
 
@@ -286,7 +306,7 @@ static int fio_vsyncio_queue(struct thread_data *td, struct io_u *io_u)
  */
 static int fio_vsyncio_end(struct thread_data *td, ssize_t bytes)
 {
-       struct syncio_data *sd = td->io_ops->data;
+       struct syncio_data *sd = td->io_ops_data;
        struct io_u *io_u;
        unsigned int i;
        int err;
@@ -326,7 +346,7 @@ static int fio_vsyncio_end(struct thread_data *td, ssize_t bytes)
 
 static int fio_vsyncio_commit(struct thread_data *td)
 {
-       struct syncio_data *sd = td->io_ops->data;
+       struct syncio_data *sd = td->io_ops_data;
        struct fio_file *f;
        ssize_t ret;
 
@@ -363,14 +383,15 @@ static int fio_vsyncio_init(struct thread_data *td)
        sd->last_offset = -1ULL;
        sd->iovecs = malloc(td->o.iodepth * sizeof(struct iovec));
        sd->io_us = malloc(td->o.iodepth * sizeof(struct io_u *));
+       init_rand(&sd->rand_state, 0);
 
-       td->io_ops->data = sd;
+       td->io_ops_data = sd;
        return 0;
 }
 
 static void fio_vsyncio_cleanup(struct thread_data *td)
 {
-       struct syncio_data *sd = td->io_ops->data;
+       struct syncio_data *sd = td->io_ops_data;
 
        if (sd) {
                free(sd->iovecs);