static int get_next_rand_offset(struct thread_data *td, struct fio_file *f,
int ddir, unsigned long long *b)
{
- unsigned long long max_blocks = f->file_size / td->o.min_bs[ddir];
+ unsigned long long max_blocks = f->io_size / td->o.min_bs[ddir];
unsigned long long r, rb;
int loops = 5;
if (get_next_rand_offset(td, f, ddir, &b))
return 1;
- } else
+ } else {
+ if (f->last_pos >= f->real_file_size)
+ return 1;
+
b = f->last_pos / td->o.min_bs[ddir];
+ }
io_u->offset = (b * td->o.min_bs[ddir]) + f->file_offset;
if (io_u->offset >= f->real_file_size)
buflen = (buflen + td->o.min_bs[ddir] - 1) & ~(td->o.min_bs[ddir] - 1);
}
- while (buflen + io_u->offset > f->real_file_size) {
- if (buflen == td->o.min_bs[ddir]) {
- if (!td->o.odirect) {
- assert(io_u->offset <= f->real_file_size);
- buflen = f->real_file_size - io_u->offset;
- return buflen;
- }
- return 0;
- }
-
- buflen = td->o.min_bs[ddir];
- }
-
return buflen;
}
*/
ddir = get_rand_ddir(td);
max_bytes = td->this_io_bytes[ddir];
- if (max_bytes >= (td->io_size * td->o.rwmix[ddir] / 100)) {
+ if (max_bytes >= (td->o.size * td->o.rwmix[ddir] / 100)) {
if (!td->rw_end_set[ddir]) {
td->rw_end_set[ddir] = 1;
memcpy(&td->rw_end[ddir], &now, sizeof(now));
fno = (unsigned int) ((double) td->o.nr_files * (r / (RAND_MAX + 1.0)));
f = &td->files[fno];
+ if (f->flags & FIO_FILE_DONE)
+ continue;
if ((!goodf || (f->flags & goodf)) && !(f->flags & badf))
return f;
if (td->next_file >= td->o.nr_files)
td->next_file = 0;
+ if (f->flags & FIO_FILE_DONE) {
+ f = NULL;
+ continue;
+ }
+
if ((!goodf || (f->flags & goodf)) && !(f->flags & badf))
break;
*/
io_u->file = NULL;
td_io_close_file(td, f);
+ f->flags |= FIO_FILE_DONE;
/*
* probably not the right place to do this, but see
f->last_pos += td->o.zone_skip;
}
- if (io_u->buflen + io_u->offset > f->real_file_size) {
- if (td->io_ops->flags & FIO_RAWIO) {
- put_io_u(td, io_u);
- return NULL;
- }
-
- io_u->buflen = f->real_file_size - io_u->offset;
- }
-
if (io_u->ddir != DDIR_SYNC) {
if (!io_u->buflen) {
put_io_u(td, io_u);