X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=parse.h;h=4e8124f853b3fa9a36f1c884416d48a4a971b78a;hp=414f77c859849046d116a6e76d06fa5342fd3d0c;hb=15ca150e8dbfd68aa5beb479fcb3f07447417a04;hpb=13335ddb0e304efa0fc96593dd1fd995ec6f68d7

diff --git a/parse.h b/parse.h
index 414f77c8..4e8124f8 100644
--- a/parse.h
+++ b/parse.h
@@ -14,24 +14,39 @@ enum fio_opt_type {
 	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 PARSE_MAX_VP	16
+
 /*
  * Option define
  */
 struct fio_option {
 	const char *name;		/* option name */
+	const char *alias;		/* possible old allowed name */
 	enum fio_opt_type type;		/* option type */
 	unsigned int off1;		/* potential parameters */
 	unsigned int off2;
 	unsigned int off3;
 	unsigned int off4;
 	unsigned int maxval;		/* max and min value */
-	unsigned int minval;
+	int minval;
+	int neg;			/* negate value stored */
 	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 *);
@@ -44,15 +59,23 @@ 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
  */
 typedef int (fio_opt_str_fn)(void *, const char *);
-typedef int (fio_opt_str_val_fn)(void *, unsigned long long *);
-typedef int (fio_opt_int_fn)(void *, unsigned int *);
+typedef int (fio_opt_str_val_fn)(void *, long long *);
+typedef int (fio_opt_int_fn)(void *, int *);
 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