pre_read fixes
1) Add a specific runstate for pre-read, so we can see that this
is what the job is currently doing.
2) open/close files for pre-read
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
diff --git a/filesetup.c b/filesetup.c
index 2858018..9fd04da 100644
--- a/filesetup.c
+++ b/filesetup.c
@@ -121,11 +121,22 @@
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);
@@ -143,11 +154,16 @@
left -= bs;
continue;
} else {
+ printf("r=%d\n", r);
td_verror(td, EIO, "pre_read");
break;
}
}
+ td_set_runstate(td, old_runstate);
+
+ if (did_open)
+ td->io_ops->close_file(td, f);
free(b);
return 0;
}