projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Unify options with gfio
[fio.git]
/
parse.h
diff --git
a/parse.h
b/parse.h
index 085de1a5face6410696d4ecab6d8e464e1a10416..d09c22db7ef4a658682d717c0f12cad0cab6d3dc 100644
(file)
--- a/
parse.h
+++ b/
parse.h
@@
-7,13
+7,16
@@
* Option types
*/
enum fio_opt_type {
* Option types
*/
enum fio_opt_type {
- FIO_OPT_STR = 0,
+ FIO_OPT_INVALID = 0,
+ FIO_OPT_STR,
+ FIO_OPT_STR_MULTI,
FIO_OPT_STR_VAL,
FIO_OPT_STR_VAL_TIME,
FIO_OPT_STR_STORE,
FIO_OPT_RANGE,
FIO_OPT_INT,
FIO_OPT_BOOL,
FIO_OPT_STR_VAL,
FIO_OPT_STR_VAL_TIME,
FIO_OPT_STR_STORE,
FIO_OPT_RANGE,
FIO_OPT_INT,
FIO_OPT_BOOL,
+ FIO_OPT_FLOAT_LIST,
FIO_OPT_STR_SET,
FIO_OPT_DEPRECATED,
};
FIO_OPT_STR_SET,
FIO_OPT_DEPRECATED,
};
@@
-25,47
+28,66
@@
struct value_pair {
const char *ival; /* string option */
unsigned int oval; /* output value */
const char *help; /* help text for sub option */
const char *ival; /* string option */
unsigned int oval; /* output value */
const char *help; /* help text for sub option */
+ int or; /* OR value */
+ void *cb; /* sub-option callback */
};
#define OPT_LEN_MAX 4096
};
#define OPT_LEN_MAX 4096
-#define PARSE_MAX_VP
16
+#define PARSE_MAX_VP
24
/*
* Option define
*/
struct fio_option {
const char *name; /* option name */
/*
* Option define
*/
struct fio_option {
const char *name; /* option name */
+ const char *lname; /* long option name */
const char *alias; /* possible old allowed name */
enum fio_opt_type type; /* option type */
unsigned int off1; /* potential parameters */
unsigned int off2;
unsigned int off3;
unsigned int off4;
const char *alias; /* possible old allowed name */
enum fio_opt_type type; /* option type */
unsigned int off1; /* potential parameters */
unsigned int off2;
unsigned int off3;
unsigned int off4;
+ unsigned int off5;
+ unsigned int off6;
+ void *roff1, *roff2, *roff3, *roff4, *roff5, *roff6;
unsigned int maxval; /* max and min value */
int minval;
unsigned int maxval; /* max and min value */
int minval;
+ double maxfp; /* max and min floating value */
+ double minfp;
+ unsigned int interval; /* client hint for suitable interval */
+ unsigned int maxlen; /* max length */
int neg; /* negate value stored */
int prio;
void *cb; /* callback */
const char *help; /* help text for option */
const char *def; /* default setting */
int neg; /* negate value stored */
int prio;
void *cb; /* callback */
const char *help; /* help text for option */
const char *def; /* default setting */
-
const
struct value_pair posval[PARSE_MAX_VP];/* possible values */
+ struct value_pair posval[PARSE_MAX_VP];/* possible values */
const char *parent; /* parent option */
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 *);
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 */
};
typedef int (str_cb_fn)(void *, char *);
};
typedef int (str_cb_fn)(void *, char *);
-extern int parse_option(c
onst char *, struct fio_option *, struct flist_head
*, void *);
+extern int parse_option(c
har *, const char *, struct fio_option *, struct fio_option *
*, void *);
extern void sort_options(char **, struct fio_option *, int);
extern void sort_options(char **, struct fio_option *, int);
-extern int parse_cmd_option(const char *t, const char *l, struct fio_option *,
struct flist_head *,
void *);
+extern int parse_cmd_option(const char *t, const char *l, struct fio_option *, void *);
extern int show_cmd_help(struct fio_option *, const char *);
extern void fill_default_options(void *, struct fio_option *);
extern void option_init(struct fio_option *);
extern void options_init(struct fio_option *);
extern int show_cmd_help(struct fio_option *, const char *);
extern void fill_default_options(void *, struct fio_option *);
extern void option_init(struct fio_option *);
extern void options_init(struct fio_option *);
+extern void options_free(struct fio_option *, void *);
extern void strip_blank_front(char **);
extern void strip_blank_end(char *);
extern int str_to_decimal(const char *, long long *, int, void *);
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 str_to_float(const char *str, double *val);
/*
* Handlers for the options
/*
* Handlers for the options
@@
-77,11
+99,9
@@
typedef int (fio_opt_str_set_fn)(void *);
#define td_var(start, offset) ((void *) start + (offset))
#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);
+}
#endif
#endif