Add buffer_compress_chunk option

[fio.git] / io_u.c

diff --git a/io_u.c b/io_u.c
index 8a033485e7cf9eee2adbb893ab2d13bd2695dde0..a0020d27b427e9bc21b184238898ac89bddd1e0c 100644 (file)
--- a/io_u.c
+++ b/io_u.c
@@ -668,7 +668,7 @@ static int fill_io_u(struct thread_data *td, struct io_u *io_u)
        /*
         * See if it's time to switch to a new zone
         */
-       if (td->zone_bytes >= td->o.zone_size) {
+       if (td->zone_bytes >= td->o.zone_size && td->o.zone_skip) {
                td->zone_bytes = 0;
                io_u->file->file_offset += td->o.zone_range + td->o.zone_skip;
                io_u->file->last_pos = io_u->file->file_offset;
@@ -1117,10 +1117,9 @@ static int check_get_verify(struct thread_data *td, struct io_u *io_u)
        if (td->o.verify_backlog && td->io_hist_len) {
                int get_verify = 0;
 
-               if (td->verify_batch) {
-                       td->verify_batch--;
+               if (td->verify_batch)
                        get_verify = 1;
-               } else if (!(td->io_hist_len % td->o.verify_backlog) &&
+               else if (!(td->io_hist_len % td->o.verify_backlog) &&
                         td->last_ddir != DDIR_READ) {
                        td->verify_batch = td->o.verify_batch;
                        if (!td->verify_batch)
@@ -1128,8 +1127,10 @@ static int check_get_verify(struct thread_data *td, struct io_u *io_u)
                        get_verify = 1;
                }
 
-               if (get_verify && !get_next_verify(td, io_u))
+               if (get_verify && !get_next_verify(td, io_u)) {
+                       td->verify_batch--;
                        return 1;
+               }
        }
 
        return 0;
@@ -1225,12 +1226,15 @@ struct io_u *get_io_u(struct thread_data *td)
                f->last_pos = io_u->offset + io_u->buflen;
 
                if (io_u->ddir == DDIR_WRITE) {
-                       if (td->o.verify != VERIFY_NONE)
-                               populate_verify_io_u(td, io_u);
-                       else if (td->o.refill_buffers)
-                               io_u_fill_buffer(td, io_u, io_u->xfer_buflen);
-                       else if (td->o.scramble_buffers)
+                       if (td->o.refill_buffers) {
+                               io_u_fill_buffer(td, io_u,
+                                       io_u->xfer_buflen, io_u->xfer_buflen);
+                       } else if (td->o.scramble_buffers)
                                do_scramble = 1;
+                       if (td->o.verify != VERIFY_NONE) {
+                               populate_verify_io_u(td, io_u);
+                               do_scramble = 0;
+                       }
                } else if (io_u->ddir == DDIR_READ) {
                        /*
                         * Reset the buf_filled parameters so next time if the
@@ -1375,7 +1379,8 @@ static void io_completed(struct thread_data *td, struct io_u *io_u,
                        }
                }
 
-               if (ramp_time_over(td) && td->runstate == TD_RUNNING) {
+               if (ramp_time_over(td) && (td->runstate == TD_RUNNING ||
+                                          td->runstate == TD_VERIFYING)) {
                        account_io_completion(td, io_u, icd, idx, bytes);
 
                        if (__should_check_rate(td, idx)) {
@@ -1531,12 +1536,21 @@ void io_u_queued(struct thread_data *td, struct io_u *io_u)
  * "randomly" fill the buffer contents
  */
 void io_u_fill_buffer(struct thread_data *td, struct io_u *io_u,
-                     unsigned int max_bs)
+                     unsigned int min_write, unsigned int max_bs)
 {
        io_u->buf_filled_len = 0;
 
-       if (!td->o.zero_buffers)
-               fill_random_buf(&td->buf_state, io_u->buf, max_bs);
-       else
+       if (!td->o.zero_buffers) {
+               unsigned int perc = td->o.compress_percentage;
+
+               if (perc) {
+                       unsigned int seg = min_write;
+
+                       seg = min(min_write, td->o.compress_chunk);
+                       fill_random_buf_percentage(&td->buf_state, io_u->buf,
+                                               perc, seg, max_bs);
+               } else
+                       fill_random_buf(&td->buf_state, io_u->buf, max_bs);
+       } else
                memset(io_u->buf, 0, max_bs);
 }