X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=parse.h;h=95d99f56c08d4cdef2bb41a3a18fc5b0efb05cd6;hp=45462596ca4246dd6a7b4eac7600a2936c241b81;hb=02c6aad501477833c7e017eec0bb14f8e6957b68;hpb=88b5a391bc2f9eb85066219e453682a746730ead

diff --git a/parse.h b/parse.h
index 45462596..95d99f56 100644
--- a/parse.h
+++ b/parse.h
@@ -1,13 +1,14 @@
 #ifndef FIO_PARSE_H
 #define FIO_PARSE_H
 
+#include "flist.h"
+
 /*
  * Option types
  */
 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,
@@ -26,7 +27,7 @@ struct value_pair {
 	const char *help;		/* help text for sub option */
 };
 
-#define OPT_LEN_MAX 	1024
+#define OPT_LEN_MAX 	4096
 #define PARSE_MAX_VP	16
 
 /*
@@ -40,6 +41,7 @@ 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;
 	int neg;			/* negate value stored */
@@ -49,20 +51,22 @@ struct fio_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 int parse_option(const char *, struct fio_option *, struct flist_head *, 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 parse_cmd_option(const char *t, const char *l, struct fio_option *, struct flist_head *, 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);
+extern int str_to_decimal(const char *, long long *, int, void *);
 
 /*
  * Handlers for the options