[PATCH] Make ctrl-c work with network io and accept loop

[fio.git] / io_u.c

diff --git a/io_u.c b/io_u.c
index 5e53b81443cda688bdb42163dc2a5af4cc28fe04..34c7e6f44bce50fed649380d391977de9752b32c 100644 (file)
--- a/io_u.c
+++ b/io_u.c
@@ -27,13 +27,16 @@ static int random_map_free(struct thread_data *td, struct fio_file *f,
 static void mark_random_map(struct thread_data *td, struct fio_file *f,
                            struct io_u *io_u)
 {
 static void mark_random_map(struct thread_data *td, struct fio_file *f,
                            struct io_u *io_u)
 {

-       unsigned int min_bs = td->min_bs[io_u->ddir];
+       unsigned int min_bs = td->rw_min_bs;

        unsigned long long block;
        unsigned int blocks;
        unsigned long long block;
        unsigned int blocks;

+       unsigned int nr_blocks;

 
        block = io_u->offset / (unsigned long long) min_bs;
        blocks = 0;
 
        block = io_u->offset / (unsigned long long) min_bs;
        blocks = 0;

-       while (blocks < (io_u->buflen / min_bs)) {
+       nr_blocks = (io_u->buflen + min_bs - 1) / min_bs;
+
+       while (blocks < nr_blocks) {

                unsigned int idx, bit;
 
                if (!random_map_free(td, f, block))
                unsigned int idx, bit;
 
                if (!random_map_free(td, f, block))


@@ -61,11 +64,12 @@ static int get_next_free_block(struct thread_data *td, struct fio_file *f,
 {
        int i;
 
 {
        int i;
 

-       *b = 0;
-       i = 0;
+       i = f->last_free_lookup;
+       *b = (i * BLOCKS_PER_MAP);

        while ((*b) * td->rw_min_bs < f->real_file_size) {
                if (f->file_map[i] != -1UL) {
                        *b += ffz(f->file_map[i]);
        while ((*b) * td->rw_min_bs < f->real_file_size) {
                if (f->file_map[i] != -1UL) {
                        *b += ffz(f->file_map[i]);

+                       f->last_free_lookup = i;

                        return 0;
                }
 
                        return 0;
                }
 


@@ -82,14 +86,15 @@ static int get_next_free_block(struct thread_data *td, struct fio_file *f,
  * the last io issued.
  */
 static int get_next_offset(struct thread_data *td, struct fio_file *f,
  * the last io issued.
  */
 static int get_next_offset(struct thread_data *td, struct fio_file *f,

-                          unsigned long long *offset, int ddir)
+                          struct io_u *io_u)

 {
 {

+       const int ddir = io_u->ddir;

        unsigned long long b, rb;
        long r;
 
        if (!td->sequential) {
                unsigned long long max_blocks = f->file_size / td->min_bs[ddir];
        unsigned long long b, rb;
        long r;
 
        if (!td->sequential) {
                unsigned long long max_blocks = f->file_size / td->min_bs[ddir];

-               int loops = 50;
+               int loops = 5;

 
                do {
                        r = os_random_long(&td->random_state);
 
                do {
                        r = os_random_long(&td->random_state);


@@ -103,12 +108,14 @@ static int get_next_offset(struct thread_data *td, struct fio_file *f,
                if (!loops) {
                        if (get_next_free_block(td, f, &b))
                                return 1;
                if (!loops) {
                        if (get_next_free_block(td, f, &b))
                                return 1;

+
+                       b += f->file_offset / td->min_bs[ddir];

                }
        } else
                b = f->last_pos / td->min_bs[ddir];
 
                }
        } else
                b = f->last_pos / td->min_bs[ddir];
 

-       *offset = (b * td->min_bs[ddir]) + f->file_offset;
-       if (*offset > f->real_file_size)
+       io_u->offset = (b * td->min_bs[ddir]) + f->file_offset;
+       if (io_u->offset > f->real_file_size)

                return 1;
 
        return 0;
                return 1;
 
        return 0;


@@ -208,11 +215,19 @@ static int fill_io_u(struct thread_data *td, struct fio_file *f,
        io_u->ddir = get_rw_ddir(td);
 
        /*
        io_u->ddir = get_rw_ddir(td);
 
        /*

-        * No log, let the seq/rand engine retrieve the next position.
+        * No log, let the seq/rand engine retrieve the next buflen and
+        * position.

         */
         */

-       if (!get_next_offset(td, f, &io_u->offset, io_u->ddir)) {
-               io_u->buflen = get_next_buflen(td, io_u->ddir);
-               if (io_u->buflen) {
+       io_u->buflen = get_next_buflen(td, io_u->ddir);
+       if (io_u->buflen) {
+               if (!get_next_offset(td, f, io_u)) {
+                       /*
+                        * mark entry before potentially trimming io_u
+                        */
+                       if (!td->read_iolog && !td->sequential &&
+                           !td->norandommap)
+                               mark_random_map(td, f, io_u);
+

                        /*
                         * If using a write iolog, store this entry.
                         */
                        /*
                         * If using a write iolog, store this entry.
                         */


@@ -308,9 +323,6 @@ struct io_u *get_io_u(struct thread_data *td, struct fio_file *f)
                        return NULL;
                }
 
                        return NULL;
                }
 

-               if (!td->read_iolog && !td->sequential && !td->norandommap)
-                       mark_random_map(td, f, io_u);
-

                f->last_pos += io_u->buflen;
 
                if (td->verify != VERIFY_NONE)
                f->last_pos += io_u->buflen;
 
                if (td->verify != VERIFY_NONE)


@@ -322,6 +334,12 @@ struct io_u *get_io_u(struct thread_data *td, struct fio_file *f)
                return NULL;
        }
 
                return NULL;
        }
 

+       /*
+        * Set io data pointers.
+        */
+       io_u->xfer_buf = io_u->buf;
+       io_u->xfer_buflen = io_u->buflen;
+

        fio_gettime(&io_u->start_time, NULL);
        return io_u;
 }
        fio_gettime(&io_u->start_time, NULL);
        return io_u;
 }


@@ -379,5 +397,3 @@ void ios_completed(struct thread_data *td, struct io_completion_data *icd)
                put_io_u(td, io_u);
        }
 }
                put_io_u(td, io_u);
        }
 }

-
-