Ignore pre-read for FIO_NOIO td

[fio.git] / filesetup.c

diff --git a/filesetup.c b/filesetup.c
index f2e47b126e18a1127415e32dbca3d402497d19e0..bd971e8e1f032731ed3f72582c07beb486f34261 100644 (file)
--- a/filesetup.c
+++ b/filesetup.c
@@ -159,11 +159,18 @@ static int extend_file(struct thread_data *td, struct fio_file *f)
                }
        }
 
-       b = malloc(td->o.max_bs[DDIR_WRITE]);
-
        left = f->real_file_size;
+       bs = td->o.max_bs[DDIR_WRITE];
+       if (bs > left)
+               bs = left;
+
+       b = malloc(bs);
+       if (!b) {
+               td_verror(td, errno, "malloc");
+               goto err;
+       }
+
        while (left && !td->terminate) {
-               bs = td->o.max_bs[DDIR_WRITE];
                if (bs > left)
                        bs = left;
 
@@ -228,7 +235,8 @@ static int pre_read_file(struct thread_data *td, struct fio_file *f)
        unsigned int bs;
        char *b;
 
-       if (td_ioengine_flagged(td, FIO_PIPEIO))
+       if (td_ioengine_flagged(td, FIO_PIPEIO) ||
+           td_ioengine_flagged(td, FIO_NOIO))
                return 0;
 
        if (!fio_file_open(f)) {
@@ -241,8 +249,17 @@ static int pre_read_file(struct thread_data *td, struct fio_file *f)
 
        old_runstate = td_bump_runstate(td, TD_PRE_READING);
 
+       left = f->io_size;
        bs = td->o.max_bs[DDIR_READ];
+       if (bs > left)
+               bs = left;
+
        b = malloc(bs);
+       if (!b) {
+               td_verror(td, errno, "malloc");
+               ret = 1;
+               goto error;
+       }
        memset(b, 0, bs);
 
        if (lseek(f->fd, f->file_offset, SEEK_SET) < 0) {
@@ -252,8 +269,6 @@ static int pre_read_file(struct thread_data *td, struct fio_file *f)
                goto error;
        }
 
-       left = f->io_size;
-
        while (left && !td->terminate) {
                if (bs > left)
                        bs = left;
@@ -932,19 +947,17 @@ int setup_files(struct thread_data *td)
                        }
 
                        /*
-                        * We normally don't come here, but if the result is 0,
-                        * set it to the real file size. This could be size of
-                        * the existing one if it already exists, but otherwise
-                        * will be set to 0. A new file won't be created because
+                        * We normally don't come here for regular files, but
+                        * if the result is 0 for a regular file, set it to the
+                        * real file size. This could be size of the existing
+                        * one if it already exists, but otherwise will be set
+                        * to 0. A new file won't be created because
                         * ->io_size + ->file_offset equals ->real_file_size.
                         */
                        if (!f->io_size) {
                                if (f->file_offset > f->real_file_size)
                                        goto err_offset;
                                f->io_size = f->real_file_size - f->file_offset;
-                               log_info("fio: forcing file %s size to %llu\n",
-                                       f->file_name,
-                                       (unsigned long long)f->io_size);
                                if (!f->io_size)
                                        log_info("fio: file %s may be ignored\n",
                                                f->file_name);