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,
};
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) */
};
/*
unsigned int unlink;
};
+/*
+ * How many depth levels to log
+ */
+#define FIO_IO_U_MAP_NR 8
+#define FIO_IO_U_LAT_NR 12
+
struct thread_stat {
struct io_log *slat_log;
struct io_log *clat_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;
+};
/*
* 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;
- struct thread_stat ts;
+ struct thread_stat *ts;
+ struct thread_stat __ts;
enum fio_filetype filetype;
struct fio_file *files;
unsigned int nr_files;
+ unsigned int nr_open_files;
unsigned int nr_uniq_files;
union {
unsigned int next_file;
unsigned int rwmixwrite;
unsigned int nice;
unsigned int file_service_type;
+ unsigned int group_reporting;
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;
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 __must_check file_invalidate_cache(struct thread_data *, struct fio_file *);
/*
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 *);