int err, need_create, can_extend;
unsigned int i;
- for_each_file(td, f, i)
- f->file_size = td->total_file_size / td->nr_files;
+ for_each_file(td, f, i) {
+ if (f->filetype != FIO_TYPE_FILE)
+ continue;
+
+ f->file_size = td->total_file_size / td->nr_normal_files;
+ f->file_offset = td->start_offset;
+ }
/*
* unless specifically asked for overwrite, let normal io extend it
temp_stall_ts = 1;
fprintf(f_out, "%s: Laying out IO file(s) (%u x %LuMiB == %LuMiB)\n",
- td->name, td->nr_uniq_files,
- (td->total_file_size >> 20) / td->nr_uniq_files,
+ td->name, td->nr_normal_files,
+ (td->total_file_size >> 20) / td->nr_normal_files,
td->total_file_size >> 20);
err = 0;
for_each_file(td, f, i)
td->total_file_size += f->file_size;
- td->total_file_size = (td->total_file_size * td->nr_files) / td->open_files;
-
td->io_size = td->total_file_size;
if (td->io_size == 0) {
log_err("%s: no io blocks\n", td->name);
unsigned int i;
for_each_file(td, f, i) {
- if (!td->filename && (f->flags & FIO_FILE_UNLINK) &&
+ if (!f->file_name && (f->flags & FIO_FILE_UNLINK) &&
f->filetype == FIO_TYPE_FILE) {
unlink(f->file_name);
+ free(f->file_name);
f->file_name = NULL;
}
td->nr_files = 0;
}
-static void get_file_type(struct thread_data *td, struct fio_file *f)
+static void get_file_type(struct fio_file *f)
{
struct stat sb;
f->filetype = FIO_TYPE_FILE;
- if (!lstat(td->filename, &sb)) {
+ if (!lstat(f->file_name, &sb)) {
if (S_ISBLK(sb.st_mode))
f->filetype = FIO_TYPE_BD;
else if (S_ISCHR(sb.st_mode))
void add_file(struct thread_data *td, const char *fname)
{
- int cur_files = td->open_files;
+ int cur_files = td->files_index;
struct fio_file *f;
td->files = realloc(td->files, (cur_files + 1) * sizeof(*f));
f = &td->files[cur_files];
memset(f, 0, sizeof(*f));
f->fd = -1;
- f->file_name = fname;
+ f->file_name = strdup(fname);
+
+ get_file_type(f);
+
+ td->files_index++;
+ if (f->filetype == FIO_TYPE_FILE)
+ td->nr_normal_files++;
+}
+
+void get_file(struct fio_file *f)
+{
+ f->references++;
+}
- get_file_type(td, f);
+void put_file(struct thread_data *td, struct fio_file *f)
+{
+ if (!(f->flags & FIO_FILE_OPEN))
+ return;
+
+ assert(f->references);
+ if (--f->references)
+ return;
+
+ if (should_fsync(td) && td->fsync_on_close)
+ fsync(f->fd);
- td->open_files++;
- td->nr_uniq_files = td->open_files;
+ if (td->io_ops->close_file)
+ td->io_ops->close_file(td, f);
+ td->nr_open_files--;
+ f->flags &= ~FIO_FILE_OPEN;
}