projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix occasional hangs on mutexes
[fio.git]
/
thread_options.h
diff --git
a/thread_options.h
b/thread_options.h
index f9c156207795c643a874b129e85f36df9e376030..edf090da28d45880474badb129e6cbc2a08103f6 100644
(file)
--- a/
thread_options.h
+++ b/
thread_options.h
@@
-25,12
+25,18
@@
enum fio_memtype {
#define ERROR_STR_MAX 128
#define BSSPLIT_MAX 64
#define ERROR_STR_MAX 128
#define BSSPLIT_MAX 64
+#define ZONESPLIT_MAX 64
struct bssplit {
uint32_t bs;
uint32_t perc;
};
struct bssplit {
uint32_t bs;
uint32_t perc;
};
+struct zone_split {
+ uint8_t access_perc;
+ uint8_t size_perc;
+};
+
#define NR_OPTS_SZ (FIO_MAX_OPTS / (8 * sizeof(uint64_t)))
#define OPT_MAGIC 0x4f50544e
#define NR_OPTS_SZ (FIO_MAX_OPTS / (8 * sizeof(uint64_t)))
#define OPT_MAGIC 0x4f50544e
@@
-40,6
+46,7
@@
struct thread_options {
uint64_t set_options[NR_OPTS_SZ];
char *description;
char *name;
uint64_t set_options[NR_OPTS_SZ];
char *description;
char *name;
+ char *wait_for;
char *directory;
char *filename;
char *filename_format;
char *directory;
char *filename;
char *filename_format;
@@
-58,6
+65,8
@@
struct thread_options {
unsigned int iodepth_batch_complete_min;
unsigned int iodepth_batch_complete_max;
unsigned int iodepth_batch_complete_min;
unsigned int iodepth_batch_complete_max;
+ unsigned int unique_filename;
+
unsigned long long size;
unsigned long long io_limit;
unsigned int size_percent;
unsigned long long size;
unsigned long long io_limit;
unsigned int size_percent;
@@
-119,6
+128,7
@@
struct thread_options {
unsigned long long rand_seed;
unsigned int dep_use_os_rand;
unsigned int log_avg_msec;
unsigned long long rand_seed;
unsigned int dep_use_os_rand;
unsigned int log_avg_msec;
+ unsigned int log_max;
unsigned int log_offset;
unsigned int log_gz;
unsigned int log_gz_store;
unsigned int log_offset;
unsigned int log_gz;
unsigned int log_gz_store;
@@
-131,6
+141,10
@@
struct thread_options {
unsigned int verify_only;
unsigned int random_distribution;
unsigned int verify_only;
unsigned int random_distribution;
+ unsigned int exitall_error;
+
+ struct zone_split *zone_split[DDIR_RWDIR_CNT];
+ unsigned int zone_split_nr[DDIR_RWDIR_CNT];
fio_fp64_t zipf_theta;
fio_fp64_t pareto_h;
fio_fp64_t zipf_theta;
fio_fp64_t pareto_h;
@@
-288,6
+302,7
@@
struct thread_options_pack {
uint64_t set_options[NR_OPTS_SZ];
uint8_t description[FIO_TOP_STR_MAX];
uint8_t name[FIO_TOP_STR_MAX];
uint64_t set_options[NR_OPTS_SZ];
uint8_t description[FIO_TOP_STR_MAX];
uint8_t name[FIO_TOP_STR_MAX];
+ uint8_t wait_for[FIO_TOP_STR_MAX];
uint8_t directory[FIO_TOP_STR_MAX];
uint8_t filename[FIO_TOP_STR_MAX];
uint8_t filename_format[FIO_TOP_STR_MAX];
uint8_t directory[FIO_TOP_STR_MAX];
uint8_t filename[FIO_TOP_STR_MAX];
uint8_t filename_format[FIO_TOP_STR_MAX];
@@
-312,6
+327,7
@@
struct thread_options_pack {
uint32_t size_percent;
uint32_t fill_device;
uint32_t file_append;
uint32_t size_percent;
uint32_t fill_device;
uint32_t file_append;
+ uint32_t unique_filename;
uint64_t file_size_low;
uint64_t file_size_high;
uint64_t start_offset;
uint64_t file_size_low;
uint64_t file_size_high;
uint64_t start_offset;
@@
-366,6
+382,7
@@
struct thread_options_pack {
uint64_t rand_seed;
uint32_t dep_use_os_rand;
uint32_t log_avg_msec;
uint64_t rand_seed;
uint32_t dep_use_os_rand;
uint32_t log_avg_msec;
+ uint32_t log_max;
uint32_t log_offset;
uint32_t log_gz;
uint32_t log_gz_store;
uint32_t log_offset;
uint32_t log_gz;
uint32_t log_gz_store;
@@
-374,9
+391,13
@@
struct thread_options_pack {
uint32_t bs_unaligned;
uint32_t fsync_on_close;
uint32_t bs_is_seq_rand;
uint32_t bs_unaligned;
uint32_t fsync_on_close;
uint32_t bs_is_seq_rand;
+ uint32_t pad1;
uint32_t random_distribution;
uint32_t random_distribution;
- uint32_t pad;
+ uint32_t exitall_error;
+
+ struct zone_split zone_split[DDIR_RWDIR_CNT][ZONESPLIT_MAX];
+ uint32_t zone_split_nr[DDIR_RWDIR_CNT];
fio_fp64_t zipf_theta;
fio_fp64_t pareto_h;
fio_fp64_t zipf_theta;
fio_fp64_t pareto_h;
@@
-414,9
+435,14
@@
struct thread_options_pack {
uint32_t stonewall;
uint32_t new_group;
uint32_t numjobs;
uint32_t stonewall;
uint32_t new_group;
uint32_t numjobs;
+ /*
+ * We currently can't convert these, so don't enable them
+ */
+#if 0
uint8_t cpumask[FIO_TOP_STR_MAX];
uint8_t verify_cpumask[FIO_TOP_STR_MAX];
uint8_t log_gz_cpumask[FIO_TOP_STR_MAX];
uint8_t cpumask[FIO_TOP_STR_MAX];
uint8_t verify_cpumask[FIO_TOP_STR_MAX];
uint8_t log_gz_cpumask[FIO_TOP_STR_MAX];
+#endif
uint32_t cpus_allowed_policy;
uint32_t iolog;
uint32_t rwmixcycle;
uint32_t cpus_allowed_policy;
uint32_t iolog;
uint32_t rwmixcycle;
@@
-475,7
+501,6
@@
struct thread_options_pack {
uint32_t rate_iops[DDIR_RWDIR_CNT];
uint32_t rate_iops_min[DDIR_RWDIR_CNT];
uint32_t rate_process;
uint32_t rate_iops[DDIR_RWDIR_CNT];
uint32_t rate_iops_min[DDIR_RWDIR_CNT];
uint32_t rate_process;
- uint32_t padding_0; /* for alignment assert */
uint8_t ioscheduler[FIO_TOP_STR_MAX];
uint8_t ioscheduler[FIO_TOP_STR_MAX];
@@
-508,6
+533,7
@@
struct thread_options_pack {
uint64_t number_ios;
uint32_t sync_file_range;
uint64_t number_ios;
uint32_t sync_file_range;
+ uint32_t pad2;
uint64_t latency_target;
uint64_t latency_window;
uint64_t latency_target;
uint64_t latency_window;