X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=parse.h;h=0cdc0894ae207be6f674c8ca963462c7af423b7f;hp=4ddb76a6335d6af7834e1209b8517fb125f01d6d;hb=e01b22b8fe3f20376fe8fdc6f2c28cc3682d698e;hpb=03b74b3ec5268e731ed7fcaef31c8c0655acd530

diff --git a/parse.h b/parse.h
index 4ddb76a6..0cdc0894 100644
--- a/parse.h
+++ b/parse.h
@@ -7,15 +7,27 @@
 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,
 };
 
+/*
+ * Match a possible value string with the integer option.
+ */
+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
+
 /*
  * Option define
  */
@@ -29,15 +41,19 @@ struct fio_option {
 	unsigned int off4;
 	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 char *posval[16];		/* possible values */
+	const struct value_pair posval[PARSE_MAX_VP];/* possible values */
+	const char *parent;		/* parent option */
 };
 
 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 *);
@@ -45,6 +61,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);
 
 /*
  * Handlers for the options
@@ -56,4 +73,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