did_open = 1;
}
- old_runstate = td->runstate;
- td_set_runstate(td, TD_PRE_READING);
+ old_runstate = td_bump_runstate(td, TD_PRE_READING);
bs = td->o.max_bs[DDIR_READ];
b = malloc(bs);
}
}
- td_set_runstate(td, old_runstate);
+ td_restore_runstate(td, old_runstate);
if (did_open)
td->io_ops->close_file(td, f);
dprint(FD_FILE, "setup files\n");
- old_state = td->runstate;
- td_set_runstate(td, TD_SETTING_UP);
+ old_state = td_bump_runstate(td, TD_SETTING_UP);
if (o->read_iolog_file)
goto done;
if (o->create_only)
td->done = 1;
- td_set_runstate(td, old_state);
+ td_restore_runstate(td, old_state);
return 0;
err_offset:
log_err("%s: you need to specify valid offset=\n", o->name);
err_out:
- td_set_runstate(td, old_state);
+ td_restore_runstate(td, old_state);
return 1;
}
if (td->o.random_distribution == FIO_RAND_DIST_RANDOM)
return 0;
- state = td->runstate;
- td_set_runstate(td, TD_SETTING_UP);
+ state = td_bump_runstate(td, TD_SETTING_UP);
+
for_each_file(td, f, i)
__init_rand_distribution(td, f);
- td_set_runstate(td, state);
+
+ td_restore_runstate(td, state);
return 1;
}
seed = td->rand_seeds[FIO_RAND_BLOCK_OFF];
- if (!lfsr_init(&f->lfsr, blocks, seed, seed & 0xF))
+ if (!lfsr_init(&f->lfsr, blocks, seed, 0))
continue;
} else if (!td->o.norandommap) {
f->io_axmap = axmap_new(blocks);
}
}
-int add_file(struct thread_data *td, const char *fname, int numjob)
+int add_file(struct thread_data *td, const char *fname, int numjob, int inc)
{
int cur_files = td->files_index;
char file_name[PATH_MAX];
if (!td->o.open_files)
td->o.open_files = 1;
+ if (inc)
+ td->o.nr_files++;
+
dprint(FD_FILE, "file %p \"%s\" added at %d\n", f, f->file_name,
cur_files);
return i;
}
- return add_file(td, fname, 0);
+ return add_file(td, fname, 0, 1);
}
void get_file(struct fio_file *f)
}
if (S_ISREG(sb.st_mode)) {
- add_file(td, full_path, 0);
- td->o.nr_files++;
+ add_file(td, full_path, 0, 1);
continue;
}
if (!S_ISDIR(sb.st_mode))