#include "fio.h"
#include "hash.h"
+#include "verify.h"
struct io_completion_data {
int nr; /* input */
i = f->last_free_lookup;
*b = (i * BLOCKS_PER_MAP);
- while ((*b) * min_bs < f->real_file_size) {
+ while ((*b) * min_bs < f->real_file_size &&
+ (*b) * min_bs < f->io_size) {
if (f->file_map[i] != (unsigned int) -1) {
*b += ffz(f->file_map[i]);
if (*b > last_block(td, f, ddir))
* Check if it's time to seed a new data direction.
*/
if (td->io_issues[td->rwmix_ddir] >= td->rwmix_issues) {
- unsigned long long max_bytes;
enum fio_ddir ddir;
/*
* ranges too much
*/
ddir = get_rand_ddir(td);
- max_bytes = td->this_io_bytes[ddir];
- if (max_bytes >=
- (td->o.size * td->o.rwmix[ddir] / 100)) {
- if (!td->rw_end_set[ddir]) {
- td->rw_end_set[ddir] = 1;
- fio_gettime(&td->rw_end[ddir], NULL);
- }
-
- ddir ^= 1;
- }
if (ddir != td->rwmix_ddir)
set_rwmix_bytes(td);
/*
* Get next file to service by choosing one at random
*/
-static struct fio_file *get_next_file_rand(struct thread_data *td, int goodf,
- int badf)
+static struct fio_file *get_next_file_rand(struct thread_data *td, enum fio_file_flags goodf,
+ enum fio_file_flags badf)
{
struct fio_file *f;
int fno;
fno = (unsigned int) ((double) td->o.nr_files
* (r / (OS_RAND_MAX + 1.0)));
f = td->files[fno];
- if (f->flags & FIO_FILE_DONE)
+ if (fio_file_done(f))
continue;
- if (!(f->flags & FIO_FILE_OPEN)) {
+ if (!fio_file_open(f)) {
int err;
err = td_io_open_file(td, f);
td->next_file = 0;
dprint(FD_FILE, "trying file %s %x\n", f->file_name, f->flags);
- if (f->flags & FIO_FILE_DONE) {
+ if (fio_file_done(f)) {
f = NULL;
continue;
}
- if (!(f->flags & FIO_FILE_OPEN)) {
+ if (!fio_file_open(f)) {
int err;
err = td_io_open_file(td, f);
if (err) {
dprint(FD_FILE, "error %d on open of %s\n",
err, f->file_name);
+ f = NULL;
continue;
}
opened = 1;
}
f = td->file_service_file;
- if (f && (f->flags & FIO_FILE_OPEN) && !(f->flags & FIO_FILE_CLOSING)) {
+ if (f && fio_file_open(f) && !fio_file_closing(f)) {
if (td->o.file_service_type == FIO_FSERVICE_SEQ)
goto out;
if (td->file_service_left--)
if (td->o.file_service_type == FIO_FSERVICE_RR ||
td->o.file_service_type == FIO_FSERVICE_SEQ)
- f = get_next_file_rr(td, FIO_FILE_OPEN, FIO_FILE_CLOSING);
+ f = get_next_file_rr(td, FIO_FILE_open, FIO_FILE_closing);
else
- f = get_next_file_rand(td, FIO_FILE_OPEN, FIO_FILE_CLOSING);
+ f = get_next_file_rand(td, FIO_FILE_open, FIO_FILE_closing);
td->file_service_file = f;
td->file_service_left = td->file_service_nr - 1;
put_file_log(td, f);
td_io_close_file(td, f);
io_u->file = NULL;
- f->flags |= FIO_FILE_DONE;
+ fio_file_set_done(f);
td->nr_done_files++;
dprint(FD_FILE, "%s: is done (%d of %d)\n", f->file_name, td->nr_done_files, td->o.nr_files);
} while (1);
}
f = io_u->file;
- assert(f->flags & FIO_FILE_OPEN);
+ assert(fio_file_open(f));
if (io_u->ddir != DDIR_SYNC) {
if (!io_u->buflen && !(td->io_ops->flags & FIO_NOIO)) {
f->last_pos = io_u->offset + io_u->buflen;
- if (td->o.verify != VERIFY_NONE)
+ if (td->o.verify != VERIFY_NONE && io_u->ddir == DDIR_WRITE)
populate_verify_io_u(td, io_u);
else if (td->o.refill_buffers && io_u->ddir == DDIR_WRITE)
io_u_fill_buffer(td, io_u, io_u->xfer_buflen);
/*
* Set io data pointers.
*/
- io_u->endpos = io_u->offset + io_u->buflen;
io_u->xfer_buf = io_u->buf;
io_u->xfer_buflen = io_u->buflen;
&icd->time);
if (!td->o.disable_clat) {
- add_clat_sample(td, idx, usec);
+ add_clat_sample(td, idx, usec, bytes);
io_u_mark_latency(td, usec);
}
if (!td->o.disable_bw)
- add_bw_sample(td, idx, &icd->time);
+ add_bw_sample(td, idx, bytes, &icd->time);
}
if (td_write(td) && idx == DDIR_WRITE &&
unsigned long slat_time;
slat_time = utime_since(&io_u->start_time, &io_u->issue_time);
- add_slat_sample(td, io_u->ddir, slat_time);
+ add_slat_sample(td, io_u->ddir, io_u->xfer_buflen, slat_time);
}
}