Add support for O_ATOMIC

[fio.git] / thread_options.h

diff --git a/thread_options.h b/thread_options.h
index 68056dfb3475f18a82b459576b44d95408882cc2..44cbf91acb4ed81e72a5352267f8f9f46604b234 100644 (file)
--- a/thread_options.h
+++ b/thread_options.h
@@ -5,6 +5,8 @@
 #include "os/os.h"
 #include "stat.h"
 #include "gettime.h"
+#include "lib/ieee754.h"
+#include "td_error.h"
 
 /*
  * What type of allocation to use for io buffers
@@ -17,26 +19,8 @@ enum fio_memtype {
        MEM_MMAPHUGE,   /* memory mapped huge file */
 };
 
-/*
- * What type of errors to continue on when continue_on_error is used
- */
-enum error_type_bit {
-       ERROR_TYPE_READ_BIT = 0,
-       ERROR_TYPE_WRITE_BIT = 1,
-       ERROR_TYPE_VERIFY_BIT = 2,
-       ERROR_TYPE_CNT = 3,
-};
-
 #define ERROR_STR_MAX  128
 
-enum error_type {
-        ERROR_TYPE_NONE = 0,
-        ERROR_TYPE_READ = 1 << ERROR_TYPE_READ_BIT,
-        ERROR_TYPE_WRITE = 1 << ERROR_TYPE_WRITE_BIT,
-        ERROR_TYPE_VERIFY = 1 << ERROR_TYPE_VERIFY_BIT,
-        ERROR_TYPE_ANY = 0xffff,
-};
-
 #define BSSPLIT_MAX    64
 
 struct bssplit {
@@ -88,6 +72,7 @@ struct thread_options {
        enum file_lock_mode file_lock_mode;
 
        unsigned int odirect;
+       unsigned int oatomic;
        unsigned int invalidate_cache;
        unsigned int create_serialize;
        unsigned int create_fsync;
@@ -121,6 +106,7 @@ struct thread_options {
        unsigned int softrandommap;
        unsigned int bs_unaligned;
        unsigned int fsync_on_close;
+       unsigned int bs_is_seq_rand;
 
        unsigned int random_distribution;
 
@@ -129,6 +115,8 @@ struct thread_options {
 
        unsigned int random_generator;
 
+       unsigned int perc_rand[DDIR_RWDIR_CNT];
+
        unsigned int hugepage_size;
        unsigned int rw_min_bs;
        unsigned int thinktime;
@@ -170,7 +158,7 @@ struct thread_options {
 #endif
        unsigned int iolog;
        unsigned int rwmixcycle;
-       unsigned int rwmix[2];
+       unsigned int rwmix[DDIR_RWDIR_CNT];
        unsigned int nice;
        unsigned int ioprio;
        unsigned int ioprio_class;
@@ -249,6 +237,7 @@ struct thread_options {
        unsigned int flow_sleep;
 
        unsigned long long offset_increment;
+       unsigned long long number_ios;
 
        unsigned int sync_file_range;
 };
@@ -298,6 +287,7 @@ struct thread_options_pack {
        uint32_t file_lock_mode;
 
        uint32_t odirect;
+       uint32_t oatomic;
        uint32_t invalidate_cache;
        uint32_t create_serialize;
        uint32_t create_fsync;
@@ -331,6 +321,7 @@ struct thread_options_pack {
        uint32_t softrandommap;
        uint32_t bs_unaligned;
        uint32_t fsync_on_close;
+       uint32_t bs_is_seq_rand;
 
        uint32_t random_distribution;
        fio_fp64_t zipf_theta;
@@ -338,6 +329,8 @@ struct thread_options_pack {
 
        uint32_t random_generator;
 
+       uint32_t perc_rand[DDIR_RWDIR_CNT];
+
        uint32_t hugepage_size;
        uint32_t rw_min_bs;
        uint32_t thinktime;
@@ -371,7 +364,7 @@ struct thread_options_pack {
        uint32_t verify_cpumask_set;
        uint32_t iolog;
        uint32_t rwmixcycle;
-       uint32_t rwmix[2];
+       uint32_t rwmix[DDIR_RWDIR_CNT];
        uint32_t nice;
        uint32_t ioprio;
        uint32_t ioprio_class;
@@ -450,6 +443,7 @@ struct thread_options_pack {
        uint32_t flow_sleep;
 
        uint64_t offset_increment;
+       uint64_t number_ios;
 
        uint32_t sync_file_range;
 } __attribute__((packed));