From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 30370C544 for ; Fri, 19 Feb 2016 16:19:20 +0100 (CET) Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga101.fm.intel.com with ESMTP; 19 Feb 2016 07:19:19 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.22,471,1449561600"; d="scan'208";a="50930154" Received: from irsmsx151.ger.corp.intel.com ([163.33.192.59]) by fmsmga004.fm.intel.com with ESMTP; 19 Feb 2016 07:19:19 -0800 Received: from irsmsx156.ger.corp.intel.com (10.108.20.68) by IRSMSX151.ger.corp.intel.com (163.33.192.59) with Microsoft SMTP Server (TLS) id 14.3.248.2; Fri, 19 Feb 2016 15:18:41 +0000 Received: from irsmsx108.ger.corp.intel.com ([169.254.11.102]) by IRSMSX156.ger.corp.intel.com ([10.108.20.68]) with mapi id 14.03.0248.002; Fri, 19 Feb 2016 15:18:41 +0000 From: "Dumitrescu, Cristian" To: Rich Lane , "dev@dpdk.org" Thread-Topic: [PATCH v4] cfgfile: support looking up sections by index Thread-Index: AQHRaQ2WCyvfNVt0pkaKktOgmQcXnZ8zfrCw Date: Fri, 19 Feb 2016 15:18:41 +0000 Message-ID: <3EB4FA525960D640B5BDFFD6A3D8912647953788@IRSMSX108.ger.corp.intel.com> References: <1455131536-46285-1-git-send-email-rlane@bigswitch.com> <1455663517-55095-1-git-send-email-rlane@bigswitch.com> In-Reply-To: <1455663517-55095-1-git-send-email-rlane@bigswitch.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiODE5Y2Y5MjEtOTI2ZS00ZGM2LTg5MmEtYWE2ZDZjNDk0NDJlIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX0lDIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE1LjkuNi42IiwiVHJ1c3RlZExhYmVsSGFzaCI6IlVtb1VRalpnT2xWeUhhdUFNQ09nRHJGS252VUhuUXZoWVpUdmN4OSs1eHM9In0= x-ctpclassification: CTP_IC x-originating-ip: [163.33.239.182] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [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: Fri, 19 Feb 2016 15:19:20 -0000 > -----Original Message----- > From: Rich Lane [mailto:rich.lane@bigswitch.com] > Sent: Tuesday, February 16, 2016 10:59 PM > To: dev@dpdk.org > Cc: Dumitrescu, Cristian ; Panu Matilainen > > Subject: [PATCH v4] cfgfile: support looking up sections by index >=20 > This is useful when sections have duplicate names. >=20 > 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. >=20 > 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(+) >=20 > diff --git a/lib/librte_cfgfile/rte_cfgfile.c b/lib/librte_cfgfile/rte_cf= gfile.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; > } >=20 > +int > +rte_cfgfile_section_entries_by_index(struct rte_cfgfile *cfg, int index, > + struct rte_cfgfile_entry *entries, int max_entries, > + char *sectionname) To be inline with the other API functions, can we please place the sectionn= ame parameter after cfg and index and before entries and max_entries (be th= e 3rd parameter). Thanks! > +{ > + int i; > + const struct rte_cfgfile_section *sect; > + > + if (index < 0 || index >=3D cfg->num_sections) > + return -1; > + > + sect =3D cfg->sections[index]; > + snprintf(sectionname, CFG_NAME_LEN, "%s", sect->name); > + for (i =3D 0; i < max_entries && i < sect->num_entries; i++) > + entries[i] =3D *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_cf= gfile.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_cfgfil= e > *cfg, >=20 > /** 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); >=20 > +/** 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 sectio= n > +* 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 otherwis= e > +*/ > +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, >=20 > /** 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 { >=20 > local: *; > }; > + > +DPDK_2.3 { > + global: > + > + rte_cfgfile_section_entries_by_index; > +} DPDK_2.0; > -- > 1.9.1