X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.h;h=5038e4def239c6eaa50074549e97201cdd1a3770;hp=7eb02ad42dbbb9b66f7569ff6f82f34a6f2cf17d;hb=4780fa263c038646ab803b63f23f486b2b7b1140;hpb=79d16311c8d0c7188d73df77838fb1b4b6ff58db diff --git a/fio.h b/fio.h index 7eb02ad4..5038e4de 100644 --- a/fio.h +++ b/fio.h @@ -29,6 +29,9 @@ #include "ioengine.h" #include "iolog.h" #include "helpers.h" +#include "options.h" +#include "profile.h" +#include "time.h" #ifdef FIO_HAVE_GUASI #include @@ -236,6 +239,7 @@ struct thread_options { unsigned int gtod_reduce; unsigned int gtod_cpu; unsigned int gtod_offload; + enum fio_cs clocksource; char *read_iolog_file; char *write_iolog_file; @@ -280,6 +284,8 @@ struct thread_options { unsigned int uid; unsigned int gid; + + unsigned int sync_file_range; }; #define FIO_VERROR_SIZE 128 @@ -415,6 +421,8 @@ struct thread_data { unsigned int file_service_left; struct fio_file *file_service_file; + unsigned int sync_file_range_nr; + /* * For generating file sizes */ @@ -425,6 +433,12 @@ struct thread_data { */ unsigned int total_err_count; int first_error; + + /* + * Can be overloaded by profiles + */ + struct prof_io_ops prof_io_ops; + void *prof_data; }; /* @@ -469,6 +483,7 @@ extern unsigned long done_secs; extern char *job_section; extern int fio_gtod_offload; extern int fio_gtod_cpu; +extern enum fio_cs fio_clock_source; extern struct thread_data *threads; @@ -505,25 +520,6 @@ static inline int should_fsync(struct thread_data *td) return 0; } -/* - * Time functions - */ -extern unsigned long long utime_since(struct timeval *, struct timeval *); -extern unsigned long long utime_since_now(struct timeval *); -extern unsigned long mtime_since(struct timeval *, struct timeval *); -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_spin(unsigned int); -extern void usec_sleep(struct thread_data *, unsigned long); -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 */ @@ -539,7 +535,7 @@ extern void options_mem_free(struct thread_data *); extern void td_fill_rand_seeds(struct thread_data *); extern void add_job_opts(const char **); #define FIO_GETOPT_JOB 0x89988998 -#define FIO_NR_OPTIONS 128 +#define FIO_NR_OPTIONS (FIO_MAX_OPTS + 128) /* * ETA/status stuff