Merge branch 'fix_verify' of https://github.com/charles-jacobsen/fio

diff --git a/backend.c b/backend.c
index 950333034e749154eb082e8ab3169c2794276aef..58c77cbc6fa3c2862b29eba289efe7ca2bb2bed5 100644 (file)
--- a/backend.c
+++ b/backend.c
@@ -2397,7 +2397,7 @@ int fio_backend(struct sk_out *sk_out)
                        for (i = 0; i < DDIR_RWDIR_CNT; i++) {
                                struct io_log *log = agg_io_log[i];
 
-                               flush_log(log, 0);
+                               flush_log(log, false);
                                free_log(log);
                        }
                }

diff --git a/iolog.c b/iolog.c
index ff521df4719818e2ecf368ef021e1763be5a1f3b..4c87f1cb88d723f90712da14474ce2d1fe71deba 100644 (file)
--- a/iolog.c
+++ b/iolog.c
@@ -965,7 +965,7 @@ int iolog_file_inflate(const char *file)
 
 #endif
 
-void flush_log(struct io_log *log, int do_append)
+void flush_log(struct io_log *log, bool do_append)
 {
        void *buf;
        FILE *f;

diff --git a/iolog.h b/iolog.h
index 0da70670c796ef1e8685394d88bb455a843d917b..a58e3f09376b843775f57428c8023c1fe31cb3e9 100644 (file)
--- a/iolog.h
+++ b/iolog.h
@@ -232,7 +232,7 @@ static inline bool per_unit_log(struct io_log *log)
 
 extern void finalize_logs(struct thread_data *td, bool);
 extern void setup_log(struct io_log **, struct log_params *, const char *);
-extern void flush_log(struct io_log *, int);
+extern void flush_log(struct io_log *, bool);
 extern void flush_samples(FILE *, void *, uint64_t);
 extern void free_log(struct io_log *);
 extern void fio_writeout_logs(bool);

diff --git a/rate-submit.c b/rate-submit.c
index 92cb6222cd0512e00dea844b7762e7c0c7250390..0c31f29f5aaafcc27c7dce14d66072f5c5567b08 100644 (file)
--- a/rate-submit.c
+++ b/rate-submit.c
@@ -14,7 +14,7 @@ static int io_workqueue_fn(struct submit_worker *sw,
 {
        struct io_u *io_u = container_of(work, struct io_u, work);
        const enum fio_ddir ddir = io_u->ddir;
-       struct thread_data *td = sw->private;
+       struct thread_data *td = sw->priv;
        int ret;
 
        dprint(FD_RATE, "io_u %p queued by %u\n", io_u, gettid());
@@ -61,7 +61,7 @@ static int io_workqueue_fn(struct submit_worker *sw,
 
 static bool io_workqueue_pre_sleep_flush_fn(struct submit_worker *sw)
 {
-       struct thread_data *td = sw->private;
+       struct thread_data *td = sw->priv;
 
        if (td->io_u_queued || td->cur_depth || td->io_u_in_flight)
                return true;
@@ -71,7 +71,7 @@ static bool io_workqueue_pre_sleep_flush_fn(struct submit_worker *sw)
 
 static void io_workqueue_pre_sleep_fn(struct submit_worker *sw)
 {
-       struct thread_data *td = sw->private;
+       struct thread_data *td = sw->priv;
        int ret;
 
        ret = io_u_quiesce(td);
@@ -84,20 +84,20 @@ static int io_workqueue_alloc_fn(struct submit_worker *sw)
        struct thread_data *td;
 
        td = calloc(1, sizeof(*td));
-       sw->private = td;
+       sw->priv = td;
        return 0;
 }
 
 static void io_workqueue_free_fn(struct submit_worker *sw)
 {
-       free(sw->private);
-       sw->private = NULL;
+       free(sw->priv);
+       sw->priv = NULL;
 }
 
 static int io_workqueue_init_worker_fn(struct submit_worker *sw)
 {
        struct thread_data *parent = sw->wq->td;
-       struct thread_data *td = sw->private;
+       struct thread_data *td = sw->priv;
        int fio_unused ret;
 
        memcpy(&td->o, &parent->o, sizeof(td->o));
@@ -145,7 +145,7 @@ err:
 static void io_workqueue_exit_worker_fn(struct submit_worker *sw,
                                        unsigned int *sum_cnt)
 {
-       struct thread_data *td = sw->private;
+       struct thread_data *td = sw->priv;
 
        (*sum_cnt)++;
        sum_thread_stats(&sw->wq->td->ts, &td->ts, *sum_cnt == 1);
@@ -213,7 +213,7 @@ static void sum_ddir(struct thread_data *dst, struct thread_data *src,
 
 static void io_workqueue_update_acct_fn(struct submit_worker *sw)
 {
-       struct thread_data *src = sw->private;
+       struct thread_data *src = sw->priv;
        struct thread_data *dst = sw->wq->td;
 
        if (td_read(src))

diff --git a/workqueue.h b/workqueue.h
index 1961b2ae8b631eba3d70b5e791e5b6f387a429d0..e35c181a23ea359a895a51cbab1815f279686d0b 100644 (file)
--- a/workqueue.h
+++ b/workqueue.h
@@ -16,7 +16,7 @@ struct submit_worker {
        unsigned int index;
        uint64_t seq;
        struct workqueue *wq;
-       void *private;
+       void *priv;
        struct sk_out *sk_out;
 };