* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <string.h>
-#include <sys/user.h>
-#include <linux/binfmts.h>
+#include <stdlib.h>
-#include <rte_malloc.h>
#include <rte_log.h>
#include <rte_string_fns.h>
#include "rte_kvargs.h"
-/*
- * Initialize a rte_kvargs structure to an empty key/value list.
- */
-int
-rte_kvargs_init(struct rte_kvargs *kvlist)
-{
- kvlist->count = 0;
- kvlist->size = RTE_KVARGS_MAX;
- memset(kvlist->pairs, 0, kvlist->size);
- return 0;
-}
-
-/*
- * Add a key-value pair at the end of a given key/value list.
- * Return an error if the list is full or if the key is duplicated.
- */
-static int
-rte_kvargs_add_pair(struct rte_kvargs *kvlist, char *key, char *val)
-{
- unsigned i;
- struct rte_kvargs_pair* entry;
-
- /* is the list full? */
- if (kvlist->count >= kvlist->size) {
- RTE_LOG(ERR, PMD, "Couldn't add %s, key/value list is full\n", key);
- return -1;
- }
-
- /* Check if the key is duplicated */
- for (i = 0; i < kvlist->count; i++) {
- entry = &kvlist->pairs[i];
- if (strcmp(entry->key, key) == 0) {
- RTE_LOG(ERR, PMD, "Couldn't add %s, duplicated key\n", key);
- return -1;
- }
- }
-
- entry = &kvlist->pairs[kvlist->count];
- entry->key = key;
- entry->value = val;
- kvlist->count++;
- return 0;
-}
-
/*
* Receive a string with a list of arguments following the pattern
* key=value;key=value;... and insert them into the list.
static int
rte_kvargs_tokenize(struct rte_kvargs *kvlist, const char *params)
{
- unsigned i, count;
- char *args;
- char *pairs[RTE_KVARGS_MAX];
- char *pair[2];
-
- /* If params are empty, nothing to do */
- if (params == NULL || params[0] == 0) {
- RTE_LOG(ERR, PMD, "Cannot parse empty arguments\n");
- return -1;
- }
+ unsigned i;
+ char *str;
+ char *ctx1 = NULL;
+ char *ctx2 = NULL;
/* Copy the const char *params to a modifiable string
* to pass to rte_strsplit
*/
- args = strdup(params);
- if(args == NULL){
+ kvlist->str = strdup(params);
+ if (kvlist->str == NULL) {
RTE_LOG(ERR, PMD, "Cannot parse arguments: not enough memory\n");
return -1;
}
- count = rte_strsplit(args, strnlen(args, MAX_ARG_STRLEN), pairs,
- RTE_KVARGS_MAX, RTE_KVARGS_PAIRS_DELIM);
-
- for (i = 0; i < count; i++) {
- pair[0] = NULL;
- pair[1] = NULL;
+ /* browse each key/value pair and add it in kvlist */
+ str = kvlist->str;
+ while ((str = strtok_r(str, RTE_KVARGS_PAIRS_DELIM, &ctx1)) != NULL) {
- rte_strsplit(pairs[i], strnlen(pairs[i], MAX_ARG_STRLEN), pair, 2,
- RTE_KVARGS_KV_DELIM);
+ i = kvlist->count;
+ if (i >= RTE_KVARGS_MAX) {
+ RTE_LOG(ERR, PMD, "Cannot parse arguments: list full\n");
+ return -1;
+ }
- if (pair[0] == NULL || pair[1] == NULL || pair[0][0] == 0
- || pair[1][0] == 0) {
+ kvlist->pairs[i].key = strtok_r(str, RTE_KVARGS_KV_DELIM, &ctx2);
+ kvlist->pairs[i].value = strtok_r(NULL, RTE_KVARGS_KV_DELIM, &ctx2);
+ if (kvlist->pairs[i].key == NULL || kvlist->pairs[i].value == NULL) {
RTE_LOG(ERR, PMD,
"Cannot parse arguments: wrong key or value\n"
"params=<%s>\n", params);
- goto error;
+ return -1;
}
- if (rte_kvargs_add_pair(kvlist, pair[0], pair[1]) < 0)
- goto error;
+ kvlist->count++;
+ str = NULL;
}
- return 0;
-error:
- rte_free(args);
- return -1;
+ return 0;
}
/*
{
const char **valid_ptr;
- for (valid_ptr = valid; *valid_ptr != NULL; valid_ptr++)
- if (strstr(key_match, *valid_ptr) != NULL)
+ for (valid_ptr = valid; *valid_ptr != NULL; valid_ptr++) {
+ if (strcmp(key_match, *valid_ptr) == 0)
return 1;
+ }
return 0;
}
ret = 0;
for (i = 0; i < kvlist->count; i++) {
pair = &kvlist->pairs[i];
- if (strcmp(pair->key, key_match) == 0)
+ if (key_match == NULL || strcmp(pair->key, key_match) == 0)
ret++;
}
for (i = 0; i < kvlist->count; i++) {
pair = &kvlist->pairs[i];
- if (strstr(pair->key, key_match) != NULL) {
- if ((*handler)(pair->value, opaque_arg) < 0)
+ if (key_match == NULL || strcmp(pair->key, key_match) == 0) {
+ if ((*handler)(pair->key, pair->value, opaque_arg) < 0)
return -1;
}
}
return 0;
}
+/* free the rte_kvargs structure */
+void
+rte_kvargs_free(struct rte_kvargs *kvlist)
+{
+ if (!kvlist)
+ return;
+
+ free(kvlist->str);
+ free(kvlist);
+}
+
/*
* Parse the arguments "key=value;key=value;..." string and return
* an allocated structure that contains a key/value list. Also
* check if only valid keys were used.
*/
-int
-rte_kvargs_parse(struct rte_kvargs *kvlist,
- const char *args,
- const char *valid_keys[])
+struct rte_kvargs *
+rte_kvargs_parse(const char *args, const char *valid_keys[])
{
+ struct rte_kvargs *kvlist;
- int ret;
+ kvlist = malloc(sizeof(*kvlist));
+ if (kvlist == NULL)
+ return NULL;
+ memset(kvlist, 0, sizeof(*kvlist));
- ret = rte_kvargs_tokenize(kvlist, args);
- if (ret < 0)
- return ret;
+ if (rte_kvargs_tokenize(kvlist, args) < 0) {
+ rte_kvargs_free(kvlist);
+ return NULL;
+ }
- if (valid_keys == NULL)
- return 0;
+ if (valid_keys != NULL && check_for_valid_keys(kvlist, valid_keys) < 0) {
+ rte_kvargs_free(kvlist);
+ return NULL;
+ }
- return check_for_valid_keys(kvlist, valid_keys);
+ return kvlist;
}
git.droids-corp.org / dpdk.git / blobdiff