X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.h;h=5098ff8f615d42104f298f04867366a72256a159;hp=8c46b3f905b2d9eb5b320ca96d05e2b8117b8e8d;hb=96d32d518a0743a6c050057bc1562e4883e51c5d;hpb=0aabe160c38efc3c42157fac2a9af08e070341c6 diff --git a/fio.h b/fio.h index 8c46b3f9..5098ff8f 100644 --- a/fio.h +++ b/fio.h @@ -17,6 +17,7 @@ #include "crc32.h" #include "arch.h" #include "os.h" +#include "mutex.h" #ifdef FIO_HAVE_SYSLET #include "syslet.h" @@ -28,6 +29,16 @@ enum fio_ddir { DDIR_SYNC, }; +enum td_ddir { + TD_DDIR_READ = 1 << 0, + TD_DDIR_WRITE = 1 << 1, + 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_RAND, + TD_DDIR_RANDRW = TD_DDIR_RW | TD_DDIR_RAND, +}; + /* * Use for maintaining statistics */ @@ -71,8 +82,9 @@ struct io_piece { #ifdef FIO_HAVE_SYSLET struct syslet_req { - struct syslet_uatom atom; - long ret; + struct syslet_uatom atom; /* the atom to submit */ + struct syslet_uatom *head; /* head of the sequence */ + long ret; /* syscall return value */ }; #endif @@ -134,6 +146,11 @@ struct io_u { struct fio_file *file; struct list_head list; + + /* + * Callback for io completion + */ + int (*end_io)(struct io_u *); }; /* @@ -195,11 +212,17 @@ enum fio_filetype { 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_NETIO = 1 << 4, /* networked io */ - FIO_NULLIO = 1 << 5, /* no real data transfer (cpu/null) */ + FIO_RAWIO = 1 << 1, /* some sort of direct/raw io */ + FIO_DISKLESSIO = 1 << 2, /* no disk involved */ + FIO_NOEXTEND = 1 << 3, /* engine can't extend file */ + FIO_NODISKUTIL = 1 << 4, /* diskutil can't handle filename */ +}; + +enum fio_file_flags { + FIO_FILE_OPEN = 1 << 0, /* file is open */ + FIO_FILE_UNLINK = 1 << 1, /* unlink on close */ + FIO_FILE_CLOSING = 1 << 2, /* file being closed */ + FIO_FILE_EXISTS = 1 << 3, /* no need to create */ }; /* @@ -207,6 +230,8 @@ enum fio_ioengine_flags { * this structure holds state information for a single file. */ struct fio_file { + enum fio_filetype filetype; + /* * A file may not be a file descriptor, let the io engine decide */ @@ -229,10 +254,25 @@ struct fio_file { unsigned int num_maps; unsigned int last_free_lookup; - unsigned int unlink; + int references; + enum fio_file_flags flags; }; +/* + * 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; @@ -255,31 +295,39 @@ struct thread_stat { 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[2]; + + 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. */ struct thread_data { + int pad; char *description; char *name; char *directory; char *filename; - char verror[80]; + char *ioengine; + char verror[128]; pthread_t thread; int thread_number; int groupid; struct thread_stat ts; - enum fio_filetype filetype; struct fio_file *files; + unsigned int files_index; unsigned int nr_files; - unsigned int nr_uniq_files; + unsigned int nr_open_files; + unsigned int nr_normal_files; union { unsigned int next_file; os_random_state_t next_file_state; @@ -290,12 +338,10 @@ struct thread_data { size_t orig_buffer_size; volatile int terminate; volatile int runstate; - enum fio_ddir ddir; - unsigned int iomix; + enum td_ddir td_ddir; unsigned int ioprio; unsigned int last_was_sync; - unsigned int sequential; unsigned int odirect; unsigned int invalidate_cache; unsigned int create_serialize; @@ -312,6 +358,7 @@ struct thread_data { unsigned int write_bw_log; unsigned int norandommap; unsigned int bs_unaligned; + unsigned int fsync_on_close; unsigned int bs[2]; unsigned int min_bs[2]; @@ -336,6 +383,7 @@ struct thread_data { unsigned int numjobs; unsigned int iodepth; unsigned int iodepth_low; + unsigned int iodepth_batch; os_cpu_mask_t cpumask; unsigned int iolog; unsigned int read_iolog; @@ -344,6 +392,9 @@ struct thread_data { unsigned int rwmixwrite; unsigned int nice; unsigned int file_service_type; + unsigned int group_reporting; + unsigned int open_files; + char *opendir; char *read_iolog_file; char *write_iolog_file; @@ -368,12 +419,10 @@ struct thread_data { * 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 int io_u_queued; /* * Rate state @@ -386,7 +435,6 @@ struct thread_data { 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; @@ -397,7 +445,7 @@ struct thread_data { unsigned long long io_bytes[2]; unsigned long long this_io_bytes[2]; unsigned long long zone_bytes; - volatile int mutex; + struct fio_sem *mutex; /* * State for random io, a bitmap of blocks done vs not done @@ -412,7 +460,6 @@ struct thread_data { 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 @@ -438,6 +485,13 @@ struct thread_data { */ struct timeval timeout_end; struct itimerval timer; + + /* + * for fileservice, how often to switch to a new file + */ + unsigned int file_service_nr; + unsigned int file_service_left; + struct fio_file *file_service_file; }; /* @@ -472,6 +526,7 @@ enum { extern int exitall_on_terminate; extern int thread_number; +extern int nr_process, nr_thread; extern int shm_id; extern int groupid; extern int terse_output; @@ -482,9 +537,10 @@ extern unsigned long long mlock_size; extern struct thread_data *threads; -#define td_read(td) ((td)->ddir == DDIR_READ) -#define td_write(td) ((td)->ddir == DDIR_WRITE) -#define td_rw(td) ((td)->iomix != 0) +#define td_read(td) ((td)->td_ddir & TD_DDIR_READ) +#define td_write(td) ((td)->td_ddir & TD_DDIR_WRITE) +#define td_rw(td) (((td)->td_ddir & TD_DDIR_RW) == TD_DDIR_RW) +#define td_random(td) ((td)->td_ddir & TD_DDIR_RAND) #define BLOCKS_PER_MAP (8 * sizeof(long)) #define TO_MAP_BLOCK(td, f, b) ((b) - ((f)->file_offset / (td)->rw_min_bs)) @@ -534,11 +590,6 @@ struct disk_util { struct timeval time; }; -/* - * Callback for io completion - */ -typedef int (endio_handler)(struct io_u *); - #define DISK_UTIL_MSEC (250) #ifndef min @@ -588,7 +639,7 @@ extern unsigned long time_since_now(struct timeval *); extern unsigned long mtime_since_genesis(void); extern void __usec_sleep(unsigned int); extern void usec_sleep(struct thread_data *, unsigned long); -extern void rate_throttle(struct thread_data *, unsigned long, unsigned int, int); +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 set_genesis_time(void); @@ -606,6 +657,12 @@ 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 __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 *); +extern void add_file(struct thread_data *, const char *); +extern void get_file(struct fio_file *); +extern void put_file(struct thread_data *, struct fio_file *); +extern int add_dir_files(struct thread_data *, const char *); /* * ETA/status stuff @@ -653,11 +710,13 @@ 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 void requeue_io_u(struct thread_data *, struct io_u **); -extern long __must_check io_u_sync_complete(struct thread_data *, struct io_u *, endio_handler *); -extern long __must_check io_u_queued_complete(struct thread_data *, int, endio_handler *); +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 void io_u_mark_depth(struct thread_data *, struct io_u *); /* * io engine entry points @@ -668,30 +727,8 @@ extern int __must_check td_io_queue(struct thread_data *, struct io_u *); 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 *); - -/* - * This is a pretty crappy semaphore implementation, but with the use that fio - * has (just signalling start/go conditions), it doesn't have to be better. - * Naturally this would not work for any type of contended semaphore or - * for real locking. - */ -static inline void fio_sem_init(volatile int *sem, int val) -{ - *sem = val; -} - -static inline void fio_sem_down(volatile int *sem) -{ - while (*sem == 0) - usleep(10000); - - (*sem)--; -} - -static inline void fio_sem_up(volatile int *sem) -{ - (*sem)++; -} +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 *); /* * If logging output to a file, stderr should go to both stderr and f_err @@ -702,6 +739,9 @@ static inline void fio_sem_up(volatile int *sem) fprintf(stderr, ##args); \ } while (0) +FILE *get_f_out(void); +FILE *get_f_err(void); + struct ioengine_ops { struct list_head list; char name[16]; @@ -716,12 +756,13 @@ struct ioengine_ops { 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 *); @@ -738,7 +779,7 @@ extern void close_ioengine(struct thread_data *); #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) < (td)->nr_files; (i)++, (f)++) #define fio_assert(td, cond) do { \ if (!(cond)) { \