/*
* size of the file, offset into file, and io size from that offset
*/
- unsigned long long real_file_size;
- unsigned long long file_offset;
- unsigned long long io_size;
+ uint64_t real_file_size;
+ uint64_t file_offset;
+ uint64_t io_size;
- unsigned long long last_pos;
- unsigned long long last_start;
+ uint64_t last_pos;
+ uint64_t last_start;
- unsigned long long first_write;
- unsigned long long last_write;
+ uint64_t first_write;
+ uint64_t last_write;
/*
* For use by the io engine
/*
* if io is protected by a semaphore, this is set
*/
- struct fio_mutex *lock;
- void *lock_owner;
- unsigned int lock_batch;
- enum fio_ddir lock_ddir;
+ union {
+ struct fio_mutex *lock;
+ struct fio_rwlock *rwlock;
+ };
/*
* block map for random io
struct disk_util *du;
};
+struct file_name {
+ struct flist_head list;
+ char *filename;
+};
+
#define FILE_FLAG_FNS(name) \
static inline void fio_file_set_##name(struct fio_file *f) \
{ \
- (f)->flags |= FIO_FILE_##name; \
+ (f)->flags = (enum fio_file_flags) ((f)->flags | FIO_FILE_##name); \
} \
static inline void fio_file_clear_##name(struct fio_file *f) \
{ \
- (f)->flags &= ~FIO_FILE_##name; \
+ (f)->flags = (enum fio_file_flags) ((f)->flags & ~FIO_FILE_##name); \
} \
static inline int fio_file_##name(struct fio_file *f) \
{ \
struct thread_data;
extern void close_files(struct thread_data *);
extern void close_and_free_files(struct thread_data *);
-extern unsigned long long get_start_offset(struct thread_data *);
+extern uint64_t get_start_offset(struct thread_data *, struct fio_file *);
extern int __must_check setup_files(struct thread_data *);
extern int __must_check file_invalidate_cache(struct thread_data *, struct fio_file *);
extern int __must_check generic_open_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 file_lookup_open(struct fio_file *f, int flags);
extern int __must_check pre_read_files(struct thread_data *);
-extern int add_file(struct thread_data *, const char *);
+extern int add_file(struct thread_data *, const char *, int, int);
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 dup_files(struct thread_data *, struct thread_data *);
extern int get_fileno(struct thread_data *, const char *);
extern void free_release_files(struct thread_data *);
-
-static inline void fio_file_reset(struct fio_file *f)
-{
- f->last_pos = f->file_offset;
- f->last_start = -1ULL;
- if (f->io_axmap)
- axmap_reset(f->io_axmap);
-}
+extern void filesetup_mem_free(void);
+void fio_file_reset(struct thread_data *, struct fio_file *);
+int fio_files_done(struct thread_data *);
#endif