Add verify trim support

[fio.git] / fio.h

diff --git a/fio.h b/fio.h
index 2a762aa2e5427c93adfdc6cdf9426c3e60ec4b6a..e8c025d6880e2d3613abf43578acf3efbbd8dab5 100644 (file)
--- a/fio.h
+++ b/fio.h
@@ -11,7 +11,6 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
-#include <getopt.h>
 #include <inttypes.h>
 #include <assert.h>
 
@@ -32,6 +31,7 @@
 #include "options.h"
 #include "profile.h"
 #include "time.h"
+#include "lib/getopt.h"
 
 #ifdef FIO_HAVE_GUASI
 #include <guasi.h>
@@ -60,6 +60,14 @@ enum fio_memtype {
        MEM_MMAPHUGE,   /* memory mapped huge file */
 };
 
+/*
+ * offset generator types
+ */
+enum {
+       RW_SEQ_SEQ      = 0,
+       RW_SEQ_IDENT,
+};
+
 /*
  * How many depth levels to log
  */
@@ -80,6 +88,7 @@ struct thread_stat {
 
        struct io_log *slat_log;
        struct io_log *clat_log;
+       struct io_log *lat_log;
        struct io_log *bw_log;
 
        /*
@@ -87,6 +96,7 @@ struct thread_stat {
         */
        struct io_stat clat_stat[2];            /* completion latency */
        struct io_stat slat_stat[2];            /* submission latency */
+       struct io_stat lat_stat[2];             /* total latency */
        struct io_stat bw_stat[2];              /* bandwidth stats */
 
        unsigned long long stat_io_bytes[2];
@@ -110,8 +120,8 @@ struct thread_stat {
        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_io_u[3];
+       unsigned long short_io_u[3];
        unsigned long total_submit;
        unsigned long total_complete;
 
@@ -143,8 +153,9 @@ struct thread_options {
        char *opendir;
        char *ioengine;
        enum td_ddir td_ddir;
+       unsigned int rw_seq;
        unsigned int kb_base;
-       unsigned int ddir_nr;
+       unsigned int ddir_seq_nr;
        unsigned int iodepth;
        unsigned int iodepth_low;
        unsigned int iodepth_batch;
@@ -206,7 +217,7 @@ struct thread_options {
        unsigned int thinktime_blocks;
        unsigned int fsync_blocks;
        unsigned int fdatasync_blocks;
-       unsigned int start_delay;
+       unsigned long start_delay;
        unsigned long long timeout;
        unsigned long long ramp_time;
        unsigned int overwrite;
@@ -235,6 +246,7 @@ struct thread_options {
        unsigned int zero_buffers;
        unsigned int refill_buffers;
        unsigned int time_based;
+       unsigned int disable_lat;
        unsigned int disable_clat;
        unsigned int disable_slat;
        unsigned int disable_bw;
@@ -242,11 +254,17 @@ struct thread_options {
        unsigned int gtod_cpu;
        unsigned int gtod_offload;
        enum fio_cs clocksource;
+       unsigned int no_stall;
+       unsigned int trim_percentage;
+       unsigned int trim_batch;
+       unsigned int trim_zero;
+       unsigned long long trim_backlog;
 
        char *read_iolog_file;
        char *write_iolog_file;
        char *bw_log_file;
        char *lat_log_file;
+       char *replay_redirect;
 
        /*
         * Pre-run and post-run shell
@@ -333,12 +351,14 @@ struct thread_data {
 
        char *sysfs_root;
 
-       unsigned long rand_seeds[6];
+       unsigned long rand_seeds[7];
 
        os_random_state_t bsrange_state;
        os_random_state_t verify_state;
+       os_random_state_t trim_state;
 
        unsigned int verify_batch;
+       unsigned int trim_batch;
 
        int shm_id;
 
@@ -407,7 +427,7 @@ struct thread_data {
        os_random_state_t rwmix_state;
        unsigned long rwmix_issues;
        enum fio_ddir rwmix_ddir;
-       unsigned int ddir_nr;
+       unsigned int ddir_seq_nr;
 
        /*
         * IO history logs for verification. We use a tree for sorting,
@@ -422,6 +442,12 @@ struct thread_data {
         */
        struct flist_head io_log_list;
 
+       /*
+        * For tracking/handling discards
+        */
+       struct flist_head trim_list;
+       unsigned long trim_entries;
+
        /*
         * for fileservice, how often to switch to a new file
         */