X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=parse.h;h=68a7338e32d34ed929cb5173c18df43273e2920f;hp=45462596ca4246dd6a7b4eac7600a2936c241b81;hb=c9c63318734feb94eae3013fa1b606d6da744655;hpb=88b5a391bc2f9eb85066219e453682a746730ead diff --git a/parse.h b/parse.h index 45462596..68a7338e 100644 --- a/parse.h +++ b/parse.h @@ -1,18 +1,22 @@ #ifndef FIO_PARSE_H #define FIO_PARSE_H +#include "flist.h" + /* * 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_INT, 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, }; @@ -24,11 +28,33 @@ struct value_pair { 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 1024 +#define OPT_LEN_MAX 4096 #define PARSE_MAX_VP 16 +enum opt_category { + FIO_OPT_G_DESC = 1UL << 0, + FIO_OPT_G_FILE = 1UL << 1, + FIO_OPT_G_MISC = 1UL << 2, + FIO_OPT_G_IO = 1UL << 3, + FIO_OPT_G_IO_DDIR = 1UL << 4, + FIO_OPT_G_IO_BUF = 1UL << 5, + FIO_OPT_G_RAND = 1UL << 6, + FIO_OPT_G_OS = 1UL << 7, + FIO_OPT_G_MEM = 1UL << 8, + FIO_OPT_G_VERIFY = 1UL << 9, + FIO_OPT_G_CPU = 1UL << 10, + FIO_OPT_G_LOG = 1UL << 11, + FIO_OPT_G_ZONE = 1UL << 12, + FIO_OPT_G_CACHE = 1UL << 13, + FIO_OPT_G_STAT = 1UL << 14, + FIO_OPT_G_ERR = 1UL << 15, + FIO_OPT_G_JOB = 1UL << 16, +}; + /* * Option define */ @@ -40,29 +66,38 @@ struct fio_option { unsigned int off2; unsigned int off3; unsigned int off4; + void *roff1, *roff2, *roff3, *roff4; unsigned int maxval; /* max and min value */ int minval; + double maxfp; /* max and min floating value */ + double minfp; + 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 */ - const struct value_pair posval[PARSE_MAX_VP];/* possible values */ + struct value_pair posval[PARSE_MAX_VP];/* possible values */ const char *parent; /* parent option */ + int (*verify)(struct fio_option *, void *); + const char *prof_name; /* only valid for specific profile */ + unsigned int category; /* for type grouping */ }; typedef int (str_cb_fn)(void *, char *); -extern int parse_option(const char *, struct fio_option *, void *); +extern int parse_option(char *, const char *, struct fio_option *, 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 *); +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); +extern int str_to_decimal(const char *, long long *, int, void *); /* * Handlers for the options @@ -81,4 +116,9 @@ typedef int (fio_opt_str_set_fn)(void *); #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