#include "arch.h"
#include "os.h"
+#ifdef FIO_HAVE_SYSLET
+#include "syslet.h"
+#endif
+
enum fio_ddir {
DDIR_READ = 0,
DDIR_WRITE,
struct list_head list;
struct fio_file *file;
unsigned long long offset;
- unsigned int len;
+ unsigned long len;
enum fio_ddir ddir;
};
+#ifdef FIO_HAVE_SYSLET
+struct syslet_req {
+ struct syslet_uatom atom;
+ long ret;
+};
+#endif
+
/*
* The io unit
*/
#endif
#ifdef FIO_HAVE_SGIO
struct sg_io_hdr hdr;
+#endif
+#ifdef FIO_HAVE_SYSLET
+ struct syslet_req req;
#endif
};
struct timeval start_time;
* Allocated/set buffer and length
*/
void *buf;
- unsigned int buflen;
+ unsigned long buflen;
unsigned long long offset;
/*
* partial transfers / residual data counts
*/
void *xfer_buf;
- unsigned int xfer_buflen;
+ unsigned long xfer_buflen;
unsigned int resid;
unsigned int error;
struct list_head list;
};
+/*
+ * io_ops->queue() return values
+ */
+enum {
+ FIO_Q_COMPLETED = 0, /* completed sync */
+ FIO_Q_QUEUED = 1, /* queued, will complete async */
+ FIO_Q_BUSY = 2, /* no more room, call ->commit() */
+};
+
#define FIO_HDR_MAGIC 0xf00baaef
enum {
unsigned int unlink;
};
+struct thread_stat {
+ struct io_log *slat_log;
+ struct io_log *clat_log;
+ struct io_log *bw_log;
+
+ /*
+ * bandwidth and latency stats
+ */
+ struct io_stat clat_stat[2]; /* completion latency */
+ struct io_stat slat_stat[2]; /* submission latency */
+ struct io_stat bw_stat[2]; /* bandwidth stats */
+
+ unsigned long long stat_io_bytes[2];
+ struct timeval stat_sample_time[2];
+
+ /*
+ * fio system usage accounting
+ */
+ struct rusage ru_start;
+ struct rusage ru_end;
+ 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
/*
* This describes a single thread/process executing a fio job.
pthread_t thread;
int thread_number;
int groupid;
+ struct thread_stat ts;
enum fio_filetype filetype;
struct fio_file *files;
unsigned int nr_files;
unsigned int hugepage_size;
unsigned int rw_min_bs;
unsigned int thinktime;
+ unsigned int thinktime_spin;
unsigned int thinktime_blocks;
unsigned int fsync_blocks;
unsigned int start_delay;
unsigned int stonewall;
unsigned int numjobs;
unsigned int iodepth;
+ unsigned int iodepth_low;
os_cpu_mask_t cpumask;
unsigned int iolog;
unsigned int read_iolog;
*/
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;
/*
* Rate state
unsigned long long start_offset;
unsigned long long total_io_size;
+ unsigned long io_issues[2];
unsigned long long io_blocks[2];
unsigned long long io_bytes[2];
- unsigned long long zone_bytes;
unsigned long long this_io_bytes[2];
+ unsigned long long zone_bytes;
volatile int mutex;
/*
unsigned int cpuload;
unsigned int cpucycle;
- /*
- * bandwidth and latency stats
- */
- struct io_stat clat_stat[2]; /* completion latency */
- struct io_stat slat_stat[2]; /* submission latency */
- struct io_stat bw_stat[2]; /* bandwidth stats */
-
- unsigned long long stat_io_bytes[2];
- struct timeval stat_sample_time[2];
-
- struct io_log *slat_log;
- struct io_log *clat_log;
- struct io_log *bw_log;
-
struct timeval start; /* start of this loop */
struct timeval epoch; /* time job was started */
struct timeval end_time;/* time job ended */
- /*
- * fio system usage accounting
- */
- struct rusage ru_start;
- struct rusage ru_end;
- unsigned long usr_time;
- unsigned long sys_time;
- unsigned long ctx;
-
/*
* read/write mixed workload state
*/
};
/*
- * Used for passing io_u completion data
+ * Callback for io completion
*/
-struct io_completion_data {
- int nr; /* input */
-
- int error; /* output */
- unsigned long bytes_done[2]; /* output */
- struct timeval time; /* output */
-};
+typedef int (endio_handler)(struct io_u *);
#define DISK_UTIL_MSEC (250)
*/
extern void populate_verify_io_u(struct thread_data *, struct io_u *);
extern int get_next_verify(struct thread_data *td, struct io_u *);
-extern int do_io_u_verify(struct thread_data *, struct io_u **);
+extern int verify_io_u(struct io_u *);
/*
* Memory helpers
*/
#define queue_full(td) list_empty(&(td)->io_u_freelist)
extern struct io_u *__get_io_u(struct thread_data *);
-extern struct io_u *get_io_u(struct thread_data *, struct fio_file *);
+extern struct io_u *get_io_u(struct thread_data *);
extern void put_io_u(struct thread_data *, struct io_u *);
-extern void ios_completed(struct thread_data *, struct io_completion_data *);
-extern void io_completed(struct thread_data *, struct io_u *, struct io_completion_data *);
+extern void requeue_io_u(struct thread_data *, struct io_u **);
+extern long io_u_sync_complete(struct thread_data *, struct io_u *, endio_handler *);
+extern long io_u_queued_complete(struct thread_data *, int, endio_handler *);
+extern void io_u_queued(struct thread_data *, struct io_u *);
/*
* io engine entry points
extern int td_io_queue(struct thread_data *, struct io_u *);
extern int td_io_sync(struct thread_data *, struct fio_file *);
extern int td_io_getevents(struct thread_data *, int, int, struct timespec *);
+extern int td_io_commit(struct thread_data *);
/*
* This is a pretty crappy semaphore implementation, but with the use that fio
int (*init)(struct thread_data *);
int (*prep)(struct thread_data *, struct io_u *);
int (*queue)(struct thread_data *, struct io_u *);
+ int (*commit)(struct thread_data *);
int (*getevents)(struct thread_data *, int, int, struct timespec *);
struct io_u *(*event)(struct thread_data *, int);
int (*cancel)(struct thread_data *, struct io_u *);
void (*cleanup)(struct thread_data *);
void *data;
void *dlhandle;
+ unsigned long priv;
};
-#define FIO_IOOPS_VERSION 3
+#define FIO_IOOPS_VERSION 5
extern struct ioengine_ops *load_ioengine(struct thread_data *, const char *);
extern int register_ioengine(struct ioengine_ops *);
projects / fio.git / blobdiff