X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=parse.h;h=cf15ce0855fbb6efff797f7ff6a6c0cb88af6056;hp=030a18067fc04638573c5952fbcbc17b896487ed;hb=6a79a4cbe0c9c9a72a1064b55fdefbcb6257942d;hpb=e8b0e958cd219cabb1154e2b06036863a7d6dbd7 diff --git a/parse.h b/parse.h index 030a1806..cf15ce08 100644 --- a/parse.h +++ b/parse.h @@ -33,7 +33,7 @@ struct value_pair { }; #define OPT_LEN_MAX 4096 -#define PARSE_MAX_VP 16 +#define PARSE_MAX_VP 24 /* * Option define @@ -47,7 +47,9 @@ struct fio_option { unsigned int off2; unsigned int off3; unsigned int off4; - void *roff1, *roff2, *roff3, *roff4; + unsigned int off5; + unsigned int off6; + void *roff1, *roff2, *roff3, *roff4, *roff5, *roff6; unsigned int maxval; /* max and min value */ int minval; double maxfp; /* max and min floating value */ @@ -62,10 +64,14 @@ struct fio_option { struct value_pair posval[PARSE_MAX_VP];/* possible values */ const char *parent; /* parent option */ int hide; /* hide if parent isn't set */ + int hide_on_set; /* hide on set, not on unset */ + const char *inverse; /* if set, apply opposite action to this option */ + struct fio_option *inv_opt; /* cached lookup */ int (*verify)(struct fio_option *, void *); const char *prof_name; /* only valid for specific profile */ unsigned int category; /* what type of option */ unsigned int group; /* who to group with */ + void *gui_data; }; typedef int (str_cb_fn)(void *, char *); @@ -83,6 +89,8 @@ extern void strip_blank_front(char **); extern void strip_blank_end(char *); extern int str_to_decimal(const char *, long long *, int, void *); extern int check_str_bytes(const char *p, long long *val, void *data); +extern int check_str_time(const char *p, long long *val); +extern int str_to_float(const char *str, double *val); /* * Handlers for the options @@ -94,13 +102,6 @@ typedef int (fio_opt_str_set_fn)(void *); #define td_var(start, offset) ((void *) start + (offset)) -#ifndef min -#define min(a, b) ((a) < (b) ? (a) : (b)) -#endif -#ifndef max -#define max(a, b) ((a) > (b) ? (a) : (b)) -#endif - static inline int parse_is_percent(unsigned long long val) { return val <= -1ULL && val >= (-1ULL - 100ULL);