X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=parse.h;h=ae6bdead38fe25f16bbcd20b7c8ce751ce4b1f22;hp=36ff2b2357d673cd07134bbe7751a441b8ea4462;hb=c06c78c04c415bcb33350e8e56b924b75b4e93aa;hpb=ef9aff52b10c71a4cb2b3649deaea270fa3944a0 diff --git a/parse.h b/parse.h index 36ff2b23..ae6bdead 100644 --- a/parse.h +++ b/parse.h @@ -7,13 +7,13 @@ enum fio_opt_type { FIO_OPT_STR = 0, FIO_OPT_STR_VAL, - FIO_OPT_STR_VAL_INT, FIO_OPT_STR_VAL_TIME, FIO_OPT_STR_STORE, FIO_OPT_RANGE, FIO_OPT_INT, FIO_OPT_BOOL, FIO_OPT_STR_SET, + FIO_OPT_DEPRECATED, }; /* @@ -25,6 +25,7 @@ struct value_pair { const char *help; /* help text for sub option */ }; +#define OPT_LEN_MAX 4096 #define PARSE_MAX_VP 16 /* @@ -41,17 +42,19 @@ struct fio_option { unsigned int maxval; /* max and min value */ int minval; 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 */ const char *parent; /* parent option */ - char parent_seen; + int (*verify)(struct fio_option *, void *); }; typedef int (str_cb_fn)(void *, char *); extern int parse_option(const char *, struct fio_option *, void *); +extern void sort_options(char **, struct fio_option *, int); 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 *); @@ -59,6 +62,7 @@ extern void options_init(struct fio_option *); extern void strip_blank_front(char **); extern void strip_blank_end(char *); +extern int str_to_decimal(const char *, long long *, int, void *); /* * Handlers for the options