/*
* convert string into decimal value, noting any size suffix
*/
-static int str_to_decimal(const char *str, unsigned long long *val, int kilo)
+static int str_to_decimal(const char *str, long long *val, int kilo)
{
int len;
if (!len)
return 1;
- *val = strtoul(str, NULL, 10);
- if (*val == ULONG_MAX && errno == ERANGE)
+ *val = strtoll(str, NULL, 10);
+ if (*val == LONG_MAX && errno == ERANGE)
return 1;
if (kilo)
return 0;
}
-static int check_str_bytes(const char *p, unsigned long long *val)
+static int check_str_bytes(const char *p, long long *val)
{
return str_to_decimal(p, val, 1);
}
-static int check_str_time(const char *p, unsigned long long *val)
+static int check_str_time(const char *p, long long *val)
{
return str_to_decimal(p, val, 0);
}
*(s + 1) = '\0';
}
-static int check_range_bytes(const char *str, unsigned long *val)
+static int check_range_bytes(const char *str, long *val)
{
char suffix;
return 1;
}
-static int check_int(const char *p, unsigned int *val)
+static int check_int(const char *p, int *val)
{
if (!strlen(p))
return 1;
static struct fio_option *find_option(struct fio_option *options,
const char *opt)
{
- struct fio_option *o = &options[0];
+ struct fio_option *o;
- while (o->name) {
+ for (o = &options[0]; o->name; o++) {
if (!strcmp(o->name, opt))
return o;
-
- o++;
+ else if (o->alias && !strcmp(o->alias, opt))
+ return o;
}
return NULL;
static int __handle_option(struct fio_option *o, const char *ptr, void *data,
int first, int more)
{
- unsigned int il, *ilp;
- unsigned long long ull, *ullp;
- unsigned long ul1, ul2;
+ int il, *ilp;
+ long long ull, *ullp;
+ long ul1, ul2;
char **cp;
int ret = 0, is_time = 0;
if (ret)
break;
- if (o->maxval && ull > o->maxval)
- ull = o->maxval;
- if (o->minval && ull < o->minval)
- ull = o->minval;
+ if (o->maxval && ull > o->maxval) {
+ fprintf(stderr, "max value out of range: %lld (%d max)\n", ull, o->maxval);
+ return 1;
+ }
+ if (o->minval && ull < o->minval) {
+ fprintf(stderr, "min value out of range: %lld (%d min)\n", ull, o->minval);
+ return 1;
+ }
if (fn)
ret = fn(data, &ull);
p1 = strchr(tmp, '-');
if (!p1) {
- ret = 1;
- break;
+ p1 = strchr(tmp, ':');
+ if (!p1) {
+ ret = 1;
+ break;
+ }
}
p2 = p1 + 1;
break;
}
- case FIO_OPT_INT: {
+ case FIO_OPT_INT:
+ case FIO_OPT_BOOL: {
fio_opt_int_fn *fn = o->cb;
ret = check_int(ptr, &il);
if (ret)
break;
- if (o->maxval && il > o->maxval)
- il = o->maxval;
- if (o->minval && il < o->minval)
- il = o->minval;
+ if (o->maxval && il > (int) o->maxval) {
+ fprintf(stderr, "max value out of range: %d (%d max)\n", il, o->maxval);
+ return 1;
+ }
+ if (o->minval && il < o->minval) {
+ fprintf(stderr, "min value out of range: %d (%d min)\n", il, o->minval);
+ return 1;
+ }
+
+ if (o->neg)
+ il = !il;
if (fn)
ret = fn(data, &il);
* Do this before parsing the first round, to check if we should
* copy set 1 options to set 2.
*/
- if (ptr)
+ if (ptr && (o->type != FIO_OPT_STR_STORE)) {
ptr2 = strchr(ptr, ',');
+ if (!ptr2)
+ ptr2 = strchr(ptr, ':');
+ }
/*
* Don't return early if parsing the first option fails - if
return 1;
}
+static void show_option_range(struct fio_option *o)
+{
+ if (!o->minval && !o->maxval)
+ return;
+
+ printf("%16s: min=%d, max=%d\n", "range", o->minval, o->maxval);
+}
+
+static void show_option_values(struct fio_option *o)
+{
+ const char *msg;
+ int i = 0;
+
+ if (!o->posval)
+ return;
+
+ do {
+ msg = o->posval[i];
+ if (!msg)
+ break;
+
+ if (!i)
+ printf("%16s: ", "valid values");
+
+ printf("%s,", msg);
+ i++;
+ } while (1);
+
+ if (i)
+ printf("\n");
+}
+
int show_cmd_help(struct fio_option *options, const char *name)
{
int show_all = !strcmp(name, "all");
- struct fio_option *o = &options[0];
const char *typehelp[] = {
"string (opt=bla)",
"string with possible k/m/g postfix (opt=4k)",
"string (opt=bla)",
"string with dual range (opt=1k-4k,4k-8k)",
"integer value (opt=100)",
+ "boolean value (opt=1)",
"no argument (opt)",
};
+ struct fio_option *o;
int found = 0;
- while (o->name) {
+ for (o = &options[0]; o->name; o++) {
int match = !strcmp(name, o->name);
if (show_all || match) {
found = 1;
- printf("%s: %s\n", o->name, o->help);
- if (match) {
- printf("type: %s\n", typehelp[o->type]);
- if (o->def)
- printf("default: %s\n", o->def);
- else
- printf("defaults: no default\n");
- }
+ printf("%16s: %s\n", o->name, o->help);
+ if (show_all)
+ continue;
}
- o++;
+ if (!match)
+ continue;
+
+ printf("%16s: %s\n", "type", typehelp[o->type]);
+ printf("%16s: %s\n", "default", o->def ? o->def : "no default");
+ show_option_range(o);
+ show_option_values(o);
}
if (found)
return 1;
}
+/*
+ * Handle parsing of default parameters.
+ */
void fill_default_options(void *data, struct fio_option *options)
{
- struct fio_option *o = &options[0];
+ struct fio_option *o;
- while (o->name) {
+ for (o = &options[0]; o->name; o++)
if (o->def)
handle_option(o, o->def, data);
- o++;
+}
+
+/*
+ * Sanitize the options structure. For now it just sets min/max for bool
+ * values and whether both callback and offsets are given.
+ */
+void options_init(struct fio_option *options)
+{
+ struct fio_option *o;
+
+ for (o = &options[0]; o->name; o++) {
+ if (o->type == FIO_OPT_BOOL) {
+ o->minval = 0;
+ o->maxval = 1;
+ }
+ if (o->cb && (o->off1 || o->off2 || o->off3 || o->off4))
+ fprintf(stderr, "Option %s: both cb and offset given\n", o->name);
}
}
projects / fio.git / blobdiff