From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id 350F85320 for ; Wed, 29 Jan 2014 16:48:26 +0100 (CET) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP; 29 Jan 2014 07:49:44 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.95,742,1384329600"; d="scan'208";a="472688913" Received: from irsmsx101.ger.corp.intel.com ([163.33.3.153]) by fmsmga002.fm.intel.com with ESMTP; 29 Jan 2014 07:49:05 -0800 Received: from irsmsx103.ger.corp.intel.com ([169.254.3.84]) by IRSMSX101.ger.corp.intel.com ([163.33.3.153]) with mapi id 14.03.0123.003; Wed, 29 Jan 2014 15:47:09 +0000 From: "Richardson, Bruce" To: Olivier Matz , "dev@dpdk.org" Thread-Topic: [dpdk-dev] [PATCH 03/11] kvargs: remove driver name in arguments Thread-Index: AQHPHENDzDq9ERLmOkWijEfAL9SxyJqb2h1g Date: Wed, 29 Jan 2014 15:47:08 +0000 Message-ID: <59AF69C657FD0841A61C55336867B5B01A995B46@IRSMSX103.ger.corp.intel.com> References: <1390925204-10800-1-git-send-email-olivier.matz@6wind.com> <1390925204-10800-4-git-send-email-olivier.matz@6wind.com> In-Reply-To: <1390925204-10800-4-git-send-email-olivier.matz@6wind.com> Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [163.33.239.181] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dpdk-dev] [PATCH 03/11] kvargs: remove driver name in arguments 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: Wed, 29 Jan 2014 15:48:26 -0000 > -----Original Message----- > From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Olivier Matz > Sent: Tuesday, January 28, 2014 4:07 PM > To: dev@dpdk.org > Subject: [dpdk-dev] [PATCH 03/11] kvargs: remove driver name in > arguments >=20 > Now that rte_kvargs is a generic library, there is no need to have an > argument for the driver name in rte_kvargs_tokenize() and > rte_kvargs_parse() prototypes. This argument was only used to log the > driver name in case of error. Instead, we can add a log in init function = of > pmd_pcap and pmd_ring. >=20 > Signed-off-by: Olivier Matz > --- > lib/librte_kvargs/rte_kvargs.c | 13 ++++++------- > lib/librte_kvargs/rte_kvargs.h | 4 +--- > lib/librte_pmd_pcap/rte_eth_pcap.c | 4 +++- > lib/librte_pmd_ring/rte_eth_ring.c | 2 ++ > 4 files changed, 12 insertions(+), 11 deletions(-) >=20 > diff --git a/lib/librte_kvargs/rte_kvargs.c b/lib/librte_kvargs/rte_kvarg= s.c > index 7a950d6..935698c 100644 > --- a/lib/librte_kvargs/rte_kvargs.c > +++ b/lib/librte_kvargs/rte_kvargs.c > @@ -91,8 +91,7 @@ rte_kvargs_add_pair(struct rte_kvargs *kvlist, char > *key, char *val) > * strtok() is used so the params string will be copied to be modified. > */ > static int > -rte_kvargs_tokenize(struct rte_kvargs *kvlist, const char *name, > - const char *params) > +rte_kvargs_tokenize(struct rte_kvargs *kvlist, const char *params) > { > unsigned i, count; > char *args; > @@ -101,7 +100,7 @@ rte_kvargs_tokenize(struct rte_kvargs *kvlist, > const char *name, >=20 > /* If params are empty, nothing to do */ > if (params =3D=3D NULL || params[0] =3D=3D 0) { > - RTE_LOG(ERR, PMD, "Couldn't parse %s device, empty > arguments\n", name); > + RTE_LOG(ERR, PMD, "Cannot parse empty arguments\n"); > return -1; > } >=20 > @@ -110,7 +109,7 @@ rte_kvargs_tokenize(struct rte_kvargs *kvlist, > const char *name, > */ > args =3D strdup(params); > if(args =3D=3D NULL){ > - RTE_LOG(ERR, PMD, "Couldn't parse %s device \n", name); > + RTE_LOG(ERR, PMD, "Cannot parse arguments: not enough > memory\n"); > return -1; > } >=20 > @@ -127,7 +126,8 @@ rte_kvargs_tokenize(struct rte_kvargs *kvlist, > const char *name, > if (pair[0] =3D=3D NULL || pair[1] =3D=3D NULL || pair[0][0] =3D=3D 0 > || pair[1][0] =3D=3D 0) { > RTE_LOG(ERR, PMD, > - "Couldn't parse %s device, wrong key > or value \n", name); > + "Cannot parse arguments: wrong key or > value\n" > + "params=3D<%s>\n", params); > goto error; > } >=20 > @@ -230,14 +230,13 @@ rte_kvargs_process(const struct rte_kvargs > *kvlist, > */ > int > rte_kvargs_parse(struct rte_kvargs *kvlist, > - const char *name, > const char *args, > const char *valid_keys[]) > { >=20 > int ret; >=20 > - ret =3D rte_kvargs_tokenize(kvlist, name, args); > + ret =3D rte_kvargs_tokenize(kvlist, args); > if (ret < 0) > return ret; >=20 > diff --git a/lib/librte_kvargs/rte_kvargs.h b/lib/librte_kvargs/rte_kvarg= s.h > index 19485b1..804ea1d 100644 > --- a/lib/librte_kvargs/rte_kvargs.h > +++ b/lib/librte_kvargs/rte_kvargs.h > @@ -100,8 +100,6 @@ int rte_kvargs_init(struct rte_kvargs *kvlist); > * > * @param kvlist > * The rte_kvargs structure > - * @param name > - * The name of the driver > * @param args > * The input string containing the key/value associations > * @param valid_keys > @@ -112,7 +110,7 @@ int rte_kvargs_init(struct rte_kvargs *kvlist); > * - 0 on success > * - Negative on error > */ > -int rte_kvargs_parse(struct rte_kvargs *kvlist, const char *name, > +int rte_kvargs_parse(struct rte_kvargs *kvlist, > const char *args, const char *valid_keys[]); >=20 > /** > diff --git a/lib/librte_pmd_pcap/rte_eth_pcap.c > b/lib/librte_pmd_pcap/rte_eth_pcap.c > index e47afcb..2006b35 100644 > --- a/lib/librte_pmd_pcap/rte_eth_pcap.c > +++ b/lib/librte_pmd_pcap/rte_eth_pcap.c > @@ -706,6 +706,8 @@ rte_pmd_pcap_init(const char *name, const char > *params) > struct rx_pcaps pcaps; > struct tx_pcaps dumpers; >=20 > + RTE_LOG(INFO, PMD, "Initializing pmd_pcap for %s\n", name); > + > rte_kvargs_init(&kvlist); >=20 > numa_node =3D rte_socket_id(); > @@ -714,7 +716,7 @@ rte_pmd_pcap_init(const char *name, const char > *params) > start_cycles =3D rte_get_timer_cycles(); > hz =3D rte_get_timer_hz(); >=20 > - if (rte_kvargs_parse(&kvlist, name, params, valid_arguments) < 0) > + if (rte_kvargs_parse(&kvlist, params, valid_arguments) < 0) > return -1; >=20 > /* > diff --git a/lib/librte_pmd_ring/rte_eth_ring.c > b/lib/librte_pmd_ring/rte_eth_ring.c > index fa3ff72..abef2e8 100644 > --- a/lib/librte_pmd_ring/rte_eth_ring.c > +++ b/lib/librte_pmd_ring/rte_eth_ring.c > @@ -384,6 +384,8 @@ rte_eth_ring_pair_attach(const char *name, const > unsigned numa_node) int rte_pmd_ring_init(const char *name, const char > *params) { > + RTE_LOG(INFO, PMD, "Initializing pmd_ring for %s\n", name); > + > if (params =3D=3D NULL) > eth_dev_ring_create(name, rte_socket_id(), DEV_CREATE); > else { > -- > 1.8.4.rc3 Acked-by: Bruce Richardson