X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.h;h=63778b65cbae974d83fbfccc4d7c5ffecf683e28;hp=6bb1949f9faed23d2d8977ed3df3f2db32dfd4ab;hb=408e0b90d74196f173c2008bc0034b70e9b56ddf;hpb=ff6bb260a1dbade1559f26892883690021aa4598 diff --git a/fio.h b/fio.h index 6bb1949f..63778b65 100644 --- a/fio.h +++ b/fio.h @@ -95,12 +95,25 @@ enum { FIO_RAND_SEQ_RAND_TRIM_OFF, FIO_RAND_START_DELAY, FIO_DEDUPE_OFF, + FIO_RAND_POISSON_OFF, FIO_RAND_NR_OFFS, }; enum { IO_MODE_INLINE = 0, - IO_MODE_OFFLOAD, + IO_MODE_OFFLOAD = 1, + + RATE_PROCESS_LINEAR = 0, + RATE_PROCESS_POISSON = 1, +}; + +/* + * Per-thread/process specific data. Only used for the network client + * for now. + */ +struct backend_data { + pthread_key_t key; + void *ptr; }; /* @@ -125,7 +138,7 @@ struct thread_data { struct io_log *bw_log; struct io_log *iops_log; - struct tp_data *tp_data; + struct workqueue log_compress_wq; struct thread_data *parent; @@ -243,7 +256,8 @@ struct thread_data { unsigned long rate_blocks[DDIR_RWDIR_CNT]; unsigned long rate_io_issue_bytes[DDIR_RWDIR_CNT]; struct timeval lastrate[DDIR_RWDIR_CNT]; - unsigned long long last_usec; + int64_t last_usec; + struct frand_state poisson_state; /* * Enforced rate submission/completion workqueue @@ -463,7 +477,7 @@ extern int __must_check fio_init_options(void); extern int __must_check parse_options(int, char **); extern int parse_jobs_ini(char *, int, int, int); extern int parse_cmd_line(int, char **, int); -extern int fio_backend(void); +extern int fio_backend(struct backend_data *); extern void reset_fio_state(void); extern void clear_io_state(struct thread_data *, int); extern int fio_options_parse(struct thread_data *, char **, int, int); @@ -534,8 +548,8 @@ extern void td_restore_runstate(struct thread_data *, int); */ #define FIO_REAP_TIMEOUT 60 -#define TERMINATE_ALL (-1) -extern void fio_terminate_threads(int); +#define TERMINATE_ALL (-1U) +extern void fio_terminate_threads(unsigned int); extern void fio_mark_td_terminate(struct thread_data *); /* @@ -560,6 +574,10 @@ extern int is_blktrace(const char *, int *); extern int load_blktrace(struct thread_data *, const char *, int); #endif +extern int io_queue_event(struct thread_data *td, struct io_u *io_u, int *ret, + enum fio_ddir ddir, uint64_t *bytes_issued, int from_verify, + struct timeval *comp_time); + /* * Latency target helpers */