gettime: fix cycles_per_msec overflow when using 32 bit longs

[fio.git] / thread_options.h

diff --git a/thread_options.h b/thread_options.h
index 2b2df3384fb12f5c24c311f32bc259515919d439..1813cdc706a89a5a493386e7f7d0345abf3fae3a 100644 (file)
--- a/thread_options.h
+++ b/thread_options.h
@@ -20,6 +20,7 @@ enum fio_memtype {
        MEM_MMAP,       /* use anonynomous mmap */
        MEM_MMAPHUGE,   /* memory mapped huge file */
        MEM_MMAPSHARED, /* use mmap with shared flag */
+       MEM_CUDA_MALLOC,/* use GPU memory */
 };
 
 #define ERROR_STR_MAX  128
@@ -52,6 +53,7 @@ struct thread_options {
        char *filename_format;
        char *opendir;
        char *ioengine;
+       char *ioengine_so_path;
        char *mmapfile;
        enum td_ddir td_ddir;
        unsigned int rw_seq;
@@ -64,6 +66,7 @@ struct thread_options {
        unsigned int iodepth_batch;
        unsigned int iodepth_batch_complete_min;
        unsigned int iodepth_batch_complete_max;
+       unsigned int serialize_overlap;
 
        unsigned int unique_filename;
 
@@ -101,6 +104,7 @@ struct thread_options {
        unsigned int end_fsync;
        unsigned int pre_read;
        unsigned int sync_io;
+       unsigned int write_hint;
        unsigned int verify;
        unsigned int do_verify;
        unsigned int verifysort;
@@ -198,6 +202,9 @@ struct thread_options {
        unsigned short numa_mem_mode;
        unsigned int numa_mem_prefer_node;
        char *numa_memnodes;
+       unsigned int gpu_dev_id;
+       unsigned int start_offset_percent;
+
        unsigned int iolog;
        unsigned int rwmixcycle;
        unsigned int rwmix[DDIR_RWDIR_CNT];
@@ -233,6 +240,7 @@ struct thread_options {
        unsigned int trim_zero;
        unsigned long long trim_backlog;
        unsigned int clat_percentiles;
+       unsigned int lat_percentiles;
        unsigned int percentile_precision;      /* digits after decimal for percentiles */
        fio_fp64_t percentile_list[FIO_IO_U_LIST_MAX_LEN];
 
@@ -301,7 +309,6 @@ struct thread_options {
        fio_fp64_t latency_percentile;
 
        unsigned block_error_hist;
-       unsigned int skip_bad;
 
        unsigned int replay_align;
        unsigned int replay_scale;
@@ -336,7 +343,8 @@ struct thread_options_pack {
        uint32_t iodepth_batch;
        uint32_t iodepth_batch_complete_min;
        uint32_t iodepth_batch_complete_max;
-       uint32_t __proper_alignment_for_64b;
+       uint32_t serialize_overlap;
+       uint32_t lat_percentiles;
 
        uint64_t size;
        uint64_t io_size;
@@ -373,6 +381,7 @@ struct thread_options_pack {
        uint32_t end_fsync;
        uint32_t pre_read;
        uint32_t sync_io;
+       uint32_t write_hint;
        uint32_t verify;
        uint32_t do_verify;
        uint32_t verifysort;
@@ -411,10 +420,10 @@ struct thread_options_pack {
        uint32_t bs_unaligned;
        uint32_t fsync_on_close;
        uint32_t bs_is_seq_rand;
-       uint32_t pad1;
 
        uint32_t random_distribution;
        uint32_t exitall_error;
+       uint32_t pad;
 
        struct zone_split zone_split[DDIR_RWDIR_CNT][ZONESPLIT_MAX];
        uint32_t zone_split_nr[DDIR_RWDIR_CNT];
@@ -467,6 +476,8 @@ struct thread_options_pack {
        uint8_t verify_cpumask[FIO_TOP_STR_MAX];
        uint8_t log_gz_cpumask[FIO_TOP_STR_MAX];
 #endif
+       uint32_t gpu_dev_id;
+       uint32_t start_offset_percent;
        uint32_t cpus_allowed_policy;
        uint32_t iolog;
        uint32_t rwmixcycle;
@@ -572,7 +583,6 @@ struct thread_options_pack {
        fio_fp64_t latency_percentile;
 
        uint32_t block_error_hist;
-       uint32_t skip_bad;
 
        uint32_t replay_align;
        uint32_t replay_scale;