d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

kvargs: support list value

Browse Source 
If a value contains a comma, rte_kvargs_tokenize() will split here.
In order to support list syntax [a,b] as value, an extra parsing of
the square brackets is added.

Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
This commit is contained in:
Thomas Monjalon 2018-10-22 15:15:27 +02:00 committed by Ferruh Yigit
parent 6bd7fbd03c
commit cc0579f233
2 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/librte_kvargs/rte_kvargs.c
View File

@ -44,6 +44,20 @@ rte_kvargs_tokenize(struct rte_kvargs *kvlist, const char *params)
kvlist->pairs[i].value == NULL)
return -1;
/* Detect list [a,b] to skip comma delimiter in list. */
str = kvlist->pairs[i].value;
if (str[0] == '[') {
/* Find the end of the list. */
while (str[strlen(str) - 1] != ']') {
/* Restore the comma erased by strtok_r(). */
str[strlen(str)] = ',';
/* Parse until next comma. */
str = strtok_r(NULL, RTE_KVARGS_PAIRS_DELIM, &ctx1);
if (str == NULL)
return -1; /* no closing bracket */
}
}
kvlist->count++;
str = NULL;
}

21
test/test/test_kvargs.c
View File

@ -137,6 +137,26 @@ static int test_valid_kvargs(void)
}
rte_kvargs_free(kvlist);
/* third test using list as value */
args = "foo=[0,1],check=value2";
valid_keys = valid_keys_list;
kvlist = rte_kvargs_parse(args, valid_keys);
if (kvlist == NULL) {
printf("rte_kvargs_parse() error");
goto fail;
}
if (strcmp(kvlist->pairs[0].value, "[0,1]") != 0) {
printf("wrong value %s", kvlist->pairs[0].value);
goto fail;
}
count = kvlist->count;
if (count != 2) {
printf("invalid count value %d\n", count);
rte_kvargs_free(kvlist);
goto fail;
}
rte_kvargs_free(kvlist);
return 0;
fail:
@ -162,6 +182,7 @@ static int test_invalid_kvargs(void)
"foo=1,,foo=2", /* empty key/value */
"foo=1,foo", /* no value */
"foo=1,=2", /* no key */
"foo=[1,2", /* no closing bracket in value */
",=", /* also test with a smiley */
NULL };
const char **args;