#include <assert.h>
#include "compiler/compiler.h"
-#include "list.h"
+#include "flist.h"
#include "fifo.h"
#include "rbtree.h"
#include "arch/arch.h"
#include <guasi.h>
#endif
+#ifdef FIO_HAVE_SOLARISAIO
+#include <sys/asynch.h>
+#endif
+
enum fio_ddir {
DDIR_READ = 0,
DDIR_WRITE,
struct io_piece {
union {
struct rb_node rb_node;
- struct list_head list;
+ struct flist_head list;
};
union {
int fileno;
#endif
#ifdef FIO_HAVE_GUASI
guasi_req_t greq;
+#endif
+#ifdef FIO_HAVE_SOLARISAIO
+ aio_result_t resultp;
#endif
};
struct timeval start_time;
union {
unsigned int index;
unsigned int seen;
+ void *engine_data;
};
unsigned int flags;
struct fio_file *file;
- struct list_head list;
+ struct flist_head list;
/*
* Callback for io completion
VERIFY_MD5, /* md5 sum data blocks */
VERIFY_CRC64, /* crc64 sum data blocks */
VERIFY_CRC32, /* crc32 sum data blocks */
+ VERIFY_CRC32C, /* crc32c sum data blocks */
+ VERIFY_CRC32C_INTEL, /* crc32c sum data blocks with hw */
VERIFY_CRC16, /* crc16 sum data blocks */
VERIFY_CRC7, /* crc7 sum data blocks */
VERIFY_SHA256, /* sha256 sum data blocks */
* this structure holds state information for a single file.
*/
struct fio_file {
- struct list_head hash_list;
+ struct flist_head hash_list;
enum fio_filetype filetype;
/*
/*
* block map for random io
*/
- unsigned long *file_map;
+ unsigned int *file_map;
unsigned int num_maps;
unsigned int last_free_lookup;
* IO depth and latency stats
*/
unsigned int io_u_map[FIO_IO_U_MAP_NR];
+ unsigned int io_u_submit[FIO_IO_U_MAP_NR];
+ unsigned int io_u_complete[FIO_IO_U_MAP_NR];
unsigned int io_u_lat_u[FIO_IO_U_LAT_U_NR];
unsigned int io_u_lat_m[FIO_IO_U_LAT_M_NR];
unsigned long total_io_u[2];
unsigned long short_io_u[2];
+ unsigned long total_submit;
+ unsigned long total_complete;
unsigned long long io_bytes[2];
unsigned long runtime[2];
unsigned int iodepth;
unsigned int iodepth_low;
unsigned int iodepth_batch;
+ unsigned int iodepth_batch_complete;
unsigned long long size;
unsigned int fill_device;
unsigned long long start_offset;
unsigned int bs[2];
+ unsigned int ba[2];
unsigned int min_bs[2];
unsigned int max_bs[2];
struct bssplit *bssplit;
unsigned int invalidate_cache;
unsigned int create_serialize;
unsigned int create_fsync;
+ unsigned int create_on_open;
unsigned int end_fsync;
unsigned int sync_io;
unsigned int verify;
unsigned int fsync_blocks;
unsigned int start_delay;
unsigned long long timeout;
+ unsigned long long ramp_time;
unsigned int overwrite;
unsigned int bw_avg_time;
unsigned int loops;
unsigned int group_reporting;
unsigned int fadvise_hint;
unsigned int zero_buffers;
+ unsigned int refill_buffers;
unsigned int time_based;
+ unsigned int disable_clat;
+ unsigned int disable_slat;
+ unsigned int disable_bw;
+ unsigned int gtod_reduce;
+ unsigned int gtod_cpu;
+ unsigned int gtod_offload;
char *read_iolog_file;
char *write_iolog_file;
+ char *bw_log_file;
+ char *lat_log_file;
/*
* Pre-run and post-run shell
int groupid;
struct thread_stat ts;
struct fio_file **files;
+ unsigned int files_size;
unsigned int files_index;
unsigned int nr_open_files;
unsigned int nr_done_files;
*/
unsigned int cur_depth;
unsigned int io_u_queued;
- struct list_head io_u_freelist;
- struct list_head io_u_busylist;
- struct list_head io_u_requeues;
+ struct flist_head io_u_freelist;
+ struct flist_head io_u_busylist;
+ struct flist_head io_u_requeues;
/*
* Rate state
struct timeval epoch; /* time job was started */
struct timeval rw_end[2];
struct timeval last_issue;
+ struct timeval tv_cache;
+ unsigned int tv_cache_nr;
+ unsigned int tv_cache_mask;
unsigned int rw_end_set[2];
+ unsigned int ramp_time_over;
/*
* read/write mixed workload state
* if we are overwriting. Otherwise just use a fifo.
*/
struct rb_root io_hist_tree;
- struct list_head io_hist_list;
+ struct flist_head io_hist_list;
/*
* For IO replaying
*/
- struct list_head io_log_list;
-
- /*
- * timeout handling
- */
- struct timeval timeout_end;
- struct itimerval timer;
+ struct flist_head io_log_list;
/*
* for fileservice, how often to switch to a new file
};
/*
- * roundrobin available files, or choose one at random.
+ * roundrobin available files, or choose one at random, or do each one
+ * serially.
*/
enum {
FIO_FSERVICE_RANDOM = 1,
FIO_FSERVICE_RR = 2,
+ FIO_FSERVICE_SEQ = 3,
};
/*
FIO_ETA_NEVER,
};
-/*
- * 30 second per-io_u timeout, with 5 second intervals to avoid resetting
- * the timer on each queue operation.
- */
-#define IO_U_TIMEOUT_INC 5
-#define IO_U_TIMEOUT 30
-
#define __td_verror(td, err, msg, func) \
do { \
if ((td)->error) \
extern int eta_print;
extern unsigned long done_secs;
extern char *job_section;
+extern int fio_gtod_offload;
+extern int fio_gtod_cpu;
extern struct thread_data *threads;
assert(!(io_u->ddir == DDIR_WRITE && !td_write(td)));
}
-#define BLOCKS_PER_MAP (8 * sizeof(long))
+#define BLOCKS_PER_MAP (8 * sizeof(int))
#define TO_MAP_BLOCK(f, b) (b)
#define RAND_MAP_IDX(f, b) (TO_MAP_BLOCK(f, b) / BLOCKS_PER_MAP)
#define RAND_MAP_BIT(f, b) (TO_MAP_BLOCK(f, b) & (BLOCKS_PER_MAP - 1))
* Per-device disk util management
*/
struct disk_util {
- struct list_head list;
+ struct flist_head list;
+ /* If this disk is a slave, hook it into the master's
+ * list using this head.
+ */
+ struct flist_head slavelist;
char *name;
char *sysfs_root;
struct disk_util_stat dus;
struct disk_util_stat last_dus;
+ /* For software raids, this entry maintains pointers to the
+ * entries for the slave devices. The disk_util entries for
+ * the slaves devices should primarily be maintained through
+ * the disk_list list, i.e. for memory allocation and
+ * de-allocation, etc. Whereas this list should be used only
+ * for aggregating a software RAID's disk util figures.
+ */
+ struct flist_head slaves;
+
unsigned long msec;
struct timeval time;
};
extern void init_disk_util(struct thread_data *);
extern void update_rusage_stat(struct thread_data *);
extern void update_io_ticks(void);
-extern void disk_util_timer_arm(void);
extern void setup_log(struct io_log **);
extern void finish_log(struct thread_data *, struct io_log *, const char *);
+extern void finish_log_named(struct thread_data *, struct io_log *, const char *, const char *);
extern void __finish_log(struct io_log *, const char *);
extern struct io_log *agg_io_log[2];
extern int write_bw_log;
extern unsigned long mtime_since_now(struct timeval *);
extern unsigned long time_since_now(struct timeval *);
extern unsigned long mtime_since_genesis(void);
-extern void __usec_sleep(unsigned int);
+extern void usec_spin(unsigned int);
extern void usec_sleep(struct thread_data *, unsigned long);
extern void rate_throttle(struct thread_data *, unsigned long, unsigned int);
extern void fill_start_time(struct timeval *);
extern void fio_gettime(struct timeval *, void *);
+extern void fio_gtod_init(void);
+extern void fio_gtod_update(void);
extern void set_genesis_time(void);
+extern int ramp_time_over(struct thread_data *);
+extern int in_ramp_time(struct thread_data *);
/*
* Init/option functions
*/
extern int __must_check parse_options(int, char **);
-extern int fio_option_parse(struct thread_data *, const char *);
+extern int fio_options_parse(struct thread_data *, char **, int);
extern int fio_cmd_option_parse(struct thread_data *, const char *, char *);
extern void fio_fill_default_options(struct thread_data *);
extern int fio_show_option_help(const char *);
extern void close_files(struct thread_data *);
extern void close_and_free_files(struct thread_data *);
extern int __must_check setup_files(struct thread_data *);
-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 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 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 *);
*/
#ifdef FIO_HAVE_DISK_UTIL
extern void show_disk_util(void);
-extern void disk_util_timer_arm(void);
extern void init_disk_util(struct thread_data *);
extern void update_io_ticks(void);
#else
#define show_disk_util()
-#define disk_util_timer_arm()
#define init_disk_util(td)
#define update_io_ticks()
#endif
TD_NOT_CREATED = 0,
TD_CREATED,
TD_INITIALIZED,
+ TD_RAMP,
TD_RUNNING,
TD_VERIFYING,
TD_FSYNCING,
TD_REAPED,
};
+extern void td_set_runstate(struct thread_data *, int);
+
/*
* Verify helpers
*/
/*
* io unit handling
*/
-#define queue_full(td) list_empty(&(td)->io_u_freelist)
+#define queue_full(td) flist_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 *);
extern void put_io_u(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 void io_u_mark_depth(struct thread_data *, unsigned int);
+extern void io_u_fill_buffer(struct thread_data *td, struct io_u *, unsigned int);
+void io_u_mark_complete(struct thread_data *, unsigned int);
+void io_u_mark_submit(struct thread_data *, unsigned int);
+
+/*
+ * Reset stats after ramp time completes
+ */
+extern void reset_all_stats(struct thread_data *);
/*
* io engine entry points
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 int td_io_close_file(struct thread_data *, struct fio_file *);
+extern int __must_check td_io_get_file_size(struct thread_data *, struct fio_file *);
/*
* blktrace support
#endif
struct ioengine_ops {
- struct list_head list;
+ struct flist_head list;
char name[16];
int version;
int flags;
void (*cleanup)(struct thread_data *);
int (*open_file)(struct thread_data *, struct fio_file *);
int (*close_file)(struct thread_data *, struct fio_file *);
+ int (*get_file_size)(struct thread_data *, struct fio_file *);
void *data;
void *dlhandle;
};
-#define FIO_IOOPS_VERSION 9
+#define FIO_IOOPS_VERSION 10
extern struct ioengine_ops *load_ioengine(struct thread_data *, const char *);
extern void register_ioengine(struct ioengine_ops *);
} \
} while (0)
+static inline void fio_file_reset(struct fio_file *f)
+{
+ f->last_free_lookup = 0;
+ f->last_pos = f->file_offset;
+ if (f->file_map)
+ memset(f->file_map, 0, f->num_maps * sizeof(int));
+}
+
static inline void clear_error(struct thread_data *td)
{
td->error = 0;
struct fio_file *f = io_u->file;
dprint(FD_IO, "%s: io_u %p: off=%llu/len=%lu/ddir=%d", p, io_u,
- io_u->offset, io_u->buflen, io_u->ddir);
+ (unsigned long long) io_u->offset,
+ io_u->buflen, io_u->ddir);
if (fio_debug & (1 << FD_IO)) {
if (f)
log_info("/%s", f->file_name);
#define dprint_io_u(io_u, p)
#endif
+static inline int fio_fill_issue_time(struct thread_data *td)
+{
+ if (td->o.read_iolog_file ||
+ !td->o.disable_clat || !td->o.disable_slat || !td->o.disable_bw)
+ return 1;
+
+ return 0;
+}
+
#endif
projects / fio.git / blobdiff