projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Init stat for all files, not just current range
[fio.git]
/
fio.h
diff --git
a/fio.h
b/fio.h
index e9f34e8ab550eb7c69ddf68d16f1e1056c82539c..465053ac675372e8c9a854af4cb7edba974b1b73 100644
(file)
--- a/
fio.h
+++ b/
fio.h
@@
-215,6
+215,13
@@
enum fio_ioengine_flags {
FIO_RAWIO = 1 << 1, /* some sort of direct/raw io */
FIO_DISKLESSIO = 1 << 2, /* no disk involved */
FIO_NOEXTEND = 1 << 3, /* engine can't extend file */
FIO_RAWIO = 1 << 1, /* some sort of direct/raw io */
FIO_DISKLESSIO = 1 << 2, /* no disk involved */
FIO_NOEXTEND = 1 << 3, /* engine can't extend file */
+ 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 */
};
/*
};
/*
@@
-222,6
+229,8
@@
enum fio_ioengine_flags {
* this structure holds state information for a single file.
*/
struct fio_file {
* this structure holds state information for a single file.
*/
struct fio_file {
+ enum fio_filetype filetype;
+
/*
* A file may not be a file descriptor, let the io engine decide
*/
/*
* A file may not be a file descriptor, let the io engine decide
*/
@@
-244,8
+253,8
@@
struct fio_file {
unsigned int num_maps;
unsigned int last_free_lookup;
unsigned int num_maps;
unsigned int last_free_lookup;
-
unsigned int unlink
;
-
unsigned int open
;
+
int references
;
+
enum fio_file_flags flags
;
};
/*
};
/*
@@
-313,11
+322,11
@@
struct thread_data {
int thread_number;
int groupid;
struct thread_stat ts;
int thread_number;
int groupid;
struct thread_stat ts;
- enum fio_filetype filetype;
struct fio_file *files;
struct fio_file *files;
+ unsigned int files_index;
unsigned int nr_files;
unsigned int nr_open_files;
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;
union {
unsigned int next_file;
os_random_state_t next_file_state;
@@
-647,6
+656,9
@@
extern int __must_check open_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 void generic_close_file(struct thread_data *, struct fio_file *);
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 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 *);
/*
* ETA/status stuff
/*
* ETA/status stuff
@@
-763,7
+775,9
@@
extern void close_ioengine(struct thread_data *);
#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) \
#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) < (int) (td)->open_files; (i)++, (f)++)
+ for ((i) = 0, (f) = &(td)->files[0]; (i) < (td)->open_files; (i)++, (f)++)
+#define for_all_files(td, f, i) \
+ for ((i) = 0, (f) = &(td)->files[0]; (i) < (td)->files_index; (i)++, (f)++)
#define fio_assert(td, cond) do { \
if (!(cond)) { \
#define fio_assert(td, cond) do { \
if (!(cond)) { \