if (td_random(td)) {
unsigned long long max_blocks = f->file_size / td->min_bs[ddir];
- int loops = 5;
+ int loops = 2;
do {
r = os_random_long(&td->random_state);
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)
return f;
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)
* 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)
+ reopen_file(td, f);
} while (1);
if (td->zone_bytes >= td->zone_size) {