projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
log: abstract out and use generic buffer logger
[fio.git]
/
file.h
diff --git
a/file.h
b/file.h
index eb0688c554c6b48b3cc72881897271a5fa1873be..d5595c1671f9e7d0194e463604b353117230ccd8 100644
(file)
--- a/
file.h
+++ b/
file.h
@@
-8,6
+8,7
@@
#include "lib/zipf.h"
#include "lib/axmap.h"
#include "lib/lfsr.h"
#include "lib/zipf.h"
#include "lib/axmap.h"
#include "lib/lfsr.h"
+#include "lib/gauss.h"
/*
* The type of object we are working on
/*
* The type of object we are working on
@@
-27,6
+28,8
@@
enum fio_file_flags {
FIO_FILE_size_known = 1 << 4, /* size has been set */
FIO_FILE_hashed = 1 << 5, /* file is on hash */
FIO_FILE_partial_mmap = 1 << 6, /* can't do full mmap */
FIO_FILE_size_known = 1 << 4, /* size has been set */
FIO_FILE_hashed = 1 << 5, /* file is on hash */
FIO_FILE_partial_mmap = 1 << 6, /* can't do full mmap */
+ FIO_FILE_axmap = 1 << 7, /* uses axmap */
+ FIO_FILE_lfsr = 1 << 8, /* lfsr is used */
};
enum file_lock_mode {
};
enum file_lock_mode {
@@
-73,13
+76,10
@@
struct fio_file {
/*
* filename and possible memory mapping
*/
/*
* filename and possible memory mapping
*/
- char *file_name;
unsigned int major, minor;
int fileno;
unsigned int major, minor;
int fileno;
-
- void *mmap_ptr;
- size_t mmap_sz;
- off_t mmap_off;
+ int bs;
+ char *file_name;
/*
* size of the file, offset into file, and io size from that offset
/*
* size of the file, offset into file, and io size from that offset
@@
-88,8
+88,11
@@
struct fio_file {
uint64_t file_offset;
uint64_t io_size;
uint64_t file_offset;
uint64_t io_size;
- uint64_t last_pos;
- uint64_t last_start;
+ /*
+ * Track last end and last start of IO for a given data direction
+ */
+ uint64_t last_pos[DDIR_RWDIR_CNT];
+ uint64_t last_start[DDIR_RWDIR_CNT];
uint64_t first_write;
uint64_t last_write;
uint64_t first_write;
uint64_t last_write;
@@
-102,22
+105,26
@@
struct fio_file {
/*
* if io is protected by a semaphore, this is set
*/
/*
* 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
+ * block map
or LFSR
for random io
*/
*/
- struct axmap *io_axmap;
-
- struct fio_lfsr lfsr;
+ union {
+ struct axmap *io_axmap;
+ struct fio_lfsr lfsr;
+ };
/*
* Used for zipf random distribution
*/
/*
* Used for zipf random distribution
*/
- struct zipf_state zipf;
+ union {
+ struct zipf_state zipf;
+ struct gauss_state gauss;
+ };
int references;
enum fio_file_flags flags;
int references;
enum fio_file_flags flags;
@@
-125,14
+132,23
@@
struct fio_file {
struct disk_util *du;
};
struct disk_util *du;
};
+#define FILE_ENG_DATA(f) ((void *) (uintptr_t) (f)->engine_data)
+#define FILE_SET_ENG_DATA(f, data) \
+ ((f)->engine_data = (uintptr_t) (data))
+
+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) \
{ \
#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) \
{ \
} \
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) \
{ \
} \
static inline int fio_file_##name(struct fio_file *f) \
{ \
@@
-146,6
+162,8
@@
FILE_FLAG_FNS(done);
FILE_FLAG_FNS(size_known);
FILE_FLAG_FNS(hashed);
FILE_FLAG_FNS(partial_mmap);
FILE_FLAG_FNS(size_known);
FILE_FLAG_FNS(hashed);
FILE_FLAG_FNS(partial_mmap);
+FILE_FLAG_FNS(axmap);
+FILE_FLAG_FNS(lfsr);
#undef FILE_FLAG_FNS
/*
#undef FILE_FLAG_FNS
/*
@@
-154,7
+172,7
@@
FILE_FLAG_FNS(partial_mmap);
struct thread_data;
extern void close_files(struct thread_data *);
extern void close_and_free_files(struct thread_data *);
struct thread_data;
extern void close_files(struct thread_data *);
extern void close_and_free_files(struct thread_data *);
-extern uint64_t 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 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 *);
@@
-162,7
+180,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 file_lookup_open(struct fio_file *f, int flags);
extern int __must_check pre_read_files(struct thread_data *);
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 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 *);
@@
-175,6
+193,8
@@
extern int init_random_map(struct thread_data *);
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 *);
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 *);
+extern void filesetup_mem_free(void);
void fio_file_reset(struct thread_data *, struct fio_file *);
void fio_file_reset(struct thread_data *, struct fio_file *);
+int fio_files_done(struct thread_data *);
#endif
#endif