/*
* convert string into decimal value, noting any size suffix
*/
-static int str_to_decimal(char *p, unsigned long long *val, int kilo)
+static int str_to_decimal(const char *str, unsigned long long *val, int kilo)
{
- char *str = p;
int len;
len = strlen(str);
+ if (!len)
+ return 1;
*val = strtoul(str, NULL, 10);
if (*val == ULONG_MAX && errno == ERANGE)
*val *= get_mult_bytes(str[len - 1]);
else
*val *= get_mult_time(str[len - 1]);
+
return 0;
}
-static int check_str_bytes(char *p, unsigned long long *val)
+static int check_str_bytes(const char *p, unsigned long long *val)
{
return str_to_decimal(p, val, 1);
}
-static int check_str_time(char *p, unsigned long long *val)
+static int check_str_time(const char *p, unsigned long long *val)
{
return str_to_decimal(p, val, 0);
}
*(s + 1) = '\0';
}
-static int check_range_bytes(char *str, unsigned long *val)
+static int check_range_bytes(const char *str, unsigned long *val)
{
char suffix;
+ if (!strlen(str))
+ return 1;
+
if (sscanf(str, "%lu%c", val, &suffix) == 2) {
*val *= get_mult_bytes(suffix);
return 0;
return 1;
}
-static int check_int(char *p, unsigned int *val)
+static int check_int(const char *p, unsigned int *val)
{
+ if (!strlen(p))
+ return 1;
if (sscanf(p, "%u", val) == 1)
return 0;
return NULL;
}
-static int handle_option(struct fio_option *o, char *ptr, void *data)
+#define val_store(ptr, val, off, data) \
+ do { \
+ ptr = td_var((data), (off)); \
+ *ptr = (val); \
+ } while (0)
+
+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, *ulp1, *ulp2;
- char *tmpbuf, **cp;
+ unsigned long ul1, ul2;
+ char **cp;
int ret = 0, is_time = 0;
- tmpbuf = malloc(4096);
+ if (!ptr && o->type != FIO_OPT_STR_SET) {
+ fprintf(stderr, "Option %s requires an argument\n", o->name);
+ return 1;
+ }
switch (o->type) {
case FIO_OPT_STR: {
}
case FIO_OPT_STR_VAL_TIME:
is_time = 1;
- case FIO_OPT_STR_VAL: {
+ case FIO_OPT_STR_VAL:
+ case FIO_OPT_STR_VAL_INT: {
fio_opt_str_val_fn *fn = o->cb;
if (is_time)
if (fn)
ret = fn(data, &ull);
else {
- ullp = td_var(data, o->off1);
- *ullp = ull;
+ if (o->type == FIO_OPT_STR_VAL_INT) {
+ if (first)
+ val_store(ilp, ull, o->off1, data);
+ if (!more && o->off2)
+ val_store(ilp, ull, o->off2, data);
+ } else {
+ if (first)
+ val_store(ullp, ull, o->off1, data);
+ if (!more && o->off2)
+ val_store(ullp, ull, o->off2, data);
+ }
}
break;
}
*cp = strdup(ptr);
break;
case FIO_OPT_RANGE: {
+ char tmp[128];
char *p1, *p2;
- p1 = strchr(ptr, '-');
+ strncpy(tmp, ptr, sizeof(tmp) - 1);
+
+ p1 = strchr(tmp, '-');
if (!p1) {
ret = 1;
break;
p2 = p1 + 1;
*p1 = '\0';
+ p1 = tmp;
ret = 1;
if (!check_range_bytes(p1, &ul1) && !check_range_bytes(p2, &ul2)) {
ret = 0;
- ulp1 = td_var(data, o->off1);
- ulp2 = td_var(data, o->off2);
if (ul1 > ul2) {
- *ulp1 = ul2;
- *ulp2 = ul1;
- } else {
- *ulp2 = ul2;
- *ulp1 = ul1;
+ unsigned long foo = ul1;
+
+ ul1 = ul2;
+ ul2 = foo;
}
- }
-
+
+ if (first) {
+ val_store(ilp, ul1, o->off1, data);
+ val_store(ilp, ul2, o->off2, data);
+ }
+ if (!more && o->off3 && o->off4) {
+ val_store(ilp, ul1, o->off3, data);
+ val_store(ilp, ul2, o->off4, data);
+ }
+ }
+
break;
}
case FIO_OPT_INT: {
if (fn)
ret = fn(data, &il);
else {
- ilp = td_var(data, o->off1);
- *ilp = il;
+ if (first)
+ val_store(ilp, il, o->off1, data);
+ if (!more && o->off2)
+ val_store(ilp, il, o->off2, data);
}
break;
}
if (fn)
ret = fn(data);
else {
- ilp = td_var(data, o->off1);
- *ilp = 1;
+ if (first)
+ val_store(ilp, 1, o->off1, data);
+ if (!more && o->off2)
+ val_store(ilp, 1, o->off2, data);
}
break;
}
ret = 1;
}
- free(tmpbuf);
return ret;
}
+static int handle_option(struct fio_option *o, const char *ptr, void *data)
+{
+ const char *ptr2 = NULL;
+ int r1, r2;
+
+ /*
+ * See if we have a second set of parameters, hidden after a comma.
+ * Do this before parsing the first round, to check if we should
+ * copy set 1 options to set 2.
+ */
+ if (ptr)
+ ptr2 = strchr(ptr, ',');
+
+ /*
+ * Don't return early if parsing the first option fails - if
+ * we are doing multiple arguments, we can allow the first one
+ * being empty.
+ */
+ r1 = __handle_option(o, ptr, data, 1, !!ptr2);
+
+ if (!ptr2)
+ return r1;
+
+ ptr2++;
+ r2 = __handle_option(o, ptr2, data, 0, 0);
+
+ return r1 && r2;
+}
+
+int parse_cmd_option(const char *opt, const char *val,
+ struct fio_option *options, void *data)
+{
+ struct fio_option *o;
+
+ o = find_option(options, opt);
+ if (!o) {
+ fprintf(stderr, "Bad option %s\n", opt);
+ return 1;
+ }
+
+ if (!handle_option(o, val, data))
+ return 0;
+
+ fprintf(stderr, "fio: failed parsing %s=%s\n", opt, val);
+ return 1;
+}
+
int parse_option(const char *opt, struct fio_option *options, void *data)
{
- struct fio_option *o = find_option(options, opt);
+ struct fio_option *o;
char *pre, *post;
char tmp[64];
- strcpy(tmp, opt);
+ strncpy(tmp, opt, sizeof(tmp) - 1);
pre = strchr(tmp, '=');
if (pre) {
return 1;
}
- return handle_option(o, post, data);
+ if (!handle_option(o, post, data))
+ return 0;
+
+ fprintf(stderr, "fio: failed parsing %s\n", opt);
+ return 1;
}
projects / fio.git / blobdiff