FIO_NODISKUTIL = 1 << 4, /* diskutil can't handle filename */
};
+enum fio_file_flags {
+ FIO_FILE_OPEN = 1 << 0, /* file is open */
+ FIO_FILE_UNLINK = 1 << 1, /* unlink on close */
+ FIO_FILE_CLOSING = 1 << 2, /* file being closed */
+};
+
/*
* Each thread_data structure has a number of files associated with it,
* this structure holds state information for a single file.
unsigned long file_data;
int fd;
};
- const char *file_name;
+ char *file_name;
void *mmap;
unsigned long long file_size;
unsigned long long real_file_size;
unsigned int num_maps;
unsigned int last_free_lookup;
- unsigned int unlink;
- unsigned int open;
+ int references;
+ enum fio_file_flags flags;
};
/*
int groupid;
struct thread_stat ts;
struct fio_file *files;
+ unsigned int files_index;
unsigned int nr_files;
unsigned int nr_open_files;
- unsigned int nr_uniq_files;
+ unsigned int nr_normal_files;
union {
unsigned int next_file;
os_random_state_t next_file_state;
unsigned int write_bw_log;
unsigned int norandommap;
unsigned int bs_unaligned;
+ unsigned int fsync_on_close;
unsigned int bs[2];
unsigned int min_bs[2];
unsigned int file_service_type;
unsigned int group_reporting;
unsigned int open_files;
+ char *opendir;
char *read_iolog_file;
char *write_iolog_file;
extern int __must_check generic_open_file(struct thread_data *, struct fio_file *);
extern void generic_close_file(struct thread_data *, struct fio_file *);
extern void add_file(struct thread_data *, const char *);
+extern void get_file(struct fio_file *);
+extern void put_file(struct thread_data *, struct fio_file *);
+extern int add_dir_files(struct thread_data *, const char *);
/*
* ETA/status stuff
#define for_each_td(td, i) \
for ((i) = 0, (td) = &threads[0]; (i) < (int) thread_number; (i)++, (td)++)
#define for_each_file(td, f, i) \
- for ((i) = 0, (f) = &(td)->files[0]; (i) < (td)->open_files; (i)++, (f)++)
+ for ((i) = 0, (f) = &(td)->files[0]; (i) < (td)->nr_files; (i)++, (f)++)
#define fio_assert(td, cond) do { \
if (!(cond)) { \