From patchwork Tue Jun 26 16:56:16 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: 41599 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 5EC361BE51; Tue, 26 Jun 2018 18:57:23 +0200 (CEST) Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by dpdk.org (Postfix) with ESMTP id 5DFDD1BE34 for ; Tue, 26 Jun 2018 18:57:07 +0200 (CEST) Received: by mail-wm0-f67.google.com with SMTP id v16-v6so2772349wmv.5 for ; Tue, 26 Jun 2018 09:57:07 -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=iknt2bA9XbpG/yfyyUjUBtsvNWBmFKd1jZVBbdQY5kY=; b=XN7sw+M5eHUBhC9uPC1dPOkv4io0KGBGrPG1ekSnxAUdhfuDiwkDCtWGymqdxOSlLm EhQC+vkaDzDLHgZYmjSmHHasykMaqADAerUGx37gOS2N2jYASrXuzg9wUSUwYj7qWoGy B53b+X8uESIpqAEjbKcf63VvO5sMdL0EsvZPW6riguLQi1f7N3+/TVity7k50DAxGyXr GJB5O8fjFpdbHxUIpNOLAeRIqIUbFp672ClJrShu0zQd3NcKX3dRNuUjkIBs/r8wEdvf qXaPHpZo4b4LsQ0lzneFTb2BiWDalGFckcczsrn+7wNTpG786NHar1upHIlAX4eeCKFz VrVA== 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=iknt2bA9XbpG/yfyyUjUBtsvNWBmFKd1jZVBbdQY5kY=; b=AJEet+WWq3PU7yi3g4NiTxYXRP5xCGoVw+q9yAm3oA6mr8pmm0UYwRdesxu+ECQcQd GoD1vS4endf8fhU1VIlr9qCK8b+EyMiIcTa9WPDNqRlS+WJeWGmVK/vJpTV647ZUFUZQ nReMbmBQRHBu29N4aY0snTdkX2LY3AhVcM8/5eFfP8dfPkmRwAPgsACpYF744WazEC3G ur7S4RaKATjzylkxBnR7JFgBg1Ccw1ISpWtgd7uom8dASmXBJo6ACZkspDAJaqikTujI FClOn3VV2eTd3UHRY8Qni56udVwo+QFEcvNC5azg0Z2e/9wyU0IbnDc+m1dPnkiEZRpi NsxA== X-Gm-Message-State: APt69E1nHnJyTAyvUHepW815sgTe58ti+KEWMU/irq9iYkrJGSi2lpYc nf/GP3Q37ygq9CLvqe/X9uqPYdDX X-Google-Smtp-Source: AAOMgpcrxFyZATu/goLoS9HkDci7I6xB14xXcZEDacgpSiIs+dZdOFGII1m4F+8KxJMpboF6PJGpXg== X-Received: by 2002:a1c:a845:: with SMTP id r66-v6mr2395491wme.2.1530032226641; Tue, 26 Jun 2018 09:57:06 -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 p5-v6sm2680880wre.83.2018.06.26.09.57.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Jun 2018 09:57:05 -0700 (PDT) From: Gaetan Rivet To: dev@dpdk.org Cc: Gaetan Rivet Date: Tue, 26 Jun 2018 18:56:16 +0200 Message-Id: X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: Subject: [dpdk-dev] [PATCH v8 13/21] kvargs: add generic string matching callback 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 can be used as a callback to rte_kvargs_process. This should reduce code duplication. Signed-off-by: Gaetan Rivet --- lib/librte_kvargs/rte_kvargs.c | 10 ++++++++++ lib/librte_kvargs/rte_kvargs.h | 28 ++++++++++++++++++++++++++++ lib/librte_kvargs/rte_kvargs_version.map | 1 + 3 files changed, 39 insertions(+) diff --git a/lib/librte_kvargs/rte_kvargs.c b/lib/librte_kvargs/rte_kvargs.c index cfbee3bd9..cf24b939e 100644 --- a/lib/librte_kvargs/rte_kvargs.c +++ b/lib/librte_kvargs/rte_kvargs.c @@ -205,3 +205,13 @@ rte_kvargs_parse2(const char *args, const char * const valid_keys[], free(copy); return kvlist; } + +__rte_experimental +int +rte_kvargs_strcmp(const char *key __rte_unused, + const char *value, void *opaque) +{ + const char *str = opaque; + + return -abs(strcmp(str, value)); +} diff --git a/lib/librte_kvargs/rte_kvargs.h b/lib/librte_kvargs/rte_kvargs.h index defdf10e4..5c065c3a8 100644 --- a/lib/librte_kvargs/rte_kvargs.h +++ b/lib/librte_kvargs/rte_kvargs.h @@ -25,6 +25,8 @@ extern "C" { #endif +#include + /** Maximum number of key/value associations */ #define RTE_KVARGS_MAX 32 @@ -151,6 +153,32 @@ int rte_kvargs_process(const struct rte_kvargs *kvlist, unsigned rte_kvargs_count(const struct rte_kvargs *kvlist, const char *key_match); +/** + * Generic kvarg handler for string comparison. + * + * This function can be used for a generic string comparison processing + * on a list of kvargs. + * + * @param key + * kvarg pair key. + * + * @param value + * kvarg pair value. + * + * @param opaque + * Opaque pointer to a string. + * + * @return + * 0 if the strings match. + * !0 otherwise or on error. + * + * Unless strcmp, comparison ordering is not kept. + * In order for rte_kvargs_process to stop processing on match error, + * a negative value is returned even if strcmp had returned a positive one. + */ +__rte_experimental +int rte_kvargs_strcmp(const char *key, const char *value, void *opaque); + #ifdef __cplusplus } #endif diff --git a/lib/librte_kvargs/rte_kvargs_version.map b/lib/librte_kvargs/rte_kvargs_version.map index b9fe44b98..6a41a6b65 100644 --- a/lib/librte_kvargs/rte_kvargs_version.map +++ b/lib/librte_kvargs/rte_kvargs_version.map @@ -13,5 +13,6 @@ EXPERIMENTAL { global: rte_kvargs_parse2; + rte_kvargs_strcmp; } DPDK_2.0;