From patchwork Tue Jul 3 22:14:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ga=C3=ABtan_Rivet?= X-Patchwork-Id: 42173 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 3A5571BE4C; Wed, 4 Jul 2018 00:15:43 +0200 (CEST) Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by dpdk.org (Postfix) with ESMTP id 784401BE3F for ; Wed, 4 Jul 2018 00:15:39 +0200 (CEST) Received: by mail-wr0-f194.google.com with SMTP id q10-v6so3379584wrd.4 for ; Tue, 03 Jul 2018 15:15:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=bZU/7VKOPDsaUPRBk2F/ugqQ52BHubQjw6+LsmQ5bAE=; b=ECImR+6w+iPq8iR78PyGEQzuP27Dmx7QdbW46yec0Xd8uE5OxLlJ6cRoSBKznhAqvo 14RZLR3tTUQu4LPrNupwpASJcn2vau4M/kF7XlZ8h87FKvf0rAfFfIipLmv80OXwQOYr 3HxknrStAijzjI4mnn07LfAAOGIEeCOuM1g4Jz1V9z7tt9dC63npHvkbZElYv+stlOHE 04vPQe3i6K0KcF0ztjpTCJsM+movsD97Bsvtv2K3GpY8wnp12Qk5jWf84guWzWG38iuR nqse6jM9lFTrgqN9TD5k8rMgRUUai+hZRdKZCH0NprNsDdfB4fa5xKb9TkklCQFtEwDV QDdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=bZU/7VKOPDsaUPRBk2F/ugqQ52BHubQjw6+LsmQ5bAE=; b=WG7dfPvP9SRlSgVPQRZGtjz7sY1oFezl9vkfH0TQ7vCphGh2L9pO1evai1DaipzzmE 75are8ivf2L36vf0Ad7CKo9SxzLSouP/PBBHOoIOlNzu/QyB3ZGVaAqC5gCxBItHIL8a IRMZMkYZfpSSUhjiaxp/cN6FsdIpleCSPyHalB88Yg2BNgJahEeAFo0B71OZwYv+8TWj zAv/Ir3Q2w/DyZnPajWAhecUYFyX9p+sJh9H1+JzlypVWAI8rsJ8sTwC6DJcx+oi7pyJ AqIlkUD5uRpwg5VtGJG9+QZEiCuDulhK3fw/UFHUIRbAhEb4+NWukJizzU3w+6o9ZaBp 3hYw== X-Gm-Message-State: APt69E2eT6O2YhalT3SQAlsbePeK1++Are9i2VlV/0358S6vSZW+iVmc SlhcRNXdzIT2jBaygiT7ITgbyIak X-Google-Smtp-Source: AAOMgpcOMVCLxUHcgpHA0DVlCCz9Vlsb2TrpYe2ZC1L7XZrIk1JHJuwY5ylnopT44LweVZDG5JerMQ== X-Received: by 2002:adf:874b:: with SMTP id 11-v6mr16310149wrz.117.1530656138848; Tue, 03 Jul 2018 15:15:38 -0700 (PDT) Received: from bidouze.dev.6wind.com. (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id i190-v6sm3771084wmd.33.2018.07.03.15.15.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Jul 2018 15:15:37 -0700 (PDT) From: Gaetan Rivet To: dev@dpdk.org Cc: Gaetan Rivet Date: Wed, 4 Jul 2018 00:14:47 +0200 Message-Id: <5f7625162a33c5814f4760babcc1854d260fbed6.1530655929.git.gaetan.rivet@6wind.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: Subject: [dpdk-dev] [PATCH v9 04/27] kvargs: introduce a more flexible parsing function X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" This function permits defining additional terminating characters, ending the parsing to arbitrary delimiters. Signed-off-by: Gaetan Rivet --- lib/Makefile | 1 + lib/librte_kvargs/rte_kvargs.c | 25 +++++++++++++++++++++++++ lib/librte_kvargs/rte_kvargs.h | 30 ++++++++++++++++++++++++++++++ lib/librte_kvargs/rte_kvargs_version.map | 7 +++++++ 4 files changed, 63 insertions(+) diff --git a/lib/Makefile b/lib/Makefile index e8e903c8f..8a65525cd 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -5,6 +5,7 @@ include $(RTE_SDK)/mk/rte.vars.mk DIRS-y += librte_compat DIRS-$(CONFIG_RTE_LIBRTE_KVARGS) += librte_kvargs +DEPDIRS-librte_kvargs := librte_compat DIRS-$(CONFIG_RTE_LIBRTE_EAL) += librte_eal DIRS-$(CONFIG_RTE_LIBRTE_PCI) += librte_pci DEPDIRS-librte_pci := librte_eal diff --git a/lib/librte_kvargs/rte_kvargs.c b/lib/librte_kvargs/rte_kvargs.c index 747f14964..519f77679 100644 --- a/lib/librte_kvargs/rte_kvargs.c +++ b/lib/librte_kvargs/rte_kvargs.c @@ -168,3 +168,28 @@ rte_kvargs_parse(const char *args, const char * const valid_keys[]) return kvlist; } + +__rte_experimental +struct rte_kvargs * +rte_kvargs_parse2(const char *args, const char * const valid_keys[], + const char *valid_ends) +{ + struct rte_kvargs *kvlist = NULL; + char *copy; + size_t len; + + if (valid_ends == NULL) + return rte_kvargs_parse(args, valid_keys); + + copy = strdup(args); + if (copy == NULL) + return NULL; + + len = strcspn(copy, valid_ends); + copy[len] = '\0'; + + kvlist = rte_kvargs_parse(copy, valid_keys); + + free(copy); + return kvlist; +} diff --git a/lib/librte_kvargs/rte_kvargs.h b/lib/librte_kvargs/rte_kvargs.h index 51b8120b8..98c4ed1bf 100644 --- a/lib/librte_kvargs/rte_kvargs.h +++ b/lib/librte_kvargs/rte_kvargs.h @@ -72,6 +72,36 @@ struct rte_kvargs *rte_kvargs_parse(const char *args, const char *const valid_keys[]); /** + * Allocate a rte_kvargs and store key/value associations from a string. + * This version will consider any byte from valid_ends as a possible + * terminating character, and will not parse beyond any of their occurrence. + * + * The function allocates and fills an rte_kvargs structure from a given + * string whose format is key1=value1,key2=value2,... + * + * The structure can be freed with rte_kvargs_free(). + * + * @param args + * The input string containing the key/value associations + * + * @param valid_keys + * A list of valid keys (table of const char *, the last must be NULL). + * This argument is ignored if NULL + * + * @param valid_ends + * Acceptable terminating characters. + * If NULL, the behavior is the same as ``rte_kvargs_parse``. + * + * @return + * - A pointer to an allocated rte_kvargs structure on success + * - NULL on error + */ +__rte_experimental +struct rte_kvargs *rte_kvargs_parse2(const char *args, + const char *const valid_keys[], + const char *valid_ends); + +/** * Free a rte_kvargs structure * * Free a rte_kvargs structure previously allocated with diff --git a/lib/librte_kvargs/rte_kvargs_version.map b/lib/librte_kvargs/rte_kvargs_version.map index 2030ec46c..b9fe44b98 100644 --- a/lib/librte_kvargs/rte_kvargs_version.map +++ b/lib/librte_kvargs/rte_kvargs_version.map @@ -8,3 +8,10 @@ DPDK_2.0 { local: *; }; + +EXPERIMENTAL { + global: + + rte_kvargs_parse2; + +} DPDK_2.0;