do {
long r = os_random_long(&td->next_file_state);
- fileno = (unsigned int) ((double) (td->nr_files - 1) * r / (RAND_MAX + 1.0));
+ fileno = (unsigned int) ((double) (td->open_files * r) / (RAND_MAX + 1.0));
f = &td->files[fileno];
- if (f->fd != -1)
+ if (f->open)
return f;
} while (1);
}
f = &td->files[td->next_file];
td->next_file++;
- if (td->next_file >= td->nr_files)
+ if (td->next_file >= td->open_files)
td->next_file = 0;
- if (f->fd != -1)
+ if (f->open)
break;
f = NULL;
static struct fio_file *get_next_file(struct thread_data *td)
{
+ struct fio_file *f;
+
if (!td->nr_open_files)
return NULL;
+ f = td->file_service_file;
+ if (f && f->open && td->file_service_left--)
+ return f;
+
if (td->file_service_type == FIO_FSERVICE_RR)
- return get_next_file_rr(td);
+ f = get_next_file_rr(td);
else
- return get_next_file_rand(td);
+ f = get_next_file_rand(td);
+
+ td->file_service_file = f;
+ td->file_service_left = td->file_service_nr - 1;
+ return f;
}
struct io_u *__get_io_u(struct thread_data *td)
* No more to do for this file, close it
*/
io_u->file = NULL;
- close_file(td, f);
+ td_io_close_file(td, f);
+
+ /*
+ * probably not the right place to do this, but see
+ * if we need to open a new file
+ */
+ if (td->nr_open_files < td->nr_files &&
+ td->open_files != td->nr_files) {
+ int ret = td_io_open_file(td, f);
+
+ if (ret) {
+ put_io_u(td, io_u);
+ return NULL;
+ }
+ }
} while (1);
if (td->zone_bytes >= td->zone_size) {