TD_DDIR_RAND = 1 << 2,
TD_DDIR_RW = TD_DDIR_READ | TD_DDIR_WRITE,
TD_DDIR_RANDREAD = TD_DDIR_READ | TD_DDIR_RAND,
- TD_DDIR_RANDWRITE = TD_DDIR_WRITE | TD_DDIR_READ,
+ TD_DDIR_RANDWRITE = TD_DDIR_WRITE | TD_DDIR_RAND,
TD_DDIR_RANDRW = TD_DDIR_RW | TD_DDIR_RAND,
};
enum fio_ioengine_flags {
FIO_SYNCIO = 1 << 0, /* io engine has synchronous ->queue */
FIO_CPUIO = 1 << 1, /* cpu burner, doesn't do real io */
- FIO_MMAPIO = 1 << 2, /* uses memory mapped io */
- FIO_RAWIO = 1 << 3, /* some sort of direct/raw io */
- FIO_DISKLESSIO = 1 << 4, /* no disk involved */
- FIO_SELFOPEN = 1 << 5, /* opens its own devices */
- FIO_NULLIO = 1 << 6, /* no real data transfer (cpu/null) */
+ FIO_RAWIO = 1 << 2, /* some sort of direct/raw io */
+ FIO_DISKLESSIO = 1 << 3, /* no disk involved */
};
/*
unsigned int last_free_lookup;
unsigned int unlink;
+ unsigned int open;
};
+/*
+ * How many depth levels to log
+ */
+#define FIO_IO_U_MAP_NR 8
+#define FIO_IO_U_LAT_NR 12
+
struct thread_stat {
+ char *name;
+ char *verror;
+ int error;
+ int groupid;
+ pid_t pid;
+ char *description;
+ int members;
+
struct io_log *slat_log;
struct io_log *clat_log;
struct io_log *bw_log;
unsigned long usr_time;
unsigned long sys_time;
unsigned long ctx;
-};
-/*
- * How many depth levels to log
- */
-#define FIO_IO_U_MAP_NR 8
-#define FIO_IO_U_LAT_NR 12
+ /*
+ * IO depth and latency stats
+ */
+ unsigned int io_u_map[FIO_IO_U_MAP_NR];
+ unsigned int io_u_lat[FIO_IO_U_LAT_NR];
+ unsigned long total_io_u;
+
+ unsigned long long io_bytes[2];
+ unsigned long runtime[2];
+ unsigned long total_run_time;
+};
/*
* This describes a single thread/process executing a fio job.
char *name;
char *directory;
char *filename;
- char verror[80];
+ char verror[128];
pthread_t thread;
int thread_number;
int groupid;
unsigned int rwmixwrite;
unsigned int nice;
unsigned int file_service_type;
+ unsigned int group_reporting;
+ unsigned int open_files;
char *read_iolog_file;
char *write_iolog_file;
* Current IO depth and list of free and busy io_u's.
*/
unsigned int cur_depth;
- unsigned int io_u_map[FIO_IO_U_MAP_NR];
- unsigned int io_u_lat[FIO_IO_U_LAT_NR];
- unsigned long total_io_u;
struct list_head io_u_freelist;
struct list_head io_u_busylist;
struct list_head io_u_requeues;
unsigned long rate_bytes;
struct timeval lastrate;
- unsigned long runtime[2]; /* msec */
unsigned long long io_size;
unsigned long long total_file_size;
unsigned long long start_offset;
struct timeval start; /* start of this loop */
struct timeval epoch; /* time job was started */
- struct timeval end_time;/* time job ended */
/*
* read/write mixed workload state
extern void close_files(struct thread_data *);
extern int __must_check setup_files(struct thread_data *);
extern int __must_check open_files(struct thread_data *);
-extern int open_file(struct thread_data *, struct fio_file *, int, int);
-extern void close_file(struct thread_data *, struct fio_file *);
+extern int reopen_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 *);
/*
* ETA/status stuff
extern long __must_check io_u_sync_complete(struct thread_data *, struct io_u *);
extern long __must_check io_u_queued_complete(struct thread_data *, int);
extern void io_u_queued(struct thread_data *, struct io_u *);
+extern void io_u_log_error(struct thread_data *, struct io_u *);
extern void io_u_init_timeout(void);
extern void io_u_set_timeout(struct thread_data *);
extern int __must_check td_io_sync(struct thread_data *, struct fio_file *);
extern int __must_check td_io_getevents(struct thread_data *, int, int, struct timespec *);
extern int __must_check td_io_commit(struct thread_data *);
+extern int __must_check td_io_open_file(struct thread_data *, struct fio_file *);
+extern void td_io_close_file(struct thread_data *, struct fio_file *);
/*
* This is a pretty crappy semaphore implementation, but with the use that fio
struct io_u *(*event)(struct thread_data *, int);
int (*cancel)(struct thread_data *, struct io_u *);
void (*cleanup)(struct thread_data *);
+ int (*open_file)(struct thread_data *, struct fio_file *);
+ void (*close_file)(struct thread_data *, struct fio_file *);
void *data;
void *dlhandle;
- unsigned long priv;
};
-#define FIO_IOOPS_VERSION 5
+#define FIO_IOOPS_VERSION 6
extern struct ioengine_ops *load_ioengine(struct thread_data *, const char *);
extern void register_ioengine(struct ioengine_ops *);
#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)->nr_files; (i)++, (f)++)
+ for ((i) = 0, (f) = &(td)->files[0]; (i) < (int) (td)->open_files; (i)++, (f)++)
#define fio_assert(td, cond) do { \
if (!(cond)) { \