From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pa0-f42.google.com (mail-pa0-f42.google.com [209.85.220.42]) by dpdk.org (Postfix) with ESMTP id DADDF2C5B for ; Mon, 22 Feb 2016 21:30:42 +0100 (CET) Received: by mail-pa0-f42.google.com with SMTP id yy13so96556180pab.3 for ; Mon, 22 Feb 2016 12:30:42 -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=01+rkKVfLucyA77XpBuyVl+gLauunxS0FAQycZoMIaw=; b=0SJ7JmyAA97A68M63izwEWEeNaSi1rJpGe6WevbO1kKHGMFR7KbSZVBsH+Hbqug0+y A4KDDhnWiPuHGIEiPgG/9wQY/QwpL1bsUThPvQ1a0lYqh5DohQsIafTN9lAvvWI2A141 DQX3WGNYOQ1l12E49TByfHKgcb4FUKvXQfYwTaLns/epRAtXD6C58l85N1LdlyXp29Da uwQE5JL7KapeaHDzUFBRcJUCxrfEn/yB5OHULl9F4+JXs4adqOjiaxaxJzbNUGGiXtT0 OEvrGH30apvFM9sLL0wK4VzrnQ71MwGxpHk4rT67v/o0ulhQqCW/EiLnFRffkJkRBri0 oj6g== 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=01+rkKVfLucyA77XpBuyVl+gLauunxS0FAQycZoMIaw=; b=IQ9zBkw5P1P0vurVvxMu82EQ40W2aalajVP6fu1Den5cq9uXEi5ISzXxNtjscibN5a RiTfH7MryrCrbtAJrtZ9+FIvJCr6DwAfSEth+nko04N2tMA2Q6ScB2Zh4tkW1IL/8I2P p7027v2RjJbOFwcDKtEhb1njsBi55n05CxPfgvTG6Tcgooan+uBwEdSs43muItISf37M eCRdpJTAau7Kz4usgYtWx9g71LlZ/HzVSxmUJ+V0+VpXXn/IMMopZvLG3L7xjkzHsR2w Xszz7JCMQbGnH9D9wnj1pw6vQzj2ZvNIzTJicMZjtUHeFTaDeFkh6py1dFpOlKLpy9+1 Y97Q== X-Gm-Message-State: AG10YORng00nfiJIrc4IXVLccgmHFxcDxAhBGsHv5RpJPxWGIDbncmqz11Lj3880DXNKIeN9 X-Received: by 10.66.147.74 with SMTP id ti10mr41220318pab.128.1456173042210; Mon, 22 Feb 2016 12:30:42 -0800 (PST) Received: from rlane-work.eng.bigswitch.com (c-67-188-28-208.hsd1.ca.comcast.net. [67.188.28.208]) by smtp.gmail.com with ESMTPSA id d8sm39091153pas.14.2016.02.22.12.30.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 22 Feb 2016 12:30:41 -0800 (PST) From: Rich Lane X-Google-Original-From: Rich Lane To: dev@dpdk.org Date: Mon, 22 Feb 2016 12:30:39 -0800 Message-Id: <1456173039-23175-1-git-send-email-rlane@bigswitch.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1455663517-55095-1-git-send-email-rlane@bigswitch.com> References: <1455663517-55095-1-git-send-email-rlane@bigswitch.com> Subject: [dpdk-dev] [PATCH v5] 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: Mon, 22 Feb 2016 20:30:43 -0000 This is useful when sections have duplicate names. Signed-off-by: Rich Lane --- v4->v5: - Reordered sectionname argument. 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 1cd523f..75625a2 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, + char *sectionname, + struct rte_cfgfile_entry *entries, int max_entries) +{ + 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..689fd66 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, + char *sectionname, + struct rte_cfgfile_entry *entries, + int max_entries); + /** 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