client: iolog cleanups

[fio.git] / parse.h

diff --git a/parse.h b/parse.h
index 5273d23f6907b41db030d0090ea555f87cf0ee61..3ba804797fe1c23658fc1f51bdd82ac8d2287a51 100644 (file)
--- a/parse.h
+++ b/parse.h
@@ -72,13 +72,17 @@ struct fio_option {
        unsigned int category;          /* what type of option */
        unsigned int 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 */
 };
 
 typedef int (str_cb_fn)(void *, char *);
 
-extern int parse_option(char *, const char *, struct fio_option *, struct fio_option **, void *, int);
+extern int parse_option(char *, const char *, struct fio_option *, struct fio_option **, void *, struct flist_head *);
 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 *, void *, struct flist_head *);
 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 *);
@@ -87,10 +91,13 @@ extern void options_free(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 check_str_time(const char *p, long long *val);
-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
@@ -100,7 +107,7 @@ 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))
+#define __td_var(start, offset)        ((char *) start + (offset))
 
 struct thread_options;
 static inline void *td_var(struct thread_options *to, struct fio_option *o,
@@ -117,4 +124,10 @@ static inline int parse_is_percent(unsigned long long val)
        return val <= -1ULL && val >= (-1ULL - 100ULL);
 }
 
+struct print_option {
+       struct flist_head list;
+       char *name;
+       char *value;
+};
+
 #endif