Add some more options for commands

[fio.git] / io_u.c

diff --git a/io_u.c b/io_u.c
index 10fa188dd9aa0eb6d7900cc6c6a151cafb337eba..c78865636b1f52f159bf8ef7d6846deb5fec5ef1 100644 (file)
--- a/io_u.c
+++ b/io_u.c
@@ -111,7 +111,10 @@ static int get_next_offset(struct thread_data *td, struct io_u *io_u)
 
                do {
                        r = os_random_long(&td->random_state);
-                       b = ((max_blocks - 1) * r / (unsigned long long) (RAND_MAX+1.0));
+                       if (!max_blocks)
+                               b = 0;
+                       else
+                               b = ((max_blocks - 1) * r / (unsigned long long) (RAND_MAX+1.0));
                        if (td->norandommap)
                                break;
                        rb = b + (f->file_offset / td->min_bs[ddir]);
@@ -151,8 +154,14 @@ static unsigned int get_next_buflen(struct thread_data *td, struct io_u *io_u)
        }
 
        while (buflen + io_u->offset > f->real_file_size) {
-               if (buflen == td->min_bs[ddir])
+               if (buflen == td->min_bs[ddir]) {
+                       if (!td->odirect) {
+                               assert(io_u->offset <= f->real_file_size);
+                               buflen = f->real_file_size - io_u->offset;
+                               return buflen;
+                       }
                        return 0;
+               }
 
                buflen = td->min_bs[ddir];
        }
@@ -478,13 +487,13 @@ set_file:
                 * probably not the right place to do this, but see
                 * if we need to open a new file
                 */
-               if (td->nr_open_files < td->nr_files &&
+               if (td->nr_open_files < td->open_files &&
                    td->open_files != td->nr_files) {
                        f = find_next_new_file(td);
 
                        if (!f || (ret = td_io_open_file(td, f))) {
                                put_io_u(td, io_u);
-                               break;
+                               return NULL;
                        }
                        goto set_file;
                }