server: send return quit when asked to leave

[fio.git] / io_u.c

diff --git a/io_u.c b/io_u.c
index f4c4aa2ca432532d894d61c9559940c7b1ee43b4..77069c55277f8aeb0cd93d99754b12913cdfbaee 100644 (file)
--- a/io_u.c
+++ b/io_u.c
@@ -1129,6 +1129,7 @@ static int check_get_verify(struct thread_data *td, struct io_u *io_u)
 static void small_content_scramble(struct io_u *io_u)
 {
        unsigned int i, nr_blocks = io_u->buflen / 512;
+       unsigned long long boffset;
        unsigned int offset;
        void *p, *end;
 
@@ -1136,20 +1137,24 @@ static void small_content_scramble(struct io_u *io_u)
                return;
 
        p = io_u->xfer_buf;
+       boffset = io_u->offset;
+
        for (i = 0; i < nr_blocks; i++) {
                /*
                 * Fill the byte offset into a "random" start offset of
                 * the buffer, given by the product of the usec time
                 * and the actual offset.
                 */
-               offset = (io_u->start_time.tv_usec * io_u->offset) & 511;
+               offset = (io_u->start_time.tv_usec ^ boffset) & 511;
+               offset &= ~(sizeof(unsigned long long) - 1);
                if (offset >= 512 - sizeof(unsigned long long))
                        offset -= sizeof(unsigned long long);
-               *((unsigned long long *) p + offset) = io_u->offset;
+               memcpy(p + offset, &boffset, sizeof(boffset));
 
                end = p + 512 - sizeof(io_u->start_time);
                memcpy(end, &io_u->start_time, sizeof(io_u->start_time));
                p += 512;
+               boffset += 512;
        }
 }
 
@@ -1203,13 +1208,14 @@ struct io_u *get_io_u(struct thread_data *td)
                f->last_start = io_u->offset;
                f->last_pos = io_u->offset + io_u->buflen;
 
-               if (td->o.verify != VERIFY_NONE && io_u->ddir == DDIR_WRITE)
-                       populate_verify_io_u(td, io_u);
-               else if (td->o.refill_buffers && io_u->ddir == DDIR_WRITE)
-                       io_u_fill_buffer(td, io_u, io_u->xfer_buflen);
-               else if (io_u->ddir == DDIR_WRITE)
-                       do_scramble = 1;
-               else if (io_u->ddir == DDIR_READ) {
+               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)
+                               do_scramble = 1;
+               } else if (io_u->ddir == DDIR_READ) {
                        /*
                         * Reset the buf_filled parameters so next time if the
                         * buffer is used for writes it is refilled.