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

diff --git a/parse.h b/parse.h
index 214e56b4..5b1a53de 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,
 };
 
 /*
@@ -22,8 +22,10 @@ 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 */
 };
 
+#define OPT_LEN_MAX 	1024
 #define PARSE_MAX_VP	16
 
 /*
@@ -40,15 +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 */
+	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 *);
@@ -56,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
@@ -67,4 +74,11 @@ 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
+
 #endif