Initial suppor for sync_file_range()

[fio.git] / fio.h

diff --git a/fio.h b/fio.h
index b19101c20a4924892610bd78b0f6d645f3b93e9b..05911c00d1934f6368b5d7e28942a9deaae278a4 100644 (file)
--- a/fio.h
+++ b/fio.h
@@ -28,6 +28,9 @@
 #include "io_ddir.h"
 #include "ioengine.h"
 #include "iolog.h"
+#include "helpers.h"
+#include "options.h"
+#include "profile.h"
 
 #ifdef FIO_HAVE_GUASI
 #include <guasi.h>
@@ -42,6 +45,7 @@ struct group_run_stats {
        unsigned long long max_bw[2], min_bw[2];
        unsigned long long io_kb[2];
        unsigned long long agg[2];
+       unsigned int kb_base;
 };
 
 /*
@@ -62,6 +66,8 @@ enum fio_memtype {
 #define FIO_IO_U_LAT_U_NR 10
 #define FIO_IO_U_LAT_M_NR 12
 
+#define MAX_PATTERN_SIZE 512
+
 struct thread_stat {
        char *name;
        char *verror;
@@ -118,6 +124,8 @@ struct thread_stat {
        unsigned continue_on_error;
        unsigned long total_err_count;
        int first_error;
+
+       unsigned int kb_base;
 };
 
 struct bssplit {
@@ -134,6 +142,7 @@ struct thread_options {
        char *opendir;
        char *ioengine;
        enum td_ddir td_ddir;
+       unsigned int kb_base;
        unsigned int ddir_nr;
        unsigned int iodepth;
        unsigned int iodepth_low;
@@ -171,9 +180,10 @@ struct thread_options {
        unsigned int verifysort;
        unsigned int verify_interval;
        unsigned int verify_offset;
-       unsigned int verify_pattern;
+       char verify_pattern[MAX_PATTERN_SIZE];
        unsigned int verify_pattern_bytes;
        unsigned int verify_fatal;
+       unsigned int verify_async;
        unsigned int use_thread;
        unsigned int unlink;
        unsigned int do_disk_util;
@@ -209,6 +219,8 @@ struct thread_options {
        unsigned int numjobs;
        os_cpu_mask_t cpumask;
        unsigned int cpumask_set;
+       os_cpu_mask_t verify_cpumask;
+       unsigned int verify_cpumask_set;
        unsigned int iolog;
        unsigned int rwmixcycle;
        unsigned int rwmix[2];
@@ -216,6 +228,7 @@ struct thread_options {
        unsigned int file_service_type;
        unsigned int group_reporting;
        unsigned int fadvise_hint;
+       unsigned int fallocate;
        unsigned int zero_buffers;
        unsigned int refill_buffers;
        unsigned int time_based;
@@ -255,6 +268,22 @@ struct thread_options {
         * I/O Error handling
         */
        unsigned int continue_on_error;
+
+       /*
+        * Benchmark profile type
+        */
+       char *profile;
+
+       /*
+        * blkio cgroup support
+        */
+       char *cgroup;
+       unsigned int cgroup_weight;
+
+       unsigned int uid;
+       unsigned int gid;
+
+       unsigned int sync_file_range;
 };
 
 #define FIO_VERROR_SIZE        128
@@ -319,11 +348,22 @@ struct thread_data {
        struct flist_head io_u_freelist;
        struct flist_head io_u_busylist;
        struct flist_head io_u_requeues;
+       pthread_mutex_t io_u_lock;
+       pthread_cond_t free_cond;
+
+       /*
+        * async verify offload
+        */
+       struct flist_head verify_list;
+       pthread_t *verify_threads;
+       unsigned int nr_verify_threads;
+       pthread_cond_t verify_cond;
+       int verify_thread_exit;
 
        /*
         * Rate state
         */
-       unsigned long rate_usec_cycle[2];
+       unsigned long rate_nsec_cycle[2];
        long rate_pending_usleep[2];
        unsigned long rate_bytes[2];
        unsigned long rate_blocks[2];
@@ -379,6 +419,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
         */
@@ -389,6 +431,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;
 };
 
 /*
@@ -493,6 +541,7 @@ extern int in_ramp_time(struct thread_data *);
  */
 extern int __must_check parse_options(int, char **);
 extern int fio_options_parse(struct thread_data *, char **, int);
+extern void fio_keywords_init(void);
 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 *);
@@ -500,8 +549,9 @@ extern void fio_options_dup_and_init(struct option *);
 extern void options_mem_dupe(struct thread_data *);
 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
@@ -661,4 +711,26 @@ static inline int is_power_of_2(unsigned int val)
        return (val != 0 && ((val & (val - 1)) == 0));
 }
 
+/*
+ * We currently only need to do locking if we have verifier threads
+ * accessing our internal structures too
+ */
+static inline void td_io_u_lock(struct thread_data *td)
+{
+       if (td->o.verify_async)
+               pthread_mutex_lock(&td->io_u_lock);
+}
+
+static inline void td_io_u_unlock(struct thread_data *td)
+{
+       if (td->o.verify_async)
+               pthread_mutex_unlock(&td->io_u_lock);
+}
+
+static inline void td_io_u_free_notify(struct thread_data *td)
+{
+       if (td->o.verify_async)
+               pthread_cond_signal(&td->free_cond);
+}
+
 #endif