X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=file.h;h=994d5fd0c828bd8de6c6c39bce44e42d45e11d8f;hp=30293fc9ddc34e4515a56cc8f5ab0091eb254030;hb=03e20d687566753b90383571e5e152c5142bdffd;hpb=44f29692cfba246981bb3c1b894333a6d2209f51 diff --git a/file.h b/file.h index 30293fc9..994d5fd0 100644 --- a/file.h +++ b/file.h @@ -47,13 +47,12 @@ struct fio_file { struct flist_head hash_list; enum fio_filetype filetype; - /* - * A file may not be a file descriptor, let the io engine decide - */ - union { - unsigned long file_data; - int fd; - }; + void *file_data; + int fd; +#ifdef __CYGWIN__ + HANDLE hFile; + HANDLE ioCP; +#endif /* * filename and possible memory mapping @@ -73,6 +72,7 @@ struct fio_file { unsigned long long io_size; unsigned long long last_pos; + unsigned long long last_start; unsigned long long first_write; unsigned long long last_write; @@ -139,6 +139,7 @@ extern int __must_check generic_close_file(struct thread_data *, struct fio_file extern int __must_check generic_get_file_size(struct thread_data *, struct fio_file *); extern int __must_check pre_read_files(struct thread_data *); extern int add_file(struct thread_data *, const char *); +extern int add_file_exclusive(struct thread_data *, const char *); extern void get_file(struct fio_file *); extern int __must_check put_file(struct thread_data *, struct fio_file *); extern void put_file_log(struct thread_data *, struct fio_file *); @@ -155,6 +156,7 @@ static inline void fio_file_reset(struct fio_file *f) { f->last_free_lookup = 0; f->last_pos = f->file_offset; + f->last_start = -1ULL; f->file_pos = -1ULL; if (f->file_map) memset(f->file_map, 0, f->num_maps * sizeof(int));