X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=parse.h;h=c5a74171ae94e70cb45339b1b22fbd387579ccf5;hp=214e56b4769d9c5a5faa3b2589e6b85f5e81b3ad;hb=833491908a1a;hpb=b1ec1da670aab645e32303ea5ffaa1e5ca336936

diff --git a/parse.h b/parse.h
index 214e56b4..c5a74171 100644
--- a/parse.h
+++ b/parse.h
@@ -1,19 +1,24 @@
 #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,
 };
 
 /*
@@ -22,8 +27,11 @@ enum fio_opt_type {
 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 */
 };
 
+#define OPT_LEN_MAX 	4096
 #define PARSE_MAX_VP	16
 
 /*
@@ -37,25 +45,36 @@ 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 */
 };
 
 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 *);
+extern void option_init(struct fio_option *);
 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
@@ -67,4 +86,16 @@ 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);
+}
+
 #endif