verify: Reset verify_state before verification phase.

[fio.git] / backend.c

diff --git a/backend.c b/backend.c
index 243ddd393a576d6cc19d6a79385467ea9a5ee165..950333034e749154eb082e8ab3169c2794276aef 100644 (file)
--- a/backend.c
+++ b/backend.c
@@ -441,6 +441,12 @@ static int wait_for_completions(struct thread_data *td, struct timeval *time)
        int min_evts = 0;
        int ret;
 
+       if (td->flags & TD_F_REGROW_LOGS) {
+               ret = io_u_quiesce(td);
+               regrow_logs(td);
+               return ret;
+       }
+
        /*
         * if the queue is full, we MUST reap at least 1 event
         */
@@ -518,6 +524,9 @@ sync_done:
                                break;
                }
 
+               if (td->flags & TD_F_REGROW_LOGS)
+                       regrow_logs(td);
+
                /*
                 * when doing I/O (not when verifying),
                 * check for any errors that are to be ignored
@@ -594,6 +603,15 @@ static void do_verify(struct thread_data *td, uint64_t verify_bytes)
        if (td->error)
                return;
 
+       /*
+        * verify_state needs to be reset before verification
+        * proceeds so that expected random seeds match actual
+        * random seeds in headers. The main loop will reset
+        * all random number generators if randrepeat is set.
+        */
+       if (!td->o.rand_repeatable)
+               td_fill_verify_state_seed(td);
+
        td_set_runstate(td, TD_VERIFYING);
 
        io_u = NULL;
@@ -1419,7 +1437,6 @@ static void *thread_main(void *data)
        struct thread_data *td = fd->td;
        struct thread_options *o = &td->o;
        struct sk_out *sk_out = fd->sk_out;
-       pthread_condattr_t attr;
        int clear_state;
        int ret;
 
@@ -1444,12 +1461,18 @@ static void *thread_main(void *data)
        INIT_FLIST_HEAD(&td->verify_list);
        INIT_FLIST_HEAD(&td->trim_list);
        INIT_FLIST_HEAD(&td->next_rand_list);
-       pthread_mutex_init(&td->io_u_lock, NULL);
        td->io_hist_tree = RB_ROOT;
 
-       pthread_condattr_init(&attr);
-       pthread_cond_init(&td->verify_cond, &attr);
-       pthread_cond_init(&td->free_cond, &attr);
+       ret = mutex_cond_init_pshared(&td->io_u_lock, &td->free_cond);
+       if (ret) {
+               td_verror(td, ret, "mutex_cond_init_pshared");
+               goto err;
+       }
+       ret = cond_init_pshared(&td->verify_cond);
+       if (ret) {
+               td_verror(td, ret, "mutex_cond_pshared");
+               goto err;
+       }
 
        td_set_runstate(td, TD_INITIALIZED);
        dprint(FD_MUTEX, "up startup_mutex\n");
@@ -1471,6 +1494,14 @@ static void *thread_main(void *data)
                goto err;
        }
 
+       /*
+        * Do this early, we don't want the compress threads to be limited
+        * to the same CPUs as the IO workers. So do this before we set
+        * any potential CPU affinity
+        */
+       if (iolog_compress_init(td, sk_out))
+               goto err;
+
        /*
         * If we have a gettimeofday() thread, make sure we exclude that
         * thread from this job
@@ -1605,9 +1636,6 @@ static void *thread_main(void *data)
                        goto err;
        }
 
-       if (iolog_compress_init(td, sk_out))
-               goto err;
-
        fio_verify_init(td);
 
        if (rate_submit_init(td, sk_out))