projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix warning on platforms without disk util support
[fio.git]
/
parse.h
diff --git
a/parse.h
b/parse.h
index 4edf75e5871251a59b078c1a954fd4df21177901..b9da7b950c2813a0bb53457179b2abd7e1257ef8 100644
(file)
--- a/
parse.h
+++ b/
parse.h
@@
-33,24
+33,28
@@
struct value_pair {
};
#define OPT_LEN_MAX 4096
};
#define OPT_LEN_MAX 4096
-#define PARSE_MAX_VP
16
+#define PARSE_MAX_VP
24
/*
* Option define
*/
struct fio_option {
const char *name; /* option name */
/*
* Option define
*/
struct fio_option {
const char *name; /* option name */
+ const char *lname; /* long 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;
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;
- void *roff1, *roff2, *roff3, *roff4;
+ unsigned int off5;
+ unsigned int off6;
+ void *roff1, *roff2, *roff3, *roff4, *roff5, *roff6;
unsigned int maxval; /* max and min value */
int minval;
double maxfp; /* max and min floating value */
double minfp;
unsigned int maxval; /* max and min value */
int minval;
double maxfp; /* max and min floating value */
double minfp;
+ unsigned int interval; /* client hint for suitable interval */
unsigned int maxlen; /* max length */
int neg; /* negate value stored */
int prio;
unsigned int maxlen; /* max length */
int neg; /* negate value stored */
int prio;
@@
-59,8
+63,15
@@
struct fio_option {
const char *def; /* default setting */
struct value_pair posval[PARSE_MAX_VP];/* possible values */
const char *parent; /* parent option */
const char *def; /* default setting */
struct value_pair posval[PARSE_MAX_VP];/* possible values */
const char *parent; /* parent option */
+ int hide; /* hide if parent isn't set */
+ 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 *);
const char *prof_name; /* only valid for specific profile */
int (*verify)(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 *gui_data;
};
typedef int (str_cb_fn)(void *, char *);
};
typedef int (str_cb_fn)(void *, char *);
@@
-77,6
+88,8
@@
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 void strip_blank_front(char **);
extern void strip_blank_end(char *);
extern int str_to_decimal(const char *, long long *, int, void *);
+extern int check_str_bytes(const char *p, long long *val, void *data);
+extern int str_to_float(const char *str, double *val);
/*
* Handlers for the options
/*
* Handlers for the options
@@
-88,13
+101,6
@@
typedef int (fio_opt_str_set_fn)(void *);
#define td_var(start, offset) ((void *) start + (offset))
#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
-
static inline int parse_is_percent(unsigned long long val)
{
return val <= -1ULL && val >= (-1ULL - 100ULL);
static inline int parse_is_percent(unsigned long long val)
{
return val <= -1ULL && val >= (-1ULL - 100ULL);