#ifndef FIO_PARSE_H
#define FIO_PARSE_H
+#include <inttypes.h>
#include "flist.h"
/*
enum fio_opt_type {
FIO_OPT_INVALID = 0,
FIO_OPT_STR,
+ FIO_OPT_STR_ULL,
FIO_OPT_STR_MULTI,
FIO_OPT_STR_VAL,
FIO_OPT_STR_VAL_TIME,
FIO_OPT_STR_STORE,
FIO_OPT_RANGE,
FIO_OPT_INT,
+ FIO_OPT_ULL,
FIO_OPT_BOOL,
FIO_OPT_FLOAT_LIST,
FIO_OPT_STR_SET,
+ FIO_OPT_STR_VAL_ZONE,
FIO_OPT_DEPRECATED,
+ FIO_OPT_SOFT_DEPRECATED,
+ FIO_OPT_UNSUPPORTED, /* keep this last */
};
/*
*/
struct value_pair {
const char *ival; /* string option */
- unsigned int oval; /* output value */
+ unsigned long long oval; /* output value */
const char *help; /* help text for sub option */
- int or; /* OR value */
+ int orval; /* OR value */
void *cb; /* sub-option callback */
};
-#define OPT_LEN_MAX 4096
-#define PARSE_MAX_VP 24
+#define OPT_LEN_MAX 8192
+#define PARSE_MAX_VP 32
/*
* Option define
unsigned int off4;
unsigned int off5;
unsigned int off6;
- void *roff1, *roff2, *roff3, *roff4, *roff5, *roff6;
- unsigned int maxval; /* max and min value */
+ unsigned long long maxval; /* max and min value */
int minval;
double maxfp; /* max and min floating value */
double minfp;
int hide_on_set; /* hide on set, not on unset */
const char *inverse; /* if set, apply opposite action to this option */
struct fio_option *inv_opt; /* cached lookup */
- int (*verify)(struct fio_option *, void *);
+ int (*verify)(const struct fio_option *, void *);
const char *prof_name; /* only valid for specific profile */
- unsigned int category; /* what type of option */
- unsigned int group; /* who to group with */
+ void *prof_opts;
+ uint64_t category; /* what type of option */
+ uint64_t group; /* who to group with */
void *gui_data;
+ int is_seconds; /* time value with seconds base */
+ int is_time; /* time based value */
+ int no_warn_def;
+ int pow2; /* must be a power-of-2 */
+ int no_free;
};
-typedef int (str_cb_fn)(void *, char *);
-
-extern int parse_option(char *, const char *, struct fio_option *, 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 *);
-extern void option_init(struct fio_option *);
+extern int parse_option(char *, const char *, const struct fio_option *,
+ const struct fio_option **, void *,
+ struct flist_head *);
+extern void sort_options(char **, const struct fio_option *, int);
+extern int parse_cmd_option(const char *t, const char *l,
+ const struct fio_option *, void *,
+ struct flist_head *);
+extern int show_cmd_help(const struct fio_option *, const char *);
+extern void fill_default_options(void *, const struct fio_option *);
extern void options_init(struct fio_option *);
-extern void options_free(struct fio_option *, void *);
+extern void options_mem_dupe(const struct fio_option *, void *);
+extern void options_free(const struct fio_option *, void *);
extern void strip_blank_front(char **);
extern void strip_blank_end(char *);
-extern int str_to_decimal(const char *, long long *, int, void *);
+extern int str_to_decimal(const char *, long long *, int, void *, int, int);
extern int check_str_bytes(const char *p, long long *val, void *data);
-extern int str_to_float(const char *str, double *val);
+extern int check_str_time(const char *p, long long *val, int);
+extern int str_to_float(const char *str, double *val, int is_time);
+
+extern int string_distance(const char *s1, const char *s2);
+extern int string_distance_ok(const char *s1, int dist);
/*
* Handlers for the options
typedef int (fio_opt_str_fn)(void *, const char *);
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))
+struct thread_options;
+static inline void *td_var(void *to, const struct fio_option *o,
+ unsigned int offset)
+{
+ void *ret;
+
+ if (o->prof_opts)
+ ret = o->prof_opts;
+ else
+ ret = to;
+
+ return (void *) ((uintptr_t) ret + offset);
+}
static inline int parse_is_percent(unsigned long long val)
{
- return val <= -1ULL && val >= (-1ULL - 100ULL);
+ return val >= -101ULL;
+}
+
+#define ZONE_BASE_VAL ((-1ULL >> 1) + 1)
+static inline int parse_is_percent_uncapped(unsigned long long val)
+{
+ return ZONE_BASE_VAL + -1U < val;
}
+static inline int parse_is_zone(unsigned long long val)
+{
+ return (val - ZONE_BASE_VAL) <= -1U;
+}
+
+struct print_option {
+ struct flist_head list;
+ char *name;
+ char *value;
+};
+
#endif