unsigned long time;
unsigned long val;
enum fio_ddir ddir;
+ unsigned int bs;
};
/*
void *buf;
unsigned long buflen;
unsigned long long offset;
- unsigned long long endpos;
/*
* IO engine state, may be different from above when we get
int references;
enum fio_file_flags flags;
+
+ struct disk_util *du;
};
/*
unsigned int create_fsync;
unsigned int create_on_open;
unsigned int end_fsync;
+ unsigned int pre_read;
unsigned int sync_io;
unsigned int verify;
unsigned int do_verify;
unsigned long msec;
struct timeval time;
+
+ struct fio_mutex *lock;
+ unsigned long users;
};
+static inline void disk_util_inc(struct disk_util *du)
+{
+ if (du) {
+ fio_mutex_down(du->lock);
+ du->users++;
+ fio_mutex_up(du->lock);
+ }
+}
+
+static inline void disk_util_dec(struct disk_util *du)
+{
+ if (du) {
+ fio_mutex_down(du->lock);
+ du->users--;
+ fio_mutex_up(du->lock);
+ }
+}
+
#define DISK_UTIL_MSEC (250)
/*
/*
* Logging
*/
-extern void add_clat_sample(struct thread_data *, enum fio_ddir, unsigned long);
-extern void add_slat_sample(struct thread_data *, enum fio_ddir, unsigned long);
-extern void add_bw_sample(struct thread_data *, enum fio_ddir, struct timeval *);
+extern void add_clat_sample(struct thread_data *, enum fio_ddir, unsigned long,
+ unsigned int);
+extern void add_slat_sample(struct thread_data *, enum fio_ddir, unsigned long,
+ unsigned int);
+extern void add_bw_sample(struct thread_data *, enum fio_ddir, unsigned int,
+ struct timeval *);
extern void show_run_stats(void);
extern void init_disk_util(struct thread_data *);
extern void update_rusage_stat(struct thread_data *);
extern void __finish_log(struct io_log *, const char *);
extern struct io_log *agg_io_log[2];
extern int write_bw_log;
-extern void add_agg_sample(unsigned long, enum fio_ddir);
+extern void add_agg_sample(unsigned long, enum fio_ddir, unsigned int);
/*
* Time functions
extern int __must_check generic_open_file(struct thread_data *, struct fio_file *);
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 void get_file(struct fio_file *);
extern int __must_check put_file(struct thread_data *, struct fio_file *);
TD_INITIALIZED,
TD_RAMP,
TD_RUNNING,
+ TD_PRE_READING,
TD_VERIFYING,
TD_FSYNCING,
TD_EXITED,