mmap engine: allow large files on 32-bit archs

[fio.git] / filesetup.c

diff --git a/filesetup.c b/filesetup.c
index 28580188c1e98fc56aeb73d3e465c6d7d63e1cc2..a3f96a15ef0e2a965406c3c050d57cfa47bbce38 100644 (file)
--- a/filesetup.c
+++ b/filesetup.c
@@ -121,11 +121,22 @@ err:
 
 static int pre_read_file(struct thread_data *td, struct fio_file *f)
 {
-       int r;
+       int r, did_open = 0, old_runstate;
        unsigned long long left;
        unsigned int bs;
        char *b;
 
+       if (!(f->flags & FIO_FILE_OPEN)) {
+               if (td->io_ops->open_file(td, f)) {
+                       log_err("fio: cannot pre-read, failed to open file\n");
+                       return 1;
+               }
+               did_open = 1;
+       }
+
+       old_runstate = td->runstate;
+       td_set_runstate(td, TD_PRE_READING);
+
        bs = td->o.max_bs[DDIR_READ];
        b = malloc(bs);
        memset(b, 0, bs);
@@ -148,6 +159,10 @@ static int pre_read_file(struct thread_data *td, struct fio_file *f)
                }
        }
 
+       td_set_runstate(td, old_runstate);
+
+       if (did_open)
+               td->io_ops->close_file(td, f);
        free(b);
        return 0;
 }
@@ -240,8 +255,11 @@ static int __file_invalidate_cache(struct thread_data *td, struct fio_file *f,
 {
        int ret = 0;
 
-       if (len == -1ULL)
+       if (len == -1ULL) {
                len = f->io_size;
+               if (len == -1ULL && td->o.fill_device)
+                       return 0;
+       }
        if (off == -1ULL)
                off = f->file_offset;
 
@@ -251,8 +269,8 @@ static int __file_invalidate_cache(struct thread_data *td, struct fio_file *f,
        /*
         * FIXME: add blockdev flushing too
         */
-       if (f->mmap)
-               ret = madvise(f->mmap, len, MADV_DONTNEED);
+       if (f->mmap_ptr)
+               ret = madvise(f->mmap_ptr, f->mmap_sz, MADV_DONTNEED);
        else if (f->filetype == FIO_TYPE_FILE) {
                ret = fadvise(f->fd, off, len, POSIX_FADV_DONTNEED);
        } else if (f->filetype == FIO_TYPE_BD) {