X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=parse.h;h=2d4b55ec30999b932e9f3823981ba171191869a2;hp=be3d24ac43f1634a39a57b77ab84491cf7142b25;hb=63f29372bc1bd69b66816c96d88b9c0bd8f3d8b9;hpb=b46928282e0a890f49250e79b81af773a2b7108f

diff --git a/parse.h b/parse.h
index be3d24ac..2d4b55ec 100644
--- a/parse.h
+++ b/parse.h
@@ -7,10 +7,12 @@
 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,
 };
 
@@ -18,18 +20,27 @@ enum fio_opt_type {
  * Option define
  */
 struct fio_option {
-	char *name;
-	enum fio_opt_type type;
-	unsigned int off1;
+	const char *name;		/* option name */
+	enum fio_opt_type type;		/* option type */
+	unsigned int off1;		/* potential parameters */
 	unsigned int off2;
-	unsigned int max_val;
-	void *cb;
+	unsigned int off3;
+	unsigned int off4;
+	unsigned int maxval;		/* max and min value */
+	int minval;
+	void *cb;			/* callback */
+	const char *help;		/* help text for option */
+	const char *def;		/* default setting */
+	const char *posval[16];		/* possible values */
 };
 
 typedef int (str_cb_fn)(void *, char *);
 
 extern int parse_option(const char *, struct fio_option *, void *);
 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 options_init(struct fio_option *);
 
 extern void strip_blank_front(char **);
 extern void strip_blank_end(char *);
@@ -38,8 +49,8 @@ extern void strip_blank_end(char *);
  * 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))