From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pa0-f46.google.com (mail-pa0-f46.google.com [209.85.220.46]) by dpdk.org (Postfix) with ESMTP id DD1CCC312 for ; Tue, 16 Feb 2016 23:58:39 +0100 (CET) Received: by mail-pa0-f46.google.com with SMTP id fl4so98989529pad.0 for ; Tue, 16 Feb 2016 14:58:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bigswitch-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=t1EWrOz/x40UCTfP34xqkXwiB2GbOr2zyvTjpqYpfBI=; b=xYbSs1pkoBKXZjfslVTockM7LY0MuzYh+MaIF670hA06QnOkueV0cBFvHqX7O9cSOz hHMeobG6hb2HOBTnNlijF0bVoP+1hpVaxGZQafoEktaApneC+f6dFU4IoCWOBJ5Vx5ld L7nlIEejqgpSDpYoPbxblZbMeDNF8dfcOgudGGXBXMrPBr0w1lrzETfafe/L8/APEWho kiKFQVYT/6Ne841sU+MC6xoJigfjywsSq8vscVgr+q8t8+QYeI2zioIU30KlxCJd/TrW AX+XWAu6IEf20MB7kDtrho91gHIwFHc7VyYm/WY+BvkLdwRLBMVSi9XtGfI3UucM03kW Tttw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=t1EWrOz/x40UCTfP34xqkXwiB2GbOr2zyvTjpqYpfBI=; b=QQ6dFpvtwrDqhx0i2URKr1gsjMM8PlCMTkAEScXO6vLWj9B0vPNoUN710qqJWm2o3j 7izJJv77W3lfwvIewQXeb54DCCqGwj82gDbN7YVbL0NbblXEZp68VLchRP5h6vBczjWx EZ4ftBwTJmZhnXCG4IVHtGsiMYIE2Js0YehE2S/T34X/LvhPL47nQrBUDiRv4LAlHlJ3 2ZHFfJr5yG8Q2ILQP5PA7AmnP4I6LYJ+vY8vCmS6nlaRBdb08IHZxgmFFlMwR4CVIpNg +kY4ZbdSpI8EgTFsjBffTJpZdYv1WbH8MTS5Do6U0p+FolsMs5zrP6weMwYIOlurPQu1 D2ag== X-Gm-Message-State: AG10YOTUORfuUxZgGEoai5RRV5aCTAINRuuspYlVD23Z3Tt1zGUhtQJ0l3ucZcfRraH4Qj5t X-Received: by 10.67.6.10 with SMTP id cq10mr34643022pad.120.1455663519252; Tue, 16 Feb 2016 14:58:39 -0800 (PST) Received: from rlane-work.eng.bigswitch.com ([173.227.38.50]) by smtp.gmail.com with ESMTPSA id y15sm48111636pfi.16.2016.02.16.14.58.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 16 Feb 2016 14:58:38 -0800 (PST) From: Rich Lane X-Google-Original-From: Rich Lane To: dev@dpdk.org Date: Tue, 16 Feb 2016 14:58:37 -0800 Message-Id: <1455663517-55095-1-git-send-email-rlane@bigswitch.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1455131536-46285-1-git-send-email-rlane@bigswitch.com> References: <1455131536-46285-1-git-send-email-rlane@bigswitch.com> Subject: [dpdk-dev] [PATCH v4] cfgfile: support looking up sections by index X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Feb 2016 22:58:40 -0000 This is useful when sections have duplicate names. Signed-off-by: Rich Lane --- v3->v4: - Added section name return value. - Updated API docs for other functions. v2->v3 - Added check for index < 0. v1->v2: - Added new symbol to version script. lib/librte_cfgfile/rte_cfgfile.c | 18 ++++++++++++++ lib/librte_cfgfile/rte_cfgfile.h | 39 ++++++++++++++++++++++++++++++ lib/librte_cfgfile/rte_cfgfile_version.map | 6 +++++ 3 files changed, 63 insertions(+) diff --git a/lib/librte_cfgfile/rte_cfgfile.c b/lib/librte_cfgfile/rte_cfgfile.c index a677dad..c086fc5 100644 --- a/lib/librte_cfgfile/rte_cfgfile.c +++ b/lib/librte_cfgfile/rte_cfgfile.c @@ -333,6 +333,24 @@ rte_cfgfile_section_entries(struct rte_cfgfile *cfg, const char *sectionname, return i; } +int +rte_cfgfile_section_entries_by_index(struct rte_cfgfile *cfg, int index, + struct rte_cfgfile_entry *entries, int max_entries, + char *sectionname) +{ + int i; + const struct rte_cfgfile_section *sect; + + if (index < 0 || index >= cfg->num_sections) + return -1; + + sect = cfg->sections[index]; + snprintf(sectionname, CFG_NAME_LEN, "%s", sect->name); + for (i = 0; i < max_entries && i < sect->num_entries; i++) + entries[i] = *sect->entries[i]; + return i; +} + const char * rte_cfgfile_get_entry(struct rte_cfgfile *cfg, const char *sectionname, const char *entryname) diff --git a/lib/librte_cfgfile/rte_cfgfile.h b/lib/librte_cfgfile/rte_cfgfile.h index d443782..67c9f6c 100644 --- a/lib/librte_cfgfile/rte_cfgfile.h +++ b/lib/librte_cfgfile/rte_cfgfile.h @@ -126,6 +126,9 @@ int rte_cfgfile_has_section(struct rte_cfgfile *cfg, const char *sectionname); /** * Get number of entries in given config file section * +* If multiple sections have the given name this function operates on the +* first one. +* * @param cfg * Config file * @param sectionname @@ -138,6 +141,9 @@ int rte_cfgfile_section_num_entries(struct rte_cfgfile *cfg, /** Get section entries as key-value pairs * +* If multiple sections have the given name this function operates on the +* first one. +* * @param cfg * Config file * @param sectionname @@ -155,8 +161,38 @@ int rte_cfgfile_section_entries(struct rte_cfgfile *cfg, struct rte_cfgfile_entry *entries, int max_entries); +/** Get section entries as key-value pairs +* +* The index of a section is the same as the index of its name in the +* result of rte_cfgfile_sections. This API can be used when there are +* multiple sections with the same name. +* +* @param cfg +* Config file +* @param index +* Section index +* @param entries +* Pre-allocated array of at least max_entries entries where the section +* entries are stored as key-value pair after successful invocation +* @param max_entries +* Maximum number of section entries to be stored in entries array +* @param sectionname +* Pre-allocated string of at least CFG_NAME_LEN characters where the +* section name is stored after successful invocation. +* @return +* Number of entries populated on success, negative error code otherwise +*/ +int rte_cfgfile_section_entries_by_index(struct rte_cfgfile *cfg, + int index, + struct rte_cfgfile_entry *entries, + int max_entries, + char *sectionname); + /** Get value of the named entry in named config file section * +* If multiple sections have the given name this function operates on the +* first one. +* * @param cfg * Config file * @param sectionname @@ -172,6 +208,9 @@ const char *rte_cfgfile_get_entry(struct rte_cfgfile *cfg, /** Check if given entry exists in named config file section * +* If multiple sections have the given name this function operates on the +* first one. +* * @param cfg * Config file * @param sectionname diff --git a/lib/librte_cfgfile/rte_cfgfile_version.map b/lib/librte_cfgfile/rte_cfgfile_version.map index bf6c6fd..f6a27a9 100644 --- a/lib/librte_cfgfile/rte_cfgfile_version.map +++ b/lib/librte_cfgfile/rte_cfgfile_version.map @@ -13,3 +13,9 @@ DPDK_2.0 { local: *; }; + +DPDK_2.3 { + global: + + rte_cfgfile_section_entries_by_index; +} DPDK_2.0; -- 1.9.1